diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0da70ba4..bf56ee68 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -33,6 +33,7 @@
         android:icon="@drawable/icon"
         android:label="KDE Connect"
         android:theme="@style/KdeConnectTheme"
+        android:name="android.support.multidex.MultiDexApplication"
         >
 
         <service
diff --git a/build.gradle b/build.gradle
index 2306acbb..bc32ad2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,6 +15,7 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 22
+        multiDexEnabled true
     }
 	sourceSets {
         main {
@@ -49,11 +50,12 @@ dependencies {
     repositories {
         mavenCentral()
     }
-
+    compile 'com.android.support:multidex:1.0.0'
     compile 'com.android.support:support-v4:22.2.0'
     compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'com.madgag.spongycastle:pkix:1.52.0.0'
     compile 'org.apache.sshd:sshd-core:0.8.0'
+    compile 'org.bouncycastle:bcprov-jdk16:1.46'
     compile 'io.netty:netty-all:4.0.29.Final'
     compile fileTree(dir: 'libs', include: '*.jar')