diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am
index b8cfbcc4..778395d0 100644
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@@ -1,5 +1,7 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 
+INCLUDES = @CFLAGS_PCSC@
+
 lib_LTLIBRARIES		= libopensc.la
 libopensc_la_SOURCES	= sc-asn1.c sc-base64.c sc-defaults.c \
 			  sc-sec.c sc-log.c sc.c sc-card.c sc-iso7816.c \
diff --git a/src/openssh/Makefile.am b/src/openssh/Makefile.am
index 6fa3eae1..bd82dc54 100644
--- a/src/openssh/Makefile.am
+++ b/src/openssh/Makefile.am
@@ -1,8 +1,7 @@
 # Process this file with automake to create Makefile.in
 
-INCLUDES = -I../libopensc
-LDFLAGS = @LDFLAGS@ @LIBCRYPTO@ \
-	../libopensc/libopensc.la
+INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
+LDFLAGS = @LDFLAGS@ @LIBCRYPTO@ @LIBOPENSC@
 
 EXTRA_DIST = openssh-3.0.2p1-patch.diff
 
diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am
index 09d6005c..e0c3a792 100644
--- a/src/pam/Makefile.am
+++ b/src/pam/Makefile.am
@@ -2,9 +2,8 @@
 
 libdir = ${prefix}/lib/security
 
-INCLUDES = -I../libopensc
-LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ @LIBCRYPTO@ \
-	../libopensc/libopensc.la
+INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
+LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ @LIBCRYPTO@ @LIBOPENSC@
 
 SRC = pam_pkcs15.c
 INC = 
diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am
index 78949b56..540f4da4 100644
--- a/src/pkcs11/Makefile.am
+++ b/src/pkcs11/Makefile.am
@@ -4,10 +4,9 @@ SUBDIRS = . pkcs11
 
 libdir = ${prefix}/lib/pkcs11
 
-INCLUDES = -I../libopensc
+INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
 
-LDFLAGS = @LDFLAGS@ @LIBDL@ \
-	../libopensc/libopensc.la
+LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBOPENSC@
 
 SRC = function_table.c generic.c session.c object.c \
 	endecrypt.c digestsign.c verify.c misc.c slot.c
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 924aae3c..951335e3 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,8 +1,7 @@
 # Process this file with automake to create Makefile.in
 
-INCLUDES = -I../libopensc
-LDFLAGS = @LDFLAGS@ \
-	../libopensc/libopensc.la
+INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
+LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
 noinst_PROGRAMS = base64 hst-test lottery p15dump \
 		  pintest prngtest
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 7ab4404a..cec51f76 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,8 +1,7 @@
 # Process this file with automake to create Makefile.in
 
-INCLUDES = -I../libopensc
-LDFLAGS = @LDFLAGS@ \
-	../libopensc/libopensc.la
+INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
+LDFLAGS = @LDFLAGS@ @LIBOPENSC@
 
 bin_PROGRAMS = opensc-crypt opensc-tool