diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index de7b60dd48e8..2cd927d6973e 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	hiawatha
-PORTVERSION=	9.5
+PORTVERSION=	9.6
 CATEGORIES=	www
-MASTER_SITES=	http://www.hiawatha-webserver.org/files/ \
-		SF/fbsdports/hiawatha/
+MASTER_SITES=	SF/fbsdports/hiawatha/ \
+		http://www.hiawatha-webserver.org/files/:monitor
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	chris@bsdjunk.com
 COMMENT=	Advanced and secure webserver for Unix
diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo
index 877df40b8015..42adb4f0b211 100644
--- a/www/hiawatha/distinfo
+++ b/www/hiawatha/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hiawatha-9.5.tar.gz) = c181011db1af187006190fc186689a0707a6f1e7b524c2a4347840e8fdf68b4f
-SIZE (hiawatha-9.5.tar.gz) = 847545
+SHA256 (hiawatha-9.6.tar.gz) = 13132fdb322a8d222f7fa25fa19b5485fcdf7a9568fbe4a52c99905571a75a45
+SIZE (hiawatha-9.6.tar.gz) = 862173
diff --git a/www/hiawatha/pkg-plist b/www/hiawatha/pkg-plist
index 1fa7321a5bbd..644ebd687b45 100644
--- a/www/hiawatha/pkg-plist
+++ b/www/hiawatha/pkg-plist
@@ -9,7 +9,7 @@ sbin/cgi-wrapper
 sbin/hiawatha
 sbin/wigwam
 lib/hiawatha/libpolarssl.so
-lib/hiawatha/libpolarssl.so.1.3.6
+lib/hiawatha/libpolarssl.so.1.3.7
 lib/hiawatha/libpolarssl.so.6
 man/man1/cgi-wrapper.1.gz
 man/man1/hiawatha.1.gz
@@ -22,5 +22,6 @@ man/man1/wigwam.1.gz
 @dirrmtry var
 @dirrmtry lib/hiawatha
 @dirrmtry %%ETCDIR%%
+@unexec rmdir "/var/log/hiawatha" >/dev/null 2>&1 || :
 @exec if [ ! -d /var/log/hiawatha ] ; then mkdir /var/log/hiawatha ; fi
 @unexec t=`/bin/ls /var/log/hiawatha`; if [ -z "$t" ]; then %%ECHO_MSG%% "===>    Log directory is empty, removing it."; rmdir /var/log/hiawatha; fi;