diff --git a/libcap.changes b/libcap.changes
index 609d32e..779770b 100644
--- a/libcap.changes
+++ b/libcap.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr 16 15:37:55 CEST 2007 - tiwai@suse.de
+
+- follow library packaging policy
+  * move docs to devel package
+  * move binaries and man pages to progs sub package
+  * fix *.so symlink in libdir
+
 -------------------------------------------------------------------
 Wed Jan 24 12:05:59 CET 2007 - tiwai@suse.de
 
diff --git a/libcap.spec b/libcap.spec
index 9d99f34..4a605aa 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -14,9 +14,9 @@ Name:           libcap
 License:        BSD License and BSD-like
 Group:          System/Libraries
 Autoreqprov:    on
-Summary:        Library and Binaries for Capabilities (linux-privs) Support
+Summary:        Library for Capabilities (linux-privs) Support
 Version:        1.10
-Release:        4
+Release:        12
 Source:         ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/old/kernel-2.4/libcap-1.10.tar.bz2
 Source3:        ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/uid-proc.patch
 Source4:        ftp://ftp.de.kernel.org/pub/linux/libs/security/linux-privs/old/kernel-2.4/README
@@ -60,6 +60,16 @@ using libcap.
 
 
 
+%package progs
+Summary:        Libcap utility programs
+Group:          System/Filesystems
+
+%description progs
+This package contains utility programs handling capabilities via
+libcap.
+
+
+
 %prep
 %setup
 %patch
@@ -69,15 +79,19 @@ using libcap.
 %patch4
 %patch6
 %patch7
+cp -p %SOURCE3 .
+cp -p %SOURCE4 ./README.libcap
+cp -p %SOURCE5 .
 
 %build
 lib=%{_lib} make LDFLAGS= COPTFLAG="$RPM_OPT_FLAGS"
 
 %install
 make install FAKEROOT=$RPM_BUILD_ROOT LIBDIR=$RPM_BUILD_ROOT/%{_lib} MANDIR=$RPM_BUILD_ROOT%{_mandir}
-cp -p %SOURCE3 .
-cp -p %SOURCE4 ./README.libcap
-cp -p %SOURCE5 .
+# move *.so file to libdir and relink
+rm -f $RPM_BUILD_ROOT/%{_lib}/*.so
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+ln -s /%{_lib}/libcap.so.1 $RPM_BUILD_ROOT%{_libdir}/libcap.so
 rm $RPM_BUILD_ROOT%{_mandir}/man2/{capget,capset}.2*
 
 %post -p /sbin/ldconfig
@@ -86,9 +100,11 @@ rm $RPM_BUILD_ROOT%{_mandir}/man2/{capget,capset}.2*
 
 %files
 %defattr(-,root,root)
-%doc License README CHANGELOG uid-proc.patch README.libcap capfaq-0.2.txt.gz
-#%doc fcaps-2.2.9-990610.patch.bz2 fcap-module-990613.tar.bz2
 %attr(755,root,root) /%{_lib}/libcap.so.*
+
+%files progs
+%defattr(-,root,root)
+%doc %{_mandir}/man3/*
 /sbin/getpcaps
 /sbin/setpcaps
 /sbin/execcap
@@ -96,12 +112,17 @@ rm $RPM_BUILD_ROOT%{_mandir}/man2/{capget,capset}.2*
 
 %files devel
 %defattr(-,root,root)
-%dir %{_includedir}/sys
- %{_includedir}/sys/capability.h
-/%{_lib}/*.so
-%{_mandir}/man3/*
+%doc License README CHANGELOG uid-proc.patch README.libcap capfaq-0.2.txt.gz
+#%doc fcaps-2.2.9-990610.patch.bz2 fcap-module-990613.tar.bz2
+%{_includedir}/sys/capability.h
+%{_libdir}/*.so
 
-%changelog -n libcap
+%changelog
+* Mon Apr 16 2007 - tiwai@suse.de
+- follow library packaging policy
+  * move docs to devel package
+  * move binaries and man pages to progs sub package
+  * fix *.so symlink in libdir
 * Wed Jan 24 2007 - tiwai@suse.de
 - fix the access over array range in cap_extint.c (#237943).
 * Tue Dec 19 2006 - tiwai@suse.de