diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index fc0da36f0f..864722cdd5 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -1,6 +1,6 @@
 # Template file for 'shorewall'
 pkgname=shorewall
-version=5.0.2.1
+version=5.0.3.1
 revision=1
 _disturl="http://www.shorewall.net/pub/${pkgname}/${version:0:3}/${pkgname}-${version%.*}"
 distfiles="
@@ -8,9 +8,9 @@ distfiles="
  ${_disturl}/${pkgname}6-${version}.tar.bz2
  ${_disturl}/${pkgname}-core-${version}.tar.bz2"
 checksum="
- 10136cf586b620abdad1f3c716f03d1160cfa65c8461fba42d858fa1ab8d5856
- ab8489662511990c5430e795803a01249e26e036f84c1079f08c45f52ef501fd
- 8be30270e527c7697c365c437bff07e6a41ccdcf28b7163b2866750158e5845d"
+ 21b7d2d38031c63b19addcc0246ef6fc8e3cc8d74f7a608cf8a648e5d1a95f9b
+ 78c80a9c11deb9a223719bc30013b26a76751e7b5e6059bc5d1eeb2e36d529de
+ ad530b12cc2af3f5bf8fe79d1b3fd3105149ce2f01f803fb059e710eceb5e8ca"
 depends="shorewall-core perl"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.shorewall.net/"
@@ -20,51 +20,7 @@ short_desc="An iptables-based firewall for Linux systems"
 noarch=yes
 create_wrksrc=yes
 make_dirs="/var/lib/${pkgname} 0755 0 0"
-conf_files="
- /etc/shorewall/accounting
- /etc/shorewall/actions
- /etc/shorewall/arprules
- /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/mangle
- /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/tunnels
- /etc/shorewall/zones"
+conf_files="/etc/$pkgname/*"
 
 do_build() {
 	for product in ${pkgname}{-core,6,}-${version}; do
@@ -93,14 +49,11 @@ shorewall-core_package() {
 shorewall6_package() {
 	noarch=yes
 	depends="shorewall"
+	conf_files="/etc/$pkgname/*"
 	short_desc+=" - IPv6 support"
-	make_dirs="/var/lib/${pkgname} 0755 0 0"
 	pkg_install() {
 		cd ${wrksrc}/${pkgname}-${version}
 		DESTDIR="${PKGDESTDIR}" ./install.sh
 		vsv shorewall6
 	}
-	for f in ${PKGDESTDIR}/etc/${pkgname}/*; do
-		conf_files+="${f##${PKGDESTDIR}} "
-	done
 }