diff --git a/README b/README
index ef88842..d8399e9 100644
--- a/README
+++ b/README
@@ -27,9 +27,18 @@ Installation
 
         $ sudo apt-get update
 
-4. Install Puppet
+4. Install Puppet -- On Oneiric Ocelot (11.10) the ubuntu repos have the correct version puppet but on Natty you have to manually get the 11.10 packages 
+
+        $ sudo apt-get install libxmlrpc-ruby libopenssl-ruby libshadow-ruby1.8 libaugeas-ruby1.8
+	$ wget http://mirror.pnl.gov/ubuntu//pool/main/p/puppet/puppet_2.6.8-1ubuntu1_all.deb \
+   		http://mirror.pnl.gov/ubuntu//pool/main/p/puppet/puppet-common_2.6.8-1ubuntu1_all.deb \
+   		http://mirror.pnl.gov/ubuntu//pool/main/f/facter/facter_1.5.9-1ubuntu1_all.deb
+	$ sudo dpkg -i *.deb
+
+	make sure you have version 2.6.8
+	$ sudo puppet --version
+	2.6.8
 
-        $ apt-get install puppet
 
 5. Download the Puppet OpenStack module
 
@@ -37,7 +46,7 @@ Installation
 
 6. Copy the modules into the Puppet modulepath
 
-        $ sudo cp -R ~/puppetlabs-openstack/modules/* /etc/puppet/
+        $ sudo cp -R ~/puppetlabs-openstack/modules/* /etc/puppet/modules/
 
 7. Run Puppet
 
diff --git a/modules/nova b/modules/nova
deleted file mode 160000
index 9464483..0000000
--- a/modules/nova
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 946448309b9e07756c324e90ad5acbfa0cd0838c
diff --git a/modules/puppetlabs-nova b/modules/puppetlabs-nova
new file mode 160000
index 0000000..321d2ae
--- /dev/null
+++ b/modules/puppetlabs-nova
@@ -0,0 +1 @@
+Subproject commit 321d2ae3c26bb11f2caa71b039630e8a0de627bb
diff --git a/modules/rabbitmq b/modules/rabbitmq
index 65163cb..875ab94 160000
--- a/modules/rabbitmq
+++ b/modules/rabbitmq
@@ -1 +1 @@
-Subproject commit 65163cb52924c9a822794b7c96b28de7bfc3c223
+Subproject commit 875ab949067998332f3cc5961b7d0e8fa51d312d