diff --git a/.gitignore b/.gitignore
index c16f3ae5..893e1e3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 /generator/vendor/
 /generator/build/
-/generator/doc/doc-en/
 /generator/doc/entities/generated.ent
 /composer.lock
 vendor/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..3481a18d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "generator/doc/doc-en/doc-base"]
+	path = generator/doc/doc-en/doc-base
+	url = https://github.com/salathe/phpdoc-base
+[submodule "generator/doc/doc-en/en"]
+	path = generator/doc/doc-en/en
+	url = https://github.com/php/doc-en
diff --git a/generator/doc/doc-en/doc-base b/generator/doc/doc-en/doc-base
new file mode 160000
index 00000000..851670c1
--- /dev/null
+++ b/generator/doc/doc-en/doc-base
@@ -0,0 +1 @@
+Subproject commit 851670c1c412c37215c3e8983381cbdbb469c7ca
diff --git a/generator/doc/doc-en/en b/generator/doc/doc-en/en
new file mode 160000
index 00000000..d5d4f158
--- /dev/null
+++ b/generator/doc/doc-en/en
@@ -0,0 +1 @@
+Subproject commit d5d4f158b964b08a07ae13ac9bc417c7c2c6ef66
diff --git a/generator/doc/update.sh b/generator/doc/update.sh
index d3c6006a..f7c07bcc 100755
--- a/generator/doc/update.sh
+++ b/generator/doc/update.sh
@@ -1,11 +1,4 @@
-if [ ! -d "doc-en" ]; then
-    mkdir doc-en
-    cd doc-en
-    git clone https://github.com/salathe/phpdoc-base doc-base
-    git clone https://github.com/php/doc-en en
-  else
-    cd doc-en/en
-    git pull
-    cd ../doc-base
-    git pull
-  fi
\ No newline at end of file
+#!/usr/bin/env sh
+
+git submodule init
+git submodule update --remote --merge