diff --git a/Makefile.am b/Makefile.am
index 5d43463..e010363 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,16 +37,18 @@ libdir = $(PAMDIR)
 
 lib_LTLIBRARIES = pam_yubico.la
 
-pam_yubico_la_SOURCES = pam_yubico.c drop_privs.h drop_privs.c
+pam_yubico_la_SOURCES = drop_privs.h drop_privs.c
 # XXX add -Wl,-x too?  PAM documentation suggests it.
-pam_yubico_la_LIBADD = @LTLIBYUBIKEY@ @LTLIBYKCLIENT@ @LIBLDAP@ -lpam
-pam_yubico_la_LIBADD += libpam_util.la
+pam_yubico_la_LIBADD = @LTLIBYUBIKEY@ @LTLIBYKCLIENT@ @LIBLDAP@ @LIBPAM@
+pam_yubico_la_LIBADD += libpam_util.la libpam_real.la
 pam_yubico_la_LDFLAGS = -module -avoid-version
 
-noinst_LTLIBRARIES = libpam_util.la
+noinst_LTLIBRARIES = libpam_util.la libpam_real.la
 libpam_util_la_SOURCES = util.c util.h
 libpam_util_la_LIBADD = @LTLIBYUBIKEY@ @YKPERS_LIBS@
 
+libpam_real_la_SOURCES = pam_yubico.c
+
 DEFS = -DDEBUG_PAM -DPAM_DEBUG @DEFS@
 
 # The command line tools.
diff --git a/configure.ac b/configure.ac
index 7a0f99e..2a72149 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ AC_CHECK_HEADERS([security/pam_modules.h security/_pam_macros.h security/pam_mod
   [#include <sys/types.h>
    #include <security/pam_appl.h>])
 
-AC_CHECK_LIB([pam], [pam_start])
+AC_CHECK_LIB([pam], [pam_start], [AC_SUBST([LIBPAM], ["-lpam"])])
 
 AC_ARG_WITH([ldap],
             [AS_HELP_STRING([--without-ldap],