diff --git a/.cvsignore b/.cvsignore
index 67aa4b1..dfb4b7d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ parted-1.6.18.tar.gz
 parted-1.6.19.tar.gz
 parted-1.6.20.tar.gz
 parted-1.6.21.tar.gz
+parted-1.6.22.tar.gz
diff --git a/parted.spec b/parted.spec
index 397a736..f775c67 100644
--- a/parted.spec
+++ b/parted.spec
@@ -3,8 +3,8 @@
 
 Summary: The GNU disk partition manipulation program.
 Name: parted
-Version: 1.6.21
-Release: 3
+Version: 1.6.22
+Release: 1
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: parted-1.6.3-fat.c.patch
 Patch3: parted-1.6.19-sx8.patch
@@ -13,8 +13,7 @@ Patch100: parted-1.6.21-dasd.patch
 Patch150: parted-1.6.3-iseries.patch
 Patch151: parted-1.6.3-aix.patch
 Patch152: parted-1.6.15-dasd_geometry.patch
-Patch153: parted-1.6.21-mac-lvm.patch
-Patch154: parted-1.6.21-gcc4.patch
+Patch153: parted-1.6.22-mac-lvm.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -52,7 +51,6 @@ Parted library, you need to install this package.
 %patch151 -p1 -b .aix
 %patch152 -p1 -b .dasd_geometry
 %patch153 -p1 -b .mac-lvm
-%patch154 -p1 -b .gcc4
 
 iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_
 mv doc/pt_BR-parted.8_ doc/pt_BR-parted.8
@@ -101,6 +99,11 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 %{_libdir}/*.a*
 
 %changelog
+* Wed Mar 23 2005 Chris Lumens <clumens@redhat.com> 1.6.22-1
+- Updated to 1.6.22.
+- Get rid of separate gc4 patch that's now included upstream.
+- Take Mac LVM patch from parted CVS.
+
 * Mon Mar 14 2005 Chris Lumens <clumens@redhat.com> 1.6.21-3
 - Include patches from parted CVS for new gcc4 warnings.
 
diff --git a/sources b/sources
index c9d22a5..015a094 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb1b8d3d74792a74c9fc4cbb0d351737  parted-1.6.21.tar.gz
+a8177c27ce5830bdaa4d6f2d7cd13671  parted-1.6.22.tar.gz