diff --git a/xtables-addons.changes b/xtables-addons.changes
index a124d4d..3baf167 100644
--- a/xtables-addons.changes
+++ b/xtables-addons.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec 21 02:08:44 UTC 2012 - jengelh@inai.de
+
+- Always ship all source tarballs to make osc validator happy
+
 -------------------------------------------------------------------
 Mon Dec  3 15:17:18 CET 2012 - sbrabec@suse.cz
 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 5fe0da5..81c0ad0 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -29,13 +29,16 @@ License:        GPL-2.0 ; GPL-2.0+
 Group:          Productivity/Networking/Security
 Url:            http://xtables-addons.sf.net/
 
+#Freecode-URL:	http://freecode.com/projects/xtables-addons/
 #Git-Clone:	git://xtables-addons.git.sf.net/gitroot/xtables-addons/xtables-addons
 #Git-Web:	http://xtables-addons.git.sf.net/
 %define git_snapshot 0
-Source:         %name-%version.tar.xz
-Source2:        %name-%version.tar.xz.asc
 Source3:        %name-preamble
 Source4:        %name.keyring
+Source5:        %name-1.47.1.tar.xz
+Source6:        %name-1.47.1.tar.xz.asc
+Source7:        %name-2.0.tar.xz
+Source8:        %name-2.0.tar.xz.asc
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1230
@@ -90,10 +93,14 @@ contains extensions that were not, or are not yet, accepted in the
 main kernel/iptables packages.
 
 %prep
-%{?gpg_verify: %gpg_verify %{S:2}}
+%{?gpg_verify: %gpg_verify %_sourcedir/%name-%version.tar.xz.asc}
 echo "Version: %version"
 echo "Repository: %_repository"
-%setup -q
+%if "%_repository" == "Kernel_HEAD"
+%setup -Tqb7
+%else
+%setup -Tqb5
+%endif
 
 %build
 if [ ! -e configure ]; then