diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index 5f5cc7969d7..fe70cebb6ac 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -17,6 +17,56 @@ license="GPL"
 short_desc="An iptables-based firewall for Linux systems"
 
 create_wrksrc=yes
+noarch="yes"
+conf_files="
+ /etc/shorewall/accounting
+ /etc/shorewall/actions
+ /etc/shorewall/blrules
+ /etc/shorewall/clear
+ /etc/shorewall/conntrack
+ /etc/shorewall/ecn
+ /etc/shorewall/findgw
+ /etc/shorewall/hosts
+ /etc/shorewall/init
+ /etc/shorewall/initdone
+ /etc/shorewall/interfaces
+ /etc/shorewall/lib.private
+ /etc/shorewall/maclist
+ /etc/shorewall/masq
+ /etc/shorewall/nat
+ /etc/shorewall/netmap
+ /etc/shorewall/params
+ /etc/shorewall/policy
+ /etc/shorewall/providers
+ /etc/shorewall/proxyarp
+ /etc/shorewall/refresh
+ /etc/shorewall/refreshed
+ /etc/shorewall/restored
+ /etc/shorewall/routes
+ /etc/shorewall/stoppedrules
+ /etc/shorewall/rtrules
+ /etc/shorewall/rules
+ /etc/shorewall/scfilter
+ /etc/shorewall/secmarks
+ /etc/shorewall/shorewall.conf
+ /etc/shorewall/start
+ /etc/shorewall/started
+ /etc/shorewall/stop
+ /etc/shorewall/stopped
+ /etc/shorewall/tcclasses
+ /etc/shorewall/tcclear
+ /etc/shorewall/tcdevices
+ /etc/shorewall/tcfilters
+ /etc/shorewall/tcinterfaces
+ /etc/shorewall/tcpri
+ /etc/shorewall/tcrules
+ /etc/shorewall/tos
+ /etc/shorewall/tunnels
+ /etc/shorewall/zones"
+
+depends="shorewall-core perl"
+systemd_services="${pkgname}.service off"
+make_dirs="/var/lib/${pkgname} 0755 0 0"
 
 do_build(){
 	for product in ${pkgname}{-core,6,}-${version}; do
@@ -26,23 +76,10 @@ do_build(){
 }
 
 do_install() {
-	:
-}
-
-shorewall_package() {
-	noarch="yes"
-	depends="shorewall-core perl"
-	systemd_services="${pkgname}.service off"
-	make_dirs="/var/lib/${pkgname} 0755 0 0"
-	pkg_install() {
-		cd ${wrksrc}/${pkgname}-${version}
-		DESTDIR="${PKGDESTDIR}" ./install.sh
-		vmkdir usr/share/doc/${pkgname}
-		cp -r Samples ${PKGDESTDIR}/usr/share/doc/${pkgname}
-	}
-	for f in ${PKGDESTDIR}/etc/${pkgname}/*; do
-		conf_files+="${f##${PKGDESTDIR}} "
-	done
+	cd ${wrksrc}/${pkgname}-${version}
+	DESTDIR="${DESTDIR}" ./install.sh
+	vmkdir usr/share/doc/${pkgname}
+	cp -r Samples ${PKGDESTDIR}/usr/share/doc/${pkgname}
 }
 
 shorewall-core_package() {