diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec
index e82cd4f..582cb26 100644
--- a/libnetfilter_conntrack.spec
+++ b/libnetfilter_conntrack.spec
@@ -80,11 +80,11 @@ used by conntrack-tools among many other applications.
 if [ "%git_snapshot" -ne 0 ] || [ ! -e configure ]; then
 	autoreconf -fi;
 fi;
-%configure --disable-static --includedir=%_includedir/%name
+%configure --disable-static --includedir="%_includedir/%name-%version"
 make %{?_smp_mflags}
 
 %install
-%makeinstall
+make install DESTDIR="%buildroot";
 rm -f "%buildroot/%_libdir"/*.la;
 
 %post -n %lname -p /sbin/ldconfig
@@ -97,7 +97,7 @@ rm -f "%buildroot/%_libdir"/*.la;
 
 %files devel
 %defattr(-,root,root)
-%_includedir/libnetfilter_conntrack
+%_includedir/%name-%version
 %_libdir/libnetfilter_conntrack.so
 %_libdir/pkgconfig/libnetfilter_conntrack.pc