diff --git a/.gitignore b/.gitignore
index d37ab86..9483608 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ foomatic-db-4.0-20100204.tar.gz
/foomatic-db-4.0-20130312.tar.gz
/foomatic-db-4.0-20130507.tar.gz
/foomatic-db-4.0-20130604.tar.gz
+/foomatic-db-4.0-20130911.tar.gz
diff --git a/foomatic-db-device-ids-20120103.patch b/foomatic-db-device-ids-20120103.patch
deleted file mode 100644
index bb29d76..0000000
--- a/foomatic-db-device-ids-20120103.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -up foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd.device-ids-20120103 foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd
---- foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd.device-ids-20120103 2012-01-03 00:40:44.000000000 +0000
-+++ foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd 2012-02-24 09:33:37.047452635 +0000
-@@ -32,6 +32,7 @@
- *ShortNickName: "Brother MFC-8840D BR-Script3"
- *ModelName: "Brother MFC-8840D BR-Script3"
- *NickName: "Brother MFC-8840D BR-Script3"
-+*1284DeviceID: "MFG:Brother;MDL:MFC-8840D;CMD:HBP,PJL,PCL,PCLXL;"
-
- *%==== Basic Device Capabilities =============
- *LanguageLevel: "3"
-diff -up foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd.device-ids-20120103 foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd
---- foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd.device-ids-20120103 2012-01-03 00:40:44.000000000 +0000
-+++ foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd 2012-02-24 09:33:37.049452637 +0000
-@@ -62,7 +62,7 @@
- *LXCountPIN: "4"
- *LXlowPINchar: "0"
- *LXhiPINchar: "9"
--*1284DeviceID: "MFG: Lexmark;MDL: Lexmark C543"
-+*1284DeviceID: "MFG:Lexmark International;MDL:Lexmark C543;"
- *FreeVM: "252000000"
- *VMOption 256Meg: "252000000"
- *VMOption 320Meg: "312000000"
-diff -up foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml
---- foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml.device-ids-20120103 2012-02-24 09:33:36.314452298 +0000
-+++ foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml 2012-02-24 09:33:37.051452638 +0000
-@@ -15,7 +15,7 @@
-
-
-
-- MFG:Brother;MDL:Brother MFC-8840D;
-+ MFG:Brother;MDL:MFC-8840D;CMD:HBP,PJL,PCL,PCLXL;
- Brother
- Brother MFC-8840D
-
-diff -up foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml
---- foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml.device-ids-20120103 2012-02-24 09:33:36.401452339 +0000
-+++ foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml 2012-02-24 09:33:37.087452655 +0000
-@@ -20,7 +20,7 @@
- SCP,VLINK
- Hewlett-Packard DeskJet 720 Series
- HEWLETT-PACKARD
-- DESKJET 720
-+ DESKJET 720C
-
-
- A
-diff -up foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml
---- foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml.device-ids-20120103 2012-02-24 09:33:36.411452343 +0000
-+++ foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml 2012-02-24 09:33:37.089452655 +0000
-@@ -13,6 +13,13 @@
-
-
-
-+
-+
-+ PJL,PML,PCLXL,POSTSCRIPT,PCL
-+ Hewlett-Packard
-+ HP LaserJet MFP M1522nf MFP
-+
-+
- D
- pxlmono
-
-diff -up foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml
---- foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml.device-ids-20120103 2012-02-24 09:34:34.375478948 +0000
-+++ foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml 2012-02-24 09:41:52.635757050 +0000
-@@ -19,10 +19,10 @@
-
-
-
-- MFG:Kyocera;MODEL:Kyocera FS-1118MFP;COMMAND SET: POSTSCRIPT,PJL,PCL
-- POSTSCRIPT,PJL,PCL
-+ MFG:Kyocera;MODEL:FS-1118MFP;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;
-+ CMD:PCLXL,PostScript Emulation,PCL5E,PJL
- Kyocera
-- Kyocera FS-1118MFP
-+ FS-1118MFP
-
-
- A
-diff -up foomatic-db-20120103/db/source/printer/Lexmark-C543.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Lexmark-C543.xml
---- foomatic-db-20120103/db/source/printer/Lexmark-C543.xml.device-ids-20120103 2012-02-24 09:33:36.463452367 +0000
-+++ foomatic-db-20120103/db/source/printer/Lexmark-C543.xml 2012-02-24 09:33:37.090452655 +0000
-@@ -15,7 +15,7 @@
-
-
-
-- MFG: Lexmark;MDL: Lexmark C543
-+ MFG:Lexmark International;MDL:Lexmark C543;
- Lexmark
- Lexmark C543
-
diff --git a/foomatic-db-device-ids.patch b/foomatic-db-device-ids.patch
new file mode 100644
index 0000000..b1c3bfd
--- /dev/null
+++ b/foomatic-db-device-ids.patch
@@ -0,0 +1,110 @@
+diff -up foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd.device-ids-20120103 foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd
+--- foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd.device-ids-20120103 2012-01-03 00:40:44.000000000 +0000
++++ foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd 2012-02-24 09:33:37.047452635 +0000
+@@ -32,6 +32,7 @@
+ *ShortNickName: "Brother MFC-8840D BR-Script3"
+ *ModelName: "Brother MFC-8840D BR-Script3"
+ *NickName: "Brother MFC-8840D BR-Script3"
++*1284DeviceID: "MFG:Brother;MDL:MFC-8840D;CMD:HBP,PJL,PCL,PCLXL;"
+
+ *%==== Basic Device Capabilities =============
+ *LanguageLevel: "3"
+diff -up foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd.device-ids-20120103 foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd
+--- foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd.device-ids-20120103 2012-01-03 00:40:44.000000000 +0000
++++ foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd 2012-02-24 09:33:37.049452637 +0000
+@@ -62,7 +62,7 @@
+ *LXCountPIN: "4"
+ *LXlowPINchar: "0"
+ *LXhiPINchar: "9"
+-*1284DeviceID: "MFG: Lexmark;MDL: Lexmark C543"
++*1284DeviceID: "MFG:Lexmark International;MDL:Lexmark C543;"
+ *FreeVM: "252000000"
+ *VMOption 256Meg: "252000000"
+ *VMOption 320Meg: "312000000"
+diff -up foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml
+--- foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml.device-ids-20120103 2012-02-24 09:33:36.314452298 +0000
++++ foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml 2012-02-24 09:33:37.051452638 +0000
+@@ -15,7 +15,7 @@
+
+
+
+- MFG:Brother;MDL:Brother MFC-8840D;
++ MFG:Brother;MDL:MFC-8840D;CMD:HBP,PJL,PCL,PCLXL;
+ Brother
+ Brother MFC-8840D
+
+diff -up foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml
+--- foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml.device-ids-20120103 2012-02-24 09:33:36.401452339 +0000
++++ foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml 2012-02-24 09:33:37.087452655 +0000
+@@ -20,7 +20,7 @@
+ SCP,VLINK
+ Hewlett-Packard DeskJet 720 Series
+ HEWLETT-PACKARD
+- DESKJET 720
++ DESKJET 720C
+
+
+ A
+diff -up foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml
+--- foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml.device-ids-20120103 2012-02-24 09:33:36.411452343 +0000
++++ foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml 2012-02-24 09:33:37.089452655 +0000
+@@ -13,6 +13,13 @@
+
+
+
++
++
++ PJL,PML,PCLXL,POSTSCRIPT,PCL
++ Hewlett-Packard
++ HP LaserJet MFP M1522nf MFP
++
++
+ D
+ pxlmono
+
+diff -up foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml
+--- foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml.device-ids-20120103 2012-02-24 09:34:34.375478948 +0000
++++ foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml 2012-02-24 09:41:52.635757050 +0000
+@@ -19,10 +19,10 @@
+
+
+
+- MFG:Kyocera;MODEL:Kyocera FS-1118MFP;COMMAND SET: POSTSCRIPT,PJL,PCL
+- POSTSCRIPT,PJL,PCL
++ MFG:Kyocera;MODEL:FS-1118MFP;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;
++ CMD:PCLXL,PostScript Emulation,PCL5E,PJL
+ Kyocera
+- Kyocera FS-1118MFP
++ FS-1118MFP
+
+
+ A
+diff -up foomatic-db-20120103/db/source/printer/Lexmark-C543.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Lexmark-C543.xml
+--- foomatic-db-20120103/db/source/printer/Lexmark-C543.xml.device-ids-20120103 2012-02-24 09:33:36.463452367 +0000
++++ foomatic-db-20120103/db/source/printer/Lexmark-C543.xml 2012-02-24 09:33:37.090452655 +0000
+@@ -15,7 +15,7 @@
+
+
+
+- MFG: Lexmark;MDL: Lexmark C543
++ MFG:Lexmark International;MDL:Lexmark C543;
+ Lexmark
+ Lexmark C543
+
+diff -up foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml.device-ids foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml
+--- foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml.device-ids 2013-09-11 15:55:21.853642637 +0200
++++ foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml 2013-09-11 15:53:30.775176972 +0200
+@@ -15,6 +15,13 @@
+
+
+
++
++
++ MFG:Brother;MDL:HL-2040 series;CMD:PJL,HBP;
++ Brother
++ Brother HL-2040 series
++
++
+ B
+ hl1250
+
diff --git a/foomatic-db.spec b/foomatic-db.spec
index d4d675a..647c894 100644
--- a/foomatic-db.spec
+++ b/foomatic-db.spec
@@ -1,12 +1,12 @@
%global dbver_rel 4.0
# When you change dbver_snap, rebuild also foomatic against this build to pick up new IEEE 1284 Device IDs.
# The postscriptdriver tags get put onto foomatic, because that's there the actual CUPS driver lives.
-%global dbver_snap 20130604
+%global dbver_snap 20130911
Summary: Database of printers and printer drivers
Name: foomatic-db
Version: %{dbver_rel}
-Release: 38.%{dbver_snap}%{?dist}
+Release: 39.%{dbver_snap}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
Requires: %{name}-filesystem = %{version}-%{release}
@@ -14,7 +14,7 @@ Requires: %{name}-ppds = %{version}-%{release}
Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
-Patch1: foomatic-db-device-ids-20120103.patch
+Patch1: foomatic-db-device-ids.patch
Url: http://www.openprinting.org
BuildArch: noarch
@@ -101,6 +101,7 @@ popd
# Lexmark C453 (#770169)
# HP DeskJet 720C (bug #797099)
# Kyocera FS-1118MFP (bug #782377)
+# Brother HL-2040 (bug #999040)
%patch1 -p1
# Use sed instead of perl in the PPDs (bug #512739).
@@ -149,6 +150,10 @@ ln -sf ../../foomatic/db/source/PPD %{buildroot}%{_datadir}/cups/model/foomatic-
%{_datadir}/cups/model/foomatic-db-ppds
%changelog
+* Wed Sep 11 2013 Jiri Popelka - 4.0-39.20130911
+- Updated to foomatic-db-4.0-20130911
+- Device ID for Brother HL-2040 (bug #999040)
+
* Tue Jun 04 2013 Jiri Popelka - 4.0-38.20130604
- Remove some file conflicts (bug #967930)
- Updated to foomatic-db-4.0-20130604
diff --git a/sources b/sources
index f5bd8a1..d3225a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a8ac2a3f96d295705669b8d2ee05dd6 foomatic-db-4.0-20130604.tar.gz
+5d2322b35652a971bce2e212f6124f5e foomatic-db-4.0-20130911.tar.gz