diff --git a/.gitmodules b/.gitmodules
index df6c6537e..a022987ef 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,10 +10,6 @@
 	path = extern/AndroidPinning
 	url = https://gitlab.com/fdroid/androidpinning.git
 	ignore = dirty
-[submodule "extern/nanohttpd"]
-	path = extern/nanohttpd
-	url = https://github.com/eighthave/nanohttpd
-	ignore = dirty
 [submodule "extern/libsuperuser"]
 	path = extern/libsuperuser
 	url = https://github.com/dschuermann/libsuperuser.git
diff --git a/ant-prepare.sh b/ant-prepare.sh
index 04a4ae685..d4469f567 100755
--- a/ant-prepare.sh
+++ b/ant-prepare.sh
@@ -3,9 +3,7 @@
 android update lib-project --path extern/UniversalImageLoader/library
 android update lib-project --path extern/AndroidPinning
 android update lib-project --path extern/MemorizingTrustManager
-android update lib-project --path extern/nanohttpd/core
 android update lib-project --path extern/libsuperuser/libsuperuser
-android update lib-project --path extern/jmdns
 android update project --path . --name F-Droid
 
 { echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null
diff --git a/extern/jmdns b/extern/jmdns
index 7d7efed77..a81b14c75 160000
--- a/extern/jmdns
+++ b/extern/jmdns
@@ -1 +1 @@
-Subproject commit 7d7efed77756c447ac525b58425f599fb1363db0
+Subproject commit a81b14c758809c9f3a0bf8177e9114f4eb9d40ff
diff --git a/extern/nanohttpd b/extern/nanohttpd
deleted file mode 160000
index 2f0130856..000000000
--- a/extern/nanohttpd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2f0130856add775db8d512199d4015a4f4d10cf4
diff --git a/project.properties b/project.properties
index d76463992..099b6515b 100644
--- a/project.properties
+++ b/project.properties
@@ -6,7 +6,6 @@ android.library.reference.1=extern/UniversalImageLoader/library
 android.library.reference.2=extern/MemorizingTrustManager
 android.library.reference.3=extern/AndroidPinning
 android.library.reference.4=extern/libsuperuser/libsuperuser
-android.library.reference.5=extern/jmdns
 
 # For java libraries, place symlinks in extern/ant-src
 source.dir=src;extern/ant-src