diff --git a/srcpkgs/dnsmasq/files/dnsmasq.rc b/srcpkgs/dnsmasq/files/dnsmasq.rc
index 5b6df9a6ea9..354fcd76b61 100644
--- a/srcpkgs/dnsmasq/files/dnsmasq.rc
+++ b/srcpkgs/dnsmasq/files/dnsmasq.rc
@@ -2,7 +2,7 @@
 
 pidfile=/var/run/dnsmasq.pid
 command=/usr/sbin/dnsmasq
-command_args="${DNSMASQ_OPTS:--g nogroup -u nobody}"
+command_args="${DNSMASQ_OPTS:---user=dnsmasq --pid-file=${pidfile}}"
 
 depend()
 {
diff --git a/srcpkgs/dnsmasq/files/dnsmasq.service b/srcpkgs/dnsmasq/files/dnsmasq.service
new file mode 100644
index 00000000000..b09cb24b99f
--- /dev/null
+++ b/srcpkgs/dnsmasq/files/dnsmasq.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=A lightweight DHCP and caching DNS server
+
+[Service]
+Type=dbus
+BusName=uk.org.thekelleys.dnsmasq
+ExecStartPre=/usr/sbin/dnsmasq --test
+ExecStart=/usr/sbin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+Alias=dbus-uk.org.thekelleys.dnsmasq
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index 807bf24e50d..37fa636c7a6 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,13 +1,13 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
-version=2.57
+version=2.58
+homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 distfiles="http://www.thekelleys.org.uk/$pkgname/$pkgname-$version.tar.gz"
-build_style=gnu_makefile
-make_build_target="all-i18n"
-make_install_args="PREFIX=/usr install-i18n"
+build_style=custom-install
 short_desc="Lightweight, easy to configure DNS forwarder and DHCP server"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=c2e0c7b82122d636933b28a1c28e6bccb6daad49162e7534b641b3c3340ff8ae
+license="GPL-2"
+checksum=d5f64ed65f2b9a4db846d6da5d6903ec03e86924c09e232f42c7b63bcbfa3be6
 long_desc="
  Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server.
  It is designed to provide DNS and, optionally, DHCP, to a small network. It
@@ -17,6 +17,7 @@ long_desc="
  each host or in a central configuration file. Dnsmasq supports static and
  dynamic DHCP leases and BOOTP/TFTP/PXE for network booting of diskless machines."
 
+system_accounts="dnsmasq"
 conf_files="/etc/dnsmasq.conf /etc/conf.d/dnsmasq"
 openrc_services="dnsmasq default false"
 
@@ -24,19 +25,25 @@ Add_dependency run glibc
 Add_dependency run dbus-libs
 Add_dependency run libcap
 Add_dependency run libidn
+
 Add_dependency build gettext
 Add_dependency build dbus-devel
 Add_dependency build libcap-devel
 Add_dependency build libidn-devel
 
-post_install()
+do_build()
 {
-	install -D -m644 dnsmasq.conf.example \
-		${DESTDIR}/etc/dnsmasq.conf
-	install -D -m755 ${FILESDIR}/dnsmasq.rc \
-		${DESTDIR}/etc/init.d/dnsmasq
-	install -D -m644 ${FILESDIR}/dnsmasq.confd \
-		${DESTDIR}/etc/conf.d/dnsmasq
-	install -D -m644 dbus/dnsmasq.conf \
-		${DESTDIR}/etc/dbus-1/system.d/dnsmasq.conf
+	echo '#define HAVE_DBUS' >> src/config.h
+	make ${makejobs}
+}
+
+do_install()
+{
+	make PREFIX=/usr DESTDIR=${DESTDIR} install
+
+	vinstall dnsmasq.conf.example 644 etc dnsmasq.conf
+	vinstall ${FILESDIR}/dnsmasq.rc 755 etc/init.d dnsmasq
+	vinstall ${FILESDIR}/dnsmasq.confd 644 etc/conf.d dnsmasq
+	vinstall ${FILESDIR}/dnsmasq.service 644 lib/systemd/system
+	vinstall dbus/dnsmasq.conf 644 etc/dbus-1/system.d
 }