diff --git a/.cvsignore b/.cvsignore
index 3fc0106..6c8cb07 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-parted-1.8.2.tar.bz2
+parted-1.8.4.tar.bz2
diff --git a/parted.spec b/parted.spec
index a89511c..a7f3591 100644
--- a/parted.spec
+++ b/parted.spec
@@ -3,19 +3,16 @@
 
 Summary: The GNU disk partition manipulation program
 Name:    parted
-Version: 1.8.2
-Release: 5%{?dist}
+Version: 1.8.4
+Release: 1%{?dist}
 Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 
-Patch0:  parted-1.8.2-vista.patch
-Patch1:  parted-1.8.1-bz221600.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 Group: Applications/System
 BuildRequires: e2fsprogs-devel readline-devel ncurses-devel
 BuildRequires: automake libtool gettext-devel texinfo
-BuildRequires: device-mapper-devel >= 1.02.17, libselinux-devel libsepol-devel
+BuildRequires: device-mapper-devel, libselinux-devel libsepol-devel
 
 Prereq: /sbin/install-info
 
@@ -37,63 +34,61 @@ Parted library, you need to install this package.
 
 %prep
 %setup -q
-%patch0 -p 1 -b .vista
-%patch1 -p 1 -b .bz221600
-aclocal
-autoconf
 
 %build
-%configure \
-   --enable-shared \
-   --enable-device-mapper \
-   --enable-selinux \
-   --enable-part-static \
-   --enable-pc98=no \
-   --enable-Werror=no \
-   --disable-dynamic-loading
-export tagname=CC
-make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
+%configure --enable-device-mapper --enable-selinux
+%{__make} %{?_smp_mflags}
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-export tagname=CC
-%makeinstall LIBTOOL=/usr/bin/libtool MKINSTALLDIRS=`pwd`/mkinstalldirs
-find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-
-%find_lang %name
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+%{__rm} -rf %{buildroot}%{_libdir}/*.la
+%{__rm} -rf %{buildroot}%{_infodir}/dir
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post 
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/parted.info* %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/parted.info.gz %{_infodir}/dir || :
 
 %preun
 if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/parted.info* %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/parted.info.gz %{_infodir}/dir
 fi
 exit 0
 
 %postun -p /sbin/ldconfig 
 
-%files -f %{name}.lang
-%defattr(-,root,root)
+%files
+%defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO doc/API doc/FAT
-%{_sbindir}/*
-%{_mandir}/*/*
-%{_libdir}/*.so.*
-%{_infodir}/parted.info*
+%{_sbindir}/parted
+%{_sbindir}/partprobe
+%{_mandir}/man8/parted.8.gz
+%{_mandir}/man8/partprobe.8.gz
+%{_libdir}/libparted-*.so.*
+%{_libdir}/libparted-*.so.*
+%{_infodir}/parted.info.gz
 
 %files devel
-%defattr(-,root,root)
-%{_prefix}/include/*
-%{aclocaldir}/*
-%{_libdir}/*.a*
-%{_libdir}/*.so
+%defattr(-,root,root,-)
+%{_includedir}/parted
+%{_libdir}/libparted.a
+%{_libdir}/libparted.so
+%{_libdir}/pkgconfig/libparted.pc
 
 %changelog
+* Fri Mar 16 2007 David Cantrell <dcantrell@redhat.com> - 1.8.4-1
+- Upgrade to GNU parted-1.8.4, summary of major changes:
+     a) Update to use newest GNU developer tools
+     b) Use gnulib, the GNU portability library
+     c) HFS+ resize support
+     d) Windows Vista fixes
+     e) AIX disk label fixes
+     f) >512 byte logical sector read support on Linux
+- Spec file cleanups per Fedora packaging guidelines
+
 * Thu Feb 08 2007 David Cantrell <dcantrell@redhat.com> - 1.8.2-5
 - Remove period from end of summary line (package review)
 - Use preferred BuildRoot (package review)
diff --git a/sources b/sources
index 9a1aa27..332282f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f29d377592273fd3e874ebe6d492a93c  parted-1.8.2.tar.bz2
+10f06dfa3e716c7e688f0949db5bfb65  parted-1.8.4.tar.bz2