diff --git a/ext/swift.rb b/ext/swift.rb
index 715263e9..86dad46a 100644
--- a/ext/swift.rb
+++ b/ext/swift.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 # This is a script that uses
-# instructions here: http://swift.openstack.org/howto_installmultinode.html
+# instructions here: http://docs.openstack.org/developer/swift/howto_installmultinode.html
 # Even though I expect this script will work with a wide range
 # of swift versions, it is currently only tested with: 1.4.6
 require 'open3'
diff --git a/ext/swift_keystone_test.rb b/ext/swift_keystone_test.rb
index 213cc9f0..9e6284bb 100644
--- a/ext/swift_keystone_test.rb
+++ b/ext/swift_keystone_test.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 # This is a script that uses
-# instructions here: http://swift.openstack.org/howto_installmultinode.html
+# instructions here: http://docs.openstack.org/developer/swift/howto_installmultinode.html
 # Even though I expect this script will work with a wide range
 # of swift versions, it is currently only tested with: 1.4.6
 require 'open3'
diff --git a/files/swift_tester.rb b/files/swift_tester.rb
index 6f8ace1f..5981c8af 100644
--- a/files/swift_tester.rb
+++ b/files/swift_tester.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 # This is a script that uses
-# instructions here: http://swift.openstack.org/howto_installmultinode.html
+# instructions here: http://docs.openstack.org/developer/swift/howto_installmultinode.html
 # Even though I expect this script will work with a wide range
 # of swift versions, it is currently only tested with: 1.4.6
 require 'open3'
diff --git a/manifests/dispersion.pp b/manifests/dispersion.pp
index 9b542ab5..b20f21fc 100644
--- a/manifests/dispersion.pp
+++ b/manifests/dispersion.pp
@@ -7,7 +7,7 @@
 # on the swift proxy node.
 #
 # For more details, see :
-#   http://swift.openstack.org/admin_guide.html#cluster-health
+#   http://docs.openstack.org/developer/swift/admin_guide.html#cluster-health
 #
 # === Parameters
 #
diff --git a/manifests/storage/disk.pp b/manifests/storage/disk.pp
index ecc9536c..6fc64d48 100644
--- a/manifests/storage/disk.pp
+++ b/manifests/storage/disk.pp
@@ -1,6 +1,6 @@
 # This Puppet resource is based on the following
 # instructions for creating a disk device:
-# http://swift.openstack.org/development_saio.html
+# http://docs.openstack.org/developer/swift/development_saio.html
 #
 # ==Add a raw disk to a swift storage node==
 #
diff --git a/manifests/storage/ext4.pp b/manifests/storage/ext4.pp
index da43be6d..53f0d6b2 100644
--- a/manifests/storage/ext4.pp
+++ b/manifests/storage/ext4.pp
@@ -1,5 +1,5 @@
 # follow the instructions for creating a loopback device
-# for storage from: http://swift.openstack.org/development_saio.html
+# for storage from: http://docs.openstack.org/developer/swift/development_saio.html
 #
 # this define needs to be sent a refresh signal to do anything
 #
diff --git a/manifests/storage/loopback.pp b/manifests/storage/loopback.pp
index 78ba0aea..a0d81f20 100644
--- a/manifests/storage/loopback.pp
+++ b/manifests/storage/loopback.pp
@@ -1,5 +1,5 @@
 # follow the instructions for creating a loopback device
-# for storage from: http://swift.openstack.org/development_saio.html
+# for storage from: http://docs.openstack.org/developer/swift/development_saio.html
 #
 #
 # creates a managed loopback interface
diff --git a/templates/swift_keystone_test.erb b/templates/swift_keystone_test.erb
index 61cf6489..336eee08 100644
--- a/templates/swift_keystone_test.erb
+++ b/templates/swift_keystone_test.erb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 # This is a script that uses
-# instructions here: http://swift.openstack.org/howto_installmultinode.html
+# instructions here: http://docs.openstack.org/developer/swift/howto_installmultinode.html
 # Even though I expect this script will work with a wide range
 # of swift versions, it is currently only tested with: 1.4.6
 require 'open3'