diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2f7c4af..0000000
--- a/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS = ccid virtualsmartcard
-
-default: all
-
-%:
-	for d in $(SUBDIRS); do $(MAKE) $@ -C $$d; done
diff --git a/picc_to_pcsc/configure.ac b/picc_to_pcsc/configure.ac
index 05a787f..52df769 100644
--- a/picc_to_pcsc/configure.ac
+++ b/picc_to_pcsc/configure.ac
@@ -14,7 +14,7 @@ AM_PATH_PYTHON
 PKG_PROG_PKG_CONFIG
 
 # Checks for libraries.
-PKG_CHECK_EXISTS([libopensc],
+PKG_CHECK_EXISTS([libpcsclite],
                  [PKG_CHECK_MODULES([PCSC], [libpcsclite])],
                  [AC_MSG_WARN([libpcsclite not found by pkg-config])])
 
diff --git a/virtualsmartcard/configure.ac b/virtualsmartcard/configure.ac
index c3dca1e..ddd15d8 100644
--- a/virtualsmartcard/configure.ac
+++ b/virtualsmartcard/configure.ac
@@ -19,7 +19,14 @@ AM_PATH_PYTHON
 PKG_PROG_PKG_CONFIG
 
 # Checks for libraries.
-PKG_CHECK_MODULES([PCSC], [libpcsclite])
+PKG_CHECK_EXISTS([libpcsclite],
+                 [PKG_CHECK_MODULES([PCSC], [libpcsclite])],
+                 [AC_MSG_WARN([libpcsclite not found by pkg-config])])
+saved_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PCSC_CFLAGS"
+AC_CHECK_HEADERS(ifdhandler.h,,
+        [ AC_MSG_ERROR([ifdhandler.h not found, install libpcsclite or use ./configure PCSC_CFLAGS=...]) ])
+CPPFLAGS="$saved_CPPFLAGS"
 
 # --enable-serialdropdir=DIR
 AC_ARG_ENABLE(serialdropdir,
@@ -27,8 +34,8 @@ AC_ARG_ENABLE(serialdropdir,
 	serial wrapper driver (default to pcscd config or $(prefix)/pcsc/drivers/serial)]),
 	[serialdropdir="${enableval}"], [serialdropdir=false])
 if test "${serialdropdir}" = false ; then
-	serialdropdir=`$PKG_CONFIG libpcsclite --variable=usbdropdir`/serial
-	if test "${serialdropdir}" = "/serial" ; then
+	serialdropdir=${prefix}`$PKG_CONFIG libpcsclite --variable=usbdropdir`/serial
+	if test "${serialdropdir}" = "${prefix}/serial" ; then
 		AC_MSG_ERROR([use --enable-serialdropdir=DIR])
 	fi
 fi
@@ -76,11 +83,12 @@ esac
 
 cat << EOF
 
-libifdnfc has been configured with following options:
+virtualsmartcard has been configured with following options:
 
 Version:              ${PACKAGE_VERSION}
 User binaries:        $(eval eval eval echo "${bindir}")
 Configuration files:  $(eval eval eval echo "${sysconfdir}")
+Python site-packages: $(eval eval eval echo "${pythondir}")
 Driver directory:     ${serialdropdir}
 
 
@@ -93,8 +101,6 @@ Linker flags:         ${LDFLAGS}
 Libraries:            ${LIBS}
 PCSC_CFLAGS:          ${PCSC_CFLAGS}
 PCSC_LIBS:            ${PCSC_LIBS}
-LIBNFC_CFLAGS:        ${LIBNFC_CFLAGS}
-LIBNFC_LIBS:          ${LIBNFC_LIBS}
 BUNDLE_HOST:          ${BUNDLE_HOST}
 DYN_LIB_EXT:          ${DYN_LIB_EXT}
 
diff --git a/virtualsmartcard/src/vpcd/Makefile.am b/virtualsmartcard/src/vpcd/Makefile.am
index 4c87a28..b30ede4 100644
--- a/virtualsmartcard/src/vpcd/Makefile.am
+++ b/virtualsmartcard/src/vpcd/Makefile.am
@@ -2,7 +2,7 @@ VPCD_LIB = libvpcd.$(DYN_LIB_EXT)
 
 lib_LTLIBRARIES = libvpcd.la
 libvpcd_la_SOURCES = ifd.c vpcd.c
-libvpcd_la_LIBADD = $(PCSC_LIBS)
+#libvpcd_la_LIBADD = $(PCSC_LIBS)
 libvpcd_la_CFLAGS = $(PCSC_CFLAGS)
 
 EXTRA_DIST = reader.conf.in
@@ -10,9 +10,9 @@ EXTRA_DIST = reader.conf.in
 install: install_libvpcd
 
 install_libvpcd: libvpcd.la
-	$(mkinstalldirs) $(DESTDIR)$(prefix)$(serialdropdir)
-	cp .libs/$(VPCD_LIB) $(DESTDIR)$(prefix)$(serialdropdir)/$(VPCD_LIB).$(VERSION)
-	ln -fs $(VPCD_LIB).$(VERSION) $(DESTDIR)$(prefix)$(serialdropdir)/$(VPCD_LIB)
+	$(mkinstalldirs) $(DESTDIR)$(serialdropdir)
+	cp .libs/$(VPCD_LIB) $(DESTDIR)$(serialdropdir)/$(VPCD_LIB).$(VERSION)
+	ln -fs $(VPCD_LIB).$(VERSION) $(DESTDIR)$(serialdropdir)/$(VPCD_LIB)
 	if [ -e $(DESTDIR)$(sysconfdir)/reader.conf ] ; \
 	then \
 		echo "Edit existing /etc/reader.conf" ; \
@@ -24,4 +24,4 @@ install_libvpcd: libvpcd.la
 uninstall: uninstall_libvpcd
 
 uninstall_libvpcd:
-	rm -f $(DESTDIR)$(prefix)$(serialdropdir)/$(VPCD_LIB).$(VERSION)
+	rm -f $(DESTDIR)$(serialdropdir)/$(VPCD_LIB).$(VERSION)