diff --git a/AUTHORS b/AUTHORS
index d5af9f3..6c7f068 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,13 +2,19 @@ Pint is written and maintained by Hernan E. Grecco <hernan.grecco@gmail.com>.
 
 Other contributors, listed alphabetically, are:
 
+* Aaron Coleman
 * Alexander Böhn <fish2000@gmail.com>
+* Ana Krivokapic <akrivokapic1@gmail.com>
+* Andrea Zonca <code@andreazonca.com>
 * Brend Wanders <b.wanders@utwente.nl>
 * choloepus
+* coutinho <coutinho@esrf.fr>
 * Daniel Sokolowski <daniel.sokolowski@danols.com>
 * Dave Brooks <dave@bcs.co.nz>
 * David Linke
+* Ed Schofield <ed@pythoncharmers.com>
 * Eduard Bopp <eduard.bopp@aepsil0n.de>
+* Eli <elifab@gmail.com>
 * Felix Hummel <felix@felixhummel.de>
 * Giel van Schijndel <me@mortis.eu>
 * James Rowe <jnrowe@gmail.com>
@@ -16,17 +22,20 @@ Other contributors, listed alphabetically, are:
 * Joel B. Mohler <joel@kiwistrawberry.us>
 * John David Reaver <jdreaver@adlerhorst.com>
 * Jonas Olson <jolson@kth.se>
+* Kaido Kert <kaidokert@gmail.com>
 * Kenneth D. Mankoff <mankoff@gmail.com>
+* Kevin Davies <kdavies4@gmail.com>
 * Luke Campbell <luke.s.campbell@gmail.com>
 * Matthieu Dartiailh <marul@laposte.net>
 * Nate Bogdanowicz <natezb@gmail.com>
 * Peter Grayson <jpgrayson@gmail.com>
 * Richard Barnes <rbarnes@umn.edu>
+* Ryan Dwyer <ryanpdwyer@gmail.com>
 * Ryan Kingsbury <RyanSKingsbury@alumni.unc.edu>
 * Sundar Raman <cybertoast@gmail.com>
 * Tiago Coutinho <coutinho@esrf.fr>
+* Thomas Kluyver <takowl@gmail.com>
 * Tom Ritchford <tom@swirly.com>
 * Virgil Dupras <virgil.dupras@savoirfairelinux.com>
-* Ryan Dwyer <ryanpdwyer@gmail.com>
 
 (If you think that your name belongs here, please let the maintainer know)
diff --git a/CHANGES b/CHANGES
index 240a3bc..ae6e28c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,13 +5,48 @@ Pint Changelog
 0.7 (unreleased)
 ----------------
 
-- Added photometric units : lumen & lux.
-  (Issue #230, thanks janpipek)
-- Added hectare and peak sun hour.
-  (Issue #229, thanks edschofield)
--
+- Added Systems and groups.
+  (Issue #215)
+- Added check decorator to UnitRegistry.
+  (Issue #283, thanks kaidokert)
+- Added compact conversion.
+  (See #224, thanks Ryan Dwyer)
+- Added compact formating code.
+  (Issue #240)
+- New Unit Class.
+  (thanks Matthieu Dartiailh)
+- Refactor UnitRegistry.
+  (thanks Matthieu Dartiailh)
+- Move definitions, errors, and converters into their own modules.
+  (thanks Matthieu Dartiailh)
+- UnitsContainer is now immutable
+  (Issue #202, thanks Matthieu Dartiailh)
+- New parser and evaluator.
+  (Issue #226, thanks Aaron Coleman)
+- Added support for Unicode identifiers.
+- Added m_as as way top retrieve the magnitude in different units.
+  (Issue #227)
+- Added Short form for magnitude and units.
+  (Issue #234)
+- Improved deepcopy.
+  (Issue #252, thanks Emilien Kofman)
+- Improved testing infrastructure.
 - Improved docs.
-  (thanks Ryan Dwyer)
+  (thanks Ryan Dwyer, Martin Thoma, Andrea Zonca)
+- Fixed short names on electron_volt and hartree.
+- Fixed definitions of scruple and drachm.
+  (Issue #262, thanks takowl)
+- Fixed troy ounce to 480 'grains'.
+  (thanks elifab)
+- Added 'quad' as a unit of energy (= 10**15 Btu).
+  (thanks Ed Schofield)
+- Added "hectare" as a supported unit of area and 'ha' as the symbol for hectare.
+  (thanks Ed Schofield)
+- Added peak sun hour and Langley.
+  (thanks Ed Schofield)
+- Added photometric units: lumen & lux.
+  (Issue #230, thanks janpipek)
+
 
 
 0.6 (2014-11-07)