diff --git a/libnftnl.changes b/libnftnl.changes
index 0532159..3aed39f 100644
--- a/libnftnl.changes
+++ b/libnftnl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  8 23:41:15 UTC 2014 - jengelh@inai.de
+
+- Drop %version from subincludedir, it tends to break recompiles of
+  already-built trees on library updates.
+
 -------------------------------------------------------------------
 Tue Sep 23 16:05:59 UTC 2014 - jengelh@inai.de
 
diff --git a/libnftnl.spec b/libnftnl.spec
index fc5b36a..80b4dec 100644
--- a/libnftnl.spec
+++ b/libnftnl.spec
@@ -30,25 +30,14 @@ Source:         http://netfilter.org/projects/libnftnl/files/%name-%version.tar.
 Source2:        http://netfilter.org/projects/libnftnl/files/%name-%version.tar.bz2.sig
 Source3:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libmnl-devel >= 1.0.3
 # Normally, this require would not be needed, as upstream ships all headers.
 # Except when they don't and then don't bother fixing it.
 BuildRequires:  linux-glibc-devel >= 2.6.35
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  xz
-%if 0%{?suse_version} >= 1220
-%define with_json 1
-%define with_mxml 1
-%endif
-%if 0%{?fedora_version}
-%define with_json 1
-%endif
-%if 0%{?with_json}
 BuildRequires:  pkgconfig(jansson) >= 2.3
-%endif
-%if 0%{?with_mxml}
+BuildRequires:  pkgconfig(libmnl) >= 1.0.3
 BuildRequires:  pkgconfig(mxml) >= 2.6
-%endif
 
 %description
 libnftnl is a userspace library providing a low-level netlink
@@ -79,13 +68,9 @@ applications that want to make use of libnftnl.
 
 %build
 %configure \
-%if 0%{?with_mxml}
 	--with-xml-parsing \
-%endif
-%if 0%{?with_json}
 	--with-json-parsing \
-%endif
-	--includedir="%_includedir/pkg/%name-%version"
+	--includedir="%_includedir/%name"
 make %{?_smp_mflags}
 
 %install
@@ -101,7 +86,7 @@ rm -f "%buildroot/%_libdir"/*.la;
 
 %files devel
 %defattr(-,root,root)
-%_includedir/pkg/
+%_includedir/%name/
 %_libdir/libnftnl.so
 %_libdir/pkgconfig/libnftnl.pc
 %doc COPYING