diff --git a/.cvsignore b/.cvsignore
index 28ea064..1148fee 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -46,3 +46,6 @@ foomatic-db-3.0-20070614.tar.gz
 foomatic-db-3.0-20070919.tar.gz
 foomatic-filters-3.0-20070919.tar.gz
 foomatic-filters-3.0-20071218.tar.gz
+foomatic-db-engine-3.0-20071218.tar.gz
+foomatic-db-3.0-20071218.tar.gz
+foomatic-db-hpijs-20071218.tar.gz
diff --git a/foomatic-margins.patch b/foomatic-margins.patch
deleted file mode 100644
index ef16c03..0000000
--- a/foomatic-margins.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- foomatic-db-engine-3.0-20070614/lib/Foomatic/DB.pm.margins	2007-06-14 11:42:16.000000000 +0100
-+++ foomatic-db-engine-3.0-20070614/lib/Foomatic/DB.pm	2007-06-14 11:43:13.000000000 +0100
-@@ -4289,9 +4289,10 @@
- sub getmargins {
-     my ($dat, $width, $height, $pagesize) = @_;
-     # Determine the unprintable margins
--    # Zero margins when no margin info exists
-+    # Safe margins when no margin info exists
-+    my $border = 36;
-     my ($left, $right, $top, $bottom) =
--	(0, $width, $height, 0);
-+	($border, $width - $border, $height - $border, $border);
-     # Margins from printer database entry
-     my ($pleft, $pright, $ptop, $pbottom) =
- 	getmarginsformarginrecord($dat->{'printermargins'}, 
diff --git a/foomatic.spec b/foomatic.spec
index 1ce6e41..7aeefe1 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,7 +1,7 @@
-%define dbver 20070919
-%define enginever 3.0-20070614
+%define dbver 20071218
+%define enginever 3.0-20071218
 %define filtersver 20071218
-%define hpijsver 20070614
+%define hpijsver 20071218
 
 Summary: Foomatic printer database.
 Name:		foomatic
@@ -43,9 +43,6 @@ Patch15: foomatic-bad-utf8.patch
 # Missing IEEE 1284 IDs.
 Patch16: foomatic-ieee1284.patch
 
-# Safe default margins for PPDs (bug #244161).
-Patch17: foomatic-margins.patch
-
 Url:		http://www.linuxprinting.org
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -99,7 +96,6 @@ chmod a+x mkinstalldirs
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
-%patch17 -p1 -b .margins
 ./make_configure
 popd
 
@@ -249,6 +245,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 
 %changelog
 * Wed Jan  9 2008 Tim Waugh <twaugh@redhat.com>
+- Updated db-hpijs to 20071218.
+- Updated db to 3.0-20071218.
+- Updated db-engine to 3.0-20071218.
 - Updated filters to 20071218 (bug #416881).
 
 * Mon Jan  7 2008 Tim Waugh <twaugh@redhat.com>
diff --git a/sources b/sources
index ee96955..74c3bc4 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-38de62f4ac1a50a857e1122517e6b537  foomatic-db-hpijs-20070614.tar.gz
-e0a1851c3cd04b6e074e0863286adef8  foomatic-db-engine-3.0-20070614.tar.gz
-fd8968c7500462d9661a1925c99b9441  foomatic-db-3.0-20070919.tar.gz
 69282efbc0bb8c72840eea638ac7dc71  foomatic-filters-3.0-20071218.tar.gz
+29dcaf35a01bd64664215aa2489d43b9  foomatic-db-engine-3.0-20071218.tar.gz
+21c81eff341b63f5f9bcffb0a53bc906  foomatic-db-3.0-20071218.tar.gz
+8b6569a8dbf93a5dabbcf62161f15372  foomatic-db-hpijs-20071218.tar.gz