diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index cb3d4c485ab..d369306d8f3 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -16,11 +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 ${pkgname}{-core,6,}; do
-	cd ${XBPS_BUILDDIR}/${product}-${version}
+	cd ${wrksrc}
 	./configure HOST=archlinux SBINDIR=/usr/bin
 done
 }
@@ -30,35 +29,39 @@ do_install() {
 }
 
 shorewall_package() {
+	noarch="yes"
 	depends="shorewall-core perl"
 	systemd_services="shorewall.service off"
 	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}/${pkgname}-${version}
-		DESTDIR="${DESTDIR}" ./install.sh
-		install -d "${DESTDIR}/usr/share/doc/${pkgname}/"
-		cp -r Samples "${DESTDIR}/usr/share/doc/${pkgname}/"
+		cd ${wrksrc}
+		DESTDIR="${PKGDESTDIR}" ./install.sh
+		install -d "${PKGDESTDIR}/usr/share/doc/${pkgname}/"
+		cp -r Samples "${PKGDESTDIR}/usr/share/doc/${pkgname}/"
 		vmove all
 	}
 }
 
 shorewall-core_package() {
-	short_desc+=" - Core Shorewall libraries"
+	noarch="yes"
 	depends="iptables iproute2"
+	short_desc+=" - Core Shorewall libraries"
 	pkg_install() {
-		cd ${XBPS_BUILDDIR}/${pkgname}-${version}
-		DESTDIR="${DESTDIR}" ./install.sh
+		cd ${wrksrc}
+		DESTDIR="${PKGDESTDIR}" ./install.sh
 		vmove all
 	}
 }
 
 shorewall6_package() {
-	short_desc+=" - IPv6 support"
 	depends="shorewall"
+	short_desc+=" - IPv6 support"
+	systemd_services="shorewall6.service off"
+	make_dirs="/var/lib/${pkgname} 0755 0 0"
 	pkg_install() {
-		cd ${XBPS_BUILDDIR}/${pkgname}-${version}
-		DESTDIR="${DESTDIR}" ./install.sh
+		cd ${wrksrc}
+		DESTDIR="${PKGDESTDIR}" ./install.sh
 		vmove all
 	}
 }