diff -ruN x11-wm/wmii.orig/Makefile x11-wm/wmii/Makefile
--- x11-wm/wmii.orig/Makefile	Fri Jun  3 07:06:55 2005
+++ x11-wm/wmii/Makefile	Mon Aug  1 22:35:25 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmii
-DISTVERSION=	1
+DISTVERSION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://wmi.modprobe.de/download/
 
@@ -23,8 +23,7 @@
 OPTIONS=	CAIRO	"Enable Cairo rendering backend"	off \
 		STRL	"Use strlcpy()/strlcat() functions"	off
 
-MAN1=		wmibar.1 wmifs.1 wmii.1 wmiinput.1 wmikeys.1 wmiplumb.1 \
-		wmir.1 wmiwarp.1
+MAN1=		wmibar.1 wmifs.1 wmii.1 wmikeys.1 wmir.1 wmimenu.1
 MAN5=		wmii.rc.5
 
 .include <bsd.port.pre.mk>
diff -ruN x11-wm/wmii.orig/distinfo x11-wm/wmii/distinfo
--- x11-wm/wmii.orig/distinfo	Thu Jun  2 06:27:59 2005
+++ x11-wm/wmii/distinfo	Mon Aug  1 21:54:43 2005
@@ -1,2 +1,2 @@
-MD5 (wmii-1.tar.bz2) = 160f0f59138df262a9ea9764dfa5655e
-SIZE (wmii-1.tar.bz2) = 71003
+MD5 (wmii-2.tar.bz2) = de5e7838d76c4d52d49a223c6ecf4243
+SIZE (wmii-2.tar.bz2) = 67004
diff -ruN x11-wm/wmii.orig/pkg-plist x11-wm/wmii/pkg-plist
--- x11-wm/wmii.orig/pkg-plist	Thu Jun  2 06:27:59 2005
+++ x11-wm/wmii/pkg-plist	Mon Aug  1 22:48:32 2005
@@ -1,19 +1,66 @@
 bin/wmibar
 bin/wmifs
 bin/wmii
-bin/wmiinput
+bin/wmiiwm
 bin/wmikeys
+bin/wmimenu
 bin/wmiplumb
 bin/wmir
+bin/wmira
+bin/wmirefcard
 bin/wmiwarp
-etc/wmii/actions
+etc/wmii/action/actions
+etc/wmii/action/attach
+etc/wmii/action/border
+etc/wmii/action/clientupdate
+etc/wmii/action/close
+etc/wmii/action/cnext
+etc/wmii/action/cprev
+etc/wmii/action/detach
+etc/wmii/action/fnext
+etc/wmii/action/fprev
+etc/wmii/action/fresize
+etc/wmii/action/ftoggle
+etc/wmii/action/icons
+etc/wmii/action/kbare
+etc/wmii/action/kmove
+etc/wmii/action/knorm
+etc/wmii/action/kresize
+etc/wmii/action/lfloat
+etc/wmii/action/lgrid
+etc/wmii/action/lmax
+etc/wmii/action/lock
+etc/wmii/action/ltiled
+etc/wmii/action/lvsplit
+etc/wmii/action/max
+etc/wmii/action/mouse
+etc/wmii/action/p
+etc/wmii/action/pager
+etc/wmii/action/pageupdate
+etc/wmii/action/plumbgoogle
+etc/wmii/action/plumburl
+etc/wmii/action/pnew
+etc/wmii/action/pnext
+etc/wmii/action/pprev
+etc/wmii/action/premove
+etc/wmii/action/presize
+etc/wmii/action/programs
+etc/wmii/action/ptoggle
+etc/wmii/action/quit
+etc/wmii/action/scr
+etc/wmii/action/tab
+etc/wmii/action/term
+etc/wmii/action/www
+etc/wmii/action/zoom
 etc/wmii/bar
-etc/wmii/input
 etc/wmii/keys
+etc/wmii/menu
 etc/wmii/rc
 etc/wmii/rc.conf
 etc/wmii/status.sh
-etc/wmii/wmii
+etc/wmii/wm
+share/wmii/welcome.txt
+@dirrm share/wmii
+@dirrm share/pixmaps
+@dirrm etc/wmii/action
 @dirrm etc/wmii
-%%DATADIR%%/welcome.txt
-@dirrm %%DATADIR%%