diff --git a/baselibs.conf b/baselibs.conf
index de36825..d487032 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,2 @@
 pam_pkcs11
+  supplements "packageand(pam_pkcs11:pam-<targettype>)"
diff --git a/pam_pkcs11.changes b/pam_pkcs11.changes
index e25eaf9..17ecb27 100644
--- a/pam_pkcs11.changes
+++ b/pam_pkcs11.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 25 12:41:19 CEST 2009 - sbrabec@suse.cz
+
+- Supplement pam-32bit/pam-64bit in baselibs.conf (bnc#354164).
+
 -------------------------------------------------------------------
 Wed Oct 15 18:30:29 CEST 2008 - sbrabec@suse.cz
 
diff --git a/pam_pkcs11.spec b/pam_pkcs11.spec
index 86b4d39..7f1a067 100644
--- a/pam_pkcs11.spec
+++ b/pam_pkcs11.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package pam_pkcs11 (Version 0.6.0)
 #
-# 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
@@ -20,7 +20,7 @@
 
 Name:           pam_pkcs11
 Version:        0.6.0
-Release:        139
+Release:        140
 Url:            http://www.opensc-project.org/pam_pkcs11/
 Group:          Productivity/Security
 License:        LGPL v2.1 or later
@@ -128,28 +128,3 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/pam.d/common-auth-smartcard
 
 %changelog
-* Wed Oct 15 2008 sbrabec@suse.cz
-- Fixed all implicit declarations.
-* Tue Sep 23 2008 sbrabec@suse.cz
-- Fixed uninitialized variable (bnc#351207).
-* Thu Apr 10 2008 ro@suse.de
-- added baselibs.conf file to build xxbit packages
-  for multilib support
-* Thu Sep 06 2007 jberkman@novell.com
-- use the same directory for nssdb as the kerberos pkinit plugin
-* Tue Jul 31 2007 sbrabec@suse.cz
-- Build with NSS instead of openssl.
-- Applied patches from Jacob Berkman: MS UPN OID and NSS
-  configuration.
-- Fixed implicit declaration.
-* Thu Jul 26 2007 sbrabec@suse.cz
-- Updated to version 0.6.0:
-  * compiler warning fixes
-  * I18N support
-  * new configuration options
-  * support for new environment variables
-  * new tool pkcs11_setup
-  * support for the NSS crypto libraries (off by default)
-  * for more changes see ChangeLog.svn
-* Fri May 12 2006 sbrabec@suse.cz
-- New SuSE package, version 0.5.3.