diff --git a/libnetfilter_conntrack.changes b/libnetfilter_conntrack.changes
index 6ff8cee..496f521 100644
--- a/libnetfilter_conntrack.changes
+++ b/libnetfilter_conntrack.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec 29 21:17:48 UTC 2011 - jengelh@medozas.de
+
+- SPDX format for License: tag
+- Use separate include directory to catch compile errors
+
 -------------------------------------------------------------------
 Thu Feb 24 19:22:03 UTC 2011 - jengelh@medozas.de
 
diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec
index 4cc87ef..997ae19 100644
--- a/libnetfilter_conntrack.spec
+++ b/libnetfilter_conntrack.spec
@@ -15,20 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
+
 
 Name:           libnetfilter_conntrack
 %define lname	%{name}3
 Version:        0.9.1
 Release:        1
-License:        GNU GPL v2
+License:        GPL-2.0
 Group:          Productivity/Networking/Security
 URL:            http://netfilter.org/projects/libnetfilter_conntrack/
 Source:         http://netfilter.org/projects/%name/files/%name-%version.tar.bz2
 Source2:        http://netfilter.org/projects/%name/files/%name-%version.tar.bz2.sig
 Source3:        baselibs.conf
-BuildRoot:      %_tmppath/%name-%version-build
-BuildRequires:  libnfnetlink-devel >= 1.0.0, pkgconfig
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  libnfnetlink-devel >= 1.0.0 pkgconfig
 Summary:        Userspace library for the in-kernel connection tracking state table
 
 %description
@@ -38,8 +38,6 @@ library libnetfilter_conntrack has been previously known as
 libnfnetlink_conntrack and libctnetlink. This library is currently
 used by conntrack-tools among many other applications.
 
-%define debug_package_requires %lname = %version-%release
-
 %package -n %lname
 Group:          System/Libraries
 Summary:        Userspace library for the in-kernel connection tracking state table
@@ -67,7 +65,7 @@ used by conntrack-tools among many other applications.
 %setup -q
 
 %build
-%configure --disable-static
+%configure --disable-static --includedir=%_includedir/%name-%version
 make %{?_smp_mflags}
 
 %install
@@ -84,7 +82,7 @@ find %buildroot -name "*.la" -delete
 
 %files devel
 %defattr(-,root,root)
-%_includedir/libnetfilter_conntrack
+%_includedir/libnetfilter_conntrack*
 %_libdir/libnetfilter_conntrack.so
 %_libdir/pkgconfig/libnetfilter_conntrack.pc