diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am
index 60f00fba..2a16de3c 100644
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@@ -3,11 +3,11 @@
 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 \
-			  sc-emv.c sc-pkcs15.c sc-pkcs15-cert.c \
-			  sc-pkcs15-pin.c sc-pkcs15-prkey.c \
-			  sc-pkcs15-defaults.c sc-pkcs15-sec.c \
+			  sc-pkcs15.c sc-pkcs15-cert.c sc-pkcs15-pin.c \
+			  sc-pkcs15-prkey.c sc-pkcs15-defaults.c \
+			  sc-pkcs15-sec.c \
 			  sc-card-setec.c sc-card-multiflex.c \
-			  sc-card-default.c
+			  sc-card-emv.c sc-card-default.c
 libopensc_la_LDFLAGS	= -version-info 0:4:0
 libopensc_la_LIBADD	= @LIBPCSCLITE@
 libopensc_la_CFLAGS     = $(AM_CFLAGS) -Werror
diff --git a/src/libopensc/sc-emv.c b/src/libopensc/card-emv.c
similarity index 98%
rename from src/libopensc/sc-emv.c
rename to src/libopensc/card-emv.c
index c5fe5ea7..5e1323e0 100644
--- a/src/libopensc/sc-emv.c
+++ b/src/libopensc/card-emv.c
@@ -1,5 +1,5 @@
 /*
- * sc-emv.c: Functions specified by the EMV standard
+ * sc-card-emv.c: Functions specified by the EMV standard
  *
  * Copyright (C) 2001  Juha Yrjölä <juha.yrjola@iki.fi>
  *
diff --git a/src/libopensc/iso7816.c b/src/libopensc/iso7816.c
index 03ed64b3..cd36ea23 100644
--- a/src/libopensc/iso7816.c
+++ b/src/libopensc/iso7816.c
@@ -307,19 +307,24 @@ static int iso7816_get_challenge(struct sc_card *card, u8 *rnd, size_t len)
 }
 
 static struct sc_card_operations iso_ops = {
-	read_binary: NULL
+	NULL,
 };
-
 static const struct sc_card_driver iso_driver = {
 	NULL,
 	"ISO 7816-x reference driver",
 	&iso_ops
 };
 
+static int no_match(struct sc_card *card)
+{
+	return 0;
+}
+
 const struct sc_card_driver * sc_get_iso7816_driver(void)
 {
-	if (iso_ops.read_binary == NULL) {
+	if (iso_ops.match_card == NULL) {
 		memset(&iso_ops, 0, sizeof(iso_ops));
+		iso_ops.match_card = no_match;
 		iso_ops.read_binary = iso7816_read_binary;
 		iso_ops.read_record = iso7816_read_record;
 		iso_ops.select_file = iso7816_select_file;