diff --git a/hydra/Makefile b/hydra/Makefile
index b3ebffb0f6..eb02d32801 100644
--- a/hydra/Makefile
+++ b/hydra/Makefile
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2003/12/16 22:51:25 adrian_p Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/22 21:00:40 adrian_p Exp $
 #
 
-DISTNAME=	hydra-2.6
+DISTNAME=	hydra-3.1
 CATEGORIES=	security
 MASTER_SITES=	http://www.thc.org/releases/
 
-MAINTAINER=	adam@monkeybyte.org
+MAINTAINER=	adrianp@stindustries.net
 HOMEPAGE=	http://www.thc.org/
 COMMENT=	Login password cracker
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
-post-extract:
-	@${CHMOD} 0755 ${WRKSRC}
-
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/hydra/TODO b/hydra/TODO
index 1084cc1ffa..03a2412bb9 100644
--- a/hydra/TODO
+++ b/hydra/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.1 2003/12/16 22:51:25 adrian_p Exp $
+$NetBSD: TODO,v 1.2 2004/04/22 21:00:41 adrian_p Exp $
 
 Not tested on -current
-patch-ab needs work as it should follow ${SSLBASE}
+patch-aa needs work as it should follow ${SSLBASE}
diff --git a/hydra/distinfo b/hydra/distinfo
index 04da790acb..26051388aa 100644
--- a/hydra/distinfo
+++ b/hydra/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2003/12/16 22:51:25 adrian_p Exp $
+$NetBSD: distinfo,v 1.5 2004/04/22 21:00:42 adrian_p Exp $
 
-SHA1 (hydra-2.6.tar.gz) = e2ff1dd68284c55f7fc6fe63a66dbd9f3480a82d
-Size (hydra-2.6.tar.gz) = 48954 bytes
-SHA1 (patch-aa) = 7d38687f39def66c12410605531a7facca529ad0
-SHA1 (patch-ab) = 4ed6a379282313695d354c4a0424f1145610ffbd
+SHA1 (hydra-3.1.tar.gz) = 4b63b66b02eb28b355fd526cc7b30ff62cb6a88b
+Size (hydra-3.1.tar.gz) = 53937 bytes
+SHA1 (patch-aa) = 329255db454c04bbe0749982534482693ed0c264
+SHA1 (patch-ab) = 8aca85df83d7625c97799f54168e8e89266c00b8
diff --git a/hydra/patches/patch-aa b/hydra/patches/patch-aa
index 9595d3dd73..9738d56673 100644
--- a/hydra/patches/patch-aa
+++ b/hydra/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2003/11/14 17:15:16 adrian_p Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/22 21:00:42 adrian_p Exp $
 
---- Makefile.am.orig	2003-11-14 17:10:29.000000000 +0000
-+++ Makefile.am	2003-11-14 17:10:43.000000000 +0000
-@@ -4,7 +4,7 @@
+--- Makefile.am.orig	Thu Apr 22 20:49:08 2004
++++ Makefile.am	Thu Apr 22 20:49:27 2004
+@@ -3,7 +3,7 @@
+ #
  
  CC = gcc
- OPTS = -O2 -I. -Wall
--LIBS = 
-+LIBS = -lm
+-OPTS = -O2 -I. -Wall
++OPTS = ${CFLAGS} -I/usr/pkg/include/openssl
+ LIBS = 
  DIR = /bin
  
- SRC = hydra-vnc.c hydra-pcnfs.c hydra-rexec.c hydra-nntp.c hydra-socks5.c \
diff --git a/hydra/patches/patch-ab b/hydra/patches/patch-ab
index 1a79623348..1b6ddeeff1 100644
--- a/hydra/patches/patch-ab
+++ b/hydra/patches/patch-ab
@@ -1,13 +1,21 @@
-$NetBSD: patch-ab,v 1.1 2003/12/16 22:51:25 adrian_p Exp $
+$NetBSD: patch-ab,v 1.2 2004/04/22 21:00:44 adrian_p Exp $
 
---- configure.orig	Tue Dec 16 22:44:05 2003
-+++ configure	Tue Dec 16 22:44:40 2003
-@@ -141,7 +141,7 @@
- fi
+--- hydra-smbnt.c.orig	Thu Apr 22 21:51:59 2004
++++ hydra-smbnt.c	Thu Apr 22 21:52:26 2004
+@@ -243,6 +243,7 @@
+ int
+ SMBNegProt(int s)
+ {
++  int i;
+   char buf[168] = { 0x00, 0x00, 0x00, 0xa4, 0xff, 0x53, 0x4d, 0x42,
+     0x72, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0x40,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+@@ -278,7 +279,7 @@
  
- echo
--XDEFINES=""
-+XDEFINES="-I/usr/include/openssl"
- XLIBS=""
- XLIBPATHS=""
- XIPATHS=""
+   /* find the primary domain/workgroup name */
+   memset(workgroup, 0, 16);
+-  int i = 0;
++  i = 0;
+   while ((rbuf[81+i*2] != 0) && (i<16)) {
+     workgroup[i] = rbuf[81+i*2];
+     i++;