diff --git a/src/libopensc/pkcs15-tcos.c b/src/libopensc/pkcs15-tcos.c
index a8003a3c..6427c60a 100644
--- a/src/libopensc/pkcs15-tcos.c
+++ b/src/libopensc/pkcs15-tcos.c
@@ -43,6 +43,7 @@ int sc_pkcs15emu_tcos_init_ex(sc_pkcs15_card_t *p15card, sc_pkcs15emu_opt_t *opt
 	} cardlist[]={
 		{"Netkey E4 Card", "TeleSec GmbH"},
 		{"SignTrust Card", "Deutsche Post"},
+		{"DATEV classic", "DATEV"},
 		{"Smartkey Card TypA", "Kobil GmbH"},
 		{"Smartkey Card TypB", "Kobil GmbH"},
 		{"Chipkarte JLU Giessen", "Kobil GmbH"}
@@ -69,11 +70,14 @@ int sc_pkcs15emu_tcos_init_ex(sc_pkcs15_card_t *p15card, sc_pkcs15emu_opt_t *opt
 		{0, 2, 0x45, 1, "8000DF01C000", "SignTrust Signatur Zertifikat"},
 		{1, 2, 0x46, 1, "800082008220", "SignTrust Verschluesselungs Zertifikat"},
 		{1, 2, 0x47, 1, "800083008320", "SignTrust Authentifizierungs Zertifikat"},
-		{0, 3, 0x45, 1, "41004352",     "Smartkey Zertifikat 1"},
-		{0, 3, 0x46, 1, "41004353",     "Smartkey Zertifikat 2"},
-		{0, 4, 0x45, 1, "41014352",     "Smartkey Zertifikat 1"},
-		{0, 4, 0x46, 1, "41014353",     "Smartkey Zertifikat 2"},
-		{0, 5, 0x45, 1, "41004352",     "UniCard Giessen Zertifikat"},
+		{0, 3, 0x45, 0, "3000C500",     "DATEV Signatur Zertifikat"},
+		{1, 3, 0x46, 0, "DF02C200",     "DATEV Verschluesselungs Zertifikat"},
+		{1, 3, 0x47, 0, "DF02C500",     "DATEV Authentifizierungs Zertifikat"},
+		{0, 4, 0x45, 1, "41004352",     "Smartkey Zertifikat 1"},
+		{0, 4, 0x46, 1, "41004353",     "Smartkey Zertifikat 2"},
+		{0, 5, 0x45, 1, "41014352",     "Smartkey Zertifikat 1"},
+		{0, 5, 0x46, 1, "41014353",     "Smartkey Zertifikat 2"},
+		{0, 6, 0x45, 1, "41004352",     "UniCard Giessen Zertifikat"},
 		{0, 0, 0, 0, NULL, NULL}
 	};
 	static const struct {
@@ -90,11 +94,14 @@ int sc_pkcs15emu_tcos_init_ex(sc_pkcs15_card_t *p15card, sc_pkcs15emu_opt_t *opt
 		{2, 0x45, 1, "8000DF015331", 0x80, "Signatur Schluessel"},
 		{2, 0x46, 2, "800082008210", 0x80, "Verschluesselungs Schluessel"},
 		{2, 0x47, 3, "800083008310", 0x80, "Authentifizierungs Schluessel"},
-		{3, 0x45, 1, "41005103",     0x83, "Smartkey Schluessel 1"},
-		{3, 0x46, 1, "41005104",     0x84, "Smartkey Schluessel 2"},
-		{4, 0x45, 1, "41015103",     0x83, "Smartkey Schluessel 1"},
-		{4, 0x46, 1, "41015104",     0x84, "Smartkey Schluessel 2"},
-		{5, 0x45, 1, "3F004100",     0x83, "UniCard Giessen Schluessel"},
+		{3, 0x45, 1, "30005371",     0x82, "Signatur Schluessel"},
+		{3, 0x46, 1, "DF0253B1",     0x81, "Verschluesselungs Schluessel"},
+		{3, 0x47, 1, "DF025371",     0x82, "Authentifizierung Schluessel"},
+		{4, 0x45, 1, "41005103",     0x83, "Smartkey Schluessel 1"},
+		{4, 0x46, 1, "41005104",     0x84, "Smartkey Schluessel 2"},
+		{5, 0x45, 1, "41015103",     0x83, "Smartkey Schluessel 1"},
+		{5, 0x46, 1, "41015104",     0x84, "Smartkey Schluessel 2"},
+		{6, 0x45, 1, "3F004100",     0x83, "UniCard Giessen Schluessel"},
 		{0, 0, 0, NULL, 0, NULL}
 	};
 	static const struct {
@@ -128,19 +135,22 @@ int sc_pkcs15emu_tcos_init_ex(sc_pkcs15_card_t *p15card, sc_pkcs15emu_opt_t *opt
 		{2, 3, 0, 6, 0x81, "800083000040", "Authentifizierungs PIN",
 			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_LOCAL |
 			SC_PKCS15_PIN_FLAG_INITIALIZED},
-		{3, 1, 2, 6, 0x00, "5000", "globale PIN",
+		{3, 1, 0, 6, 0x01, "5001", "globale PIN",
 			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_INITIALIZED |
 			SC_PKCS15_PIN_FLAG_UNBLOCKING_PIN},
-		{3, 2, 0, 8, 0x01, "5008", "globale PUK",
-			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_INITIALIZED |
-			SC_PKCS15_PIN_FLAG_UNBLOCKING_PIN | SC_PKCS15_PIN_FLAG_SO_PIN},
 		{4, 1, 2, 6, 0x00, "5000", "globale PIN",
 			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_INITIALIZED |
 			SC_PKCS15_PIN_FLAG_UNBLOCKING_PIN},
 		{4, 2, 0, 8, 0x01, "5008", "globale PUK",
 			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_INITIALIZED |
 			SC_PKCS15_PIN_FLAG_UNBLOCKING_PIN | SC_PKCS15_PIN_FLAG_SO_PIN},
-		{5, 1, 0, 6, 0x00, "4100", "globale PIN",
+		{5, 1, 2, 6, 0x00, "5000", "globale PIN",
+			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_INITIALIZED |
+			SC_PKCS15_PIN_FLAG_UNBLOCKING_PIN},
+		{5, 2, 0, 8, 0x01, "5008", "globale PUK",
+			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_INITIALIZED |
+			SC_PKCS15_PIN_FLAG_UNBLOCKING_PIN | SC_PKCS15_PIN_FLAG_SO_PIN},
+		{6, 1, 0, 6, 0x00, "4100", "globale PIN",
 			SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_INITIALIZED},
 		{0, 0, 0, 0, 0, NULL, NULL, 0}
 	};