diff --git a/x11/wmi/Makefile b/x11/wmi/Makefile
index d3932b552f9..102d58b9161 100644
--- a/x11/wmi/Makefile
+++ b/x11/wmi/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.5 2006/11/13 13:01:38 steven Exp $
+# $OpenBSD: Makefile,v 1.6 2006/11/16 21:09:46 steven Exp $
 
 COMMENT=	"window manager improved - key driven window manager"
 
 DISTNAME=	wmi-10
-PKGNAME=	${DISTNAME}p0
-CATEGORIES=	x11	
+PKGNAME=	${DISTNAME}p1
+CATEGORIES=	x11
 
-HOMEPAGE=	http://wmi.modprobe.de/	
+HOMEPAGE=	http://wmii.suckless.org/
 
 MAINTAINER=	Julian Frede <julian.frede@gmail.com>
 
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		ICE SM X11 Xext Xft Xrender c fontconfig freetype m \
 			stdc++
 
-MASTER_SITES=	${MASTER_SITE_BERLIOS=wmi/}
+MASTER_SITES=	${HOMEPAGE}/download/
 
 # not necessary, but to ensure consistent behaviour
 BUILD_DEPENDS=	:pkgconfig-*:devel/pkgconfig
diff --git a/x11/wmi/patches/patch-configure b/x11/wmi/patches/patch-configure
new file mode 100644
index 00000000000..9c8680d0a8d
--- /dev/null
+++ b/x11/wmi/patches/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Nov 14 13:11:56 2006
++++ configure	Tue Nov 14 13:12:06 2006
+@@ -5922,7 +5922,7 @@
+ test x$x_libraries = "x" && x_libraries="/usr/lib"
+ 
+ CFLAGS=""
+-CXXFLAGS="-Os $CXXFLAGS $X_CFLAGS"
++CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+ LIBS="$LIBS $X_LIBS $X_PRE_LIBS"
+ 
+ # Check for required functions in -lX11