diff --git a/security/logsurfer/Makefile b/security/logsurfer/Makefile
index f54d27041a4..312775cd709 100644
--- a/security/logsurfer/Makefile
+++ b/security/logsurfer/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2009/07/24 21:40:15 jakob Exp $
+# $OpenBSD: Makefile,v 1.19 2009/11/27 21:30:38 jakob Exp $
 
 COMMENT=	processes logfiles and perform certain actions
 
-DISTNAME=	logsurfer-1.5b
-PKGNAME=	${DISTNAME}p1
+VERSION=	1.7
+DISTNAME=	logsurfer+-${VERSION}
+PKGNAME=	logsurfer-${VERSION}
 CATEGORIES=	security
-EXTRACT_SUFX=	.tar
 
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
 
@@ -15,8 +15,10 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c
 
-MASTER_SITES=	ftp://ftp.cert.dfn.de/pub/tools/audit/logsurfer/ \
-		ftp://ftp.tuwien.ac.at/infosys/security/dfn/tools/audit/logsurfer/
+HOMEPAGE=	http://www.crypt.gen.nz/logsurfer/
+
+MASTER_SITES=	http://kerryt.orcon.net.nz/ \
+		http://www.crypt.gen.nz/logsurfer/
 
 CONFIGURE_STYLE=	gnu
 
diff --git a/security/logsurfer/distinfo b/security/logsurfer/distinfo
index 87e51061522..36a5f99780a 100644
--- a/security/logsurfer/distinfo
+++ b/security/logsurfer/distinfo
@@ -1,5 +1,5 @@
-MD5 (logsurfer-1.5b.tar) = red77XvDxz/SYDnmnEk39A==
-RMD160 (logsurfer-1.5b.tar) = u6JZYs4aJPQU797qS5bUlLWakmE=
-SHA1 (logsurfer-1.5b.tar) = ZVTS7HTof2C5ROsF4f5Hi345F4g=
-SHA256 (logsurfer-1.5b.tar) = 14MowxeeRQDsxVNXEuKYz0Iqy4zFycZXtSny+7G4tZY=
-SIZE (logsurfer-1.5b.tar) = 703488
+MD5 (logsurfer+-1.7.tar.gz) = 81Nq9b1hLd6YgPcBghP5vQ==
+RMD160 (logsurfer+-1.7.tar.gz) = rWhlHVuH4LunaHHNXzDtlNhhUTs=
+SHA1 (logsurfer+-1.7.tar.gz) = n+myNWw0/mkaiwxmUU2Mvjw7M/o=
+SHA256 (logsurfer+-1.7.tar.gz) = sMznMR9kE6GpA6LUklBR7miogqfrCT9B8bfXvXvUQqA=
+SIZE (logsurfer+-1.7.tar.gz) = 198289
diff --git a/security/logsurfer/patches/patch-Makefile.in b/security/logsurfer/patches/patch-Makefile.in
index ed17b82fa86..579d3f2f63d 100644
--- a/security/logsurfer/patches/patch-Makefile.in
+++ b/security/logsurfer/patches/patch-Makefile.in
@@ -1,7 +1,7 @@
-$Id: patch-Makefile.in,v 1.2 2002/08/02 17:34:30 jakob Exp $
---- Makefile.in.orig	Fri Dec  1 12:50:33 2000
-+++ Makefile.in	Fri Aug  2 19:30:42 2002
-@@ -8,12 +8,12 @@ version = 1.5a
+$Id: patch-Makefile.in,v 1.3 2009/11/27 21:30:38 jakob Exp $
+--- Makefile.in.orig	Mon Sep 30 15:26:38 2002
++++ Makefile.in	Fri Nov 27 22:18:53 2009
+@@ -8,12 +8,12 @@ version = 1.5b
  
  # Where is the default configuration file
  #
diff --git a/security/logsurfer/patches/patch-src_logsurfer_c b/security/logsurfer/patches/patch-src_logsurfer_c
index f4b79a66eb2..94f938ba877 100644
--- a/security/logsurfer/patches/patch-src_logsurfer_c
+++ b/security/logsurfer/patches/patch-src_logsurfer_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_logsurfer_c,v 1.1 2006/02/15 06:34:04 sturm Exp $
---- src/logsurfer.c.orig	Mon Feb 13 21:07:38 2006
-+++ src/logsurfer.c	Mon Feb 13 21:07:58 2006
-@@ -384,7 +384,7 @@ main(argc, argv)
+$OpenBSD: patch-src_logsurfer_c,v 1.2 2009/11/27 21:30:38 jakob Exp $
+--- src/logsurfer.c.orig	Thu Dec 23 23:22:28 2004
++++ src/logsurfer.c	Fri Nov 27 22:18:53 2009
+@@ -387,7 +387,7 @@ main(argc, argv)
  	 */
  	logline_buffer_size=4096;
  	logline_buffer_pos=0;
diff --git a/security/logsurfer/pkg/PLIST b/security/logsurfer/pkg/PLIST
index 4ffc44d03a8..0558c1edb7f 100644
--- a/security/logsurfer/pkg/PLIST
+++ b/security/logsurfer/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:36:00 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2009/11/27 21:30:38 jakob Exp $
 @man man/man1/logsurfer.1
 @man man/man4/logsurfer.conf.4
-sbin/logsurfer
+@bin sbin/logsurfer