diff --git a/.cvsignore b/.cvsignore
index 9bc7e66..6545931 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-parted-1.6.11.tar.gz
+parted-1.6.12.tar.gz
diff --git a/parted.spec b/parted.spec
index 8a5d1a2..c74c19d 100644
--- a/parted.spec
+++ b/parted.spec
@@ -3,15 +3,12 @@
 
 Summary: The GNU disk partition manipulation program.
 Name: parted
-Version: 1.6.11
-Release: 5
+Version: 1.6.12
+Release: 1
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: parted-1.6.3-fat.c.patch
-Patch1: parted-1.6.6-gptver.patch
-Patch2: parted-1.6.3-26geom.patch
-Patch3: parted-1.6.6-partstatic.patch
 
-Patch100: parted-1.6.3-dasd.patch
+Patch100: parted-1.6.12-dasd.patch
 Patch150: parted-1.6.3-iseries.patch
 Patch151: parted-1.6.3-aix.patch
 
@@ -44,9 +41,6 @@ Parted library, you need to install this package.
 %prep
 %setup -q
 %patch0 -p1 -b .sigfpe
-#patch1 -p1 -b .gptver
-%patch2 -p1 -b .26geom
-%patch3 -p1 -b .partstatic
 
 %patch100 -p1 -b .dasd
 %patch150 -p1 -b .iseries
@@ -96,6 +90,10 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 %{_libdir}/*.a*
 
 %changelog
+* Mon Aug 16 2004 Jeremy Katz <katzj@redhat.com> - 1.6.12-1
+- update to 1.6.12 with major changes to CHS handling to hopefully fix #115980
+- adjust dasd patch accordingly, drop some included patches
+
 * Mon Jul 19 2004 Karsten Hopp <karsten@redhat.de> 1.6.11-4 
 - update dasd patch for dos-type partitions on mainframes (scsi disks)
 
diff --git a/sources b/sources
index d3885aa..edbff13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5cad5f9fd010da2ee038f0940a43bedb  parted-1.6.11.tar.gz
+f3fd0e95e52be0b36c5431231e2621ce  parted-1.6.12.tar.gz