diff --git a/srcpkgs/ufw/files/ufw.rc b/srcpkgs/ufw/files/ufw.rc
index dd433d38999..008642ef07f 100644
--- a/srcpkgs/ufw/files/ufw.rc
+++ b/srcpkgs/ufw/files/ufw.rc
@@ -7,8 +7,11 @@ depend() {
 start() {
 	ebegin "Starting ufw"
 	ufw enable
+	eend $?
 }
 
 stop() {
+	ebegin "Stopping ufw"
 	ufw disable
+	eend $?
 }
diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template
index f70db0aaa87..fec0cbf95f1 100644
--- a/srcpkgs/ufw/template
+++ b/srcpkgs/ufw/template
@@ -1,8 +1,9 @@
 # Template file for 'ufw'
 pkgname=ufw
 version=0.30.1
-distfiles="http://launchpad.net/ufw/0.30/0.30.1/+download/$pkgname-$version.tar.gz"
-build_style=custom-install
+revision=1
+distfiles="http://launchpad.net/ufw/0.30/$version/+download/$pkgname-$version.tar.gz"
+build_style=python-module
 short_desc="Uncomplicated Firewall"
 maintainer="Mike Rosset <mike.rosset@gmail.com>"
 homepage="https://launchpad.net/ufw"
@@ -13,18 +14,18 @@ long_desc="
  It provides a command line interface and aims to be uncomplicated and easy to use.
 "
 
+noarch=yes
+conf_files="/etc/default/ufw /etc/ufw/ufw.conf"
+openrc_services="ufw default false"
+
 Add_dependency run iptables
 Add_dependency run python
 Add_dependency build python
 Add_dependency build iptables
-
-do_install()
-{
-	python setup.py install --root=${DESTDIR}
-}
+Add_dependency build gettext
 
 post_install()
 {
 	# OpenRC service to start/stop ufw.
-	vinstall ${FILESDIR}/$pkgname.rc 755 etc/init.d $pkgname
+	vinstall ${FILESDIR}/ufw.rc 755 etc/init.d ufw
 }