diff --git a/iptables-1.4.12.1.tar.xz b/iptables-1.4.12.1.tar.xz
new file mode 100644
index 0000000..5550533
--- /dev/null
+++ b/iptables-1.4.12.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:201dc6cda40930cb072f7888401bb761a2e6b50d653ee28690cd61b226b64bd5
+size 412892
diff --git a/iptables-1.4.12.tar.xz b/iptables-1.4.12.tar.xz
deleted file mode 100644
index 781dea0..0000000
--- a/iptables-1.4.12.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9a98a026e2f9d6795fcb209e61b938adecac05d002dd094b3ed7bf930a2047d
-size 411544
diff --git a/iptables.changes b/iptables.changes
index 5b8b300..16b7e85 100644
--- a/iptables.changes
+++ b/iptables.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Sep  1 17:09:05 UTC 2011 - jengelh@medozas.de
+
+- Update to new upstream release 1.4.12.1
+* regression fixes for the new (stricter) command-line parser
+- restore --includedir= in spec file
+- Put libxtables into its own subpackage so that one does not need
+  a lockstep update of iproute2 on a new iptables package
+- Remove redundant fields (Autoreqprov defaults to on, License is
+  inherited from main package)
+
+-------------------------------------------------------------------
+Sat Aug 13 01:39:38 CEST 2011 - draht@suse.de
+
+- include path is /usr/include
+
+-------------------------------------------------------------------
+Mon Aug  8 00:42:53 UTC 2011 - jengelh@medozas.de
+
+- Put include files into a separate directory to flag up missing
+  CFLAGS. libipq.pc will now be provided.
+- Enable build of nfnl_osf, a tool to upload OS fingerprints to
+  the kernel for use with xt_osf.
+
 -------------------------------------------------------------------
 Fri Jul 22 13:12:50 UTC 2011 - jengelh@medozas.de
 
diff --git a/iptables.spec b/iptables.spec
index b0b3c21..49f9bff 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -21,8 +21,9 @@
 Name:           iptables
 License:        GPLv2+
 Group:          Productivity/Networking/Security
-Version:        1.4.12
+Version:        1.4.12.1
 Release:        1
+%define xt_sover	7
 Summary:        IP Packet Filter Administration
 
 #DL-URL:	ftp://ftp.netfilter.org/pub/iptables/
@@ -32,7 +33,15 @@ Source:         %name-%version.tar.xz
 Patch1:         iptables-batch.patch
 Url:            http://netfilter.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  pkg-config sgmltool xz
+%if 0%{?suse_version}
+BuildRequires:	sgmltool
+%endif
+%if 0%{?fedora_version} || 0%{?centos_version}
+BuildRequires:	sgml-common
+Provides:	iptables-ipv6 = %version-%release
+Obsoletes:	iptables-ipv6 < %version-%release
+%endif
+BuildRequires:  fdupes, libnfnetlink-devel, pkgconfig, xz
 
 %description
 Iptables is used to set up, maintain, and inspect the tables of IP
@@ -40,19 +49,31 @@ packet filter rules in the Linux kernel. This version requires kernel
 2.4.0 or newer.
 
 %package devel
-License:        GPLv2+
 Summary:        Libraries, Headers and Development Man Pages for iptables
 Group:          Development/Libraries/C and C++
-AutoReqProv:    on
-Requires:       %name = %version
+Requires:       %name = %version-%release
+Requires:	libxtables%xt_sover = %version-%release
 
 %description devel
 These libraries are needed to compile
 - additional third-party extensions
 - programs using libipq
 
+%package -n libxtables%xt_sover
+Summary:	Library for functions shared between iptables
+Group:		System/Libraries
+
+%description -n libxtables%xt_sover
+This package contains shared functions exposed for integration with
+iproute2's m_xt.
+
 %prep
+%if 0%{?__xz:1}
 %setup -q
+%else
+tar -xf "%{S:0}" --use=xz;
+%setup -DTq
+%endif
 %patch -P 1 -p1
 
 %build
@@ -61,8 +82,9 @@ if [ ! -e configure ]; then
 fi
 # bnc#561793 - do not include unclean module in iptables manpage
 rm -f extensions/libipt_unclean.man
-%configure \
-    --enable-libipq
+# includedir is overriden on purpose to detect projects that
+# fail to include libxtables_CFLAGS
+%configure --includedir=%_includedir/%name-%version --enable-libipq
 make %{?_smp_mflags}
 
 %install
@@ -71,11 +93,18 @@ make DESTDIR=%buildroot install
 install -m0755 iptables/iptables-apply %buildroot%_sbindir/
 install -m0644 iptables/iptables-apply.8 %buildroot%_mandir/man8/
 find "%buildroot" -iname "*.la" -delete
+%if 0%{?suse_version}
+%fdupes %buildroot
+%endif
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+%post -n libxtables%xt_sover -p /sbin/ldconfig
+
+%postun -n libxtables%xt_sover -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc COPYING INCOMPATIBILITIES
@@ -85,15 +114,20 @@ find "%buildroot" -iname "*.la" -delete
 %_sbindir/iptables*
 %_sbindir/ip6tables*
 %_sbindir/xtables*
+%_sbindir/nfnl_osf
 %_libdir/xtables
-%_libdir/*.so.*
+%_libdir/libip*.so.*
+%_datadir/xtables
 
 %files devel
 %defattr(-,root,root)
 %doc %_mandir/man3/*
 %_includedir/*
 %_libdir/*.so
-%_libdir/pkgconfig/xtables.pc
-%_libdir/pkgconfig/libiptc.pc
+%_libdir/pkgconfig/*.pc
+
+%files -n libxtables%xt_sover
+%defattr(-,root,root)
+%_libdir/libxtables.so.*
 
 %changelog