diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index 64490967a4..cb3d4c485a 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -5,8 +5,8 @@ revision=1
 _disturl="http://www.shorewall.net/pub/${pkgname}/4.5/${pkgname}-4.5.21"
 distfiles="
  ${_disturl}/${pkgname}-${version}.tar.bz2
- ${_disturl}/shorewall6-${version}.tar.bz2
- ${_disturl}/shorewall-core-${version}.tar.bz2"
+ ${_disturl}/${pkgname}6-${version}.tar.bz2
+ ${_disturl}/${pkgname}-core-${version}.tar.bz2"
 checksum="
  dd1160c077112264094478ee81d83c2757d6d72d0d8e7fe6bf000427282a8356
  2eccf072ffb83733e73697f425cfd832de91ec70cb19231bb9f88a461790c0da
@@ -16,8 +16,10 @@ homepage="http://www.shorewall.net/"
 license="GPL"
 short_desc="An iptables-based firewall for Linux systems"
 
+noarch="yes"
+
 do_build(){
-for product in shorewall{-core,6,}; do
+for product in ${pkgname}{-core,6,}; do
 	cd ${XBPS_BUILDDIR}/${product}-${version}
 	./configure HOST=archlinux SBINDIR=/usr/bin
 done
@@ -28,26 +30,24 @@ do_install() {
 }
 
 shorewall_package() {
-	noarch="yes"
 	depends="shorewall-core perl"
 	systemd_services="shorewall.service off"
-	make_dirs="/var/lib/shorewall 0755 0 0"
-	conf_files="/etc/shorewall/{accounting,actions,blrules,clear,conntrack,ecn,findgw,hosts,init,initdone,interfaces,lib.private,maclist,masq,nat,netmap,params,policy,providers,proxyarp,refresh,refreshed,restored,routes,stoppedrules,rtrules,rules,scfilter,secmarks,shorewall.conf,start,started,stop,stopped,tcclasses,tcclear,tcdevices,tcfilters,tcinterfaces,tcpri,tcrules,tos,tunnels,zones}"
+	make_dirs="/var/lib/${pkgname} 0755 0 0"
+	conf_files="/etc/${pkgname}/{accounting,actions,blrules,clear,conntrack,ecn,findgw,hosts,init,initdone,interfaces,lib.private,maclist,masq,nat,netmap,params,policy,providers,proxyarp,refresh,refreshed,restored,routes,stoppedrules,rtrules,rules,scfilter,secmarks,shorewall.conf,start,started,stop,stopped,tcclasses,tcclear,tcdevices,tcfilters,tcinterfaces,tcpri,tcrules,tos,tunnels,zones}"
 	pkg_install() {
-		cd ${XBPS_BUILDDIR}/shorewall-${version}
+		cd ${XBPS_BUILDDIR}/${pkgname}-${version}
 		DESTDIR="${DESTDIR}" ./install.sh
-		install -d "${DESTDIR}/usr/share/doc/shorewall/"
-		cp -r Samples "${DESTDIR}/usr/share/doc/shorewall/"
+		install -d "${DESTDIR}/usr/share/doc/${pkgname}/"
+		cp -r Samples "${DESTDIR}/usr/share/doc/${pkgname}/"
 		vmove all
 	}
 }
 
 shorewall-core_package() {
 	short_desc+=" - Core Shorewall libraries"
-	noarch="yes"
 	depends="iptables iproute2"
 	pkg_install() {
-		cd ${XBPS_BUILDDIR}/shorewall-core-${version}
+		cd ${XBPS_BUILDDIR}/${pkgname}-${version}
 		DESTDIR="${DESTDIR}" ./install.sh
 		vmove all
 	}
@@ -55,10 +55,9 @@ shorewall-core_package() {
 
 shorewall6_package() {
 	short_desc+=" - IPv6 support"
-	noarch="yes"
 	depends="shorewall"
 	pkg_install() {
-		cd ${XBPS_BUILDDIR}/shorewall6-${version}
+		cd ${XBPS_BUILDDIR}/${pkgname}-${version}
 		DESTDIR="${DESTDIR}" ./install.sh
 		vmove all
 	}