diff --git a/CHANGELOG.md b/CHANGELOG.md
index 928bec4fa..1fc457426 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 1.2.1 (2018-04-18)
+
+* improved automatic mirror selection
+
+* more swap/nearby bug fixes and improvements
+
 ### 1.2 (2018-04-13)
 
 * lots of swap/nearby bug fixes and improvements
diff --git a/metadata/en-US/changelogs/1002051.txt b/metadata/en-US/changelogs/1002051.txt
new file mode 100644
index 000000000..923204190
--- /dev/null
+++ b/metadata/en-US/changelogs/1002051.txt
@@ -0,0 +1,17 @@
+* automatically trim or delete cache when storage space is low
+
+* improved performance on low memory devices
+
+* make all downloads respect "Only on Wi-Fi" preference
+
+* reduce memory usage when device is running low
+
+* add custom mirrors to any repo by clicking links, scanning QR codes, etc
+
+* improved automatic mirror selection
+
+* lots of swap/nearby bug fixes and improvements
+
+* fix one cause of reoccuring update notifications (#1271)
+
+* make F-Droid recognize fdroid nightly URLs from GitLab