diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index d369306d8f3..3ff04e3e637 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -39,7 +39,6 @@ shorewall_package() {
 		DESTDIR="${PKGDESTDIR}" ./install.sh
 		install -d "${PKGDESTDIR}/usr/share/doc/${pkgname}/"
 		cp -r Samples "${PKGDESTDIR}/usr/share/doc/${pkgname}/"
-		vmove all
 	}
 }
 
@@ -50,18 +49,18 @@ shorewall-core_package() {
 	pkg_install() {
 		cd ${wrksrc}
 		DESTDIR="${PKGDESTDIR}" ./install.sh
-		vmove all
 	}
 }
 
 shorewall6_package() {
+	noarch="yes"
 	depends="shorewall"
 	short_desc+=" - IPv6 support"
 	systemd_services="shorewall6.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 ${wrksrc}
 		DESTDIR="${PKGDESTDIR}" ./install.sh
-		vmove all
 	}
 }