diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index de0592bcb6fc..68b5e5e6a45c 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hydra
-PORTVERSION=	8.1
+PORTVERSION=	8.2
 CATEGORIES=	security
 MASTER_SITES=	https://www.thc.org/releases/ \
 		PACKETSTORM/groups/thc/
@@ -11,6 +11,7 @@ MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Brute force attack utility working on multiple network services
 
 LICENSE=	AGPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libidn.so:dns/libidn \
 		libpcre.so:devel/pcre \
@@ -21,30 +22,19 @@ CONFLICTS_INSTALL=	hydra-web-[0-9]*
 PLIST_FILES=	bin/hydra bin/pw-inspector bin/dpl4hydra.sh bin/hydra-wizard.sh \
 		man/man1/hydra.1.gz man/man1/pw-inspector.1.gz
 GNU_CONFIGURE=	yes
-USES=		gmake
-USE_OPENSSL=	yes
-WANT_GNOME=	yes
+USES=		gmake localbase ssl
 
 OPTIONS_DEFINE=	FIREBIRD SSH SVN X11
 OPTIONS_DEFAULT=SSH
 OPTIONS_EXCLUDE=NLS DOCS
 FIREBIRD_USES=	firebird
 SVN_LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSSH}
-CFLAGS+=	-I${LOCALBASE}/include
-LIB_DEPENDS+=	libssh.so.4:security/libssh
-.endif
-
-.if ${PORT_OPTIONS:MX11}
-USES+=		pkgconfig
-USE_GNOME=	gtk20
-PLIST_FILES+=	bin/xhydra man/man1/xhydra.1.gz
-.else
-CONFIGURE_ARGS+=	--disable-xhydra
-.endif
+SSH_LIB_DEPENDS=	libssh.so.4:security/libssh
+X11_USES=		gettext pkgconfig
+X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+			libfreetype.so:print/freetype2
+X11_USE=		gnome=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
+X11_PLIST_FILES=	bin/xhydra man/man1/xhydra.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
@@ -56,11 +46,10 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pw-inspector ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/dpl4hydra.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/hydra-wizard.sh ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/hydra.1 ${STAGEDIR}${MANPREFIX}/man/man1/hydra.1
-	${INSTALL_MAN} ${WRKSRC}/pw-inspector.1 ${STAGEDIR}${MANPREFIX}/man/man1/pw-inspector.1
-.if ${PORT_OPTIONS:MX11}
+	${INSTALL_MAN} ${WRKSRC}/hydra.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/pw-inspector.1 ${STAGEDIR}${MANPREFIX}/man/man1
+post-install-X11-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xhydra.1 ${STAGEDIR}${MANPREFIX}/man/man1/xhydra.1
-.endif
+	${INSTALL_MAN} ${WRKSRC}/xhydra.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/security/hydra/distinfo b/security/hydra/distinfo
index 9c0738418272..7501434f3ffc 100644
--- a/security/hydra/distinfo
+++ b/security/hydra/distinfo
@@ -1,2 +1,3 @@
-SHA256 (hydra-8.1.tar.gz) = e4bc2fd11f97a8d985a38a31785c86d38cc60383e47a8f4a5c436351e5135f19
-SIZE (hydra-8.1.tar.gz) = 559031
+TIMESTAMP = 1469203290
+SHA256 (hydra-8.2.tar.gz) = 9e88496aca1d7ee94410cf3e3d87bc8cbaa91e37fd5ef700cab2f55ce92b4ac4
+SIZE (hydra-8.2.tar.gz) = 578596
diff --git a/security/hydra/files/patch-configure b/security/hydra/files/patch-configure
index 2f8816e8947f..0a7d79e876a5 100644
--- a/security/hydra/files/patch-configure
+++ b/security/hydra/files/patch-configure
@@ -1,21 +1,21 @@
---- ./configure.orig	2012-12-23 01:34:25.000000000 +0400
-+++ ./configure	2012-12-31 11:58:51.000000000 +0400
-@@ -801,7 +801,7 @@
+--- configure.orig	2016-06-16 14:57:15 UTC
++++ configure
+@@ -1009,7 +1009,7 @@ XLIBPATHS=""
  XIPATHS=""
  
  if [ -n "$FIREBIRD_PATH" -o -n "$PCRE_PATH" -o -n "$IDN_PATH" -o -n "$SSL_PATH" -o -n "$CRYPTO_PATH" -o -n "$NSL_PATH" -o -n "$SOCKET_PATH" -o -n "$RESOLV_PATH" -o -n "$SAPR3_PATH" -o -n "$SSH_PATH" -o -n "$POSTGRES_PATH" -o -n "$SVN_PATH" -o -n "$NCP_PATH" -o -n "$CURSES_PATH" -o -n "$ORACLE_PATH" -o -n "$AFP_PATH" -o -n "$MYSQL_PATH" ]; then
 -    XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib"
 +    XLIBPATHS="-L/usr/local/lib -L/usr/lib -L/lib"
  fi
- if [ -n "$SSL_PATH" ]; then
-     XDEFINES="$XDEFINES -DLIBOPENSSL"
-@@ -857,6 +857,9 @@
- if [ -n "$SSL_IPATH" ]; then
-     XIPATHS="-I$SSL_IPATH"
+ if [ -n "$MYSQL_IPATH" ]; then
+     XIPATHS="$XIPATHS -I$MYSQL_IPATH"
+@@ -1024,6 +1024,9 @@ if [ -n "$SSL_PATH" ]; then
+         XDEFINES="$XDEFINES -DLIBOPENSSL"
+     fi
  fi
 +if [ -d $PREFIX/include ];then
 +   XIPATHS="$XIPATHS -I$PREFIX/include"
 +fi
  if [ -n "$CURSES_PATH" ]; then
-     XLIBS="$XLIBS -lcurses"
+     XDEFINES="$XDEFINES -DLIBNCURSES"
  fi
diff --git a/security/hydra/files/patch-hydra-gtk-make_xhydra.sh b/security/hydra/files/patch-hydra-gtk-make_xhydra.sh
index 6a1dd92c9b7c..ef99a5beb6a0 100644
--- a/security/hydra/files/patch-hydra-gtk-make_xhydra.sh
+++ b/security/hydra/files/patch-hydra-gtk-make_xhydra.sh
@@ -1,6 +1,6 @@
---- hydra-gtk/make_xhydra.sh.orig	Fri May 20 17:03:45 2005
-+++ hydra-gtk/make_xhydra.sh	Fri May 20 17:04:06 2005
-@@ -8,7 +8,7 @@
+--- hydra-gtk/make_xhydra.sh.orig	2016-06-16 14:57:15 UTC
++++ hydra-gtk/make_xhydra.sh
+@@ -8,7 +8,7 @@ test -e Makefile || {
    cat errors
    exit 1
  }
diff --git a/security/hydra/files/patch-hydra.h b/security/hydra/files/patch-hydra.h
index 01b3d5d2af17..30c84b55ab7e 100644
--- a/security/hydra/files/patch-hydra.h
+++ b/security/hydra/files/patch-hydra.h
@@ -1,6 +1,6 @@
---- hydra.h.orig	2011-10-02 12:06:16.000000000 +0400
-+++ hydra.h	2011-10-13 15:08:39.000000000 +0400
-@@ -30,10 +30,6 @@
+--- hydra.h.orig	2016-06-16 14:57:15 UTC
++++ hydra.h
+@@ -31,10 +31,6 @@
  #endif
  #endif
  
@@ -8,6 +8,6 @@
 -#include <libssh/libssh.h>
 -#endif
 -
- #define OPTION_SSL 1
- 
- #define PORT_NOPORT     -1
+ #ifdef HAVE_ZLIB
+ #include <zlib.h>
+ #endif