diff --git a/kitty-0.8.2-desktopfile-category.patch b/kitty-0.8.2-desktopfile-category.patch
deleted file mode 100644
index 8f7dbf6..0000000
--- a/kitty-0.8.2-desktopfile-category.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urEbwB kitty-0.8.2/setup.py kitty-0.8.2.new/setup.py
---- kitty-0.8.2/setup.py	2018-03-17 13:15:57.000000000 +0100
-+++ kitty-0.8.2.new/setup.py	2018-03-21 11:23:51.409869542 +0100
-@@ -549,7 +549,7 @@
- TryExec=kitty
- Exec=kitty
- Icon=kitty
--Categories=System;
-+Categories=System;TerminalEmulator;
- '''
-             )
-     # }}}
diff --git a/kitty.changes b/kitty.changes
index f165d33..e78911f 100644
--- a/kitty.changes
+++ b/kitty.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  2 06:55:11 UTC 2018 - glin@suse.com
+
+- Update to 0.8.4
+- Drop upstreamed patch: kitty-0.8.2-desktopfile-category.patch
+
 -------------------------------------------------------------------
 Tue Mar 20 16:07:57 UTC 2018 - mvetter@suse.com
 
diff --git a/kitty.spec b/kitty.spec
index 5fc535b..f5c076e 100644
--- a/kitty.spec
+++ b/kitty.spec
@@ -17,15 +17,13 @@
 
 
 Name:           kitty
-Version:        0.8.2
+Version:        0.8.4
 Release:        0
 Summary:        A cross-platform, fast, feature full, GPU based terminal emulator
 License:        GPL-3.0-only
 Group:          System/X11/Terminals
 URL:            https://github.com/kovidgoyal/kitty
 Source:         https://github.com/kovidgoyal/kitty/archive/v%{version}.tar.gz
-# https://github.com/kovidgoyal/kitty/pull/410
-Patch0:         kitty-0.8.2-desktopfile-category.patch
 BuildRequires:  ImageMagick-devel
 BuildRequires:  Mesa-libGL-devel
 BuildRequires:  fontconfig-devel
@@ -55,7 +53,6 @@ bracketed paste and so on. And which can be controlled by scripts.
 
 %prep
 %setup -q
-%patch0 -p1
 find . -type f -exec sed -i "s/#!\/usr\/bin\/env python3/#!\/usr\/bin\/python3/" {} +
 
 %build
diff --git a/v0.8.2.tar.gz b/v0.8.2.tar.gz
deleted file mode 100644
index a4d058c..0000000
--- a/v0.8.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:083d89d12b94ba27eccfe89d31988b633d2f2c93f442d29306b652f16c3c9470
-size 3281308
diff --git a/v0.8.4.tar.gz b/v0.8.4.tar.gz
new file mode 100644
index 0000000..438d139
--- /dev/null
+++ b/v0.8.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fceab2131c0c2e8403e06946fcf343bed5b04f14944d51b4c2fe41f350dfd68
+size 3285125