diff --git a/.gitmodules b/.gitmodules
index 5f203612e..c118aa920 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,3 +32,6 @@
 [submodule "extern/nanohttpd"]
 	path = extern/nanohttpd
 	url = https://github.com/eighthave/nanohttpd
+[submodule "extern/zxing-core"]
+	path = extern/zxing-core
+	url = https://gitlab.com/fdroid/zxing-core.git
diff --git a/ant-prepare.sh b/ant-prepare.sh
index d4469f567..13929a08c 100755
--- a/ant-prepare.sh
+++ b/ant-prepare.sh
@@ -4,6 +4,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/libsuperuser/libsuperuser
+android update lib-project --path extern/zxing-core
 android update project --path . --name F-Droid
 
 { echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null
diff --git a/build.gradle b/build.gradle
index 6f564756b..4b7199694 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,6 @@ FileCollection getAndroidPrebuilt(String apiLevel) {
 }
 
 dependencies {
-	compile files('libs/core-3.0.1.jar')
 	compile project(':support-v4')
 	compile project(':extern:AndroidPinning')
 	compile project(':extern:UniversalImageLoader:library')
@@ -25,6 +24,7 @@ dependencies {
 	compile project(':extern:nanohttpd:core')
 	compile project(':extern:jmdns')
 	compile project(':extern:zipsigner')
+	compile project(':extern:zxing-core')
 }
 
 project(':extern:UniversalImageLoader:library') {
diff --git a/extern/ant-src/kellinwood b/extern/ant-src/kellinwood
deleted file mode 120000
index 443258ed6..000000000
--- a/extern/ant-src/kellinwood
+++ /dev/null
@@ -1 +0,0 @@
-../zipsigner/src/main/java/kellinwood
\ No newline at end of file
diff --git a/extern/zxing-core b/extern/zxing-core
new file mode 160000
index 000000000..252a9b6b2
--- /dev/null
+++ b/extern/zxing-core
@@ -0,0 +1 @@
+Subproject commit 252a9b6b275397aabb944636f812e8c7057984a7
diff --git a/libs/core-3.0.1.jar b/libs/core-3.0.1.jar
deleted file mode 100644
index d1b35fcbb..000000000
Binary files a/libs/core-3.0.1.jar and /dev/null differ
diff --git a/libs/core-3.0.1.jar.README b/libs/core-3.0.1.jar.README
deleted file mode 100644
index 8535081d5..000000000
--- a/libs/core-3.0.1.jar.README
+++ /dev/null
@@ -1,17 +0,0 @@
-zxing
------
-
-ZXing ("zebra crossing") is an open-source, multi-format 1D/2D barcode image
-processing library implemented in Java, with ports to other languages.
-
-https://github.com/zxing/zxing
-
-Building zxing from scratch is a massive pain, so we use the official jar.
-The main source repo is SVN, so we couldn't do a git submodule anyway.
-
-The releases should be signed by this key:
-Sean Owen (ZXing) <srowen@gmail.com>
-CE32 85F3 2068 5193 D11F  EA01 F6CE 9695 C931 8406
-
-http://central.maven.org/maven2/com/google/zxing/core/3.0.1/core-3.0.1.jar
-http://central.maven.org/maven2/com/google/zxing/core/3.0.1/core-3.0.1.jar.asc
diff --git a/project.properties b/project.properties
index 099b6515b..e12ad6cf0 100644
--- a/project.properties
+++ b/project.properties
@@ -6,6 +6,7 @@ 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
 
 # For java libraries, place symlinks in extern/ant-src
 source.dir=src;extern/ant-src
diff --git a/settings.gradle b/settings.gradle
index ba1e07e79..f948dc4d2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,6 +9,7 @@ include ':extern:spongycastle:core'
 include ':extern:spongycastle:pg'
 include ':extern:spongycastle:pkix'
 include ':extern:spongycastle:prov'
+include ':extern:zxing-core'
 
 include ':support-v4'
 project(':support-v4').projectDir = new File('extern/Support/v4')