diff --git a/src/libopensc/card-authentic.c b/src/libopensc/card-authentic.c
index e5dada0b..123999aa 100644
--- a/src/libopensc/card-authentic.c
+++ b/src/libopensc/card-authentic.c
@@ -1134,7 +1134,7 @@ authentic_fcp_encode(struct sc_card *card, struct sc_file *file, unsigned char *
 	buf[offs++] = 1;
 	buf[offs++] = file->type == SC_FILE_TYPE_DF ? ISO7816_FILE_TYPE_DF : ISO7816_FILE_TYPE_TRANSPARENT_EF;
 
-	buf[offs++] = ISO7816_TAG_FCP_ID;
+	buf[offs++] = ISO7816_TAG_FCP_FID;
 	buf[offs++] = 2;
 	buf[offs++] = (file->id >> 8) & 0xFF;
 	buf[offs++] = file->id & 0xFF;
diff --git a/src/libopensc/iso7816.h b/src/libopensc/iso7816.h
index 839da42d..6b6f9cc1 100644
--- a/src/libopensc/iso7816.h
+++ b/src/libopensc/iso7816.h
@@ -12,15 +12,19 @@ extern "C" {
 #define ISO7816_FILE_TYPE_TRANSPARENT_EF	0x01
 #define ISO7816_FILE_TYPE_DF			0x38
 
-#define ISO7816_TAG_FCI		0x6F
+#define ISO7816_TAG_FCI			0x6F
 
-#define ISO7816_TAG_FCP		0x62
-#define ISO7816_TAG_FCP_SIZE	0x80
-#define ISO7816_TAG_FCP_TYPE	0x82
-#define ISO7816_TAG_FCP_ID	0x83
-#define ISO7816_TAG_FCP_ACLS	0x86
+#define ISO7816_TAG_FCP			0x62
+#define ISO7816_TAG_FCP_SIZE		0x80
+#define ISO7816_TAG_FCP_SIZE_FULL	0x81
+#define ISO7816_TAG_FCP_TYPE		0x82
+#define ISO7816_TAG_FCP_FID		0x83
+#define ISO7816_TAG_FCP_DF_NAME		0x84
+#define ISO7816_TAG_FCP_PROP_INFO	0x85
+#define ISO7816_TAG_FCP_ACLS		0x86
+#define ISO7816_TAG_FCP_LCS		0x8A
 
-/* ISO7816 interindustry data tags */	
+/* ISO7816 interindustry data tags */
 #define ISO7816_II_CATEGORY_TLV		0x80
 #define ISO7816_II_CATEGORY_NOT_TLV	0x00
 
diff --git a/src/pkcs15init/profile.c b/src/pkcs15init/profile.c
index 55a7f6c3..419d1b62 100644
--- a/src/pkcs15init/profile.c
+++ b/src/pkcs15init/profile.c
@@ -110,7 +110,7 @@ static struct map		fileOpNames[] = {
 	{ "SELECT",	SC_AC_OP_SELECT	},
 	{ "LOCK",	SC_AC_OP_LOCK	},
 	{ "DELETE",	SC_AC_OP_DELETE	},
-	{ "DELETE_SELF",SC_AC_OP_DELETE_SELF },
+	{ "DELETE-SELF",SC_AC_OP_DELETE_SELF },
 	{ "CREATE",	SC_AC_OP_CREATE	},
 	{ "REHABILITATE",SC_AC_OP_REHABILITATE	},
 	{ "INVALIDATE",	SC_AC_OP_INVALIDATE	},
@@ -128,6 +128,7 @@ static struct map		fileOpNames[] = {
 	{ "INTERNAL-AUTHENTICATE",	SC_AC_OP_INTERNAL_AUTHENTICATE },
 	{ "PSO-DECRYPT",		SC_AC_OP_PSO_DECRYPT },
 	{ "RESIZE",	SC_AC_OP_RESIZE },
+	{ "ADMIN",	SC_AC_OP_ADMIN	},
 	{ NULL, 0 }
 };
 static struct map		fileTypeNames[] = {