diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a79be45ef..868f195cf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.17.0 (Sep 6, 2018)
+- **New** Add support for setting the Padding via resource or directly in dp (https://github.com/airbnb/epoxy/pull/528 Thanks to pwillmann!)
+- **Fixed** Strip kotlin metadata annotation from generated classes (https://github.com/airbnb/epoxy/pull/523)
+- **Fixed** Reflect the annotations declared in constructor params (https://github.com/airbnb/epoxy/pull/519 Thanks to Shaishav Gandhi!)
+
 # 2.16.4 (Aug 29, 2018)
 - **New** `EpoxyAsyncUtil` and `AsyncEpoxyController` make it easier to use Epoxy's async behavior out of the box
 - **New** Epoxy's background diffing posts messages back to the main thread asynchronously so they are not blocked by waiting for vsync
diff --git a/gradle.properties b/gradle.properties
index 4e86f7911b..a61f19c2c3 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=2.16.4
+VERSION_NAME=2.17.0
 GROUP=com.airbnb.android
 POM_DESCRIPTION=Epoxy is a system for composing complex screens with a ReyclerView in Android.
 POM_URL=https://github.com/airbnb/epoxy
diff --git a/kotlinsample/src/test/java/com/airbnb/epoxy/kotlinsample/AnnotationModel.kt b/kotlinsample/src/test/java/com/airbnb/epoxy/kotlinsample/AnnotationModel.kt
index cd6745b371..3d630c04c0 100644
--- a/kotlinsample/src/test/java/com/airbnb/epoxy/kotlinsample/AnnotationModel.kt
+++ b/kotlinsample/src/test/java/com/airbnb/epoxy/kotlinsample/AnnotationModel.kt
@@ -9,7 +9,7 @@ import com.airbnb.epoxy.EpoxyHolder
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
 
-@EpoxyModelClass(layout = R.layout.activity_kotlin_sample)
+@EpoxyModelClass(layout = R.layout.activity)
 abstract class AnnotationModel(
     @StringRes val resId: Int,
     @FloatRange(from = 0.0, to = 1.0) val range: Float