diff --git a/security/logsurfer/Makefile b/security/logsurfer/Makefile
index bf8d1f98ede..beb51229312 100644
--- a/security/logsurfer/Makefile
+++ b/security/logsurfer/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.20 2010/10/18 21:41:45 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2012/08/25 10:07:25 sthen Exp $
 
 COMMENT=	processes logfiles and perform certain actions
 
-VERSION=	1.7
-DISTNAME=	logsurfer+-${VERSION}
-PKGNAME=	logsurfer-${VERSION}
+DISTNAME=	logsurfer-1.8
 CATEGORIES=	security
 
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
@@ -22,7 +20,6 @@ MASTER_SITES=	http://kerryt.orcon.net.nz/ \
 
 CONFIGURE_STYLE=	gnu
 
-USE_GROFF =	Yes
 NO_REGRESS=	Yes
 
 NOT_FOR_ARCHS=	${LP64_ARCHS}
diff --git a/security/logsurfer/distinfo b/security/logsurfer/distinfo
index 36a5f99780a..3a7f8e531a9 100644
--- a/security/logsurfer/distinfo
+++ b/security/logsurfer/distinfo
@@ -1,5 +1,2 @@
-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
+SHA256 (logsurfer-1.8.tar.gz) = dKNuhTCohAMbSuI0Ska5qqB6HuNtFDgC9rZPgXxb0a8=
+SIZE (logsurfer-1.8.tar.gz) = 197507
diff --git a/security/logsurfer/patches/patch-Makefile_in b/security/logsurfer/patches/patch-Makefile_in
index a8362a61a34..215fd8fc742 100644
--- a/security/logsurfer/patches/patch-Makefile_in
+++ b/security/logsurfer/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2010/12/03 08:46:03 jasper Exp $
---- Makefile.in.orig	Mon Sep 30 15:26:38 2002
-+++ Makefile.in	Fri Dec  3 09:44:45 2010
-@@ -8,12 +8,12 @@ version = 1.5b
+$OpenBSD: patch-Makefile_in,v 1.2 2012/08/25 10:07:26 sthen Exp $
+--- Makefile.in.orig	Thu Aug 11 04:15:31 2011
++++ Makefile.in	Thu Aug 23 10:50:52 2012
+@@ -8,12 +8,12 @@ version = 1.8
  
  # 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 94f938ba877..9baaa31f130 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.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)
+$OpenBSD: patch-src_logsurfer_c,v 1.3 2012/08/25 10:07:26 sthen Exp $
+--- src/logsurfer.c.orig	Mon Sep  5 10:35:08 2011
++++ src/logsurfer.c	Thu Aug 23 10:50:53 2012
+@@ -458,7 +458,7 @@ main(argc, argv)
  	 */
  	logline_buffer_size=4096;
  	logline_buffer_pos=0;