diff --git a/CONTRIBUTING b/CONTRIBUTING
index f6113877..9ed9d72f 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -1,3 +1,3 @@
 Contributions are welcomed. Please see the following sites for guidelines:
 
-  http://haml-lang.com/development.html#contributing
+  http://haml.info/development.html#contributing
diff --git a/README.md b/README.md
index df3d4d1f..650bdddb 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ and both Haml and Sass will be installed.
 Views with the `.html.haml` extension will automatically use Haml.
 
 To use Haml programatically,
-check out the [YARD documentation](http://haml-lang.com/docs/yardoc/).
+check out the [YARD documentation](http://haml.info/docs/yardoc/).
 
 ## Formatting
 
@@ -98,7 +98,7 @@ like `if` and `while`:
         = "Happy new " + "year!"
 
 Haml provides far more tools than those presented here.
-Check out the [reference documentation](http://beta.haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html)
+Check out the [reference documentation](http://haml.info/docs/yardoc/file.HAML_REFERENCE.html)
 for full details.
 
 ### Indentation
diff --git a/doc-src/FAQ.md b/doc-src/FAQ.md
index 53b39e62..e0a749be 100644
--- a/doc-src/FAQ.md
+++ b/doc-src/FAQ.md
@@ -151,7 +151,7 @@ For other plugins, a little searching will probably turn up a way to fix them as
 
 ## You still haven't answered my question!
 
-Sorry! Try looking at the [Haml](http://haml-lang.com/docs/yardoc/HAML_REFERENCE.md.html) reference,
+Sorry! Try looking at the [Haml](http://haml.info/docs/yardoc/HAML_REFERENCE.md.html) reference,
 If you can't find an answer there,
 feel free to ask in `#haml` on irc.freenode.net
-or send an email to the [mailing list](http://groups.google.com/group/haml?hl=en).
+or send an email to the [mailing list](http://groups.google.com/group/haml).
diff --git a/doc-src/HAML_CHANGELOG.md b/doc-src/HAML_CHANGELOG.md
index d849bd18..dc7f7891 100644
--- a/doc-src/HAML_CHANGELOG.md
+++ b/doc-src/HAML_CHANGELOG.md
@@ -963,7 +963,7 @@ Haml 2.2 introduces a new syntax for attributes
 based on the HTML syntax.
 For example:
 
-    %a(href="http://haml-lang.com" title="Haml's so cool!")
+    %a(href="http://haml.info" title="Haml's so cool!")
       %img(src="/images/haml.png" alt="Haml")
 
 There are two main reasons for this.
diff --git a/haml.gemspec b/haml.gemspec
index dfda83fe..fd9dd983 100644
--- a/haml.gemspec
+++ b/haml.gemspec
@@ -28,7 +28,7 @@ HAML_GEMSPEC = Gem::Specification.new do |spec|
   spec.executables = ['haml', 'html2haml']
   spec.files = Dir['rails/init.rb', 'lib/**/*', 'bin/*', 'test/**/*',
     'extra/**/*', 'vendor/sass/**/*', 'Rakefile', 'init.rb', '.yardopts'] + readmes
-  spec.homepage = 'http://haml-lang.com/'
+  spec.homepage = 'http://haml.info/'
   spec.has_rdoc = false
   spec.test_files = Dir['test/**/*_test.rb']
 end
diff --git a/test/haml/engine_test.rb b/test/haml/engine_test.rb
index 13880572..ee9ec2bf 100755
--- a/test/haml/engine_test.rb
+++ b/test/haml/engine_test.rb
@@ -188,11 +188,11 @@ MESSAGE
   def test_dynamic_attributes_with_no_content
     assert_equal(<<HTML, render(<<HAML))
 <p>
-  <a href='http://haml-lang.com'></a>
+  <a href='http://haml.info'></a>
 </p>
 HTML
 %p
-  %a{:href => "http://" + "haml-lang.com"}
+  %a{:href => "http://" + "haml.info"}
 HAML
   end