diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index b73eb73..19d534f 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Jun 28 13:57:13 UTC 2017 - guillaume@opensuse.org
+
+- mozilla-disable-neon-option.patch has been dropped silently, so 
+  remove the --disable-neon option as it is not available anymore.
+
+-------------------------------------------------------------------
+Sun Jun 25 06:55:13 UTC 2017 - wr@rosenauer.org
+
+- update to Thunderbird 52.2.1
+  * Problems with Gmail fixed (folders not showing, repeated email
+    download, etc.) introduced in version 52.2.0. (boo#1045895)
+
 -------------------------------------------------------------------
 Wed Jun 14 11:34:58 UTC 2017 - wr@rosenauer.org
 
diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec
index 2fb5fb7..7cc3e00 100644
--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@@ -17,9 +17,9 @@
 #
 
 
-%define mainversion 52.2
+%define mainversion 52.2.1
 %define update_channel release
-%define releasedate 201706120000
+%define releasedate 201706250000
 
 %bcond_without mozilla_tb_kde4
 %bcond_with    mozilla_tb_valgrind
@@ -289,10 +289,6 @@ ac_add_options --enable-system-cairo
 %if ! %crashreporter
 ac_add_options --disable-crashreporter
 %endif
-# Disable neon for arm as it does not build correctly
-%ifarch %arm
-ac_add_options --disable-neon
-%endif
 %if %{with mozilla_tb_valgrind}
 ac_add_options --disable-jemalloc
 ac_add_options --enable-valgrind
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index ae2543a..8ba6c48 100644
--- a/compare-locales.tar.xz
+++ b/compare-locales.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdd0969f0cff0578e6a1ca6684e50752dffe4c6e5a6ac1b29f6ed0c4ed804c0d
-size 28356
+oid sha256:370bc757121f5378736e13bd204b3fbf51a41cc9da7a00f286d58cade70e3684
+size 28404
diff --git a/create-tar.sh b/create-tar.sh
index 0cb430b..b3c0045 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,8 +2,8 @@
 
 CHANNEL="esr52"
 BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="THUNDERBIRD_52_2_0_RELEASE"
-VERSION="52.2"
+RELEASE_TAG="THUNDERBIRD_52_2_1_RELEASE"
+VERSION="52.2.1"
 
 echo "cloning $BRANCH..."
 hg clone http://hg.mozilla.org/$BRANCH thunderbird
diff --git a/l10n-52.2.1.tar.xz b/l10n-52.2.1.tar.xz
new file mode 100644
index 0000000..a9ad93c
--- /dev/null
+++ b/l10n-52.2.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e651343e1d90eae1ca135c09ccdacabb1f0193b0e61618758a8b726e8ffe2800
+size 26219380
diff --git a/l10n-52.2.tar.xz b/l10n-52.2.tar.xz
deleted file mode 100644
index a1b70d3..0000000
--- a/l10n-52.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b9ec2281c733f1a469f71c34cf4ddb9077c016da1f0dad864fb4bd3384cd6f5
-size 26212088
diff --git a/thunderbird-52.2-source.tar.xz b/thunderbird-52.2-source.tar.xz
deleted file mode 100644
index 159a618..0000000
--- a/thunderbird-52.2-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f85ec5c053b5377b5d5094de8b5fbf04d235c6c4560ccfe3f9b9c33630b656b
-size 241028092
diff --git a/thunderbird-52.2.1-source.tar.xz b/thunderbird-52.2.1-source.tar.xz
new file mode 100644
index 0000000..29b69b0
--- /dev/null
+++ b/thunderbird-52.2.1-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:319b1c9dbcb486ebc8d2cf8819110428d95a2d4aaf131c16a6f583bdc67fda98
+size 240247096