diff -Naur abiword-0.9.5/abi/src/pkg/linux/Makefile abiword-0.9.5.mod/abi/src/pkg/linux/Makefile
--- abiword-0.9.5/abi/src/pkg/linux/Makefile	Fri Sep 21 16:59:14 2001
+++ abiword-0.9.5.mod/abi/src/pkg/linux/Makefile	Thu Nov 22 22:11:44 2001
@@ -125,9 +125,9 @@
 
 
 
-PACK_ROOT:=$(ABI_ROOT)/../abisuite-$(ABI_BUILD_VERSION)
+PACK_ROOT:=$(ABI_ROOT)/../abiword-$(ABI_BUILD_VERSION)
 
-MODULE_LIST=abi-$(ABI_BUILD_VERSION) expat unixfonts abidistfiles libpng zlib wv
+MODULE_LIST=abi expat unixfonts abidistfiles libpng zlib wv
 
 # The following only works for RPM3.x
 #RPM_SOURCE_DIR=$(strip $(shell grep "topdir:" /etc/rpmrc | sed "s/.*topdir://"))
@@ -144,9 +144,9 @@
 	@mkdir -p $(PACK_ROOT)
 	@(cd $(ABI_ROOT)/..; tar --exclude=CVS -cf - $(MODULE_LIST)) | \
 		(cd $(PACK_ROOT); tar xf -)
-#	@rm -f $(RPM_SOURCE_DIR)/SOURCES/abisuite-$(ABI_BUILD_VERSION).tar
-	@(cd $(PACK_ROOT)/..; tar cf $(RPM_SOURCE_DIR)/SOURCES/abisuite-$(ABI_BUILD_VERSION).tar \
-		 abisuite-$(ABI_BUILD_VERSION))
+#	@rm -f $(RPM_SOURCE_DIR)/SOURCES/abiword-$(ABI_BUILD_VERSION).tar
+	@(cd $(PACK_ROOT)/..; tar cf $(RPM_SOURCE_DIR)/SOURCES/abiword-$(ABI_BUILD_VERSION).tar \
+		 abiword-$(ABI_BUILD_VERSION))
 	@rm -rf $(PACK_ROOT)
 
 ########################################################################
@@ -158,13 +158,13 @@
 # so rip the spec template through some sed magic and run with it.
 	@$(subst xxxx,$(DIST),$(VERIFY_DIRECTORY))	
 	@echo "Exporting spec file to [$(RPM_SOURCE_DIR)/SPECS]..."
-	@(sed "s/__ABI_BUILD_VERSION__/$(ABI_BUILD_VERSION)/" rpm/abisuite.spec-template \
+	@(sed "s/__ABI_BUILD_VERSION__/$(ABI_BUILD_VERSION)/" rpm/abiword.spec-template \
 		| sed "s/__ABI_RELEASE_NUMBER__/$(ABI_RELEASE_NUMBER)/" \
-		> $(RPM_SOURCE_DIR)/SPECS/abisuite-$(ABI_BUILD_VERSION).spec)
+		> $(RPM_SOURCE_DIR)/SPECS/abiword-$(ABI_BUILD_VERSION).spec)
 	@echo "Producing RPM..."
-	rpm -ba $(RPM_SOURCE_DIR)/SPECS/abisuite-$(ABI_BUILD_VERSION).spec
-	mv $(RPM_SOURCE_DIR)/RPMS/$(OS_ARCH)/abisuite-$(ABI_BUILD_VERSION)-$(ABI_RELEASE_NUMBER).$(OS_ARCH).rpm $(DIST)
-	mv $(RPM_SOURCE_DIR)/SRPMS/abisuite-$(ABI_BUILD_VERSION)-$(ABI_RELEASE_NUMBER).$(OS_ARCH).src.rpm $(DIST)
+	rpm -ba $(RPM_SOURCE_DIR)/SPECS/abiword-$(ABI_BUILD_VERSION).spec
+	mv $(RPM_SOURCE_DIR)/RPMS/$(OS_ARCH)/abiword-$(ABI_BUILD_VERSION)-$(ABI_RELEASE_NUMBER).$(OS_ARCH).rpm $(DIST)
+	mv $(RPM_SOURCE_DIR)/SRPMS/abiword-$(ABI_BUILD_VERSION)-$(ABI_RELEASE_NUMBER).src.rpm $(DIST)
 
 deb::
 	@echo "Producing Deb..."
diff -Naur abiword-0.9.5/abi/src/pkg/linux/rpm/abisuite.spec-template abiword-0.9.5.mod/abi/src/pkg/linux/rpm/abisuite.spec-template
--- abiword-0.9.5/abi/src/pkg/linux/rpm/abisuite.spec-template	Fri Jun 15 09:38:51 2001
+++ abiword-0.9.5.mod/abi/src/pkg/linux/rpm/abisuite.spec-template	Thu Jan  1 01:00:00 1970
@@ -1,114 +0,0 @@
-%define version __ABI_BUILD_VERSION__
-%define release	__ABI_RELEASE_NUMBER__
-
-#
-# spec file for AbiSuite 
-#
-Summary: AbiWord Word Processor
-Name: abiword
-Version: %{version}
-Release: %{release}
-Copyright: GPL
-Group: Applications/Productivity
-Source: abisuite-%{version}.tar
-URL: http://www.abisource.com/
-Vendor: AbiSource, Inc.
-Packager: Dom Lachowicz <dominicl@seas.upenn.edu>
-AutoReqProv: yes
-
-Requires: gtk+ >= 1.2.7
-Requires: glib >= 1.2.7
-
-# TODO: requirements in for *Gnome Only*
-#Requires: gnome-libs >= 1.0.57
-#Requires: gnome-print >= 0.25
-#Requires: gal >= 0.0.1
-
-# TODO: requirements for pspell only
-#Requires: pspell >= 0.11.2
-
-%description
-AbiWord is a cross-platform, Open Source Word Processor developed
-by the people at AbiSource, Inc. and by developers from around the world.
-(http://www.abisource.com)
-
-%prep
-%setup
-
-%build
-UNIX_CAN_BUILD_STATIC=0 ABI_BUILD_VERSION=%{version} make -C abi-%{version} compile canonical
-
-%install
-umask 002
-UNIX_CAN_BUILD_STATIC=0 ABI_BUILD_VERSION=%{version} make -C abi-%{version} install_redhat
-
-# I can't think of a way to do this in a non-overlapping fashion
-# as part of the %files section with %defattr() blocks, so I do
-# it here.
-
-# /usr/share/abisuite ; all dirs 0755
-find /usr/share/abisuite -type d -exec chown root.root {} \;
-find /usr/share/abisuite -type d -exec chmod 0755 {} \;
-
-# /usr/share/abisuite ; all files 0644
-find /usr/share/abisuite -type f -exec chown root.root {} \;
-find /usr/share/abisuite -type f -exec chmod 0644 {} \;
-
-# symlinks in /usr/bin 0777 by default ; own by root.root
-chown root.root /usr/bin/AbiWord
-chown root.root /usr/bin/abiword
-
-# exception to find above, bins 0755
-chown root.root /usr/share/abisuite/bin/AbiWord*
-chmod 0755      /usr/share/abisuite/bin/AbiWord*
-
-# docs 0755 for dir
-chown root.root /usr/doc/abisuite
-chmod 0755 /usr/doc/abisuite
-
-# docs 0644 for files
-chown root.root /usr/doc/abisuite/*
-chmod 0644 /usr/doc/abisuite/*
-
-# menu file 0644
-chown root.root /usr/lib/menu/abisuite
-chmod 644 /usr/lib/menu/abisuite
-
-# icon file 0644
-chown root.root /usr/share/pixmaps/abiword*
-chmod 0644 /usr/share/pixmaps/abiword*
-
-# desktop file 0644
-chown root.root /usr/share/gnome/apps/Applications/abiword.desktop
-chmod 0644 /usr/share/gnome/apps/Applications/abiword.desktop
-
-%post
-/usr/sbin/chkfontpath -q -a /usr/share/abisuite/fonts
-
-%postun
-if [ "$1" = "0" ]; then
-        /usr/sbin/chkfontpath -q -r /usr/share/abisuite/fonts
-fi
-
-%files
-/usr/bin/AbiWord
-/usr/bin/abiword
-%docdir /usr/doc/abisuite
-/usr/lib/menu/abisuite
-/usr/share/pixmaps/abiword_48.png
-/usr/share/gnome/apps/Applications/abiword.desktop
-/usr/share/abisuite
-
-%clean
-rm -rf /usr/share/abisuite
-rm -rf /usr/doc/abisuite
-rm -f /usr/bin/AbiWord
-rm -f /usr/bin/abiword
-rm -f /usr/lib/menu/abisuite
-rm -f /usr/share/pixmaps/abiword_48.png
-rm -f /usr/share/gnome/apps/Applications/abiword.desktop
-rm -rf $RPM_BUILD_DIR/abisuite-%{version}
-# are there better ways to get these paths?
-rm -f $RPM_SOURCE_DIR/abisuite-%{version}.tar
-rm -f $RPM_SOURCE_DIR/../SRPMS/abisuite-%{version}-%{release}.src.rpm
-rm -f $RPM_SOURCE_DIR/../SPECS/abisuite-%{version}.spec
diff -Naur abiword-0.9.5/abi/src/pkg/linux/rpm/abiword.spec-template abiword-0.9.5.mod/abi/src/pkg/linux/rpm/abiword.spec-template
--- abiword-0.9.5/abi/src/pkg/linux/rpm/abiword.spec-template	Thu Jan  1 01:00:00 1970
+++ abiword-0.9.5.mod/abi/src/pkg/linux/rpm/abiword.spec-template	Thu Nov 22 22:12:02 2001
@@ -0,0 +1,113 @@
+%define version __ABI_BUILD_VERSION__
+%define release	__ABI_RELEASE_NUMBER__
+
+#
+# spec file for AbiSuite 
+#
+Summary: AbiWord Word Processor
+Name: abiword
+Version: %{version}
+Release: %{release}
+Copyright: GPL
+Group: Applications/Productivity
+Source: abiword-%{version}.tar
+URL: http://www.abisource.com/
+Vendor: AbiSource, Inc.
+Packager: Dom Lachowicz <dominicl@seas.upenn.edu>
+AutoReqProv: yes
+
+Requires: gtk+ >= 1.2.7
+Requires: glib >= 1.2.7
+
+# TODO: requirements in for *Gnome Only*
+#Requires: gnome-libs >= 1.0.57
+#Requires: gnome-print >= 0.25
+#Requires: gal >= 0.0.1
+
+# TODO: requirements for pspell only
+#Requires: pspell >= 0.11.2
+
+%description
+AbiWord is a cross-platform, Open Source Word Processor developed
+by the people at AbiSource, Inc. and by developers from around the world.
+(http://www.abisource.com)
+
+%prep
+%setup
+
+%build
+UNIX_CAN_BUILD_STATIC=0 ABI_BUILD_VERSION=%{version} make -C abi compile canonical
+
+%install
+umask 002
+UNIX_CAN_BUILD_STATIC=0 ABI_BUILD_VERSION=%{version} make -C abi install_redhat
+
+# I can't think of a way to do this in a non-overlapping fashion
+# as part of the %files section with %defattr() blocks, so I do
+# it here.
+
+# /usr/share/abisuite ; all dirs 0755
+find /usr/share/abisuite -type d -exec chown root.root {} \;
+find /usr/share/abisuite -type d -exec chmod 0755 {} \;
+
+# /usr/share/abisuite ; all files 0644
+find /usr/share/abisuite -type f -exec chown root.root {} \;
+find /usr/share/abisuite -type f -exec chmod 0644 {} \;
+
+# symlinks in /usr/bin 0777 by default ; own by root.root
+chown root.root /usr/bin/AbiWord
+chown root.root /usr/bin/abiword
+
+# exception to find above, bins 0755
+chown root.root /usr/share/abisuite/bin/AbiWord*
+chmod 0755      /usr/share/abisuite/bin/AbiWord*
+
+# docs 0755 for dir
+chown root.root /usr/doc/abisuite
+chmod 0755 /usr/doc/abisuite
+
+# docs 0644 for files
+chown root.root /usr/doc/abisuite/*
+chmod 0644 /usr/doc/abisuite/*
+
+# menu file 0644
+chown root.root /usr/lib/menu/abisuite
+chmod 644 /usr/lib/menu/abisuite
+
+# icon file 0644
+chown root.root /usr/share/pixmaps/abiword*
+chmod 0644 /usr/share/pixmaps/abiword*
+
+# desktop file 0644
+chown root.root /usr/share/gnome/apps/Applications/abiword.desktop
+chmod 0644 /usr/share/gnome/apps/Applications/abiword.desktop
+
+%post
+/usr/sbin/chkfontpath -q -a /usr/share/abisuite/fonts
+
+%postun
+if [ "$1" = "0" ]; then
+        /usr/sbin/chkfontpath -q -r /usr/share/abisuite/fonts
+fi
+
+%files
+/usr/bin/AbiWord
+/usr/bin/abiword
+%docdir /usr/doc/abisuite
+/usr/lib/menu/abisuite
+/usr/share/pixmaps/abiword_48.png
+/usr/share/gnome/apps/Applications/abiword.desktop
+/usr/share/abisuite
+
+%clean
+rm -rf /usr/share/abisuite
+rm -rf /usr/doc/abisuite
+rm -f /usr/bin/AbiWord
+rm -f /usr/bin/abiword
+rm -f /usr/lib/menu/abisuite
+rm -f /usr/share/pixmaps/abiword_48.png
+rm -f /usr/share/gnome/apps/Applications/abiword.desktop
+rm -rf $RPM_BUILD_DIR/abiword-%{version}
+# are there better ways to get these paths?
+rm -f $RPM_SOURCE_DIR/abiword-%{version}.tar
+rm -f $RPM_SOURCE_DIR/../SPECS/abiword-%{version}.spec