diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 75c19e6c6f8..4789e2c5333 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2004/01/29 20:30:33 sturm Exp $
+# $OpenBSD: Makefile,v 1.49 2004/05/16 08:38:12 jolan Exp $
 
 COMMENT=	"scan ports and fingerprint stack of network hosts"
 
@@ -23,6 +23,11 @@ MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/nbase \
 				${WRKSRC}/nsock/src \
 				${WRKSRC}/libpcap-possiblymodified
 
+# XXX workaround linking issue on hppa
+.if ${MACHINE_ARCH:Mhppa}
+PATCH_LIST=	patch-* hppa-*
+.endif
+
 FLAVORS=	no_x11
 FLAVOR?=	
 
diff --git a/net/nmap/patches/hppa-patch-Makefile_in b/net/nmap/patches/hppa-patch-Makefile_in
new file mode 100644
index 00000000000..47709da9418
--- /dev/null
+++ b/net/nmap/patches/hppa-patch-Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: hppa-patch-Makefile_in,v 1.1 2004/05/16 08:38:12 jolan Exp $
+--- Makefile.in.orig	2004-01-18 05:38:38.000000000 -0600
++++ Makefile.in	2004-05-16 02:29:32.000000000 -0500
+@@ -55,7 +55,7 @@ all: $(TARGET) $(TARGETNMAPFE)
+ $(TARGET): $(DEPS) @PCAP_DEPENDS@ @PCRE_DEPENDS@ $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a $(OBJS)
+ 	@echo Compiling nmap
+ 	rm -f $@
+-	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -lssl -lcrypto
+ 
+ # This empty rule is used to force execution of certain rules where I can't conveniently specify
+ # all of the prerequisites (e.g. recursive makes and such)
diff --git a/net/nmap/patches/patch-nbase_configure b/net/nmap/patches/patch-nbase_configure
index f76e6c1512c..4dc7729f317 100644
--- a/net/nmap/patches/patch-nbase_configure
+++ b/net/nmap/patches/patch-nbase_configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-nbase_configure,v 1.3 2003/12/09 18:42:37 brad Exp $
---- nbase/configure.orig	2003-10-10 12:36:03.000000000 -0700
-+++ nbase/configure	2003-10-10 12:36:45.000000000 -0700
-@@ -3192,6 +3192,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+$OpenBSD: patch-nbase_configure,v 1.4 2004/05/16 08:38:12 jolan Exp $
+--- nbase/configure.orig	2004-01-11 21:23:12.000000000 -0600
++++ nbase/configure	2004-05-16 01:53:17.000000000 -0500
+@@ -3318,6 +3318,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #if HAVE_SYS_TYPES_H
  # include <sys/types.h>
  # endif