diff --git a/ChangeLog b/ChangeLog
index 87832e9f..5fa33395 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 	* Add crypt_last_error() API call.
 	* Fix luksKillSLot exit code if slot is inactive or invalid.
 	* Fix exit code if passphrases do not match in luksAddKey.
+	* Add LUKS on-disk format description into package.
 
 2011-09-22  Milan Broz  <mbroz@redhat.com>
 	* Support key-slot option for luksOpen (use only explicit keyslot).
diff --git a/TODO b/TODO
index cae93ca5..ad44f218 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,6 @@
-Version 1.4.0:
-- Wipe device flag
+Version 1.5.0:
+- Export wipe device functions
 - Support K/M suffixes for align payload (new switch?).
+- FIPS patches (RNG, volume key restrictions, move changekey to library)
+- online reencryption api?
+- integrate more metadata formats
diff --git a/docs/on-disk-format.pdf b/docs/on-disk-format.pdf
new file mode 100644
index 00000000..b6d2218a
Binary files /dev/null and b/docs/on-disk-format.pdf differ