diff --git a/.cvsignore b/.cvsignore
index 5b6e02a..8bf63a3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -39,3 +39,8 @@ foomatic-db-hpijs-20061031.tar.gz
 foomatic-db-engine-3.0-20061109.tar.gz
 foomatic-db-3.0-20061130.tar.gz
 foomatic-db-3.0-20070105.tar.gz
+foomatic-db-3.0-20070105.tar.gz
+foomatic-filters-3.0-20070614.tar.gz
+foomatic-db-hpijs-20070614.tar.gz
+foomatic-db-engine-3.0-20070614.tar.gz
+foomatic-db-3.0-20070614.tar.gz
diff --git a/foomatic-ieee1284.patch b/foomatic-ieee1284.patch
new file mode 100644
index 0000000..1302d8b
--- /dev/null
+++ b/foomatic-ieee1284.patch
@@ -0,0 +1,17 @@
+--- foomatic-db-20070614/db/source/printer/HP-PhotoSmart_380.xml.ieee1284	2007-06-14 11:55:00.000000000 +0100
++++ foomatic-db-20070614/db/source/printer/HP-PhotoSmart_380.xml	2007-06-14 11:55:13.000000000 +0100
+@@ -24,7 +24,13 @@
+     </text>
+   </lang>
+   <autodetect>
+-  <!--no known parport probe information--></autodetect>
++    <usb>
++      <manufacturer>HP</manufacturer>
++      <model>Photosmart 380 series_BT</model>
++      <description>385</description>
++      <commandset>PCL,DW-PCL,DESKJET,DYN</commandset>
++    </usb>
++  </autodetect>
+   <functionality>A</functionality>
+   <driver>hpijs</driver>
+   <!--verified--><!--no "contrib_url"-->
diff --git a/foomatic-margins.patch b/foomatic-margins.patch
new file mode 100644
index 0000000..ef16c03
--- /dev/null
+++ b/foomatic-margins.patch
@@ -0,0 +1,15 @@
+--- 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 195c45c..fad1b73 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,12 +1,12 @@
-%define dbver 20070105
-%define enginever 3.0-20061109
-%define filtersver 20051209
-%define hpijsver 20061031
+%define dbver 20070614
+%define enginever 3.0-20070614
+%define filtersver 20070614
+%define hpijsver 20070614
 
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    47%{?dist}
+Release:    47.1%{?dist}
 License:	GPL
 Group: System Environment/Libraries
 
@@ -40,6 +40,12 @@ Patch14: foomatic-ampathxml.patch
 # Handle non-UTF-8 encodings in imported PPD files.
 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:	libxml2-devel
@@ -93,6 +99,7 @@ chmod a+x mkinstalldirs
 %patch14 -p1 -b .ampathxml
 %patch10 -p1 -b .xml-cflags
 %patch15 -p1
+%patch17 -p1 -b .margins
 ./make_configure
 popd
 
@@ -102,6 +109,8 @@ popd
 pushd foomatic-db-%{dbver}
 %patch7 -p1 -b .ppdload-ppd
 
+%patch16 -p1 -b .ieee1284
+
 cd db/source
 
 # For gutenprint printers, use gutenprint-ijs-simplified.5.0.
@@ -246,6 +255,14 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_var}/cache/foomatic
 
 %changelog
+* Thu Jun 14 2007 Tim Waugh <twaugh@redhat.com> 3.0.2-47.1
+- Safe default margins for PPDs (bug #244161).
+- Added missing IEEE 1284 ID for HP Photosmart 380 (bug #241352).
+- Updated db to 3.0-20070614.
+- Updated db-engine to 3.0-20070614.
+- Updated db-hpijs to 20070614.
+- Updated filters to 3.0-20070614.
+
 * Mon Apr 16 2007 Tim Waugh <twaugh@redhat.com> 3.0.2-47
 - Fixed %%prep (bug #208851).
 - Removed now-unused with_omni code.
diff --git a/sources b/sources
index 392fdde..1ef55d9 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-5876178c3aefd36102bc5eef575d3f9c  foomatic-filters-3.0-20051209.tar.gz
-480ab4a4148667dad1ffc188b6480bce  foomatic-db-hpijs-20061031.tar.gz
-562703c7da605a4c89ac476a3bf7955b  foomatic-db-engine-3.0-20061109.tar.gz
-ba04156e056a1df600decaa0501af371  foomatic-db-3.0-20070105.tar.gz
+8b197e646995c1cb9dca6a74ac687dd9  foomatic-filters-3.0-20070614.tar.gz
+38de62f4ac1a50a857e1122517e6b537  foomatic-db-hpijs-20070614.tar.gz
+e0a1851c3cd04b6e074e0863286adef8  foomatic-db-engine-3.0-20070614.tar.gz
+aa9d9cf8dc42ce7a61e6d4506098aebb  foomatic-db-3.0-20070614.tar.gz