diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..56061e3
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "vendor/github.com/FreifunkBremen/yanic"]
+	path = vendor/github.com/FreifunkBremen/yanic
+	url = https://github.com/FreifunkBremen/yanic
+	branch = database-socket
diff --git a/.test-coverage b/.test-coverage
index 5694852..a5c99e9 100755
--- a/.test-coverage
+++ b/.test-coverage
@@ -6,7 +6,7 @@ echo "mode: count" > profile.cov
 FAIL=0
 
 # Standard go tooling behavior is to ignore dirs with leading underscors
-for dir in $(find . -maxdepth 10 -not -path './ssh' -not -path './.git*' -not -path '*/_*' -type d);
+for dir in $(find . -maxdepth 10 -not -path './ssh' -not -path './vendor/*' -not -path './.git*' -not -path '*/_*' -type d);
 do
   if ls $dir/*.go &> /dev/null; then
     go test -p 1 -v -covermode=count -coverprofile=profile.tmp $dir || FAIL=$?
diff --git a/vendor/github.com/FreifunkBremen/yanic b/vendor/github.com/FreifunkBremen/yanic
new file mode 160000
index 0000000..cf15adc
--- /dev/null
+++ b/vendor/github.com/FreifunkBremen/yanic
@@ -0,0 +1 @@
+Subproject commit cf15adc69e24b20e295b0a766fb2128bc08da0c6