diff --git a/.cvsignore b/.cvsignore
index 3e96885..764d757 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 gutenprint-5.0.0.tar.bz2
+gutenprint-5.0.0.99.1.tar.bz2
diff --git a/gutenprint.spec b/gutenprint.spec
index d98235a..8614ffe 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -3,8 +3,8 @@
 
 Name:           gutenprint
 Summary:        Printer Drivers Package
-Version:        5.0.0
-Release:        7%{?dist}
+Version:        5.0.0.99.1
+Release:        1%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -57,150 +57,6 @@ Provides:  gimp-print-plugin = 4.2.7-25
 %description plugin
 This package contains the gutenprint GIMP plug-in.
 
-%package ppds-cs
-Summary:        Printer Drivers Package in Czech
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-cs
-This is the printer drivers package in Czech.
-
-%package ppds-da
-Summary:        Printer Drivers Package in Danish
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-da
-This is the printer drivers package in Danish.
-
-%package ppds-de
-Summary:        Printer Drivers Package in German
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-de
-This is the printer drivers package in German.
-
-%package ppds-el
-Summary:        Printer Drivers Package in Greek
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-el
-This is the printer drivers package in Greek.
-
-%package ppds-en_GB
-Summary:        Printer Drivers Package in English
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-en_GB
-This is the printer drivers package in English.
-
-%package ppds-es
-Summary:        Printer Drivers Package in Spanish
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-es
-This is the printer drivers package in Spanish.
-
-%package ppds-fr
-Summary:        Printer Drivers Package in French
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-fr
-This is the printer drivers package in French.
-
-%package ppds-hu
-Summary:        Printer Drivers Package in Hungarian
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-hu
-This is the printer drivers package in Hungarian.
-
-%package ppds-ja
-Summary:        Printer Drivers Package in Japanese
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-ja
-This is the printer drivers package in Japanese.
-
-%package ppds-nb
-Summary:        Printer Drivers Package in Norwegian/Bokmaal
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-nb
-This is the printer drivers package in Norwegian/Bokmaal.
-
-%package ppds-nl
-Summary:        Printer Drivers Package in Dutch
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-nl
-This is the printer drivers package in Dutch.
-
-%package ppds-pl
-Summary:        Printer Drivers Package in Polish
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-pl
-This is the printer drivers package in Polish.
-
-%package ppds-pt
-Summary:        Printer Drivers Package in Portuguese
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-pt
-This is the printer drivers package in Portuguese.
-
-%package ppds-sk
-Summary:        Printer Drivers Package in Slovak
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-sk
-This is the printer drivers package in Slovak.
-
-%package ppds-sv
-Summary:        Printer Drivers Package in Swedish
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-sv
-This is the printer drivers package in Swedish.
-
-%package ppds-zh_TW
-Summary:        Printer Drivers Package in Chinese (traditional
-Group:          System Environment/Base
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-cups = %{version}-%{release}
-
-%description  ppds-zh_TW
-This is the printer drivers package in Chinese (traditional.
-
 %package foomatic
 Summary:        Foomatic printer database
 Group:          System Environment/Libraries
@@ -225,6 +81,38 @@ Group:          Applications/Publishing
 Requires:       cups >= 1.2.1-1.7
 Obsoletes: gimp-print-cups <= 4.2.7-25
 Provides: gimp-print-cups = 4.2.7-25
+Obsoletes: gutenprint-ppds-cs <= 5.0.0-7
+Provides: gutenprint-ppds-cs = 5.0.0-7
+Obsoletes: gutenprint-ppds-da <= 5.0.0-7
+Provides: gutenprint-ppds-da = 5.0.0-7
+Obsoletes: gutenprint-ppds-de <= 5.0.0-7
+Provides: gutenprint-ppds-de = 5.0.0-7
+Obsoletes: gutenprint-ppds-el <= 5.0.0-7
+Provides: gutenprint-ppds-el = 5.0.0-7
+Obsoletes: gutenprint-ppds-en_GB <= 5.0.0-7
+Provides: gutenprint-ppds-en_GB = 5.0.0-7
+Obsoletes: gutenprint-ppds-es <= 5.0.0-7
+Provides: gutenprint-ppds-es = 5.0.0-7
+Obsoletes: gutenprint-ppds-fr <= 5.0.0-7
+Provides: gutenprint-ppds-fr = 5.0.0-7
+Obsoletes: gutenprint-ppds-hu <= 5.0.0-7
+Provides: gutenprint-ppds-hu = 5.0.0-7
+Obsoletes: gutenprint-ppds-ja <= 5.0.0-7
+Provides: gutenprint-ppds-ja = 5.0.0-7
+Obsoletes: gutenprint-ppds-nb <= 5.0.0-7
+Provides: gutenprint-ppds-nb = 5.0.0-7
+Obsoletes: gutenprint-ppds-nl <= 5.0.0-7
+Provides: gutenprint-ppds-nl = 5.0.0-7
+Obsoletes: gutenprint-ppds-pl <= 5.0.0-7
+Provides: gutenprint-ppds-pl = 5.0.0-7
+Obsoletes: gutenprint-ppds-pt <= 5.0.0-7
+Provides: gutenprint-ppds-pt = 5.0.0-7
+Obsoletes: gutenprint-ppds-sk <= 5.0.0-7
+Provides: gutenprint-ppds-sk = 5.0.0-7
+Obsoletes: gutenprint-ppds-sv <= 5.0.0-7
+Provides: gutenprint-ppds-sv = 5.0.0-7
+Obsoletes: gutenprint-ppds-zh_TW <= 5.0.0-7
+Provides: gutenprint-ppds-zh_TW = 5.0.0-7
 
 %description cups
 This package contains native CUPS support for a wide range of Canon,
@@ -246,6 +134,8 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
+mv %{buildroot}%{cups_serverbin}/driver/gutenprint.5.0 %{buildroot}%{_sbindir}
+ln -s %{_sbindir}/gutenprint.5.0 %{buildroot}%{cups_serverbin}/driver/
 
 rm -rf %{buildroot}%{_datadir}/gutenprint/doc
 rm -rf %{buildroot}%{_libdir}/gutenprint/5.0.0/modules/*.la
@@ -324,76 +214,13 @@ exit 0
 %{_datadir}/cups/calibrate.ppm
 %{cups_serverbin}/backend/*
 %{cups_serverbin}/filter/*
+%{cups_serverbin}/driver/*
 %{_bindir}/cups-calibrate
 %{_sbindir}/cups-genppd*
-%{_datadir}/cups/model/gutenprint/5.0/C
+%{_sbindir}/gutenprint.5.0
 %{_mandir}/man8/cups-calibrate.8*
 %{_mandir}/man8/cups-genppd*.8*
 
-%files ppds-cs
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/cs
-
-%files ppds-da
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/da
-
-%files ppds-de
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/de
-
-%files ppds-el
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/el
-
-%files ppds-en_GB
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/en_GB
-
-%files ppds-es
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/es
-
-%files ppds-fr
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/fr
-
-%files ppds-hu
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/hu
-
-%files ppds-ja
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/ja
-
-%files ppds-nb
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/nb
-
-%files ppds-nl
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/nl
-
-%files ppds-pl
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/pl
-
-%files ppds-pt
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/pt
-
-%files ppds-sk
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/sk
-
-%files ppds-sv
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/sv
-
-%files ppds-zh_TW
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/zh_TW
-
 %post foomatic
 /bin/rm -f /var/cache/foomatic/*
 
@@ -401,6 +228,13 @@ exit 0
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Mon Mar  5 2007 Tim Waugh <twaugh@redhat.com> 5.0.0.99.1-1
+- 5.0.0.99.1.
+- No longer need PPDs sub-packages: CUPS driver is included in the cups
+  sub-package.
+- Package the CUPS driver in sbindir and put a symlink in the CUPS ServerBin
+  directory to work around bug #231015.
+
 * Fri Mar  2 2007 Tim Waugh <twaugh@redhat.com> 5.0.0-7
 - Fixed menu patch.
 - Don't list rastertogutenprint twice.
diff --git a/sources b/sources
index 5dee28a..6ed1a8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ede8acbd1e94c9d4fd366fb37e335bfb  gutenprint-5.0.0.tar.bz2
+c9f9b3e1260aa003f6fc357c4857c8f9  gutenprint-5.0.0.99.1.tar.bz2