diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index a83a7c0bff4..c07e49a7968 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.73 2007/09/15 20:04:25 merdely Exp $
+# $OpenBSD: Makefile,v 1.74 2009/02/15 20:12:17 wilfried Exp $
 
 COMMENT-main=		window manager that emulates NEXTSTEP(tm)
 COMMENT-lang=		language subpackage for Window Maker
 
 V=			0.92.0
 DISTNAME=		WindowMaker-${V}
-PKGNAME-main=		${DISTNAME:L}p7
+PKGNAME-main=		${DISTNAME:L}p8
 FULLPKGNAME-lang=       windowmaker-lang-${V}p1
 SHARED_LIBS=		wraster 5.0
 CATEGORIES=		x11 x11/windowmaker
diff --git a/x11/windowmaker/patches/patch-util_Makefile_in b/x11/windowmaker/patches/patch-util_Makefile_in
deleted file mode 100644
index ba91498b3de..00000000000
--- a/x11/windowmaker/patches/patch-util_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-util_Makefile_in,v 1.5 2005/11/01 17:28:34 wilfried Exp $
---- util/Makefile.in.orig	Sun Jun 19 05:23:00 2005
-+++ util/Makefile.in	Mon Oct 31 18:34:43 2005
-@@ -515,6 +515,7 @@ wmaker.inst: $(srcdir)/wmaker.inst.in ./
- 	-rm -f wmaker.inst
- 	sed -e "s|#pkgdatadir#|$(pkgdatadir)|" \
- 		-e "s|#sysconfdir#|$(sysconfdir)/WindowMaker|" \
-+		-e "s|#wpref#|$(wprefsdir)|" \
- 		-e "s|#version#|$(VERSION)|" \
- 		-e "s|#bindir#|$(bindir)|" \
- 		-e "s|#LITE#|@LITE@|" \
diff --git a/x11/windowmaker/patches/patch-util_wmaker_inst_in b/x11/windowmaker/patches/patch-util_wmaker_inst_in
index 7c997c9c811..ead2cb56a51 100644
--- a/x11/windowmaker/patches/patch-util_wmaker_inst_in
+++ b/x11/windowmaker/patches/patch-util_wmaker_inst_in
@@ -1,11 +1,11 @@
-$OpenBSD: patch-util_wmaker_inst_in,v 1.4 2001/10/24 13:54:38 wilfried Exp $
---- util/wmaker.inst.in.orig	Wed Sep  5 13:55:18 2001
-+++ util/wmaker.inst.in	Wed Oct 24 11:20:19 2001
+$OpenBSD: patch-util_wmaker_inst_in,v 1.5 2009/02/15 20:12:17 wilfried Exp $
+--- util/wmaker.inst.in.orig	Fri Apr  8 13:24:14 2005
++++ util/wmaker.inst.in	Sun Feb 15 20:31:10 2009
 @@ -22,6 +22,7 @@ fi
  # directory where system wide configuration is stored
  GLOBALDIR="#pkgdatadir#"
  GLOBALDEFDIR="#sysconfdir#"
-+WPREFSDIR="#wpref#"
++WPREFSDIR="#bindir#"
  
  USERDIR=$HOME