diff --git a/x11/fluxbox/Makefile b/x11/fluxbox/Makefile
index adc55eff2fb..ccd824ae673 100644
--- a/x11/fluxbox/Makefile
+++ b/x11/fluxbox/Makefile
@@ -1,14 +1,18 @@
-# $OpenBSD: Makefile,v 1.13 2002/09/03 23:06:24 brad Exp $
+# $OpenBSD: Makefile,v 1.14 2002/09/10 23:24:31 brad Exp $
 
 COMMENT=	"blackbox-derived window manager with Gnome and KDE support"
 
 VERSION=		0.1.11
 DISTNAME=		fluxbox-${VERSION}
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fluxbox/}
-MASTER_SITES0=		http://fluxbox.sourceforge.net/download/patches/
 
-HOMEPAGE=		http://fluxbox.sourceforge.net/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fluxbox/}
+MASTER_SITES0=		http://fluxbox.org/download/patches/
+PATCHFILES=		fluxbox-${VERSION}-bugfix2.patch:0
+PATCH_DIST_STRIP=       -p1
+
+HOMEPAGE=		http://fluxbox.org/
 
 MAINTAINER=		Han Boetes <han@mijncomputer.nl>
 
diff --git a/x11/fluxbox/distinfo b/x11/fluxbox/distinfo
index 5ef32bcc6e0..b401b198bab 100644
--- a/x11/fluxbox/distinfo
+++ b/x11/fluxbox/distinfo
@@ -1,3 +1,6 @@
+MD5 (fluxbox-0.1.11-bugfix2.patch) = eec58c869c161f2ed1da9591b68a813a
 MD5 (fluxbox-0.1.11.tar.gz) = 41f10c899ff47f2f5eb9e34a9302fd89
+RMD160 (fluxbox-0.1.11-bugfix2.patch) = 5893b70f7a21f1e14ffe698744e91a750fcf060c
 RMD160 (fluxbox-0.1.11.tar.gz) = bc983bc827913755d95c049ac17a5405a49c0e95
+SHA1 (fluxbox-0.1.11-bugfix2.patch) = 155d3ebc35a9852a86bbd1b3794ff2d477cd25c2
 SHA1 (fluxbox-0.1.11.tar.gz) = d09cb4a246e863c64c415d48fbb2766b49fbbb76