diff --git a/.cvsignore b/.cvsignore
index e75a754..b48c4cf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,14 +1 @@
-parted-1.6.14.tar.gz
-parted-1.6.15.tar.gz
-parted-1.6.16.tar.gz
-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
-parted-1.6.23.tar.gz
-parted-1.6.24.tar.gz
-parted-1.6.25.tar.gz
-parted-1.6.25.1.tar.gz
-parted-1.7.0.tar.bz2
-parted-1.7.1.tar.bz2
+parted-1.8.0.tar.bz2
diff --git a/parted.spec b/parted.spec
index 05917d6..537bec2 100644
--- a/parted.spec
+++ b/parted.spec
@@ -1,24 +1,11 @@
-%define aclocaldir	/usr/share/aclocal
+%define aclocaldir /usr/share/aclocal
 %define _sbindir /sbin
 
 Summary: The GNU disk partition manipulation program.
 Name:    parted
-Version: 1.7.1
-Release: 18%{?dist}
+Version: 1.8.0
+Release: 1%{?dist}
 Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
-Patch0:  parted-1.7.0-fat.c.patch
-Patch1:  parted-1.7.0-sx8.patch
-Patch3:  parted-1.7.1-dasd.patch
-Patch4:  parted-1.7.0-iseries.patch
-Patch5:  parted-1.7.1-dm.patch
-Patch6:  parted-1.7.0-aix.patch
-Patch7:  parted-1.7.1-vtoc-errbuf.patch
-Patch8:  parted-1.7.1-O_DIRECT.patch
-Patch9:  parted-1.7.1-get_exception.patch
-Patch10: parted-1.7.1-gpt.patch
-Patch11: parted-1.7.1-ped_geometry_read.patch
-Patch12: parted-1.7.1-goto.patch
-Patch13: parted-1.7.1-apple_boot.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -47,29 +34,17 @@ Parted library, you need to install this package.
 
 %prep
 %setup -q
-%patch0 -p1 -b .sigfpe
-%patch1 -p1 -b .sx8
-%patch3 -p1 -b .dasd
-%patch4 -p1 -b .iseries
-%patch5 -p1 -b .dm
-%patch6 -p1 -b .aix
-%patch7 -p1 -b .vtoc_errbuf
-%patch8 -p1 -b .o_direct
-%patch9 -p1 -b .get_exception
-%patch10 -p1 -b .gpt
-%patch11 -p1 -b .geom
-%patch12 -p1 -b .goto
-%patch13 -p1 -b .apple_boot
-
-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
-
 aclocal
 autoconf
 
 %build
-if [ -n "$LINGUAS" ]; then unset LINGUAS; fi
-%configure --enable-shared --enable-part-static --enable-pc98=no --enable-Werror=no --disable-dynamic-loading
+%configure \
+   --enable-shared \
+   --enable-device-mapper \
+   --enable-part-static \
+   --enable-pc98=no \
+   --enable-Werror=no \
+   --disable-dynamic-loading
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
 
@@ -113,6 +88,9 @@ exit 0
 %{_libdir}/*.so
 
 %changelog
+* Fri Nov 17 2006 David Cantrell <dcantrell@redhat.com> - 1.8.0-1
+- Upgrad to GNU parted-1.8.0
+
 * Thu Nov 02 2006 David Cantrell <dcantrell@redhat.com> - 1.7.1-18
 - Detect Apple_Boot partition types correctly (#204714)
 
diff --git a/sources b/sources
index 02e6bc6..1395cf6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-baa6771273c8362d735086d52a0d6efe  parted-1.7.1.tar.bz2
+c0172d2e3a9fe12db1fe1c7915ab987e  parted-1.8.0.tar.bz2