diff -urN --exclude CVS /ports/x11-wm/pekwm/Makefile x11-wm/pekwm/Makefile
--- /ports/x11-wm/pekwm/Makefile	2008-05-16 16:21:06.000000000 +0200
+++ x11-wm/pekwm/Makefile	2008-08-06 23:59:52.000000000 +0200
@@ -6,32 +6,32 @@
 #
 
 PORTNAME=	pekwm
-PORTVERSION=	0.1.6
+PORTVERSION=	0.1.7
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.carpetsmoker.net/distfiles/ \
+MASTER_SITES=	http://pekwm.org/projects/3/files/ \
+		http://www.carpetsmoker.net/distfiles/ \
 		http://www.xs4all.nl/~tournoij/distfiles/ \
 		http://www.rwxrwxrwx.net/distfiles/
 
-MAINTAINER=	carpetsmoker@xs4all.nl
-COMMENT=	A windowmanager based on aewm++
+MAINTAINER=	carpetsmoker@rwxrwxrwx.net
+COMMENT=	Light, Unobtrusive, and configurable windowmanager
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_XORG=	xft xpm x11
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--enable-shape --enable-xinerama --enable-xrandr \
-		--enable-xft --disable-pcre --enable-image-xpm \
-		--enable-image-jpeg --enable-image-png --disable-debug \
+		--enable-xft --enable-image-xpm --enable-image-jpeg \
+		--enable-image-png --disable-debug \
 		--disable-pedantic --enable-menus --enable-harbour
+CFLAGS+=	-DICONV_CONST
 MAN1=		pekwm.1
 MANCOMPRESSED=	no
 
-post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/pekwm
+post-configure:
+	@${REINPLACE_CMD} 's|-lXin|-liconv -lXin|' ${WRKSRC}/src/Makefile
 
 .include <bsd.port.mk>
diff -urN --exclude CVS /ports/x11-wm/pekwm/distinfo x11-wm/pekwm/distinfo
--- /ports/x11-wm/pekwm/distinfo	2008-05-16 16:21:06.000000000 +0200
+++ x11-wm/pekwm/distinfo	2008-08-06 23:22:44.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (pekwm-0.1.6.tar.bz2) = 551358cbe15cfe7be3a7f614c49c1d00
-SHA256 (pekwm-0.1.6.tar.bz2) = 2cf2f3a59c83273c022419d50e627b9e8f1f629cad89c1c91dffe7a4bc1b4c44
-SIZE (pekwm-0.1.6.tar.bz2) = 275703
+MD5 (pekwm-0.1.7.tar.bz2) = 30acfa41a5005a9f31117041ec32eb0d
+SHA256 (pekwm-0.1.7.tar.bz2) = 2216eb0c722f4aad15761a7f4eced67ea1284a00e32e03d66de4b55f8c1c9524
+SIZE (pekwm-0.1.7.tar.bz2) = 363788
diff -urN --exclude CVS /ports/x11-wm/pekwm/files/patch-aa x11-wm/pekwm/files/patch-aa
--- /ports/x11-wm/pekwm/files/patch-aa	2005-03-14 14:58:32.000000000 +0100
+++ x11-wm/pekwm/files/patch-aa	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- data/scripts/pekwm_themeset.pl.orig	Sun Feb 27 14:52:08 2005
-+++ data/scripts/pekwm_themeset.pl	Sun Mar 13 16:38:13 2005
-@@ -51,7 +51,7 @@
- 	close $fh
- 		or die "Failed to write $cfg_file successfully: $!\n";
- 
--	system 'pkill', -HUP => 'pekwm'; # tell pekwm to reread its config
-+	system("killall -HUP pekwm"); # tell pekwm to reread its config
- }
- 
- if( @ARGV == 1 ) {
diff -urN --exclude CVS /ports/x11-wm/pekwm/files/patch-ab x11-wm/pekwm/files/patch-ab
--- /ports/x11-wm/pekwm/files/patch-ab	2005-02-11 15:36:41.000000000 +0100
+++ x11-wm/pekwm/files/patch-ab	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- data/scripts/pekwm_themeset.sh.orig	Tue Jan 13 06:42:34 2004
-+++ data/scripts/pekwm_themeset.sh	Tue Dec 21 06:27:44 2004
-@@ -44,7 +44,7 @@
- 		sed -e "s/Theme\ =\ \".*\"/Theme\ =\ \"$THEME\"/" $PEKWM_CONFIG_FILE > $TMPFILE;
- 		cp $TMPFILE $PEKWM_CONFIG_FILE;
- 		rm $TMPFILE
--		pkill -HUP pekwm;
-+		killall -HUP pekwm;
- fi;
- 
- exit 0
diff -urN --exclude CVS /ports/x11-wm/pekwm/pkg-descr x11-wm/pekwm/pkg-descr
--- /ports/x11-wm/pekwm/pkg-descr	2008-05-16 16:21:06.000000000 +0200
+++ x11-wm/pekwm/pkg-descr	2008-05-16 17:51:11.000000000 +0200
@@ -11,4 +11,4 @@
   they should when starting applications. 
 o Chainable Keygrabber, usability for everyone.
 
-WWW: https://projects.pekdon.net/projects/3
+WWW: http://pekwm.org/
diff -urN --exclude CVS /ports/x11-wm/pekwm/pkg-plist x11-wm/pekwm/pkg-plist
--- /ports/x11-wm/pekwm/pkg-plist	2006-04-28 23:30:24.000000000 +0200
+++ x11-wm/pekwm/pkg-plist	2008-08-06 23:48:45.000000000 +0200
@@ -1,17 +1,16 @@
 bin/pekwm
-etc/pekwm/autoproperties
-etc/pekwm/config
-etc/pekwm/keys
-etc/pekwm/menu
-etc/pekwm/mouse
-etc/pekwm/start
-etc/pekwm/vars
-%%DATADIR%%/scripts/pekwm_themeset.pl
-%%DATADIR%%/scripts/pekwm_themeset.sh
-%%DATADIR%%/scripts/pekwm_ws_menu.pl
+%%ETCDIR%%/autoproperties
+%%ETCDIR%%/config
+%%ETCDIR%%/keys
+%%ETCDIR%%/menu
+%%ETCDIR%%/mouse
+%%ETCDIR%%/start
+%%ETCDIR%%/vars
 %%DATADIR%%/themes/default/theme
+%%DATADIR%%/scripts/pekwm_ws_menu.sh
+%%DATADIR%%/scripts/pekwm_themeset.sh
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/themes/default
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
-@dirrm etc/pekwm
+@dirrm %%ETCDIR%%