diff -ru rpm-5.2.1/rpmdb/header_internal.c rpm-5.2.1.orig/rpmdb/header_internal.c
--- rpm-5.2.1/rpmdb/header_internal.c	2010-07-27 19:27:58.316530178 +0200
+++ rpm-5.2.1.orig/rpmdb/header_internal.c	2008-07-31 04:40:08.000000000 +0200
@@ -44,11 +44,13 @@
     for (i = 0; i < il; i++) {
 	info->tag = (rpmuint32_t) ntohl(pe[i].tag);
 	info->type = (rpmuint32_t) ntohl(pe[i].type);
+#ifdef DYING
 	/* XXX Convert RPMTAG_FILESTATE to RPM_UINT8_TYPE. */
 	if (info->tag == 1029 && info->type == 1) {
 	    info->type = RPM_UINT8_TYPE;
 	    pe[i].type = (rpmuint32_t) htonl(info->type);
 	}
+#endif
 	info->offset = (rpmint32_t) ntohl(pe[i].offset);
 assert(negate || info->offset >= 0);	/* XXX insurance */
 	if (negate)
diff -ru rpm-5.2.1/rpmdb/rpmtag.h rpm-5.2.1.orig/rpmdb/rpmtag.h
--- rpm-5.2.1/rpmdb/rpmtag.h	2010-07-27 19:28:33.943469247 +0200
+++ rpm-5.2.1.orig/rpmdb/rpmtag.h	2009-07-25 02:56:51.000000000 +0200
@@ -25,7 +25,7 @@
  */
 enum rpmTagType_e {
     	/* RPM_NULL_TYPE =  0	- never been used. */
-	/* RPM_CHAR_TYPE =  1	- never been used, same as RPM_UINT8_TYPE. */
+    RPM_CHAR_TYPE		=  1,
     RPM_UINT8_TYPE		=  2,
     RPM_UINT16_TYPE		=  3,
     RPM_UINT32_TYPE		=  4,
@@ -37,7 +37,7 @@
 	/* RPM_ASN1_TYPE = 10	- never been used. */
 	/* RPM_OPENPGP_TYPE= 11	- never been used. */
 };
-#define	RPM_MIN_TYPE		2
+#define	RPM_MIN_TYPE		1
 #define	RPM_MAX_TYPE		9
 #define	RPM_MASK_TYPE		0x0000ffff