diff --git a/pam_yubico-pamuid_t.patch b/pam_yubico-pamuid_t.patch
new file mode 100644
index 0000000..c61f771
--- /dev/null
+++ b/pam_yubico-pamuid_t.patch
@@ -0,0 +1,28 @@
+Index: pam_yubico-2.10/configure.ac
+===================================================================
+--- pam_yubico-2.10.orig/configure.ac
++++ pam_yubico-2.10/configure.ac
+@@ -37,7 +37,10 @@ AC_PROG_LIBTOOL
+ 
+ AC_CHECK_HEADERS([security/pam_appl.h], [],
+   [AC_MSG_ERROR([[PAM header files not found, install libpam-dev.]])])
+-AC_CHECK_HEADERS([security/pam_modules.h security/_pam_macros.h security/pam_modutil.h], [], [],
++AC_CHECK_HEADERS([security/pam_modutil.h], [], [],
++  [#include <security/pam_appl.h>
++   #include <unistd.h>])
++AC_CHECK_HEADERS([security/pam_modules.h security/_pam_macros.h], [], [],
+   [#include <security/pam_appl.h>])
+ 
+ AC_CHECK_LIB([pam], [pam_start])
+Index: pam_yubico-2.10/drop_privs.c
+===================================================================
+--- pam_yubico-2.10.orig/drop_privs.c
++++ pam_yubico-2.10/drop_privs.c
+@@ -47,6 +47,7 @@
+ 
+ #ifdef HAVE_PAM_MODUTIL_DROP_PRIV
+ #ifdef HAVE_SECURITY_PAM_MODUTIL_H
++#include <unistd.h>
+ #include <security/pam_modutil.h>
+ #endif /* HAVE_SECURITY_PAM_MODUTIL_H */
+ #else
diff --git a/pam_yubico.spec b/pam_yubico.spec
index 0de2494..96c9d05 100644
--- a/pam_yubico.spec
+++ b/pam_yubico.spec
@@ -7,11 +7,12 @@ Group:          System Environment/Base
 License:        BSD
 URL:            http://yubico-pam.googlecode.com/
 Source0:        http://yubico-pam.googlecode.com/files/pam_yubico-%{version}.tar.gz
+Patch0:         pam_yubico-pamuid_t.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ykclient-devel >= 2.4
 BuildRequires:  libyubikey-devel >= 1.5
-BuildRequires:  pam-devel ykpers-devel openldap-devel
+BuildRequires:  pam-devel ykpers-devel openldap-devel autoconf
 #Requires:       
 
 %description
@@ -20,8 +21,10 @@ Linux-PAM and yubikeys. This module supports yubikey OTP checking.
 
 %prep
 %setup -q 
+%patch0 -p1
 
 %build
+autoconf
 %configure --libdir=/%{_lib} \
            --with-pam-dir=/%{_lib}/security/
 make %{?_smp_mflags}