diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 37d37dc8ce2..8d3d6748a55 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.14 2008/02/10 15:59:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2008/03/15 10:16:30 ajacoutot Exp $
 
 COMMENT=	secure webserver
 
-DISTNAME=	hiawatha-6.4
+DISTNAME=	hiawatha-6.5
 CATEGORIES=	www net
 
 HOMEPAGE=	http://hiawatha.leisink.org
 
 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo
index 1e03c9fc8dc..a81d5b3167a 100644
--- a/www/hiawatha/distinfo
+++ b/www/hiawatha/distinfo
@@ -1,5 +1,5 @@
-MD5 (hiawatha-6.4.tar.gz) = QVfs3RPTn2RTUaPVsgNrPw==
-RMD160 (hiawatha-6.4.tar.gz) = WXdPT8g8lpr4gOUDNxcyyxFOtWQ=
-SHA1 (hiawatha-6.4.tar.gz) = i/VBhnRhJWA8dRmnw5mD4xElTIo=
-SHA256 (hiawatha-6.4.tar.gz) = x2YQY47IKEPqb9QJgmch2h0+WjEm/sMbNwj8xorcPus=
-SIZE (hiawatha-6.4.tar.gz) = 232935
+MD5 (hiawatha-6.5.tar.gz) = zT1xu0vr1S/IHjgXk3J4/A==
+RMD160 (hiawatha-6.5.tar.gz) = GLCoKuFSO/OIL0xXvzd5toMzL84=
+SHA1 (hiawatha-6.5.tar.gz) = AGdVJyEx8okFLVibMxA20T0/uw0=
+SHA256 (hiawatha-6.5.tar.gz) = YZsEcgUbE7d4LAIWpyj8wqsLebnXYNeW+NtPu4Q+fR0=
+SIZE (hiawatha-6.5.tar.gz) = 233283
diff --git a/www/hiawatha/patches/patch-etc_hiawatha_cgi-wrapper_conf b/www/hiawatha/patches/patch-etc_hiawatha_cgi-wrapper_conf
index 01959512645..e0b11b8cf3e 100644
--- a/www/hiawatha/patches/patch-etc_hiawatha_cgi-wrapper_conf
+++ b/www/hiawatha/patches/patch-etc_hiawatha_cgi-wrapper_conf
@@ -1,9 +1,9 @@
-$OpenBSD: patch-etc_hiawatha_cgi-wrapper_conf,v 1.2 2007/10/26 22:42:16 ajacoutot Exp $
---- etc/hiawatha/cgi-wrapper.conf.orig	Wed Oct 24 09:55:43 2007
-+++ etc/hiawatha/cgi-wrapper.conf	Sat Oct 27 00:26:02 2007
+$OpenBSD: patch-etc_hiawatha_cgi-wrapper_conf,v 1.3 2008/03/15 10:16:30 ajacoutot Exp $
+--- etc/hiawatha/cgi-wrapper.conf.orig	Wed Feb 13 09:27:41 2008
++++ etc/hiawatha/cgi-wrapper.conf	Sat Mar  8 21:22:31 2008
 @@ -4,9 +4,9 @@
  
- # CGIhandler = /path/to/cgi_handler
+ # CGIhandler = /path/to/cgi-handler
  #
 -#CGIhandler = /usr/bin/php-cgi
 +#CGIhandler = !!LOCALBASE!!/bin/php