diff --git a/baselibs.conf b/baselibs.conf
index 671f7f3..644db35 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,2 @@
 ecryptfs-utils
+  supplements "packageand(ecryptfs-utils:pam-<targettype>)"
diff --git a/ecryptfs-utils.changes b/ecryptfs-utils.changes
index a521188..4e38efe 100644
--- a/ecryptfs-utils.changes
+++ b/ecryptfs-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 25 12:37:06 CEST 2009 - sbrabec@suse.cz
+
+- Supplement pam-32bit/pam-64bit in baselibs.conf (bnc#354164).
+
 -------------------------------------------------------------------
 Fri Oct 24 13:58:01 CEST 2008 - meissner@suse.de
 
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 253f3c4..51470de 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ecryptfs-utils (Version 61)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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
@@ -25,7 +25,7 @@ Group:          Productivity/Security
 AutoReqProv:    on
 Summary:        Userspace Utilities for ecryptfs
 Version:        61
-Release:        1
+Release:        2
 Source0:        http://downloads.sourceforge.net/ecryptfs/%{name}-%{version}.tar.bz2
 Patch0:         ecryptfs-utils-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -87,56 +87,3 @@ rm -rf $RPM_BUILD_ROOT
 /%_lib/security/pam_ecryptfs.so
 
 %changelog
-* Fri Oct 24 2008 meissner@suse.de
-- Upgraded to version 61
-   - starts of filename encryption
-   - bugfixes
-* Fri Sep 19 2008 meissner@suse.de
-- Upgraded to version 58
-   - config file changes yet again
-   - some documentation fixes
-   - some TPM related fixes
-* Sat Aug 23 2008 meissner@suse.de
-- Upgraded to version 56
-   - more manpages
-   - changed configfile format
-* Sat Jul 12 2008 meissner@suse.de
-- Upgraded to version 50
-  - another manpage
-  - bugfixes
-  - fixed kernel netlink interface
-* Thu Apr 10 2008 ro@suse.de
-- added baselibs.conf file to build xxbit packages
-  for multilib support
-* Thu Apr 03 2008 meissner@suse.de
-- Upgraded to version 41
-	- typo fixed in manpage
-- enabled TPM support (tspi)
-- enabled PKCS11 support
-* Tue Feb 26 2008 meissner@suse.de
-- Upgraded to version 40
-  - more manpages
-  - some new features
-  - lots of bugfixes
-* Fri Aug 03 2007 meissner@suse.de
-- fixed pam module path for ia64 and s390x too.
-* Sun Jul 29 2007 meissner@suse.de
-- fixed pam module path
-* Fri Jul 27 2007 meissner@suse.de
-- uphgraded to version 18.
-	- TPM support (not yet enabled)
-	- added PAM module
-* Tue Mar 20 2007 meissner@suse.de
-- build on IA64
-- fixed compiler warnings
-* Tue Mar 06 2007 meissner@suse.de
-- fixed build on lib64
-* Mon Mar 05 2007 meissner@suse.de
-- upgraded to version 10.
-  - unlisted enhancements and bugfixes.
-* Thu Dec 14 2006 meissner@suse.de
-- use lib64 correctly.
-- fixed "is used uninitialized" warnings.
-* Tue Dec 05 2006 meissner@suse.de
-- initial checkin of version 5.
-     - userland utilities to control ecryptfs filesystems