diff --git a/HISTORY.txt b/HISTORY.txt
new file mode 100644
--- /dev/null
+++ b/HISTORY.txt
@@ -0,0 +1,198 @@
+0.7.0
+~~~~~~~~~~~~~~~~~~~
+
+Delaying keyring module import until passwords are really needed. It
+can noticeably improve Mercurial (non pull/push) performance in some
+cases (no longer slow hg status because D-Bus is busy an keyring tries
+to activate KDE Wallet through it…).
+
+0.6.7
+~~~~~~~~~~~~~~~~~
+
+#46 Fixed syntax of smtp.tls configuration setting (current Mercurials
+doesn't handle "true" anymore, TortoiseHG crashed with mercurial
+keyring enabled while currently recommended starttls/smtps/none values
+were in use).
+
+0.6.6
+~~~~~~~~~~~~~~~~~ 
+
+#44 Handling some more mercurial versions in demandimport-detection
+logic.
+
+0.6.5
+~~~~~~~~~~~~~~~~~
+
+#36 Shutting up warning about no logging handlers.
+
+0.6.4
+~~~~~~~~~~~~~~~~~
+
+#44 Pre-2.9.1 Mercurials compatibility (probing for active
+demandimport differently).
+
+0.6.3
+~~~~~~~~~~~~~~~~~
+
+#41 Fix for incorrect demandimport activity check logic, which could
+cause various problems with imports after mercurial_keyring is
+imported.
+
+0.6.2
+~~~~~~~~~~~~~~~~~
+
+#33 Fix for UnicodeDecodeErrors happening on some backends (especially
+Vault) when passwords with non-ascii characters are in use and native
+locale is not utf-8. Passwords are no longer saved to keyring backends
+as-entered, they are now decoded from local encoding (whichever is
+detected by Mercurial), then encoded to unicode.
+
+0.6.1
+~~~~~~~~~~~~~~~~~
+
+#30 Yet another demandimport conflict fixed.
+
+0.6.0
+~~~~~~~~~~~~~~~~~
+
+#28 Disable demandimport completely during keyring import. Mayhaps it
+will resolve (most) demandimport conflict errors.
+
+0.5.7
+~~~~~~~~~~~~~~~~~
+
+#27 Some more demandimport ignores.
+
+0.5.6
+~~~~~~~~~~~~~~~~~
+
+#24, #25 Demandimport fixes (import failures in specific cases).
+
+Better way of demandimport-ignoring modules. In particular, we append
+more of them if gobject happens to be on the list.
+
+0.5.5
+~~~~~~~~~~~~~~~~~
+
+Fix for gnome keyring import problems.
+
+0.5.4
+~~~~~~~~~~~~~~~~~
+
+#22 Some more demandimport ignores (fix import failures).
+
+SMTP password was not cleared properly (after detecting that it is
+invalid).
+
+Clarified license to be modified BSD style license.
+
+0.5.3
+~~~~~~~~~~~~~~~~~
+
+Remove useless import which caused problems on Mercurial 2.3 when
+demandimport was not enabled
+
+0.5.1
+~~~~~~~~~~~~~~~~~
+
+Add help text to output for hg help.
+
+0.5.0
+~~~~~~~~~~~~~~~~~
+
+Improved bad password detection. Internally: extension is now able to
+properly differentiate between an authentication failure and a new
+request to the same url.
+
+Fixes in debug message
+
+Further debug messages patching
+
+Improving debug messages handling.
+
+Mercurial Keyring debug messages are now prefixed with
+[HgKeyring] to make distinguishing them easier
+
+0.4.6
+~~~~~~~~~~~~~~~~~
+
+More compatibility (changed signature of httpconnection.readauthforuri
+, introduced post Mercurial 1.9 - since hg.0593e8f81c71)
+
+Fix compatibility code which did not work due to demandimport issues
+(attempts to catch ImportErrors on "from mercurial.url import
+readauthforuri" were not working properly).
+
+0.4.5
+~~~~~~~~~~~~~~~~~
+
+Mercurial 1.9 compatibility (readauthforuri has been moved into new
+httpconnection module).
+
+0.4.4
+~~~~~~~~~~~~~~~~~
+
+Mercurial 1.8 compatibility (passwordmgr.readauthtoken() has been
+moved into mercurial.url.readauthforuri).
+
+0.4.3
+~~~~~~~~~~~~~~~~~
+
+Keyring fork no longer is needed as keyring releases are available
+again.
+
+Workaround for gnomekeyring mercurial.demandimport incompatibility:
+mercurial.demandimport, which is enabled while in a mercurial
+extensions, prevents the correct import of gobject._gobject and
+consequently doesn't allow the loading of the gnomekeyring module,
+which can be used by keyring. This just adds the proper module to
+demandimport ignore list.
+
+0.4.2
+~~~~~~~~~~~~~~~~~
+
+No longer raising an error when username is specified both in ~/.hgrc
+and <repo>/.hg/hgrc if it is the same in both places.
+
+Docs recommend sborho keyring fork.
+
+0.4.1
+~~~~~~~~~~~~~~~~~
+
+Some tweaks and docs related to prefix handling.
+
+Explicit information that keyring is not used due to lack of username.
+
+0.4.0
+~~~~~~~~~~~~~~~~~
+
+Store and lookup prefix from [auth] so that password is shared amongst
+shared auth entries
+
+0.3.3
+~~~~~~~~~~~~~~~~~
+
+Better error message
+
+0.3.2
+~~~~~~~~~~~~~~~~~
+
+Doc tweaks
+
+0.3.1
+~~~~~~~~~~~~~~~~~
+
+Introduced and documented PyPi package, added setup.py
+
+0.2.0
+~~~~~~~~~~~~~~~~~
+
+Added handling of SMTP passwords (tested on patchbomb extension but
+should work on anything what utilizes mercurial.mail)
+
+Docstrings mention Debian keyring packages.
+
+0.1.1
+~~~~~~~~~~~~~~~~~
+
+Initial public release
diff --git a/README.txt b/README.txt
--- a/README.txt
+++ b/README.txt
@@ -185,6 +185,11 @@ The extension is monkey-patching the mer
 to replace the find_user_password method. Detailed order of operations
 is described in the comments inside `the code`_.
 
+History
+==========
+
+See `HISTORY.txt`_.
+
 Development
 ===========
 
@@ -197,3 +202,5 @@ Additional notes
 
 Information about this extension is also available
 on Mercurial Wiki: http://mercurial.selenic.com/wiki/KeyringExtension
+
+.. _HISTORY.txt: http://bitbucket.org/Mekk/mercurial_keyring/src/HISTORY.txt