diff --git a/libnsl.changes b/libnsl.changes
index 2fd1abb..58dd276 100644
--- a/libnsl.changes
+++ b/libnsl.changes
@@ -1,18 +1,3 @@
--------------------------------------------------------------------
-Tue Sep 12 12:43:01 CEST 2017 - kukuk@suse.de
-
-- Install yppasswd.h again
-
--------------------------------------------------------------------
-Tue Sep  5 12:54:29 CEST 2017 - kukuk@suse.de
-
-- Disable static library
-
--------------------------------------------------------------------
-Wed Aug 30 13:35:01 CEST 2017 - kukuk@suse.de
-
-- Don't install into nsl subdirectories
-
 -------------------------------------------------------------------
 Fri Aug 18 19:53:51 UTC 2017 - kukuk@suse.com
 
diff --git a/libnsl.spec b/libnsl.spec
index 4cdb9bc..5794f09 100644
--- a/libnsl.spec
+++ b/libnsl.spec
@@ -66,15 +66,20 @@ The NIS+ API is deprecated and only there "as is".
 %setup -q
 
 %build
-%configure --disable-static
+%configure --libdir=/%{_libdir}/nsl --includedir=%{_includedir}/nsl
 make %{?_smp_mflags}
 
 %install
 # Don't strip .symtab to allow debugging
 export STRIP_KEEP_SYMTAB=libnsl*.so*
+# NO_BRP_CHECK_ROOTFS is for SLES11 only, but does not harm for Factory
+export NO_BRP_CHECK_ROOTFS=true
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
-# Remove .la file
-rm %{buildroot}%{_libdir}/%{name}.la
+mv -v %{buildroot}/%{_libdir}/nsl/%{name}.so.2*  %{buildroot}%{_libdir}/
+# Adjust devel so link
+rm -v %{buildroot}/%{_libdir}/nsl/%{name}.{a,la,so}
+ln -s -v %{_libdir}/%{name}.so.2 %{buildroot}%{_libdir}/nsl/%{name}.so
+mv -v %{buildroot}/%{_libdir}/nsl/pkgconfig %{buildroot}/%{_libdir}
 
 %check
 make %{?_smp_mflags} check
@@ -89,8 +94,10 @@ make %{?_smp_mflags} check
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/libnsl.so
-%{_includedir}/*
+%dir %{_libdir}/nsl/
+%{_libdir}/nsl/libnsl.so
+%dir %{_includedir}/nsl/
+%{_includedir}/nsl/*
 %{_libdir}/pkgconfig/*
 
 %changelog