diff --git a/gptfdisk-0.8.2.tar.gz b/gptfdisk-0.8.2.tar.gz
deleted file mode 100644
index d09b388..0000000
--- a/gptfdisk-0.8.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1159027ca459661f04bc3bac8e79381895933ee214c4d6dba49b7d27204e5d3
-size 155914
diff --git a/gptfdisk-0.8.5.tar.xz b/gptfdisk-0.8.5.tar.xz
new file mode 100644
index 0000000..2884f21
--- /dev/null
+++ b/gptfdisk-0.8.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9620c0cb950bd83d4d19c528bf3ee2ee34fef8dc14da0d179cba85aa43a571c
+size 120060
diff --git a/gptfdisk-gcc47.patch b/gptfdisk-gcc47.patch
deleted file mode 100644
index b2ed2c9..0000000
--- a/gptfdisk-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gptfdisk-0.8.2/diskio-unix.cc
-===================================================================
---- gptfdisk-0.8.2.orig/diskio-unix.cc
-+++ gptfdisk-0.8.2/diskio-unix.cc
-@@ -22,6 +22,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#include <unistd.h>
- 
- #ifdef __linux__
- #include "linux/hdreg.h"
diff --git a/gptfdisk.changes b/gptfdisk.changes
index 379c94e..c15bb6d 100644
--- a/gptfdisk.changes
+++ b/gptfdisk.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jun 22 21:29:05 UTC 2012 - jengelh@inai.de
+
+- Update to new upstream release 0.8.5
+* sgdisk: fix bug that caused truncation of 2+ TiB partitions
+  on 32-bit
+* added type codes for Midnight BSD
+- Rip out unused gdisk subpackage
+
 -------------------------------------------------------------------
 Sat Mar 17 15:12:31 UTC 2012 - dimstar@opensuse.org
 
diff --git a/gptfdisk.spec b/gptfdisk.spec
index d57568d..2b216c3 100644
--- a/gptfdisk.spec
+++ b/gptfdisk.spec
@@ -14,24 +14,31 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
+
+
 Name:           gptfdisk
-Version:        0.8.2
+Version:        0.8.5
 Release:        0
 Summary:        GPT partitioning and MBR repair software
 License:        GPL-2.0
-Group:          Applications/System
+Group:          Base/System
 Url:            http://rodsbooks.com/gdisk
-Source:         http://rodsbooks.com/gdisk/gptfdisk-0.8.2.tar.gz
-Patch0:         gptfdisk-gcc47.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+#DL-URL:	http://downloads.sf.net/gptfdisk/gptfdisk-0.8.5.tar.gz
+Source:         %name-%version.tar.xz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
 BuildRequires:  ncurses-devel
+BuildRequires:  xz
 BuildRequires:  pkgconfig(icu-io)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(popt)
 BuildRequires:  pkgconfig(uuid)
 
+Obsoletes:      gdisk < %version-%release
+Provides:       gdisk = %version-%release
+
 %description
 Partitioning software for GPT disks and to repair MBR disks. The
 gdisk, cgdisk, and sgdisk utilities (in the gdisk package) are
@@ -39,17 +46,6 @@ GPT-enabled partitioning tools; the fixparts utility (in the fixparts
 package) fixes some problems with MBR disks that can be created by
 buggy partitioning software.
 
-%package -n gdisk
-Summary:        An fdisk-like partitioning tool for GPT disks
-Group:          Applications/System
-
-%description -n gdisk
-An fdisk-like partitioning tool for GPT disks. GPT
-fdisk features a command-line interface, fairly direct
-manipulation of partition table structures, recovery
-tools to help you deal with corrupt partition tables,
-and the ability to convert MBR disks to GPT format.
-
 %package fixparts
 Summary:        A tool for repairing certain types of damage to MBR disks
 Group:          Applications/System
@@ -62,7 +58,6 @@ provides a few additional partition manipulation features.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 CFLAGS="%optflags" CXXFLAGS="%optflags" make %{?_smp_mflags}