diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d5a8f6f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "uwhoisd"]
+	path = uwhoisd
+	url = https://github.com/Rafiot/uwhoisd.git
diff --git a/.travis.yml b/.travis.yml
index 0b38b45..0d40c1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,9 @@ install:
     - python setup.py install
     - popd
     - pip install -r requirements.txt
+    - pushd uwhoisd
+    - python setup.py install
+    - popd
     - pip install coveralls
     - pip install codecov
     - cp config.ini.sample config.ini
diff --git a/uwhoisd b/uwhoisd
new file mode 160000
index 0000000..eefb13f
--- /dev/null
+++ b/uwhoisd
@@ -0,0 +1 @@
+Subproject commit eefb13ffa6b129efb97d794b2df6cd249ec4bff4