diff --git a/Makefile.am b/Makefile.am
index 76fa78c..aea899e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ lib_LTLIBRARIES = pam_yubico.la
 
 pam_yubico_la_SOURCES = pam_yubico.c util.c
 # XXX add -Wl,-x too?  PAM documentation suggests it.
-pam_yubico_la_LIBADD = @LTLIBYKCLIENT@ @LIBLDAP@ @YKPERS_LIBS@
+pam_yubico_la_LIBADD = @LTLIBYKCLIENT@ @LIBLDAP@ @YKPERS_LIBS@ @LTLIBYUBIKEY@
 pam_yubico_la_LDFLAGS = -module -avoid-version
 pam_yubico_la_CPPFLAGS = @YKPERS_CFLAGS@
 
@@ -45,7 +45,7 @@ DEFS = -DDEBUG_PAM -DPAM_DEBUG @DEFS@
 bin_PROGRAMS = ykpamcfg
 
 ykpamcfg_SOURCES = ykpamcfg.c util.c
-ykpamcfg_LDADD = @LTLIBYKCLIENT@ @YKPERS_LIBS@
+ykpamcfg_LDADD = @LTLIBYKCLIENT@ @YKPERS_LIBS@ @LTLIBYUBIKEY@
 ykpamcfg_CPPFLAGS = @YKPERS_CFLAGS@
 
 dist_man1_MANS = ykpamcfg.1
diff --git a/configure.ac b/configure.ac
index 75858e3..ac20cc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,13 @@ if test "$ac_cv_libykclient" != yes; then
    AC_MSG_ERROR([[Libykclient v2.4+ required, see http://code.google.com/p/yubico-c-client/]])
 fi
 
+AC_LIB_HAVE_LINKFLAGS(yubikey,,
+		      [#include <yubikey.h>],                                                                                                                               			  [yubikey_modhex_p("foo")])
+if test "$ac_cv_libyubikey" != yes; then
+  AC_MSG_ERROR([libyubikey v1.5+ not found, see http://code.google.com/p/yubico-c/])
+fi
+
+
 PKG_CHECK_MODULES([YKPERS], [ykpers-1]);
 
 AC_SUBST(PAMDIR, "\$(exec_prefix)/lib/security")