diff --git a/x11/fluxbox/Makefile b/x11/fluxbox/Makefile
index d71036a9931..8633ecf3de9 100644
--- a/x11/fluxbox/Makefile
+++ b/x11/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2003/08/25 17:15:56 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2003/08/26 19:46:09 naddy Exp $
 
 COMMENT=	"window manager based on the original Blackbox code"
 
@@ -14,7 +14,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 
 HOMEPAGE=		http://fluxbox.org/
 
-MAINTAINER=		Han Boetes <han@mijncomputer.nl>
+MAINTAINER=		Han Boetes <han@linux-mandrake.com>
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -31,5 +31,7 @@ MODGCC3_LANGS+=		c++
 USE_X11=		Yes
 SUBST_VARS=		VERSION
 
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/menu ${PREFIX}/share/fluxbox
 
 .include <bsd.port.mk>
diff --git a/x11/fluxbox/files/menu b/x11/fluxbox/files/menu
new file mode 100644
index 00000000000..e62c93401ae
--- /dev/null
+++ b/x11/fluxbox/files/menu
@@ -0,0 +1,8 @@
+# $OpenBSD: menu,v 1.1 2003/08/26 19:46:09 naddy Exp $
+[begin] (Fluxbox)
+      [exec] (Xterm) {xterm}
+      [exec] (Generate Menu) {fluxbox-generate_menu}
+      [reconfig] (Reload config)
+      [restart] (Restart)
+      [exit] (Exit)
+[end]
diff --git a/x11/fluxbox/pkg/DEINSTALL b/x11/fluxbox/pkg/DEINSTALL
deleted file mode 100644
index 83f79c0d98b..00000000000
--- a/x11/fluxbox/pkg/DEINSTALL
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2002/05/27 13:30:44 lebel Exp $
-#
-# fluxbox de-installation
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-rm -f ${PREFIX}/share/fluxbox/menu*
-
-exit 0
diff --git a/x11/fluxbox/pkg/INSTALL b/x11/fluxbox/pkg/INSTALL
deleted file mode 100644
index a7ba91fd561..00000000000
--- a/x11/fluxbox/pkg/INSTALL
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.1 2002/05/27 13:30:44 lebel Exp $
-#
-# Pre/post-installation setup of fluxbox
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
-
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	${PREFIX}/bin/fluxbox-generate_menu \
-		-p ${PREFIX}/share \
-		-o ${PREFIX}/share/fluxbox/menu \
-		-m Fluxbox-${VERSION}
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/x11/fluxbox/pkg/PLIST b/x11/fluxbox/pkg/PLIST
index 936323054b5..2dc48bb70e3 100644
--- a/x11/fluxbox/pkg/PLIST
+++ b/x11/fluxbox/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2003/08/25 17:15:56 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.10 2003/08/26 19:46:09 naddy Exp $
 @pkgcfl blackbox-*
 @pkgcfl openbox-*
 bin/bsetbg
@@ -10,6 +10,7 @@ man/man1/bsetroot.1
 man/man1/fluxbox.1
 share/fluxbox/init
 share/fluxbox/keys
+share/fluxbox/menu
 share/fluxbox/nls/C/fluxbox.cat
 share/fluxbox/nls/POSIX
 share/fluxbox/nls/US_ASCII