diff --git a/srcpkgs/ccextractor/patches/disable_arm_neon.patch b/srcpkgs/ccextractor/patches/disable_arm_neon.patch
new file mode 100644
index 00000000000..76dcada659d
--- /dev/null
+++ b/srcpkgs/ccextractor/patches/disable_arm_neon.patch
@@ -0,0 +1,10 @@
+--- src/libpng/pngpriv.h.orig	2017-01-24 01:56:17.000000000 +0100
++++ src/libpng/pngpriv.h	2018-02-23 14:33:41.864333473 +0100
+@@ -105,6 +105,7 @@
+  * this in $(CC), e.g. "CC=gcc -mfpu=neon", but people who build libpng rarely
+  * do this.
+  */
++#define PNG_ARM_NEON_OPT 0
+ #ifndef PNG_ARM_NEON_OPT
+    /* ARM NEON optimizations are being controlled by the compiler settings,
+     * typically the target FPU.  If the FPU has been set to NEON (-mfpu=neon
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 41c1bb7d75c..ec71ac4d4c3 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,38 +1,31 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.85
+version=0.86
 revision=1
-wrksrc=${pkgname}
-hostmakedepends="unzip"
-makedepends="leptonica-devel tesseract-ocr-devel"
+build_wrksrc="linux"
+build_style=gnu-configure
+configure_args="--enable-ocr --enable-hardsubx"
+hostmakedepends="automake pkg-config"
+makedepends="leptonica-devel tesseract-ocr-devel ffmpeg-devel"
 short_desc="Extract subtitles from video"
-maintainer="Styrsven <sven.a.jonsson@bahnhof.se>"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2"
 homepage="http://www.ccextractor.org/doku.php"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-src-full.${version}.zip"
-checksum=557f6dcae751598fb2f9c5e98b5407ddd3f6eaca61b5769df881b8155149bae8
+distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
+checksum=0c24b00384244a2e58d63ad2ef1cb69b2e0824c7461f707d40e926d49136330a
 
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) broken="libpng missing png_init_filter_functions_neon" ;;
-esac
-
-do_build() {
-	cd ${wrksrc}/linux
-	make ${makejobs} CC=$CC LDFLAGS="$LDFLAGS -lm"
-}
-
-post_extract() {
-	sed -i -e 's/\(^LDFLAGS \)=\(.*$\)/\1+=\2/' \
-	       -e 's/\(^CFLAGS \)=\(.*$\)/\1+=\2/' linux/Makefile
+pre_configure() {
+	sed -i -e "s/tesseract --version/tesseract-ocr --version/g" configure.ac
+	./autogen.sh
 }
 
 do_install() {
-	vbin linux/ccextractor
-	for i in docs/*; do
-	    if [ $i = "docs/gpl-2.0.txt" ]; then
+	vbin ccextractor
+	for i in ../docs/*; do
+	    if [ $i = "../docs/gpl-2.0.txt" ]; then
 	       vlicense $i
 	    else
-		vdoc $i
+		vdoc "$i"
 	    fi
 	done
 }