diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 2734da6685..23e18e6fa9 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,17 +1,84 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=24.3
-revision=1
+revision=2
+hostmakedepends="pkg-config"
+makedepends="ncurses-devel"
+build_style="gnu-configure"
+configure_args="--without-x"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-3"
 homepage="http://www.gnu.org/software/${pkgname}/"
 distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=0098ca3204813d69cd8412045ba33e8701fa2062f4bff56bedafc064979eef41
 short_desc="GNU Emacs Editor without X support"
-makedepends="libxml2-devel>=2.7.0_1 ncurses-devel>=5.8_1"
-build_style="gnu-configure"
-configure_args="--without-x"
 
+# Package build options
+build_options="dbus jpeg tiff gif png svg xml imagemagick"
+desc_option_dbus="Enable support for dbus"
+desc_option_jpeg="Enable support for JPEG images"
+desc_option_tiff="Enable support for TIFF images"
+desc_option_gif="Enable support for GIF images"
+desc_option_png="Enable support for PNG images"
+desc_option_svg="Enable support for SVG images"
+desc_option_imagemagick="Enable support for ImageMagick"
+desc_option_xml="Enable support for XML parsing"
+
+if [ "$build_option_dbus" ]; then
+	configure_args+=" --with-dbus"
+	makedepends+=" dbus-devel"
+else
+	configure_args+=" --without-dbus"
+fi
+
+if [ "$build_option_jpeg" ]; then
+	configure_args+=" --with-jpeg"
+	makedepends+=" libjpeg-turbo-devel"
+else
+	configure_args+=" --without-jpeg"
+fi
+
+if [ "$build_option_tiff" ]; then
+	configure_args+=" --with-tiff"
+	makedepends+=" tiff-devel"
+else
+	configure_args+=" --without-tiff"
+fi
+
+if [ "$build_option_gif" ]; then
+	configure_args+=" --with-gif"
+	makedepends+=" giflib-devel"
+else
+	configure_args+=" --without-gif"
+fi
+
+if [ "$build_option_png" ]; then
+	configure_args+=" --with-png"
+	makedepends+=" libpng-devel"
+else
+	configure_args+=" --without-png"
+fi
+
+if [ "$build_option_svg" ]; then
+	configure_args+=" --with-rsvg"
+	makedepends+=" librsvg-devel"
+else
+	configure_args+=" --without-rsvg"
+fi
+
+if [ "$build_option_imagemagick" ]; then
+	configure_args+=" --with-imagemagick"
+	makedepends+=" libmagick-devel"
+else
+	configure_args+=" --without-imagemagick"
+fi
+
+if [ "$build_option_xml" ]; then
+	configure_args+=" --with-xml2"
+	makedepends+=" libxml2-devel"
+else
+	configure_args+=" --without-xml2"
+fi
 
 emacs_package() {
   pkg_install() {