diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fb99bfa2..00627b7a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,38 +1,91 @@
 ## 0.2.0 (Unreleased)
 
-FEATURES:
-
-  * Blocking queries supported in API [GH-366]
-  * Add support for downloading external artifacts to execute for Exec, Raw exec drivers [GH-381]
-
 BACKWARDS INCOMPATIBILITIES:
 
-  * Qemu and Java driver configurations have been updated to both use `artifact_source` as the source for external images/jars to be ran
+  * drivers: Qemu and Java driver configurations have been updated to both use
+    `artifact_source` as the source for external images/jars to be ran
+  * core: Removed weight and hard/soft fields in constraints [GH-351]
+  * core: HTTP API `/v1/node/<id>/allocations` returns full Allocation and not stub [GH-402]
+
+FEATURES:
+
+  * core: System Scheduler that runs tasks on every node [GH-287]
+  * client: Restart policy for task groups enforced by the client [GH-369, GH-393]
+  * core: distinctHost constraint ensures Task Groups are running on distinct
+    clients [GH-321]
+  * core: Regexp, version and lexical ordering constraints [GH-271]
+  * core: Blocking queries supported in API [GH-366]
+  * drivers: Add support for downloading external artifacts to execute for Exec,
+    Raw exec drivers [GH-381]
+  * driver/rawexec: Raw Fork/Exec Driver [GH-237]
+  * driver/rkt: Experimental Rkt Driver [GH-165, GH-247]
+  * client: GCE Fingerprinting [GH-215]
+
+IMPROVEMENTS:
+
+  * client: Test Skip Detection [GH-221]
+  * drivers: Use BlkioWeight rather than BlkioThrottleReadIopsDevice [GH-222]
+  * core: Overlap plan verification and plan application for increased throughput [GH-272]
+  * driver/docker: Mount task local and alloc directory to docker containers [GH-290]
+  * driver/docker: Pass JVM options in java driver [GH-293, GH-297]
+  * cli: Show node attributes in `node-status` [GH-313]
+  * cli: Output of `server-members` is sorted [GH-323]
+  * client/fingerprint: Network fingerprinter detects interface suitable for
+    use, rather than defaulting to eth0 [GH-334, GH-356]
+  * core: Configurable Node GC threshold [GH-362]
+  * client: Client Restore State properly reattaches to tasks and recreates them as
+    needed [GH-364, GH-380, GH-388, GH-392, GH-394, GH-397, GH-408]
+  * driver/docker: Advanced docker driver options [GH-390]
+  * client: Periodic Fingerprinting [GH-391]
+  * client: Precise snapshotting of TaskRunner and AllocRunner [GH-403, GH-411]
+  * jobspec and drivers: Driver configuration supports arbitrary struct to be
+    passed in jobspec [GH-415]
+  * client: Task State is tracked by client [GH-416]
+  * cli: Output of `alloc-status` also displays task state [GH-424]
+  * driver/docker: Docker hostname can be set [GH-426]
+
+BUG FIXES:
+
+  * client: Reap spawn-daemon process, avoiding a zombie process [GH-240]
+  * core: Scheduler checks for updates to environment variables [GH-327]
+  * core: Reset Nack timer in response to scheduler operations [GH-325]
+  * driver/qemu: Qemu fingerprint and tests work on both windows/linux [GH-352]
+  * client/fingerprint: Use correct local interface on OS X [GH-361, GH-365]
+  * driver/docker: Apply SELinux label for mounting directories in docker [GH-377]
+  * driver/docker: Docker driver uses docker environment variables correctly [GH-407]
+  * core: Nomad Client/Server RPC codec encodes strings properly [GH-420]
+  * cli: Fix crash when -config was given a directory or empty path [GH-119]
+  * client: Resource exhausted errors because of link-speed zero [GH-146, GH-205]
+  * client: Restarting Nomad Client leads to orphaned containers [GH-159]
+  * client: Nomad Client doesn't restart failed containers [GH-198]
+  * driver/docker: Docker driver exposes ports when creating container [GH-212, GH-412]
 
 ## 0.1.2 (October 6, 2015)
 
 IMPROVEMENTS:
 
-  * Nomad client cleans allocations on exit when in dev mode
-  * drivers: Use go-getter for artifact retrieval, add artifact support to Exec, Raw Exec drivers [GH-288]
+  * client: Nomad client cleans allocations on exit when in dev mode [GH-214]
+  * drivers: Use go-getter for artifact retrieval, add artifact support to Exec,
+    Raw Exec drivers [GH-288]
 
 ## 0.1.1 (October 5, 2015)
 
 IMPROVEMENTS:
 
-  * Docker networking mode is configurable
-  * Set task environment variables
-  * Native IP detection and user specifiable network interface for
-    fingerprinting
-  * Nomad Client configurable from command-line
+  * driver/docker: Docker networking mode is configurable [GH-184]
+  * drivers: Set task environment variables [GH-206]
+  * client/fingerprint: Native IP detection and user specifiable network
+    interface for fingerprinting [GH-189]
+  * cli: Nomad Client configurable from command-line [GH-191]
 
 BUG FIXES:
 
-  * Network fingerprinting failed if default network interface did not exist
-  * Improved detection of Nomad binary
-  * Docker dynamic port mapping were not being set properly
-  * Fixed issue where network resources throughput would be set to 0 MBits if
-    the link speed could not be determined
+  * client/fingerprint: Network fingerprinting failed if default network
+    interface did not exist [GH-189]
+  * client: Improved detection of Nomad binary [GH-181]
+  * driver/docker: Docker dynamic port mapping were not being set properly [GH-199]
+  * client: Fixed issue where network resources throughput would be set to 0 MBits if
+    the link speed could not be determined [GH-205]
 
 ## 0.1.0 (September 28, 2015)