diff --git a/packages/x11/other/fluxbox/package.mk b/packages/x11/other/fluxbox/package.mk
index 6fa9b7bc6c..0185659d19 100644
--- a/packages/x11/other/fluxbox/package.mk
+++ b/packages/x11/other/fluxbox/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="fluxbox"
-PKG_VERSION="1.3.5"
+PKG_VERSION="1.3.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
@@ -47,13 +47,12 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
                            --disable-test \
                            --disable-nls \
                            --disable-imlib2"
-                           
+
 post_install() {
   enable_service windowmanager.service
 }
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin/fbrun
   rm -rf $INSTALL/usr/bin/fbsetbg
   rm -rf $INSTALL/usr/bin/fluxbox-generate_menu
   rm -rf $INSTALL/usr/bin/fluxbox-remote
@@ -62,7 +61,7 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/share/fluxbox/styles
   rm -rf $INSTALL/usr/share/fluxbox/init
   rm -rf $INSTALL/usr/share/fluxbox/keys
-  
+
   cp $PKG_DIR/config/init $INSTALL/usr/share/fluxbox/
   cp $PKG_DIR/config/keys $INSTALL/usr/share/fluxbox/
 }
diff --git a/packages/x11/other/fluxbox/patches/fluxbox-dont_build_fbrun.patch b/packages/x11/other/fluxbox/patches/fluxbox-dont_build_fbrun.patch
new file mode 100644
index 0000000000..19fab52946
--- /dev/null
+++ b/packages/x11/other/fluxbox/patches/fluxbox-dont_build_fbrun.patch
@@ -0,0 +1,11 @@
+diff -Naur fluxbox-1.3.6/Makefile.am fluxbox-1.3.6.patch/Makefile.am
+--- fluxbox-1.3.6/Makefile.am	2015-01-05 15:14:15.320478262 +0100
++++ fluxbox-1.3.6.patch/Makefile.am	2015-01-10 20:39:20.376934793 +0100
+@@ -79,7 +79,6 @@
+ include src/Makemodule.am
+ include src/tests/Makemodule.am
+ include util/Makemodule.am
+-include util/fbrun/Makemodule.am
+ 
+ uninstall-hook:
+ 	rmdir $(DESTDIR)$(pkgdatadir)