diff --git a/wmii-cairo/DESCR b/wmii-cairo/DESCR
index 8805438621..39d4952909 100644
--- a/wmii-cairo/DESCR
+++ b/wmii-cairo/DESCR
@@ -1,13 +1,15 @@
 Window manager improved 2 (wmii) is an improved, modularized and lightweight
 X11 window manager which supports tabbed, tiled and conventional window
-management. If build with cairo support, it also provides extended rendering
-capabilities like alpha blending and UTF-8 capable anti-aliased font rendering.
+management through layouts. If build with cairo support, it also provides
+anti-aliased font rendering.
 
-Wmii consists of components which are independent processes and communicate
-via a socket-based virtual filesystem, inspired by the filesystem paradigm
-of the plan9 operating system. The core distribution of wmii contains the
-window manager itself, a pager (wmipager), a generic status bar (wmibar), a
-shortcut handler (wmirat), and a generic ex-alike interaction menu (wmiinput)
-beside several tiny utilities like wmir, wmiplumb, wmitw, and wmimulti.
+Wmii consists of components that are independent processes and communicate
+via a socket-based virtual filesystem which is oriented on the "everything is a
+file" paradigm of the plan9 operating system.
+
+The core distribution of wmii contains the window manager itself, a master file
+system routing utility (wmifs), a generic bar (wmibar), a shortcut handler
+(wmikeys), and a generic interaction menu (wmiinput) beside several tiny
+utilities like wmir, wmiplumb, and wmiwarp.
 
 This package is built with cairo support.
diff --git a/wmii-cairo/Makefile b/wmii-cairo/Makefile
index 35073093d9..7b065610c2 100644
--- a/wmii-cairo/Makefile
+++ b/wmii-cairo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/05/31 15:56:30 leonardschmidt Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/02 14:48:45 leonardschmidt Exp $
 #
 
 .include "../../wip/wmii/Makefile.common"
 
-PKGNAME=	${DISTNAME:S/wmii-0/wmii-cairo/}
+PKGNAME=	${DISTNAME:S/wmii/wmii-cairo/}
 
 COMMENT+=	(built with cairo support)
 
diff --git a/wmii-cairo/distinfo b/wmii-cairo/distinfo
index 6376af7c83..a00cc25ca5 100644
--- a/wmii-cairo/distinfo
+++ b/wmii-cairo/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/06/01 10:31:10 leonardschmidt Exp $
+$NetBSD: distinfo,v 1.3 2005/06/02 14:48:45 leonardschmidt Exp $
 
-SHA1 (wmii-0-20050529.tar.bz2) = 8ab028df7aa90de85c2ce92008750fec4ed392b8
-RMD160 (wmii-0-20050529.tar.bz2) = 816a9ba9e916c4896105da7f4efd9705ba3f26da
-Size (wmii-0-20050529.tar.bz2) = 66394 bytes
-SHA1 (patch-aa) = aeda608ae2c275e14ec4c34283a3d7012eefc939
-SHA1 (patch-ab) = 42cabf1ed6e6bea51ee30c505ede34a7e63983b8
+SHA1 (wmii-1.tar.gz) = 4fc0f314a8ca894bac47b5d3506c17382fb66c3e
+RMD160 (wmii-1.tar.gz) = 2c88e3c73e925e0f7f419f245ebee7812d01bdee
+Size (wmii-1.tar.gz) = 87432 bytes
+SHA1 (patch-aa) = c5c4e5bfb8c5d487a8e74f6db7daaaa3afeb6e8e
+SHA1 (patch-ab) = ff74fcc72a604e314c1acef3710c979f140ec716
diff --git a/wmii-cairo/patches/patch-aa b/wmii-cairo/patches/patch-aa
index 432ccc0041..9d8d1c6f89 100644
--- a/wmii-cairo/patches/patch-aa
+++ b/wmii-cairo/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/06/01 10:31:10 leonardschmidt Exp $
+$NetBSD: patch-aa,v 1.3 2005/06/02 14:48:46 leonardschmidt Exp $
 
---- config.mk.orig	2005-05-28 23:39:35.000000000 +0000
+--- config.mk.orig	2005-06-01 22:44:48.000000000 +0000
 +++ config.mk
-@@ -1,23 +1,23 @@
+@@ -1,24 +1,24 @@
  # Customize to fit your system
  
  # paths
@@ -12,6 +12,7 @@ $NetBSD: patch-aa,v 1.2 2005/06/01 10:31:10 leonardschmidt Exp $
 +#PREFIX      = /usr/local
 +CONFPREFIX  = ${PREFIX}/share/examples
 +MANPREFIX   = ${PREFIX}/man
+ SHAREPREFIX = ${PREFIX}/share
  
  INCDIR      = ${PREFIX}/include
  LIBDIR      = ${PREFIX}/lib
@@ -35,7 +36,7 @@ $NetBSD: patch-aa,v 1.2 2005/06/01 10:31:10 leonardschmidt Exp $
  
  # str{l,n}{cat,cpy} support, if you have OpenBSD you can use strl*
  STRLCPY     = strncpy
-@@ -26,25 +26,25 @@ STRLFLAGS   = -DSTRLCPY=${STRLCPY} -DSTR
+@@ -27,25 +27,25 @@ STRLFLAGS   = -DSTRLCPY=${STRLCPY} -DSTR
  
  # compiler
  # Note: under Solaris add -D__EXTENSIONS__ to CFLAGS
diff --git a/wmii-cairo/patches/patch-ab b/wmii-cairo/patches/patch-ab
index 02f8511225..6051789feb 100644
--- a/wmii-cairo/patches/patch-ab
+++ b/wmii-cairo/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/05/31 12:53:29 leonardschmidt Exp $
+$NetBSD: patch-ab,v 1.2 2005/06/02 14:48:46 leonardschmidt Exp $
 
---- Makefile.orig	2005-05-28 23:39:35.000000000 +0000
+--- Makefile.orig	2005-06-01 22:44:48.000000000 +0000
 +++ Makefile
-@@ -41,7 +41,7 @@ RM_BIN      = wmii wmibar wmiinput wmir 
+@@ -44,7 +44,7 @@ RM_BIN      = wmii wmibar wmiinput wmir 
                wmiplumb wmiwarp
  
  RC          = rc/actions rc/bar rc/input rc/keys rc/rc.conf \
@@ -11,19 +11,24 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/05/31 12:53:29 leonardschmidt Exp $
  RM_RC       = actions bar input keys rc rc.conf status.sh \
                wmii
  
-@@ -105,20 +105,16 @@ version:
+@@ -114,26 +114,21 @@ version:
  install: all
  	@echo -------------------------------------------------------
  	@echo Installing configuration files to ${DESTDIR}${CONFPREFIX}/wmii
 -	@${MKDIR} -p ${DESTDIR}${CONFPREFIX}/wmii
 -	@${INSTDATA} ${RC} ${DESTDIR}${CONFPREFIX}/wmii
--	@${SED} 's|CONFPREFIX|${CONFPREFIX}|' < rc/rc > ${DESTDIR}${CONFPREFIX}/wmii/rc
+-	@${SED} 's|CONFPREFIX|${CONFPREFIX}|;s|SHAREPREFIX|${SHAREPREFIX}|' < rc/rc > ${DESTDIR}${CONFPREFIX}/wmii/rc
 -	@${MODBIN} ${DESTDIR}${CONFPREFIX}/wmii/rc
 -	@${MODBIN} ${DESTDIR}${CONFPREFIX}/wmii/status.sh
 +	@${BSD_INSTALL_DATA_DIR} ${DESTDIR}${CONFPREFIX}/wmii
 +	@${BSD_INSTALL_DATA} ${RC} ${DESTDIR}${CONFPREFIX}/wmii
++	@${BSD_INSTALL_SCRIPT} rc/status.sh ${DESTDIR}${CONFPREFIX}/wmii
 +	@${BSD_INSTALL_SCRIPT} rc/rc ${DESTDIR}${CONFPREFIX}/wmii
-+	@${BSD_INSTALL_SCRIPT} rc/status.sh ${DESTIDR}${CONFPREFIX}/wmii
+ 	@echo Installing docs to ${DESTDIR}${SHAREPREFIX}/wmii
+-	@${MKDIR} -p ${DESTDIR}${SHAREPREFIX}/wmii
+-	@${INSTDATA} ${SHARE} ${DESTDIR}${SHAREPREFIX}/wmii
++	@${BSD_INSTALL_DATA_DIR} ${DESTDIR}${SHAREPREFIX}/wmii
++	@${BSD_INSTALL_DATA} ${SHARE} ${DESTIDR}${SHAREPREFIX}/wmii
  	@echo Installing executable files to ${DESTDIR}${PREFIX}/bin
 -	@${MKDIR} -p ${DESTDIR}${PREFIX}/bin
 -	@${INSTBIN} ${BIN} ${DESTDIR}${PREFIX}/bin
@@ -35,8 +40,13 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/05/31 12:53:29 leonardschmidt Exp $
 -	@${MODDATA} ${DESTDIR}${MANPREFIX}/man1/wmii.1
 -	@${MODDATA} ${DESTDIR}${MANPREFIX}/man1/wmir.1
 -	@${MODDATA} ${DESTDIR}${MANPREFIX}/man1/wmibar.1
+-	@${MKDIR} -p ${DESTDIR}${MANPREFIX}/man5
+-	@${INSTDATA} ${MAN5} ${DESTDIR}${MANPREFIX}/man5
+-	@${MODDATA} ${DESTDIR}${MANPREFIX}/man5/wmii.rc.5
 +	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MAN1} ${DESTDIR}${MANPREFIX}/man1
- #	@${MKDIR} -p ${DESTDIR}${MANPREFIX}/man5
- #	@${INSTDATA} ${MAN5} ${DESTDIR}${MANPREFIX}/man5
- #	@${MODDATA} ${DESTDIR}${MANPREFIX}/man5/wmii.rc.5
++	@${BSD_INSTALL_MAN} ${MAN1} ${DESTIDR}${MANPREFIX}/man1
++	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man5
++	@${BSD_INSTALL_MAN} ${MAN5} ${DESTDIR}${MANPREFIX}/man5
+ 	@echo "wmii successfully installed"
+ 
+ uninstall: