diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index aff4cfe..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xbase
-# $Id$
-NAME := xbase
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/xbase-2.0.0-ppc.patch b/xbase-2.0.0-ppc.patch
new file mode 100644
index 0000000..3b743a9
--- /dev/null
+++ b/xbase-2.0.0-ppc.patch
@@ -0,0 +1,20 @@
+--- xbase-2.0.0/ltconfig.foo	2007-05-04 18:14:42.000000000 -0400
++++ xbase-2.0.0/ltconfig	2007-05-04 18:15:39.000000000 -0400
+@@ -1664,16 +1664,7 @@ linux-gnu*)
+   shlibpath_var=LD_LIBRARY_PATH
+   check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object'
+   sys_lib_search_path="/lib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`"
+-
+-  if test -f /lib/ld.so.1; then
+-    dynamic_linker='GNU ld.so'
+-  else
+-    # Only the GNU ld.so supports shared libraries on MkLinux.
+-    case "$host_cpu" in
+-    powerpc*) dynamic_linker=no ;;
+-    *) dynamic_linker='Linux ld.so' ;;
+-    esac
+-  fi
++  dynamic_linker='GNU ld.so'
+   ;;
+ 
+ netbsd* | openbsd*)
diff --git a/xbase.spec b/xbase.spec
index fc78545..ea658d5 100644
--- a/xbase.spec
+++ b/xbase.spec
@@ -1,13 +1,14 @@
 Name:		xbase
-Summary: 	XBase compatible database library and tools
+Summary: 	XBase compatible database library
 Version: 	2.0.0
-Release: 	6%{?dist}
-License: 	LGPL (binaries GPL)
-Group: 		Development/Libraries
+Release: 	8%{?dist}
+License: 	LGPLv2+
+Group: 		System Environment/Libraries
 URL:		http://linux.techass.com/projects/xdb/
-Source0:	http://dl.sourceforge.net/xdb/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/xdb/%{name}-%{version}.tar.gz
 Patch0:		xbase-2.0.0-fixconfig.patch
 Patch1:		xbase-2.0.0-fixheader.patch
+Patch2:		xbase-2.0.0-ppc.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	doxygen
 
@@ -29,13 +30,28 @@ Requires: %{name} = %{version}-%{release}
 %description devel
 Headers and libraries for compiling programs that use the XBase library.
 
+%package utils
+Summary: XBase utilities / tools
+Group: Applications/Databases
+License: GPLv2+
+Requires: %{name} = %{version}-%{release}
+
+%description utils
+This package contains various utilities for working with X-Base files:
+checkndx (check an NDX file), copydbf (copy a DBF file structure), deletall
+(mark all records for deletion), dumphdr (print an X-Base file header),
+dumprecs (dump records for an X-Base file), packdbf (pack a database file),
+reindex (rebuild an index), undelall (undeletes all deleted records in a file),
+zap (remove all records from a DBF file).
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-%configure --enable-static
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -43,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# Fix files for multilib
+touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/xbase-config
+touch -r NEWS docs/html/*.html
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -53,6 +73,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root, 0755)
 %doc NEWS README TODO AUTHORS COPYING ChangeLog
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-, root, root, 0755)
+%doc docs/html
+%{_includedir}/xbase
+%{_bindir}/xbase-config
+%{_libdir}/libxbase.so
+
+%files utils
+%defattr(-, root, root, 0755)
 %{_bindir}/checkndx
 %{_bindir}/copydbf
 %{_bindir}/dbfxtrct
@@ -64,18 +95,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/undelall
 %{_bindir}/zap
 %{_bindir}/dbfutil1
-%{_libdir}/*.so.*
-
-%files devel
-%defattr(-, root, root, 0755)
-%doc docs/html
-%dir %{_includedir}/xbase
-%{_includedir}/xbase/*
-%{_bindir}/xbase-config
-%{_libdir}/libxbase.a
-%{_libdir}/libxbase.so
 
 %changelog
+* Tue Oct 30 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.0-8
+- fix multilib conflicts
+
+* Fri Aug 17 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 2.0.0-7
+- Update License tag for new Licensing Guidelines compliance
+- Add patch by Bill Nottingham to fix building on ppc64 (bz 239131)
+- Don't build and install a static version of the lib
+- Put the utilities/tools in a -utils sub package (to make clear they are under
+  a different license)
+
 * Mon Sep 11 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.0-6
 - rebuild