diff --git a/.gitmodules b/.gitmodules
index 711d86810..2076aad51 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "extern/MemorizingTrustManager"]
-	path = extern/MemorizingTrustManager
-	url = https://github.com/ge0rg/MemorizingTrustManager.git
-	ignore = dirty
 [submodule "extern/Support"]
 	path = extern/Support
 	url = https://android.googlesource.com/platform/frameworks/support
diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml
index 83ab75774..d90c2ae38 100644
--- a/F-Droid/AndroidManifest.xml
+++ b/F-Droid/AndroidManifest.xml
@@ -404,11 +404,6 @@
                 android:resource="@xml/searchable" />
         </activity>
 
-        <!--Used for SSL TOFU, supported by extern/MemorizingTrustManager lib -->
-        <activity
-                android:name="de.duenndns.ssl.MemorizingActivity"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-
         <receiver android:name=".receiver.StartupReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/F-Droid/ant-prepare.sh b/F-Droid/ant-prepare.sh
index b12f16bff..f2abbc5c8 100755
--- a/F-Droid/ant-prepare.sh
+++ b/F-Droid/ant-prepare.sh
@@ -32,8 +32,6 @@ 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/libsuperuser/libsuperuser
 
 android update lib-project --path $EXTERN/zxing-core
diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index 9c97a5481..e24437876 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -39,10 +39,6 @@ if ( !hasProperty( 'sourceDeps' ) ) {
 
         // Upstream doesn't have a binary on mavenCentral.
         compile(name: 'zipsigner')
-
-        // Upstream doesn't have a binary on mavenCentral, but we are currently not using this
-        // library due to bugs anyway. In the future, it will likely get included again though.
-        // compile(name: 'MemorizingTrustManager-release', ext: 'aar')
     }
 
 } else {
@@ -80,9 +76,6 @@ if ( !hasProperty( 'sourceDeps' ) ) {
         compile 'com.android.support:support-v4:20.0.+',
                 'com.android.support:appcompat-v7:20.0.+',
                 'com.android.support:support-annotations:20.0.+'
-
-        // Removed for now, until it is reimplemented.
-        // compile project(':extern:MemorizingTrustManager')
     }
 
 }
@@ -108,9 +101,6 @@ task binaryDeps(type: Copy, dependsOn: ':F-Droid:prepareReleaseDependencies') {
                 'nanohttpd/core/build/libs/nanohttpd-2.1.0.jar',
                 'zipsigner/build/libs/zipsigner.jar',
                 'Support/v4/build/libs/support-v4.jar'
-
-                // Removed for now, until it is reimplemented.
-                // 'MemorizingTrustManager/build/outputs/aar/MemorizingTrustManager-release.aar'
     }
 
     into 'libs/binaryDeps'
diff --git a/F-Droid/project.properties b/F-Droid/project.properties
index 211bec884..9ba41cecb 100644
--- a/F-Droid/project.properties
+++ b/F-Droid/project.properties
@@ -1,7 +1,6 @@
 target=android-21
 
 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/zxing-core
diff --git a/extern/MemorizingTrustManager b/extern/MemorizingTrustManager
deleted file mode 160000
index 36f86bd15..000000000
--- a/extern/MemorizingTrustManager
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 36f86bd1592671a1eb28264e1f6c81c7173d4b9b
diff --git a/settings.gradle b/settings.gradle
index 812780d2e..78e3bfd6a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,7 +3,6 @@ include ':F-Droid'
 if ( hasProperty( 'sourceDeps' ) ) {
 	include ':extern:AndroidPinning'
 	include ':extern:UniversalImageLoader:library'
-	include ':extern:MemorizingTrustManager'
 	include ':extern:libsuperuser:libsuperuser'
 	include ':extern:nanohttpd:core'
 	include ':extern:jmdns'