diff --git a/.gitignore b/.gitignore
index 372c334..c34eede 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,5 @@ foomatic-filters-4.0.4.tar.gz
 /foomatic-filters-4.0.5.tar.gz
 /foomatic-db-engine-4.0.6.tar.gz
 /foomatic-filters-4.0.6.tar.gz
+/foomatic-db-engine-4.0.7.tar.gz
+/foomatic-filters-4.0.7.tar.gz
diff --git a/foomatic-db-engine-libdir.patch b/foomatic-db-engine-libdir.patch
index 9a928a0..255ce21 100644
--- a/foomatic-db-engine-libdir.patch
+++ b/foomatic-db-engine-libdir.patch
@@ -1,6 +1,7 @@
---- foomatic-db-engine-3.0-20031217/configure.ac.libdir	2003-11-19 18:31:07.000000000 +0000
-+++ foomatic-db-engine-3.0-20031217/configure.ac	2003-12-17 13:23:23.975555441 +0000
-@@ -43,8 +43,8 @@
+diff -up foomatic-db-engine-4.0.7/configure.ac.libdir foomatic-db-engine-4.0.7/configure.ac
+--- foomatic-db-engine-4.0.7/configure.ac.libdir	2011-02-18 13:30:22.000000000 +0100
++++ foomatic-db-engine-4.0.7/configure.ac	2011-02-21 12:43:24.000000000 +0100
+@@ -69,8 +69,8 @@ LOGSEARCHPATH=/var/log:/usr/log:/usr/loc
  SYSCONFSEARCHPATH=/etc:/usr/etc:/usr/local/etc:/var/etc
  SBINSEARCHPATH=/usr/sbin:/sbin:/usr/local/sbin:/etc/sbin
  BINSEARCHPATH=/usr/bin:/bin:/usr/local/bin
@@ -11,22 +12,22 @@
  PTALPIPESSEARCHPATH=/var/run:/var:/var/ptal:/usr/var/run:/usr/var:/usr/var/ptal:/usr/local/var/run:/usr/local/var:/usr/local/var/ptal:/dev:/dev/ptal
  MTINKPIPESSEARCHPATH=/var:/var/run:/usr/var/:/usr/var/run:/usr/local/var:/usr/local/var/run:/dev
  
-@@ -236,15 +236,15 @@
+@@ -257,15 +257,15 @@ AC_PATH_PROGS(CUPS_LPOPTIONS,lpoptions,/
  AC_PATH_PROGS(CUPS_LPINFO,lpinfo,/usr/sbin/lpinfo,$SBINSEARCHPATH)
  
- dnl Paths for PDQ
--AC_PATH_DIRS(PDQ_CONF,pdq,/usr/lib/pdq,$SYS_LIB_PATH)
-+AC_PATH_DIRS(PDQ_CONF,pdq,$libdir/pdq,$SYS_LIB_PATH)
+ # Paths for PDQ
+-FM_PATH_DIRS(PDQ_CONF,pdq,/usr/lib/pdq,$SYS_LIB_PATH)
++FM_PATH_DIRS(PDQ_CONF,pdq,$libdir/pdq,$SYS_LIB_PATH)
  AC_PATH_PROGS(PDQ_PRINTRC,pdq/printrc,$PDQ_CONF/printrc,$SYS_LIB_PATH)
  dnl PDQ_FOOMATIC=$PDQ_CONF/drivers/foomatic
  AC_PATH_PROGS(PDQ_PRINT,pdq lpr-pdq,/usr/bin/pdq,$BINSEARCHPATH)
  dnl PDQ_JOBDIR=~/.printjobs
  
- dnl Paths for PPR
+ # Paths for PPR
 -AC_PATH_PROGS(PPR_PPRD,ppr/bin/pprd,/usr/lib/ppr/bin/pprd,$LIBSEARCHPATH)
--AC_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
+-FM_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
 +AC_PATH_PROGS(PPR_PPRD,ppr/bin/pprd,$libdir/ppr/bin/pprd,$LIBSEARCHPATH)
-+AC_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,$libdir/ppr/interfaces,$LIBSEARCHPATH)
- AC_PATH_DIRS(PPR_PPDFILES,ppr/PPDFiles,/usr/share/ppr/PPDFiles,$DATASEARCHPATH)
- AC_PATH_DIRS(PPR_ETC,ppr,/etc/ppr,$SYSCONFSEARCHPATH)
++FM_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,$libdir/ppr/interfaces,$LIBSEARCHPATH)
+ FM_PATH_DIRS(PPR_PPDFILES,ppr/PPDFiles,/usr/share/ppr/PPDFiles,$DATASEARCHPATH)
+ FM_PATH_DIRS(PPR_ETC,ppr,/etc/ppr,$SYSCONFSEARCHPATH)
  AC_PATH_PROGS(PPR_PPR,ppr lpr-ppr,/usr/bin/ppr,$BINSEARCHPATH)
diff --git a/foomatic.spec b/foomatic.spec
index c692aca..d393845 100644
--- a/foomatic.spec
+++ b/foomatic.spec
@@ -1,10 +1,10 @@
-%define enginever 4.0.6
-%define filtersver 4.0.6
+%define enginever 4.0.7
+%define filtersver 4.0.7
 
 Summary: Tools for using the foomatic database of printers and printer drivers
 Name:       foomatic
 Version:    %{enginever}
-Release:    2%{?dist}
+Release:    1%{?dist}
 License:    GPLv2+
 Group: System Environment/Libraries
 
@@ -193,6 +193,9 @@ rm -fr %buildroot $RPM_BUILD_DIR/%{name}
 %{_mandir}/man1/foomatic-rip.1*
 
 %changelog
+* Mon Feb 21 2011 Jiri Popelka <jpopelka@redhat.com> - 4.0.7-1
+- 4.0.7
+
 * Tue Dec 21 2010 Tim Waugh <twaugh@redhat.com> - 4.0.6-2
 - Use perl_vendorlib macro instead of defining our own.
 
diff --git a/sources b/sources
index 62c86a5..f0adeae 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b34f17b56304b48e3e90c1c6c8f2c287  foomatic-db-engine-4.0.6.tar.gz
-9bca3d3d83192a3741a34bd9b1859b1e  foomatic-filters-4.0.6.tar.gz
+fcfa8eb9ce5494b81b58ae983fc2aeb5  foomatic-db-engine-4.0.7.tar.gz
+20abd25c1c98b2dae68709062a132a7d  foomatic-filters-4.0.7.tar.gz