diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index 5f125adc91f..40c081c9b55 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -9,10 +9,10 @@ configure_args="
  --datadir=/usr/share/ups --with-user=nut --with-group=nut --with-ssl
  --with-usb --without-dev --with-serial -with-avahi --with-udev-dir=/usr/lib/udev
  --without-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
- --with-snmp --with-drvpath=/var/lib/nut"
+ --with-snmp --with-drvpath=/var/lib/nut $(vopt_with cgi)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
- net-snmp-devel"
+ net-snmp-devel $(vopt_if cgi gd-devel)"
 system_accounts="nut"
 conf_files="
 	/etc/ups/ups.conf
@@ -28,9 +28,10 @@ homepage="http://www.networkupstools.org/"
 distfiles="${homepage}source/${version%.*}/nut-${version}.tar.gz"
 checksum=ff44d95d06a51559a0a018eef7f8d17911c1002b6352a7d7580ff75acb12126b
 
+build_options="cgi"
+desc_option_cgi="Build and install the CGI programs"
+
 post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/{html,cgi-bin}
 	# Prepare configuration files
 	for f in ups upsd upsmon upssched nut; do
 		mv ${DESTDIR}/etc/ups/${f}.conf{.sample,}