diff --git a/PKGBUILD b/PKGBUILD
index dead7c3..6c9ed8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fluxbox
-pkgver=1.3.5
-pkgrel=4
+pkgver=1.3.6
+pkgrel=1
 pkgdesc="A lightweight and highly-configurable window manager"
 arch=('i686' 'x86_64')
 url="http://www.fluxbox.org"
@@ -11,14 +11,18 @@ license=('MIT')
 depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribidi')
 optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.lzma \
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz \
+        fluxbox.patch::http://git.fluxbox.org/fluxbox.git/patch/?id=7b8fd2d81ad80a73564fc9fbb779f47568f12652 \
         fluxbox.desktop)
-sha1sums=('495d82ca428949cc2bc85814898b49cf4624b7cb'
+sha1sums=('2bcf7a02394b01652be05f6b6108a1e67a12afb5'
+          '4058e5a8a0a9e8af0ec1fc4a098fefafef008a28'
           'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   sed -i 's/@EXEEXT@//g' util/fluxbox-generate_menu.in #share/fluxbox/menu}
+  # http://git.fluxbox.org/fluxbox.git/commit/?id=7b8fd2d81ad80a73564fc9fbb779f47568f12652
+  patch -p1 -i ${srcdir}/${pkgname}.patch
 }
 
 build() {