diff --git a/cifs-utils-5.8.tar.bz2 b/cifs-utils-5.8.tar.bz2
deleted file mode 100644
index 6b0d0ab..0000000
--- a/cifs-utils-5.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aae107f4d7f39b9374e2a60a48796c5c7b5c88bf0a5e0281799aff2345e51e82
-size 383272
diff --git a/cifs-utils-5.9.tar.bz2 b/cifs-utils-5.9.tar.bz2
new file mode 100644
index 0000000..183baea
--- /dev/null
+++ b/cifs-utils-5.9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee0d4ae25c54f47362ef4c97cda142224360a2c4a5a8fbf71d87003bf3eaaef2
+size 388403
diff --git a/cifs-utils.changes b/cifs-utils.changes
index c1eaae5..cb915c9 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jan 16 14:51:39 UTC 2013 - lmuelle@suse.com
+
+- Update to cifs-utils 5.9.
+  + new plugin architecture for the ID mapping tools
+  + DOMAIN\username@password format for username= arguments is removed
+  + full RELRO (vs. partial) is now enabled on all binaries
+
 -------------------------------------------------------------------
 Wed Nov 21 04:03:45 UTC 2012 - crrodriguez@opensuse.org
 
diff --git a/cifs-utils.spec b/cifs-utils.spec
index 4294134..483ab03 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cifs-utils
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           cifs-utils
-Version:        5.8
+Version:        5.9
 Release:        0
 Summary:        Utilities for doing and managing mounts of the Linux CIFS filesyste
 License:        GPL-3.0+
@@ -71,6 +71,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 The cifs-utils package consist of utilities for doing and managing mounts of
 the Linux CIFS filesystem.
 
+%package devel
+Summary:        Files needed for building plugins for cifs-utils
+Group:          Development/Libraries
+
+%description devel
+The SMB/CIFS protocol is a standard file sharing protocol widely deployed
+on Microsoft Windows machines. This package contains the header file
+necessary for building ID mapping plugins for cifs-utils.
+
 %prep
 %setup -q
 
@@ -85,7 +94,14 @@ mkdir -p \
 	${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d
 %{__make} install \
 	DESTDIR=${RPM_BUILD_ROOT}
-%if 0%{?suse_version}
+%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1020
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}
+ln -s %{_libdir}/%{name}/idmapwb.so %{buildroot}%{_sysconfdir}/%{name}/idmap-plugin
+%endif
+mkdir -p %{buildroot}%{_sysconfdir}/request-key.d
+install -m 644 -p contrib/request-key.d/cifs.idmap.conf %{buildroot}%{_sysconfdir}/request-key.d
+install -m 644 -p contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir}/request-key.d
+%if 0%{?suse_version} > 1100
 	mkdir -p ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/
 	%{__install} -m 0755 ${RPM_SOURCE_DIR}/mkinitrd_scripts_boot-cifs.sh ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/boot-cifs.sh
 	%{__install} -m 0755 ${RPM_SOURCE_DIR}/mkinitrd_scripts_setup-cifs.sh ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/setup-cifs.sh
@@ -125,26 +141,40 @@ exit 0
 %files
 %defattr(-,root,root)
 /sbin/mount.cifs
-%{_bindir}/cifscreds
-%if 0%{?mandriva_version} > 201100 || 0%{?mandriva_version} == 0
+%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1020
 %{_bindir}/getcifsacl
 %{_bindir}/setcifsacl
 %{_sbindir}/cifs.idmap
-%endif
-%{_sbindir}/cifs.upcall
-%doc %{_mandir}/man1/cifscreds.1.*
-%if 0%{?mandriva_version} > 201100 || 0%{?mandriva_version} == 0
 %doc %{_mandir}/man1/getcifsacl.1.*
 %doc %{_mandir}/man1/setcifsacl.1.*
 %doc %{_mandir}/man8/cifs.idmap.8.*
 %endif
+%if 0%{?centos_version} > 499 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 499 || 0%{?suse_version} > 1020
+%{_bindir}/cifscreds
+%{_sbindir}/cifs.upcall
+%doc %{_mandir}/man1/cifscreds.1.*
 %doc %{_mandir}/man8/cifs.upcall.8.*
+%endif
 %doc %{_mandir}/man8/mount.cifs.8.*
+%dir %{_sysconfdir}/request-key.d
 %if 0%{?suse_version} > 1100
 %dir /lib/mkinitrd
 %dir /lib/mkinitrd/scripts
 /lib/mkinitrd/scripts/setup-cifs.sh
 /lib/mkinitrd/scripts/boot-cifs.sh
 %endif
+%config(noreplace) %{_sysconfdir}/request-key.d/cifs.idmap.conf
+%config(noreplace) %{_sysconfdir}/request-key.d/cifs.spnego.conf
+%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1020
+%dir %{_libdir}/cifs-utils
+%dir %{_sysconfdir}/cifs-utils
+%config(noreplace) %{_sysconfdir}/cifs-utils/idmap-plugin
+%{_libdir}/%{name}/idmapwb.so
+%doc %{_mandir}/man8/idmapwb.8.*
+%endif
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/cifsidmap.h
 
 %changelog