diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f75b0d2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "modules/riak"]
+	path = modules/riak
+	url = https://github.com/basho/puppet-riak
+[submodule "modules/python"]
+	path = modules/python
+	url = https://github.com/stankevich/puppet-python.git
diff --git a/modules/python b/modules/python
new file mode 160000
index 0000000..83f4294
--- /dev/null
+++ b/modules/python
@@ -0,0 +1 @@
+Subproject commit 83f42940563d183593b0e091c314dbf1484fae1e
diff --git a/modules/riak b/modules/riak
new file mode 160000
index 0000000..6d00e52
--- /dev/null
+++ b/modules/riak
@@ -0,0 +1 @@
+Subproject commit 6d00e5285c7fc0ed538a7a3dec3f176dc5fd97e3