diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 59f51f6282d..4c0b502ebdb 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,25 +1,15 @@
 # Template file for 'gnome-system-monitor'
 pkgname=gnome-system-monitor
 version=3.14.1
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-schemas-compile --enable-wnck"
+build_options="systemd"
+configure_args="--disable-schemas-compile --enable-wnck $(vopt_enable systemd)"
 hostmakedepends="which pkg-config intltool itstool gnome-doc-utils"
-makedepends="libwnck-devel gtkmm-devel>=3.9 librsvg-devel libgtop-devel gnome-icon-theme>=3.12"
-depends="gtkmm>=3.9 gnome-icon-theme"
+makedepends="libwnck-devel gtkmm-devel librsvg-devel libgtop-devel $(vopt_if systemd systemd-devel)"
 short_desc="Process viewer and system resource monitor for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=948be34a5c3e91acd4a1af0c7711020dd76d274aac547d5836910f2fde09a5e6
-
-# Package build options
-build_options="systemd"
-
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --enable-systemd"
-	makedepends+=" systemd-devel"
-else
-	configure_args+=" --disable-systemd"
-fi