diff --git a/security/p0f/Makefile b/security/p0f/Makefile
index 3e3f2267e6c..2c68037b98f 100644
--- a/security/p0f/Makefile
+++ b/security/p0f/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/01/02 04:56:24 brad Exp $
+# $OpenBSD: Makefile,v 1.11 2004/05/03 15:59:36 naddy Exp $
 # $NetBSD: Makefile,v 1.1.1.2 2001/03/26 11:59:15 hubertf Exp $
 
 COMMENT=		"passive OS fingerprinting tool"
@@ -39,10 +39,10 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/p0f ${PREFIX}/bin/p0f
-	${INSTALL_PROGRAM} ${WRKSRC}/p0frep ${PREFIX}/bin/p0frep
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/p0f
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/p0f
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/p0f/README
+	${INSTALL_MAN} ${WRKSRC}/p0f.1 ${PREFIX}/man/man1/p0f.1
 .for file in ${EXAMPLES}
 .if ${FLAVOR:L} == "mysql"
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/p0f/mysql
diff --git a/security/p0f/patches/patch-Makefile b/security/p0f/patches/patch-Makefile
index 2943e9ad332..56e065fcae9 100644
--- a/security/p0f/patches/patch-Makefile
+++ b/security/p0f/patches/patch-Makefile
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile,v 1.1 2003/07/19 17:02:06 jose Exp $
---- Makefile.orig	Thu Feb  6 22:30:54 2003
-+++ Makefile	Sat Jul 19 18:22:19 2003
+$OpenBSD: patch-Makefile,v 1.2 2004/05/03 15:59:36 naddy Exp $
+--- Makefile.orig	2003-02-07 04:30:54.000000000 +0100
++++ Makefile	2004-05-03 17:53:51.000000000 +0200
 @@ -6,7 +6,7 @@
  
  CC      = gcc
  CLIBS	= -lpcap -I/usr/include/pcap
 -MYSQLCLIBS	= -L/usr/local/mysql/lib -lmysqlclient -lpcap -I/usr/include/pcap -I/usr/local/mysql/include
-+MYSQLCLIBS = -L%%LOCALBASE%%/lib -lmysqlclient -lpcap -I%%LOCALBASE%%/include
++MYSQLCLIBS = -L/usr/local/lib -lmysqlclient -lpcap -I/usr/local/include
  SUNLIBS	= -lsocket -lnsl -D_SUN_=1
  STRIP	= strip
  CFLAGS  = -O3 -Wall
diff --git a/security/p0f/patches/patch-p0f_1 b/security/p0f/patches/patch-p0f_1
new file mode 100644
index 00000000000..180055a1134
--- /dev/null
+++ b/security/p0f/patches/patch-p0f_1
@@ -0,0 +1,16 @@
+$OpenBSD: patch-p0f_1,v 1.1 2004/05/03 15:59:36 naddy Exp $
+--- p0f.1.orig	2004-05-03 17:54:34.000000000 +0200
++++ p0f.1	2004-05-03 17:55:02.000000000 +0200
+@@ -54,10 +54,10 @@ add timestamps
+ \fB\-q\fR
+ quiet mode - do not display banners
+ .TP
+-\fB\-m file\fR
++\fB\-m\fR file
+ send output to mysql server in 'file'
+ .TP
+-\fb\-g file\fR
++\fB\-g\fR file
+ insert fprints from 'file' into sql (must be used with -m)
+ .SH FILES
+ .TP
diff --git a/security/p0f/patches/patch-p0f_c b/security/p0f/patches/patch-p0f_c
index 490d48a6ced..2ba873e0972 100644
--- a/security/p0f/patches/patch-p0f_c
+++ b/security/p0f/patches/patch-p0f_c
@@ -1,5 +1,6 @@
---- p0f.c.orig	Mon May 13 12:59:40 2002
-+++ p0f.c	Fri Feb  7 21:40:19 2003
+$OpenBSD: patch-p0f_c,v 1.6 2004/05/03 15:59:36 naddy Exp $
+--- p0f.c.orig	2002-05-13 18:59:40.000000000 +0200
++++ p0f.c	2004-05-03 17:53:51.000000000 +0200
 @@ -397,7 +397,7 @@ void load_fprints(char *filename) {
    char *p;
    //bzero(fips,120000);
diff --git a/security/p0f/pkg/PLIST b/security/p0f/pkg/PLIST
index d46189ef532..d916d2acae4 100644
--- a/security/p0f/pkg/PLIST
+++ b/security/p0f/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/04/14 09:27:52 xsa Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/05/03 15:59:36 naddy Exp $
 bin/p0f
-bin/p0frep
+man/man1/p0f.1
 share/doc/p0f/README
 share/examples/p0f/p0f.fp
 %%mysql%%