Index: head/security/hashcat/Makefile
===================================================================
--- head/security/hashcat/Makefile
+++ head/security/hashcat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hashcat
 PORTVERSION=	3.20
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
@@ -20,7 +21,8 @@
 USE_GITHUB=	yes
 
 ALL_TARGET=	native
-USES=		gmake localbase
+USES=		gmake localbase shebangfix
+SHEBANG_FILES=	extra/tab_completion/install
 USE_CSTD=	c99
 
 pre-install:
Index: head/security/hashcat/files/patch-src_Makefile
===================================================================
--- head/security/hashcat/files/patch-src_Makefile
+++ head/security/hashcat/files/patch-src_Makefile
@@ -1,6 +1,22 @@
 --- src/Makefile.orig	2016-12-02 14:00:23 UTC
 +++ src/Makefile
-@@ -101,25 +101,7 @@ BINARY_NATIVE           := $(PROG_NAME)
+@@ -60,7 +60,6 @@ OPENCL_HEADERS_KHRONOS  := deps/OpenCL-H
+ ## Native compiler paths
+ ##
+ 
+-CC                      := gcc
+ FIND                    := find
+ INSTALL                 := install
+ RM                      := rm
+@@ -72,7 +71,6 @@ SED                     := gsed
+ endif
+ 
+ ifeq ($(UNAME),FreeBSD)
+-CC                      := cc
+ SED                     := gsed
+ endif
+ 
+@@ -101,25 +99,7 @@ BINARY_NATIVE           := $(PROG_NAME)
  ## General compiler and linker options
  ##
  
@@ -27,7 +43,7 @@
  
  # the following compiler options produce warnings that should be fixed at some time
  
-@@ -137,18 +119,6 @@ CFLAGS                  += -ftrapv
+@@ -137,18 +117,6 @@ CFLAGS                  += -ftrapv
  
  #CFLAGS                  += -Wstack-usage=524288
  
@@ -46,7 +62,7 @@
  ##
  ## Native compilation target
  ##
-@@ -165,7 +135,6 @@ endif # Linux
+@@ -165,7 +133,6 @@ endif # Linux
  ifeq ($(UNAME),FreeBSD)
  CFLAGS_NATIVE           := $(CFLAGS)
  CFLAGS_NATIVE           += -I$(OPENCL_HEADERS_KHRONOS)/