diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 56edb9683c2..282f44ab6ff 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -1,25 +1,26 @@
-# $OpenBSD: Makefile,v 1.9 2008/03/31 06:54:13 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2008/12/08 08:35:46 sthen Exp $
 
 COMMENT=		Squid Analysis Report Generator
 
 DISTNAME=		sarg-2.2.5
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		www
 
 HOMEPAGE=	 	http://sarg.sourceforge.net/
 
 MAINTAINER=		Douglas Santos <dsantos@hydroxyl.org>
 
-# GPL
-PERMIT_PACKAGE_CDROM=	Yes 
+# GPLv2+
+PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=   	${MASTER_SITE_SOURCEFORGE:=sarg/}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sarg/}
 
 WANTLIB=		c
 
-CONFIGURE_STYLE=  	gnu
+CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--enable-bindir=${LOCALBASE}/bin \
 			--enable-sysconfdir=${SYSCONFDIR}/sarg \
 			--enable-htmldir=/var/www/htdocs/sarg \
@@ -30,7 +31,7 @@ EXAMPLESDIR=		${PREFIX}/share/examples/sarg
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/cfgaux
 
 post-extract:
-	@chmod 755 ${WRKSRC}/sarg-php/locale	
+	@chmod 755 ${WRKSRC}/sarg-php/locale
 
 post-build:
 	@perl -pi -e \
@@ -51,7 +52,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/exclude_codes ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/images/* ${EXAMPLESDIR}/images/
 	${INSTALL_DATA} ${WRKSRC}/sarg.conf ${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/fonts/FreeSans.ttf ${EXAMPLESDIR}/fonts/ 
+	${INSTALL_DATA} ${WRKSRC}/fonts/FreeSans.ttf ${EXAMPLESDIR}/fonts/
 	${INSTALL_DATA} ${WRKSRC}/languages/* ${EXAMPLESDIR}/languages/
 	${INSTALL_DATA} ${WRKSRC}/sarg-php/*php ${EXAMPLESDIR}/sarg-php/
 	cp -R ${WRKSRC}/sarg-php/locale ${EXAMPLESDIR}/sarg-php/
diff --git a/www/sarg/patches/patch-include_conf_h b/www/sarg/patches/patch-include_conf_h
new file mode 100644
index 00000000000..edb16fd2c14
--- /dev/null
+++ b/www/sarg/patches/patch-include_conf_h
@@ -0,0 +1,22 @@
+$OpenBSD: patch-include_conf_h,v 1.1 2008/12/08 08:35:46 sthen Exp $
+--- include/conf.h.orig	Tue Dec  2 13:48:59 2008
++++ include/conf.h	Tue Dec  2 14:46:38 2008
+@@ -86,7 +86,17 @@ gdPoint points[4];
+ 
+ 
+ #define MAXLEN 20000
+-long long int my_atoll (const char *nptr);
++/* from util.c */
++char *getword2(char *, char *, int);
++long long int my_atoll (const char *);
++char *fixnum(long long int, int );
++char *fixnum2(long long int, int);
++char *buildtime(long long int);
++char *fixtime(long int);
++char *strup(char *);
++char *subs(char *, char *, char *);
++char *strlow(char *);
++
+ 
+ FILE *fp_tt; 
+ 
diff --git a/www/sarg/patches/patch-topsites_c b/www/sarg/patches/patch-topsites_c
new file mode 100644
index 00000000000..32305e5f7af
--- /dev/null
+++ b/www/sarg/patches/patch-topsites_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-topsites_c,v 1.1 2008/12/08 08:35:46 sthen Exp $
+--- topsites.c.orig	Tue Dec  2 14:58:52 2008
++++ topsites.c	Tue Dec  2 14:59:05 2008
+@@ -216,7 +216,7 @@ void topsites()
+ 
+       sprintf(wwork1,"%s",fixnum(twork1,1));
+       sprintf(wwork2,"%s",fixnum(twork2,1));
+-      sprintf(wwork3,"%s",fixtime(twork3,1));
++      sprintf(wwork3,"%s",fixtime(twork3));
+ 
+       if(strlen(BlockIt) > 0)
+          sprintf(BlockImage,"<a href=\"%s%s?url=%s\"><img src=\"../images/sarg-squidguard-block.png\" border=\"0\"></a>&nbsp;",wwwDocumentRoot,BlockIt,url);
diff --git a/www/sarg/pkg/PLIST b/www/sarg/pkg/PLIST
index dafcca14f2b..6c10230e713 100644
--- a/www/sarg/pkg/PLIST
+++ b/www/sarg/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2007/05/16 15:59:23 aanriot Exp $
-bin/sarg
+@comment $OpenBSD: PLIST,v 1.4 2008/12/08 08:35:46 sthen Exp $
+@bin bin/sarg
 @man man/man1/sarg.1
 share/examples/sarg/
 @sample ${SYSCONFDIR}/sarg/