diff --git a/x11/fluxbox/Makefile b/x11/fluxbox/Makefile
index b8191a505ea..c1616d413d9 100644
--- a/x11/fluxbox/Makefile
+++ b/x11/fluxbox/Makefile
@@ -1,10 +1,15 @@
 COMMENT =	window manager based on the original Blackbox code
 DISTNAME =	fluxbox-1.3.7
 CATEGORIES =	x11
-REVISION =	4
+REVISION =	5
 
 HOMEPAGE =	http://fluxbox.org/
 
+MASTER_SITES0 =         http://git.fluxbox.org/fluxbox.git/patch/
+# Backport fix for maxDepth to fix usage with Firefox
+PATCHFILES =            fluxbox-firefox-fix.patch{?id=dcdde4d32c93d01df205bc06d7dfcbd356be031f}:0
+PATCH_DIST_STRIP =      -p1
+
 # X11
 PERMIT_PACKAGE =	Yes
 
diff --git a/x11/fluxbox/distinfo b/x11/fluxbox/distinfo
index 2a746ba98d2..1e36e4c4e6c 100644
--- a/x11/fluxbox/distinfo
+++ b/x11/fluxbox/distinfo
@@ -1,2 +1,4 @@
 SHA256 (fluxbox-1.3.7.tar.gz) = yZ4rqgb/8eljQrIEFQWdEv8fopF63gFzx1svpXApW58=
+SHA256 (fluxbox-firefox-fix.patch) = oRWRrVGIr5l0j27eaEdDKuxUo8ISrCmHOqgupe7e4Ts=
 SIZE (fluxbox-1.3.7.tar.gz) = 1267833
+SIZE (fluxbox-firefox-fix.patch) = 4080