diff --git a/parted.spec b/parted.spec
index fce0dd0..70063bd 100644
--- a/parted.spec
+++ b/parted.spec
@@ -4,16 +4,20 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.6.16
-Release: 1
+Release: 2
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: parted-1.6.3-fat.c.patch
 Patch2: parted-1.6.15-unique-sig.patch
+Patch3: parted-1.6.16-gpt-device_length_pmbr.patch
 
 Patch100: parted-1.6.15-dasd.patch
 Patch150: parted-1.6.3-iseries.patch
 Patch151: parted-1.6.3-aix.patch
 Patch152: parted-1.6.15-dasd_geometry.patch
 
+# patch from upstream cvs to do geometry probing hopefully "better"
+Patch500: parted-msdos-geom-probe-cvs.patch
+
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
 Group: Applications/System
@@ -42,8 +46,10 @@ Parted library, you need to install this package.
 
 %prep
 %setup -q
+%patch500 -p1 -b .geomprobe
 %patch0 -p1 -b .sigfpe
 %patch2 -p1 -b .unique
+%patch3 -p1 -b .gptdev
 
 %patch100 -p1 -b .dasd
 %patch150 -p1 -b .iseries
@@ -94,6 +100,13 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 %{_libdir}/*.a*
 
 %changelog
+* Thu Nov 11 2004 Jeremy Katz <katzj@redhat.com> - 1.6.16-2
+- add patch from Matt Domsch to fix consistency of GPT disk labels 
+  with the EFI specification for disks > 2TB (#138480)
+- understand the new Sun UFS partition ID
+- merge the new geometry probing from CVS to see if that helps the 
+  assertions people are seeing (#138419)
+
 * Mon Nov  8 2004 Jeremy Katz <katzj@redhat.com> - 1.6.16-1
 - update to 1.6.16
 - rebuild for python 2.4