diff --git a/srcpkgs/fluxbox/files/fluxbox.desktop b/srcpkgs/fluxbox/files/fluxbox.desktop
new file mode 100644
index 00000000000..418d29acbc7
--- /dev/null
+++ b/srcpkgs/fluxbox/files/fluxbox.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=XSession
+Exec=/usr/bin/startfluxbox
+TryExec=/usr/bin/startfluxbox
+Name=fluxbox
diff --git a/srcpkgs/fluxbox/template b/srcpkgs/fluxbox/template
new file mode 100644
index 00000000000..eb6673d0f51
--- /dev/null
+++ b/srcpkgs/fluxbox/template
@@ -0,0 +1,45 @@
+# Template file for 'fluxbox'
+pkgname=fluxbox
+version=1.3.0
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--enable-nls"
+short_desc="Highly configurable and low resource X11 Window manager "
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=3afa696c4616a4ad80c1e0852fc9dbbf568530a23227a436f4aad86cd92c964c
+long_desc="
+ Fairly similar to blackbox, from which it is derived, but has been extended
+ with features such as pwm-style window tabs, configurable key bindings,
+ toolbar, and an iconbar. It also includes some cosmetic fixes over blackbox."
+
+Add_dependency run libgcc
+Add_dependency run glibc
+Add_dependency run libstdc++
+Add_dependency run libX11
+Add_dependency run libXft
+Add_dependency run libXrender
+Add_dependency run fontconfig
+Add_dependency run libXpm
+Add_dependency run imlib2
+Add_dependency run libXext
+Add_dependency run libXinerama
+Add_dependency run libXrandr
+Add_dependency run fribidi
+
+Add_dependency build pkg-config
+Add_dependency build libX11-devel
+Add_dependency build libXft-devel
+Add_dependency build libXrender-devel
+Add_dependency build fontconfig-devel
+Add_dependency build libXpm-devel
+Add_dependency build imlib2-devel
+Add_dependency build libXext-devel
+Add_dependency build libXinerama-devel
+Add_dependency build libXrandr-devel
+Add_dependency build fribidi-devel
+
+post_install()
+{
+	install -D -m644 ${FILESDIR}/fluxbox.desktop \
+		${DESTDIR}/usr/share/xsessions/fluxbox.desktop
+}