diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..181d2a2
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1 @@
+libcap-ng0
diff --git a/libcap-ng-0.6.3.tar.bz2 b/libcap-ng-0.6.3.tar.bz2
deleted file mode 100644
index 38462d1..0000000
--- a/libcap-ng-0.6.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a121e611f9471721938809a1bab3965a2c9d9b0c552b67687ad69b9e8250b98
-size 271667
diff --git a/libcap-ng-0.6.4.tar.bz2 b/libcap-ng-0.6.4.tar.bz2
new file mode 100644
index 0000000..46a6303
--- /dev/null
+++ b/libcap-ng-0.6.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a830e9e5117febb00de2b6bf6fb9eb88f61dba8df3f761239423a2fad561f16
+size 274844
diff --git a/libcap-ng.changes b/libcap-ng.changes
index 0e409ca..63b2159 100644
--- a/libcap-ng.changes
+++ b/libcap-ng.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu May  6 17:55:55 UTC 2010 - pascal.bleser@opensuse.org
+
+- update to 0.6.4:
+  * the library now uses kernel thread ID for capget/set calls
+  * a display problem of filesystem based capabilities was fixed
+  * netcap now prints device name for packet socket apps
+
+- add baselibs.conf to build libcap-ng0-32bit
+
 -------------------------------------------------------------------
 Fri Mar 12 10:01:51 UTC 2010 - pascal.bleser@opensuse.org
 
diff --git a/libcap-ng.rpmlintrc b/libcap-ng.rpmlintrc
index 67da57d..908e6ce 100644
--- a/libcap-ng.rpmlintrc
+++ b/libcap-ng.rpmlintrc
@@ -1,2 +1,4 @@
 addFilter("libcap-ng-utils.*: W: shlib-policy-missing-lib")
 addFilter("libcap-ng-utils.*: W: shlib-policy-nonversioned-dir .*")
+addFilter("python-capng..*: W: files-duplicate /usr/lib.*/python.*/site-packages/.*")
+addFilter("libcap-ng-devel..*: W: no-dependency-on libcap-ng/libcap-ng-libs/liblibcap-ng")
diff --git a/libcap-ng.spec b/libcap-ng.spec
index 3fc8cb5..e364f14 100644
--- a/libcap-ng.spec
+++ b/libcap-ng.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libcap-ng (Version 0.6.3)
+# spec file for package libcap-ng (Version 0.6.4)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -22,7 +22,7 @@
 Summary:        An alternate POSIX capabilities library
 
 Name:           libcap-ng
-Version:        0.6.3
+Version:        0.6.4
 Release:        1
 %define soname 0
 License:        LGPLv2+
@@ -34,10 +34,6 @@ Source99:       libcap-ng.rpmlintrc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  kernel-headers >= 2.6.11
 BuildRequires:  libattr-devel
-%if 0%{?suse_version} >= 1030
-BuildRequires:  licenses
-Requires:       licenses
-%endif
 
 %description
 Libcap-ng is a library that makes using posix capabilities easier
@@ -88,33 +84,30 @@ lets you set the file system based capabilities.
 %setup -q
 
 %build
-%configure --libdir=/%{_lib}
+%configure --libdir="/%{_lib}"
 %__make %{?_smp_mflags} %{?jobs:-j%{jobs}}
 
 %install
-%__make DESTDIR="${RPM_BUILD_ROOT}" install
+%__make DESTDIR="%{buildroot}" install
 
 # Move the symlink
-rm -f $RPM_BUILD_ROOT/%{_lib}/%{name}.so
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-VLIBNAME=$(ls $RPM_BUILD_ROOT/%{_lib}/%{name}.so.*.*.*)
-LIBNAME=$(basename $VLIBNAME)
-ln -s ../../%{_lib}/$LIBNAME $RPM_BUILD_ROOT%{_libdir}/%{name}.so
+%__rm -f "%{buildroot}/%{_lib}/%{name}.so"
+%__mkdir_p "%{buildroot}%{_libdir}"
+VLIBNAME=$(/bin/ls -1 "%{buildroot}/%{_lib}/%{name}.so".*.*.*)
+[ -n "$VLIBNAME" ] || { echo "ERROR: failed to find %{buildroot}/%{_lib}/%{name}.so.*.*.*" >&2; exit 1; }
+LIBNAME=$(basename "$VLIBNAME")
+%__ln_s "../../%{_lib}/$LIBNAME" "%{buildroot}%{_libdir}/%{name}.so"
 
 # Move the pkgconfig file
-mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
+%__install -d "%{buildroot}%{_libdir}"
+%__mv "%{buildroot}/%{_lib}/pkgconfig" "%{buildroot}%{_libdir}/pkgconfig"
 
 # Remove a couple things so they don't get picked up
-rm -f $RPM_BUILD_ROOT/%{_lib}/libcap-ng.{a,la}
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/_capng.{a,la}
-
-for f in COPYING COPYING.LIB; do
-    h=/usr/share/doc/licenses/md5/$(md5sum "$f"|cut -f1 -d" ")
-    test -e "$h" && %__ln_s -f "$h" .
-done
+%__rm -f "%{buildroot}/%{_lib}/libcap-ng".{a,la}
+%__rm -f "%{buildroot}%{python_sitearch}/_capng".{a,la}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{?buildroot:%__rm -rf "%{buildroot}"}
 
 %post -n %{name}%{soname} -p /sbin/ldconfig