diff --git a/CHANGELOG.md b/CHANGELOG.md
index a43a25b..3a05bf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+## Version 2.0.0
+
+ * New classification model.
+
 ## Version 1.0.1
 
 _2015-04-02_
@@ -12,4 +16,4 @@ _2015-04-02_
 
 _2015-03-25_
 
- * Initial release.
\ No newline at end of file
+ * Initial release.
diff --git a/README.md b/README.md
index 1af0c63..b4b92c6 100644
--- a/README.md
+++ b/README.md
@@ -7,32 +7,33 @@ application behavior based on the capabilities of the phone's hardware.
 
 ![Most Popular Devices by Year Class](https://github.com/facebook/device-year-class/raw/master/docs/images/popular_devices_by_year_class.png)
 
-Mappings as of this writing (ceilings, aside from the final row):
-
-|Year|	Cores|	Clock |	RAM  |
-|---:|------:|-------:|-----:|
-|2008|	1    |	528MHz|	192MB|
-|2009|	n/a  |	600MHz|	290MB|
-|2010|	n/a  |	1.0GHz|	512MB|
-|2011|	2    |	1.2GHz|	  1GB|
-|2012|	4    |	1.5GHz|	1.5GB|
-|2013|	n/a  |	2.0GHz|	  2GB|
-|2014|	n/a  |   >2GHz|	 >2GB|
+Mappings as of this writing (RAM is a ceiling):
 
+| RAM | condition | Year Class |
+|----:|----------:|-----------:|
+|768MB| 1 core    | 2009 |
+|     | 2+ cores  | 2010 |
+|  1GB| <1.3GHz   | 2011 |
+|     | 1.3GHz+   | 2012 |
+|1.5GB| <1.8GHz   | 2012 |
+|     | 1.8GHz+   | 2013 |
+|  2GB|           | 2013 |
+|  3GB|           | 2014 |
+| more|           | 2015 |
 
 ## Integration
 
 ### Download
 Download [the latest JARs](https://github.com/facebook/device-year-class/releases/latest) or grab via Gradle:
 ```groovy
-compile 'com.facebook.device.yearclass:yearclass:1.0.1'
+compile 'com.facebook.device.yearclass:yearclass:2.0.0'
 ```
 or Maven:
 ```xml
 <dependency>
   <groupId>com.facebook.device.yearclass</groupId>
   <artifactId>yearclass</artifactId>
-  <version>1.0.1</version>
+  <version>2.0.0</version>
 </dependency>
 ```
 
diff --git a/gradle.properties b/gradle.properties
index 4cf3450..e47d34f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-VERSION_NAME=1.0.1
-GROUP=com.facebook.device.yearclass
\ No newline at end of file
+VERSION_NAME=2.0.0
+GROUP=com.facebook.device.yearclass