Index: backends/flint/flint_version.cc
===================================================================
--- backends/flint/flint_version.cc	(revision 8457)
+++ backends/flint/flint_version.cc	(working copy)
@@ -36,7 +36,9 @@
 using std::string;
 
 // YYYYMMDDX where X allows multiple format revisions in a day
-#define FLINT_VERSION 200704230u
+#define FLINT_VERSION 200705040u
+// 200705040 Change metainfo format slightly, so that more items can be added
+//           in future without breaking old databases
 // 200704230 Use zlib compression of tags for record and termlist tables
 // 200611200 Fixed occasional, architecture-dependent surplus bits in
 //	     interpolative coding; "flicklock" -> "flintlock".
Index: backends/flint/flint_postlist.cc
===================================================================
--- backends/flint/flint_postlist.cc	(revision 8458)
+++ backends/flint/flint_postlist.cc	(working copy)
@@ -54,7 +54,7 @@
     DEBUGCALL(DB, void, "FlintPostListTable::set_total_length_and_lastdocid",
 			totlen << ", " << did);
     string tag = pack_uint(did);
-    tag += pack_uint_last(totlen);
+    tag += pack_uint(totlen);
     add(METAINFO_KEY, tag);
 }
 
@@ -73,7 +73,7 @@
     if (!unpack_uint(&data, end, &did)) {
 	throw Xapian::DatabaseCorruptError("Record containing meta information is corrupt.");
     }
-    if (!unpack_uint_last(&data, end, &totlen)) {
+    if (!unpack_uint(&data, end, &totlen)) {
 	throw Xapian::DatabaseCorruptError("Record containing meta information is corrupt.");
     }
     RETURN(totlen);
