diff --git a/.cvsignore b/.cvsignore
index 9fbfc05..9e9225a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-parted-1.6.3.tar.gz
+parted-1.6.6.tar.gz
diff --git a/parted.spec b/parted.spec
index 85b960a..6cf4c75 100644
--- a/parted.spec
+++ b/parted.spec
@@ -1,29 +1,28 @@
-# -*- mode: rpm-spec -*-
 %define aclocaldir	/usr/share/aclocal
 %define _sbindir /sbin
 
 Summary: The GNU disk partition manipulation program.
 Name: parted
-Version: 1.6.3
-Release: 33
+Version: 1.6.6
+Release: 2
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Source1: fake-libtool.sh
 Patch0: parted-1.6.3-fat.c.patch
-# NOTE: remove patch1 when updating to a new tarball
-Patch1: parted-1.6.3-debug.patch
-Patch2: parted-1.6.3-vtoc.patch
-Patch3: parted-1.6.3-s390update.patch
-Patch4: parted-1.6.3-ldl.patch
-Patch5: parted-1.6.3-iseries.patch
-Patch6: parted-1.6.3-aix.patch
-Patch7: parted-1.6.3-s390raidlvm.patch
-Patch8: parted-1.6.3-gptver.patch
-Patch9: parted-1.6.3-destroy-segfault.patch
-Patch10: parted-1.6.3-26geom.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
+Patch150: parted-1.6.3-iseries.patch
+Patch151: parted-1.6.3-aix.patch
+
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
 Group: Applications/System
 BuildRequires: e2fsprogs-devel libtermcap-devel readline-devel
 BuildRequires: python-devel ncurses-devel
+BuildRequires: automake14 autoconf
+
 %description
 The GNU Parted program allows you to create, destroy, resize, move,
 and copy hard disk partitions. Parted can be used for creating space
@@ -44,42 +43,37 @@ Parted library, you need to install this package.
 %prep
 %setup -q
 %patch0 -p1 -b .sigfpe
-%patch1 -p1 -b .dasddbg
-%patch2 -p1 -b .vtoc
-%patch3 -p1 -b .s390update
-%patch4 -p1 -b .ldl
-%patch5 -p1 -b .iseries
-%patch6 -p1 -b .aix
-%patch7 -p1 -b .s390raidlvm
-%patch8 -p1 -b .gptver
-%patch9 -p1 -b .segfault
-%patch10 -p1 -b .26geom
+%patch1 -p1 -b .gptver
+%patch2 -p1 -b .26geom
+%patch3 -p1 -b .partstatic
+
+%patch100 -p1 -b .dasd
+%patch150 -p1 -b .iseries
+%patch151 -p1 -b .aix
+
+aclocal-1.4
+automake-1.4 --add-missing
+autoconf
+autoheader
 
 %build
 if [ -n "$LINGUAS" ]; then unset LINGUAS; fi
-#export CFLAGS="-DDEBUG_DASD"
 %configure --enable-shared --enable-part-static --enable-pc98=no --enable-Werror=no --disable-dynamic-loading
 export tagname=CC
-make LIBTOOL=/usr/bin/libtool
+make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
+
+# Because this is the best fix for 118183, given libtool's stupidity.
+cd parted
+mv parted parted_
+make LIBTOOL=$RPM_SOURCE_DIR/fake-libtool.sh parted
+mv parted_ parted
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-# don't relink the python module
-sed 's/^relink_command=/#relink_command=/' python/partedmodule.la > python/partedmodule.la-
-mv python/partedmodule.la- python/partedmodule.la
 export tagname=CC
-%makeinstall LIBTOOL=/usr/bin/libtool
+%makeinstall LIBTOOL=/usr/bin/libtool MKINSTALLDIRS=`pwd`/mkinstalldirs
 find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
-rm -f $RPM_BUILD_ROOT/usr/lib/python*/site-packages/*.a
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-# FIXME: hack for x86_64 until automake's python.m4 is fixed
-if [ "%{_libdir}" != "/usr/lib" ]; then
-  for path in $RPM_BUILD_ROOT/usr/lib/python?.? ; do
-    dir=`basename $path`
-    mkdir -p $RPM_BUILD_ROOT/%{_libdir}/$dir
-    mv $RPM_BUILD_ROOT/usr/lib/$dir/* $RPM_BUILD_ROOT/%{_libdir}/$dir/
-  done
-fi
 
 %find_lang %name
 
@@ -92,13 +86,11 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO doc/COPYING.DOC doc/API doc/USER doc/FAT
+%doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO doc/API doc/FAT
 %{_sbindir}/*
 %{_mandir}/*/*
 %{_libdir}/*.so*
 %{_infodir}/parted.info*
-%dir %{_libdir}/python?.?/site-packages
-%{_libdir}/python?.?/site-packages/*.so
 
 %files devel
 %defattr(-,root,root)
@@ -107,6 +99,24 @@ fi
 %{_libdir}/*.a*
 
 %changelog
+* Mon Mar 15 2004 Elliot Lee <sopwith@redhat.com> 1.6.6-2
+- Fix parted's "part-static" option to close #118183. Woohoo, a fake-libtool.sh :)
+
+* Fri Mar 12 2004 Jeremy Katz <katzj@redhat.com> - 1.6.6-1
+- update to 1.6.6 
+- split dasd into a patch instead of included in the tarball
+- python module is now in the pyparted package (separate src.rpm)
+- ExcludeArch: ppc64 (#118183)
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Fri Feb  6 2004 Jeremy Katz <katzj@redhat.com>
+- add automake buildrequires (#115063)
+
 * Thu Jan 22 2004 Jeremy Katz <katzj@redhat.com> 1.6.3-33
 - 2.6 removes the geometry fixups that used to be present for IDE disks.  
   According to Andries, just follow what's in the partition table and don't 
diff --git a/sources b/sources
index 09af2f3..f5a4510 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-897efe1d84eacb1d5eaace4a7605be6a  parted-1.6.3.tar.gz
+563ab3855124c2ed706ea71eb8e47cf5  parted-1.6.6.tar.gz