diff --git a/etc/opensc.conf.in b/etc/opensc.conf.in
index 17ede5b0..6afc3997 100644
--- a/etc/opensc.conf.in
+++ b/etc/opensc.conf.in
@@ -206,16 +206,19 @@ app default {
 	 	# driver = "piv";
 	# }
 
-	# Estonian ID card and Micardo driver currently play together with T=0
-	# only. In theory only the 'cold' ATR should be specified, as T=0 will
+	# Estonian ID card and Micardo driver sometimes only play together with T=0
+	# In theory only the 'cold' ATR should be specified, as T=0 will
 	# be the preferred protocol once you boot it up with T=0, but be
 	# paranoid.
-	card_atr 3b:6e:00:ff:45:73:74:45:49:44:20:76:65:72:20:31:2e:30 {
-		force_protocol = t0;
-	}
-	card_atr 3b:fe:94:00:ff:80:b1:fa:45:1f:03:45:73:74:45:49:44:20:76:65:72:20:31:2e:30:43 {
-		force_protocol = t0;
-	}
+	# 
+	# (warm ATR)
+	# card_atr 3b:6e:00:ff:45:73:74:45:49:44:20:76:65:72:20:31:2e:30 {
+	#	force_protocol = t0;
+	# }
+	# (cold ATR)
+	# card_atr 3b:fe:94:00:ff:80:b1:fa:45:1f:03:45:73:74:45:49:44:20:76:65:72:20:31:2e:30:43 {
+	# 	force_protocol = t0;
+	# }
 
 	# D-Trust cards are also based on micardo and need T=0 for some reason
 	card_atr 3b:ff:94:00:ff:80:b1:fe:45:1f:03:00:68:d2:76:00:00:28:ff:05:1e:31:80:00:90:00:23 {
diff --git a/src/libopensc/card-mcrd.c b/src/libopensc/card-mcrd.c
index 0bdc3f70..8097adce 100644
--- a/src/libopensc/card-mcrd.c
+++ b/src/libopensc/card-mcrd.c
@@ -40,6 +40,7 @@ static struct sc_atr_table mcrd_atrs[] = {
 	  "D-Trust", SC_CARD_TYPE_MCRD_DTRUST, 0, NULL},
 	{"3b:ff:11:00:ff:80:b1:fe:45:1f:03:00:68:d2:76:00:00:28:ff:05:1e:31:80:00:90:00:a6", NULL,
 	  "D-Trust", SC_CARD_TYPE_MCRD_DTRUST, 0, NULL},
+	{"3B:FE:94:00:FF:80:B1:FA:45:1F:03:45:73:74:45:49:44:20", NULL, "Broken EstEID ATR", SC_CARD_TYPE_MCRD_ESTEID, 0, NULL},
 	{NULL, NULL, NULL, 0, 0, NULL}
 };