diff --git a/.gitmodules b/.gitmodules
index 28e43aadc49..bc590f136e3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "docs"]
 	path = docs
 	url = git://github.com/geonetwork/core-doc-sources.git
+[submodule "geoserver"]
+	path = geoserver
+	url = git://github.com/geonetwork/core-geoserver.git
diff --git a/geoserver b/geoserver
new file mode 160000
index 00000000000..9c98d24ac38
--- /dev/null
+++ b/geoserver
@@ -0,0 +1 @@
+Subproject commit 9c98d24ac38f9cc3d6282ae0d23b372a3379235b