diff --git a/app/app.iml b/app/app.iml
index 484b6351..05d7d2de 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -80,12 +80,12 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="bcprov-jdk15on-1.51" level="project" />
     <orderEntry type="library" exported="" name="jmdns-fixed" level="project" />
+    <orderEntry type="library" exported="" name="jcodec-0.1.6-3" level="project" />
+    <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.51" level="project" />
     <orderEntry type="library" exported="" name="tinyrtsp" level="project" />
     <orderEntry type="library" exported="" name="limelight-common" level="project" />
-    <orderEntry type="library" exported="" name="bcprov-jdk15on-151" level="project" />
-    <orderEntry type="library" exported="" name="bcpkix-jdk15on-151" level="project" />
-    <orderEntry type="library" exported="" name="jcodec-0.1.5" level="project" />
   </component>
 </module>
 
diff --git a/app/build.gradle b/app/build.gradle
index 9aa840d5..1d8de990 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,9 +48,9 @@ android {
 }
 
 dependencies {
-    compile files('libs/bcpkix-jdk15on-151.jar')
-    compile files('libs/bcprov-jdk15on-151.jar')
-    compile files('libs/jcodec-0.1.5.jar')
+    compile group: 'org.jcodec', name: 'jcodec', version: '0.1.6-3'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.51'
+    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.51'
     compile files('libs/jmdns-fixed.jar')
     compile files('libs/limelight-common.jar')
     compile files('libs/tinyrtsp.jar')
diff --git a/app/libs/bcpkix-jdk15on-151.jar b/app/libs/bcpkix-jdk15on-151.jar
deleted file mode 100644
index 57e00806..00000000
Binary files a/app/libs/bcpkix-jdk15on-151.jar and /dev/null differ
diff --git a/app/libs/bcprov-jdk15on-151.jar b/app/libs/bcprov-jdk15on-151.jar
deleted file mode 100644
index 4076e116..00000000
Binary files a/app/libs/bcprov-jdk15on-151.jar and /dev/null differ
diff --git a/app/libs/jcodec-0.1.5.jar b/app/libs/jcodec-0.1.5.jar
deleted file mode 100644
index 13f32971..00000000
Binary files a/app/libs/jcodec-0.1.5.jar and /dev/null differ