diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..acb2669
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "gnulib"]
+	path = gnulib
+	url = git://git.sv.gnu.org/gnulib.git
diff --git a/autogen.sh b/autogen.sh
index 0ab1868..0afb7ed 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,6 @@
 #!/bin/sh -
 
-if [ -d ../gnulib ]; then
-    ../gnulib/gnulib-tool --update
-fi
+./gnulib/gnulib-tool --update
 
 export AUTOMAKE='automake --foreign --add-missing'
 autoreconf
diff --git a/gnulib b/gnulib
new file mode 160000
index 0000000..a88d256
--- /dev/null
+++ b/gnulib
@@ -0,0 +1 @@
+Subproject commit a88d2561c2cdb9bde56bec1c858a5f64c6ad28c0