diff --git a/AUTHORS b/AUTHORS
index bbcfec3e4..e0cfbd333 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,7 @@
 Benjamin Doherty <bendohmv@gmail.com>
+Bernardo Gomes <bgomesdeabreu@gmail.com>
 Bruno Rocha <rochacbruno@gmail.com>
 Bruno Rocha <rochacbruno@users.noreply.github.com>
 Eric Ho <dho.eric@gmail.com>
 Filipe Amaral <filipe@britecore.com>
+Lex Quarkie <lex.quarkie@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 1d05b7c10..d1466049f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
 CHANGES
 =======
 
+* removed unused \_\_version\_\_
+* Fix wrong template call
+* Update Readme.md - fix link to Pelican Themes (#666)
+* Preparing for Dynaconf 1.0.0 (#661)
+* Dynaconf upgraded to 0.7.0
+* Fix #629 user and author profile management
+* Added full name to user
+* Fix #631 added view|preview links to admin column views (#658)
+* Fix #639 preview requires login
+* fix #654 added logout button to admin navbar
+* Get favicon filename from theme\_context (#656)
+* Added user creation and edit to admin (#652)
+* In runserver command SITEURL is dynamically set
+* Changed the port parameter to int. (#651)
+* Updated url for the project in contributing.md (#649)
 * Small whitespace fix
 * Added some screenshots and fixed navbar
 * Added basic test to pass travis CI
diff --git a/HISTORY b/HISTORY
deleted file mode 100644
index a5c7d915f..000000000
--- a/HISTORY
+++ /dev/null
@@ -1,15 +0,0 @@
-Changelog
-=========
-
-These are all the changes in Quokka (new generation) since the first public release.
-
-1.0.0
------
-
-- Ported from old code base and refactored the whole system
-- Moved from MongoDB and MongoEngine to TinyDb and TinyMongo
-- MongoDB and Pymongo is now optional
-- Changed configuration to use Dynaconf
-- Introduced `$ quokka` cli using click and manage
-- Simplified admin interface
-- By default it is now intended to deploy a generated static site