diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index a9a5dd4..79887b6 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -58,8 +58,9 @@ and start the keyring daemon.
 %patch0 -p1 -b .pam
 
 %build
-libtoolize
-autoreconf
+aclocal
+automake
+autoconf
 %configure --disable-gtk-doc --with-pam-dir=/lib/security
 make %{?_smp_mflags}
 
diff --git a/pam.patch b/pam.patch
index 0f69a0f..b6e10e2 100644
--- a/pam.patch
+++ b/pam.patch
@@ -1,6 +1,6 @@
 diff -up gnome-keyring-2.19.6/pam/Makefile.am.pam gnome-keyring-2.19.6/pam/Makefile.am
 --- gnome-keyring-2.19.6/pam/Makefile.am.pam	2007-07-21 22:01:42.000000000 -0400
-+++ gnome-keyring-2.19.6/pam/Makefile.am	2007-07-27 15:55:41.000000000 -0400
++++ gnome-keyring-2.19.6/pam/Makefile.am	2007-07-27 18:31:40.000000000 -0400
 @@ -17,9 +17,10 @@ pam_gnome_keyring_la_LIBADD = \
  pam_gnome_keyring_la_LDFLAGS = -module -avoid-version
  
@@ -17,7 +17,7 @@ diff -up gnome-keyring-2.19.6/pam/Makefile.am.pam gnome-keyring-2.19.6/pam/Makef
  	rm -f $(PAM_DEST_DIR)/pam_gnome_keyring.so
 diff -up gnome-keyring-2.19.6/configure.in.pam gnome-keyring-2.19.6/configure.in
 --- gnome-keyring-2.19.6/configure.in.pam	2007-07-24 23:05:32.000000000 -0400
-+++ gnome-keyring-2.19.6/configure.in	2007-07-27 16:22:55.000000000 -0400
++++ gnome-keyring-2.19.6/configure.in	2007-07-27 18:31:52.000000000 -0400
 @@ -236,18 +236,15 @@ if test "$enable_pam" != "no"; then
  	if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then
  		AC_MSG_ERROR(The PAM headers are missing)
@@ -36,10 +36,10 @@ diff -up gnome-keyring-2.19.6/configure.in.pam gnome-keyring-2.19.6/configure.in
 -fi
 +fi	
 +
-+AC_ARG_WITH ([pam-dir],
-+             AC_HELP_STRING([--with-pam-dir=DIR],
-+                            [directory to install pam modules in]),,
-+             [with_pam_dir=/usr/lib])
++AC_ARG_WITH([pam-dir],
++            [AC_HELP_STRING([--with-pam-dir=DIR],
++                             [directory to install pam modules in])],
++             [], [with_pam_dir="/usr/lib"])
 +PAM_DEST_DIR="$with_pam_dir"
 +AC_SUBST(PAM_DEST_DIR)
 +