diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..3b9ad20bc
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,28 @@
+## 1.6.2.0 (TBD)
+
+Features:
+
+  - Integration of fyyd Podcast Search Engine
+  - Export subscriptions as HTML
+  - Rename feeds
+  - Auto-enable sleep timer
+  - "has media" filter
+  - Force gpodder full sync
+  - Preliminary support for Android Auto
+
+Improvements:
+
+  - Better support for Atom feeds, e.g. summary tag
+  - Confirmation dialog on mark all as seen
+  - Number of downloaded episodes in subscription counter
+  - Gpodder sync error optional
+  - Search results
+  - MRSS support
+  - Sanitize HTML from Atom feed
+
+Fixes:
+
+  - Reset sleep timer on shake to current waiting time
+  - Cast dialog image
+  - Mini player not showing up
+  - Audio player cover fragment
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 14a38e017..990382dba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.danoeh.antennapod"
-    android:versionCode="1060102"
-    android:versionName="1.6.1.2">
+    android:versionCode="1060200"
+    android:versionName="1.6.2.0">
     <!--
       Version code schema:
       "1.2.3-SNAPSHOT" -> 1020300