diff --git a/.gitmodules b/.gitmodules
index 7d39cfc6f..f4e70c3aa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 	path = extern/AndroidPinning
 	url = http://gitlab.doeg.gy/cpu/androidpinning.git
 	ignore = dirty
+[submodule "extern/nanohttpd"]
+	path = extern/nanohttpd
+	url = https://github.com/eighthave/nanohttpd
diff --git a/extern/nanohttpd b/extern/nanohttpd
new file mode 160000
index 000000000..58f73260e
--- /dev/null
+++ b/extern/nanohttpd
@@ -0,0 +1 @@
+Subproject commit 58f73260ed98df878bae1051dc8e6a0bce842fcb
diff --git a/src/fi/iki/elonen/InternalRewrite.java b/src/fi/iki/elonen/InternalRewrite.java
new file mode 120000
index 000000000..1032b32ff
--- /dev/null
+++ b/src/fi/iki/elonen/InternalRewrite.java
@@ -0,0 +1 @@
+../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/InternalRewrite.java
\ No newline at end of file
diff --git a/src/fi/iki/elonen/NanoHTTPD.java b/src/fi/iki/elonen/NanoHTTPD.java
new file mode 120000
index 000000000..e901c0713
--- /dev/null
+++ b/src/fi/iki/elonen/NanoHTTPD.java
@@ -0,0 +1 @@
+../../../../extern/nanohttpd/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
\ No newline at end of file
diff --git a/src/fi/iki/elonen/ServerRunner.java b/src/fi/iki/elonen/ServerRunner.java
new file mode 120000
index 000000000..5e86528e1
--- /dev/null
+++ b/src/fi/iki/elonen/ServerRunner.java
@@ -0,0 +1 @@
+../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/ServerRunner.java
\ No newline at end of file
diff --git a/src/fi/iki/elonen/WebServerPlugin.java b/src/fi/iki/elonen/WebServerPlugin.java
new file mode 120000
index 000000000..e47bc1985
--- /dev/null
+++ b/src/fi/iki/elonen/WebServerPlugin.java
@@ -0,0 +1 @@
+../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/WebServerPlugin.java
\ No newline at end of file
diff --git a/src/fi/iki/elonen/WebServerPluginInfo.java b/src/fi/iki/elonen/WebServerPluginInfo.java
new file mode 120000
index 000000000..b50012005
--- /dev/null
+++ b/src/fi/iki/elonen/WebServerPluginInfo.java
@@ -0,0 +1 @@
+../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/WebServerPluginInfo.java
\ No newline at end of file