diff --git a/srcpkgs/cgminer/template b/srcpkgs/cgminer/template
index e1cd2a011ef..6e6ff882fbe 100644
--- a/srcpkgs/cgminer/template
+++ b/srcpkgs/cgminer/template
@@ -1,29 +1,35 @@
 # Template file for 'cgminer'
 pkgname=cgminer
-version=3.4.1
+version=3.8.3
 revision=1
 build_style=gnu-configure
-configure_args="--disable-adl --enable-bitforce --enable-bflsc
- --enable-icarus --enable-avalon --enable-modminer --enable-ztex"
-hostmakedepends="pkg-config yasm"
+configure_args="
+ --enable-bflsc --enable-bitforce --enable-icarus --enable-modminer
+ --enable-avalon --enable-klondike --enable-bitfury --enable-hashfast
+ --enable-bab --with-system-libusb"
+hostmakedepends="pkg-config automake libtool yasm"
 makedepends="libcurl-devel libusb-devel jansson-devel libudev-devel ncurses-devel"
 short_desc="Multi-threaded multi-pool CPU and GPU miner for bitcoin"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="https://github.com/ckolivas/cgminer"
 distfiles="http://ck.kolivas.org/apps/cgminer/cgminer-${version}.tar.bz2"
-checksum=b17cad48d3470f94e777faf56a7947e72d409ce01c42c838faa63899d8c745f8
+checksum=d88b5e85638dcc3437544aa35b97e6ec7823ed2516f972c1cdd862681f59f0d4
 
 pre_configure() {
 	# We have latest jansson and libusb - just use them
-	sed "s|ac_subdirs_all='compat/libusb\-1.0'||" -i ./configure
-	sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure
-	sed 's|LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"|LIBUSB_LIBS=-lusb-1.0|' -i ./configure
-	sed 's|JANSSON_LIBS="compat/jansson/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure
-	sed 's|compat/Makefile compat/jansson/Makefile||' -i ./configure
-	sed 's|JANSSON_INCLUDES = -I$(top_srcdir)/compat/jansson||' -i ./Makefile.in
-	sed "s|USBUTILS_INCLUDES = -I\$(top_srcdir)/compat/libusb\-1.0/libusb|USBUTILS_INCLUDES = -I${XBPS_CROSS_BASE}/usr/include/libusb-1.0|" -i ./Makefile.in
-	sed 's|SUBDIRS = lib compat ccan|SUBDIRS = lib ccan|' -i ./Makefile.in
+	sed -e 's|^AC_CONFIG_SUBDIRS.*compat/jansson-2\.5.*||' \
+		-e 's|JANSSON_LIBS="compat/jansson-2\.5/src/\.libs/libjansson\.a"|JANSSON_LIBS=-ljansson|' \
+		-e 's|compat/Makefile||' \
+		-i configure.ac
+
+	sed -e 's|^JANSSON_INCLUDES= .*||' \
+		-e 's|^USBUTILS_INCLUDES = .*|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' \
+		-e 's|^SUBDIRS.*|SUBDIRS = lib ccan|' \
+		-i Makefile.am
+
+	rm -r compat
+	autoreconf -fi
 }
 
 post_install() {
@@ -39,18 +45,3 @@ cgminer_package() {
 	}
 }
 
-# Package build options
-build_options="opencl"
-desc_option_opencl="Enable support for OpenCL mining"
-
-# Enable opencl by default on x86.
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	build_options_default="opencl"
-fi
-
-if [ "$build_option_opencl" ]; then
-	configure_args+=" --enable-scrypt --enable-opencl"
-	makedepends+=" opencl-headers nvidia-opencl"
-else
-	configure_args+=" --disable-scrypt --disable-opencl"
-fi