diff --git a/srcpkgs/hashcat/patches/musl.patch b/srcpkgs/hashcat/patches/musl.patch
index 826fccf5797..3a0963d7043 100644
--- a/srcpkgs/hashcat/patches/musl.patch
+++ b/srcpkgs/hashcat/patches/musl.patch
@@ -1,21 +1,18 @@
-diff --git src/hashcat-cli.c src/hashcat-cli.c
-index 8c9c951..c2b53ed 100644
---- src/hashcat-cli.c
-+++ src/hashcat-cli.c
-@@ -17,7 +17,7 @@
+diff --git include/common.h include/common.h
+index c63d15a..2a8b3bc 100644
+--- include/common.h
++++ include/common.h
+@@ -41,7 +42,13 @@
+ #include <limits.h>
  
- // for interactive status prompt
- #ifdef POSIX
--#ifndef OSX
+ #ifdef LINUX
 +#ifdef __GLIBC__
- 
  #include <termio.h>
- 
-@@ -25,6 +25,7 @@
- 
- #include <termios.h>
- #include <sys/ioctl.h>
++#else
++#include <termios.h>
++#include <sys/ioctl.h>
 +#define termio termios
++#endif
+ #endif
  
- #endif
- #endif
+ #ifdef DARWIN
diff --git a/srcpkgs/hashcat/template b/srcpkgs/hashcat/template
index b4353035b14..2f4c65320ff 100644
--- a/srcpkgs/hashcat/template
+++ b/srcpkgs/hashcat/template
@@ -1,44 +1,25 @@
 # Template file for 'hashcat'
 pkgname=hashcat
-version=2.00
+version=3.00
 revision=1
-makedepends="gmp-devel"
+build_style=gnu-makefile
+make_build_target="native"
+make_build_args="LFLAGS=$LDFLAGS"
+makedepends="gmp-devel opencl2-headers"
 short_desc="Advanced CPU-based password recovery utility"
 maintainer="Duncaen <duncaen@voidlinux.eu>"
 license="MIT"
 homepage="https://hashcat.net/hashcat/"
-distfiles="https://github.com/hashcat/hashcat/archive/${version}.tar.gz"
-checksum=6325e6d75a4df3485adec00f74e5887326809c15ed31bfe74a12b62943245444
-only_for_archs="x86_64 i686 x86_64-musl i686-musl"
+distfiles="https://github.com/hashcat/hashcat/archive/v${version}.tar.gz"
+checksum=0283791b91db9dd7ee7431d8975c63419c73232945b76eedcefbe12becfa19c4
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) nopie=yes;;
-esac
+CFLAGS="-W -Wall -std=c99 -Iinclude/ -IOpenCL/"
 
-do_build() {
-
-	CFLAGS+=" -Iinclude/ -fomit-frame-pointer -funroll-loops"
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*) target="posix64" ;;
-		i686*) target="posix32" ;;
-	esac
-	make CC_POSIX32="$CC" CC_POSIX64="$CC" \
-		CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-		LIBGMP_POSIX32="${XBPS_CROSS_TRIPLET}/usr" \
-		LIBGMP_POSIX64="${XBPS_CROSS_TRIPLET}/usr" \
-		"$target"
+pre_build() {
+	sed -i -e 's|-ldl|-ldl $(LDFLAGS)|g' -e 's| -s$||g' src/Makefile
 }
 
-do_install() {
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*) vbin hashcat-cli64.bin hashcat ;;
-		i686*) vbin hashcat-cli32.bin hashcat ;;
-	esac
-
-	vmkdir etc/hashcat
-	for d in salts rules tables; do
-		vcopy "$d" etc/hashcat
-	done
-
+post_install() {
+	rm -f ${DESTDIR}/usr/share/docs/hashcat/license.txt
 	vlicense docs/license.txt
 }