diff --git a/x11/fluxbox/Makefile b/x11/fluxbox/Makefile
index 6680587f509..d71036a9931 100644
--- a/x11/fluxbox/Makefile
+++ b/x11/fluxbox/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.21 2003/06/12 14:04:26 brad Exp $
+# $OpenBSD: Makefile,v 1.22 2003/08/25 17:15:56 naddy Exp $
 
 COMMENT=	"window manager based on the original Blackbox code"
 
-VERSION=		0.9.3
+VERSION=		0.1.14
 DISTNAME=		fluxbox-${VERSION}
 PKGNAME=		${DISTNAME} #p2
 CATEGORIES=		x11
diff --git a/x11/fluxbox/distinfo b/x11/fluxbox/distinfo
index 2f54f5518ba..eebb307dd40 100644
--- a/x11/fluxbox/distinfo
+++ b/x11/fluxbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (fluxbox-0.9.3.tar.gz) = 22b3323e948c32ff81afef9e18aa2ac6
-RMD160 (fluxbox-0.9.3.tar.gz) = eb29273ae07d8311fd1449978787080b0c83efd3
-SHA1 (fluxbox-0.9.3.tar.gz) = 2709a24b2eaeac0cf63c24de1b2fba0ef72e2796
+MD5 (fluxbox-0.1.14.tar.gz) = f097b97127461fa3f6f4af4048c75cfc
+RMD160 (fluxbox-0.1.14.tar.gz) = 674f4ea0336f7dc062a6424000987f2fcde073ad
+SHA1 (fluxbox-0.1.14.tar.gz) = 323bd101ae99fed56e320651c721815c7a36509a
diff --git a/x11/fluxbox/patches/patch-src_BaseDisplay_cc b/x11/fluxbox/patches/patch-src_BaseDisplay_cc
new file mode 100644
index 00000000000..1df2a39d4e5
--- /dev/null
+++ b/x11/fluxbox/patches/patch-src_BaseDisplay_cc
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_BaseDisplay_cc,v 1.3 2003/08/25 17:15:56 naddy Exp $
+--- src/BaseDisplay.cc.orig	Sun Mar  2 11:38:30 2003
++++ src/BaseDisplay.cc	Sun Mar  2 11:38:48 2003
+@@ -123,7 +123,7 @@ void bexec(const char *command, char *di
+ 	if (! fork()) {
+ 		setsid();
+ 		putenv(displaystring);
+-		execl("/bin/sh", "/bin/sh", "-c", command, 0);
++		execl("/bin/sh", "/bin/sh", "-c", command, (void *)NULL);
+ 		exit(0);
+ 	}
+ }
diff --git a/x11/fluxbox/patches/patch-src_FbCommands_cc b/x11/fluxbox/patches/patch-src_FbCommands_cc
deleted file mode 100644
index c08bac75d4b..00000000000
--- a/x11/fluxbox/patches/patch-src_FbCommands_cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_FbCommands_cc,v 1.1 2003/06/12 14:04:26 brad Exp $
-cast NULL sentinel to void * to make sure it's 64-bit on 64-bit architectures
---- src/FbCommands.cc.orig	Wed Jun 11 05:38:07 2003
-+++ src/FbCommands.cc	Wed Jun 11 05:38:51 2003
-@@ -49,7 +49,7 @@ void ExecuteCmd::execute() {
-         displaystring += intbuff;
-         setsid();
-         putenv(const_cast<char *>(displaystring.c_str()));
--        execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), 0);
-+        execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), (void *)NULL);
-         exit(0);
-     }
- #else //   __EMX__
diff --git a/x11/fluxbox/patches/patch-src_fluxbox_cc b/x11/fluxbox/patches/patch-src_fluxbox_cc
deleted file mode 100644
index c3cdcbb1b97..00000000000
--- a/x11/fluxbox/patches/patch-src_fluxbox_cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_fluxbox_cc,v 1.3 2003/06/12 14:46:02 brad Exp $
-Rathnor found another one.
---- src/fluxbox.cc.orig	Tue Jun 10 13:23:03 2003
-+++ src/fluxbox.cc	Wed Jun 11 06:55:49 2003
-@@ -1736,7 +1736,7 @@ void Fluxbox::restart(const char *prog) 
-     shutdown();
- 
-     if (prog) {
--        execlp(prog, prog, 0);
-+        execlp(prog, prog, (void *) NULL);
-         perror(prog);
-     }
- 
diff --git a/x11/fluxbox/pkg/DESCR b/x11/fluxbox/pkg/DESCR
index 9edd6bb925c..ad221e68dd4 100644
--- a/x11/fluxbox/pkg/DESCR
+++ b/x11/fluxbox/pkg/DESCR
@@ -21,5 +21,3 @@ Here is a list of features that have been added to Fluxbox:
  * AntiAliased font support
  * UTF-8 support
  * Lots of other minor features
-
-WWW: ${HOMEPAGE}
diff --git a/x11/fluxbox/pkg/PLIST b/x11/fluxbox/pkg/PLIST
index 93c406c40fb..936323054b5 100644
--- a/x11/fluxbox/pkg/PLIST
+++ b/x11/fluxbox/pkg/PLIST
@@ -1,9 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.8 2003/06/12 14:46:02 brad Exp $
+@comment $OpenBSD: PLIST,v 1.9 2003/08/25 17:15:56 naddy Exp $
 @pkgcfl blackbox-*
 @pkgcfl openbox-*
+bin/bsetbg
 bin/bsetroot
 bin/fbrun
-bin/fbsetbg
 bin/fluxbox
 bin/fluxbox-generate_menu
 man/man1/bsetroot.1
@@ -15,7 +15,6 @@ share/fluxbox/nls/POSIX
 share/fluxbox/nls/US_ASCII
 share/fluxbox/nls/bg_BG/fluxbox.cat
 share/fluxbox/nls/da_DK/fluxbox.cat
-share/fluxbox/nls/de_DE/fluxbox.cat
 share/fluxbox/nls/en
 share/fluxbox/nls/en_US
 share/fluxbox/nls/es
@@ -43,7 +42,6 @@ share/fluxbox/styles/Flux
 share/fluxbox/styles/LemonSpace
 share/fluxbox/styles/Makro
 share/fluxbox/styles/MerleyKay
-share/fluxbox/styles/Meta
 share/fluxbox/styles/Minimal
 share/fluxbox/styles/Nyz
 share/fluxbox/styles/Operation
@@ -67,7 +65,6 @@ share/fluxbox/styles/qnx-photon
 @dirrm share/fluxbox/nls/fr_FR
 @dirrm share/fluxbox/nls/et_EE
 @dirrm share/fluxbox/nls/es_ES
-@dirrm share/fluxbox/nls/de_DE
 @dirrm share/fluxbox/nls/da_DK
 @dirrm share/fluxbox/nls/bg_BG
 @dirrm share/fluxbox/nls/C