diff --git a/.gitignore b/.gitignore
index c576788..430ba91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ guake-0.4.2.tar.gz
 /guake-0.7.2.tar.gz
 /0.8.0.tar.gz
 /guake-0.8.1.tar.gz
+/guake-0.8.3.tar.gz
diff --git a/fix_fullscreen_recovery.patch b/fix_fullscreen_recovery.patch
deleted file mode 100644
index e1bd035..0000000
--- a/fix_fullscreen_recovery.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 893701060426772d08ace1a4464d045b4a23c243 Mon Sep 17 00:00:00 2001
-From: thardev <dbravo.iessabadell@gmail.com>
-Date: Fri, 16 Oct 2015 11:17:03 +0200
-Subject: [PATCH] Fix Guake cannot restore from fullscreen #628
-
----
- src/guake/guake_app.py | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/src/guake/guake_app.py b/src/guake/guake_app.py
-index 56ab678..a9ef999 100644
---- a/src/guake/guake_app.py
-+++ b/src/guake/guake_app.py
-@@ -1202,6 +1202,7 @@ def accel_toggle_fullscreen(self, *args):
-         """Callback toggle the fullscreen status of the main
-         window. Called by the accel key.
-         """
-+
-         if not self.is_fullscreen:
-             self.fullscreen()
-         else:
-@@ -1228,6 +1229,10 @@ def fullscreen(self):
-             self.toolbar.hide()
- 
-     def unfullscreen(self):
-+
-+        # Fixes "Guake cannot restore from fullscreen" (#628)
-+        self.window.unmaximize()
-+
-         self.set_final_window_rect()
-         self.window.unfullscreen()
-         self.is_fullscreen = False
diff --git a/fix_tab_bar_size.patch b/fix_tab_bar_size.patch
deleted file mode 100644
index ac99d6f..0000000
--- a/fix_tab_bar_size.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From e6147d1f942e658afede15e07a23191a8947ca20 Mon Sep 17 00:00:00 2001
-From: Ozzyboshi <gun101@email.it>
-Date: Sat, 19 Sep 2015 17:23:02 +0200
-Subject: [PATCH] fixed bug #599
-
----
- data/guake.glade | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/guake.glade b/data/guake.glade
-index 61e9b89..9d66eb8 100644
---- a/data/guake.glade
-+++ b/data/guake.glade
-@@ -427,6 +427,7 @@
-                 <property name="vscrollbar_policy">never</property>
-                 <child>
-                   <widget class="GtkViewport" id="tabs-viewport">
-+                    <property name="height_request">10</property>
-                     <property name="visible">True</property>
-                     <property name="can_focus">False</property>
-                     <property name="shadow_type">none</property>
diff --git a/guake.spec b/guake.spec
index 6001369..10e8995 100644
--- a/guake.spec
+++ b/guake.spec
@@ -1,5 +1,5 @@
 Name:           guake
-Version:        0.8.1
+Version:        0.8.3
 Release:        1%{?dist}
 Summary:        Drop-down terminal for GNOME
 
@@ -9,12 +9,6 @@ URL:            http://guake-project.org/
 #Source0:        https://github.com/Guake/guake/archive/%{version}.tar.gz
 Source0:        guake-%{version}.tar.gz
 Patch5:         0001-Remove-vte-check-in-the-configure.ac.patch
-# Fixed upstream:
-# https://github.com/Ozzyboshi/guake/commit/e6147d1f942e658afede15e07a23191a8947ca20
-Patch6:         fix_tab_bar_size.patch
-# Fixed recovering from full-screen
-# https://github.com/Guake/guake/commit/893701060426772d08ace1a4464d045b4a23c243
-Patch7:         fix_fullscreen_recovery.patch
 
 BuildArch:      noarch
 
@@ -54,14 +48,9 @@ and press again to hide.
 sed -i -e '/^#!\//, 1d' src/guake/notifier.py
 
 %patch5 -p1 -b .
-%patch6 -p1 -b .
-%patch7 -p1 -b .
 
 ./autogen.sh
 
-cat data/guake.desktop.in
-cat data/guake.desktop
-
 # Enables to pass the configure without problem concerning python vte library
 sed -i -e 's|if test -z "$ac_pvte_result"; then|if test -z "" ; then|g' configure
 
@@ -122,6 +111,10 @@ killall gconfd-2 > /dev/null || :
 %{_datadir}/icons/hicolor/*/apps/%{name}*.png
 
 %changelog
+* Wed Oct 28 2015 Pierre-Yves Chibon <pingou@pingoured.fr> - 0.8.3-1
+- Update to 0.8.3
+- Drop the two patches we had added, they are now merged
+
 * Wed Oct 21 2015 Pierre-Yves Chibon <pingou@pingoured.fr> - 0.8.1-1
 - Update to 0.8.1
 - Backport upstream patch to fix the size of the tab bar
diff --git a/sources b/sources
index c5e2635..8951f43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9158b0121ae603e6c14160882fdd037e  guake-0.8.1.tar.gz
+39bca0e53dcc100ad0c34ceac249967c  guake-0.8.3.tar.gz