diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000000000000000000000000000000000000..06ee8769f61f014d9f63a0df6c9c46b689f9dd66
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,35 @@
+2015-07-17 trees 2.0.0 (First Drumpf General Strike)
+	* Don't use assert() for an overflow check
+	* Use SSIZE_MAX in trees_ostream_send_chunk() check
+	* Handle error code in trees_ostream_send_header()
+	* Handle error code in trees_ostream_send_chunk()
+	* Remove buggy use of trees_password_fd
+	* Rename project from tofu-scrambler to trees
+	* Fix README with compile instruction
+	* Update README with latest info
+	* Update author and remove uneeded CONTRIBUTORS file
+	* Massive cleanup of unused files
+	* Handle missing switch case found by GCC
+	* Add autoconf support for a proper build system
+	* Validate the version from the header
+	* Actually write the version in the email header
+	* Add version capability
+	* Merge branch 'feature/tofu-create' into 'master'
+	* fix typos in README.md
+	* updated README.md
+	* Don't check private key if detecting header
+	* Pass a NULL pointer if no private key set
+	* Extra protection on the private key when decrypting
+	* Don't fail if private key not found. Also, set errno on decrypt error
+	* Really fix the enabled flag
+	* added tofu-create script, for testing purposes
+	* Actually check for a disabled user
+	* Enable flag has to be signed to detect errors
+	* Remove unused OpenSSL header file include
+	* Massive amount of fixes
+	* Skip private key if no user password
+	* Implement private key unlocked by password
+	* Use libsodium memzero function to wipe private key
+	* Use libsodium crypto box and dump OpenSSL RSA/AES
+	* Beautify the rest of the code base
+	* Beautify scrambler-plugin.c
diff --git a/configure.ac b/configure.ac
index d635ab864e44df38205507d1e8b90918ec0393b3..03145d65a23766bc26ed35c544cb0bfa96d99fb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.64])
-AC_INIT([trees],[1.0.0],[https://0xacab.org/riseuplabs/trees/issues],
+AC_INIT([trees],[2.0.0],[https://0xacab.org/riseuplabs/trees/issues],
         [trees-plugin],[https://0xacab.org/riseuplabs/trees.git])
 
 AC_CONFIG_HEADERS([trees-config.h])