diff --git a/.gitmodules b/.gitmodules
index c86598bef..c49989eb9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -100,3 +100,6 @@
 [submodule "gluster"]
 	path = gluster
 	url = https://github.com/purpleidea/puppet-gluster
+[submodule "puppet"]
+	path = puppet
+	url = git@github.com:purpleidea/puppet-puppet
diff --git a/gluster b/gluster
index 8139b8985..b948c83c5 160000
--- a/gluster
+++ b/gluster
@@ -1 +1 @@
-Subproject commit 8139b898583ddd6f1a71df235719faec8305d161
+Subproject commit b948c83c52c512bf1f1898c02bb4f03ce5a04148
diff --git a/puppet b/puppet
new file mode 160000
index 000000000..07ec49d1f
--- /dev/null
+++ b/puppet
@@ -0,0 +1 @@
+Subproject commit 07ec49d1f67a498b31b4f164678a76c464e129c4