diff --git a/src/Makefile.am b/src/Makefile.am
index 6ef3462f..86eca44c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,4 +5,4 @@ MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = Makefile.mak
 
 # Order IS important
-SUBDIRS = common include scconf scldap scrandom assuan libopensc pkcs15init pkcs11 tests tools openssh scam pam sia signer
+SUBDIRS = common include scconf scldap scrandom assuan libopensc pkcs15init pkcs11 tests tools openssh scam pam sia signer usbtoken
diff --git a/src/include/opensc/Makefile.am b/src/include/opensc/Makefile.am
index 63fa8077..820b0d19 100644
--- a/src/include/opensc/Makefile.am
+++ b/src/include/opensc/Makefile.am
@@ -21,17 +21,17 @@ MAINTAINERCLEANFILES = Makefile.in \
 
 all-local:
 	@$(RM) *.h
-	@$(LN_S) ../../libopensc/asn1.h asn1.h
-	@$(LN_S) ../../libopensc/cardctl.h cardctl.h
-	@$(LN_S) ../../libopensc/emv.h emv.h
-	@$(LN_S) ../../libopensc/log.h log.h
-	@$(LN_S) ../../libopensc/opensc.h opensc.h
-	@$(LN_S) ../../libopensc/errors.h errors.h
-	@$(LN_S) ../../libopensc/types.h types.h
-	@$(LN_S) ../../libopensc/pkcs15.h pkcs15.h
-	@$(LN_S) ../../pkcs15init/pkcs15-init.h pkcs15-init.h
-	@$(LN_S) ../../pkcs11/pkcs11.h pkcs11.h
-	@$(LN_S) ../../scconf/scconf.h scconf.h
-	@$(LN_S) ../../scldap/scldap.h scldap.h
-	@$(LN_S) ../../scrandom/scrandom.h scrandom.h
+	@$(LN_S) ${top_srcdir}/src/libopensc/asn1.h asn1.h
+	@$(LN_S) ${top_srcdir}/src/libopensc/cardctl.h cardctl.h
+	@$(LN_S) ${top_srcdir}/src/libopensc/emv.h emv.h
+	@$(LN_S) ${top_srcdir}/src/libopensc/log.h log.h
+	@$(LN_S) ${top_srcdir}/src/libopensc/opensc.h opensc.h
+	@$(LN_S) ${top_srcdir}/src/libopensc/errors.h errors.h
+	@$(LN_S) ${top_srcdir}/src/libopensc/types.h types.h
+	@$(LN_S) ${top_srcdir}/src/libopensc/pkcs15.h pkcs15.h
+	@$(LN_S) ${top_srcdir}/src/pkcs15init/pkcs15-init.h pkcs15-init.h
+	@$(LN_S) ${top_srcdir}/src/pkcs11/pkcs11.h pkcs11.h
+	@$(LN_S) ${top_srcdir}/src/scconf/scconf.h scconf.h
+	@$(LN_S) ${top_srcdir}/src/scldap/scldap.h scldap.h
+	@$(LN_S) ${top_srcdir}/src/scrandom/scrandom.h scrandom.h
 
diff --git a/src/include/opensc/rsaref/Makefile.am b/src/include/opensc/rsaref/Makefile.am
index df9b8582..3cfce5ed 100644
--- a/src/include/opensc/rsaref/Makefile.am
+++ b/src/include/opensc/rsaref/Makefile.am
@@ -11,9 +11,9 @@ MAINTAINERCLEANFILES = Makefile.in \
 
 all-local:
 	@$(RM) *.h
-	@$(LN_S) ../../../pkcs11/rsaref/pkcs11.h pkcs11.h
-	@$(LN_S) ../../../pkcs11/rsaref/pkcs11f.h pkcs11f.h
-	@$(LN_S) ../../../pkcs11/rsaref/pkcs11t.h pkcs11t.h
-	@$(LN_S) ../../../pkcs11/rsaref/unix.h unix.h
-	@$(LN_S) ../../../pkcs11/rsaref/win32.h win32.h
+	@$(LN_S) ${top_srcdir}/src/pkcs11/rsaref/pkcs11.h pkcs11.h
+	@$(LN_S) ${top_srcdir}/src/pkcs11/rsaref/pkcs11f.h pkcs11f.h
+	@$(LN_S) ${top_srcdir}/src/pkcs11/rsaref/pkcs11t.h pkcs11t.h
+	@$(LN_S) ${top_srcdir}/src/pkcs11/rsaref/unix.h unix.h
+	@$(LN_S) ${top_srcdir}/src/pkcs11/rsaref/win32.h win32.h
 
diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am
index e2793171..cfaeb005 100644
--- a/src/pam/Makefile.am
+++ b/src/pam/Makefile.am
@@ -4,9 +4,9 @@ libdir = @libdir@/security
 
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = -I../scam
+INCLUDES = -I${top_srcdir}/src/scam
 
-LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ ../scam/libscam.la
+LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ ${top_builddir}/src/scam/libscam.la
 
 SRC = pam_opensc.c pam_support.c pam_support.h