diff --git a/gedit-3.20.2.tar.xz b/gedit-3.20.2.tar.xz
deleted file mode 100644
index 1acb34e..0000000
--- a/gedit-3.20.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32a1276a71a0d4a5af4e20a87bc273170ba8e075fc1ca7f51c8d3a6c150463f8
-size 3135004
diff --git a/gedit-3.21.90.tar.xz b/gedit-3.21.90.tar.xz
new file mode 100644
index 0000000..3d80d9a
--- /dev/null
+++ b/gedit-3.21.90.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a1f66f854f409fdf52532a1f0df26e6539136559f7ff15f629494caba0dee91
+size 2959196
diff --git a/gedit.changes b/gedit.changes
index 3ab2584..4f043af 100644
--- a/gedit.changes
+++ b/gedit.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Sun Aug 21 14:39:55 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.90:
+  + Misc bugfixes.
+  + Updated translations.
+- Drop gedit-remove-geometry.patch: Fixed upstream.
+- Conditionally apply translations-update-upstream BuildRequires
+  and macro for non-openSUSE only.
+- Stop passing V=1 to make, debugging is done locally. No need to
+  clutter buildlogs.
+
+-------------------------------------------------------------------
+Sun Jul 31 08:43:15 UTC 2016 - zaitor@opensuse.org
+
+- Add gedit-remove-geometry.patch: Remove --geometry command line
+  option (deprecated in GTK+).
+
 -------------------------------------------------------------------
 Wed May 18 11:13:31 UTC 2016 - fezhang@suse.com
 
diff --git a/gedit.spec b/gedit.spec
index 424168e..24f5d0c 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -19,13 +19,13 @@
 %define _with_gi_python 1
 
 Name:           gedit
-Version:        3.20.2
+Version:        3.21.90
 Release:        0
 Summary:        Small and lightweight UTF-8 text editor
 License:        GPL-2.0+
 Group:          Productivity/Text/Editors
 Url:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/gedit/3.20/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gedit/3.21/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE gedit-desktop.patch -- Adds more MIME types.
 Patch0:         gedit-desktop.patch
 BuildRequires:  fdupes
@@ -35,7 +35,9 @@ BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool >= 0.50.1
 BuildRequires:  iso-codes-devel
 BuildRequires:  python >= 3.2.3
+%if !0%{?is_opensuse}
 BuildRequires:  translation-update-upstream
+%endif
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(gio-2.0) >= 2.44
@@ -103,13 +105,15 @@ environment.
 %lang_package
 %prep
 %setup -q
+%if !0%{?is_opensuse}
 translation-update-upstream
+%endif
 %patch0 -p0
 
 %build
 %configure \
     --enable-python
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags}
 
 %install
 %make_install