diff --git a/srcpkgs/reaver/patches/fix-libwps_elements_iterator.patch b/srcpkgs/reaver/patches/fix-libwps_elements_iterator.patch
deleted file mode 100644
index 7f0216e6861..00000000000
--- a/srcpkgs/reaver/patches/fix-libwps_elements_iterator.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix the calculation of the number of iterations.
-
---- src/libwps/libwps.c	2012-01-18 10:02:39.000000000 +0100
-+++ src/libwps/libwps.c	2017-01-09 00:55:01.593948178 +0100
-@@ -83,7 +83,7 @@
- 
- 	if(wps_ie_data)
- 	{
--		for(i=0; i<sizeof(elements); i++)
-+		for(i=0; i<sizeof(elements)/sizeof(elements[0]); i++)
- 		{
- 			/* Search for each WPS element inside the WPS IE data blob */
- 			el = get_wps_data_element(wps_ie_data, wps_data_len, elements[i], &el_len);
diff --git a/srcpkgs/reaver/patches/fix-md5_ctx_memset.patch b/srcpkgs/reaver/patches/fix-md5_ctx_memset.patch
deleted file mode 100644
index 313e6be57aa..00000000000
--- a/srcpkgs/reaver/patches/fix-md5_ctx_memset.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix size of memset which is what ctx points to.
-
---- src/crypto/md5-internal.c	2012-01-18 10:02:40.000000000 +0100
-+++ src/crypto/md5-internal.c	2017-01-09 00:57:00.889939319 +0100
-@@ -188,7 +188,7 @@
-     MD5Transform(ctx->buf, (u32 *) ctx->in);
-     byteReverse((unsigned char *) ctx->buf, 4);
-     os_memcpy(digest, ctx->buf, 16);
--    os_memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
-+    os_memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
- }
- 
- /* The four core functions - F1 is optimized somewhat */
diff --git a/srcpkgs/reaver/patches/libwps.makefile.patch b/srcpkgs/reaver/patches/libwps.makefile.patch
deleted file mode 100644
index b2e75b2e679..00000000000
--- a/srcpkgs/reaver/patches/libwps.makefile.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/libwps/Makefile.orig	2017-01-07 19:45:12.126774214 +0100
-+++ src/libwps/Makefile	2017-01-08 18:17:11.095493475 +0100
-@@ -1,5 +1,3 @@
--CC=gcc
--CFLAGS=-Wall
- 
- libwps.o:
- 	$(CC) $(CFLAGS) libwps.c -c
diff --git a/srcpkgs/reaver/patches/lwe.makefile.patch b/srcpkgs/reaver/patches/lwe.makefile.patch
deleted file mode 100644
index 7d33a7dba63..00000000000
--- a/srcpkgs/reaver/patches/lwe.makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/lwe/Makefile.orig	2017-01-08 13:59:36.306546961 +0100
-+++ src/lwe/Makefile	2017-01-08 14:04:01.681546043 +0100
-@@ -8,12 +8,6 @@
-   PREFIX = /usr/local
- endif
- 
--## Compiler to use (modify this for cross compile).
--CC = gcc
--## Other tools you need to modify for cross compile (static lib only).
--AR = ar
--RANLIB = ranlib
--
- ## Uncomment this to build tools using static version of the library.
- ## Mostly useful for embedded platforms without ldd, or to create
- ## a local version (non-root).
-@@ -151,7 +145,7 @@
- $(STATIC): $(OBJS:.o=.so)
- 	$(RM) $@
- 	$(AR) cru $@ $^
--	$(RANLIB) $@
-+	$(AR) s $@
- 
- # Installation : So crude but so effective ;-)
- # Less crude thanks to many contributions ;-)
diff --git a/srcpkgs/reaver/patches/wps.makefile.patch b/srcpkgs/reaver/patches/wps.makefile.patch
deleted file mode 100644
index 28e7765ee74..00000000000
--- a/srcpkgs/reaver/patches/wps.makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/wps/Makefile.orig	2017-01-07 19:43:44.617774517 +0100
-+++ src/wps/Makefile	2017-01-08 18:18:15.866493251 +0100
-@@ -1,34 +1,33 @@
--CC=gcc
- INC=-I../utils -I ../
- 
- all: wps_attr_build.o wps_attr_parse.o wps_attr_process.o wps.o wps_common.o wps_dev_attr.o wps_enrollee.o wps_registrar.o wps_ufd.o
- 
- wps_attr_build.o:
--	$(CC) $(INC) wps_attr_build.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_attr_build.c -c
- 
- wps_attr_parse.o:
--	$(CC) $(INC) wps_attr_parse.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_attr_parse.c -c
- 
- wps_attr_process.o:
--	$(CC) $(INC) wps_attr_process.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_attr_process.c -c
- 
- wps.o:
--	$(CC) $(INC) wps.c -c
-+	$(CC) $(CFLAGS) $(INC) wps.c -c
- 
- wps_common.o:
--	$(CC) $(INC) wps_common.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_common.c -c
- 
- wps_dev_attr.o:
--	$(CC) $(INC) wps_dev_attr.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_dev_attr.c -c
- 
- wps_enrollee.o:
--	$(CC) $(INC) wps_enrollee.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_enrollee.c -c
- 
- wps_registrar.o:
--	$(CC) $(INC) wps_registrar.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_registrar.c -c
- 
- wps_ufd.o:
--	$(CC) $(INC) wps_ufd.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_ufd.c -c
- 
- clean:
- 	rm -f *.o
diff --git a/srcpkgs/reaver/template b/srcpkgs/reaver/template
index 4e11805b774..67f2f9a2985 100644
--- a/srcpkgs/reaver/template
+++ b/srcpkgs/reaver/template
@@ -1,17 +1,17 @@
 # Template file for 'reaver'
 pkgname=reaver
-version=1.4
+version=1.6.5
 revision=2
 build_style=gnu-configure
 build_wrksrc="src"
-conf_files="/etc/reaver/reaver.db"
-makedepends="libpcap-devel sqlite-devel"
+#conf_files="/etc/reaver/reaver.db"
+makedepends="libpcap-devel"
 short_desc="Brute force attack tool against Wifi Protected Setup (WPS)"
 maintainer="cipr3s <cipr3s@gmx.com>"
 license="GPL-2"
-homepage="https://code.google.com/archive/p/reaver-wps/"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/reaver-wps/${pkgname}-${version}.tar.gz"
-checksum="add3050a4a05fe0ab6bfb291ee2de8e9b8a85f1e64ced93ee27a75744954b22d"
+homepage="https://github.com/t6x/reaver-wps-fork-t6x"
+distfiles="https://github.com/t6x/reaver-wps-fork-t6x/releases/download/v${version}/${pkgname}-${version}.tar.xz"
+checksum=342e9d265cf459bd2387205b73a63d1fc7582e268f0e9aec20613f3ec11b6a6b
 
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
@@ -20,10 +20,10 @@ post_extract() {
 	esac
 }
 
-do_install() {
-	# The Makefile's install target is broken (ignores destdir)
-	vmkdir etc/${pkgname}
-	vinstall ${pkgname}.db 644 etc/${pkgname}
-	vbin wash
-	vbin reaver
-}
+#do_install() {
+#	# The Makefile's install target is broken (ignores destdir)
+#	vmkdir etc/${pkgname}
+#	vinstall ${pkgname}.db 644 etc/${pkgname}
+#	vbin wash
+#	vbin reaver
+#}