diff --git a/virtualsmartcard/src/Makefile.am b/virtualsmartcard/src/Makefile.am
index ea92d1f..e209f27 100644
--- a/virtualsmartcard/src/Makefile.am
+++ b/virtualsmartcard/src/Makefile.am
@@ -1,5 +1,5 @@
+SUBDIRS  = vpcd vpicc
+
 if BUILD_LIBPCSCLITE
-SUBDIRS = libpcsclite vpcd vpicc
-else
-SUBDIRS = vpcd vpicc
+SUBDIRS += libpcsclite
 endif
diff --git a/virtualsmartcard/src/libpcsclite/Makefile.am b/virtualsmartcard/src/libpcsclite/Makefile.am
index 1b6b98b..84993cf 100644
--- a/virtualsmartcard/src/libpcsclite/Makefile.am
+++ b/virtualsmartcard/src/libpcsclite/Makefile.am
@@ -4,8 +4,8 @@ lib_LTLIBRARIES         = libpcsclite.la
 
 libpcsclite_la_CPPFLAGS = $(PCSC_CFLAGS) -I$(srcdir)/../vpcd
 libpcsclite_la_LDFLAGS  = -no-undefined
-libpcsclite_la_SOURCES  = winscard.c debug.c strlcpy.c error.c \
-						  $(top_builddir)/src/vpcd/libvpcd.la
+libpcsclite_la_SOURCES  = winscard.c debug.c strlcpy.c error.c
+libpcsclite_la_LIBADD   = $(top_builddir)/src/vpcd/libvpcd.la
 
 noinst_HEADERS = pcsclite.h strlcpycat.h misc.h
 
diff --git a/virtualsmartcard/src/libpcsclite/libpcsclite.pc.in b/virtualsmartcard/src/libpcsclite/libpcsclite.pc.in
index f59d02c..8fec830 100644
--- a/virtualsmartcard/src/libpcsclite/libpcsclite.pc.in
+++ b/virtualsmartcard/src/libpcsclite/libpcsclite.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@/PCSC
 Name: @PACKAGE_NAME@
 Description: PC/SC smart card interface
 Version: @VERSION@
-Libs: -L${libdir} -lpcsclite -lvpcd
+Libs: -L${libdir} -lpcsclite
 Cflags: -I${includedir}
diff --git a/virtualsmartcard/src/vpcd/Makefile.am b/virtualsmartcard/src/vpcd/Makefile.am
index 76becb1..8e6cbcf 100644
--- a/virtualsmartcard/src/vpcd/Makefile.am
+++ b/virtualsmartcard/src/vpcd/Makefile.am
@@ -1,12 +1,9 @@
 VPCD_LIB = $(LIB_PREFIX)vpcd.$(DYN_LIB_EXT)
 
 libvpcd_la_SOURCES = ifd-vpcd.c vpcd.c
-libvpcd_la_LIBADD = $(PCSC_LIBS)
 libvpcd_la_LDFLAGS = -no-undefined
 libvpcd_la_CFLAGS = $(PCSC_CFLAGS)
 
-lib_LTLIBRARIES = libvpcd.la
-
 noinst_HEADERS = vpcd.h
 
 EXTRA_DIST = reader.conf.in
@@ -18,7 +15,21 @@ do_subst = $(SED) \
 
 
 if BUILD_LIBPCSCLITE
+
+noinst_LTLIBRARIES = libvpcd.la
+
+ifd-vpcd.c: pcsclite.h
+
+.PHONY: pcsclite.h
+pcsclite.h:
+	$(MAKE) -C $(builddir)/../libpcsclite pcsclite.h
+
 else
+
+libvpcd_la_LIBADD = $(PCSC_LIBS)
+
+lib_LTLIBRARIES = libvpcd.la
+
 install: install_libvpcd
 
 install_libvpcd: libvpcd.la reader.conf.in