diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index df7dc4c56c40..0fc43c1e26a1 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -7,22 +7,25 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	0.1.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-.if defined(WITH_REMEMBER)
-PATCH_SITES=	http://www.raisdorf.net/files/FreeBSD/
-PATCHFILES=	remember-patch-0.1.13.gz
+PATCH_SITES=	http://www.cse.unsw.edu.au/~simonb/
 PATCH_DIST_STRIP=	-p1
+PATCHFILES=	fluxbox.openoffice.patch fluxbox-0.1.13.aa2.patch
+.if defined(WITH_REMEMBER)
+PATCHFILES+=	fluxbox-remember-patch-0.1.13.gz
 .endif
 
 MAINTAINER=	hendrik@scholz.net
 
-RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools
+RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
+		xterm:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
 .if defined(WITH_REMEMBER)
-BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14
+BUILD_DEPENDS+=	automake14:${PORTSDIR}/devel/automake14
 .endif
 
 USE_X_PREFIX=	yes
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index f2d48e02ab2a..315f3f6dc350 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1,2 +1,4 @@
 MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083
-MD5 (remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63
+MD5 (fluxbox.openoffice.patch) = 5f1cedd6893799695fbbc3a19f5c5cff
+MD5 (fluxbox-0.1.13.aa2.patch) = a983e268749bf143cd500690878def80
+MD5 (fluxbox-remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63
diff --git a/x11-wm/fluxbox-devel/files/patch-src::Font.cc b/x11-wm/fluxbox-devel/files/patch-src::Font.cc
deleted file mode 100644
index f4a567db7071..000000000000
--- a/x11-wm/fluxbox-devel/files/patch-src::Font.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Font.cc.orig	Fri Oct 25 23:07:07 2002
-+++ src/Font.cc	Sun Nov 24 18:23:28 2002
-@@ -140,7 +140,7 @@
- 	if (name == 0)
- 		return false;
- 	bool ret_val = m_fontimp->load(name);
--	if (ret_val && name == 0) { //prevent from having a bad fontimp
-+	if (ret_val && name != 0) { //prevent from having a bad fontimp
- 		m_fontstr = name; // if the load really succeded then set font string
- 	} else {
- 		m_fontstr = "";
diff --git a/x11-wm/fluxbox-devel/files/patch-src::Screen.cc b/x11-wm/fluxbox-devel/files/patch-src::Screen.cc
deleted file mode 100644
index d0b73e2c6c6b..000000000000
--- a/x11-wm/fluxbox-devel/files/patch-src::Screen.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/Screen.cc.orig	Sun Nov 17 12:27:50 2002
-+++ src/Screen.cc	Sun Nov 24 18:23:28 2002
-@@ -284,7 +284,7 @@
- 	image_control->setDither(*resource.image_dither);
- 	theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), colormap(), getScreenNumber(), 
- 			image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
--
-+	theme->reconfigure(*resource.antialias);
- 
- 	const char *s =	i18n->getMessage(
- 		FBNLS::ScreenSet, FBNLS::ScreenPositionLength,
-@@ -447,7 +447,6 @@
- 
- 	XFree(children);
- 	XFlush(getBaseDisplay()->getXDisplay());
--	theme->reconfigure(*resource.antialias);
- }
- 
- namespace {
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index df7dc4c56c40..0fc43c1e26a1 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -7,22 +7,25 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	0.1.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-.if defined(WITH_REMEMBER)
-PATCH_SITES=	http://www.raisdorf.net/files/FreeBSD/
-PATCHFILES=	remember-patch-0.1.13.gz
+PATCH_SITES=	http://www.cse.unsw.edu.au/~simonb/
 PATCH_DIST_STRIP=	-p1
+PATCHFILES=	fluxbox.openoffice.patch fluxbox-0.1.13.aa2.patch
+.if defined(WITH_REMEMBER)
+PATCHFILES+=	fluxbox-remember-patch-0.1.13.gz
 .endif
 
 MAINTAINER=	hendrik@scholz.net
 
-RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools
+RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
+		xterm:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
 .if defined(WITH_REMEMBER)
-BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14
+BUILD_DEPENDS+=	automake14:${PORTSDIR}/devel/automake14
 .endif
 
 USE_X_PREFIX=	yes
diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo
index f2d48e02ab2a..315f3f6dc350 100644
--- a/x11-wm/fluxbox/distinfo
+++ b/x11-wm/fluxbox/distinfo
@@ -1,2 +1,4 @@
 MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083
-MD5 (remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63
+MD5 (fluxbox.openoffice.patch) = 5f1cedd6893799695fbbc3a19f5c5cff
+MD5 (fluxbox-0.1.13.aa2.patch) = a983e268749bf143cd500690878def80
+MD5 (fluxbox-remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63
diff --git a/x11-wm/fluxbox/files/patch-src::Font.cc b/x11-wm/fluxbox/files/patch-src::Font.cc
deleted file mode 100644
index f4a567db7071..000000000000
--- a/x11-wm/fluxbox/files/patch-src::Font.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Font.cc.orig	Fri Oct 25 23:07:07 2002
-+++ src/Font.cc	Sun Nov 24 18:23:28 2002
-@@ -140,7 +140,7 @@
- 	if (name == 0)
- 		return false;
- 	bool ret_val = m_fontimp->load(name);
--	if (ret_val && name == 0) { //prevent from having a bad fontimp
-+	if (ret_val && name != 0) { //prevent from having a bad fontimp
- 		m_fontstr = name; // if the load really succeded then set font string
- 	} else {
- 		m_fontstr = "";
diff --git a/x11-wm/fluxbox/files/patch-src::Screen.cc b/x11-wm/fluxbox/files/patch-src::Screen.cc
deleted file mode 100644
index d0b73e2c6c6b..000000000000
--- a/x11-wm/fluxbox/files/patch-src::Screen.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/Screen.cc.orig	Sun Nov 17 12:27:50 2002
-+++ src/Screen.cc	Sun Nov 24 18:23:28 2002
-@@ -284,7 +284,7 @@
- 	image_control->setDither(*resource.image_dither);
- 	theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), colormap(), getScreenNumber(), 
- 			image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
--
-+	theme->reconfigure(*resource.antialias);
- 
- 	const char *s =	i18n->getMessage(
- 		FBNLS::ScreenSet, FBNLS::ScreenPositionLength,
-@@ -447,7 +447,6 @@
- 
- 	XFree(children);
- 	XFlush(getBaseDisplay()->getXDisplay());
--	theme->reconfigure(*resource.antialias);
- }
- 
- namespace {