diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..0028fb4e2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "authentic2/manager/vendor/gadjo"]
+	path = authentic2/manager/vendor/gadjo
+	url = git://repos.entrouvert.org/gadjo.git
diff --git a/MANIFEST.in b/MANIFEST.in
index 690417306..3a3764238 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -30,6 +30,9 @@ recursive-include authentic2/attribute_aggregator/locale *.po *.mo
 recursive-include authentic2/disco_service/locale *.po *.mo
 recursive-include authentic2 README  xrds.xml *.txt yadis.xrdf
 
+# gadjo submodule
+recursive-include authentic2/manager/vendor/gadjo *
+
 include doc/*.rst
 include doc/pictures/*
 include COPYING NEWS README.rst AUTHORS.txt
diff --git a/authentic2/manager/vendor/gadjo b/authentic2/manager/vendor/gadjo
new file mode 160000
index 000000000..a075ca07c
--- /dev/null
+++ b/authentic2/manager/vendor/gadjo
@@ -0,0 +1 @@
+Subproject commit a075ca07c9f387ab1ec00de0673840f6e9a9e501
diff --git a/authentic2/settings.py b/authentic2/settings.py
index 36eaddf56..326629b8b 100644
--- a/authentic2/settings.py
+++ b/authentic2/settings.py
@@ -136,11 +136,13 @@ ROOT_URLCONF = 'authentic2.urls'
 TEMPLATE_DIRS = (
         os.path.join(VAR_DIR, 'templates'),
         os.path.join(BASE_DIR, 'templates'),
+        os.path.join(BASE_DIR, 'manager', 'vendor', 'gadjo', 'gadjo', 'templates'),
 )
 
 STATICFILES_DIRS = (
         os.path.join(VAR_DIR, 'extra-static'),
         os.path.join(BASE_DIR, 'static'),
+        os.path.join(BASE_DIR, 'manager', 'vendor', 'gadjo', 'gadjo', 'static'),
 )
 
 if os.environ.get('TEMPLATE_DIRS'):