[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5cbbd5f1ed37c0c465378916716319d63234a294

7 Apr 2012

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
       via  5cbbd5f1ed37c0c465378916716319d63234a294 (commit)
       via  8969d075e06a687b8878e9ed1b41133a0f015b05 (commit)
       via  b7d1e1c4a4ce1bfc1cf87dd5f305110fc009df29 (commit)
       via  2d40b8174bb5c7e7f9424439e622c936de87bfc5 (commit)
       via  2c0a849f7a7c388bf53072e5fc335b4f97488ba0 (commit)
       via  f028065fd15c1984db770724bdfb35fa5e0635fa (commit)
       via  a4826680bc8a58f169327d97da60005dbdc47e0d (commit)
       via  844d37795d6166d4017327b550804d47591b09f1 (commit)
       via  ef5d80c0336c2e484220906d35b75ae93984d57c (commit)
       via  67ab1d620624ba3d02ffd94c80cbdb9d1872131c (commit)
       via  25a063e66dd06b43685dcd6cc779a6ad71b125b6 (commit)
       via  88511b6145749525957565b11b227b207e1f5a65 (commit)
       via  d2bbe7f46e107c8a94aa84aaa32f570fde298426 (commit)
       via  5d934a73dcbbdb1e4dfa7219eb40bbb34e2cc9c7 (commit)
       via  16ada955ac658c59f8a2d96acb305699c224482e (commit)
       via  8cbc8e01b382df53d9882d7a7e0970287575ad08 (commit)
       via  0f0a5a6e5ffee29fa9e63b267d13232d5d8ffe49 (commit)
       via  524fc726215f527803423b0af51364ff5904221e (commit)
       via  870f68d7f2c8cdd6febf5a1706c52deca992ce86 (commit)
       via  42fb65f0f3f78c706d0406f40b6989f3d40e4cae (commit)
      from  eb17d0fd69ae2c21becfee831b32d3441ec6652c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5cbbd5f1ed37c0c465378916716319d63234a294
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Apr 7 11:39:23 2012 +0200
finished core58.
commit 8969d075e06a687b8878e9ed1b41133a0f015b05
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Apr 6 19:30:24 2012 +0200
hwdata: updata usb and pci ids database.
commit b7d1e1c4a4ce1bfc1cf87dd5f305110fc009df29
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Apr 6 19:22:23 2012 +0200
GeoIP: update database to 03032012.
commit 2d40b8174bb5c7e7f9424439e622c936de87bfc5
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Apr 6 18:49:20 2012 +0200
core58: add cryptodev module to updater.
commit 2c0a849f7a7c388bf53072e5fc335b4f97488ba0
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Mar 31 11:21:15 2012 +0200
cryptodev: update to 1.4.
commit f028065fd15c1984db770724bdfb35fa5e0635fa
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Mar 31 11:20:27 2012 +0200
openssl: fix aes accleration via cryptodev.
commit a4826680bc8a58f169327d97da60005dbdc47e0d
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Apr 6 13:42:27 2012 +0200
pound: Add patch to select certificates by their SANs.
http://www.apsis.ch/pound/pound_list/archive/2012/2012-02/1329442080000#1329...
commit 844d37795d6166d4017327b550804d47591b09f1
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Mar 18 13:14:59 2012 +0100
clamav: updated to 0.97.4.
commit ef5d80c0336c2e484220906d35b75ae93984d57c
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Tue Mar 13 21:16:25 2012 +0100
openssl: update to 0.9.8u.
commit 67ab1d620624ba3d02ffd94c80cbdb9d1872131c
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Tue Mar 13 20:47:09 2012 +0100
samba: update to 3.5.13.
commit 25a063e66dd06b43685dcd6cc779a6ad71b125b6
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Mar 11 16:53:32 2012 +0100
git: Update to 1.7.9.3.
commit 88511b6145749525957565b11b227b207e1f5a65
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Mar 11 14:50:44 2012 +0100
fireinfo: Update to 2.1.4.
Fixes an issue with the detection of online CPUs on ARM.
commit d2bbe7f46e107c8a94aa84aaa32f570fde298426
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Mar 10 17:37:23 2012 +0100
usb_modeswitch: update to 1.2.3.
commit 5d934a73dcbbdb1e4dfa7219eb40bbb34e2cc9c7
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Mar 10 17:32:31 2012 +0100
strongswan: update to 4.6.2.
fixes #10037
commit 16ada955ac658c59f8a2d96acb305699c224482e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 6 22:26:22 2012 +0100
Add libpng update to core update 58.
commit 8cbc8e01b382df53d9882d7a7e0970287575ad08
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Feb 4 11:17:22 2012 +0100
libpng: Update to 1.2.46.
Fixes several security issues from 2011.
commit 0f0a5a6e5ffee29fa9e63b267d13232d5d8ffe49
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Mar 6 22:23:29 2012 +0100
Open core update 58 and import changes that were already commited.
commit 524fc726215f527803423b0af51364ff5904221e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Feb 25 12:10:25 2012 +0100
openvpn: Update to 2.2.2.
Add --enable-password-save switch that was requested by the
    community.
See bug #10036.
commit 870f68d7f2c8cdd6febf5a1706c52deca992ce86
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Feb 23 00:01:05 2012 +0100
vim: Add "set ruler" option to configuration file.
This will show a small line at the bottom which displays
    the current cursor position and more.
References bug #10021.
commit 42fb65f0f3f78c706d0406f40b6989f3d40e4cae
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Feb 19 13:04:06 2012 +0100
core57: stop/start ipsec at update.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/libpng                     |    4 +-
 config/rootfiles/common/openvpn                    |    6 +-
 config/rootfiles/common/strongswan                 |   21 +-
 config/rootfiles/common/usb_modeswitch             |    2 +-
 config/rootfiles/core/57/update.sh                 |    5 +-
 config/rootfiles/core/{55 => 58}/exclude           |    0
 config/rootfiles/core/{54 => 58}/filelists/GeoIP   |    0
 .../rootfiles/core/58/filelists/armv5tel/cryptodev |    2 +
 config/rootfiles/core/{55 => 58}/filelists/files   |    1 +
 .../rootfiles/core/{54 => 58}/filelists/fireinfo   |    0
 .../rootfiles/{common => core/58/filelists}/hwdata |    2 +-
 config/rootfiles/core/58/filelists/i586/cryptodev  |    3 +
 .../{oldcore/39 => core/58}/filelists/libpng       |    0
 config/rootfiles/core/{55 => 58}/filelists/openssh |    0
 config/rootfiles/core/{55 => 58}/filelists/openssl |    0
 config/rootfiles/core/{53 => 58}/filelists/openvpn |    0
 .../rootfiles/core/{53 => 58}/filelists/strongswan |    0
 .../core/{53 => 58}/filelists/usb_modeswitch       |    0
 config/rootfiles/core/{52 => 58}/meta              |    0
 config/rootfiles/core/{55 => 58}/update.sh         |   26 +-
 config/rootfiles/packages/clamav                   |    6 +-
 config/rootfiles/packages/git                      |   79 ++-
 lfs/GeoIP                                          |    4 +-
 lfs/clamav                                         |    6 +-
 lfs/cryptodev                                      |   12 +-
 lfs/fireinfo                                       |    4 +-
 lfs/git                                            |   10 +-
 lfs/libpng                                         |    8 +-
 lfs/openssl                                        |   11 +-
 lfs/openvpn                                        |   18 +-
 lfs/pound                                          |    3 +-
 lfs/samba                                          |    6 +-
 lfs/strongswan                                     |    4 +-
 lfs/usb_modeswitch                                 |    4 +-
 lfs/vim                                            |    3 +-
 make.sh                                            |    4 +-
 src/hwdata/pci.ids                                 | 1037 ++++++++++++++------
 src/hwdata/usb.ids                                 |  332 ++++++-
 .../Pound-2.6-reneg-ciphers-altnames-nosslv2.patch |  452 +++++++++
 src/patches/openssl-0.9.8u-cryptodev.patch         |  882 +++++++++++++++++
 40 files changed, 2524 insertions(+), 433 deletions(-)
 copy config/rootfiles/core/{55 => 58}/exclude (100%)
 copy config/rootfiles/core/{54 => 58}/filelists/GeoIP (100%)
 create mode 100644 config/rootfiles/core/58/filelists/armv5tel/cryptodev
 copy config/rootfiles/core/{55 => 58}/filelists/files (74%)
 copy config/rootfiles/core/{54 => 58}/filelists/fireinfo (100%)
 copy config/rootfiles/{common => core/58/filelists}/hwdata (100%)
 create mode 100644 config/rootfiles/core/58/filelists/i586/cryptodev
 copy config/rootfiles/{oldcore/39 => core/58}/filelists/libpng (100%)
 copy config/rootfiles/core/{55 => 58}/filelists/openssh (100%)
 copy config/rootfiles/core/{55 => 58}/filelists/openssl (100%)
 copy config/rootfiles/core/{53 => 58}/filelists/openvpn (100%)
 copy config/rootfiles/core/{53 => 58}/filelists/strongswan (100%)
 copy config/rootfiles/core/{53 => 58}/filelists/usb_modeswitch (100%)
 copy config/rootfiles/core/{52 => 58}/meta (100%)
 copy config/rootfiles/core/{55 => 58}/update.sh (84%)
 create mode 100644 src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch
 create mode 100644 src/patches/openssl-0.9.8u-cryptodev.patch
Difference in files:

diff --git a/config/rootfiles/common/libpng b/config/rootfiles/common/libpng
index 2b2ab10..c29eaa7 100644
--- a/config/rootfiles/common/libpng
+++ b/config/rootfiles/common/libpng
@@ -9,12 +9,12 @@
 #usr/lib/libpng.la
 usr/lib/libpng.so
 usr/lib/libpng.so.3
-usr/lib/libpng.so.3.44.0
+usr/lib/libpng.so.3.46.0
 #usr/lib/libpng12.a
 #usr/lib/libpng12.la
 usr/lib/libpng12.so
 usr/lib/libpng12.so.0
-usr/lib/libpng12.so.0.44.0
+usr/lib/libpng12.so.0.46.0
 #usr/lib/pkgconfig/libpng.pc
 #usr/lib/pkgconfig/libpng12.pc
 #usr/share/man/man3/libpng.3
diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index 0f2aa47..18f4d31 100644
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -1,5 +1,6 @@
-lib/openvpn-auth-pam.so
-lib/openvpn-down-root.so
+usr/lib/openvpn
+usr/lib/openvpn/openvpn-auth-pam.so
+usr/lib/openvpn/openvpn-down-root.so
 usr/sbin/openvpn
 #usr/share/doc/openvpn
 #usr/share/doc/openvpn/management-notes.txt
@@ -16,5 +17,6 @@ var/ipfire/ovpn/n2nconf
 var/ipfire/ovpn/openssl/ovpn.cnf
 var/ipfire/ovpn/ovpn-leases.db
 var/ipfire/ovpn/ovpnconfig
+var/ipfire/ovpn/scripts
 var/ipfire/ovpn/settings
 var/ipfire/ovpn/verify
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index c7d4bbd..9b02c0b 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -10,6 +10,7 @@ etc/ipsec.d/private
 etc/ipsec.d/reqs
 etc/ipsec.secrets
 etc/strongswan.conf
+#usr/lib/ipsec
 #usr/lib/ipsec/libcharon.a
 #usr/lib/ipsec/libcharon.la
 usr/lib/ipsec/libcharon.so
@@ -25,15 +26,6 @@ usr/lib/ipsec/libhydra.so.0.0.0
 usr/lib/ipsec/libstrongswan.so
 usr/lib/ipsec/libstrongswan.so.0
 usr/lib/ipsec/libstrongswan.so.0.0.0
-#usr/libexec/ipsec
-usr/libexec/ipsec/_copyright
-usr/libexec/ipsec/_pluto_adns
-usr/libexec/ipsec/_updown
-usr/libexec/ipsec/_updown_espmark
-usr/libexec/ipsec/charon
-usr/libexec/ipsec/openac
-usr/libexec/ipsec/pki
-#usr/lib/ipsec
 #usr/lib/ipsec/plugins
 #usr/lib/ipsec/plugins/libstrongswan-aes.a
 #usr/lib/ipsec/plugins/libstrongswan-aes.la
@@ -77,6 +69,9 @@ usr/lib/ipsec/plugins/libstrongswan-pgp.so
 #usr/lib/ipsec/plugins/libstrongswan-pkcs1.a
 #usr/lib/ipsec/plugins/libstrongswan-pkcs1.la
 usr/lib/ipsec/plugins/libstrongswan-pkcs1.so
+#usr/lib/ipsec/plugins/libstrongswan-pkcs8.a
+#usr/lib/ipsec/plugins/libstrongswan-pkcs8.la
+usr/lib/ipsec/plugins/libstrongswan-pkcs8.so
 #usr/lib/ipsec/plugins/libstrongswan-pubkey.a
 #usr/lib/ipsec/plugins/libstrongswan-pubkey.la
 usr/lib/ipsec/plugins/libstrongswan-pubkey.so
@@ -113,6 +108,14 @@ usr/lib/ipsec/plugins/libstrongswan-xauth.so
 #usr/lib/ipsec/plugins/libstrongswan-xcbc.a
 #usr/lib/ipsec/plugins/libstrongswan-xcbc.la
 usr/lib/ipsec/plugins/libstrongswan-xcbc.so
+#usr/libexec/ipsec
+usr/libexec/ipsec/_copyright
+usr/libexec/ipsec/_pluto_adns
+usr/libexec/ipsec/_updown
+usr/libexec/ipsec/_updown_espmark
+usr/libexec/ipsec/charon
+usr/libexec/ipsec/openac
+usr/libexec/ipsec/pki
 usr/libexec/ipsec/pluto
 usr/libexec/ipsec/scepclient
 usr/libexec/ipsec/starter
diff --git a/config/rootfiles/common/usb_modeswitch b/config/rootfiles/common/usb_modeswitch
index fe60c05..ab46c4d 100644
--- a/config/rootfiles/common/usb_modeswitch
+++ b/config/rootfiles/common/usb_modeswitch
@@ -1,5 +1,5 @@
 etc/usb_modeswitch.conf
-#lib/udev/usb_modeswitch
+lib/udev/usb_modeswitch
 usr/sbin/usb_modeswitch
 usr/sbin/usb_modeswitch_dispatcher
 #usr/share/man/man1/usb_modeswitch.1
diff --git a/config/rootfiles/core/57/update.sh b/config/rootfiles/core/57/update.sh
index 6668c8f..177bf72 100644
--- a/config/rootfiles/core/57/update.sh
+++ b/config/rootfiles/core/57/update.sh
@@ -36,16 +36,19 @@ done
 #Stop services
 /etc/init.d/squid stop
 /etc/init.d/apache stop
+/etc/init.d/ipsec stop
#
 #Extract files
 extract_files
-
 #
 #Start services
 /etc/init.d/squid start
 /etc/init.d/apache start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+	/etc/init.d/ipsec start
+fi
#
 #Update Language cache
diff --git a/config/rootfiles/core/58/exclude b/config/rootfiles/core/58/exclude
new file mode 100644
index 0000000..7360266
--- /dev/null
+++ b/config/rootfiles/core/58/exclude
@@ -0,0 +1,12 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
diff --git a/config/rootfiles/core/58/filelists/GeoIP b/config/rootfiles/core/58/filelists/GeoIP
new file mode 100644
index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/58/filelists/armv5tel/cryptodev b/config/rootfiles/core/58/filelists/armv5tel/cryptodev
new file mode 100644
index 0000000..6870588
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/armv5tel/cryptodev
@@ -0,0 +1,2 @@
+lib/modules/2.6.32.45-ipfire-versatile/extra/cryptodev.ko
+lib/modules/2.6.32.45-ipfire-kirkwood/extra/cryptodev.ko
diff --git a/config/rootfiles/core/58/filelists/files b/config/rootfiles/core/58/filelists/files
new file mode 100644
index 0000000..afb3d99
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/files
@@ -0,0 +1,3 @@
+etc/system-release
+etc/issue
+etc/vimrc
diff --git a/config/rootfiles/core/58/filelists/fireinfo b/config/rootfiles/core/58/filelists/fireinfo
new file mode 120000
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/hwdata b/config/rootfiles/core/58/filelists/hwdata
new file mode 100644
index 0000000..5a9672f
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/hwdata
@@ -0,0 +1,2 @@
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids
diff --git a/config/rootfiles/core/58/filelists/i586/cryptodev b/config/rootfiles/core/58/filelists/i586/cryptodev
new file mode 100644
index 0000000..da29a79
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/i586/cryptodev
@@ -0,0 +1,3 @@
+lib/modules/2.6.32.45-ipfire/extra/cryptodev.ko
+lib/modules/2.6.32.45-ipfire-pae/extra/cryptodev.ko
+lib/modules/2.6.32.45-ipfire-xen/extra/cryptodev.ko
diff --git a/config/rootfiles/core/58/filelists/libpng b/config/rootfiles/core/58/filelists/libpng
new file mode 120000
index 0000000..8ef96e2
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/libpng
@@ -0,0 +1 @@
+../../../common/libpng
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/openssh b/config/rootfiles/core/58/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/openssl b/config/rootfiles/core/58/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/openvpn b/config/rootfiles/core/58/filelists/openvpn
new file mode 120000
index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/strongswan b/config/rootfiles/core/58/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/58/filelists/usb_modeswitch b/config/rootfiles/core/58/filelists/usb_modeswitch
new file mode 120000
index 0000000..acbab6f
--- /dev/null
+++ b/config/rootfiles/core/58/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/core/58/meta b/config/rootfiles/core/58/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/58/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/58/update.sh b/config/rootfiles/core/58/update.sh
new file mode 100644
index 0000000..ccec4b0
--- /dev/null
+++ b/config/rootfiles/core/58/update.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2012 IPFire-Team info@ipfire.org.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=58
+for (( i=1; i<=$core; i++ ))
+do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/ipsec stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+	/etc/init.d/ipsec start
+fi
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+arch=`uname -m`
+if [ ${arch::3} == "arm" ]; then
+	depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+	depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+else
+	depmod -a 2.6.32.45-ipfire     >/dev/null 2>&1
+	depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+	depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+fi
+
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 7244dbb..4029074 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.12
+usr/lib/libclamav.so.6.1.13
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.12
+usr/lib/libclamunrar.so.6.1.13
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.12
+usr/lib/libclamunrar_iface.so.6.1.13
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav
diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index f17851d..b92070e 100644
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -6,10 +6,32 @@ usr/bin/git-upload-archive
 usr/bin/git-upload-pack
 #usr/bin/gitk
 usr/lib/perl5/site_perl/5.12.3/Error.pm
+usr/lib/perl5/site_perl/5.12.3/Git
 usr/lib/perl5/site_perl/5.12.3/Git.pm
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist
+usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git/.packlist
+usr/lib/python2.7/site-packages/git_remote_helpers
+#usr/lib/python2.7/site-packages/git_remote_helpers-0.1.0-py2.7.egg-info
+usr/lib/python2.7/site-packages/git_remote_helpers/__init__.py
+usr/lib/python2.7/site-packages/git_remote_helpers/__init__.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git
+usr/lib/python2.7/site-packages/git_remote_helpers/git/__init__.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/__init__.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git/exporter.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/exporter.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git/git.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/git.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git/importer.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/importer.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git/non_local.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/non_local.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/git/repo.py
+usr/lib/python2.7/site-packages/git_remote_helpers/git/repo.pyc
+usr/lib/python2.7/site-packages/git_remote_helpers/util.py
+usr/lib/python2.7/site-packages/git_remote_helpers/util.pyc
 usr/libexec/git-core
+usr/libexec/git-core/git
 usr/libexec/git-core/git-add
 usr/libexec/git-core/git-add--interactive
 usr/libexec/git-core/git-am
@@ -36,6 +58,9 @@ usr/libexec/git-core/git-commit
 usr/libexec/git-core/git-commit-tree
 usr/libexec/git-core/git-config
 usr/libexec/git-core/git-count-objects
+usr/libexec/git-core/git-credential-cache
+usr/libexec/git-core/git-credential-cache--daemon
+usr/libexec/git-core/git-credential-store
 usr/libexec/git-core/git-cvsexportcommit
 usr/libexec/git-core/git-cvsimport
 usr/libexec/git-core/git-cvsserver
@@ -50,7 +75,6 @@ usr/libexec/git-core/git-difftool--helper
 usr/libexec/git-core/git-fast-export
 usr/libexec/git-core/git-fast-import
 usr/libexec/git-core/git-fetch
-usr/libexec/git-core/git-fetch--tool
 usr/libexec/git-core/git-fetch-pack
 usr/libexec/git-core/git-filter-branch
 usr/libexec/git-core/git-fmt-merge-msg
@@ -65,6 +89,7 @@ usr/libexec/git-core/git-gui
 usr/libexec/git-core/git-gui--askpass
 usr/libexec/git-core/git-hash-object
 usr/libexec/git-core/git-help
+usr/libexec/git-core/git-http-backend
 usr/libexec/git-core/git-http-fetch
 usr/libexec/git-core/git-http-push
 usr/libexec/git-core/git-imap-send
@@ -96,6 +121,7 @@ usr/libexec/git-core/git-mktag
 usr/libexec/git-core/git-mktree
 usr/libexec/git-core/git-mv
 usr/libexec/git-core/git-name-rev
+usr/libexec/git-core/git-notes
 usr/libexec/git-core/git-pack-objects
 usr/libexec/git-core/git-pack-redundant
 usr/libexec/git-core/git-pack-refs
@@ -109,12 +135,22 @@ usr/libexec/git-core/git-push
 usr/libexec/git-core/git-quiltimport
 usr/libexec/git-core/git-read-tree
 usr/libexec/git-core/git-rebase
+usr/libexec/git-core/git-rebase--am
 usr/libexec/git-core/git-rebase--interactive
+usr/libexec/git-core/git-rebase--merge
 usr/libexec/git-core/git-receive-pack
 usr/libexec/git-core/git-reflog
 usr/libexec/git-core/git-relink
 usr/libexec/git-core/git-remote
+usr/libexec/git-core/git-remote-ext
+usr/libexec/git-core/git-remote-fd
+usr/libexec/git-core/git-remote-ftp
+usr/libexec/git-core/git-remote-ftps
+usr/libexec/git-core/git-remote-http
+usr/libexec/git-core/git-remote-https
+usr/libexec/git-core/git-remote-testgit
 usr/libexec/git-core/git-repack
+usr/libexec/git-core/git-replace
 usr/libexec/git-core/git-repo-config
 usr/libexec/git-core/git-request-pull
 usr/libexec/git-core/git-rerere
@@ -125,6 +161,8 @@ usr/libexec/git-core/git-revert
 usr/libexec/git-core/git-rm
 usr/libexec/git-core/git-send-email
 usr/libexec/git-core/git-send-pack
+usr/libexec/git-core/git-sh-i18n
+usr/libexec/git-core/git-sh-i18n--envsubst
 usr/libexec/git-core/git-sh-setup
 usr/libexec/git-core/git-shell
 usr/libexec/git-core/git-shortlog
@@ -154,6 +192,22 @@ usr/libexec/git-core/git-verify-tag
 usr/libexec/git-core/git-web--browse
 usr/libexec/git-core/git-whatchanged
 usr/libexec/git-core/git-write-tree
+usr/libexec/git-core/mergetools
+usr/libexec/git-core/mergetools/araxis
+usr/libexec/git-core/mergetools/bc3
+usr/libexec/git-core/mergetools/defaults
+usr/libexec/git-core/mergetools/diffuse
+usr/libexec/git-core/mergetools/ecmerge
+usr/libexec/git-core/mergetools/emerge
+usr/libexec/git-core/mergetools/kdiff3
+usr/libexec/git-core/mergetools/kompare
+usr/libexec/git-core/mergetools/meld
+usr/libexec/git-core/mergetools/opendiff
+usr/libexec/git-core/mergetools/p4merge
+usr/libexec/git-core/mergetools/tkdiff
+usr/libexec/git-core/mergetools/tortoisemerge
+usr/libexec/git-core/mergetools/vim
+usr/libexec/git-core/mergetools/xxdiff
 usr/share/git-core
 usr/share/git-core/templates
 usr/share/git-core/templates/branches
@@ -161,8 +215,6 @@ usr/share/git-core/templates/description
 usr/share/git-core/templates/hooks
 usr/share/git-core/templates/hooks/applypatch-msg.sample
 usr/share/git-core/templates/hooks/commit-msg.sample
-usr/share/git-core/templates/hooks/post-commit.sample
-usr/share/git-core/templates/hooks/post-receive.sample
 usr/share/git-core/templates/hooks/post-update.sample
 usr/share/git-core/templates/hooks/pre-applypatch.sample
 usr/share/git-core/templates/hooks/pre-commit.sample
@@ -195,16 +247,19 @@ usr/share/git-core/templates/info/exclude
 #usr/share/git-gui/lib/error.tcl
 #usr/share/git-gui/lib/git-gui.ico
 #usr/share/git-gui/lib/index.tcl
+#usr/share/git-gui/lib/line.tcl
 #usr/share/git-gui/lib/logo.tcl
 #usr/share/git-gui/lib/merge.tcl
 #usr/share/git-gui/lib/mergetool.tcl
 #usr/share/git-gui/lib/msgs
 #usr/share/git-gui/lib/msgs/de.msg
+#usr/share/git-gui/lib/msgs/el.msg
 #usr/share/git-gui/lib/msgs/fr.msg
 #usr/share/git-gui/lib/msgs/hu.msg
 #usr/share/git-gui/lib/msgs/it.msg
 #usr/share/git-gui/lib/msgs/ja.msg
 #usr/share/git-gui/lib/msgs/nb.msg
+#usr/share/git-gui/lib/msgs/pt_br.msg
 #usr/share/git-gui/lib/msgs/ru.msg
 #usr/share/git-gui/lib/msgs/sv.msg
 #usr/share/git-gui/lib/msgs/zh_cn.msg
@@ -218,6 +273,7 @@ usr/share/git-core/templates/info/exclude
 #usr/share/git-gui/lib/sshkey.tcl
 #usr/share/git-gui/lib/status_bar.tcl
 #usr/share/git-gui/lib/tclIndex
+#usr/share/git-gui/lib/themed.tcl
 #usr/share/git-gui/lib/tools.tcl
 #usr/share/git-gui/lib/tools_dlg.tcl
 #usr/share/git-gui/lib/transport.tcl
@@ -228,8 +284,21 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitk/lib/msgs
 #usr/share/gitk/lib/msgs/de.msg
 #usr/share/gitk/lib/msgs/es.msg
+#usr/share/gitk/lib/msgs/fr.msg
+#usr/share/gitk/lib/msgs/hu.msg
 #usr/share/gitk/lib/msgs/it.msg
+#usr/share/gitk/lib/msgs/ja.msg
+#usr/share/gitk/lib/msgs/pt_br.msg
 #usr/share/gitk/lib/msgs/ru.msg
 #usr/share/gitk/lib/msgs/sv.msg
+#usr/share/gitweb
+#usr/share/gitweb/gitweb.cgi
+#usr/share/gitweb/static
+#usr/share/gitweb/static/git-favicon.png
+#usr/share/gitweb/static/git-logo.png
+#usr/share/gitweb/static/gitweb.css
+#usr/share/gitweb/static/gitweb.js
+#usr/share/locale/is/LC_MESSAGES/git.mo
 #usr/share/man/man3/Git.3
+#usr/share/man/man3/Git::I18N.3
 #usr/share/man/man3/private-Error.3
diff --git a/lfs/GeoIP b/lfs/GeoIP
index 653d654..271bab6 100644
--- a/lfs/GeoIP
+++ b/lfs/GeoIP
@@ -25,7 +25,7 @@
 include Config
VER        = 1.17
-DATVER     = 06122011
+DATVER     = 03032012
THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = 78baa14e4e271f5fb9f75e5ff1169950
+GeoIP.dat-$(DATVER).gz_MD5 = 98ba2a5c177cdfa8da6f9fab524e948d
install : $(TARGET)
diff --git a/lfs/clamav b/lfs/clamav
index 5b97cfe..fe26aa2 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
include Config
-VER        = 0.97.3
+VER        = 0.97.4
THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 18
+PAK_VER    = 19
DEPS       = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5cf25ed7778fa0cb6b140ad8f009befb
+$(DL_FILE)_MD5 = dc1e5abc093b11f120e4eac94a7f78aa
install : $(TARGET)
diff --git a/lfs/cryptodev b/lfs/cryptodev
index 17a10c7..0c2f486 100644
--- a/lfs/cryptodev
+++ b/lfs/cryptodev
@@ -26,10 +26,10 @@ include Config
VERSUFIX=ipfire$(KCFG)
-VER        = 20091126
+VER        = 1.4
-THISAPP    = cryptodev-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+THISAPP    = cryptodev-linux-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 26ffa32ef75bea7e980ab66166616e95
+$(DL_FILE)_MD5 = 7b0ac1c0a88d8fbe7316db02f21666e6
install : $(TARGET)
@@ -74,13 +74,13 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && make build \
    	KERNEL_DIR=/lib/modules/$(KVER)-$(VERSUFIX)/build
-mkdir -pv /usr/include/crypto
    cd $(DIR_APP) && make install \
    	KERNEL_DIR=/lib/modules/$(KVER)-$(VERSUFIX)/build
-	ln -svf ../crypto/cryptodev.h /usr/include/linux/cryptodev.h
+#	ln -svf ../crypto/cryptodev.h /usr/include/linux/cryptodev.h
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/fireinfo b/lfs/fireinfo
index 26c195d..e0d83bf 100644
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,7 +24,7 @@
include Config
-VER        = 2.1.3
+VER        = 2.1.4
THISAPP    = fireinfo-v$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8c977d1b8b0743ea0d244d1d8f86598a
+$(DL_FILE)_MD5 = 4a5a027fadb7f81bda1224608a76c944
install : $(TARGET)
diff --git a/lfs/git b/lfs/git
index 253b819..82b90fd 100644
--- a/lfs/git
+++ b/lfs/git
@@ -24,15 +24,15 @@
include Config
-VER        = 1.6.3.1
+VER        = 1.7.9.3
THISAPP    = git-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 7
+PAK_VER    = 8
DEPS       = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c1f4aab741359c29f0fbf28563ac7387
+$(DL_FILE)_MD5 = f93b976649216d731fd9f9befb90a58c
install : $(TARGET)
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && ./configure --prefix=/usr
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/lfs/libpng b/lfs/libpng
index 60b25a0..7075118 100644
--- a/lfs/libpng
+++ b/lfs/libpng
@@ -24,10 +24,10 @@
include Config
-VER        = 1.2.44
+VER        = 1.2.46
THISAPP    = libpng-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 098ab673ab74015978db98667febc4a9
+$(DL_FILE)_MD5 = 03ddfc17ad321db93f984581e9415d22
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && ./configure --prefix=/usr
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/lfs/openssl b/lfs/openssl
index 21b6c0e..9d559e1 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
include Config
-VER        = 0.9.8t
+VER        = 0.9.8u
THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f5dabb7ffb068eecf245f1b2151df100
+$(DL_FILE)_MD5 = cb41e94f762ed63e41d1cca2b8430ede
install : $(TARGET)
@@ -70,15 +70,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8n-cryptodev.diff
-ifeq "$(PADLOCK)" "1"
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8g-engine-padlock.patch
-endif
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8u-cryptodev.patch
    @rm -rf /etc/ssl
    cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config
    cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure
    cd $(DIR_APP) && ./Configure --openssldir=/etc/ssl --prefix=/usr shared linux-elf \
-		zlib-dynamic no-asm 386
+		zlib-dynamic no-asm 386 -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGEST
    cd $(DIR_APP) && make MANDIR=/usr/share/man
    cd $(DIR_APP) && make MANDIR=/usr/share/man install
    rm -rf /etc/ssl/lib
diff --git a/lfs/openvpn b/lfs/openvpn
index 41594b7..4f10e7a 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -24,7 +24,7 @@
include Config
-VER        = 2.2.1
+VER        = 2.2.2
THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 500bee5449b29906150569aaf2eb2730
+$(DL_FILE)_MD5 = c5181e27b7945fa6276d21873329c5c7
install : $(TARGET)
@@ -70,20 +70,26 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/ovpn \
-						--enable-pthread
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/var/ipfire/ovpn \
+		--enable-password-save \
+		--enable-pthread
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
    cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
+	-mkdir -pv /usr/lib/openvpn
    cd $(DIR_APP)/plugin/auth-pam && make
-	cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /lib/
+	cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /usr/lib/openvpn
    cd $(DIR_APP)/plugin/down-root && make
-	cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /lib/
+	cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /usr/lib/openvpn
    -mkdir -vp /var/ipfire/ovpn/ca
    -mkdir -vp /var/ipfire/ovpn/crls
    -mkdir -vp /var/ipfire/ovpn/n2nconf
+	-mkdir -vp /var/ipfire/ovpn/scripts
    touch /var/ipfire/ovpn/ovpn-leases.db
    chmod 700 /var/ipfire/ovpn/ovpn-leases.db
+	chown -R root:root /var/ipfire/ovpn/scripts
    chown -R nobody:nobody /var/ipfire/ovpn
    chown root.nobody /var/log/ovpnserver.log
    chmod 755 /var/ipfire/ovpn/verify
diff --git a/lfs/pound b/lfs/pound
index 1b9e523..f2a7f5f 100644
--- a/lfs/pound
+++ b/lfs/pound
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pound
-PAK_VER    = 3
+PAK_VER    = 4
DEPS       = ""
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/pound-2.6.patch
+	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch
    cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --enable-cert1l
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/lfs/samba b/lfs/samba
index f31aac2..781a342 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
include Config
-VER        = 3.5.12
+VER        = 3.5.13
THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 37
+PAK_VER    = 38
DEPS       = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b1b8c6238a5524d001b8518d2b999993
+$(DL_FILE)_MD5 = ceb91e31218e337ae8d47b35f03518ca
install : $(TARGET)
diff --git a/lfs/strongswan b/lfs/strongswan
index 7370be9..964f2ed 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER        = 4.6.1
+VER        = 4.6.2
THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 85a28a12ed6f286a5bc9117e3a9386bb
+$(DL_FILE)_MD5 = ed64e6746011930a70f3a271dc0e3c9e
install : $(TARGET)
diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch
index db9ca3a..09a0b68 100644
--- a/lfs/usb_modeswitch
+++ b/lfs/usb_modeswitch
@@ -24,7 +24,7 @@
include Config
-VER        = 1.2.2
+VER        = 1.2.3
THISAPP    = usb-modeswitch-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4f3d3b9342b59b488089a8a81abda3ae
+$(DL_FILE)_MD5 = 9b29e8b0d93d7604a9e5efc4696d37a3
install : $(TARGET)
diff --git a/lfs/vim b/lfs/vim
index a018dc1..3935d33 100644
--- a/lfs/vim
+++ b/lfs/vim
@@ -79,9 +79,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    ln -sv vim /usr/bin/vi
    echo "set nocompatible"	>  /etc/vimrc
    echo "set backspace=2"	>> /etc/vimrc
+	echo "set ruler"		>> /etc/vimrc
    echo "syntax on"		>> /etc/vimrc
    echo -e "if (&term == "iterm") || (&term == "putty")" >> /etc/vimrc
-	echo "set background=dark"	>> /etc/vimrc
+	echo "  set background=dark"	>> /etc/vimrc
    echo "endif"			>> /etc/vimrc
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 598681d..3535beb 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.11"							# Version number
-CORE="57"							# Core Level (Filename)
-PAKFIRE_CORE="57"						# Core Level (PAKFIRE)
+CORE="58"							# Core Level (Filename)
+PAKFIRE_CORE="58"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids
index f13551b..27618a6 100644
--- a/src/hwdata/pci.ids
+++ b/src/hwdata/pci.ids
@@ -1,11 +1,11 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2011.11.09
-#	Date:    2011-11-09 03:15:02
+#	Version: 2012.04.04
+#	Date:    2012-04-04 03:15:01
 #
 #	Maintained by Martin Mares mj@ucw.cz and other volunteers from the
-#	PCI ID Project at http://pciids.sf.net/.
+#	PCI ID Project at http://pci-ids.ucw.cz/.
 #
 #	New data are always welcome, especially if they are accurate. If you have
 #	anything to contribute, please follow the instructions at the web site.
@@ -93,7 +93,7 @@
    8519  OV519 series
 05e3  CyberDoor
    0701  CBD516
-066f  Sigmatel Inc.
+066f  SigmaTel
    3410  SMTP3410
    3500  SMTP3500
 0675  Dynalink
@@ -383,6 +383,7 @@
    	1028 1f35  PERC H710 Adapter
    	1028 1f37  PERC H710 Mini (for blades)
    	1028 1f38  PERC H710 Mini (for monolithics)
+		8086 3513  RMS25PB080 RAID Controller
    005c  SAS1064A PCI-X Fusion-MPT SAS
    005d  MegaRAID SAS-3 3108 [Invader]
    005e  SAS1066 PCI-X Fusion-MPT SAS
@@ -423,7 +424,7 @@
    0065  SAS2116 PCI-Express Fusion-MPT SAS-2 [Meteor]
    006e  SAS2308 PCI-Express Fusion-MPT SAS-2
    0070  SAS2004 PCI-Express Fusion-MPT SAS-2 [Spitfire]
-	0071  MR SAS HBA
+	0071  MR SAS HBA 2004
    0072  SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon]
    	1028 1f1c  6Gbps SAS HBA Adapter
    	1028 1f1d  PERC H200 Adapter
@@ -432,7 +433,7 @@
    	1028 1f20  PERC H200 Embedded
    	1028 1f22  Internal Tape Adapter
    	8086 350f  RMS2LL040 RAID Controller
-	0073  MegaRAID SAS 9240
+	0073  MegaRAID SAS 2008 [Falcon]
    	1000 9240  MegaRAID SAS 9240-8i
    	1000 9241  MegaRAID SAS 9240-4i
    	1014 03b1  ServeRAID M1015 SAS/SATA Controller
@@ -446,6 +447,8 @@
    	1054 3035  LSI MegaRAID SAS 9240-8i
    	1137 0072  2004 iMR ROMB
    	1137 0073  2008 ROMB
+		1137 00b0  UCSC RAID SAS 2008M-8i
+		1137 00b1  UCSC RAID SAS 2008M-8i
    	15d9 0400  Supermicro SMC2008-iMR
    	1734 1177  RAID Ctrl SAS 6G 0/1 (D2607)
    	8086 350d  RMS2AF040 RAID Controller
@@ -462,6 +465,8 @@
    	1000 9262  MegaRAID SAS 9262-8i
    	1000 9263  MegaRAID SAS 9261-8i
    	1000 9264  MegaRAID SAS 9264-8i
+		1000 9267  MegaRAID SAS 9260CV-4i
+		1000 9268  MegaRAID SAS 9260CV-8i
    	1000 9275  MegaRAID SAS 9280-8ex
    	1000 9276  MR9260-16i
    	1000 9280  MegaRAID SAS 9280-8e
@@ -496,6 +501,7 @@
    0085  SAS2208 PCI-Express Fusion-MPT SAS-2
    0086  SAS2308 PCI-Express Fusion-MPT SAS-2
    0087  SAS2308 PCI-Express Fusion-MPT SAS-2
+		1590 0044  H220i
    008f  53c875J
    	1092 8000  FirePort 40 SCSI Controller
    	1092 8760  FirePort 40 Dual SCSI Host Adapter
@@ -531,7 +537,7 @@
    	8086 3008  MegaRAID RAID Controller SRCS28X
    	8086 3431  MegaRAID RAID Controller Alief SROMBU42E
    	8086 3499  MegaRAID RAID Controller Harwich SROMBU42E
-	0411  MegaRAID SAS
+	0411  MegaRAID SAS 1068
    	1000 1001  MegaRAID SAS 8408E
    	1000 1002  MegaRAID SAS 8480E
    	1000 1003  MegaRAID SAS 8344ELP
@@ -550,7 +556,7 @@
    	8086 3500  SROMBSAS18E RAID Controller
    	8086 3501  SROMBSAS18E RAID Controller
    	8086 3504  SROMBSAS18E RAID Controller
-	0413  MegaRAID SAS Verde ZCR
+	0413  MegaRAID SAS 1068 [Verde ZCR]
    	1000 1005  MegaRAID SAS 8300XLP
    0621  FC909 Fibre Channel Adapter
    0622  FC929 Fibre Channel Adapter
@@ -599,12 +605,14 @@
    0016  PCI-MFB Analogue I/O board
    0017  PROTO-3 PCI Prototyping board
    9100  INI-9100/9100W SCSI Host
-1002  ATI Technologies Inc
+# nee ATI Technologies Inc.
+1002  Advanced Micro Devices [AMD] nee ATI
    1314  Wrestler HDMI Audio [Radeon HD 6250/6310]
+	1714  BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series]
    3150  M24 1P [Radeon Mobility X600]
    	103c 0934  nx8220
    3151  M24 [FireMV 2400]
-	3152  M22 [Radeon Mobility X300]
+	3152  RV370 [Mobility Radeon X300]
    3154  M24GL [Mobility FireGL V3200]
    3171  M24 [FireMV 2400] (Secondary)
    3e50  RV380 0x3e50 [Radeon X600]
@@ -759,7 +767,7 @@
    	1458 b005  Gigabyte GA-MA69G-S3H Motherboard
    	1462 7327  K9AG Neo2
    	17f2 5999  KI690-AM2 Motherboard
-	4381  SB600 Raid-5 SATA
+	4381  SB400 SATA Controller (RAID 5 mode)
    4382  SB600 AC97 Audio
    4383  SBx00 Azalia (Intel HDA)
    	103c 1611  Pavilion DM1Z-3000
@@ -942,9 +950,9 @@
    	1002 0084  Rage 3D Pro AGP 2x XPERT 98
    	1002 0087  Rage 3D IIC
    	1002 475a  Rage IIC AGP
-	4964  Radeon RV250 Id [Radeon 9000]
-	4965  Radeon RV250 Ie [Radeon 9000]
-	4966  Radeon RV250 If [Radeon 9000]
+	4964  RV250 Id [Radeon 9000]
+	4965  RV250 Ie [Radeon 9000]
+	4966  R250 If [Radeon 9000]
    	10f1 0002  RV250 If [Tachyon G9000 PRO]
    	148c 2039  RV250 If [Radeon 9000 Pro "Evil Commando"]
    	1509 9a00  RV250 If [Radeon 9000 "AT009"]
@@ -953,7 +961,7 @@
    	174b 7192  RV250 If [Radeon 9000 "Atlantis"]
    	17af 2005  RV250 If [Excalibur Radeon 9000 Pro]
    	17af 2006  RV250 If [Excalibur Radeon 9000]
-	4967  Radeon RV250 Ig [Radeon 9000]
+	4967  RV250 Ig [Radeon 9000]
    496e  RV250 [Radeon 9000] (Secondary)
    4a48  R420 JH [Radeon X800]
    4a49  R420 JI [Radeon X800PRO]
@@ -961,7 +969,7 @@
    4a4b  R420 JK [Radeon X800]
    4a4c  R420 JL [Radeon X800]
    4a4d  R420 JM [FireGL X3]
-	4a4e  M18 JN [Radeon Mobility 9800]
+	4a4e  R420 JN [Mobility Radeon 9800]
    4a4f  R420 [Radeon X800 AGP]
    4a50  R420 JP [Radeon X800XT]
    4a54  R420 [Radeon X800 VE]
@@ -1016,7 +1024,7 @@
    	1033 8112  Versa Note VXi
    4c53  Rage Mobility L
    4c54  264LT [Mach64 LT]
-	4c57  Radeon Mobility M7 LW [Radeon Mobility 7500]
+	4c57  RV200 [Mobility Radeon 7500]
    	1014 0517  ThinkPad T30
    	1014 0530  ThinkPad T42 2373-4WU
    	1028 00e6  Radeon Mobility M7 LW (Dell Inspiron 8100)
@@ -1024,7 +1032,7 @@
    	1043 1622  Mobility Radeon M7 (L3C/S)
    	144d c006  Radeon Mobility M7 LW in vpr Matrix 170B4
    4c58  Radeon RV200 LX [Mobility FireGL 7800 M7]
-	4c59  Radeon Mobility M6 LY
+	4c59  RV100 LY [Mobility Radeon 7000]
    	0e11 b111  Evo N600c
    	1014 0235  ThinkPad A30/A30p (2652/2653)
    	1014 0239  ThinkPad X22/X23/X24
@@ -1032,7 +1040,7 @@
    	104d 80e7  VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP
    	104d 8140  PCG-Z1SP laptop
    	1509 1930  Medion MD9703
-	4c5a  Radeon Mobility M6 LZ
+	4c5a  RV100 LZ [Mobility Radeon 7000]
    4c64  Radeon RV250 Ld [Radeon Mobility 9000 M9]
    4c65  Radeon RV250 Le [Radeon Mobility 9000 M9]
    4c66  Radeon RV250 [Mobility FireGL 9000]
@@ -1064,10 +1072,10 @@
    	144d c00c  P35 notebook
    	1462 0311  MSI M510A
    	1734 1055  Amilo M1420W
-	4e51  M10 NQ [Radeon Mobility 9600]
+	4e51  RV350 NQ [Mobility Radeon 9600]
    4e52  RV350 [Mobility Radeon 9600 M10]
    	144d c00c  P35 notebook
-	4e53  M10 NS [Radeon Mobility 9600]
+	4e53  RV350 NS [Mobility Radeon 9600]
    4e54  M10 NT [FireGL Mobility T2]
    4e56  M11 NV [FireGL Mobility T2e]
    4e64  Radeon R300 [Radeon 9700 Pro] (Secondary)
@@ -1157,7 +1165,7 @@
    514f  Radeon R200 QO [Radeon 8500LE]
    5154  R200 QT [Radeon 8500]
    5155  R200 QU [Radeon 9100]
-	5157  Radeon RV200 QW [Radeon 7500]
+	5157  RV200 QW [Radeon 7500]
    	1002 013a  Radeon 7500
    	1002 0f2b  ALL-IN-WONDER VE PCI
    	1002 103a  Dell Optiplex GX260
@@ -1169,8 +1177,8 @@
    	174b 7147  RV200 QW [Sapphire Radeon 7500LE]
    	174b 7161  Radeon RV200 QW [Radeon 7500 LE]
    	17af 0202  RV200 QW [Excalibur Radeon 7500LE]
-	5158  Radeon RV200 QX [Radeon 7500]
-	5159  Radeon RV100 QY [Radeon 7000/VE]
+	5158  RV200 QX [Radeon 7500]
+	5159  RV100 QY [Radeon 7000/VE]
    	1002 000a  Radeon 7000/Radeon VE
    	1002 000b  Radeon 7000
    	1002 0038  Radeon 7000/Radeon VE
@@ -1195,7 +1203,7 @@
    	174b 7c28  Sapphire Radeon VE 7000 DDR
    	1787 0202  RV100 QY [Excalibur Radeon 7000]
    	17ee 1001  Radeon 7000 64MB DDR + DVI
-	515a  Radeon RV100 QZ [Radeon 7000/VE]
+	515a  RV100 QZ [Radeon 7000/VE]
    515e  ES1000
    	1028 01bb  PowerEdge 1955 Embedded ATI ES1000
    	1028 01df  PowerEdge SC440
@@ -1265,11 +1273,11 @@
    5453  Rage 128 Pro Ultra TS
    5454  Rage 128 Pro Ultra TT
    5455  Rage 128 Pro Ultra TU
-	5460  M22 [Mobility Radeon X300]
+	5460  RV370 [Mobility Radeon X300]
    	1775 1100  CR11/VR11 Single Board Computer
-	5461  M22 [Mobility Radeon X300]
-	5462  M24 [Radeon Mobility X600]
-	5464  M22 [FireGL GL]
+	5461  RV370 [Mobility Radeon X300]
+	5462  RV380 [Mobility Radeon X600]
+	5464  RV370 [Mobility FireGL V3100]
    5548  R423 UH [Radeon X800 (PCIE)]
    5549  R423 UI [Radeon X800PRO (PCIE)]
    554a  R423 UJ [Radeon X800LE (PCIE)]
@@ -1480,6 +1488,7 @@
    5e6d  RV410 [Radeon X700 (PCIE)] (Secondary)
    	148c 2117  PowerColor Bravo X700
    5f57  R423 [Radeon X800XT (PCIE)]
+	6707  Cayman LE GL [FirePro V5900]
    6718  Cayman XT [Radeon HD 6970]
    6719  Cayman PRO [Radeon HD 6950]
    671d  Antilles [AMD Radeon HD 6990]
@@ -1492,6 +1501,7 @@
    6741  Whistler [AMD Radeon HD 6600M Series]
    6742  Whistler LE [AMD Radeon HD 6625M Graphics]
    6743  Whistler [Radeon E6760]
+	6749  Turks [FirePro V4900]
    6750  Turks [AMD Radeon HD 6570]
    6751  Turks [Radeon HD 7600A Series]
    6758  Turks [Radeon HD 6670]
@@ -1510,6 +1520,9 @@
    6798  Tahiti XT [Radeon HD 7970]
    6799  New Zealand [Radeon HD 7990]
    679a  Tahiti PRO [Radeon HD 7950]
+	6800  WIMBLEDON XT [Radeon HD 7970M]
+	6818  PITCAIRN [Radeon HD 7800]
+	6819  PITCAIRN PRO [Radeon HD 7800 Series]
    6840  Thames XT/GL [Radeon HD 7600M Series]
    6841  Thames [Radeon 7500M/7600M Series]
    6843  Thames [Radeon HD 7670M]
@@ -1735,6 +1748,7 @@
    9480  M96 [Mobility Radeon HD 4650]
    	103c 3628  ATI Mobility Radeon HD 4650 [dv6-1190en]
    9485  RV740 Pro [Radeon HD 4770]
+	9488  RV730 XT [Mobility Radeon HD 4670]
    9489  M96 XT [Mobility FireGL V5725]
    9490  RV730XT [Radeon HD 4670]
    	174b e880  Radeon HD 4670 512MB DDR3
@@ -1763,10 +1777,10 @@
    94c9  Mobility Radeon HD 2400
    	1002 94c9  Radeon HD2400
    94cb  Radeon E2400
-	94cc  RV 610LE PCI [Radeon HD 2400]
-	9501  Radeon HD 3870
+	94cc  RV610 LE [Radeon HD 2400 Pro PCI]
+	9501  RV670 [Radeon HD 3870]
    	174b e620  Sapphire Radeon HD 3870 PCIe 2.0
-	9504  Mobility Radeon HD 3850
+	9504  RV670 [Mobility Radeon HD 3850]
    9505  RV670PRO [Radeon HD 3850]
    9507  RV670 [Radeon HD 3850]
    9508  M88 XT Mobility Radeon HD 3870]
@@ -1777,15 +1791,15 @@
    9540  RV710 [Radeon HD 4550]
    954f  RV710 [Radeon HD 4350]
    	1462 1618  R4350 MD512H (MS-V161)
-	9552  M92 LP [Mobility Radeon HD 4300 Series]
-	9553  M92 [Mobility Radeon HD 4500/5100 Series]
+	9552  RV710 [Mobility Radeon HD 4300 Series]
+	9553  RV710 [Mobility Radeon HD 4500/5100 Series]
    	1179 ff82  Satellite L505-13T GPU (Mobility Radeon HD 5145)
-	9555  M93 [Mobility Radeon HD 4300/4500 Series]
+	9555  RV710 [Mobility Radeon HD 4300/4500 Series]
    	103c 1411  ProBook 4720s GPU (Mobility Radeon HD 4350)
-	9559  Mobility Radeon HD 3600 Series
-	955f  M92 [Mobility Radeon HD 4330]
-	9581  M76 [Radeon Mobility HD 2600 Series]
-	9583  M76XT [Mobility Radeon HD 2600 XT]
+	9559  RV635 [Mobility Radeon HD 3600 Series]
+	955f  RV710 [Mobility Radeon HD 4330]
+	9581  RV630 [Mobility Radeon HD 2600]
+	9583  RV630 [Mobility Radeon HD 2600 XT]
    9586  RV 630 XT AGP [Radeon HD 2600 XT AGP]
    9587  RV630 PRO AGP [Radeon HD 2600 PRO AGP]
    9588  RV630 [Radeon HD 2600XT]
@@ -1795,16 +1809,16 @@
    958d  RV630 [FireGL V3600]
    9591  RV635 [Mobility Radeon HD 3650]
    	1002 9591  Mobility Radeon HD 3650
-	9593  Radeon Mobility HD 3670
+	9593  RV635 [Mobility Radeon HD 3670]
    9595  M86GL [Mobility FireGL V5700]
    9596  RV635 PRO AGP [Radeon HD 3650]
    	1043 0028  EAH3650 SILENT/HTDI/512M/A
-	9598  Mobility Radeon HD 3600 Series
+	9598  RV630 [Radeon HD 3600 Series]
    	1002 9598  Mobility Radeon HD 3600
    	1043 01d6  EAH3650 Silent
    95c0  RV620 PRO [Radeon HD 3470]
    	1002 95c0  Mobility Radeon HD 3470
-	95c4  Mobility Radeon HD 3400 Series
+	95c4  RV620 [Mobility Radeon HD 3400 Series]
    	1002 95c4  Mobility Radeon HD 3400
    95c5  RV620 LE [Radeon HD 3450]
    95c6  RV620 LE AGP [Radeon HD 3450]
@@ -1823,6 +1837,9 @@
    9614  RS780D [Radeon HD 3300]
    9615  RS780E [Radeon HD 3200]
    9616  RS780L [Radeon HD 3000]
+	9640  BeaverCreek [Radeon HD 6550D]
+	9641  BeaverCreek [Mobility Radeon HD 6620G]
+	964a  BeaverCreek [Radeon HD 6530D]
    970f  RS880 HDMI Audio [Radeon HD 4200 Series]
    	1043 83a2  M4A785TD Motherboard
    	1043 843e  M5A88-V EVO
@@ -1837,12 +1854,13 @@
    9802  Wrestler [Radeon HD 6310]
    9804  Wrestler [Radeon HD 6250]
    9806  Wrestler [Radeon HD 6320]
+	9807  Wrestler [Radeon HD 6290]
    aa00  R600 Audio Device [Radeon HD 2900 Series]
-	aa08  RV630/M76 audio device [Radeon HD 2600 Series]
-	aa10  RV610 audio device [Radeon HD 2400 PRO]
+	aa08  RV630 audio device [Radeon HD 2600 Series]
+	aa10  RV610 HDMI Audio [Radeon HD 2350/2400 Series]
    	174b aa10  Sapphire HD 2400 PRO audio device
    	18bc aa10  GeCube Radeon HD 2400 PRO HDCP-capable digital-only audio device
-	aa18  Radeon HD 3870 Audio device
+	aa18  RV670/680 HDMI Audio [Radeon HD 3690/3800 Series]
    aa20  RV635 HDMI Audio [Radeon HD 3600 Series]
    aa28  RV620 HDMI Audio [Radeon HD 3400 Series]
    aa30  RV770 HDMI Audio [Radeon HD 4850/4870]
@@ -1852,14 +1870,19 @@
    	174b aa38  R700 Audio Device [Radeon HD 4000 Series]
    aa50  Cypress HDMI Audio [Radeon HD 5800 Series]
    aa58  Juniper HDMI Audio [Radeon HD 5700 Series]
-	aa60  Redwood HDMI Audio [Radeon HD 5600 Series]
+# 5500, 5600 and mobile 5700 series
+	aa60  Redwood HDMI Audio [Radeon HD 5000 Series]
    	1025 033d  Mobility Radeon HD 5650
    	1025 0347  Aspire 7740G
-	aa68  Manhattan HDMI Audio [Mobility Radeon HD 5000 Series]
+	aa68  Cedar HDMI Audio [Radeon HD 5400/6300 Series]
    	1028 aa68  XPS 8300
+	aa80  Cayman/Antilles HDMI Audio [Radeon HD 6900 Series]
    aa88  Barts HDMI Audio [Radeon HD 6800 Series]
+# 6500, 6600 and mobile 6700 series
+	aa90  Turks HDMI Audio [Radeon HD 6000 Series]
    aa98  Caicos HDMI Audio [Radeon HD 6400 Series]
    	174b aa98  Sapphire HD 6450 1GB DDR3
+	aaa0  Tahiti XT HDMI Audio [Radeon HD 7970 Series]
    ac00  Theater 600 Pro
    ac02  TV Wonder HD 600 PCIe
    ac12  Theater HD T507 (DVB-T) TV tuner/capture device
@@ -2259,7 +2282,7 @@
    	1014 033b  PCIe2 6Gb SAS RAID Adapter Quad-port (57B4)
    	1014 0355  PCIe2 3.6GB Cache 6Gb SAS RAID Adapter Quad-port (57B1)
    	1014 0357  PCIe2 6Gb SAS Adapter Quad-port (57C6)
-		1014 035d  PCIe2 3.6GB Cache 6Gb SAS RAID & SSD Adapter (575D)
+		1014 035d  PCIe3 1.8GB Cache RAID SAS Adapter Quad-port 6GB (57C8)
    	1014 035e  PCIe2 3.6GB Cache 6Gb SAS RAID Adapter Quad-port (57CE)
    3022  QLA3022 Network Adapter
    4022  QLA3022 Network Adapter
@@ -2347,6 +2370,21 @@
    1302  Family 11h Processor DRAM Controller
    1303  Family 11h Processor Miscellaneous Control
    1304  Family 11h Processor Link Control
+	1400  Family 15h (Models 10h-1fh) Processor Function 0
+	1401  Family 15h (Models 10h-1fh) Processor Function 1
+	1402  Family 15h (Models 10h-1fh) Processor Function 2
+	1403  Family 15h (Models 10h-1fh) Processor Function 3
+	1404  Family 15h (Models 10h-1fh) Processor Function 4
+	1405  Family 15h (Models 10h-1fh) Processor Function 5
+	1410  Family 15h (Models 10h-1fh) Processor Root Complex
+	1412  Family 15h (Models 10h-1fh) Processor Root Port
+	1413  Family 15h (Models 10h-1fh) Processor Root Port
+	1414  Family 15h (Models 10h-1fh) Processor Root Port
+	1415  Family 15h (Models 10h-1fh) Processor Root Port
+	1416  Family 15h (Models 10h-1fh) Processor Root Port
+	1417  Family 15h (Models 10h-1fh) Processor Root Port
+	1418  Family 15h (Models 10h-1fh) Processor Root Port
+	1419  Family 15h (Models 10h-1fh) I/O Memory Management Unit
    1510  Family 14h Processor Root Complex
    1512  Family 14h Processor Root Port
    1513  Family 14h Processor Root Port
@@ -2672,7 +2710,7 @@
    00cf  AIC-7899P U160/m
    	1028 0106  PowerEdge 4600
    	1028 0121  PowerEdge 2650
-102b  Matrox Graphics, Inc.
+102b  Matrox Electronics Systems Ltd.
 # DJ: I've a suspicion that 0010 is a duplicate of 0d10.
    0010  MGA-I [Impression?]
    0100  MGA 1064SG [Mystique]
@@ -2913,10 +2951,46 @@
    	102b 0101  Millenium P690 PCI
    	102b 0140  Millenium P690 LP PCIe x1
    	102b 0180  Display Wall IP Decode 128 MB
+	4164  Morphis QxT frame grabber
+	43b4  Morphis Qxt encoding engine
+	4510  Morphis COM port
    4536  VIA Framegrabber
-	4cdc  Morphis Vision System Jpeg2000
-	4fc5  Morphis Vision System
-	5e10  Morphis Vision System Aux/IO
+	4686  Concord GX (customized Intel 82541)
+	475b  Solios eCL/XCL-B frame grabber
+	475d  Vio frame grabber family
+		102b 4b90  Vio Duo frame grabber (single channel)
+		102b 4b91  Vio Duo frame grabber
+		102b 4b92  Vio Analog frame grabber
+		102b 4b93  Vio SDI Frame Grabber
+		102b 4b94  Vio DVI-A frame grabber
+	475f  Solios (single-Full) CL frame grabber
+		102b 475f  Solios eCL/XCL-F frame grabber
+		102b 4d5f  Solios eV-CL (single-Full) frame grabber
+		102b 4e5f  Solios eM-CL (single-Full) frame grabber
+	47a1  Solios eA/XA frame grabber
+		102b 4be0  Solios eA/XA (single) frame grabber
+		102b 4be1  Solios eA/XA (dual) frame grabber
+		102b 4be2  Solios eA/XA (quad) frame grabber
+	47a2  Solios COM port
+	47c1  Solios (dual-Base/single-Medium) CL frame grabber
+		102b 0000  Solios frame grabber
+		102b 4b80  Solios eCL/XCL (single-Medium) frame grabber
+		102b 4b81  Solios eCL/XCL (dual-Base) frame grabber
+		102b 4d80  Solios eV-CL (single-Medium) frame grabber
+		102b 4d81  Solios eV-CL (dual-Base) frame grabber
+		102b 4e80  Solios eM-CL (single-Medium) frame grabber
+		102b 4e81  Solios eM-CL (dual-Base) frame grabber
+	47c2  Solios COM port
+	4949  Radient frame grabber family
+		102b 0010  Radient eCL (Single-full) frame grabber
+		102b 0020  Radient eCL (Dual-base) frame grabber
+		102b 0030  Radient eCL (Dual-full) frame grabber
+		102b 0040  Radient eCL (Quad-base) frame grabber
+		102b 0050  Radient eCL (Golden) frame grabber
+	4cdc  Morphis JPEG2000 accelerator
+	4f54  Morphis (e)Quad frame grabber
+	4fc5  Morphis (e)Dual frame grabber
+	5e10  Morphis aux I/O
    6573  Shark 10/100 Multiport SwitchNIC
 102c  Chips and Technologies
    00b8  F64310
@@ -3005,7 +3079,7 @@
    003e  NAPCCARD Cardbus Controller
    0046  PowerVR PCX2 [midas]
    005a  Vrc5074 [Nile 4]
-	0063  Firewarden
+	0063  uPD72862 [Firewarden] IEEE1394 OHCI 1.0 Link Controller
    0067  PowerVR Neon 250 Chipset
    	1010 0020  PowerVR Neon 250 AGP 32Mb
    	1010 0080  PowerVR Neon 250 AGP 16Mb
@@ -3021,17 +3095,17 @@
    009b  Vrc5476
    00a5  VRC4173
    00a6  VRC5477 AC97
-	00cd  IEEE 1394 [OrangeLink] Host Controller
+	00cd  uPD72870 [Firewarden] IEEE1394a OHCI 1.0 Link/3-port PHY Controller
    	12ee 8011  Root hub
-	00ce  IEEE 1394 Host Controller
+	00ce  uPD72871 [Firewarden] IEEE1394a OHCI 1.0 Link/1-port PHY Controller
    00df  Vr4131
    00e0  USB 2.0
    	12ee 7001  Root hub
    	14c2 0205  PTI-205N USB 2.0 Host Controller
    	1799 0002  Root Hub
    	807d 1043  PCI-USB2 (EHCI subsystem)
-	00e7  uPD72873 IEEE1394 OHCI 1.1 2-port Host Controller
-	00f2  uPD72874 IEEE1394 OHCI 1.1 3-port PHY-Link Ctrlr
+	00e7  uPD72873 [Firewarden] IEEE1394a OHCI 1.1 Link/2-port PHY Controller
+	00f2  uPD72874 [Firewarden] IEEE1394a OHCI 1.1 Link/3-port PHY Controller
    00f3  uPD6113x Multimedia Decoder/Processor [EMMA2]
    010c  VR7701
    0125  uPD720400 PCI Express - PCI/PCI-X Bridge
@@ -3039,6 +3113,9 @@
    0194  uPD720200 USB 3.0 Host Controller
    	1028 04b2  Vostro 3350
    	1043 8413  P8P67 Deluxe Motherboard
+		1b96 0001  USB 3.0 PCIe Card
+	01e7  uPD72873 [Firewarden] IEEE1394a OHCI 1.1 Link/2-port PHY Controller
+	01f2  uPD72874 [Firewarden] IEEE1394a OHCI 1.1 Link/3-port PHY Controller
 1034  Framatome Connectors USA Inc.
 1035  Comp. & Comm. Research Lab
 1036  Future Domain Corp.
@@ -3289,6 +3366,7 @@
    1303  RMP-3 (Remote Management Processor)
    1361  BCM4312 802.11a/b/g WLAN Controller
    1371  Broadcom Corporation BCM4312 802.11a/b/g (rev 02)
+	1717  Intel 82571EB dual 1 Gb Ethernet controller
    2910  E2910A PCIBus Exerciser
    2925  E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
    3080  Pavilion ze2028ea
@@ -3316,6 +3394,12 @@
    	103c 3249  Smart Array P812
    	103c 324a  HP Smart Array 712m (Mezzanine RAID controller)
    	103c 324b  Smart Array P711m (Mezzanine RAID controller)
+	323b  Smart Array Gen8 Controllers
+		103c 3350  P222
+		103c 3351  P420
+		103c 3352  P421
+		103c 3354  P420i
+		103c 3355  P220i
    3300  Integrated Lights-Out Standard Virtual USB Controller
    	103c 3304  iLO2
    	103c 3305  iLO2
@@ -3534,21 +3618,28 @@
    	1102 100f  Graphics Blaster Extreme
    	3d3d 0100  Reference Permedia 2 3D
    8000  PCILynx/PCILynx2 IEEE 1394 Link Layer Controller
+		105e 8003  FireBoard200
    	1443 8003  FireBoard200
+		1443 8005  FireBoard400
+		1443 8006  FireBoard400
    	e4bf 1010  CF1-1-SNARE
    	e4bf 1020  CF1-2-SNARE
+		e4bf 1040  FireCompact400
    8009  TSB12LV22 IEEE-1394 Controller
    	104d 8032  8032 OHCI i.LINK (IEEE 1394) Controller
+		1443 8010  FireBoard400-OHCI
    8017  PCI4410 FireWire Controller
    8019  TSB12LV23 IEEE-1394 Controller
    	11bd 000a  Studio DV500-1394
    	11bd 000e  Studio DV
+		1443 8010  FireBoard400-OHCI
    	e4bf 1010  CF2-1-CYMBAL
    8020  TSB12LV26 IEEE-1394 Controller (Link)
    	1028 00d8  Precision 530
    	104d 80e2  VAIO PCV-J200
    	11bd 000f  Studio DV500-1394
    	11bd 001c  Excalibur 4.1
+		1443 8010  FireBoard400-OHCI
    8021  TSB43AA22 IEEE-1394 Controller (PHY/Link Integrated)
    	104d 80df  Vaio PCG-FX403
    	104d 80e7  VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP
@@ -3559,12 +3650,17 @@
    	1043 808b  K8N4-E Mainboard
    	1043 815b  P5W DH Deluxe Motherboard
    	1443 8023  FireCard400
+		8086 5044  Desktop Board DP35DP
    8024  TSB43AB23 IEEE-1394a-2000 Controller (PHY/Link)
    	107d 6620  Winfast DV2000 FireWire Controller
    	1443 8024  FireBoard Blue
    	1458 1000  GA-EP45-DS5 Motherboard
    8025  TSB82AA2 IEEE-1394b Link Layer Controller
+		1043 813c  P5P series mainboard
+		1443 8025  FireBoard800
    	1458 1000  GA-K8N Ultra-9 Mainboard
+		1546 8025  FWB-PCI01
+		17fc 8025  GIC3800
    8026  TSB43AB21 IEEE-1394a-2000 Controller (PHY/Link)
    	1025 0035  TravelMate 660
    	1025 003c  Aspire 2001WLCi (Compaq CL50 motherboard)
@@ -3935,7 +4031,7 @@
    	1043 809e  A7V8X motherboard
    3515  PDC40719 [FastTrak TX4300/TX4310]
    3519  PDC40519 (FastTrak TX4200)
-	3570  20771 (FastTrak TX2300)
+	3570  PDC20771 [FastTrak TX2300]
    3571  PDC20571 (FastTrak TX2200)
    3574  PDC20579 SATAII 150 IDE Controller
    3577  PDC40779 (SATA 300 779)
@@ -3955,8 +4051,8 @@
    	105a 4d30  Ultra Device on SuperTrak
    	105a 4d33  Ultra66
    	105a 4d39  FastTrak66
-	4d68  PDC20268 (Ultra100 TX2)
-		105a 4d68  Ultra100TX2
+	4d68  PDC20268 [Ultra100 TX2]
+		105a 4d68  Ultra100 TX2
    4d69  20269
    	105a 4d68  Ultra133TX2
    5275  PDC20276 (MBFastTrak133 Lite)
@@ -4108,7 +4204,7 @@
    ba57  eXtremeRAID 4000/5000 support Device
    	1069 0072  eXtremeRAID 5000 support Device
 106a  Aten Research Inc
-106b  Apple Computer Inc.
+106b  Apple Inc.
    0001  Bandit PowerPC host bridge
    0002  Grand Central I/O
    0003  Control Video
@@ -4178,6 +4274,7 @@
    0074  U4 HT Bridge
    1645  Tigon3 Gigabit Ethernet NIC (BCM5701)
 106c  Hynix Semiconductor
+	8139  8139c 100BaseTX Ethernet Controller
    8801  Dual Pentium ISA/PCI Motherboard
    8802  PowerPC ISA/PCI Motherboard
    8803  Dual Window Graphics Accelerator
@@ -4362,8 +4459,7 @@
    	108d 0017  OC-2250 GoCard 10/100 Ethernet Adapter
    0021  OC-6151/6152 [RapidFire ATM 155]
    0022  ATM Adapter
-# formerly Sun Microsystems
-108e  Oracle Corporation
+108e  Oracle/SUN
    0001  EBUS
    1000  EBUS
    1001  Happy Meal 10/100 Ethernet [hme]
@@ -4857,6 +4953,9 @@
    8664  PEX 8664 64-lane, 16-Port PCI Express Gen 2 (5.0 GT/s) Switch
    8680  PEX 8680 80-lane, 20-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch
    8696  PEX 8696 96-lane, 24-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch
+	8732  PEX 8732 32-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch
+# This is the Non-Transparent-Bridge Virtualized Port as presented by the PLX PEX 8732 chip, the physical bridges show up at 10b5:8732
+	87b0  PEX 8732 32-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch
    9016  PLX 9016 8-port serial controller
    9030  PCI9030 32-bit 33MHz PCI <-> IOBus Bridge
    	10b5 2695  Hilscher CIF50-PB Profibus Master Board
@@ -5418,7 +5517,7 @@
 10dd  Evans & Sutherland
    0100  Lightning 1200
    	10dd 0023  Lightning 1200 15+16M
-10de  nVidia Corporation
+10de  NVIDIA Corporation
    0008  NV1 [EDGE 3D]
    0009  NV1 [EDGE 3D]
    0010  NV2 [Mutara V08]
@@ -5911,7 +6010,7 @@
    0197  G80 [Tesla C870]
    019d  G80 [Quadro FX 5600]
    019e  G80 [Quadro FX 4600]
-	01a0  NVCrush11 [GeForce2 MX Integrated Graphics]
+	01a0  nForce 220/420 NV11 [GeForce2 MX]
    01a4  nForce CPU bridge
    01ab  nForce 420 Memory Controller (DDR)
    01ac  nForce 220/420 Memory Controller
@@ -5974,6 +6073,7 @@
    0215  NV48 [GeForce 6800 GT]
    0218  NV48 [GeForce 6800 XT]
    0221  NV44A [GeForce 6200]
+		1043 81e1  N6200/TD/256M/A
    	3842 a341  256A8N341DX
    0222  NV44 [GeForce 6200 A-LE]
    0240  C51PV [GeForce 6150]
@@ -6238,7 +6338,7 @@
    0361  MCP55 LPC Bridge
    	1028 0221  PowerEdge R805 MCP55 LPC Bridge
    0362  MCP55 LPC Bridge
-		147b 12c4  KN9-Ultra Mainboard
+		147b 1c24  KN9 series mainboard
    0363  MCP55 LPC Bridge
    0364  MCP55 LPC Bridge
    	1028 0221  PowerEdge R805 MCP55 LPC Bridge
@@ -6248,26 +6348,27 @@
    0368  MCP55 SMBus
    	1028 020c  PowerEdge M605 MCP55 SMBus
    	1028 0221  PowerEdge R805 MCP55 SMBus
-		147b 12c4  KN9-Ultra Mainboard
+		147b 1c24  KN9 series mainboard
    0369  MCP55 Memory Controller
-		147b 12c4  KN9-Ultra Mainboard
+		147b 1c24  KN9 series mainboard
    036a  MCP55 Memory Controller
    036b  MCP55 SMU
    036c  MCP55 USB Controller
    	1028 020c  PowerEdge M605 MCP55 USB Controller
    	1028 0221  PowerEdge R805 MCP55 USB Controller
-		147b 12c4  KN9-Ultra Mainboard
+		147b 1c24  KN9 series mainboard
    036d  MCP55 USB Controller
    	1028 020c  PowerEdge M605 MCP55 USB Controller
    	1028 0221  PowerEdge R805 MCP55 USB Controller
-		147b 12c4  KN9-Ultra Mainboard
+		147b 1c24  KN9 series mainboard
    036e  MCP55 IDE
-		147b 12c4  KN9-Ultra Mainboard
+		147b 1c24  KN9 series mainboard
    0370  MCP55 PCI bridge
    0371  MCP55 High Definition Audio
+		147b 1c24  KN9 series mainboard
    0372  MCP55 Ethernet
    0373  MCP55 Ethernet
-		147b 12c4  KN9-Ultra Mainboard
+		147b 1c24  KN9 series mainboard
    0374  MCP55 PCI Express bridge
    0375  MCP55 PCI Express bridge
    0376  MCP55 PCI Express bridge
@@ -6277,7 +6378,7 @@
    037e  MCP55 SATA Controller
    037f  MCP55 SATA Controller
    	1028 0221  PowerEdge R805 MCP55 SATA Controller
-		147b 12c4  KN9-Ultra Mainboard
+		147b 1c24  KN9 series mainboard
    038b  G73 [GeForce 7650 GS]
    0390  G73 [GeForce 7650 GS]
    0391  G73 [GeForce 7600 GT]
@@ -6337,7 +6438,9 @@
    	1028 020e  Inspiron 531
    	1849 03e0  939NF6G-VSTA Board
    03e1  MCP61 LPC Bridge
-	03e2  MCP61 LPC Bridge
+		1043 83a4  M4N68T series motherboard
+	03e2  MCP61 Host Bridge
+		1043 83a4  M4N68T series motherboard
    03e3  MCP61 LPC Bridge
    03e4  MCP61 High Definition Audio
    03e5  MCP61 Ethernet
@@ -6354,22 +6457,30 @@
    	1849 03ea  939NF6G-VSTA Board
    03eb  MCP61 SMBus
    	1028 020e  Inspiron 531
+		1043 83a4  M4N68T series motherboard
    	1849 03eb  939NF6G-VSTA Board
    03ec  MCP61 IDE
+		1025 0392  ET1350
    	1028 020e  Inspiron 531
+		1043 83a4  M4N68T series motherboard
    	1849 03ec  939NF6G-VSTA Board
    03ee  MCP61 Ethernet
    03ef  MCP61 Ethernet
+		1025 8000  ET1350
    	1028 020e  Inspiron 531
+		1043 83a4  M4N68T series motherboard
    	1849 03ef  939NF6G-VSTA Board
    03f0  MCP61 High Definition Audio
    	1028 020e  Inspiron 531
+		1043 8415  M4N68T series motherboard
    	1849 0888  939NF6G-VSTA Board
-	03f1  MCP61 USB Controller
+	03f1  MCP61 USB 1.1 Controller
    	1028 020e  Inspiron 531
+		1043 83a4  M4N68T series motherboard
    	1849 03f1  939NF6G-VSTA Board
-	03f2  MCP61 USB Controller
+	03f2  MCP61 USB 2.0 Controller
    	1028 020e  Inspiron 531
+		1043 83a4  M4N68T series motherboard
    	1849 03f2  939NF6G-VSTA Board
    03f3  MCP61 PCI bridge
    	1028 020e  Inspiron 531
@@ -6377,14 +6488,18 @@
    03f4  MCP61 SMU
    03f5  MCP61 Memory Controller
    	1028 020e  Inspiron 531
+		1043 83a4  M4N68T series motherboard
    	1849 03eb  939NF6G-VSTA Board
    03f6  MCP61 SATA Controller
    	1028 020e  Inspiron 531
+		1043 83a4  M4N68T series motherboard
    	1849 03f6  939NF6G-VSTA Board
    03f7  MCP61 SATA Controller
    0400  G84 [GeForce 8600 GTS]
+		1043 8241  EN8600GTS
    0401  G84 [GeForce 8600GT]
    0402  G84 [GeForce 8600 GT]
+		1458 3455  GV-NX86T512H
    	1462 0910  NX8600GT-T2D256EZ
    0403  G84 [GeForce 8600 GS]
    0404  G84 [GeForce 8400 GS]
@@ -6414,7 +6529,7 @@
    0427  G86 [GeForce 8400M GS]
    	103c 30cc  Pavilion dv6700
    0428  G86 [GeForce 8400M G]
-	0429  G84M [Quadro NVS 140M]
+	0429  G86 [Quadro NVS 140M]
    	17aa 20d8  ThinkPad T61
    042a  G86M [Quadro NVS 130M]
    042b  G86M [Quadro NVS 135M]
@@ -6513,7 +6628,7 @@
    	1019 297a  MCP73PVT-SM
    056f  MCP73 PCI Express bridge
    	1019 297a  MCP73PVT-SM
-	05b1  NF200 PCIe 2.0 switch for mainboards
+	05b1  NF200 PCIe 2.0 switch
    05b8  NF200 PCIe 2.0 switch for GTX 295
    05be  NF200 PCIe 2.0 switch for Quadro Plex S4 / Tesla S870 / Tesla S1070 / Tesla S2050
    05e0  GT200b [GeForce GTX 295]
@@ -6821,7 +6936,8 @@
    	19da a123  IONITX-F-E
    087e  ION LE VGA
    087f  ION LE VGA
-	08a4  GT216 [GeForce 320M]
+	08a3  MCP89 [GeForce 320M]
+	08a4  MCP89 [GeForce 320M]
    0a20  GT216 [GeForce GT 220]
    	1043 8311  ENGT220/DI/1GD3(LP)/V2
    0a23  GT218 [GeForce 210]
@@ -6935,6 +7051,7 @@
    0be9  GF106 High Definition Audio Controller
    	1558 8687  CLEVO/KAPOK W860CU
    0bea  GF108 High Definition Audio Controller
+		3842 1430  GeForce GT 430
    0beb  GF104 High Definition Audio Controller
    	1462 2322  N460GTX Cyclone 1GD5/OC
    0bee  GF116 High Definition Audio Controller
@@ -6974,9 +7091,9 @@
    0dd2  GF106 [GeForce GT 445M]
    0dd8  GF106GL [Quadro 2000]
    0dda  GF106 [Quadro 2000M]
-# Not sure if this is GF106 or GF108
-	0de0  [GeForce GT 440]
+	0de0  GF108 [GeForce GT 440]
    0de1  GF108 [GeForce GT 430]
+		3842 1430  GeForce GT 430
    0de2  GF108 [GeForce GT 420]
 # Not fully sure that it's GF108, might also be GF106.
    0deb  GF108 [GeForce GT 555M]
@@ -6984,29 +7101,42 @@
    0df0  GF108 [GeForce GT 425M]
    0df2  GF108 [GeForce GT 435M]
    0df4  GF108 [GeForce GT 540M]
+	0df5  GF108 [GeForce GT 540M]
+	0df7  GF108 [GeForce GT 520M]
    0df8  GF108 [Quadro 600]
    0dfa  GF108 [Quadro 1000M]
    0e08  HDMI Audio stub
    0e09  GF110 High Definition Audio Controller
+	0e0a  GK104 [Geforce GTX680]
+	0e0c  GF110 High Definition Audio Controller
    0e22  GF104 [GeForce GTX 460]
    	1462 2322  N460GTX Cyclone 1GD5/OC
    0e3a  GF104 [Quadro 3000M]
    0e3b  GF104 [Quadro 4000M]
+	0fd2  GK107 [GeForce GT 640M]
    1040  GF119 [GeForce GT 520]
+	1050  GF119 [GeForce GT 520M]
+	1051  GF119 [GeForce GT 520MX]
    1056  GF119 [Quadro NVS 4200M]
+	1057  GF119 [Quadro NVS 4200M]
    1080  GF110 [GeForce GTX 580]
    1081  GF110 [GeForce GTX 570]
    	10de 087e  Leadtek WinFast GTX 570
    1082  GF114 [GeForce GTX 560 Ti]
    1086  GF110 [GeForce GTX 570 HD]
+	1091  Tesla M2090
    1094  Tesla M2075 Dual-Slot Computing Processor Module
+	1096  Tesla C2075
    10c3  GT218 [GeForce 8400 GS]
    	10de 066d  G98 [GeForce 8400GS]
-	10c5  M116N
+	10c5  Dell M116N [GeForce 405]
    10d8  GT218 [NVS 300]
+	1180  GK104 [GeForce GTX 680]
    1200  GF110 [GeForce GTX 560 Ti]
    1201  GF114 [GeForce GTX 560]
+	1205  GF114 [GeForce GTX 460 v2]
    1244  GF116 [GeForce GTX 550 Ti]
+	1245  GF116 [GeForce GTS 450]
    1247  GF106 [GeForce GT 555M]
 10df  Emulex Corporation
    1ae5  LP6000 Fibre Channel Host Adapter
@@ -7154,8 +7284,9 @@
    0885  Realtek 885 High Definition Audio
    0888  Realtek 888 High Definition Audio
    	1028 020d  Inspiron 530
-	5209  RTS5116 PCI Express Card Reader
-	5288  PCI Express Card Reader
+	5209  RTS5209 PCI Express Card Reader
+	5229  RTS5229 PCI Express Card Reader
+	5288  Barossa PCI Express Card Reader
    8029  RTL-8029(AS)
    	10b8 2011  EZ-Card (SMC1208)
    	10ec 8029  RTL-8029(AS)
@@ -7167,6 +7298,7 @@
    	10ec 8129  RT8129 Fast Ethernet Adapter
    	11ec 8129  RT8129 Fast Ethernet Adapter
    8136  RTL8101E/RTL8102E PCI Express Fast Ethernet controller
+		103c 2ab1  Pavillion p6774
    	103c 30cc  Pavilion dv6700
    	1179 ff64  RTL8102E PCI-E Fast Ethernet NIC
    8138  RT8139 (B/C) Cardbus Fast Ethernet Adapter
@@ -7240,7 +7372,7 @@
    	1462 7522  X58 Pro-E
    	1775 11cc  CC11/CL11
    	1849 8168  Motherboard (one of many)
-		8086 d615  DeskTop Board D510MO
+		8086 d615  Desktop Board D510MO
    8169  RTL-8169 Gigabit Ethernet
    	1025 0079  Aspire 5024WLMi
    	10bd 3202  EP-320G-TX1 32-bit PCI Gigabit Ethernet Adapter
@@ -7268,6 +7400,7 @@
    	1385 4700  MA521 802.11b Wireless PC Card
    	1737 0019  WPC11v4 802.11b Wireless-B Notebook Adapter
    8185  RTL-8185 IEEE 802.11a/b/g Wireless LAN Controller
+	8190  RTL8190 802.11n Wireless LAN
    8191  RTL8188CE 802.11b/g/n WiFi Adapter
    8192  RTL8192E/RTL8192SE Wireless LAN Controller
    8197  SmartLAN56 56K Modem
@@ -7278,12 +7411,14 @@
 10ee  Xilinx Corporation
    0001  EUROCOM for PCI (ECOMP)
    0002  Octal E1/T1 for PCI ETP Card
-	0007  Zomojo Z1
+	0007  Default PCIe endpoint ID
    0205  Wildcard TE205P
    0210  Wildcard TE210P
+	0300  Spartan 3 Designs (Xilinx IP)
    0314  Wildcard TE405P/TE410P (1st Gen)
    0405  Wildcard TE405P (2nd Gen)
    0410  Wildcard TE410P (2nd Gen)
+	0600  Xilinx 6 Designs (Xilinx IP)
    2b00  Zomojo Zcard
    3fc0  RME Digi96
    3fc1  RME Digi96/8
@@ -7367,6 +7502,7 @@
    	1102 1009  SB Audigy2 OEM HP
    	1102 2002  SB Audigy 2 ZS (SB0350)
    	1102 4001  E-MU 1010
+		1102 4002  E-MU 0404
    0005  SB X-Fi
    	1102 0021  X-Fi Platinum
    	1102 002c  X-Fi XtremeGamer FATAL1TY PRO
@@ -7441,6 +7577,13 @@
    2340  RocketRAID 2340 16 Port SATA-II Controller
    2640  RocketRAID 2640 SAS/SATA Controller
    2722  RocketRAID 2722
+# SFF-8087 Mini-SAS 16 port internal
+	2740  RocketRAID 2740
+# SFF-8088 Mini-SAS 16 port external
+	2744  RocketRaid 2744
+# SFF-8088 8 port external / SFF-8087 24 port internal
+	2782  RocketRAID 2782
+	3120  RocketRAID 3120
    3220  RocketRAID 3220
    3320  RocketRAID 3320
 1104  RasterOps Corp.
@@ -7811,7 +7954,7 @@
    	1849 3227  K7VT4 motherboard
    3230  K8M890CE/K8N890CE [Chrome 9]
    3238  K8T890 Host Bridge
-	3249  VT6421 IDE RAID Controller
+	3249  VT6421 IDE/SATA Controller
    324a  CX700/VX700 PCI to PCI Bridge
    324b  CX700/VX700 Host Bridge
    324e  CX700/VX700 Internal Module Bus
@@ -7831,7 +7974,7 @@
    3337  VT8237A PCI to ISA Bridge
    3340  PT900 Host Bridge
    3343  P4M890 [S3 UniChrome Pro]
-	3344  CN700/P4M800 Pro/P4M800 CE/VN800 [S3 UniChrome Pro]
+	3344  CN700/P4M800 Pro/P4M800 CE/VN800 Graphics [S3 UniChrome Pro]
    3349  VT8251 AHCI/SATA 4-Port Controller
    3351  VT3351 Host Bridge
    3353  VX800 PCI to PCI Bridge
@@ -7889,6 +8032,7 @@
    6353  VX800/VX820 Scratch Registers
    6364  CN896/VN896/P4M900 Security Device
    6409  VX855/VX875 Scratch Registers
+	7122  VX900 Graphics [Chrome9 HD]
    7204  K8M800 Host Bridge
    7205  KM400/KN400/P4M800 [S3 UniChrome]
    	1458 d000  Gigabyte GA-7VM400(A)M(F) Motherboard
@@ -9077,8 +9221,9 @@
    e230  Memory Stick Host Controller
    e822  MMC/SD Host Controller
    	1028 040b  Latitude E6510
-	e832  FireWire Host Controller
+	e832  R5C832 PCIe IEEE 1394 Controller
    	1028 040b  Latitude E6510
+	e852  PCIe xD-Picture Card Controller
 1181  Telmatics International
 1183  Fujikura Ltd
 1184  Forks Inc
@@ -9378,6 +9523,7 @@
    4368  88EC034 Ethernet Controller
    4369  88EC042 Ethernet Controller
    436a  88E8058 PCI-E Gigabit Ethernet Controller
+		11ab 00ba  Imac 8,1 Wired Ethernet Adapter
    436b  88E8071 PCI-E Gigabit Ethernet Controller
    436c  88E8072 PCI-E Gigabit Ethernet Controller
    436d  88E8055 PCI-E Gigabit Ethernet Controller
@@ -9472,8 +9618,8 @@
 11be  International Microcircuits Inc
 11bf  Astrodesign, Inc.
 11c0  Hewlett Packard
-# Nee Lucent Microelectronics
-11c1  Agere Systems
+# nee Agere Systems nee Lucent Microelectronics
+11c1  LSI Corporation
    0440  56k WinModem
    	1033 8015  LT WinModem 56k Data+Fax+Voice+Dsvd
    	1033 8047  LT WinModem 56k Data+Fax+Voice+Dsvd
@@ -9820,6 +9966,7 @@
 1217  O2 Micro, Inc.
    00f7  Firewire (IEEE 1394)
    	1179 ff50  Satellite P305D-S8995E
+	10f7  1394 OHCI Compliant Host Controller
    11f7  OZ600 1394a-2000 Controller
    13f7  1394 OHCI Compliant Host Controller
    6729  OZ6729
@@ -9857,6 +10004,8 @@
    	103c 0890  NC6000 laptop
    	10cf 11c4  Lifebook P5020D Laptop
    7233  OZ711MP3/MS3 4-in-1 MemoryCardBus Controller
+	8120  Integrated MMC/SD Controller
+	8130  Integrated MS/MSPRO/xD Controller
    8321  Integrated MMC/SD controller
    8331  O2 Flash Memory Card
 1218  Hybricon Corp.
@@ -9908,7 +10057,7 @@
    0057  Voodoo 3/3000 [Avenger]
 121b  Advanced Telecommunications Modules
 121c  Nippon Texaco., Ltd
-121d  Lippert Automationstechnik GmbH
+121d  LiPPERT ADLINK Technology GmbH
 121e  CSPI
    0201  Myrinet 2000 Scalable Cluster Interconnect
 121f  Arcus Technology, Inc.
@@ -9965,8 +10114,6 @@
    0d13  Desktop PCI L1/L3 Telephony
 1232  GPT Limited
 1233  Bus-Tech, Inc.
-# Also Bochs uses this for virtual VGA...
-1234  Technical Corp.
 1235  Risq Modular Systems, Inc.
 1236  Sigma Designs Corporation
    0000  RealMagic64/GX
@@ -10070,7 +10217,7 @@
    1968  ES1968 Maestro 2
    	1028 0085  ES1968 Maestro-2 PCI
    	1033 8051  ES1968 Maestro-2 Audiodrive
-	1969  ES1969 Solo-1 Audiodrive
+	1969  ES1938/ES1946/ES1969 Solo-1 Audiodrive
    	1014 0166  ES1969 SOLO-1 AudioDrive on IBM Aptiva Mainboard
    	125d 8888  Solo-1 Audio Adapter
    	153b 111b  Terratec 128i PCI
@@ -10409,8 +10556,7 @@
    8152  IT8152F/G Advanced RISC-to-PCI Companion Chip
    8211  ITE 8211F Single Channel UDMA 133
    	1043 8138  P5GD1-VW Mainboard
-# PCI version seems to be IT8212, embedded seems to be ITE8212
-	8212  IT/ITE8212 Dual channel ATA RAID controller
+	8212  IT8212 Dual channel ATA RAID controller
    	1283 0001  IT/ITE8212 Dual channel ATA RAID controller
    8213  IT8213 IDE Controller
    8330  IT8330G
@@ -11706,6 +11852,8 @@
    4008  T420-CX Unified Wire Ethernet Controller
    4009  T420-BT Unified Wire Ethernet Controller
    400a  T404-BT Unified Wire Ethernet Controller
+	400d  T480 Unified Wire Ethernet Controller
+	400e  T440-LP-CR Unified Wire Ethernet Controller
    4401  T420-CR Unified Wire Ethernet Controller
    4402  T422-CR Unified Wire Ethernet Controller
    4403  T440-CR Unified Wire Ethernet Controller
@@ -11716,6 +11864,8 @@
    4408  T420-CX Unified Wire Ethernet Controller
    4409  T420-BT Unified Wire Ethernet Controller
    440a  T404-BT Unified Wire Ethernet Controller
+	440d  T480 Unified Wire Ethernet Controller
+	440e  T440-LP-CR Unified Wire Ethernet Controller
    4501  T420-CR Unified Wire Storage Controller
    4502  T422-CR Unified Wire Storage Controller
    4503  T440-CR Unified Wire Storage Controller
@@ -11726,6 +11876,8 @@
    4508  T420-CX Unified Wire Storage Controller
    4509  T420-BT Unified Wire Storage Controller
    450a  T404-BT Unified Wire Storage Controller
+	450d  T480 Unified Wire Storage Controller
+	450e  T440-LP-CR Unified Wire Storage Controller
    4601  T420-CR Unified Wire Storage Controller
    4602  T422-CR Unified Wire Storage Controller
    4603  T440-CR Unified Wire Storage Controller
@@ -11736,6 +11888,8 @@
    4608  T420-CX Unified Wire Storage Controller
    4609  T420-BT Unified Wire Storage Controller
    460a  T404-BT Unified Wire Storage Controller
+	460d  T480 Unified Wire Storage Controller
+	460e  T440-LP-CR Unified Wire Storage Controller
    4701  T420-CR Unified Wire Ethernet Controller
    4702  T422-CR Unified Wire Ethernet Controller
    4703  T440-CR Unified Wire Ethernet Controller
@@ -11746,6 +11900,8 @@
    4708  T420-CX Unified Wire Ethernet Controller
    4709  T420-BT Unified Wire Ethernet Controller
    470a  T404-BT Unified Wire Ethernet Controller
+	470d  T480 Unified Wire Ethernet Controller
+	470e  T440-LP-CR Unified Wire Ethernet Controller
    4801  T420-CR Unified Wire Ethernet Controller
    4802  T422-CR Unified Wire Ethernet Controller
    4803  T440-CR Unified Wire Ethernet Controller
@@ -11756,6 +11912,8 @@
    4808  T420-CX Unified Wire Ethernet Controller
    4809  T420-BT Unified Wire Ethernet Controller
    480a  T404-BT Unified Wire Ethernet Controller
+	480d  T480 Unified Wire Ethernet Controller
+	480e  T440-LP-CR Unified Wire Ethernet Controller
    a000  PE10K Unified Wire Ethernet Controller
 1426  Storage Technology Corp.
 1427  Better On-Line Solutions
@@ -12121,6 +12279,7 @@
    163b  NetXtreme II BCM5716 Gigabit Ethernet
    	1028 028c  PowerEdge R410 BCM5716 Gigabit Ethernet
    	1028 028d  PowerEdge T410 BCM5716 Gigabit Ethernet
+		1028 02f1  PowerEdge R510 BCM5716 Gigabit Ethernet
    163c  NetXtreme II BCM5716S Gigabit Ethernet
    1644  NetXtreme BCM5700 Gigabit Ethernet
    	1014 0277  Broadcom Vigil B5700 1000Base-T
@@ -12296,15 +12455,23 @@
    	103c 280a  DC5750 Microtower
    167d  NetXtreme BCM5751M Gigabit Ethernet PCI Express
    	1014 0577  ThinkPad Z60t
+		103c 0934  HP nx8220
    	103c 0940  HP Compaq nw8240 Mobile Workstation
    	17aa 2081  ThinkPad R60e
    167e  NetXtreme BCM5751F Fast Ethernet PCI Express
    167f  NetLink BCM5787F Fast Ethernet PCI Express
    1680  NetXtreme BCM5761e Gigabit Ethernet PCIe
    1681  NetXtreme BCM5761 Gigabit Ethernet PCIe
+	1682  NetXtreme BCM57762 Gigabit Ethernet PCIe
    1684  NetXtreme BCM5764M Gigabit Ethernet PCIe
    1685  NetXtreme II BCM57500S Gigabit Ethernet
-	168a  NetXtreme II BCM57800 10 Gigabit Ethernet
+	1686  NetXtreme BCM57766 Gigabit Ethernet PCIe
+# The Broadcom 57800 device has two 1Gig ports and two 10Gig ports. The subsystem information can be used to differentiate.
+	168a  NetXtreme II BCM57800 1/10 Gigabit Ethernet
+		1028 1f5c  BCM57800 10-Gigabit Ethernet
+		1028 1f5d  BCM57800 10-Gigabit Ethernet
+		1028 1f67  BCM57800 1-Gigabit Ethernet
+		1028 1f68  BCM57800 1-Gigabit Ethernet
    168d  NetXtreme II BCM57840 10/20 Gigabit Ethernet
    168e  NetXtreme II BCM57810 10 Gigabit Ethernet
    1690  NetXtreme BCM57760 Gigabit Ethernet PCIe
@@ -12330,7 +12497,12 @@
    	1462 590c  KT6 Delta-FIS2R (MS-6590)
    169d  NetLink BCM5789 Gigabit Ethernet PCI Express
    16a0  NetLink BCM5785 Fast Ethernet
-	16a5  NetXtreme II BCM57800 10 Gigabit Ethernet Multi Function
+# The Broadcom 57800 device has two 1Gig ports and two 10Gig ports. The subsystem information can be used to differentiate.
+	16a5  NetXtreme II BCM57800 1/10 Gigabit Ethernet Multi Function
+		1028 1f5c  NetXtreme II BCM57800 10-Gigabit Ethernet Multi Function
+		1028 1f5d  NetXtreme II BCM57800 10-Gigabit Ethernet Multi Function
+		1028 1f67  NetXtreme II BCM57800 1-Gigabit Ethernet Multi Function
+		1028 1f68  NetXtreme II BCM57800 1-Gigabit Ethernet Multi Function
    16a6  NetXtreme BCM5702X Gigabit Ethernet
    	0e11 00bb  NC7760 Gigabit Server Adapter (PCI-X, 10/100/1000-T)
    	1028 0126  BCM5702 1000Base-T
@@ -12349,7 +12521,12 @@
    	10a9 8014  Dual Port Gigabit Ethernet (PCI-X,Fiber)
    	10a9 801c  Quad Port Gigabit Ethernet (PCI-E,Fiber)
    	10b7 2001  3C998-SX Dual Port 1000-SX PCI-X
-	16a9  NetXtreme II BCM57800 10 Gigabit Ethernet Virtual Function
+# The Broadcom 57800 device has two 1Gig ports and two 10Gig ports. The subsystem information can be used to differentiate.
+	16a9  NetXtreme II BCM57800 1/10 Gigabit Ethernet Virtual Function
+		1028 1f5c  NetXtreme II BCM57800 10-Gigabit Ethernet Virtual Function
+		1028 1f5d  NetXtreme II BCM57800 10-Gigabit Ethernet Virtual Function
+		1028 1f67  NetXtreme II BCM57800 1-Gigabit Ethernet Virtual Function
+		1028 1f68  NetXtreme II BCM57800 1-Gigabit Ethernet Virtual Function
    16aa  NetXtreme II BCM5706S Gigabit Ethernet
    	103c 3102  NC370F MultifuNCtion Gigabit Server Adapter
    	103c 310c  NC370i Multifunction Gigabit Server Adapter
@@ -12368,9 +12545,11 @@
    16b0  NetXtreme BCM57761 Gigabit Ethernet PCIe
    16b1  NetLink BCM57781 Gigabit Ethernet PCIe
    16b2  NetLink BCM57791 Gigabit Ethernet PCIe
+	16b3  NetXtreme BCM57786 Gigabit Ethernet PCIe
    16b4  NetXtreme BCM57765 Gigabit Ethernet PCIe
    16b5  NetLink BCM57785 Gigabit Ethernet PCIe
    16b6  NetLink BCM57795 Gigabit Ethernet PCIe
+	16b7  NetXtreme BCM57782 Gigabit Ethernet PCIe
    16bc  NetXtreme BCM57765 Memory Card Reader
    16c6  NetXtreme BCM5702A3 Gigabit Ethernet
    	10b7 1100  3C1000B-T 10/100/1000 PCI
@@ -12503,7 +12682,8 @@
    	1154 0330  Buffalo WLI2-PCI-G54S High Speed Mode Wireless Desktop Adapter
    	144f 7050  eMachines M6805 802.11g Built-in Wireless
    	144f 7051  Sonnet Aria Extreme PCI
-		14e4 4320  Linksys WMP54G PCI
+		1737 0013  WMP54G v1 802.11g PCI Adapter
+		1737 0014  WMP54G v2 802.11g PCI Adapter
    	1737 0015  WMP54GS v1.0 802.11g Wireless-G PCI Adapter with SpeedBooster
    	1737 4320  WPC54G v1 / WPC54GS v1 802.11g Wireless-G Notebook Adapter
    	1799 7000  F5D7000 v1000 Wireless G Desktop Card
@@ -13164,7 +13344,8 @@
 158d  Point Multimedia Systems
 158e  Lara Technology Inc
 158f  Ditect Coop
-1590  3PAR Inc.
+# nee 3PAR Inc.
+1590  Hewlett-Packard Company
    0001  Eagle Cluster Manager
    0002  Osprey Cluster Manager
    0003  Harrier Cluster Manager
@@ -13520,7 +13701,7 @@
    	1186 3a1a  WNA-2330 802.11bg Wireless CardBus Adapter
    	1186 3a63  D-Link AirPremier DWL-AG660 Wireless Cardbus Adapter
    	1186 3a93  Conceptronic C54I Wireless 801.11g PCI card
-		1186 3a94  C54C Wireless 801.11g cardbus
+		1186 3a94  Conceptronic C54C 802.11g Wireless Cardbus Adapter
    	1186 3ab0  Allnet ALL0281 Wireless PCI Card
    	1385 4900  WG311v1 802.11g Wireless PCI Adapter
    	1385 4b00  WG511T 108 Mbps Wireless PC Card (rev.A/B)
@@ -13560,7 +13741,7 @@
    	185f 1012  CM9 Wireless a/b/g MiniPCI Adapter
    	185f 2012  Wistron NeWeb WLAN a+b+g model CB9
    	a727 6801  3CRXJK10075 OfficeConnect Wireless 108Mbps 11g XJACK PC Card
-	001a  AR2413/AR2414 Wireless Network Adapter [AR5002G(S) 802.11bg]
+	001a  AR2413/AR2414 Wireless Network Adapter [AR5005G(S) 802.11bg]
    	1052 168c  Sweex Wireless Lan PC Card 54Mbps
    	1113 ee20  SMC Wireless CardBus Adapter 802.11g (SMCWCB-G EU)
    	1113 ee24  SMC Wireless PCI Card WPCI-G
@@ -13648,7 +13829,7 @@
    	1186 3a7a  DWA-552 802.11n Xtreme N Desktop Adapter (rev A2)
    002a  AR928X Wireless Network Adapter (PCI-Express)
    	103c 3041  AR5BHB92-H 802.11abgn Wireless Half-size Mini PCIe Card [AR9280]
-		105b e006  T77H053.00 802.11bgn (1x2:2) Wireless Mini PCIe Card [AR9281]
+		105b e006  T77H053.00 802.11bgn Wireless Mini PCIe Card [AR9281]
    	105b e01f  T77H047.31 802.11bgn Wireless Half-size Mini PCIe Card [AR9283]
    	11ad 6600  WN6600A 802.11bgn Wireless Mini PCIe Card [AR9281]
    	144f 7141  WLL6080 802.11bgn Wireless Mini PCIe Card [AR9281]
@@ -13670,7 +13851,7 @@
    	1b9a 0401  XW204E 802.11bgn Wireless Half-size Mini PCIe Card
    	1b9a 0c03  WB214E 802.11bgn Wireless Half-size Mini PCIe Card [AR9002WB-1NGCD]
    002c  AR2427 802.11bg Wireless Network Adapter (PCI-Express)
-	002d  AR9287 Wireless Network Adapter
+	002d  AR9227 Wireless Network Adapter
    002e  AR9287 Wireless Network Adapter (PCI-Express)
    0030  AR9300 Wireless LAN adaptor
    	103c 1627  HB112AGN 802.11abgn 3x3 Wi-Fi Adapter
@@ -13678,6 +13859,7 @@
    	1a56 2001  Killer Wireless-N 1103 Half-size Mini PCIe Card [AR9380]
    0032  AR9485 Wireless Network Adapter
    0033  AR9580 Wireless Network Adapter
+	0034  AR9462 Wireless Network Adapter
    0207  AR5210 Wireless Network Adapter [AR5000 802.11a]
    1014  AR5212 802.11abg NIC
    	1014 058a  ThinkPad 11a/b/g Wireless LAN Mini Express Adapter (AR5BXB6)
@@ -13760,6 +13942,7 @@
    5702  PMC-SLX150-1M: Reconfigurable Spartan-6 FPGA with plug-in I/O
    5801  XMC-VLX85 Reconfigurable Virtex-5 FPGA with plug-in I/O
    5802  XMC-VLX110 Reconfigurable Virtex-5 FPGA with plug-in I/O
+	5803  XMC-VSX95 Reconfigurable Virtex-5 FPGA with plug-in I/O
    5804  XMC-VLX155 Reconfigurable Virtex-5 FPGA with plug-in I/O
    5807  XMC-SLX150: Reconfigurable Spartan-6 FPGA with plug-in I/O
    5808  XMC-SLX150-1M: Reconfigurable Spartan-6 FPGA with plug-in I/O
@@ -13803,7 +13986,6 @@
    1098  Amilo L 1310G
 1735  Aten International Co. Ltd.
 1737  Linksys
-	0013  WMP54G Wireless Pci Card
    0029  WPG54G ver. 4 PCI Card
    1032  Gigabit Network Adapter
    	1737 0015  EG1032 v2 Instant Gigabit Network Adapter
@@ -13911,6 +14093,7 @@
 17cb  Airgo Networks Inc
    0001  AGN100 802.11 a/b/g True MIMO Wireless Card
    	1385 5c00  WGM511 Pre-N 802.11g Wireless CardBus Adapter
+		1737 0045  WMP54GX v1 802.11g Wireless-G PCI Adapter with SRX
    0002  AGN300 802.11 a/b/g True MIMO Wireless Card
    	1385 6d00  WPNT511 RangeMax 240 Mbps Wireless CardBus Adapter
    	1737 0054  WPC54GX4 v1 802.11g Wireless-G Notebook Adapter with SRX400
@@ -13989,6 +14172,7 @@
    6061  R6061 USB 2.0 Controller
 17f7  Topdek Semiconductor Inc.
 17f9  Gemtek Technology Co., Ltd
+17fc  IOGEAR, Inc.
 17fe  InProComm Inc.
    2120  IPN 2120 802.11b
    	1737 0020  WMP11 v4 802.11b Wireless-B PCI Adapter
@@ -14012,6 +14196,7 @@
    0200  RT2500 802.11g PCI [PC54G2]
    0201  RT2500 Wireless 802.11bg
    	1043 130f  WL-130g
+		1186 3c00  DWL-G650X Wireless 11g CardBus Adapter
    	1371 001e  CWC-854 Wireless-G CardBus Adapter
    	1371 001f  CWM-854 Wireless-G Mini PCI Adapter
    	1371 0020  CWP-854 Wireless-G PCI Adapter
@@ -14019,11 +14204,13 @@
    	1458 e931  GN-WIKG 802.11b/g mini-PCI Adapter
    	1462 6833  Unknown 802.11g mini-PCI Adapter
    	1462 6835  Wireless 11G CardBus CB54G2
-		1737 0032  WMP54G 2.0 PCI Adapter
+		1737 0032  WMP54G v4.0 PCI Adapter
    	1799 700a  F5D7000 v2000/v3000 Wireless G Desktop Card
    	1799 701a  F5D7010 v2000/v3000 Wireless G Notebook Card
    	1814 2560  RT2500 Wireless 802.11bg
+		182d 9073  WL-115 Wireless Network PCI Adapter
    	185f 22a0  CN-WF513 Wireless Cardbus Adapter
+		18eb 5312  Tornado 122 IEEE 802.11g PCI Card-EU
    	1948 3c00  C54RC v1 Wireless 11g CardBus Adapter
    	1948 3c01  C54Ri v1 Wireless 11g PCI Adapter
    0300  Wireless Adapter Canyon CN-WF511
@@ -14033,7 +14220,7 @@
    	13d1 abe3  miniPCI Pluscom 802.11 a/b/g
    	1458 e933  GN-WI01GS
    	1458 e934  GN-WP01GS
-		1737 0055  WMP54G ver 4.1
+		1737 0055  WMP54G v4.1
    	1799 700e  F5D7000 v6000 Wireless G Desktop Card
    	1799 701e  F5D7010 v6000 Wireless G Notebook Card
    	17f9 0012  AWLC3026T 802.11g Wireless CardBus Adapter
@@ -14052,17 +14239,19 @@
    0601  RT2800 802.11n PCI
    	1799 801c  F5D8011 v3 802.11n N1 Wireless Notebook Card
    	187e 3412  NWD-310N 802.11n Wireless PCI Adapter
-	0681  RT2860 Wireless 802.11n PCIe
+	0681  RT2890 Wireless 802.11n PCIe
    	1458 e939  GN-WS30N-RH 802.11bgn Mini PCIe Card
    0701  RT2760 Wireless 802.11n 1T/2R
    	1737 0074  WMP110 v2 802.11n RangePlus Wireless PCI Adapter
    0781  RT2790 Wireless 802.11n 1T/2R PCIe
    3060  RT3060 Wireless 802.11n 1T/1R
    	1186 3c04  DWA-525 Wireless N 150 Desktop Adapter (rev.A1)
+	3062  RT3062 Wireless 802.11n 2T/2R
    3090  RT3090 Wireless 802.11n 1T/1R PCIe
    	13bd 1057  GN-WS32L-RH Half-size Mini PCIe Card
    3091  RT3091 Wireless 802.11n 1T/2R PCIe
    3092  RT3092 Wireless 802.11n 2T/2R PCIe
+	5360  RT5360
    5390  RT5390 Wireless 802.11n 1T/1R PCIe
    	103c 1636  U98Z077.00 Half-size Mini PCIe Card
    539f  RT5390 [802.11 b/g/n 1T1R G-band PCI Express Single Chip]
@@ -14167,7 +14356,8 @@
    0027  Z11/Z11M
    0040  Volari V3XT/V5/V8
    0047  Volari 8300 (chip: XP10, codename: XG47)
-18d2  Sitecom
+# should be 182d
+18d2  Sitecom Europe BV (Wrong ID)
 # Sitecom HFC-S based ISDN controller card DC-105v2
    3069  DC-105v2 ISDN controller
 18d8  Dialogue Technology Corp.
@@ -14228,6 +14418,7 @@
 18ee  Chenming Mold Ind. Corp.
 18f1  Spectrum GmbH
 18f4  Napatech A/S
+	0031  NT20X Network Adapter
    0051  NT20-X Capture Card
    0061  NT20E Capture Card
    0064  NT20E Inline Card
@@ -14237,6 +14428,7 @@
    0091  NT20X Capture Card [New Rev]
    00a1  NT4E-STD Capture Card
    00a4  NT4E-STD Inline Card
+	00c5  NT20E2 Network Adapter
 18f6  NextIO
    1000  [Nexsis] Switch Virtual P2P PCIe Bridge
    1050  [Nexsis] Switch Virtual P2P PCI Bridge
@@ -14315,12 +14507,21 @@
    	1924 6204  SFN5122F-R4
    	1924 6205  SFN5122F-R5
    	1924 6206  SFN5122F-R6
+		1924 6207  SFN5122F-R7
    	1924 6210  SFN5322F-R0
    	1924 6211  SFN5322F-R1
+		1924 6217  SFN5322F-R7
+		1924 6227  SFN6122F-R7
+		1924 6237  SFN6322F-R7
+		1924 6501  SFN5802K-R1
+		1924 6511  SFN5814H-R1
+		1924 6521  SFN5812H-R1
    	1924 6a05  SFN5112F-R5
    	1924 6a06  SFN5112F-R6
    	1924 7206  SFN5162F-R6
+		1924 7207  SFN5162F-R7
    	1924 7a06  SFN5152F-R6
+		1924 7a07  SFN5152F-R7
    0813  SFL9021 [Solarstorm]
    	1924 6100  SFN5121T-R0
    	1924 6102  SFN5121T-R2
@@ -14430,6 +14631,7 @@
    0111  P1022
    0118  P1013E
    0119  P1013
+	0128  P1010
    0400  P4080E
    0401  P4080
    0408  P4040E
@@ -14461,7 +14663,7 @@
 1969  Atheros Communications Inc.
    1026  AR8121/AR8113/AR8114 Gigabit or Fast Ethernet
    	1043 8304  P5KPL-CM Motherboard
-	1048  L1 Gigabit Ethernet
+	1048  Attansic L1 Gigabit Ethernet
    	1043 8226  P5KPL-VM Motherboard
    1062  AR8132 Fast Ethernet
    1063  AR8131 Gigabit Ethernet
@@ -14470,6 +14672,8 @@
    1067  L1c Gigabit Ethernet
    1073  AR8151 v1.0 Gigabit Ethernet
    1083  AR8151 v2.0 Gigabit Ethernet
+	1090  AR8162 Fast Ethernet
+	1091  AR8161 Gigabit Ethernet
    2048  L2 Fast Ethernet
    2060  AR8152 v1.1 Fast Ethernet
    2062  AR8152 v2.0 Fast Ethernet
@@ -14481,7 +14685,7 @@
 1971  AGEIA Technologies, Inc.
    1011  Physics Processing Unit [PhysX]
    	1043 0001  PhysX P1
-1974  TransferZentrum Mikroelektronik
+1974  Eberspaecher Electronics
 1976  TRENDnet
 1977  Parsec
 197b  JMicron Technology Corp.
@@ -14491,9 +14695,9 @@
    2360  JMB360 AHCI Controller
    2361  JMB361 AHCI/IDE
    	1462 7235  P965 Neo MS-7235 mainboard
-	2362  JMB362 AHCI Controller
+	2362  JMB362 SATA Controller
    	1043 8460  P8P67 Deluxe Motherboard
-	2363  JMB362/JMB363 Serial ATA Controller
+	2363  JMB363 SATA/IDE Controller
    	1043 81e4  P5B [JMB363]
    	1458 b000  GA-EP45-DS5 Motherboard
    	1849 2363  Motherboard (one of many)
@@ -14523,6 +14727,8 @@
    8001  RapidFile
 198a  Nallatech Ltd.
 1993  Innominate Security Technologies AG
+1999  A-Logics
+	a900  AM-7209 Video Processor
 199a  Pulse-LINK, Inc.
 199d  Xsigo Systems
    8209  Virtual NIC Device
@@ -14607,6 +14813,10 @@
 1a32  Quanta Microsystems, Inc
 1a3b  AzureWave
    1112  AR9285 Wireless Network Adapter (PCI-Express)
+1a41  Tilera Corp.
+	0001  TILE64 processor
+	0002  TILEPro processor
+	0200  TILE-Gx36 processor
 1a4a  SLAC National Accelerator Lab PPA-REG
    1000  MCOR Power Supply Controller
    2000  PGPCard - 4 Lane
@@ -14625,11 +14835,12 @@
 1a76  Wavesat
 1a77  Lightfleet Corporation
 1a78  Virident Systems Inc.
-	0031  Virident tachIOn Drive
-		1a78 0034  tachIOn PCIe SSD [rev 3]
-		1a78 0037  tachIOn PCIe SSD [rev 3D]
-		1a78 0038  tachIOn PCIe SSD [rev 4]
-		1a78 0039  tachIOn PCIe SSD [rev 4D]
+	0031  Virident FlashMAX Drive
+		1a78 0034  FlashMAX PCIe SSD [rev 3]
+		1a78 0037  FlashMAX PCIe SSD [rev 3D]
+		1a78 0038  FlashMAX PCIe SSD [rev 4]
+		1a78 0039  FlashMAX PCIe SSD [rev 4D]
+		1a78 0040  FlashMAX PCIe SSD [LP Z1]
 1a84  Commex Technologies
    0001  Vulcan SP HT6210 10-Gigabit Ethernet (rev 02)
 1a88  MEN Mikro Elektronik
@@ -14645,6 +14856,7 @@
 1ab6  CalDigit, Inc.
    6201  RAID Card
 1ab9  Espia Srl
+1acc  Point of View B.V
 1ad7  Spectracom Corporation
    8000  TSync-PCIe Time Code Processor
    9100  TPRO-PCI-66U Timecode Reader/Generator
@@ -14660,9 +14872,17 @@
 1aed  Fusion-io
    1003  ioDimm3 (v1.2)
    1005  ioDimm3
+		1014 03c3  High IOPS SSD PCIe Adapter
+		103c 176f  1.28TB MLC PCIe ioDrive Duo
+		103c 1770  5.2TB MLC PCIe ioDrive Octal
+		103c 178b  160GB SLC PCIe ioDrive
+		103c 178c  320GB MLC PCIe ioDrive
+		103c 178d  320GB SLC PCIe ioDrive Duo
+		103c 178e  640GB MLC PCIe ioDrive Duo
    1006  ioXtreme
    1007  ioXtreme Pro
    1008  ioXtreme-2
+	2001  ioDrive2
 1aee  Caustic Graphics Inc.
 # nee Qumranet, Inc.
 1af4  Red Hat, Inc
@@ -14681,8 +14901,10 @@
    0611  ASM1061 SATA IDE Controller
    0612  ASM1062 Serial ATA Controller
    1042  ASM1042 SuperSpeed USB Host Controller
-	1080  ASM108x PCIe to PCI Bridge Controller
+	1080  ASM1083/1085 PCIe to PCI Bridge
 1b36  Red Hat, Inc.
+1b37  Signal Processing Devices Sweden AB
+	0014  ADQ412
 1b3a  Westar Display Technologies
    7589  HRED J2000 - JPEG 2000 Video Codec Device
 1b3e  Teradata Corp.
@@ -14712,6 +14934,9 @@
    7023  EJ168 USB 3.0 Host Controller
 1b73  Fresco Logic
    1000  FL1000G USB 3.0 Host Controller
+1b85  OCZ Technology Group, Inc.
+	1041  RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller)
+1b96  Western Digital
 1b9a  XAVi Technologies Corp.
 1bad  ReFLEX CES
 1bb3  Bluecherry
@@ -14725,6 +14950,8 @@
    5308  BC-H08240A 8 port H.264 video and audio encoder / decoder
    5310  BC-H16480A 16 port H.264 video and audio encoder / decoder
 1bb5  Quantenna Communications, Inc.
+1bbf  Maxeler Technologies Ltd.
+	0003  MAX3
 1bf4  VTI Instruments Corporation
 1c1c  Symphony
    0001  82C101
@@ -14776,6 +15003,7 @@
    0001  Spectrum Analyzer PC Card (SAgE)
 1fd4  SUNIX Co., Ltd.
    0001  Matrix multiport serial adapter
+	1999  Multiport serial controller
 2000  Smart Link Ltd.
    2800  SmartPCI2800 V.92 PCI Soft DFT
 2001  Temporal Research Ltd
@@ -14832,6 +15060,8 @@
    1922  AS-i 3.0 PCI Master
 3475  Arastra Inc.
 3513  ARCOM Control Systems Ltd
+37d9  ITD Firm ltd.
+	1138  SCHD-PH-8 Phase detector
 3842  eVga.com. Corp.
 38ef  4Links
 3d3d  3DLabs
@@ -14934,7 +15164,7 @@
 4321  Tata Power Strategic Electronics Division
 434e  CAST Navigation LLC
 4444  Internext Compression Inc
-	0016  iTVC16 (CX23416) MPEG-2 Encoder
+	0016  iTVC16 (CX23416) Video Decoder
    	0070 0003  WinTV PVR 250
    	0070 0009  WinTV PVR 150
    	0070 0801  WinTV PVR 150
@@ -14990,7 +15220,7 @@
    	1461 c739  M785 AVerMedia PCI Analog TV (NTSC/PAL/SECAM+FM, Xceive 2028 tuner)
    	9005 0092  VideOh! AVC-2010
    	9005 0093  VideOh! AVC-2410
-	0803  iTVC15 MPEG-2 Encoder
+	0803  iTVC15 (CX23415) Video Decoder
    	0070 4000  WinTV PVR-350
    	0070 4001  WinTV PVR-250
    	0070 4800  WinTV PVR-350 (V1)
@@ -15259,6 +15489,8 @@
    	1092 5a55  Viper II Z200
    	1092 5a57  Viper II Z200
    ca00  SonicVibes
+53c1  SC1-ALLEGRO
+	0cd1  CD1-OPERA
 5431  AuzenTech, Inc.
 544c  Teralogic Inc
    0350  TL880-based HDTV/ATSC tuner
@@ -15456,6 +15688,12 @@
    0372  80333 Segment-B PCI Express-to-PCI Express Bridge
    0373  80333 B-Bus IOAPIC
    0374  80333 Address Translation Unit
+	0402  Haswell Integrated Graphics Controller
+	0406  Haswell Integrated Graphics Controller
+	040a  Haswell Integrated Graphics Controller
+	0412  Haswell Integrated Graphics Controller
+	0416  Haswell Integrated Graphics Controller
+	041a  Haswell Integrated Graphics Controller
    0436  DH89xxCC Gigabit SGMII Connection
    0438  DH8900CC Series Gigabit Network Connection
    043a  DH8900CC Series Gigabit Fiber Network Connection
@@ -15533,6 +15771,33 @@
    0886  Centrino Wireless-N + WiMAX 6150
    	8086 1315  Centrino Wireless-N + WiMAX 6150 BGN
    	8086 1317  Centrino Wireless-N + WiMAX 6150 BG
+	0887  Centrino Wireless-N 2230
+		8086 4062  Centrino Wireless-N 2230 BGN
+		8086 4462  Centrino Wireless-N 2230 BGN
+	0888  Centrino Wireless-N 2230
+		8086 4262  Centrino Wireless-N 2230 BGN
+	088e  Centrino Advanced-N 6235
+		8086 4060  Centrino Advanced-N 6235 AGN
+		8086 4460  Centrino Advanced-N 6235 AGN
+	088f  Centrino Advanced-N 6235
+		8086 4260  Centrino Advanced-N 6235 AGN
+	0890  Centrino Wireless-N 2200
+		8086 4022  Centrino Wireless-N 2200 BGN
+		8086 4422  Centrino Wireless-N 2200 BGN
+		8086 4822  Centrino Wireless-N 2200 BGN
+	0891  Centrino Wireless-N 2200
+		8086 4222  Centrino Wireless-N 2200 BGN
+	0892  Centrino Wireless-N 135
+		8086 0062  Centrino Wireless-N 135 BGN
+		8086 0462  Centrino Wireless-N 135 BGN
+	0893  Centrino Wireless-N 135
+		8086 0262  Centrino Wireless-N 135 BGN
+	0894  Centrino Wireless-N 105
+		8086 0022  Centrino Wireless-N 105 BGN
+		8086 0422  Centrino Wireless-N 105 BGN
+		8086 0822  Centrino Wireless-N 105 BGN
+	0895  Centrino Wireless-N 105
+		8086 0222  Centrino Wireless-N 105 BGN
    0896  Centrino Wireless-N 130
    	8086 5005  Centrino Wireless-N 130 BGN
    	8086 5007  Centrino Wireless-N 130 BG
@@ -15552,30 +15817,63 @@
    0960  80960RP (i960RP) Microprocessor/Bridge
    0962  80960RM (i960RM) Bridge
    0964  80960RP (i960RP) Microprocessor/Bridge
-	0be0  Atom Processor D2xxx Integrated Graphics Controller
-	0be1  Atom Processor D2xxx Integrated Graphics Controller
-	0be2  Atom Processor D2xxx Integrated Graphics Controller
-	0be3  Atom Processor D2xxx Integrated Graphics Controller
-	0be4  Atom Processor D2xxx Integrated Graphics Controller
-	0be5  Atom Processor D2xxx Integrated Graphics Controller
-	0be6  Atom Processor D2xxx Integrated Graphics Controller
-	0be7  Atom Processor D2xxx Integrated Graphics Controller
-	0be8  Atom Processor D2xxx Integrated Graphics Controller
-	0be9  Atom Processor D2xxx Integrated Graphics Controller
-	0bea  Atom Processor D2xxx Integrated Graphics Controller
-	0beb  Atom Processor D2xxx Integrated Graphics Controller
-	0bec  Atom Processor D2xxx Integrated Graphics Controller
-	0bed  Atom Processor D2xxx Integrated Graphics Controller
-	0bee  Atom Processor D2xxx Integrated Graphics Controller
-	0bef  Atom Processor D2xxx Integrated Graphics Controller
-	0bf0  Atom Processor D2xxx DRAM Controller
-	0bf1  Atom Processor D2xxx DRAM Controller
-	0bf2  Atom Processor D2xxx DRAM Controller
-	0bf3  Atom Processor D2xxx DRAM Controller
-	0bf4  Atom Processor D2xxx DRAM Controller
-	0bf5  Atom Processor D2xxx DRAM Controller
-	0bf6  Atom Processor D2xxx DRAM Controller
-	0bf7  Atom Processor D2xxx DRAM Controller
+	0be0  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0be1  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0be2  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0be3  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0be4  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0be5  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0be6  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0be7  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0be8  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0be9  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0bea  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0beb  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0bec  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0bed  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0bee  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0bef  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
+	0bf0  Atom Processor D2xxx/N2xxx DRAM Controller
+	0bf1  Atom Processor D2xxx/N2xxx DRAM Controller
+	0bf2  Atom Processor D2xxx/N2xxx DRAM Controller
+	0bf3  Atom Processor D2xxx/N2xxx DRAM Controller
+	0bf4  Atom Processor D2xxx/N2xxx DRAM Controller
+	0bf5  Atom Processor D2xxx/N2xxx DRAM Controller
+	0bf6  Atom Processor D2xxx/N2xxx DRAM Controller
+	0bf7  Atom Processor D2xxx/N2xxx DRAM Controller
+	0c00  Haswell DRAM Controller
+	0c01  Haswell PCI Express x16 Controller
+	0c04  Haswell DRAM Controller
+	0c05  Haswell PCI Express x8 Controller
+	0c08  Haswell DRAM Controller
+	0c09  Haswell PCI Express x4 Controller
+	0c0c  Haswell HD Audio Controller
+	0c46  Centerton PCI Express Root Port 1
+	0c47  Centerton PCI Express Root Port 2
+	0c48  Centerton PCI Express Root Port 3
+	0c49  Centerton PCI Express Root Port 4
+	0c4e  Centerton NTB Primary
+	0c54  Centerton Internal Management
+	0c59  Centerton SMBus 2.0 Controller 0
+	0c5a  Centerton SMBus 2.0 Controller 1
+	0c5f  Centerton UART
+	0c60  Centerton Integrated Legacy Bus
+	0c70  Centerton Internal Fabric
+	0c71  Centerton Internal Fabric
+	0c72  Centerton Internal Fabric
+	0c73  Centerton Internal Fabric
+	0c74  Centerton Internal Fabric
+	0c75  Centerton Internal Fabric
+	0c76  Centerton Internal Fabric
+	0c77  Centerton Internal Fabric
+	0c78  Centerton Internal Fabric
+	0c79  Centerton Internal Fabric
+	0c7a  Centerton Internal Fabric
+	0c7b  Centerton Internal Fabric
+	0c7c  Centerton Internal Fabric
+	0c7d  Centerton Internal Fabric
+	0c7e  Centerton Internal Fabric
+	0c7f  Centerton Internal Fabric
    1000  82542 Gigabit Ethernet Controller (Fiber)
    	0e11 b0df  NC6132 Gigabit Ethernet Adapter (1000-SX)
    	0e11 b0e0  NC6133 Gigabit Ethernet Adapter (1000-LX)
@@ -15881,8 +16179,8 @@
    	17aa 2001  ThinkPad T60
    	17aa 207e  ThinkPad X60s
    	8086 109a  PRO/1000 PL Network Connection
-		8086 309c  DeskTop Board D945GTP
-		8086 30a5  DeskTop Board D975XBX
+		8086 309c  Desktop Board D945GTP
+		8086 30a5  Desktop Board D975XBX
    109b  82546GB PRO/1000 GF Quad Port Server Adapter
    109e  82597EX 10GbE Ethernet Controller
    	8086 a01f  PRO/10GbE CX4 Server Adapter
@@ -15960,6 +16258,8 @@
    	8086 0001  Gigabit CT2 Desktop Adapter
    	8086 a01f  Gigabit CT Desktop Adapter
    	e4bf 50c1  PC1-GROOVE
+		e4bf 50c2  PC2-LIMBO
+	10d4  Matrox Concord GE (customized Intel 82574)
    10d5  82571PT Gigabit PT Quad Port Server ExpressModule
    10d6  82575GB Gigabit Network Connection
    	8086 10d6  Gigabit VT Quad Port Server Adapter
@@ -16010,11 +16310,14 @@
    	8086 000d  Ethernet Mezzanine Adapter X520-KX4-2
    10f8  82599EB 10 Gigabit Dual Port Backplane Connection
    	1028 1f63  10GbE 2P X520k bNDC
-		103c 1783  Ethernet 10Gb 2-port 560FLB Adapter
    	103c 17d2  Ethernet 10Gb 2-port 560M Adapter
+		103c 18d0  Ethernet 10Gb 2-port 560FLB Adapter
    	8086 000c  Ethernet X520 10GbE Dual Port KX4-KR Mezz
    10f9  82599EB 10 Gigabit CX4 Dual Port Network Connection
    10fb  82599EB 10-Gigabit SFI/SFP+ Network Connection
+		103c 17d0  Ethernet 10Gb 2-port 560FLR-SFP+ Adapter
+		103c 17d2  Ethernet 10Gb 2-port 560M Adapter
+		103c 17d3  Ethernet 10Gb 2-port 560SFP+ Adapter
    	108e 7b11  Ethernet Server Adapter X520-2
    	1734 11a9  10 Gigabit Dual Port Network Connection
    	8086 0002  Ethernet Server Adapter X520-DA2
@@ -16268,6 +16571,7 @@
    1511  82580 Gigabit SFP Connection
    1514  82599EB 10 Gigabit KX4 Network Connection
    	8086 000b  Ethernet X520 10GbE Dual Port KX4 Mezz
+	1515  X540 Ethernet Controller Virtual Function
    1516  82580 Gigabit Network Connection
    	8086 12b1  Ethernet Server Adapter I340-T2
    	8086 12b2  Ethernet Server Adapter I340-T2
@@ -16276,9 +16580,12 @@
    1518  82576NS SerDes Gigabit Network Connection
    151c  82599EB 10 Gigabit TN Network Connection
    	108e 7b13  Dual 10GBASE-T LP
+	1520  I350 Ethernet Controller Virtual Function
    1521  I350 Gigabit Network Connection
    	1028 1f60  Intel GbE 4P I350crNDC
    	1028 1f62  Intel GbE 2P I350crNDC
+		103c 337f  Ethernet 1Gb 2-port 361i Adapter
+		103c 3380  Ethernet 1Gb 4-port 366i Adapter
    	103c 339e  Ethernet 1Gb 2-port 361T Adapter [Wharton Stony Lake]
    	108e 7b16  Quad Port GbE PCIe 2.0 ExpressModule, UTP
    	108e 7b18  Quad Port GbE PCIe 2.0 Low Profile Adapter, UTP
@@ -16299,6 +16606,7 @@
    	8086 00a4  Ethernet Server Adapter I350-F2
    1523  I350 Gigabit Backplane Connection
    	103c 1784  Ethernet 1Gb 2-port 361FLB Adapter [Badger Flat]
+		103c 18d1  Ethernet 1Gb 2-port 361FLB Adapter
    	103c 339f  Ethernet 1Gb 4-port 366M Adapter [Vaca Key]
    	8086 1f52  1GbE 4P I350 Mezz
    1524  I350 Gigabit Connection
@@ -16309,17 +16617,21 @@
    1527  82580 Gigabit Fiber Network Connection
    	8086 0001  Ethernet Server Adapter I340-F4
    	8086 0002  Ethernet Server Adapter I340-F4
-	1528  Ethernet Controller 10 Gigabit X540-AT2
+	1528  Ethernet Controller 10-Gigabit X540-AT2
    	108e 7b14  Sun Dual Port 10 GbE PCIe 2.0 ExpressModule, Base-T
    	108e 7b15  Sun Dual Port 10 GbE PCIe 2.0 Low Profile Adapter, Base-T
-		8086 0001  Ethernet Server Adapter X540-T2
-		8086 0002  Ethernet Server Adapter X540-T1
-		8086 001a  Ethernet Server Adapter X540-T2
-		8086 00a2  Ethernet Server Adapter X540-T1
+		8086 0001  Ethernet Converged Network Adapter X540-T2
+		8086 0002  Ethernet Converged Network Adapter X540-T1
+		8086 001a  Ethernet Converged Network Adapter X540-T2
+		8086 00a2  Ethernet Converged Network Adapter X540-T1
    	8086 1f61  Ethernet 10G 4P X540/I350 rNDC
    	8086 5003  Ethernet 10G 2P X540-t Adapter
    1529  82599 10 Gigabit Dual Port Backplane Connection with FCoE
    152a  82599 10 Gigabit Dual port Network Connection with FCoE
+	154a  Ethernet Server Adapter X520-4
+		8086 011a  Ethernet Converged Network Adapter X520-4
+		8086 011b  Ethernet Converged Network Adapter X520-4
+		8086 011c  Ethernet Converged Network Adapter X520-4
    154d  82599EB 10-Gigabit SFP+ Network Connection
    	8086 7b11  10GbE 2P X520 Adapter
    1960  80960RP (i960RP) Microprocessor
@@ -16367,7 +16679,7 @@
    	8086 a11f  PRO/10GbE LR Server Adapter
    1c00  6 Series/C200 Series Chipset Family 4 port SATA IDE Controller
    1c01  6 Series/C200 Series Chipset Family 4 port SATA IDE Controller
-	1c02  6 Series/C200 Series Chipset Family 6 port SATA AHCI Controller
+	1c02  6 Series/C200 Series Chipset Family SATA AHCI Controller
    	1028 04aa  XPS 8300
    	1043 844d  P8P67 Deluxe Motherboard
    1c03  6 Series/C200 Series Chipset Family 6 port SATA AHCI Controller
@@ -16385,6 +16697,7 @@
    1c1c  6 Series/C200 Series Chipset Family PCI Express Root Port 7
    1c1e  6 Series/C200 Series Chipset Family PCI Express Root Port 8
    1c20  6 Series/C200 Series Chipset Family High Definition Audio Controller
+		1028 0490  Alienware M17x R3
    	1028 04aa  XPS 8300
    	1028 04b2  Vostro 3350
    	1043 8418  P8P67 Deluxe Motherboard
@@ -16448,71 +16761,70 @@
    1c5d  6 Series/C200 Series Chipset Family LPC Controller
    1c5e  6 Series/C200 Series Chipset Family LPC Controller
    1c5f  6 Series/C200 Series Chipset Family LPC Controller
-	1d00  Patsburg 4-Port SATA IDE Controller
-	1d02  Patsburg 6-Port SATA AHCI Controller
-	1d04  Patsburg SATA RAID Controller
-	1d06  Patsburg SATA Premium RAID Controller
-	1d08  Patsburg 2-Port SATA IDE Controller
-	1d10  Patsburg PCI Express Root Port 1
-	1d11  Patsburg PCI Express Root Port 1
-	1d12  Patsburg PCI Express Root Port 2
-	1d13  Patsburg PCI Express Root Port 2
-	1d14  Patsburg PCI Express Root Port 3
-	1d15  Patsburg PCI Express Root Port 3
-	1d16  Patsburg PCI Express Root Port 4
-	1d17  Patsburg PCI Express Root Port 4
-	1d18  Patsburg PCI Express Root Port 5
-	1d19  Patsburg PCI Express Root Port 5
-	1d1a  Patsburg PCI Express Root Port 6
-	1d1b  Patsburg PCI Express Root Port 6
-	1d1c  Patsburg PCI Express Root Port 7
-	1d1d  Patsburg PCI Express Root Port 7
-	1d1e  Patsburg PCI Express Root Port 8
-	1d1f  Patsburg PCI Express Root Port 8
-	1d20  Patsburg High Definition Audio Controller
-	1d22  Patsburg SMBus Host Controller
-	1d24  Patsburg Thermal Management Controller
-	1d25  Patsburg DMI to PCI Bridge
-	1d26  Patsburg USB2 Enhanced Host Controller #1
-	1d2d  Patsburg USB2 Enhanced Host Controller #2
-	1d33  Patsburg LAN Controller
-	1d35  Patsburg VECI Controller
-	1d3a  Patsburg MEI Controller #1
-	1d3b  Patsburg MEI Controller #2
-	1d3c  Patsburg IDE-r Controller
-	1d3d  Patsburg KT Controller
-	1d3e  Patsburg PCI Express Virtual Root Port
-	1d3f  Patsburg PCI Express Virtual Switch Port
-	1d40  Patsburg LPC Controller
-	1d41  Patsburg LPC Controller
-	1d50  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
-	1d54  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
-	1d55  Patsburg 4-Port SATA/SAS Storage Control Unit
-	1d58  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
-	1d59  Patsburg 4-Port SATA/SAS Storage Control Unit
-	1d5a  Patsburg Dual 4-Port SATA Storage Control Unit
-	1d5b  Patsburg 4-Port SATA Storage Control Unit
-	1d5c  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
-	1d5d  Patsburg 4-Port SATA/SAS Storage Control Unit
-	1d5e  Patsburg Dual 4-Port SATA Storage Control Unit
-	1d5f  Patsburg 4-Port SATA Storage Control Unit
-	1d60  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
-	1d64  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
-	1d65  Patsburg 4-Port SATA/SAS Storage Control Unit
-	1d68  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
-	1d69  Patsburg 4-Port SATA/SAS Storage Control Unit
-	1d6a  Patsburg Dual 4-Port SATA Storage Control Unit
-	1d6b  Patsburg 4-Port SATA Storage Control Unit
-	1d6c  Patsburg Dual 4-Port SATA/SAS Storage Control Unit
-	1d6d  Patsburg 4-Port SATA/SAS Storage Control Unit
-	1d6e  Patsburg Dual 4-Port SATA Storage Control Unit
-	1d6f  Patsburg 4-Port SATA Storage Control Unit
-	1d70  Patsburg SMBus Controller 0
-	1d71  Patsburg SMBus Controller 1
-	1d72  Patsburg SMBus Controller 2
-	1d73  Patsburg Integrated NVSRAM Controller
-	1d74  Patsburg PCI Express Upstream Port
-	1d76  Patsburg Multi-Function Glue
+	1d00  C600/X79 series chipset 4-Port SATA IDE Controller
+	1d02  C600/X79 series chipset 6-Port SATA AHCI Controller
+	1d04  C600/X79 series chipset SATA RAID Controller
+	1d06  C600/X79 series chipset SATA Premium RAID Controller
+	1d08  C600/X79 series chipset 2-Port SATA IDE Controller
+	1d10  C600/X79 series chipset PCI Express Root Port 1
+	1d11  C600/X79 series chipset PCI Express Root Port 1
+	1d12  C600/X79 series chipset PCI Express Root Port 2
+	1d13  C600/X79 series chipset PCI Express Root Port 2
+	1d14  C600/X79 series chipset PCI Express Root Port 3
+	1d15  C600/X79 series chipset PCI Express Root Port 3
+	1d16  C600/X79 series chipset PCI Express Root Port 4
+	1d17  C600/X79 series chipset PCI Express Root Port 4
+	1d18  C600/X79 series chipset PCI Express Root Port 5
+	1d19  C600/X79 series chipset PCI Express Root Port 5
+	1d1a  C600/X79 series chipset PCI Express Root Port 6
+	1d1b  C600/X79 series chipset PCI Express Root Port 6
+	1d1c  C600/X79 series chipset PCI Express Root Port 7
+	1d1d  C600/X79 series chipset PCI Express Root Port 7
+	1d1e  C600/X79 series chipset PCI Express Root Port 8
+	1d1f  C600/X79 series chipset PCI Express Root Port 8
+	1d20  C600/X79 series chipset High Definition Audio Controller
+	1d22  C600/X79 series chipset SMBus Host Controller
+	1d24  C600/X79 series chipset Thermal Management Controller
+	1d25  C600/X79 series chipset DMI to PCI Bridge
+	1d26  C600/X79 series chipset USB2 Enhanced Host Controller #1
+	1d2d  C600/X79 series chipset USB2 Enhanced Host Controller #2
+	1d33  C600/X79 series chipset LAN Controller
+	1d35  C600/X79 series chipset VECI Controller
+	1d3a  C600/X79 series chipset MEI Controller #1
+	1d3b  C600/X79 series chipset MEI Controller #2
+	1d3c  C600/X79 series chipset IDE-r Controller
+	1d3d  C600/X79 series chipset KT Controller
+	1d3e  C600/X79 series chipset PCI Express Virtual Root Port
+	1d3f  C608/C606/X79 series chipset PCI Express Virtual Switch Port
+	1d40  C600/X79 series chipset LPC Controller
+	1d41  C600/X79 series chipset LPC Controller
+	1d50  C608 chipset Dual 4-Port SATA/SAS Storage Control Unit
+	1d54  C600/X79 series chipset Dual 4-Port SATA/SAS Storage Control Unit
+	1d55  C600/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+	1d58  C606 chipset Dual 4-Port SATA/SAS Storage Control Unit
+	1d59  C604/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+	1d5a  C600/X79 series chipset Dual 4-Port SATA Storage Control Unit
+	1d5b  C602 chipset 4-Port SATA Storage Control Unit
+	1d5c  C600/X79 series chipset Dual 4-Port SATA/SAS Storage Control Unit
+	1d5d  C600/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+	1d5e  C600/X79 series chipset Dual 4-Port SATA Storage Control Unit
+	1d5f  C600/X79 series chipset 4-Port SATA Storage Control Unit
+	1d60  C608 chipset Dual 4-Port SATA/SAS Storage Control Unit
+	1d64  C600/X79 series chipset Dual 4-Port SATA/SAS Storage Control Unit
+	1d65  C600/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+	1d68  C606 chipset Dual 4-Port SATA/SAS Storage Control Unit
+	1d69  C604/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+	1d6a  C600/X79 series chipset Dual 4-Port SATA Storage Control Unit
+	1d6b  C602 chipset 4-Port SATA Storage Control Unit
+	1d6c  C600/X79 series chipset Dual 4-Port SATA/SAS Storage Control Unit
+	1d6d  C600/X79 series chipset 4-Port SATA/SAS Storage Control Unit
+	1d6e  C600/X79 series chipset Dual 4-Port SATA Storage Control Unit
+	1d6f  C600/X79 series chipset 4-Port SATA Storage Control Unit
+	1d70  C600/X79 series chipset SMBus Controller 0
+	1d71  C608/C606/X79 series chipset SMBus Controller 1
+	1d72  C608 chipset SMBus Controller 2
+	1d74  C608/C606/X79 series chipset PCI Express Upstream Port
+	1d76  C600/X79 series chipset Multi-Function Glue
    1e00  Panther Point 4 port SATA Controller [IDE mode]
    1e01  Panther Point 4 port SATA Controller [IDE mode]
    1e02  Panther Point 6 port SATA Controller [AHCI mode]
@@ -17035,7 +17347,7 @@
    	1028 0156  Precision 360
    	1028 0169  Precision 470
    	103c 12bc  d330 uT
-		1043 80a6  P4P800 Mainboard
+		1043 80a6  P4P800/P5P800 series motherboard
    	1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
    	1462 7280  865PE Neo2 (MS-6728)
    	1462 7650  Hetis 865GV-E (MS-7065)
@@ -17073,7 +17385,7 @@
    	1028 0169  Precision 470
    	103c 006a  NX9500
    	103c 12bc  d330 uT
-		1043 80f3  P4P800 Mainboard
+		1043 80f3  P4P800 series motherboard
    	1043 810f  P5P800-MX Mainboard
    	1458 a002  GA-8IPE1000/8KNXP motherboard
    	1462 0080  865PE Neo2-V (MS-6788) Mainboard
@@ -17255,7 +17567,7 @@
    258a  E7221 Integrated Graphics Controller
    2590  Mobile 915GM/PM/GMS/910GML Express Processor to DRAM Controller
    	1014 0575  ThinkPad Z60t
-		1028 0182  Dell Latidude C610
+		1028 0182  Dell Latitude C610
    	103c 0934  Compaq nw8240/nx8220
    	103c 099c  NX6110/NC6120
    	104d 81b7  Vaio VGN-S3XP
@@ -17567,6 +17879,7 @@
    	15d9 8680  X7DVL-E-O motherboard
    	8086 3476  Intel S5000PSLSATA Server Board
    2682  631xESB/632xESB SATA RAID Controller
+		103c 31fe  Adaptec Serial ATA HostRAID
    2683  631xESB/632xESB SATA RAID Controller
    2688  631xESB/632xESB/3100 Chipset UHCI USB Controller #1
    	1028 01bb  PowerEdge 1955 onboard USB
@@ -17654,10 +17967,10 @@
    	103c 30a1  NC2400
    	1775 11cc  CC11/CL11 integrated graphics (secondary)
    	17aa 201a  ThinkPad T60/R60 series
-	27ac  Mobile 945GME Express Memory Controller Hub
+	27ac  Mobile 945GSE Express Memory Controller Hub
    	1775 11cc  CC11/CL11
-	27ad  Mobile 945GME Express PCI Express Root Port
-	27ae  Mobile 945GME Express Integrated Graphics Controller
+	27ad  Mobile 945GSE Express PCI Express Root Port
+	27ae  Mobile 945GSE Express Integrated Graphics Controller
    	1775 11cc  CC11/CL11 integrated graphics (primary)
    27b0  82801GH (ICH7DH) LPC Interface Bridge
    	103c 2a3b  Pavilion A1512X
@@ -17828,6 +18141,7 @@
    	8086 1112  DeskTop Board D945GTP
    	8086 27d8  DeskTop Board D945GTP
    	8086 d618  DeskTop Board D510MO
+		8384 7680  STAC9221 HD Audio Codec
    27da  N10/ICH 7 Family SMBus Controller
    	1025 006c  9814 WKMI
    	1028 01ad  OptiPlex GX620
@@ -17897,7 +18211,7 @@
    2825  82801HR/HO/HH (ICH8R/DO/DH) 2 port SATA Controller [IDE mode]
    	1028 01da  OptiPlex 745
    	1462 7235  P965 Neo MS-7235 mainboard
-	2826  Patsburg SATA RAID Controller
+	2826  C600/X79 series chipset SATA RAID Controller
    2828  82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [IDE mode]
    	1028 01f3  Inspiron 1420
    	103c 30c0  Compaq 6710b
@@ -18081,6 +18395,7 @@
    	1028 0211  Optiplex 755
    2916  82801IR (ICH9R) LPC Interface Controller
    	1028 020d  Inspiron 530
+		8086 5044  Desktop Board DP35DP
    2917  ICH9M-E LPC Interface Controller
    	e4bf cc4d  CCM-BOOGIE
    2918  82801IB (ICH9) LPC Interface Controller
@@ -18099,6 +18414,7 @@
    	1028 0237  PowerEdge T610 SATA IDE Controller
    	1462 7360  G33/P35 Neo
    2922  82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA Controller [AHCI mode]
+		8086 5044  Desktop Board DP35DP
    2923  82801IB (ICH9) 4 port SATA Controller [AHCI mode]
    2925  82801IR/IO (ICH9R/DO) SATA Controller [RAID mode]
    	1734 10e0  System Board D2542
@@ -18122,6 +18438,7 @@
    	1028 0211  Optiplex 755
    	103c 3628  dv6-1190en
    	1462 7360  G33/P35 Neo
+		8086 5044  Desktop Board DP35DP
    	e4bf cc4d  CCM-BOOGIE
    2932  82801I (ICH9 Family) Thermal Subsystem
    	103c 3628  dv6-1190en
@@ -18138,6 +18455,7 @@
    	1028 029c  PowerEdge M710 USB UHCI Controller
    	1028 2011  Optiplex 755
    	1462 7360  G33/P35 Neo
+		8086 5044  Desktop Board DP35DP
    	e4bf cc4d  CCM-BOOGIE
    2935  82801I (ICH9 Family) USB UHCI Controller #2
    	1028 020d  Inspiron 530
@@ -18151,6 +18469,7 @@
    	1028 0287  PowerEdge M610 onboard UHCI
    	1028 029c  PowerEdge M710 USB UHCI Controller
    	1462 7360  G33/P35 Neo
+		8086 5044  Desktop Board DP35DP
    	e4bf cc4d  CCM-BOOGIE
    2936  82801I (ICH9 Family) USB UHCI Controller #3
    	1028 020d  Inspiron 530
@@ -18162,6 +18481,7 @@
    	1028 0287  PowerEdge M610 onboard UHCI
    	1028 029c  PowerEdge M710 USB UHCI Controller
    	1462 7360  G33/P35 Neo
+		8086 5044  Desktop Board DP35DP
    	e4bf cc4d  CCM-BOOGIE
    2937  82801I (ICH9 Family) USB UHCI Controller #4
    	1028 020d  Inspiron 530
@@ -18175,6 +18495,7 @@
    	1462 7360  G33/P35 Neo
    	8086 2937  Optiplex 755
    	8086 2942  828011 (ICH9 Family ) USB UHCI Controller
+		8086 5044  Desktop Board DP35DP
    	e4bf cc4d  CCM-BOOGIE
    2938  82801I (ICH9 Family) USB UHCI Controller #5
    	1028 020d  Inspiron 530
@@ -18186,12 +18507,14 @@
    	1028 029c  PowerEdge M710 USB UHCI Controller
    	1462 7360  G33/P35 Neo
    	8086 2938  Optiplex 755
+		8086 5044  Desktop Board DP35DP
    	e4bf cc4d  CCM-BOOGIE
    2939  82801I (ICH9 Family) USB UHCI Controller #6
    	1028 020d  Inspiron 530
    	1028 0210  PowerEdge T300 onboard UHCI
    	1028 0237  PowerEdge T610 USB UHCI Controller
    	1462 7360  G33/P35 Neo
+		8086 5044  Desktop Board DP35DP
    	e4bf cc4d  CCM-BOOGIE
    293a  82801I (ICH9 Family) USB2 EHCI Controller #1
    	1028 020d  Inspiron 530
@@ -18205,6 +18528,7 @@
    	1028 0287  PowerEdge M610 onboard EHCI
    	1028 029c  PowerEdge M710 USB EHCI Controller
    	1462 7360  G33/P35 Neo
+		8086 5044  Desktop Board DP35DP
    	e4bf cc4d  CCM-BOOGIE
    293c  82801I (ICH9 Family) USB2 EHCI Controller #2
    	1028 020d  Inspiron 530
@@ -18216,6 +18540,7 @@
    	1028 029c  PowerEdge M710 USB EHCI Controller
    	1462 7360  G33/P35 Neo
    	8086 293c  Optiplex 755
+		8086 5044  Desktop Board DP35DP
    	e4bf cc4d  CCM-BOOGIE
    293e  82801I (ICH9 Family) HD Audio Controller
    	1028 020d  Inspiron 530
@@ -18293,6 +18618,7 @@
    	1028 020d  Inspiron 530
    	1043 82b0  P5KPL-VM Motherboard
    	1462 7360  G33/P35 Neo
+		8086 5044  Desktop Board DP35DP
    29c1  82G33/G31/P35/P31 Express PCI Express Root Port
    	1028 020d  Inspiron 530
    29c2  82G33/G31 Express Integrated Graphics Controller
@@ -18302,6 +18628,7 @@
    	1028 020d  Inspiron 530
    	1043 82b0  P5KPL-VM Motherboard
    29c4  82G33/G31/P35/P31 Express MEI Controller
+		8086 5044  Desktop Board DP35DP
    29c5  82G33/G31/P35/P31 Express MEI Controller
    29c6  82G33/G31/P35/P31 Express PT IDER Controller
    29c7  82G33/G31/P35/P31 Express Serial KT Controller
@@ -18692,14 +19019,14 @@
    3515  6310ESB PCI Express Downstream Port E2
    3518  6311ESB/6321ESB PCI Express Downstream Port E3
    3519  6310ESB PCI Express Downstream Port E3
-	3575  82830 830 Chipset Host Bridge
+	3575  82830M/MG/MP Host Bridge
    	0e11 0030  Evo N600c
    	1014 021d  ThinkPad A/T/X Series
    	104d 80e7  VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP
-	3576  82830 830 Chipset AGP Bridge
-	3577  82830 CGC [Chipset Graphics Controller]
+	3576  82830M/MP AGP Bridge
+	3577  82830M/MG Integrated Graphics Controller
    	1014 0513  ThinkPad A/T/X Series
-	3578  82830 830 Chipset Host Bridge
+	3578  82830M/MG/MP Host Bridge
    3580  82852/82855 GM/GME/PM/GMV Processor to I/O Controller
    	1014 055c  ThinkPad R50e
    	1028 0139  Latitude D400
@@ -19053,85 +19380,81 @@
    3b66  5 Series/3400 Series Chipset PT IDER Controller
    3b67  5 Series/3400 Series Chipset KT Controller
    	e4bf 50c1  PC1-GROOVE
-	3c00  Sandy Bridge DMI2
-	3c01  Sandy Bridge DMI2 in PCI Express Mode
-	3c02  Sandy Bridge IIO PCI Express Root Port 1a
-	3c03  Sandy Bridge IIO PCI Express Root Port 1b
-	3c04  Sandy Bridge IIO PCI Express Root Port 2a
-	3c05  Sandy Bridge IIO PCI Express Root Port 2b
-	3c06  Sandy Bridge IIO PCI Express Root Port 2c
-	3c07  Sandy Bridge IIO PCI Express Root Port 2d
-	3c08  Sandy Bridge IIO PCI Express Root Port 3a in PCI Express Mode
-	3c09  Sandy Bridge IIO PCI Express Root Port 3b
-	3c0a  Sandy Bridge IIO PCI Express Root Port 3c
-	3c0b  Sandy Bridge IIO PCI Express Root Port 3d
-	3c0d  Sandy Bridge Non-Transparent Bridge
-	3c0e  Sandy Bridge Non-Transparent Bridge
-	3c0f  Sandy Bridge Non-Transparent Bridge
-	3c20  Sandy Bridge DMA Channel 0
-	3c21  Sandy Bridge DMA Channel 1
-	3c22  Sandy Bridge DMA Channel 2
-	3c23  Sandy Bridge DMA Channel 3
-	3c24  Sandy Bridge DMA Channel 4
-	3c25  Sandy Bridge DMA Channel 5
-	3c26  Sandy Bridge DMA Channel 6
-	3c27  Sandy Bridge DMA Channel 7
-	3c28  Sandy Bridge Address Map, VTd_Misc, System Management
-	3c2a  Sandy Bridge Control Status and Global Errors
-	3c2c  Sandy Bridge I/O APIC
-	3c2e  Sandy Bridge DMA
-	3c2f  Sandy Bridge DMA
-	3c40  Sandy Bridge IIO Switch and IRP Performance Monitor
-	3c41  Sandy Bridge QPI Port 0 Performance Monitor
-	3c42  Sandy Bridge QPI Port 1 Performance Monitor
-	3c43  Sandy Bridge Ring to PCI Express Performance Monitor
-	3c44  Sandy Bridge Ring to QuickPath Interconnect Link 0 Performance Monitor
-	3c45  Sandy Bridge Ring to QuickPath Interconnect Link 1 Performance Monitor
-	3c46  Sandy Bridge Processor Home Agent Performance Monitoring
-	3c71  Sandy Bridge Integrated Memory Controller RAS Registers
-	3c80  Sandy Bridge QPI Link 0
-	3c83  Sandy Bridge QPI Link Reut 0
-	3c84  Sandy Bridge QPI Link Reut 0
-	3c86  Sandy Bridge QPI Port 0 DFX Link
-	3c90  Sandy Bridge QPI Link 1
-	3c93  Sandy Bridge QPI Link Reut 1
-	3c94  Sandy Bridge QPI Link Reut 1
-	3c96  Sandy Bridge QPI Port 1 DFX Link
-	3ca0  Sandy Bridge Processor Home Agent
-	3ca8  Sandy Bridge Integrated Memory Controller Registers
-	3caa  Sandy Bridge Integrated Memory Controller Target Address Decoder 0
-	3cab  Sandy Bridge Integrated Memory Controller Target Address Decoder 1
-	3cac  Sandy Bridge Integrated Memory Controller Target Address Decoder 2
-	3cad  Sandy Bridge Integrated Memory Controller Target Address Decoder 3
-	3cae  Sandy Bridge Integrated Memory Controller Target Address Decoder 4
-	3cb0  Sandy Bridge Integrated Memory Controller Channel 0-3 Thermal Control 0
-	3cb1  Sandy Bridge Integrated Memory Controller Channel 0-3 Thermal Control 1
-	3cb2  Sandy Bridge Integrated Memory Controller ERROR Registers 0
-	3cb3  Sandy Bridge Integrated Memory Controller ERROR Registers 1
-	3cb4  Sandy Bridge Integrated Memory Controller Channel 0-3 Thermal Control 2
-	3cb5  Sandy Bridge Integrated Memory Controller Channel 0-3 Thermal Control 3
-	3cb6  Sandy Bridge Integrated Memory Controller ERROR Registers 2
-	3cb7  Sandy Bridge Integrated Memory Controller ERROR Registers 3
-	3cb8  Sandy Bridge DDRIO
-	3cc0  Sandy Bridge Power Control Unit 0
-	3cc1  Sandy Bridge Power Control Unit 1
-	3cc2  Sandy Bridge Power Control Unit 2
-	3cd0  Sandy Bridge Power Control Unit 3
-	3ce0  Sandy Bridge Interrupt Control Registers
-	3ce3  Sandy Bridge Semaphore and Scratchpad Configuration Registers
-	3ce4  Sandy Bridge R2PCIe
-	3ce6  Sandy Bridge QuickPath Interconnect Agent Ring Registers
-	3ce8  Sandy Bridge Unicast Register 0
-	3ce9  Sandy Bridge Unicast Register 5
-	3cea  Sandy Bridge Unicast Register 1
-	3ceb  Sandy Bridge Unicast Register 6
-	3cec  Sandy Bridge Unicast Register 3
-	3ced  Sandy Bridge Unicast Register 7
-	3cee  Sandy Bridge Unicast Register 4
-	3cef  Sandy Bridge Unicast Register 8
-	3cf4  Sandy Bridge Integrated Memory Controller System Address Decoder 0
-	3cf5  Sandy Bridge Integrated Memory Controller System Address Decoder 1
-	3cf6  Sandy Bridge System Address Decoder
+	3c00  Xeon E5/Core i7 DMI2
+	3c01  Xeon E5/Core i7 DMI2 in PCI Express Mode
+	3c02  Xeon E5/Core i7 IIO PCI Express Root Port 1a
+	3c03  Xeon E5/Core i7 IIO PCI Express Root Port 1b
+	3c04  Xeon E5/Core i7 IIO PCI Express Root Port 2a
+	3c05  Xeon E5/Core i7 IIO PCI Express Root Port 2b
+	3c06  Xeon E5/Core i7 IIO PCI Express Root Port 2c
+	3c07  Xeon E5/Core i7 IIO PCI Express Root Port 2d
+	3c08  Xeon E5/Core i7 IIO PCI Express Root Port 3a in PCI Express Mode
+	3c09  Xeon E5/Core i7 IIO PCI Express Root Port 3b
+	3c0a  Xeon E5/Core i7 IIO PCI Express Root Port 3c
+	3c0b  Xeon E5/Core i7 IIO PCI Express Root Port 3d
+	3c0d  Xeon E5/Core i7 Non-Transparent Bridge
+	3c0e  Xeon E5/Core i7 Non-Transparent Bridge
+	3c0f  Xeon E5/Core i7 Non-Transparent Bridge
+	3c20  Xeon E5/Core i7 DMA Channel 0
+	3c21  Xeon E5/Core i7 DMA Channel 1
+	3c22  Xeon E5/Core i7 DMA Channel 2
+	3c23  Xeon E5/Core i7 DMA Channel 3
+	3c24  Xeon E5/Core i7 DMA Channel 4
+	3c25  Xeon E5/Core i7 DMA Channel 5
+	3c26  Xeon E5/Core i7 DMA Channel 6
+	3c27  Xeon E5/Core i7 DMA Channel 7
+	3c28  Xeon E5/Core i7 Address Map, VTd_Misc, System Management
+	3c2a  Xeon E5/Core i7 Control Status and Global Errors
+	3c2c  Xeon E5/Core i7 I/O APIC
+	3c2e  Xeon E5/Core i7 DMA
+	3c2f  Xeon E5/Core i7 DMA
+	3c40  Xeon E5/Core i7 IIO Switch and IRP Performance Monitor
+	3c43  Xeon E5/Core i7 Ring to PCI Express Performance Monitor
+	3c44  Xeon E5/Core i7 Ring to QuickPath Interconnect Link 0 Performance Monitor
+	3c45  Xeon E5/Core i7 Ring to QuickPath Interconnect Link 1 Performance Monitor
+	3c46  Xeon E5/Core i7 Processor Home Agent Performance Monitoring
+	3c71  Xeon E5/Core i7 Integrated Memory Controller RAS Registers
+	3c80  Xeon E5/Core i7 QPI Link 0
+	3c83  Xeon E5/Core i7 QPI Link Reut 0
+	3c84  Xeon E5/Core i7 QPI Link Reut 0
+	3c90  Xeon E5/Core i7 QPI Link 1
+	3c93  Xeon E5/Core i7 QPI Link Reut 1
+	3c94  Xeon E5/Core i7 QPI Link Reut 1
+	3ca0  Xeon E5/Core i7 Processor Home Agent
+	3ca8  Xeon E5/Core i7 Integrated Memory Controller Registers
+	3caa  Xeon E5/Core i7 Integrated Memory Controller Target Address Decoder 0
+	3cab  Xeon E5/Core i7 Integrated Memory Controller Target Address Decoder 1
+	3cac  Xeon E5/Core i7 Integrated Memory Controller Target Address Decoder 2
+	3cad  Xeon E5/Core i7 Integrated Memory Controller Target Address Decoder 3
+	3cae  Xeon E5/Core i7 Integrated Memory Controller Target Address Decoder 4
+	3cb0  Xeon E5/Core i7 Integrated Memory Controller Channel 0-3 Thermal Control 0
+	3cb1  Xeon E5/Core i7 Integrated Memory Controller Channel 0-3 Thermal Control 1
+	3cb2  Xeon E5/Core i7 Integrated Memory Controller ERROR Registers 0
+	3cb3  Xeon E5/Core i7 Integrated Memory Controller ERROR Registers 1
+	3cb4  Xeon E5/Core i7 Integrated Memory Controller Channel 0-3 Thermal Control 2
+	3cb5  Xeon E5/Core i7 Integrated Memory Controller Channel 0-3 Thermal Control 3
+	3cb6  Xeon E5/Core i7 Integrated Memory Controller ERROR Registers 2
+	3cb7  Xeon E5/Core i7 Integrated Memory Controller ERROR Registers 3
+	3cb8  Xeon E5/Core i7 DDRIO
+	3cc0  Xeon E5/Core i7 Power Control Unit 0
+	3cc1  Xeon E5/Core i7 Power Control Unit 1
+	3cc2  Xeon E5/Core i7 Power Control Unit 2
+	3cd0  Xeon E5/Core i7 Power Control Unit 3
+	3ce0  Xeon E5/Core i7 Interrupt Control Registers
+	3ce3  Xeon E5/Core i7 Semaphore and Scratchpad Configuration Registers
+	3ce4  Xeon E5/Core i7 R2PCIe
+	3ce6  Xeon E5/Core i7 QuickPath Interconnect Agent Ring Registers
+	3ce8  Xeon E5/Core i7 Unicast Register 0
+	3ce9  Xeon E5/Core i7 Unicast Register 5
+	3cea  Xeon E5/Core i7 Unicast Register 1
+	3ceb  Xeon E5/Core i7 Unicast Register 6
+	3cec  Xeon E5/Core i7 Unicast Register 3
+	3ced  Xeon E5/Core i7 Unicast Register 7
+	3cee  Xeon E5/Core i7 Unicast Register 4
+	3cef  Xeon E5/Core i7 Unicast Register 8
+	3cf4  Xeon E5/Core i7 Integrated Memory Controller System Address Decoder 0
+	3cf5  Xeon E5/Core i7 Integrated Memory Controller System Address Decoder 1
+	3cf6  Xeon E5/Core i7 System Address Decoder
    4000  5400 Chipset Memory Controller Hub
    4001  5400 Chipset Memory Controller Hub
    4003  5400 Chipset Memory Controller Hub
@@ -19473,6 +19796,80 @@
    8817  Platform Controller Hub EG20T I2C Controller
    8818  Platform Controller Hub EG20T Controller Area Network (CAN) Controller
    8819  Platform Controller Hub EG20T IEEE 1588 Hardware Assist
+	8c00  Lynx Point 4-Port SATA IDE Controller
+	8c01  Lynx Point 4-Port SATA IDE Controller
+	8c02  Lynx Point 6-Port SATA AHCI Controller
+	8c03  Lynx Point 6-Port SATA AHCI Controller
+	8c04  Lynx Point SATA RAID Controller
+	8c05  Lynx Point SATA RAID Controller
+	8c06  Lynx Point SATA RAID Controller
+	8c07  Lynx Point SATA RAID Controller
+	8c08  Lynx Point 2-Port SATA IDE Controller
+	8c09  Lynx Point 2-Port SATA IDE Controller
+	8c0e  Lynx Point SATA RAID Controller
+	8c0f  Lynx Point SATA RAID Controller
+	8c10  Lynx Point PCI Express Root Port 1
+	8c11  Lynx Point PCI Express Root Port 1
+	8c12  Lynx Point PCI Express Root Port 2
+	8c13  Lynx Point PCI Express Root Port 2
+	8c14  Lynx Point PCI Express Root Port 3
+	8c15  Lynx Point PCI Express Root Port 3
+	8c16  Lynx Point PCI Express Root Port 4
+	8c17  Lynx Point PCI Express Root Port 4
+	8c18  Lynx Point PCI Express Root Port 5
+	8c19  Lynx Point PCI Express Root Port 5
+	8c1a  Lynx Point PCI Express Root Port 6
+	8c1b  Lynx Point PCI Express Root Port 6
+	8c1c  Lynx Point PCI Express Root Port 7
+	8c1d  Lynx Point PCI Express Root Port 7
+	8c1e  Lynx Point PCI Express Root Port 8
+	8c1f  Lynx Point PCI Express Root Port 8
+	8c20  Lynx Point HD Audio Controller
+	8c21  Lynx Point HD Audio Controller
+	8c22  Lynx Point SMBus Controller
+	8c23  Lynx Point CHAP Counter
+	8c24  Lynx Point Thermal Management Controller
+	8c26  Lynx Point USB Enhanced Host Controller #1
+	8c2d  Lynx Point USB Enhanced Host Controller #2
+	8c31  Lynx Point USB xHCI Host Controller
+	8c33  Lynx Point LAN Controller
+	8c34  Lynx Point NAND Controller
+	8c3a  Lynx Point MEI Controller #1
+	8c3b  Lynx Point MEI Controller #2
+	8c3c  Lynx Point IDE-r Controller
+	8c3d  Lynx Point KT Controller
+	8c40  Lynx Point LPC Controller
+	8c41  Lynx Point LPC Controller
+	8c42  Lynx Point LPC Controller
+	8c43  Lynx Point LPC Controller
+	8c44  Lynx Point LPC Controller
+	8c45  Lynx Point LPC Controller
+	8c46  Lynx Point LPC Controller
+	8c47  Lynx Point LPC Controller
+	8c48  Lynx Point LPC Controller
+	8c49  Lynx Point LPC Controller
+	8c4a  Lynx Point LPC Controller
+	8c4b  Lynx Point LPC Controller
+	8c4c  Lynx Point LPC Controller
+	8c4d  Lynx Point LPC Controller
+	8c4e  Lynx Point LPC Controller
+	8c4f  Lynx Point LPC Controller
+	8c50  Lynx Point LPC Controller
+	8c51  Lynx Point LPC Controller
+	8c52  Lynx Point LPC Controller
+	8c53  Lynx Point LPC Controller
+	8c54  Lynx Point LPC Controller
+	8c55  Lynx Point LPC Controller
+	8c56  Lynx Point LPC Controller
+	8c57  Lynx Point LPC Controller
+	8c58  Lynx Point LPC Controller
+	8c59  Lynx Point LPC Controller
+	8c5a  Lynx Point LPC Controller
+	8c5b  Lynx Point LPC Controller
+	8c5c  Lynx Point LPC Controller
+	8c5d  Lynx Point LPC Controller
+	8c5e  Lynx Point LPC Controller
+	8c5f  Lynx Point LPC Controller
    9000  IXP2000 Family Network Processor
    9001  IXP2400 Network Processor
    9002  IXP2300 Network Processor
@@ -19901,6 +20298,8 @@
 919a  Gigapixel Corp
 9412  Holtek
    6565  6565
+9618  JusonTech Corporation
+	0001  JusonTech Gigabit Ethernet Controller
 9699  Omni Media Technology Inc
    6565  6565
 9710  NetMos Technology
@@ -19976,6 +20375,7 @@ cace  CACE Technologies, Inc.
    0023  AirPcap N
 cafe  Chrysalis-ITS
    0003  Luna K3 Hardware Security Module
+	0006  Luna PCI-e 3000 Hardware Security Module
 cccc  Catapult Communications
 ccec  Curtiss-Wright Controls Embedded Computing
 cddd  Tyzx, Inc.
@@ -20011,7 +20411,12 @@ d4d4  Dy4 Systems Inc
    0601  PCI Mezzanine Card
 d531  I+ME ACTIA GmbH
 d84d  Exsys
+dada  Datapath Limited
 db10  Diablo Technologies
+dcba  Dynamic Engineering
+	0046  PCIeAlteraCycloneIV
+dd01  Digital Devices GmbH
+	0003  Octopus LE DVB adapter
 dead  Indigita Corporation
 deaf  Middle Digital Inc.
    9050  PC Weasel Virtual VGA
@@ -20031,6 +20436,15 @@ e159  Tiger Jet Network Inc.
    0002  Tiger100APC ISDN chipset
 e1c5  Elcus
 e4bf  EKF Elektronik GmbH
+	0ccd  CCD-CALYPSO
+	0cd1  CD1-OPERA
+	0cd2  CD2-BEBOP
+	0cd3  CD3-JIVE
+	50c1  PC1-GROOVE
+	50c2  PC2-LIMBO
+	53c1  SC1-ALLEGRO
+	cc47  CCG-RUMBA
+	cc4d  CCM-BOOGIE
 e55e  Essence Technology, Inc.
 ea01  Eagle Technology
    000a  PCI-773 Temperature Card
@@ -20254,6 +20668,7 @@ C 08  Generic system peripheral
    	01  ISA RTC
    04  PCI Hot-plug controller
    05  SD Host controller
+	06  IOMMU
    80  System peripheral
 C 09  Input device controller
    00  Keyboard controller
diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids
index 952ff1c..c21fff1 100644
--- a/src/hwdata/usb.ids
+++ b/src/hwdata/usb.ids
@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2011.11.13
-# Date:    2011-11-13 20:34:03
+# Version: 2012.02.08
+# Date:    2012-02-08 20:34:02
 #
# Vendors, devices and interfaces. Please keep sorted.
@@ -467,6 +467,7 @@
    5a11  PhotoSmart C7100 series
    5b11  OfficeJet J2100 series
    5c11  PhotoSmart C4200 Printer series
+	5c17  LaserJet P2055 series
    5d11  PhotoSmart C5200 series
    5e11  PhotoSmart D7400 series
    6004  DeskJet 5550
@@ -546,6 +547,7 @@
    8504  DeskJet 6600 series
    8604  DeskJet 5440
    8704  DeskJet 5940
+	8711  Deskjet 2050 J510
    8804  DeskJet 6980 series
    8904  DeskJet 6940 series
    8c07  Digital Stereo Headset
@@ -609,6 +611,7 @@
    2001  USBXchange Adapter
    2002  USB2-Xchange
    2003  USB2-Xchange Adapter
+	4000  4-port hub
    adcc  Composite Device Support
 03f4  Diebold, Inc.
 03f5  Siemens Electromechanical
@@ -775,6 +778,7 @@
    0040  Floppy
    004e  SuperScript 1400 Series
    004f  Wireless Keyboard with One-touch start buttons
+	0050  7-port hub
    0058  HighSpeed Hub
    0059  HighSpeed Hub
    005a  HighSpeed Hub
@@ -880,7 +884,7 @@
    0595  Digital Camera
    0596  Digital Camera
    0597  Digital Camera
-	0598  Digital Camera
+	0598  EASYSHARE M1033 digital camera
    0599  Digital Camera
    059a  Digital Camera
    059b  Digital Camera
@@ -931,6 +935,7 @@
    05d4  EasyShare C180 Digital Camera
    1001  EasyShare SV811 Digital Picture Frame
    4000  InkJet Color Printer
+	4056  ESP 7200 Series AiO
    4109  EasyShare Printer Dock Series 3
    410d  EasyShare G600 Printer Dock
    5010  Wireless Adapter
@@ -963,6 +968,7 @@
    0018  USB2-IDE Adapter
    001c  USB-IDE Bridge: DUB-PxxG
    0027  WLI-USB-KS11G 802.11b Adapter
+	002a  SMSC USB97C202 "HD-HB300V2-EU"
    003d  LUA-U2-KTX Ethernet
    0044  WLI-USB-KB11 Wireless LAN Adapter
    004b  WLI-USB-G54 802.11g Adapter [Broadcom 4320 USB]
@@ -986,6 +992,7 @@
    00d8  WLI-U2-SG54HP
    00d9  WLI-U2-G54HP
    00da  WLI-U2-KG54L 802.11bg [ZyDAS ZD1211B]
+	00db  External Hard Drive HD-PF32OU2 [Buffalo Ministation]
    00e8  WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870]
    012e  WLI-UC-AG300N Wireless LAN Adapter
    0148  WLI-UC-G300HP Wireless LAN Adapter
@@ -993,11 +1000,11 @@
    0157  External Hard Drive HD-PEU2
    0158  WLI-UC-GNHP Wireless LAN Adapter
    015d  WLI-UC-GN Wireless LAN Adapter [Ralink RT3070]
-	016f  WLI-UC-G301N Wireless LAN Adapter
+	016f  WLI-UC-G301N Wireless LAN Adapter [Ralink RT3072]
    017f  Sony UWA-BR100 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]
    019e  WLI-UC-GNP Wireless LAN Adapter
    01a1  MiniStation Metro
-	01a2  WLI-UC-GNM Wireless LAN Adapter
+	01a2  WLI-UC-GNM Wireless LAN Adapter [Ralink RT8070]
    01ee  WLI-UC-GNM2 Wireless LAN Adapter [Ralink RT3070]
 0412  Award Software International
 0413  Leadtek Research, Inc.
@@ -1038,6 +1045,7 @@
    6029  WinFast DTV Dongle Gold
    6125  WinFast DTV Dongle
    6126  WinFast DTV Dongle BDA Driver
+	6a03  RTL2832 [WinFast DTV Dongle Mini]
    6f00  WinFast DTV Dongle (STK7700P based)
 0414  Giga-Byte Technology Co., Ltd
 0416  Winbond Electronics Corp.
@@ -1101,6 +1109,7 @@
    3061  SoundBlaster Audigy 2 ZS Video Editor
    3090  Sound Blaster Digital Music SX
    30d3  Sound Blaster Play!
+	3121  WoW tap chat
    3f00  E-Mu Xboard 25 MIDI Controller
    3f02  E-Mu 0202
    3f04  E-Mu 0404
@@ -1200,6 +1209,7 @@
    4151  Zen Vision:M (mtp)
    4152  Zen V Plus
    4153  Zen Vision W
+	4154  Zen Stone
    4155  Zen Stone plus
    4157  Zen (MTP)
    500f  Broadband Blaster 8012U-V
@@ -1666,7 +1676,7 @@
    0001  Mouse
    0002  Genius NetMouse Pro
    0003  Genius NetScroll+
-	0006  Easy Mouse+ USB(USB\Vid_0458&Pid;_0006) Mouse
+	0006  Easy Mouse+
    000b  NetMouse Wheel(P+U)
    000c  TACOMA Fingerprint V1.06.01
    000e  VideoCAM Web
@@ -1725,7 +1735,7 @@
    301a  MaxFire G-12U Vibration
    301d  Genius MaxFire MiniPad
    400f  Genius TVGo DVB-T02Q MCE
-	4012  TVGo DVB-T03
+	4012  TVGo DVB-T03 [AF9015]
    5003  G-pen 560 Tablet
    5004  G-pen Tablet
    6001  GF3000F Ethernet Adapter
@@ -1751,6 +1761,7 @@
    705a  Asus USB2.0 Webcam
    705c  Genius iSlim 1300AF
    7079  FaceCam 2025R
+	707f  TVGo DVB-T03 [RTL2832]
 0459  Adobe Systems, Inc.
 045a  SONICblue, Inc.
    07da  Supra Express 56K modem
@@ -1840,6 +1851,7 @@
    009d  Wireless Optical Desktop 3.0
    00a0  eHome Infrared Receiver
    00b0  Digital Media Pro Keyboard
+	00b4  Digital Media Keyboard 1.0A
    00b9  Wireless Optical Mouse 3.0
    00bb  Fingerprint Reader
    00bc  Fingerprint Reader
@@ -2021,13 +2033,17 @@
    071f  Mouse/Keyboard 2.4GHz Transceiver V2.0
    0721  LifeCam NX-3000 (UVC-compliant)
    0723  LifeCam VX-7000 (UVC-compliant)
+	0724  SideWinder Mouse
+	0730  Digital Media Keyboard 3000
    0734  Wireless Optical Desktop 700
    0737  Compact Optical Mouse 500
    0745  Nano Transceiver v1.0 for Bluetooth
    0750  Wired Keyboard 600
+	0752  Wired Keyboard 400
    075d  LifeCam Cinema
    0768  Sidewinder X4
    076d  LifeCam HD-5000
+	0772  LifeCam Studio
    930a  ISOUSB.SYS Intel 82930 Isochronous IO Test Board
    fff8  Keyboard
    ffff  Windows CE Mass Storage
@@ -2118,6 +2134,7 @@
    0101  PS/2 Keyboard, Mouse & Joystick Ports
    0301  USB 1.0 Hub
    0500  Serial & Parallel Ports
+	ff10  Virtual Keyboard and Mouse
 046c  Toshiba Corp., Digital Media Equipment
 046d  Logitech, Inc.
    0082  Acer Aspire 5672 Webcam
@@ -2308,6 +2325,7 @@
    c062  LS1 Laser Mouse, corded
    c063  DELL Laser Mouse
    c068  G500 Laser Mouse
+	c069  M500 Laser Mouse
    c06b  G700 Wireless Gaming Mouse
    c06c  Optical Mouse
    c101  UltraX Media Remote
@@ -2344,6 +2362,8 @@
    c225  G11/G15 Keyboard / G keys
    c226  G15 Refresh Keyboard
    c227  G15 Refresh Keyboard
+	c22a  Gaming Keyboard G110
+	c22b  Gaming Keyboard G110 G-keys
    c22d  G510 Gaming Keyboard
    c22e  G510 Gaming Keyboard onboard audio
    c281  WingMan Force
@@ -2632,6 +2652,7 @@
    102d  Pilot Optical
    102e  Pilot Optical Pro
    102f  Pilot Optical Pro Wireless
+	1042  Ci25m Notebook Optical Mouse [Diamond Eye Precision]
    1043  Ci65m Wireless Notebook Optical Mouse
    104a  PilotMouse Mini Retractable
    105d  PocketMouse Bluetooth
@@ -2683,6 +2704,7 @@
 047f  Plantronics, Inc.
    0101  Bulk Driver
    0301  Bulk Driver
+	0411  Savi Office Base Station
    0ca1  USB DSP v4 Audio Interface
    4254  BUA-100 Bluetooth Adapter
    ad01  GameCom 777 5.1 Headset
@@ -2691,6 +2713,7 @@
    0004  InTouch Module
    0011  InTouch Module
    0014  InTouch Module
+	a007  External Disk USB 3.0
 0481  Zenith Data Systems
 0482  Kyocera Corp.
    000e  FS-1020D Printer
@@ -3113,6 +3136,7 @@
    173e  MP560
    173f  Pixma MP640 Multifunction device
    1748  Pixma MG5150
+	174d  MX360 ser
    1900  CanoScan LiDE 90
    1901  CanoScan 8800F
    1904  CanoScan LiDE 100
@@ -3455,6 +3479,7 @@
    301b  SK-8815 Keyboard
    301c  Enhanced Performance Keyboard
    3020  Enhanced Performance Keyboard
+	3025  NetVista Full Width Keyboard
    3100  NetVista Mouse
    3103  ScrollPoint Pro Mouse
    3104  ScrollPoint Wireless Mouse
@@ -3475,7 +3500,6 @@
    4604  Keyboard w/ Card Reader
    4671  4820 LCD w/ MSR/KB
 04b4  Cypress Semiconductor Corp.
-	0000  Dacal DC-101 CD Library
    0001  Mouse
    0002  CY7C63x0x Thermometer
    0033  Mouse
@@ -3496,6 +3520,7 @@
    5201  Combi Keyboard-Hub (Hub)
    5202  Combi Keyboard-Hub (Keyboard)
    5500  HID->COM RS232 Adapter
+	5a9b  Dacal CD/DVD Library D-101/DC-300/DC-016RW
    6370  ViewMate Desktop Mouse CC2201
    6560  CY7C65640 USB-2.0 "TetraHub"
    6830  CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI
@@ -3850,6 +3875,7 @@
    01fd  A160
    023e  FinePix AX300
    0240  FinePix S2950 Digital Camera
+	0241  FinePix S3200 Digital Camera
 04cc  ST-Ericsson
    1122  Hub
    1520  USB 2.0 Hub (Avocent KVM)
@@ -3919,6 +3945,7 @@
    1603  Keyboard
    2013  Keyboard [Das Keyboard]
    2221  Keyboard
+	a055  Keyboard
 04da  Panasonic (Matsushita)
    0901  LS-120 Camera
    0912  SDR-S10
@@ -3986,6 +4013,7 @@
    8005  Zaurus A-300
    8006  Zaurus SL-B500/SL-5600 PDA
    8007  Zaurus C-700 PDA
+	9009  AR-M160
    9014  IM-DR80 Portable NetMD Player
    9031  Zaurus C-750/C-760/C-860/SL-C3000 PDA
    9032  Zaurus SL-6000
@@ -4221,6 +4249,7 @@
    5f03  NEXiO Sync
    5f04  NEXiO Sync
    6032  G2 Portable hard drive
+	60c4  M2 Portable Hard Drive USB 3.0
    6601  Mobile Phone
    6602  Galaxy
    6603  Galaxy
@@ -4301,6 +4330,7 @@
    0111  KU-9908 Keyboard
    0112  KU-8933 Keyboard with PS/2 Mouse port
    0116  KU-2971/KU-0325 Keyboard
+	0201  Gaming Keyboard KPD0250
    0220  Wireless HID Receiver
    0402  Genius LuxeMate i200 Keyboard
    0403  KU-0420 keyboard
@@ -4351,8 +4381,10 @@
    b1aa  Webcam-101
    b1b4  Lenovo Integrated Camera
    b1cf  Lenovo Integrated Camera
+	b217  Lenovo Integrated Camera (0.3MP)
    b221  integrated camera
    b230  Integrated HP HD Webcam
+	b26b  Sony Visual Communication Camera
    b272  Lenovo EasyCamera
 04f3  Elan Microelectronics Corp.
    01a4  Wireless Keyboard
@@ -4360,6 +4392,7 @@
    0212  Laser Mouse
    0214  Lynx M9 Optical Mouse
    0230  3D Optical Mouse
+	0232  Mouse
    02f4  2.4G Cordless Mouse
 04f4  Harting Elektronik, Inc.
 04f5  Fujitsu-ICL Systems, Inc.
@@ -4570,7 +4603,7 @@
    4201  DS4201 Audio DAC
 04fb  Biostar Microtech International Corp.
 04fc  Sunplus Technology Co., Ltd
-	0003  CM1092 Optical Scroller Mouse
+	0003  CM1092 / Wintech CM-5098 Optical Mouse
    0005  USB OpticalWheel Mouse
    0013  ViewMate Desktop Mouse CC2201
    0015  ViewMate Desktop Mouse CC2201
@@ -4669,6 +4702,7 @@
    0122  Ethernet Adapter
    0131  Bluetooth Device with trace filter
    016a  Bluetooth Mini Dongle
+	0200  Nostromo SpeedPad n52te Gaming Keyboard
    0201  Peripheral Switch
    0208  USBView II Video Adapter [nt1004]
    0210  F5U228 Hi-Speed USB 2.0 DVD Creator
@@ -4690,7 +4724,7 @@
    0815  Nostromo n52 HID SpeedPad Mouse Wheel
    0826  ErgoFit Wireless Optical Mouse (HID)
    0980  HID UPS Battery
-	1102  F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CE-VAU]
+	1102  F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CUS]
    1202  F5U120-PC Parallel Printer Port
    1203  F5U120-PC Serial Port
    2103  F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU]
@@ -4718,9 +4752,10 @@
    845a  F7D2101 802.11n Surf & Share Wireless Adapter v1000 [Realtek RTL8192SU]
    905b  F5D9050 Wireless G+ MIMO Network Adapter v3000 [Ralink RT2573]
    905c  F5D9050 Wireless G+ MIMO Network Adapter v4000 [Ralink RT2573]
-	935a  F6D4050 N150 Enhanced Wireless Network Adapter v1000 [Ralink RT2870]
+	935a  F6D4050 N150 Enhanced Wireless Network Adapter v1000 [Ralink RT3070]
    935b  F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070]
-	945a  F7D1101 Basic Wireless USB Adapter v1000 [Realtek RTL8188SU]
+	945a  F7D1101 v1 Basic Wireless Adapter [Realtek RTL8188SU]
+	945b  F7D1101 v2 Basic Wireless Adapter [Ralink RT3370]
 050e  Neon Technology, Inc.
 050f  KC Technology, Inc.
    0001  Hub
@@ -4765,7 +4800,9 @@
 0525  Netchip Technology, Inc.
    100d  RFMD Bluetooth Device
    1080  NET1080 USB-USB Bridge
+	1200  SSDC Adapter II
    1265  File-backed Storage Gadget
+	a0f0  Cambridge Electronic Devices Power1401 mk 2
    a140  USB Clik! 40
    a141  (OME) PocketZip 40 MP3 Player Driver
    a220  GVC Bluetooth Wireless Adapter
@@ -5067,8 +5104,10 @@
    033e  DSC-W120
    0346  Handycam DCR-SR55E
    0348  HandyCam HDR-TG3E
+	035b  Walkman NWZ-A828
    035c  NWZ-A726/A728/A729
    0382  Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1)
+	0385  Walkman NWZ-E436F
    03bc  Webbie HD - MHS-CM1
    03d3  DR-BT100CX
    03d5  PlayStation Move motion controller
@@ -5115,6 +5154,7 @@
    2011  UC-2324 4xSerial Ports [mos7840]
    2202  CS124U Miniview II KVM Switch
    2213  CS682 2-Port USB 2.0 DVI KVM Switch
+	2221  Winbond Hermon
    2404  4-port switch
    2600  IDE Bridge
    2701  CE700A KVM Extender
@@ -5660,6 +5700,7 @@
    3417  NWD271N 802.11n Wireless Adapter [Atheros AR9001U-(2)NG]
    3418  NWD211AN 802.11abgn Wireless Adapter [Ralink RT2870]
    341a  NWD-270N Wireless N-lite USB Adapter
+	341e  NWD2105 802.11bgn Wireless Adapter [Ralink RT3070]
    341f  NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU]
 0587  America Kotobuki Electronics Industries, Inc.
 0588  Sapien Design
@@ -5701,7 +5742,7 @@
    6360  Multimedia Card Reader
    6361  Multimedia Card Reader
    6362  Flash Card Reader/Writer
-	6364  Hi-Speed 7-in-1 Flash Card Reader/Writer [Sabrent]
+	6364  AU6476 Card Reader Controller
    6366  Multi Flash Reader
    6377  Multimedia Card Reader
    6386  Memory Card
@@ -5728,6 +5769,7 @@
    9510  ChunghwaTL USB02 Smartcard Reader
    9520  EMV Certified Smart Card Reader
    9720  USB-Serial Adapter
+	a014  Asus Integrated Webcam
 0590  Omron Corp.
    0004  Cable Modem
    000b  MR56SVS
@@ -5914,6 +5956,7 @@
    0245  Internal Keyboard/Trackpad (ANSI)
    0246  Internal Keyboard/Trackpad (ISO)
    0247  Internal Keyboard/Trackpad (JIS)
+	0250  MP110Z/B
    0252  Internal Keyboard/Trackpad (ANSI)
    0253  Internal Keyboard/Trackpad (ISO)
    0254  Internal Keyboard/Trackpad (JIS)
@@ -5930,6 +5973,7 @@
    1003  Hub in Pro Keyboard [Mitsumi, A1048]
    1006  Hub in Aluminum Keyboard
    1101  Speakers
+	1107  Thunderbolt Display Audio
    1201  3G iPod
    1202  iPod 2G
    1203  iPod 4.Gen Grayscale 40G
@@ -5969,6 +6013,7 @@
    129a  iPad
    129e  iPod Touch 4.Gen
    129f  iPad 2
+	12a0  iPhone 4S
    1300  iPod Shuffle
    1301  iPod Shuffle 2.Gen
    1302  iPod Shuffle 3.Gen
@@ -5999,10 +6044,12 @@
    912f  Hub in 30" Cinema Display
    921c  A1082 [Cinema HD Display 23"]
    9221  30" Cinema Display
+	9227  Thunderbolt Display
    ffff  Bluetooth in DFU mode - Driver
 05ad  Y.C. Cable U.S.A., Inc.
 05ae  Synopsys, Inc.
 05af  Jing-Mold Enterprise Co., Ltd
+	0806  HP SK806A Keyboard
    0809  Wireless Keyboard and Mouse
    0821  IDE to
    3062  Cordless Keyboard
@@ -6050,6 +6097,7 @@
    9001  Gobi Wireless Modem
    9002  Gobi Wireless Modem
    9008  Gobi Wireless Modem (QDL mode)
+	9018  Qualcomm HSUSB Device
    9201  Gobi Wireless Modem (QDL mode)
    9202  Gobi Wireless Modem
    9203  Gobi Wireless Modem
@@ -6078,6 +6126,8 @@
    6001  Ten-Keypad
 05c8  Cheng Uei Precision Industry Co., Ltd (Foxlink)
    0103  FO13FF-65 PC-CAM
+	021a  HP Webcam
+	0318  Webcam
    0403  Webcam
 05c9  Semtech Corp.
 05ca  Ricoh Co., Ltd
@@ -6418,6 +6468,7 @@
    0717  All-in-1 Card Reader
    0718  IDE/SATA Adapter
    0723  GL827L SD/MMC/MS Flash Card Reader
+	0726  SD Card Reader
    0727  microSD Reader/Writer
    0760  USB 2.0 Card Reader/Writer
    0761  Genesys Mass Storage Device
@@ -6525,6 +6576,7 @@
    6001  SolidTek USB 2p HUB
    6002  SolidTek USB Keyboard
    6003  Japanese Keyboard - 600HM
+	8007  P-W1G1F12 VER:1 [Macally MegaCam]
    a001  Maxwell Compact Pc PM3
 060c  EEH Datalink GmbH
 060d  Auctor Corp.
@@ -6580,6 +6632,7 @@
    0201  Defender Office Keyboard (K7310) S Zodiak KM-9010
    0252  Emerge Uni-retractable Laser Mouse
    3286  Nano Receiver [Sandstrom Laser Mouse SMWLL11]
+	6301  Trust Wireless Optical Mouse MI-4150K
    9003  VoIP Conference Hub (A16GH)
    9004  USR9602 USB Internet Mini Phone
 062b  Greatlink Electronics Taiwan, Ltd
@@ -6600,7 +6653,7 @@
    0a10  iVina FB1600/UMAX Astra 4500
    0a13  AV600U
    0a15  Konica Minolta SC-110
-	0a16  SC-215
+	0a16  Konica Minolta SC-215
    0a30  UMAX Astra 6700 Scanner
    0a41  Avision AM3000/MF3000 Series
    0f01  fi-4010CU
@@ -6919,6 +6972,8 @@
    3c06  54g USB Network Adapter
 0682  Victor Company of Japan, Ltd
 0684  Actiontec Electronics, Inc.
+0685  ZD Incorporated
+	7000  HSDPA Modem
 0686  Minolta Co., Ltd
    2001  PagePro 4110W
    2004  PagePro 1200W
@@ -7054,7 +7109,10 @@
    05d2  PC Dash 2
    075c  X52 Flight Controller
    0762  Saitek X52 Pro Flight Control System
+	0763  Pro Flight Rudder Pedals
    0805  R440 Force Wheel
+	0bac  Pro Flight Yoke
+	0c2d  Pro Flight Quadrant
    1003  GM2 Action Pad
    1009  Action Pad
    100a  SP550 Pad and Joystick Combo
@@ -7067,6 +7125,7 @@
    3589  P3000 Wireless Pad
    35be  Cyborg Evo
    5509  P3000 Wireless Pad
+	712c  Pro Flight Yoke integrated hub
    8000  Gamers' Keyboard
    801e  Cyborg 3D Digital Stick II
    8020  Eclipse Keyboard
@@ -7112,6 +7171,7 @@
    0121  SpeedTouch 121g Wireless Dongle
    2001  SPEED TOUCH Card
    4061  SpeedTouch ISDN or ADSL Modem
+	4062  SpeedTouch ISDN or ADSL router
    a5a5  DynaMiTe Modem
 06ba  Smooth Cord & Connector Co., Ltd
 06bb  EDA, Inc.
@@ -7829,6 +7889,7 @@
    0063  LDR Device
    0064  LDR-R Device
    00b3  DVD Multi-plus unit LDR-H443U2
+	0105  LAN-TX/U1H2 10/100 Ethernet Adapter [pegasus II]
    010c  Realtek RTL8187 Wireless 802.11g 54Mbps Network Adapter
    0162  LAN-WN22/U2 Wireless LAN Adapter
    0163  LAN-WN12/U2 Wireless LAN Adapter
@@ -8234,6 +8295,7 @@
    3300  DWA-130 802.11n Wireless N Adapter(rev.E) [Realtek RTL8191SU]
    3302  DWA-130 802.11n Wireless N Adapter(rev.C2) [Realtek RTL8191SU]
    3303  DWA-131 802.11n Wireless N Nano Adapter(rev.A1) [Realtek RTL8192SU]
+	3304  FR-300USB 802.11bgn Wireless Adapter
    3a07  WUA-2340 RangeBooster G Adapter(rev.A) [Atheros AR5523]
    3a08  WUA-2340 RangeBooster G Adapter(rev.A) (no firmware) [Atheros AR5523]
    3a09  DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.A2) [Atheros AR9170+AR9104]
@@ -8246,10 +8308,10 @@
    3c03  AirPlus G DWL-G122 Wireless Adapter(rev.C1) [Ralink RT2571W]
    3c04  WUA-1340
    3c05  EH103 Wireless G Adapter
-	3c07  Wireless G DWA-110 Adapter
+	3c07  DWA-110 Wireless G Adapter(rev.A1) [Ralink RT2571W]
    3c09  DWA-140 RangeBooster N Adapter(rev.B1) [Ralink RT2870]
    3c0a  DWA-140 RangeBooster N Adapter(rev.B2) [Ralink RT3072]
-	3c0b  DWA-110 Wireless G USB Adapter(rev.B)
+	3c0b  DWA-110 Wireless G Adapter(rev.B) [Ralink RT2870]
    3c0d  DWA-125 Wireless N 150 Adapter(rev.A1) [Ralink RT3070]
    3c0e  WUA-2340 RangeBooster G Adapter(rev.B) [Ralink RT2070]
    3c0f  AirPlus G DWL-G122 Wireless Adapter(rev.E1) [Ralink RT2070]
@@ -8843,6 +8905,9 @@
 08ff  AuthenTec, Inc.
    1600  AES1600
    1610  AES1600
+	1660  AES1660 Fingerprint Sensor
+	1680  AES1660 Fingerprint Sensor
+	168f  AES1660 Fingerprint Sensor
    2500  AES2501
    2501  AES2501
    2502  AES2501
@@ -8860,6 +8925,7 @@
    250e  AES2501
    250f  AES2501
    2510  AES2510
+	2550  AES2550 Fingerprint Sensor
    2580  AES2501 Fingerprint Sensor
    2588  AES2501
    2589  AES2501
@@ -8869,6 +8935,9 @@
    258d  AES2501
    258e  AES2501
    258f  AES2501
+	2660  AES2660 Fingerprint Sensor
+	2680  AES2660 Fingerprint Sensor
+	268f  AES2660 Fingerprint Sensor
    2810  AES2810
    3400  AES3400 TruePrint Sensor
    3401  AES3400 Sensor
@@ -8940,6 +9009,7 @@
    337b  Silicon Motion Camera
    3710  Silicon Motion Camera
    3720  Silicon Motion Camera
+	37bc  HP Webcam-101 Integrated Camera
    37c0  Silicon Motion Camera
    6000  SD/SDHC Card Reader (SG365 / FlexiDrive XC+)
    6200  microSD card reader
@@ -8998,6 +9068,7 @@
    2295  Colorado 300
    22b6  eTrex Vista HCx (Mass Storage mode)
    2353  Nüvi 205T
+	2519  eTrex 30
    2535  Edge 800
 0920  Echelon Co.
    7500  Network Interface
@@ -9171,9 +9242,11 @@
 0944  KORG, Inc.
    0001  PXR4 4-Track Digital Recorder
    0020  KAOSS Pad KP3 Dynamic Effect/Sampler
+	0023  KAOSSILATOR PRO Dynamic Phrase Synthesizer
    010d  nanoKEY MIDI keyboard
    010e  nanoPAD pad controller
    010f  nanoKONTROL studio controller
+	0117  nanoKONTROL2 MIDI Controller
    0f03  K-Series K61P MIDI studio controller
 0945  Pasco Scientific
 0948  Kronauer music in digital
@@ -9203,6 +9276,7 @@
    1625  DataTraveler 101 II
    162a  DataTraveler 112 4GB Pen Drive
    1643  DataTraveler G3 4GB
+	1653  Data Traveler 100 G2 8 GiB
 0954  RPM Systems Corp.
 0955  NVidia Corp.
    7100  Notion Ink Adam
@@ -9288,9 +9362,21 @@
    0001  MySmartPad
 09bf  Auerswald GmbH & Co. KG
    00c0  COMpact 2104 ISDN PBX
-	00db  COMpact 4410/2206 ISDN ISDN
-	00f1  COMfort System Telephones
+	00db  COMpact 4410/2206 ISDN
+	00dc  COMpact 4406 DSL (PBX)
+	00dd  COMpact 2204 (PBX)
+	00de  COMpact 2104 (Rev.2 PBX)
+	00e0  COMmander Business (PBX)
+	00e2  COMmander Basic.2 (PBX)
+	00f1  COMfort 2000 (System telephone)
+	00f2  COMfort 1200 (System telephone)
+	00f5  COMfortel 2500 (System telephone)
+	8000  COMpact 2104 DSL (DSL modem)
+	8001  COMpact 4406 DSL (DSL modem)
+	8002  Analog/ISDN Converter (Line converter)
+	8005  WG-640 (Automatic event dialer)
 09c0  Genpix Electronics, LLC
+	0136  Axon CNS, MultiClamp 700B
    0202  8PSK DVB-S tuner
    0203  Skywalker-1 DVB-S tuner
    0204  Skywalker-CW3K DVB-S tuner
@@ -9531,7 +9617,7 @@
    0201  iLine10(tm) Network Adapter
    2000  Bluetooth Device
    2001  Bluetooth Device
-	2009  Bluetooth Controller
+	2009  BCM2035 Bluetooth
    200a  BCM2035 Bluetooth dongle
    200f  Bluetooth Controller
    201d  Bluetooth Device
@@ -9541,13 +9627,13 @@
    2033  BCM2033 Bluetooth
    2035  BCM2035 Bluetooth
    2038  Blutonium Device
-	2039  Bluetooth Device
+	2039  BCM2045 Bluetooth
    2045  Bluetooth Controller
    2046  Bluetooth Device
    2047  Bluetooth Device
    205e  Bluetooth Device
    2100  Bluetooth 2.0+eDR dongle
-	2101  Bluetooth Controller
+	2101  BCM2045 Bluetooth
    2102  ANYCOM Blue USB-200/250
    2110  Bluetooth Controller
    2111  ANYCOM Blue USB-UHE 200/250
@@ -9579,7 +9665,8 @@
    5802  BCM5880 Secure Applications Processor with fingerprint touch sensor
    5803  BCM5880 Secure Applications Processor with secure keyboard
    6300  Pirelli Remote NDIS Device
-	bd13  Arcadyan WN8522B [Broadcom BCM4323]
+	bd11  TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320]
+	bd13  BCM4323 802.11abgn Wireless Adapter
    d11b  Eminent EM4045 [Broadcom 4320 USB]
 0a5d  Diatrend Corp.
 0a5f  Zebra
@@ -9702,6 +9789,26 @@
 0aab  Vision Shape Europe SA
 0aac  iCompression, Inc.
 0aad  Rohde & Schwarz GmbH & Co. KG
+	0003  NRP-Z21
+	000c  NRP-Z11
+	0013  NRP-Z22
+	0014  NRP-Z23
+	0015  NRP-Z24
+	0016  NRP-Z51
+	0017  NRP-Z52
+	0018  NRP-Z55
+	0019  NRP-Z56
+	0021  NRP-Z91
+	0023  NRP-Z81
+	002c  NRP-Z31
+	002d  NRP-Z37
+	002f  NRP-Z27
+	0051  NRP-Z28
+	0052  NRP-Z98
+	0062  NRP-Z92
+	0070  NRP-Z57
+	0083  NRP-Z85
+	0095  NRP-Z86
 0aae  NEC infrontia Corp. (Nitsuko)
 0aaf  Digitalway Co., Ltd
 0ab0  Arrow Strong Electronics Co., Ltd
@@ -9732,6 +9839,7 @@
    307b  USB 1.1 Webcam
    332d  Vega USB 2.0 Camera
    3343  Sirius USB 2.0 Camera
+	3370  Traveler TV 6500 SF Dia-scanner
    3420  Venus USB2.0 Camera
    c001  Sony embedded vimicro Camera
    c002  Visual Communication Camera VGP-VCC1
@@ -9813,6 +9921,7 @@
    7501  Globetrotter HSUPA Modem (icon 411 aka "Vodafone K3760")
    7601  Globetrotter MO40x 3G Modem (GTM 382)
    7701  Globetrotter HSUPA Modem (aka icon 451)
+	d055  Globetrotter GI0505 [iCON 505]
 0af6  Silver I Co., Ltd
 0af7  B2C2, Inc.
    0101  Digital TV USB Receiver (DVB-S/T/C / ATSC)
@@ -9854,13 +9963,14 @@
    1751  BT-253 Bluetooth Adapter
    175b  Laptop OLED Display
    1760  802.11n Network Adapter
-	1761  802.11n Network Adapter
+	1761  USB-N11 802.11n Network Adapter [Ralink RT2870]
    1774  Gobi Wireless Modem (QDL mode)
    1776  Gobi Wireless Modem
    1779  My Cinema U3100 Mini Plus [AF9035A]
    1784  USB-N13 802.11n Network Adapter [Ralink RT3072]
-	1786  USB-N10 802.11n Network Adapter [Realtek RTL8192SU]
+	1786  USB-N10 802.11n Network Adapter [Realtek RTL8188SU]
    1791  WL-167G v3 802.11n Adapter [Realtek RTL8188SU]
+	179d  USB-N53 802.11abgn Network Adapter [Ralink RT3572]
    6101  Cable Modem
    620a  Remote NDIS Device
    b700  Broadcom Bluetooth 2.1
@@ -10020,6 +10130,8 @@
    1720  10/100 Ethernet
    1780  AX88178
    7720  AX88772
+	772a  AX88772A Fast Ethernet
+	7e2b  AX88772B
 0b96  Sewon Telecom
 0b97  O2 Micro, Inc.
    7732  Smart Card Reader
@@ -10048,7 +10160,7 @@
    0111  USR5420 802.11g Adapter [Broadcom 4320 USB]
    0118  U5 802.11g Adapter
    011b  Wireless MAXg Adapter [Broadcom 4320]
-	0121  USR5423 802.11bg
+	0121  USR5423 802.11bg Wireless Adapter [ZyDAS ZD1211B]
    6112  FaxModem Model 5633
 0bb0  Concord Camera Corp.
    0100  Sound Vision Stream
@@ -10242,6 +10354,7 @@
    0c99  Desire (debug)
    0c9e  Incredible
    0ca2  Desire HD (debug mode)
+	0ca5  Android Phone [Evo Shift 4G]
    0ff8  Desire HD (Tethering Mode)
    0ff9  Desire / Desire HD / Hero (Charge Mode)
    0ffe  Desire HD (modem mode)
@@ -10260,6 +10373,7 @@
 0bc2  Seagate RSS LLC
    2000  Storage Adapter V3 (TPP)
    2200  FreeAgent Go FW
+	2300  Expansion Portable
    5021  FreeAgent GoFlex USB 2.0
    5031  FreeAgent GoFlex USB 3.0
 0bc3  IPWireless, Inc.
@@ -10302,6 +10416,7 @@
    0117  Mass Storage Device
    0118  Mass Storage Device
    0138  Card reader
+	0139  Card reader
    0151  Mass Storage Device (Multicard Reader)
    0152  Mass Storage Device
    0153  Mass Storage Device
@@ -10315,13 +10430,18 @@
    0171  Mass Storage Device
    0176  Mass Storage Device
    0178  Mass Storage Device
+	0186  Card Reader
    2831  RTL2831U DVB-T
    2832  RTL2832U DVB-T
+	2838  RTL2838 DVB-T
    8150  RTL8150 Fast Ethernet Adapter
    8151  RTL8151 Adapteon Business Mobile Networks BV
    8171  RTL8188SU 802.11n WLAN Adapter
    8172  RTL8191SU 802.11n WLAN Adapter
-	8176  RTL8188CUS 802.11n WLAN
+	8174  RTL8192SU 802.11n WLAN Adapter
+	8176  RTL8188CUS 802.11n WLAN Adapter
+	8178  RTL8192CU 802.11n WLAN Adapter
+	817f  RTL8188RU 802.11n WLAN Adapter
    8187  RTL8187 Wireless Adapter
    8189  RTL8187B Wireless 802.11g 54Mbps Network Adapter
    8192  RTL8192U 802.11n Wireless Adapter
@@ -10589,9 +10709,11 @@
    63f1  Integrated Webcam
    63f8  Sonix Integrated Webcam
    6409  Webcam
+	6413  Integrated Webcam
    6417  Integrated Webcam
    641d  1.3 MPixel Integrated Webcam
    6480  Sonix 1.3 MP Laptop Integrated Webcam
+	64bd  Sony Visual Communication Camera
    8000  DC31VC
    8006  Dual Mode Camera (8006 VGA)
    800a  Vivitar Vivicam3350B
@@ -10790,6 +10912,7 @@
    0023  UB81 802.11bgn
    0025  802.11b/g/n USB Wireless Network Adapter
    0026  UB82 802.11abgn
+	0027  Sphairon Homelink 1202 802.11n Wireless Adapter [Atheros AR9170]
 0ce5  Validation Technologies International
    0003  Matrix
 0ce9  pico Technology
@@ -10812,6 +10935,7 @@
    1010  3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170]
    20ff  Virtual CD-ROM
    3000  AR3011 Bluetooth (no firmware)
+	3002  AR3011 Bluetooth
    3005  AR3011 Bluetooth
    7015  TP-Link TL-WN821N v3 802.11n [Atheros AR7010+AR9287]
    9170  AR9170 802.11n
@@ -11009,6 +11133,7 @@
    0107  CM108 Audio Controller
    010f  CM108 Audio Controller
    0115  CM108 Audio Controller
+	013c  CM108 Audio Controller
    0201  CM6501
    5000  Mass Storage Controller
    5200  Mass Storage Controller(0D8C,5200)
@@ -11073,6 +11198,7 @@
    0101  SBIG Astronomy Camera (with firmware)
 0d98  Mars Semiconductor Corp.
    0300  Avaya Wireless Card
+	1007  Discovery Kids Digital Camera
 0d99  Trazer Technologies, Inc.
 0d9a  RTX Telecom AS
    0001  Bluetooth Device
@@ -11255,6 +11381,7 @@
    004b  WL-349v3 Wireless Micro Adapter 150N X1 [Realtek RTL8192SU]
    004c  WL-352 802.11n Adapter [Realtek RTL8191SU]
    0050  WL-349v4 Wireless Micro Adapter 150N X1 [Ralink RT3370]
+	005d  WLA-2000 v1.001 WLAN [RTL8191SU]
    061c  LN-028 Network USB 2.0 Adapter
    21f4  44 St Bluetooth Device
    2200  Sitecom bluetooth2.0 class 2 dongle CN-512
@@ -11445,6 +11572,7 @@
    6803  OTI-6803 Flash Disk
    6808  OTI-6808 Flash Disk
    6828  OTI-6828 Flash Disk
+	6858  OTi-6858 serial adapter
 0ea6  Nihon Computer Co., Ltd
 0ea7  MSL Enterprises Corp.
 0ea8  CenDyne, Inc.
@@ -11761,6 +11889,8 @@
 0fef  MJ Research, Inc.
 0ff6  Core Valley Co., Ltd
 0ff7  CHI SHING Computer Accessories Co., Ltd
+0ffc  Clavia DMI AB
+	0021  Nord Stage 2
 0fff  Aopen, Inc.
 1000  Speed Tech Corp.
 1001  Ritronics Components (S) Pte., Ltd
@@ -11917,7 +12047,9 @@
    0903  My Book Premium Edition
    0910  MyBook Essential External HDD
    1001  External Hard Disk [Elements]
+	1010  Elements External HDD
    1021  Elements 2TB
+	1023  Elements SE
    1103  My Book Studio
    1104  MyBook Mirror Edition External HDD
    1123  My Book 3.0
@@ -12005,6 +12137,8 @@
 106d  San Chieh Manufacturing, Ltd
 106e  ConectL
 106f  Money Controls
+	0009  CT10x Coin Transaction
+	000a  CR10x Coin Recycler
 1076  GCT Semiconductor, Inc.
    0031  Bluetooth Device
    0032  Bluetooth Device
@@ -12077,6 +12211,7 @@
    818a  Silicon Labs FM Radio Reference Design
    8460  Sangoma Wanpipe VoiceTime
    8461  Sangoma U100
+	86bc  C8051F34x AudioDelay [AD-340]
    ea60  CP210x Composite Device
 10c5  Sanei Electric, Inc.
    819a  FM Radio
@@ -12276,6 +12411,7 @@
    6870  MC8780 Device
    6871  MC8781 Device
    6893  MC8777 Device
+	68a3  MC8700 Modem
    9000  Gobi 2000 Wireless Modem (QDL mode)
    9001  Gobi 2000 Wireless Modem
    9002  Gobi 2000 Wireless Modem
@@ -12362,6 +12498,7 @@
    0010  Alta series CCD
 125f  A-DATA Technology Co., Ltd.
    312a  Superior S102
+	312b  Superior S102 Pro
    a91a  Portable HDD CH91
    c81a  Flash drive
    c93a  4GB Pen Drive
@@ -12458,13 +12595,18 @@
    1039  Ideos (tethering mode)
    1406  E1750
    140b  EC1260 Wireless Data Modem HSD USB Card
-	1446  E1552/E1800 (HSPA modem)
+	1446  E1552/E1800/E173 (HSPA modem)
+	14f1  Gobi 3000 HSPA+ Modem
    1501  Pulse
    1505  E398 LTE/UMTS/GSM Modem/Networkcard
    1506  E398 LTE/UMTS/GSM Modem/Networkcard
    150a  E398 LTE/UMTS/GSM Modem/Networkcard
    1520  K3765 HSPA
    1521  K4505 HSPA+
+	1805  AT&T Go Phone U2800A phone
+	1c05  E173s 3G broadband stick (modem on)
+	1c0b  E173s 3G broadband stick (modem off)
+	1d50  ET302s TD-SCDMA/TD-HSDPA Mobile Broadband
    380b  WiMAX USB modem(s)
 12d2  LINE TECH INDUSTRIAL CO., LTD.
 12d6  EMS Dr. Thomas Wuensche
@@ -12486,6 +12628,7 @@
 1307  Transcend Information, Inc.
    0163  256MB/512MB/1GB Flash Drive
    0165  2GB/4GB Flash Drive
+	0310  SD/MicroSD CardReader [hama]
    0330  63-in-1 Multi-Card Reader/Writer
    0361  CR-75: 51-in-1 Card Reader/Writer [Sakar]
    1169  TS2GJF210 JetFlash 210 2GB
@@ -12595,7 +12738,7 @@
 138e  Jungo LTD
    9000  Raisonance S.A. STM32 ARM evaluation board
 1390  TOMTOM B.V.
-	0001  GO 520 T
+	0001  GO 520 T/ONE XL (v9)
 1391  IdealTEK, Inc.
    1000  URTC-1000
 1395  Sennheiser Communications
@@ -12789,6 +12932,7 @@
    013f  Megapixel Auto Focus Webcam
    0142  WB-6250X Webcam
    015a  WB-8300X 2MP Webcam
+	0161  15901 802.11bg Wireless Adapter [Realtek RTL8187L]
    0167  Widescreen 3MP Webcam
 1460  Tatung Co.
    9150  eHome Infrared Transceiver
@@ -12804,12 +12948,16 @@
    e016  eHome Infrared Receiver
    e017  eHome Infrared Receiver
    e018  eHome Infrared Receiver
+	e02c  Infrared Receiver
    e03a  eHome Infrared Receiver
    e03c  eHome Infrared Receiver
    e03e  Infrared Receiver [IR605A/Q]
 147e  Upek
    1000  Biometric Touchchip/Touchstrip Fingerprint Sensor
+	1001  TCS5B Fingerprint sensor
    2016  Biometric Touchchip/Touchstrip Fingerprint Sensor
+	3000  TCS1C EIM/Cypress Fingerprint sensor
+	3001  TCS1C EIM/STM32 Fingerprint sensor
 147f  Hama GmbH & Co., KG
 1482  Vaillant
    1005  VRD PC-Interface
@@ -12832,11 +12980,14 @@
    3070  RT2870/RT3070 Wireless Adapter
    3071  RT3071 Wireless Adapter
    3072  RT3072 Wireless Adapter
+	3370  RT3370 Wireless Adapter
    3572  RT3572 Wireless Adapter
    3573  TEW-684UB
    5370  RT5370 Wireless Adapter
    9020  RT2500USB Wireless Adapter
    9021  RT2501USB Wireless Adapter
+1491  Futronic Technology Co. Ltd.
+	0020  FS81 Fingerprint Scanner Module
 1497  Panstrong Company Ltd.
 1498  Microtek International Inc.
    a090  DVB-T Tuner
@@ -12855,14 +13006,14 @@
 14b0  StarTech.com Ltd.
 14b2  Ralink Technology, Corp.
    3a93  Topcom 802.11bg Wireless Adapter [Atheros AR5523]
-	3a95  Toshiba WUS-G06G-JT 802.11bg Wireless Adapter
+	3a95  Toshiba WUS-G06G-JT 802.11bg Wireless Adapter [Atheros AR5523]
    3a98  Airlink101 AWLL4130 802.11bg Wireless Adapter [Atheros AR5523]
-	3c02  rt2500 802.11g WLAN
+	3c02  Conceptronic C54RU v2 802.11bg Wireless Adapter [Ralink RT2571]
    3c05  rt2570 802.11g WLAN
    3c06  Conceptronic C300RU v1 802.11bgn Wireless Adapter [Ralink RT2870]
    3c07  802.11n adapter
    3c09  802.11n adapter
-	3c22  Conceptronic C54RU 802.11bg Wireless Adapter [Ralink RT73]
+	3c22  Conceptronic C54RU v3 802.11bg Wireless Adapter [Ralink RT2571W]
    3c23  Airlink101 AWLL6080 802.11bgn Wireless Adapter [Ralink RT2870]
    3c24  NEC NP01LM 802.11abg Wireless Adapter [Ralink RT2571W]
    3c25  DrayTek Vigor N61 802.11bgn Wireless Adapter [Ralink RT2870]
@@ -12886,6 +13037,7 @@
    8125  SD MMC Reader
 14d8  JAMER INDUSTRIES CO., LTD.
 14dd  Raritan Computer, Inc.
+	1007  D2CIM-VUSB KVM connector
 14e1  Dialogue Technology Corp.
    5000  PenMount 5000 Touch Controller
 14e5  SAIN Information & Communications Co., Ltd.
@@ -12940,6 +13092,7 @@
    0001  RZ01-020300 Optical Mouse [Diamondback]
    0003  Krait Mouse
    0007  DeathAdder Mouse
+	0016  DeathAdder Mouse
    0017  Imperator Mouse
    001c  RZ01-0036 Optical Gaming Mouse [Abyssus]
    0101  Copperhead Mouse
@@ -13042,6 +13195,7 @@
    0a37  Mouse
    0a41  MI-2540D [Optical mouse]
    0a4c  USB+PS/2 Optical Mouse
+	0a4d  Optical Mouse
 15dc  Hynix Semiconductor Inc.
 15e0  Seong Ji Industrial Co., Ltd.
 15e1  RSA
@@ -13317,6 +13471,22 @@
    03f1  free for internal lab use 1009
    0477  Teensy Rebootor
    0478  Teensy Halfkay Bootloader
+	0479  Teensy Debug
+	047a  Teensy Serial
+	047b  Teensy Serial+Debug
+	047c  Teensy Keyboard
+	047d  Teensy Keyboard+Debug
+	047e  Teensy Mouse
+	047f  Teensy Mouse+Debug
+	0480  Teensy RawHID
+	0481  Teensy RawHID+Debug
+	0482  Teensyduino Keyboard+Mouse+Joystick
+	0483  Teensyduino Serial
+	0484  Teensyduino Disk
+	0485  Teensyduino MIDI
+	0486  Teensyduino RawHID
+	0487  Teensyduino Serial+Keyboard+Mouse+Joystick
+	0488  Teensyduino Flight Sim Controls
    05dc  shared ID for use with libusb
    05dd  BlackcatUSB2
    05e1  CDC-ACM class devices (modems)
@@ -13363,6 +13533,7 @@
    000b  VM
 16df  King Billion Electronics Co., Ltd.
 16f0  GN ReSound A/S
+	0001  Speedlink Programming Interface
    0003  Airlink Wireless Programming Interface
 16f5  Futurelogic Inc.
 1706  BlueView Technologies, Inc.
@@ -13416,6 +13587,7 @@
    5106  Transcend StoreJet 25M3
 174f  Syntek
    1105  SM-MS/Pro-MMC-XD Card Reader
+	110b  HP Webcam
    1403  Integrated Webcam
    1404  USB Camera device, 1.3 MPixel Web Cam
    5212  USB 2.0 UVC PC Camera
@@ -13449,6 +13621,8 @@
    083e  MetaGeek Wi-Spy
    083f  MetaGeek Wi-Spy 2.4x
    0938  Iguanaworks USB IR Transceiver
+	0c30  Telldus TellStick
+	0c31  Telldus TellStick Duo
    0c9f  USBtiny
 1782  Spreadtrum Communications Inc.
 1784  TopSeed Technology Corp.
@@ -13508,9 +13682,15 @@
 17cf  Hip Hing Cable & Plug Mfy. Ltd.
 17d0  Sanford L.P.
 17d3  Korea Techtron Co., Ltd.
-17e9  Newnham Research
+17e9  DisplayLink
    0051  USB VGA Adaptor
+	0377  Plugable UD-160-A (M)
+	0378  Plugable UGA-2K-A
+	0379  Plugable UGA-125
+	037a  Plugable UGA-165
+	037b  Plugable USB-VGA-165
    037c  Plugable DC-125
+	037d  Plugable USB2-HDMI-165
 17eb  Cornice, Inc.
 17ef  Lenovo
    1003  Integrated Smart Card Reader
@@ -13530,6 +13710,7 @@
    4814  Integrated Webcam [R5U877]
    4815  Integrated Webcam [R5U877]
    481c  Integrated Webcam
+	481d  Integrated Webcam
    6007  Smartcard Keyboard
    6009  ThinkPad Keyboard with TrackPoint
    6014  Mini Wireless Keyboard N5901
@@ -13585,6 +13766,7 @@
    0216  External Hard Drive
    0218  External Hard Drive
    0227  Pocket Hard Drive
+	0237  Portable Harddrive (500 GB)
 18b1  Petalynx
    0037  Maxter Remote Control
 18b4  e3C Technologies
@@ -13689,7 +13871,7 @@
    a253  Model 2253 Audio/Video Codec Card (cold)
 1949  Lab126
    0002  Amazon Kindle
-	0004  Amazon Kindle 3
+	0004  Amazon Kindle 3/4
 1951  Hyperstone AG
 1953  Ironkey Inc.
 1954  Radiient Technologies
@@ -13747,6 +13929,7 @@
    0083  MF190
    0103  MF112
    0172  AX226 WIMAX MODEM (After Modeswitch)
+	1203  MF691 [ T-Mobile webConnect Rocket 2.0]
    2000  MF627/MF628/MF628+/MF636+ HSDPA/HSUPA
    fff2  Gobi Wireless Modem (QDL mode)
    fff3  Gobi Wireless Modem
@@ -13773,7 +13956,7 @@
 1a36  Biwin Technology Ltd.
 1a40  Terminus Technology Inc.
    0101  4-Port HUB
-	0201  Hub
+	0201  FE 2.1 7-port Hub
 1a41  Action Electronics Co., Ltd.
 1a44  VASCO Data Security International
    0001  Digipass 905 SmartCard Reader
@@ -13814,6 +13997,8 @@
    0588  DS1000 SERIES
 1acb  Salcomp Plc
 1ad1  Desay Wire Co., Ltd.
+1ad4  APS
+	0002  KM290-HRS
 1adb  SEL C662 Serial Cable
 1ae4  ic-design Reinhard Gottinger GmbH
 1ae7  X-TENSIONS
@@ -13950,7 +14135,7 @@
 1b75  Ovislink Corp.
    3072  AirLive WN-360USB adapter
    8187  AirLive WL-1600USB 802.11g Adapter [Realtek RTL8187L]
-	9170  Airlive X.USB [AR9170]
+	9170  AirLive X.USB 802.11abgn [Atheros AR9170+AR9104]
    a200  AirLive WN-200USB wireless 11b/g/n dongle
 1b76  Legend Silicon Corp.
 1b80  Afatech
@@ -13960,6 +14145,7 @@
    d397  DVB-T receiver [RTL2832U]
    d398  DVB-T receiver [RTL2832U]
    d700  FM Radio SnapMusic Mobile 700 (FM700)
+	e297  Conceptronic DVB-T CTVDIGRCU V3.0
    e383  DVB-T UB383-T [af9015]
    e385  DVB-T UB385-T [af9015]
    e386  DVB-T UB385-T [af9015]
@@ -13997,7 +14183,7 @@
    053a  Targa Silvercrest OMC807-C optische Funkmaus
    05c5  SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver]
    05cf  Micro keyboard & mouse receiver
-	0c31  Serial-ATA bridge
+	0c31  SPIF30x Serial-ATA bridge
 1bd0  Hangzhou Riyue Electronic Co., Ltd.
 1bd5  BG Systems, Inc.
 1bde  P-TWO INDUSTRIES, INC.
@@ -14084,6 +14270,8 @@
 1ce1  Amphenol KAE
 1cfc  ANDES TECHNOLOGY CORPORATION
 1cfd  Flextronics Digital Design Japan, LTD.
+1d03  iCON
+	0028  iCreativ MIDI Controller
 1d07  Solid-Motion
 1d08  NINGBO HENTEK DRAGON ELECTRONICS CO., LTD.
 1d09  TechFaith Wireless Technology Limited
@@ -14107,6 +14295,15 @@
    000e  Ralink RT3070 802.11b/g/n Wireless Lan USB Device
 1d50  OpenMoko, Inc.
    5119  GTA01/GTA02 U-Boot Bootloader
+1d57  Xenta
+	0005  Wireless Receiver (Keyboard and Mouse)
+	0006  Wireless Receiver (RC Laser Pointer)
+	000c  Optical Mouse
+	2400  Wireless Mouse Receiver
+	32da  2.4GHz Receiver (Keyboard and Mouse)
+	83d0  Click-mouse!
+	ac01  Wireless Receiver (Keyboard and Mouse)
+	af01  AUVIO Universal Remote Receiver for PlayStation 3
 1d5b  Smartronix, Inc.
 1d6b  Linux Foundation
    0001  1.1 root hub
@@ -14119,6 +14316,9 @@
    0104  Multifunction Composite Gadget
    0105  FunctionFS Gadget
    0200  Qemu Audio Device
+1de1  Actions Microelectronics Co.
+	1101  Generic Display Device (Mass storage mode)
+	c101  Generic Display Device
 1e0e  Qualcomm / Option
 1e10  Point Grey Research, Inc.
    2004  Sony 1.3MP 1/3" ICX445 IIDC video camera [Chameleon]
@@ -14153,24 +14353,37 @@
 1e71  NZXT
    0001  Avatar Optical Mouse
 1e74  Coby Electronics Corporation
+	2211  MP300
+	2659  Coby 4GB Go Video MP3 Player [MP620-4G]
+	4641  A8705 MP3/Video Player
    6511  MP705-8G MP3 player
    6512  MP705-4G
 1e7d  ROCCAT
    2c24  Pyra Mouse (wired)
    2ced  Kone Mouse
+	2cf6  Pyra Mouse (wireless)
+	2d50  Kova+ Mouse
    2d51  Kone+ Mouse
    30d4  Arvo Keyboard
 1ebb  NuCORE Technology, Inc.
 1eda  AirTies Wireless Networks
-	2310  802.11n USB Wireless LAN Card
+	2012  Air2210 54 Mbps Wireless Adapter
+	2210  Air2210 54 Mbps Wireless Adapter
+	2310  Air2310 150 Mbps Wireless Adapter
+	2410  Air2410 300 Mbps Wireless Adapter
 1edb  Blackmagic design
    bd3b  Intensity Shuttle
 1ee8  ONDA COMMUNICATION S.p.a.
    0014  MT833UP
 1ef6  EADS Deutschland GmbH
+	5064  FDR Interface
+	5648  RIU CSMU/BSD
+	564a  Cassidian RIU CSMU/BSD Simulator
 1f28  Cal-Comp
    0020  CDMA USB Modem A600
    0021  CD INSTALLER USB Device
+1f44  The Neat Company
+	0001  NM-1000 scanner
 1f4d  G-Tek Electronics Group
    b803  Lifeview LV5TDLX DVB-T [RTL2832U]
 1f82  TANDBERG
@@ -14178,9 +14391,14 @@
 1f84  Alere, Inc.
 1f87  Stantum
    0002  Multi-touch HID Controller
+1f9b  Ubiquiti Networks, Inc.
+	0241  AirView2-EXT
 1fbd  Delphin Technology AG
    0001  Expert Key - Data aquisition system
 1fc9  NXP Semiconductors
+	010b  PR533
+1fde  ILX Lightwave Corporation
+	0001  UART Bridge
 1fe7  Vertex Wireless Co., Ltd.
    1000  VW100 series CDMA EV-DO Rev.A modem
 2001  D-Link Corp.
@@ -14190,11 +14408,15 @@
    200c  10/100 Ethernet
    3200  DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a]
    3301  DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U]
+	3306  DWL-G122 Wireless Adapter(rev.F1) [Realtek RTL8188SU]
+	3308  DWA-121 802.11n Wireless N 150 Pico Adapter [Realtek RTL8188CUS]
+	3309  DWA-135 802.11n Wireless N Adapter(rev.A1) [Realtek RTL8192CU]
+	330a  DWA-133 802.11n Wireless N Adapter [Realtek RTL8192CU]
    3500  Elitegroup Computer Systems WLAN card WL-162
    3700  DWL-122 802.11b [Intersil Prism 3]
    3701  DWL-G120 Spinnaker 802.11g [Intersil ISL3886]
    3702  DWL-120 802.11b Wireless Adapter(rev.F) [Intersil ISL3871]
-	3703  AirPlus G DWL-G122 Wireless Adapter [Intersil ISL3886]
+	3703  AirPlus G DWL-G122 Wireless Adapter(rev.A1) [Intersil ISL3880]
    3704  AirPlus G DWL-G122 Wireless Adapter(rev.A2) [Intersil ISL3887]
    3705  AirPlus G DWL-G120 Wireless Adapter(rev.C) [Intersil ISL3887]
    3761  IEEE 802.11g USB2.0 Wireless Network Adapter-PN
@@ -14210,10 +14432,11 @@
    3a83  predator Bootloader Download
    3b00  AirPlus DWL-120+ Wireless Adapter [Texas Instruments ACX100USB]
    3b01  WLAN Boot Device
-	3c00  AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2500USB]
+	3c00  AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2571]
    3c01  AirPlus AG DWL-AG122 Wireless Adapter
    3c02  AirPlus G DWL-G122 Wireless Adapter
    3c05  DUB-E100 Fast Ethernet [asix]
+	3c19  DWA-125 Wireless N 150 Adapter(rev.A3) [Ralink RT5370]
    4000  DSB-650C Ethernet [klsi]
    4001  DSB-650TX Ethernet [pegasus]
    4002  DSB-650TX Ethernet [pegasus]
@@ -14235,12 +14458,15 @@
    f116  Formosa 2
    f117  Formosa 3
    f118  Formosa 4
-2013  Unknown (Pinnacle?)
+2002  DAP Technologies
+2013  PCTV Systems
    0245  PCTV 73ESE
    0246  PCTV 74E
    0248  PCTV 282E
+	024f  nanoStick T2 290e
 2019  PLANEX
    3220  GW-US11S WLAN [Atmel AT76C503A]
+	4903  GW-USFang300 802.11abgn Wireless Adapter [Realtek RTL8192DU]
    5303  GW-US54GXS 802.11bg
    5304  GWUS300 802.11n
    ab01  GW-US54HP
@@ -14248,14 +14474,16 @@
    ab25  GW-USMini2N 802.11n Wireless Adapter [Ralink RT2870]
    ab28  GW-USNano
    ab29  GW-USMicro300
+	ab2a  GW-USNano2 802.11n Wireless Adapter [Realtek RTL8188CUS]
+	ab2c  GW-USDual300 802.11abgn Wireless Adapter [Realtek RTL8192DU]
    ab50  GW-US54Mini2
    c002  GW-US54SG
    c007  GW-US54GZL
    ed02  GW-USMM
-	ed06  802.11n Wireless LAN Adapter
+	ed06  GW-US300MiniW 802.11bgn Wireless Adapter
    ed10  GW-US300Mini2
    ed14  GW-USMicroN
-	ed17  GW-USValue-EZ
+	ed17  GW-USValue-EZ 802.11n Wireless Adapter [Realtek RTL8188CUS]
 2040  Hauppauge
    0c80  Windham
    0c90  Windham
@@ -14271,6 +14499,7 @@
    2400  WinTV PVR USB2 (Model 24019)
    4700  WinTV Nova-S-USB2
    4902  HD PVR
+	4903  HS PVR
    4982  HD PVR
    5500  Windham
    5510  Windham
@@ -14301,12 +14530,18 @@
 2080  Barnes & Noble
    0001  nook
    0002  NOOKcolor
+	0003  NOOK Simple Touch
+	0004  NOOK Tablet
 2087  Cando
    0a01  Multi Touch Panel
    0a02  Multi Touch Panel
    0b03  Multi Touch Panel
 20a0  Clay Logic
+	4123  IKALOGIC SCANALOGIC 2
    414a  MDE SPI Interface
+	415a  OpenPilot
+	415b  CopterControl
+	415c  PipXtreme
 20b1  XMOS Ltd
    10ad  XUSB Loader
    f7d1  XTAG2 - JTAG Adapter
@@ -14321,6 +14556,8 @@
    cb72  ben-wpan, cntr
 20df  Simtec Electronics
    0001  Entropy Key [UDEKEY01]
+20f4  TRENDnet
+	648b  TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]
 2101  ActionStar
    0201  SIIG 4-to-2 Printer Switch
 2162  Creative (?)
@@ -14486,6 +14723,15 @@
    061e  PCTV Deluxe (PAL) Device
 2318  Shining Technologies, Inc. [hex]
    0011  CitiDISK Jr. IDE Enclosure
+2341  Arduino SA
+	0001  Uno (CDC ACM)
+	0010  Mega 2560 (CDC ACM)
+	003b  Serial Adapter (CDC ACM)
+	003f  Mega ADK (CDC ACM)
+	0042  Mega 2560 R3 (CDC ACM)
+	0043  Uno R3 (CDC ACM)
+	0044  Mega ADK R3 (CDC ACM)
+	0045  Serial R3 (CDC ACM)
 2373  Pumatronix Ltda
    0001  5 MegaPixel Digital Still Camera [DSC5M]
 2375  Digit@lway, Inc.
@@ -14497,6 +14743,8 @@
 2632  TwinMOS
    3209  7-in-1 Card Reader
 2650  Electronics For Imaging, Inc. [hex]
+2659  Sundtek
+	1101  TNT DVB-T/DAB/DAB+/FM
 2730  Citizen
    200f  CT-S310 Label printer
 2735  DigitalWay
diff --git a/src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch b/src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch
new file mode 100644
index 0000000..9c874c8
--- /dev/null
+++ b/src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch
@@ -0,0 +1,452 @@
+diff -Naur Pound-2.6.orig/config.c Pound-2.6.reneg-ciphers-altnames-nosslv2/config.c
+--- Pound-2.6.orig/config.c	2011-12-28 14:57:45.000000000 +0100
++++ Pound-2.6.reneg-ciphers-altnames-nosslv2/config.c	2012-02-15 21:49:39.000000000 +0100
+@@ -31,6 +31,8 @@
+ 
+ #include    "pound.h"
+ 
++#include    <openssl/x509v3.h>
++
+ #ifdef MISS_FACILITYNAMES
+ 
+ /* This is lifted verbatim from the Linux sys/syslog.h */
+@@ -76,7 +78,7 @@
+ static regex_t  Err414, Err500, Err501, Err503, MaxRequest, HeadRemove, RewriteLocation, RewriteDestination;
+ static regex_t  Service, ServiceName, URL, HeadRequire, HeadDeny, BackEnd, Emergency, Priority, HAport, HAportAddr;
+ static regex_t  Redirect, RedirectN, TimeOut, Session, Type, TTL, ID, DynScale;
+-static regex_t  ClientCert, AddHeader, Ciphers, CAlist, VerifyList, CRLlist, NoHTTPS11;
++static regex_t  ClientCert, AddHeader, DisableSSLv2, SSLAllowClientRenegotiation, SSLHonorCipherOrder, Ciphers, CAlist, VerifyList, CRLlist, NoHTTPS11;
+ static regex_t  Grace, Include, ConnTO, IgnoreCase, HTTPS, HTTPSCert, Disabled, Threads, CNName;
+ 
+ static regmatch_t   matches[5];
+@@ -167,6 +169,53 @@
+     }
+ }
+ 
++unsigned char **
++get_subjectaltnames(X509 *x509, unsigned int *count)
++{
++    *count = 0;
++    unsigned int local_count = 0;
++    unsigned char **result = NULL;
++
++    STACK_OF(GENERAL_NAME) *san_stack = (STACK_OF(GENERAL_NAME)*)X509_get_ext_d2i(x509, NID_subject_alt_name, NULL, NULL);     
++
++    unsigned char *temp[sk_GENERAL_NAME_num(san_stack)];
++
++    GENERAL_NAME *name = NULL;
++    while(sk_GENERAL_NAME_num(san_stack) > 0)
++    {
++        name = sk_GENERAL_NAME_pop(san_stack);
++
++        switch(name->type)
++        {
++            case GEN_DNS:
++                temp[local_count] = strndup(ASN1_STRING_data(name->d.dNSName), ASN1_STRING_length(name->d.dNSName)+1);
++                if(temp[local_count] == NULL) { conf_err("out of memory"); }
++                local_count++;
++                break;
++            default:
++              logmsg(LOG_INFO, "unsupported subjectAltName type encountered: %i", name->type);
++        }
++
++        GENERAL_NAME_free(name);
++    }
++
++    result = (unsigned char**)malloc(sizeof(unsigned char*)*local_count);
++    if(result == NULL) { conf_err("out of memory"); }
++    int i;
++    for(i = 0;i < local_count; i++)
++    {
++        result[i] = strndup(temp[i], strlen(temp[i])+1);
++        if(result[i] == NULL) { conf_err("out of memory"); }
++
++        free(temp[i]);
++    }
++    *count = local_count;
++
++    sk_GENERAL_NAME_pop_free(san_stack, GENERAL_NAME_free);
++
++    return result;
++}
++
+ /*
+  * parse a back-end
+  */
+@@ -289,9 +338,12 @@
+         } else if(!regexec(&HTTPS, lin, 4, matches, 0)) {
+             if((res->ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
+                 conf_err("SSL_CTX_new failed - aborted");
++            SSL_CTX_set_app_data(res->ctx, res);
+             SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL);
+             SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY);
+             SSL_CTX_set_options(res->ctx, SSL_OP_ALL);
++            SSL_CTX_clear_options(res->ctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
++            SSL_CTX_clear_options(res->ctx, SSL_OP_LEGACY_SERVER_CONNECT);
+             sprintf(lin, "%d-Pound-%ld", getpid(), random());
+             SSL_CTX_set_session_id_context(res->ctx, (unsigned char *)lin, strlen(lin));
+             SSL_CTX_set_tmp_rsa_callback(res->ctx, RSA_tmp_callback);
+@@ -299,6 +351,7 @@
+         } else if(!regexec(&HTTPSCert, lin, 4, matches, 0)) {
+             if((res->ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
+                 conf_err("SSL_CTX_new failed - aborted");
++            SSL_CTX_set_app_data(res->ctx, res);
+             lin[matches[1].rm_eo] = '\0';
+             if(SSL_CTX_use_certificate_chain_file(res->ctx, lin + matches[1].rm_so) != 1)
+                 conf_err("SSL_CTX_use_certificate_chain_file failed - aborted");
+@@ -309,6 +362,8 @@
+             SSL_CTX_set_verify(res->ctx, SSL_VERIFY_NONE, NULL);
+             SSL_CTX_set_mode(res->ctx, SSL_MODE_AUTO_RETRY);
+             SSL_CTX_set_options(res->ctx, SSL_OP_ALL);
++            SSL_CTX_clear_options(res->ctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION);
++            SSL_CTX_clear_options(res->ctx, SSL_OP_LEGACY_SERVER_CONNECT);
+             sprintf(lin, "%d-Pound-%ld", getpid(), random());
+             SSL_CTX_set_session_id_context(res->ctx, (unsigned char *)lin, strlen(lin));
+             SSL_CTX_set_tmp_rsa_callback(res->ctx, RSA_tmp_callback);
+@@ -805,13 +860,23 @@
+     /* logmsg(LOG_DEBUG, "Received SSL SNI Header for servername %s", servername); */
+ 
+     SSL_set_SSL_CTX(ssl, NULL);
+-    for(pc = ctx; pc; pc = pc->next)
++    for(pc = ctx; pc; pc = pc->next) {
+         if(fnmatch(pc->server_name, server_name, 0) == 0) {
+             /* logmsg(LOG_DEBUG, "Found cert for %s", servername); */
+             SSL_set_SSL_CTX(ssl, pc->ctx);
+             return SSL_TLSEXT_ERR_OK;
+         }
+-
++        else if(pc->subjectAltNameCount > 0 && pc->subjectAltNames != NULL) {
++            int i;
++            for(i = 0; i < pc->subjectAltNameCount; i++) {
++                if(fnmatch(pc->subjectAltNames[i], server_name, 0) == 0) {
++                    SSL_set_SSL_CTX(ssl, pc->ctx);
++                    return SSL_TLSEXT_ERR_OK;
++                }
++            }
++        }
++    }
++    
+     /* logmsg(LOG_DEBUG, "No match for %s, default used", server_name); */
+     SSL_set_SSL_CTX(ssl, ctx->ctx);
+     return SSL_TLSEXT_ERR_OK;
+@@ -829,11 +894,15 @@
+     SERVICE     *svc;
+     MATCHER     *m;
+     int         has_addr, has_port, has_other;
++    long	ssl_op_enable, ssl_op_disable;
+     struct hostent      *host;
+     struct sockaddr_in  in;
+     struct sockaddr_in6 in6;
+     POUND_CTX   *pc;
+ 
++    ssl_op_enable = SSL_OP_ALL;
++    ssl_op_disable = SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION | SSL_OP_LEGACY_SERVER_CONNECT;
++
+     if((res = (LISTENER *)malloc(sizeof(LISTENER))) == NULL)
+         conf_err("ListenHTTPS config: out of memory - aborted");
+     memset(res, 0, sizeof(LISTENER));
+@@ -844,6 +913,8 @@
+     res->err500 = "An internal server error occurred. Please try again later.";
+     res->err501 = "This method may not be used.";
+     res->err503 = "The service is not available. Please try again later.";
++    res->allow_client_reneg = 0;
++    res->disable_ssl_v2 = 0;
+     res->log_level = log_level;
+     if(regcomp(&res->verb, xhttp[0], REG_ICASE | REG_NEWLINE | REG_EXTENDED))
+         conf_err("xHTTP bad default pattern - aborted");
+@@ -959,6 +1030,9 @@
+             fclose(fcert);
+             memset(server_name, '\0', MAXBUF);
+             X509_NAME_oneline(X509_get_subject_name(x509), server_name, MAXBUF - 1);
++            pc->subjectAltNameCount = 0;
++            pc->subjectAltNames = NULL;
++            pc->subjectAltNames = get_subjectaltnames(x509, &(pc->subjectAltNameCount));
+             X509_free(x509);
+             if(!regexec(&CNName, server_name, 4, matches, 0)) {
+                 server_name[matches[1].rm_eo] = '\0';
+@@ -1029,6 +1103,25 @@
+                 strcat(res->add_head, "\r\n");
+                 strcat(res->add_head, lin + matches[1].rm_so);
+             }
++	} else if(!regexec(&DisableSSLv2, lin, 4, matches, 0)) {
++	    res->disable_ssl_v2 = 1;
++        } else if(!regexec(&SSLAllowClientRenegotiation, lin, 4, matches, 0)) {
++            res->allow_client_reneg = atoi(lin + matches[1].rm_so);
++            if (res->allow_client_reneg == 2) {
++                ssl_op_enable |= SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
++                ssl_op_disable &= ~SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
++            } else {
++                ssl_op_disable |= SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
++                ssl_op_enable &= ~SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
++            }
++        } else if(!regexec(&SSLHonorCipherOrder, lin, 4, matches, 0)) {
++            if (atoi(lin + matches[1].rm_so)) {
++                ssl_op_enable |= SSL_OP_CIPHER_SERVER_PREFERENCE;
++                ssl_op_disable &= ~SSL_OP_CIPHER_SERVER_PREFERENCE;
++            } else {
++                ssl_op_disable |= SSL_OP_CIPHER_SERVER_PREFERENCE;
++                ssl_op_enable &= ~SSL_OP_CIPHER_SERVER_PREFERENCE;
++            }
+         } else if(!regexec(&Ciphers, lin, 4, matches, 0)) {
+             has_other = 1;
+             if(res->ctx == NULL)
+@@ -1105,12 +1198,19 @@
+                 conf_err("ListenHTTPS: can't set SNI callback");
+ #endif
+             for(pc = res->ctx; pc; pc = pc->next) {
++                SSL_CTX_set_app_data(pc->ctx, res);
+                 SSL_CTX_set_mode(pc->ctx, SSL_MODE_AUTO_RETRY);
+-                SSL_CTX_set_options(pc->ctx, SSL_OP_ALL);
++                SSL_CTX_set_options(pc->ctx, ssl_op_enable);
++                SSL_CTX_clear_options(pc->ctx, ssl_op_disable);
++		if (res->disable_ssl_v2 == 1)
++		{
++		    SSL_CTX_set_options(pc->ctx, SSL_OP_NO_SSLv2);
++		}
+                 sprintf(lin, "%d-Pound-%ld", getpid(), random());
+                 SSL_CTX_set_session_id_context(pc->ctx, (unsigned char *)lin, strlen(lin));
+                 SSL_CTX_set_tmp_rsa_callback(pc->ctx, RSA_tmp_callback);
+                 SSL_CTX_set_tmp_dh_callback(pc->ctx, DH_tmp_callback);
++                SSL_CTX_set_info_callback(pc->ctx, SSLINFO_callback);
+             }
+             return res;
+         } else {
+@@ -1305,6 +1405,9 @@
+     || regcomp(&DynScale, "^[ \t]*DynScale[ \t]+([01])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+     || regcomp(&ClientCert, "^[ \t]*ClientCert[ \t]+([0-3])[ \t]+([1-9])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+     || regcomp(&AddHeader, "^[ \t]*AddHeader[ \t]+"(.+)"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
++    || regcomp(&SSLAllowClientRenegotiation, "^[ \t]*SSLAllowClientRenegotiation[ \t]+([012])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
++    || regcomp(&DisableSSLv2, "^[ \t]*DisableSSLv2[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
++    || regcomp(&SSLHonorCipherOrder, "^[ \t]*SSLHonorCipherOrder[ \t]+([01])[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+     || regcomp(&Ciphers, "^[ \t]*Ciphers[ \t]+"(.+)"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+     || regcomp(&CAlist, "^[ \t]*CAlist[ \t]+"(.+)"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+     || regcomp(&VerifyList, "^[ \t]*VerifyList[ \t]+"(.+)"[ \t]*$", REG_ICASE | REG_NEWLINE | REG_EXTENDED)
+@@ -1463,6 +1566,9 @@
+     regfree(&DynScale);
+     regfree(&ClientCert);
+     regfree(&AddHeader);
++    regfree(&SSLAllowClientRenegotiation);
++    regfree(&DisableSSLv2);
++    regfree(&SSLHonorCipherOrder);
+     regfree(&Ciphers);
+     regfree(&CAlist);
+     regfree(&VerifyList);
+diff -Naur Pound-2.6.orig/http.c Pound-2.6.reneg-ciphers-altnames-nosslv2/http.c
+--- Pound-2.6.orig/http.c	2011-12-28 14:57:45.000000000 +0100
++++ Pound-2.6.reneg-ciphers-altnames-nosslv2/http.c	2012-02-15 21:44:46.000000000 +0100
+@@ -246,6 +246,11 @@
+ 
+ static int  err_to = -1;
+ 
++typedef struct {
++    int timeout;
++    RENEG_STATE *reneg_state;
++} BIO_ARG;
++
+ /*
+  * Time-out for client read/gets
+  * the SSL manual says not to do it, but it works well enough anyway...
+@@ -253,18 +258,32 @@
+ static long
+ bio_callback(BIO *const bio, const int cmd, const char *argp, int argi, long argl, long ret)
+ {
++    BIO_ARG *bio_arg;
+     struct pollfd   p;
+     int             to, p_res, p_err;
+ 
+     if(cmd != BIO_CB_READ && cmd != BIO_CB_WRITE)
+         return ret;
+ 
++    //logmsg(LOG_NOTICE, "bio callback");
+     /* a time-out already occured */
+-    if((to = *((int *)BIO_get_callback_arg(bio)) * 1000) < 0) {
++    if((bio_arg = (BIO_ARG*)BIO_get_callback_arg(bio))==NULL) return ret;
++    if((to = bio_arg->timeout * 1000) < 0) {
+         errno = ETIMEDOUT;
+         return -1;
+     }
+ 
++    /* Renegotiations */
++    //logmsg(LOG_NOTICE, "RENEG STATE %d", bio_arg->reneg_state==NULL?-1:*bio_arg->reneg_state);
++    if (bio_arg->reneg_state != NULL && *bio_arg->reneg_state == RENEG_ABORT) {
++        logmsg(LOG_NOTICE, "REJECTING renegotiated session");
++        errno = ECONNABORTED;
++        return -1;
++    }
++
++    //logmsg(LOG_NOTICE, "TO %d", to);
++    if (to == 0) return ret;
++
+     for(;;) {
+         memset(&p, 0, sizeof(p));
+         BIO_get_fd(bio, &p.fd);
+@@ -299,7 +318,7 @@
+             return -1;
+         case 0:
+             /* timeout - mark the BIO as unusable for the future */
+-            BIO_set_callback_arg(bio, (char *)&err_to);
++            bio_arg->timeout = err_to;
+ #ifdef  EBUG
+             logmsg(LOG_WARNING, "(%lx) CALLBACK timeout poll after %d secs: %s",
+                 pthread_self(), to / 1000, strerror(p_err));
+@@ -503,7 +522,14 @@
+     regmatch_t          matches[4];
+     struct linger       l;
+     double              start_req, end_req;
++    RENEG_STATE		reneg_state;
++    BIO_ARG		ba1, ba2;
+ 
++    reneg_state = RENEG_INIT;
++    ba1.reneg_state =  &reneg_state;
++    ba2.reneg_state = &reneg_state;
++    ba1.timeout = 0;
++    ba2.timeout = 0;
+     from_host = ((thr_arg *)arg)->from_host;
+     memcpy(&from_host_addr, from_host.ai_addr, from_host.ai_addrlen);
+     from_host.ai_addr = (struct sockaddr *)&from_host_addr;
+@@ -512,6 +538,8 @@
+     free(((thr_arg *)arg)->from_host.ai_addr);
+     free(arg);
+ 
++    if(lstn->allow_client_reneg) reneg_state = RENEG_ALLOW;
++
+     n = 1;
+     setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (void *)&n, sizeof(n));
+     l.l_onoff = 1;
+@@ -535,10 +563,11 @@
+         close(sock);
+         return;
+     }
+-    if(lstn->to > 0) {
+-        BIO_set_callback_arg(cl, (char *)&lstn->to);
++    //if(lstn->to > 0) {
++        ba1.timeout = lstn->to;
++        BIO_set_callback_arg(cl, (char *)&ba1);
+         BIO_set_callback(cl, bio_callback);
+-    }
++    //}
+ 
+     if(lstn->ctx != NULL) {
+         if((ssl = SSL_new(lstn->ctx->ctx)) == NULL) {
+@@ -547,6 +576,7 @@
+             BIO_free_all(cl);
+             return;
+         }
++        SSL_set_app_data(ssl, &reneg_state);
+         SSL_set_bio(ssl, cl, cl);
+         if((bb = BIO_new(BIO_f_ssl())) == NULL) {
+             logmsg(LOG_WARNING, "(%lx) BIO_new(Bio_f_ssl()) failed", pthread_self());
+@@ -848,7 +878,8 @@
+             }
+             BIO_set_close(be, BIO_CLOSE);
+             if(backend->to > 0) {
+-                BIO_set_callback_arg(be, (char *)&backend->to);
++                ba2.timeout = backend->to;
++                BIO_set_callback_arg(be, (char *)&ba2);
+                 BIO_set_callback(be, bio_callback);
+             }
+             if(backend->ctx != NULL) {
+diff -Naur Pound-2.6.orig/pound.8 Pound-2.6.reneg-ciphers-altnames-nosslv2/pound.8
+--- Pound-2.6.orig/pound.8	2011-12-28 14:57:45.000000000 +0100
++++ Pound-2.6.reneg-ciphers-altnames-nosslv2/pound.8	2012-02-15 21:44:46.000000000 +0100
+@@ -501,6 +501,19 @@
+ and
+ .I SSL_CTX_set_cipher_list(3).
+ .TP
++\fBSSLHonorCipherOrder\fR 0|1
++If this value is 1, the server will broadcast a preference to use \fBCiphers\fR in the
++order supplied in the \fBCiphers\fR directive.  If the value is 0, the server will treat
++the Ciphers list as the list of Ciphers it will accept, but no preference will be
++indicated.  Default value is 0.
++.TP
++\fBSSLAllowClientRenegotiation\fR 0|1|2
++If this value is 0, client initiated renegotiation will be disabled.  This will mitigate
++DoS exploits based on client renegotiation, regardless of the patch status of clients and
++servers related to "Secure renegotiation".  If the value is 1, secure renegotiation is
++supported.  If the value is 2, insecure renegotiation is supported, with unpatched
++clients.  /fBThis can lead to a DoS and a Man in the Middle attack!/fR  Default value is 0.
++.TP
+ \fBCAlist\fR "CAcert_file"
+ Set the list of "trusted" CA's for this server. The CAcert_file is a file containing
+ a sequence of CA certificates (PEM format). The names of the defined CA certificates
+diff -Naur Pound-2.6.orig/pound.h Pound-2.6.reneg-ciphers-altnames-nosslv2/pound.h
+--- Pound-2.6.orig/pound.h	2011-12-28 14:57:45.000000000 +0100
++++ Pound-2.6.reneg-ciphers-altnames-nosslv2/pound.h	2012-02-15 21:49:39.000000000 +0100
+@@ -380,6 +380,8 @@
+     SSL_CTX             *ctx;
+     char                *server_name;
+     struct _pound_ctx   *next;
++    unsigned int        subjectAltNameCount;
++    unsigned char       **subjectAltNames;
+ } POUND_CTX;
+ 
+ /* Listener definition */
+@@ -404,6 +406,8 @@
+     int                 rewr_dest;      /* rewrite destination header */
+     int                 disabled;       /* true if the listener is disabled */
+     int                 log_level;      /* log level for this listener */
++    int                 allow_client_reneg; /* Allow Client SSL Renegotiation */
++    int                disable_ssl_v2; /* Disable SSL version 2 */
+     SERVICE             *services;
+     struct _listener    *next;
+ }   LISTENER;
+@@ -419,6 +423,9 @@
+     struct _thr_arg *next;
+ }   thr_arg;                        /* argument to processing threads: socket, origin */
+ 
++/* Track SSL handshare/renegotiation so we can reject client-renegotiations. */
++typedef enum { RENEG_INIT=0, RENEG_REJECT, RENEG_ALLOW, RENEG_ABORT } RENEG_STATE;
++
+ /* Header types */
+ #define HEADER_ILLEGAL              -1
+ #define HEADER_OTHER                0
+@@ -591,6 +598,11 @@
+ extern DH   *DH_tmp_callback(SSL *, int, int);
+ 
+ /*
++ * Renegotiation callback
++ */
++extern void SSLINFO_callback(const SSL *s, int where, int rc);
++
++/*
+  * expiration stuff
+  */
+ #ifndef EXPIRE_TO
+diff -Naur Pound-2.6.orig/svc.c Pound-2.6.reneg-ciphers-altnames-nosslv2/svc.c
+--- Pound-2.6.orig/svc.c	2011-12-28 14:57:45.000000000 +0100
++++ Pound-2.6.reneg-ciphers-altnames-nosslv2/svc.c	2012-02-15 21:44:46.000000000 +0100
+@@ -1797,3 +1797,34 @@
+         close(ctl);
+     }
+ }
++
++void
++SSLINFO_callback(const SSL *ssl, int where, int rc)
++{
++    RENEG_STATE *reneg_state;
++
++    /* Get our thr_arg where we're tracking this connection info */
++    if ((reneg_state = (RENEG_STATE *)SSL_get_app_data(ssl)) == NULL) return;
++
++    /* If we're rejecting renegotiations, move to ABORT if Client Hello is being read. */
++    if ((where & SSL_CB_ACCEPT_LOOP) && *reneg_state == RENEG_REJECT) {
++        int state = SSL_get_state(ssl);
++
++        if (state == SSL3_ST_SR_CLNT_HELLO_A || state == SSL23_ST_SR_CLNT_HELLO_A) {
++           *reneg_state = RENEG_ABORT;
++           logmsg(LOG_WARNING,"rejecting client initiated renegotiation");
++        }
++    }
++    else if (where & SSL_CB_HANDSHAKE_DONE && *reneg_state == RENEG_INIT) {
++       // Reject any followup renegotiations
++       *reneg_state = RENEG_REJECT;
++    }
++
++    //if (where & SSL_CB_HANDSHAKE_START) logmsg(LOG_DEBUG, "handshake start");
++    //else if (where & SSL_CB_HANDSHAKE_DONE) logmsg(LOG_DEBUG, "handshake done");
++    //else if (where & SSL_CB_LOOP) logmsg(LOG_DEBUG, "loop");
++    //else if (where & SSL_CB_READ) logmsg(LOG_DEBUG, "read");
++    //else if (where & SSL_CB_WRITE) logmsg(LOG_DEBUG, "write");
++    //else if (where & SSL_CB_ALERT) logmsg(LOG_DEBUG, "alert");
++}
++
diff --git a/src/patches/openssl-0.9.8u-cryptodev.patch b/src/patches/openssl-0.9.8u-cryptodev.patch
new file mode 100644
index 0000000..920648d
--- /dev/null
+++ b/src/patches/openssl-0.9.8u-cryptodev.patch
@@ -0,0 +1,882 @@
+diff -Naur openssl-0.9.8u.org/crypto/engine/eng_all.c openssl-0.9.8u/crypto/engine/eng_all.c
+--- openssl-0.9.8u.org/crypto/engine/eng_all.c	2010-03-01 01:30:11.000000000 +0100
++++ openssl-0.9.8u/crypto/engine/eng_all.c	2012-03-27 14:07:11.000000000 +0200
+@@ -113,7 +113,6 @@
+ #endif
+ 	}
+ 
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+ void ENGINE_setup_bsd_cryptodev(void) {
+ 	static int bsd_cryptodev_default_loaded = 0;
+ 	if (!bsd_cryptodev_default_loaded) {
+@@ -122,4 +121,3 @@
+ 	}
+ 	bsd_cryptodev_default_loaded=1;
+ }
+-#endif
+diff -Naur openssl-0.9.8u.org/crypto/engine/eng_cryptodev.c openssl-0.9.8u/crypto/engine/eng_cryptodev.c
+--- openssl-0.9.8u.org/crypto/engine/eng_cryptodev.c	2012-03-06 14:22:32.000000000 +0100
++++ openssl-0.9.8u/crypto/engine/eng_cryptodev.c	2012-03-27 14:02:59.000000000 +0200
+@@ -2,6 +2,7 @@
+  * Copyright (c) 2002 Bob Beck beck@openbsd.org
+  * Copyright (c) 2002 Theo de Raadt
+  * Copyright (c) 2002 Markus Friedl
++ * Copyright (c) 2012 Nikos Mavrogiannopoulos
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -30,10 +31,6 @@
+ #include <openssl/engine.h>
+ #include <openssl/evp.h>
+ #include <openssl/bn.h>
+-#include <openssl/dsa.h>
+-#include <openssl/rsa.h>
+-#include <openssl/dh.h>
+-#include <openssl/err.h>
+ 
+ #if (defined(__unix__) || defined(unix)) && !defined(USG) && \
+ 	(defined(OpenBSD) || defined(__FreeBSD__))
+@@ -59,6 +56,10 @@
+  
+ #include <sys/types.h>
+ #include <crypto/cryptodev.h>
++#include <crypto/dh/dh.h>
++#include <crypto/dsa/dsa.h>
++#include <crypto/err/err.h>
++#include <crypto/rsa/rsa.h>
+ #include <sys/ioctl.h>
+ #include <errno.h>
+ #include <stdio.h>
+@@ -72,6 +73,12 @@
+ struct dev_crypto_state {
+ 	struct session_op d_sess;
+ 	int d_fd;
++
++#ifdef USE_CRYPTODEV_DIGESTS
++	unsigned char digest_res[HASH_MAX_LEN];
++	char *mac_data;
++	int mac_len;
++#endif
+ };
+ 
+ static u_int32_t cryptodev_asymfeat = 0;
+@@ -79,15 +86,14 @@
+ static int get_asym_dev_crypto(void);
+ static int open_dev_crypto(void);
+ static int get_dev_crypto(void);
+-static int cryptodev_max_iv(int cipher);
+-static int cryptodev_key_length_valid(int cipher, int len);
+-static int cipher_nid_to_cryptodev(int nid);
+ static int get_cryptodev_ciphers(const int **cnids);
+-/*static int get_cryptodev_digests(const int **cnids);*/
++#ifdef USE_CRYPTODEV_DIGESTS
++static int get_cryptodev_digests(const int **cnids);
++#endif
+ static int cryptodev_usable_ciphers(const int **nids);
+ static int cryptodev_usable_digests(const int **nids);
+ static int cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+-    const unsigned char *in, unsigned int inl);
++    const unsigned char *in, size_t inl);
+ static int cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+     const unsigned char *iv, int enc);
+ static int cryptodev_cleanup(EVP_CIPHER_CTX *ctx);
+@@ -121,7 +127,7 @@
+ static int cryptodev_dh_compute_key(unsigned char *key,
+     const BIGNUM *pub_key, DH *dh);
+ static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p,
+-    void (*f)());
++    void (*f)(void));
+ void ENGINE_load_cryptodev(void);
+ 
+ static const ENGINE_CMD_DEFN cryptodev_defns[] = {
+@@ -134,27 +140,38 @@
+ 	int	ivmax;
+ 	int	keylen;
+ } ciphers[] = {
++	{ CRYPTO_ARC4,			NID_rc4,		0,	16, },
+ 	{ CRYPTO_DES_CBC,		NID_des_cbc,		8,	 8, },
+ 	{ CRYPTO_3DES_CBC,		NID_des_ede3_cbc,	8,	24, },
+ 	{ CRYPTO_AES_CBC,		NID_aes_128_cbc,	16,	16, },
++	{ CRYPTO_AES_CBC,		NID_aes_192_cbc,	16,	24, },
++	{ CRYPTO_AES_CBC,		NID_aes_256_cbc,	16,	32, },
+ 	{ CRYPTO_BLF_CBC,		NID_bf_cbc,		8,	16, },
+ 	{ CRYPTO_CAST_CBC,		NID_cast5_cbc,		8,	16, },
+ 	{ CRYPTO_SKIPJACK_CBC,		NID_undef,		0,	 0, },
+ 	{ 0,				NID_undef,		0,	 0, },
+ };
+ 
+-#if 0
++#ifdef USE_CRYPTODEV_DIGESTS
+ static struct {
+ 	int	id;
+ 	int	nid;
++	int 	digestlen;
+ } digests[] = {
+-	{ CRYPTO_SHA1_HMAC,		NID_hmacWithSHA1,	},
+-	{ CRYPTO_RIPEMD160_HMAC,	NID_ripemd160,		},
+-	{ CRYPTO_MD5_KPDK,		NID_undef,		},
+-	{ CRYPTO_SHA1_KPDK,		NID_undef,		},
+-	{ CRYPTO_MD5,			NID_md5,		},
+-	{ CRYPTO_SHA1,			NID_undef,		},
+-	{ 0,				NID_undef,		},
++#if 0
++        /* HMAC is not supported */
++	{ CRYPTO_MD5_HMAC,		NID_hmacWithMD5,	16},
++	{ CRYPTO_SHA1_HMAC,		NID_hmacWithSHA1,	20},
++	{ CRYPTO_SHA2_256_HMAC,		NID_hmacWithSHA256,	32},
++	{ CRYPTO_SHA2_384_HMAC,		NID_hmacWithSHA384,	48},
++	{ CRYPTO_SHA2_512_HMAC,		NID_hmacWithSHA512,	64},
++#endif
++	{ CRYPTO_MD5,			NID_md5,		16},
++	{ CRYPTO_SHA1,			NID_sha1,		20},
++	{ CRYPTO_SHA2_256,		NID_sha256,		32},
++	{ CRYPTO_SHA2_384,		NID_sha384,		48},
++	{ CRYPTO_SHA2_512,		NID_sha512,		64},
++	{ 0,				NID_undef,		0},
+ };
+ #endif
+ 
+@@ -186,6 +203,7 @@
+ 
+ 	if ((fd = open_dev_crypto()) == -1)
+ 		return (-1);
++#ifndef CRIOGET_NOT_NEEDED
+ 	if (ioctl(fd, CRIOGET, &retfd) == -1)
+ 		return (-1);
+ 
+@@ -194,9 +212,19 @@
+ 		close(retfd);
+ 		return (-1);
+ 	}
++#else
++        retfd = fd;
++#endif
+ 	return (retfd);
+ }
+ 
++static void put_dev_crypto(int fd)
++{
++#ifndef CRIOGET_NOT_NEEDED
++	close(fd);
++#endif
++}
++
+ /* Caching version for asym operations */
+ static int
+ get_asym_dev_crypto(void)
+@@ -209,50 +237,6 @@
+ }
+ 
+ /*
+- * XXXX this needs to be set for each alg - and determined from
+- * a running card.
+- */
+-static int
+-cryptodev_max_iv(int cipher)
+-{
+-	int i;
+-
+-	for (i = 0; ciphers[i].id; i++)
+-		if (ciphers[i].id == cipher)
+-			return (ciphers[i].ivmax);
+-	return (0);
+-}
+-
+-/*
+- * XXXX this needs to be set for each alg - and determined from
+- * a running card. For now, fake it out - but most of these
+- * for real devices should return 1 for the supported key
+- * sizes the device can handle.
+- */
+-static int
+-cryptodev_key_length_valid(int cipher, int len)
+-{
+-	int i;
+-
+-	for (i = 0; ciphers[i].id; i++)
+-		if (ciphers[i].id == cipher)
+-			return (ciphers[i].keylen == len);
+-	return (0);
+-}
+-
+-/* convert libcrypto nids to cryptodev */
+-static int
+-cipher_nid_to_cryptodev(int nid)
+-{
+-	int i;
+-
+-	for (i = 0; ciphers[i].id; i++)
+-		if (ciphers[i].nid == nid)
+-			return (ciphers[i].id);
+-	return (0);
+-}
+-
+-/*
+  * Find out what ciphers /dev/crypto will let us have a session for.
+  * XXX note, that some of these openssl doesn't deal with yet!
+  * returning them here is harmless, as long as we return NULL
+@@ -264,13 +248,14 @@
+ 	static int nids[CRYPTO_ALGORITHM_MAX];
+ 	struct session_op sess;
+ 	int fd, i, count = 0;
++	unsigned char fake_key[CRYPTO_CIPHER_MAX_KEY_LEN];
+ 
+ 	if ((fd = get_dev_crypto()) < 0) {
+ 		*cnids = NULL;
+ 		return (0);
+ 	}
+ 	memset(&sess, 0, sizeof(sess));
+-	sess.key = (caddr_t)"123456781234567812345678";
++	sess.key = (void*)fake_key;
+ 
+ 	for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
+ 		if (ciphers[i].nid == NID_undef)
+@@ -282,7 +267,7 @@
+ 		    ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
+ 			nids[count++] = ciphers[i].nid;
+ 	}
+-	close(fd);
++	put_dev_crypto(fd);
+ 
+ 	if (count > 0)
+ 		*cnids = nids;
+@@ -291,7 +276,7 @@
+ 	return (count);
+ }
+ 
+-#if 0  /* unused */
++#ifdef USE_CRYPTODEV_DIGESTS
+ /*
+  * Find out what digests /dev/crypto will let us have a session for.
+  * XXX note, that some of these openssl doesn't deal with yet!
+@@ -302,6 +287,7 @@
+ get_cryptodev_digests(const int **cnids)
+ {
+ 	static int nids[CRYPTO_ALGORITHM_MAX];
++	unsigned char fake_key[CRYPTO_CIPHER_MAX_KEY_LEN];
+ 	struct session_op sess;
+ 	int fd, i, count = 0;
+ 
+@@ -310,16 +296,18 @@
+ 		return (0);
+ 	}
+ 	memset(&sess, 0, sizeof(sess));
++	sess.mackey = fake_key;
+ 	for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
+ 		if (digests[i].nid == NID_undef)
+ 			continue;
+ 		sess.mac = digests[i].id;
++		sess.mackeylen = 8;
+ 		sess.cipher = 0;
+ 		if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
+ 		    ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
+ 			nids[count++] = digests[i].nid;
+ 	}
+-	close(fd);
++	put_dev_crypto(fd);
+ 
+ 	if (count > 0)
+ 		*cnids = nids;
+@@ -327,8 +315,7 @@
+ 		*cnids = NULL;
+ 	return (count);
+ }
+-
+-#endif
++#endif  /* 0 */
+ 
+ /*
+  * Find the useable ciphers|digests from dev/crypto - this is the first
+@@ -360,6 +347,9 @@
+ static int
+ cryptodev_usable_digests(const int **nids)
+ {
++#ifdef USE_CRYPTODEV_DIGESTS
++	return (get_cryptodev_digests(nids));
++#else
+ 	/*
+ 	 * XXXX just disable all digests for now, because it sucks.
+ 	 * we need a better way to decide this - i.e. I may not
+@@ -374,11 +364,12 @@
+ 	 */
+ 	*nids = NULL;
+ 	return (0);
++#endif
+ }
+ 
+ static int
+ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+-    const unsigned char *in, unsigned int inl)
++    const unsigned char *in, size_t inl)
+ {
+ 	struct crypt_op cryp;
+ 	struct dev_crypto_state *state = ctx->cipher_data;
+@@ -398,14 +389,14 @@
+ 	cryp.ses = sess->ses;
+ 	cryp.flags = 0;
+ 	cryp.len = inl;
+-	cryp.src = (caddr_t) in;
+-	cryp.dst = (caddr_t) out;
++	cryp.src = (void*) in;
++	cryp.dst = (void*) out;
+ 	cryp.mac = 0;
+ 
+ 	cryp.op = ctx->encrypt ? COP_ENCRYPT : COP_DECRYPT;
+ 
+ 	if (ctx->cipher->iv_len) {
+-		cryp.iv = (caddr_t) ctx->iv;
++		cryp.iv = (void*) ctx->iv;
+ 		if (!ctx->encrypt) {
+ 			iiv = in + inl - ctx->cipher->iv_len;
+ 			memcpy(save_iv, iiv, ctx->cipher->iv_len);
+@@ -436,28 +427,32 @@
+ {
+ 	struct dev_crypto_state *state = ctx->cipher_data;
+ 	struct session_op *sess = &state->d_sess;
+-	int cipher;
++	int cipher = -1, i;
+ 
+-	if ((cipher = cipher_nid_to_cryptodev(ctx->cipher->nid)) == NID_undef)
+-		return (0);
+-
+-	if (ctx->cipher->iv_len > cryptodev_max_iv(cipher))
+-		return (0);
++	for (i = 0; ciphers[i].id; i++)
++		if (ctx->cipher->nid == ciphers[i].nid &&
++		    ctx->cipher->iv_len <= ciphers[i].ivmax &&
++		    ctx->key_len == ciphers[i].keylen) {
++			cipher = ciphers[i].id;
++			break;
++		}
+ 
+-	if (!cryptodev_key_length_valid(cipher, ctx->key_len))
++	if (!ciphers[i].id) {
++		state->d_fd = -1;
+ 		return (0);
++	}
+ 
+ 	memset(sess, 0, sizeof(struct session_op));
+ 
+ 	if ((state->d_fd = get_dev_crypto()) < 0)
+ 		return (0);
+ 
+-	sess->key = (char *)key;
++	sess->key = (void*)key;
+ 	sess->keylen = ctx->key_len;
+ 	sess->cipher = cipher;
+ 
+ 	if (ioctl(state->d_fd, CIOCGSESSION, sess) == -1) {
+-		close(state->d_fd);
++		put_dev_crypto(state->d_fd);
+ 		state->d_fd = -1;
+ 		return (0);
+ 	}
+@@ -494,7 +489,7 @@
+ 	} else {
+ 		ret = 1;
+ 	}
+-	close(state->d_fd);
++	put_dev_crypto(state->d_fd);
+ 	state->d_fd = -1;
+ 
+ 	return (ret);
+@@ -505,6 +500,20 @@
+  * gets called when libcrypto requests a cipher NID.
+  */
+ 
++/* RC4 */
++const EVP_CIPHER cryptodev_rc4 = {
++	NID_rc4,
++	1, 16, 0,
++	EVP_CIPH_VARIABLE_LENGTH,
++	cryptodev_init_key,
++	cryptodev_cipher,
++	cryptodev_cleanup,
++	sizeof(struct dev_crypto_state),
++	NULL,
++	NULL,
++	NULL
++};
++
+ /* DES CBC EVP */
+ const EVP_CIPHER cryptodev_des_cbc = {
+ 	NID_des_cbc,
+@@ -572,6 +581,32 @@
+ 	NULL
+ };
+ 
++const EVP_CIPHER cryptodev_aes_192_cbc = {
++	NID_aes_192_cbc,
++	16, 24, 16,
++	EVP_CIPH_CBC_MODE,
++	cryptodev_init_key,
++	cryptodev_cipher,
++	cryptodev_cleanup,
++	sizeof(struct dev_crypto_state),
++	EVP_CIPHER_set_asn1_iv,
++	EVP_CIPHER_get_asn1_iv,
++	NULL
++};
++
++const EVP_CIPHER cryptodev_aes_256_cbc = {
++	NID_aes_256_cbc,
++	16, 32, 16,
++	EVP_CIPH_CBC_MODE,
++	cryptodev_init_key,
++	cryptodev_cipher,
++	cryptodev_cleanup,
++	sizeof(struct dev_crypto_state),
++	EVP_CIPHER_set_asn1_iv,
++	EVP_CIPHER_get_asn1_iv,
++	NULL
++};
++
+ /*
+  * Registered by the ENGINE when used to find out how to deal with
+  * a particular NID in the ENGINE. this says what we'll do at the
+@@ -585,6 +620,9 @@
+ 		return (cryptodev_usable_ciphers(nids));
+ 
+ 	switch (nid) {
++	case NID_rc4:
++		*cipher = &cryptodev_rc4;
++		break;
+ 	case NID_des_ede3_cbc:
+ 		*cipher = &cryptodev_3des_cbc;
+ 		break;
+@@ -600,6 +638,12 @@
+ 	case NID_aes_128_cbc:
+ 		*cipher = &cryptodev_aes_cbc;
+ 		break;
++	case NID_aes_192_cbc:
++		*cipher = &cryptodev_aes_192_cbc;
++		break;
++	case NID_aes_256_cbc:
++		*cipher = &cryptodev_aes_256_cbc;
++		break;
+ 	default:
+ 		*cipher = NULL;
+ 		break;
+@@ -607,6 +651,286 @@
+ 	return (*cipher != NULL);
+ }
+ 
++
++#ifdef USE_CRYPTODEV_DIGESTS
++
++/* convert digest type to cryptodev */
++static int
++digest_nid_to_cryptodev(int nid)
++{
++	int i;
++
++	for (i = 0; digests[i].id; i++)
++		if (digests[i].nid == nid)
++			return (digests[i].id);
++	return (0);
++}
++
++
++static int cryptodev_digest_init(EVP_MD_CTX *ctx)
++{
++	struct dev_crypto_state *state = ctx->md_data;
++	struct session_op *sess = &state->d_sess;
++	int digest;
++
++	if ((digest = digest_nid_to_cryptodev(ctx->digest->type)) == NID_undef){
++		printf("cryptodev_digest_init: Can't get digest \n");
++		return (0);
++	}
++	memset(state, 0, sizeof(struct dev_crypto_state));
++
++	if ((state->d_fd = get_dev_crypto()) < 0) {
++		printf("cryptodev_digest_init: Can't get Dev \n");
++		return (0);
++	}
++
++	sess->mackey = NULL;
++	sess->mackeylen = 0;
++	sess->mac = digest;
++
++	if (ioctl(state->d_fd, CIOCGSESSION, sess) < 0) {
++		put_dev_crypto(state->d_fd);
++		state->d_fd = -1;
++		printf("cryptodev_digest_init: Open session failed\n");
++		return (0);
++	}
++
++	return (1);
++}
++
++static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
++		size_t count)
++{
++	struct dev_crypto_state *state = ctx->md_data;
++	struct crypt_op cryp;
++	struct session_op *sess = &state->d_sess;
++
++	if (!data || state->d_fd < 0) {
++		printf("cryptodev_digest_update: illegal inputs \n");
++		return (0);
++	}
++
++	if (!count) {
++		return (1);
++	}
++
++	if (!(ctx->flags & EVP_MD_CTX_FLAG_ONESHOT)) {
++		/* if application doesn't support one buffer */
++		state->mac_data = OPENSSL_realloc(state->mac_data, state->mac_len + count);
++
++		if (!state->mac_data) {
++			printf("cryptodev_digest_update: realloc failed\n");
++			return (0);
++		}
++
++		memcpy(state->mac_data + state->mac_len, data, count);
++   		state->mac_len += count;
++	
++		return (1);
++	}
++
++	memset(&cryp, 0, sizeof(cryp));
++
++	cryp.ses = sess->ses;
++	cryp.flags = 0;
++	cryp.len = count;
++	cryp.src = (void*) data;
++	cryp.dst = NULL;
++	cryp.mac = (void*) state->digest_res;
++	if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
++		printf("cryptodev_digest_update: digest failed\n");
++		return (0);
++	}
++	return (1);
++}
++
++
++static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
++{
++	struct crypt_op cryp;
++	struct dev_crypto_state *state = ctx->md_data;
++	struct session_op *sess = &state->d_sess;
++
++	if (!md || state->d_fd < 0) {
++		printf("cryptodev_digest_final: illegal input\n");
++		return(0);
++	}
++
++	if (! (ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) ) {
++		/* if application doesn't support one buffer */
++		memset(&cryp, 0, sizeof(cryp));
++		cryp.ses = sess->ses;
++		cryp.flags = 0;
++		cryp.len = state->mac_len;
++		cryp.src = state->mac_data;
++		cryp.dst = NULL;
++		cryp.mac = (void*)md;
++		if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
++			printf("cryptodev_digest_final: digest failed\n");
++			return (0);
++		}
++
++		return 1;
++	}
++
++	memcpy(md, state->digest_res, ctx->digest->md_size);
++
++	return 1;
++}
++
++
++static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
++{
++	int ret = 1;
++	struct dev_crypto_state *state = ctx->md_data;
++	struct session_op *sess = &state->d_sess;
++
++	if (state == NULL)
++	  return 0;
++
++	if (state->d_fd < 0) {
++		printf("cryptodev_digest_cleanup: illegal input\n");
++		return (0);
++	}
++
++	if (state->mac_data) {
++		OPENSSL_free(state->mac_data);
++		state->mac_data = NULL;
++		state->mac_len = 0;
++	}
++
++	if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) {
++		printf("cryptodev_digest_cleanup: failed to close session\n");
++		ret = 0;
++	} else {
++		ret = 1;
++	}
++	put_dev_crypto(state->d_fd);	
++	state->d_fd = -1;
++
++	return (ret);
++}
++
++static int cryptodev_digest_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from)
++{
++	struct dev_crypto_state *fstate = from->md_data;
++	struct dev_crypto_state *dstate = to->md_data;
++	struct session_op *sess;
++	int digest;
++
++	if (dstate == NULL || fstate == NULL)
++	  return 1;
++
++       	memcpy(dstate, fstate, sizeof(struct dev_crypto_state));
++
++	sess = &dstate->d_sess;
++
++	digest = digest_nid_to_cryptodev(to->digest->type);
++
++	sess->mackey = NULL;
++	sess->mackeylen = 0;
++	sess->mac = digest;
++
++	dstate->d_fd = get_dev_crypto();
++
++	if (ioctl(dstate->d_fd, CIOCGSESSION, sess) < 0) {
++		put_dev_crypto(dstate->d_fd);
++		dstate->d_fd = -1;
++		printf("cryptodev_digest_init: Open session failed\n");
++		return (0);
++	}
++
++	if (fstate->mac_len != 0) {
++	        if (fstate->mac_data != NULL)
++	                {
++        		dstate->mac_data = OPENSSL_malloc(fstate->mac_len);
++	        	memcpy(dstate->mac_data, fstate->mac_data, fstate->mac_len);
++           		dstate->mac_len = fstate->mac_len;
++	        	}
++	}
++
++	return 1;
++}
++
++
++static const EVP_MD cryptodev_sha1 = {
++	NID_sha1,
++	NID_sha1WithRSAEncryption,
++	SHA_DIGEST_LENGTH, 
++	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT|EVP_MD_FLAG_ONESHOT,
++	cryptodev_digest_init,
++	cryptodev_digest_update,
++	cryptodev_digest_final,
++	cryptodev_digest_copy,
++	cryptodev_digest_cleanup,
++	EVP_PKEY_RSA_method,
++	SHA_CBLOCK,
++	sizeof(EVP_MD *)+sizeof(struct dev_crypto_state),
++};
++
++static const EVP_MD cryptodev_sha256 = {
++	NID_sha256,
++	NID_sha256WithRSAEncryption,
++	SHA256_DIGEST_LENGTH, 
++	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT|EVP_MD_FLAG_ONESHOT,
++	cryptodev_digest_init,
++	cryptodev_digest_update,
++	cryptodev_digest_final,
++	cryptodev_digest_copy,
++	cryptodev_digest_cleanup,
++	EVP_PKEY_RSA_method,
++	SHA256_CBLOCK,
++	sizeof(EVP_MD *)+sizeof(struct dev_crypto_state),
++};
++
++static const EVP_MD cryptodev_sha384 = {
++	NID_sha384,
++	NID_sha384WithRSAEncryption, 
++	SHA384_DIGEST_LENGTH, 
++	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT|EVP_MD_FLAG_ONESHOT,
++	cryptodev_digest_init,
++	cryptodev_digest_update,
++	cryptodev_digest_final,
++	cryptodev_digest_copy,
++	cryptodev_digest_cleanup,
++	EVP_PKEY_RSA_method,
++	SHA512_CBLOCK,
++	sizeof(EVP_MD *)+sizeof(struct dev_crypto_state),
++};
++
++static const EVP_MD cryptodev_sha512 = {
++	NID_sha512,
++	NID_sha512WithRSAEncryption, 
++	SHA512_DIGEST_LENGTH, 
++	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT|EVP_MD_FLAG_ONESHOT,
++	cryptodev_digest_init,
++	cryptodev_digest_update,
++	cryptodev_digest_final,
++	cryptodev_digest_copy,
++	cryptodev_digest_cleanup,
++	EVP_PKEY_RSA_method,
++	SHA512_CBLOCK,
++	sizeof(EVP_MD *)+sizeof(struct dev_crypto_state),
++};
++
++static const EVP_MD cryptodev_md5 = {
++	NID_md5,
++	NID_md5WithRSAEncryption, 
++	16 /* MD5_DIGEST_LENGTH */, 
++	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT|EVP_MD_FLAG_ONESHOT,
++	cryptodev_digest_init,
++	cryptodev_digest_update,
++	cryptodev_digest_final,
++	cryptodev_digest_copy,
++	cryptodev_digest_cleanup,
++	EVP_PKEY_RSA_method,
++	64 /* MD5_CBLOCK */,
++	sizeof(EVP_MD *)+sizeof(struct dev_crypto_state),
++};
++
++#endif /* USE_CRYPTODEV_DIGESTS */
++
++
+ static int
+ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
+     const int **nids, int nid)
+@@ -615,10 +939,24 @@
+ 		return (cryptodev_usable_digests(nids));
+ 
+ 	switch (nid) {
++#ifdef USE_CRYPTODEV_DIGESTS
+ 	case NID_md5:
+-		*digest = NULL; /* need to make a clean md5 critter */
++		*digest = &cryptodev_md5; 
+ 		break;
++	case NID_sha1:
++		*digest = &cryptodev_sha1;
++ 		break;
++	case NID_sha256:
++		*digest = &cryptodev_sha256;
++ 		break;
++	case NID_sha384:
++		*digest = &cryptodev_sha384;
++ 		break;
++	case NID_sha512:
++		*digest = &cryptodev_sha512;
++ 		break;
+ 	default:
++#endif /* USE_CRYPTODEV_DIGESTS */
+ 		*digest = NULL;
+ 		break;
+ 	}
+@@ -646,8 +984,9 @@
+ 	b = malloc(bytes);
+ 	if (b == NULL)
+ 		return (1);
++	memset(b, 0, bytes);
+ 
+-	crp->crp_p = (char *)b;
++	crp->crp_p = (void*) b;
+ 	crp->crp_nbits = bits;
+ 
+ 	for (i = 0, j = 0; i < a->top; i++) {
+@@ -690,7 +1029,7 @@
+ {
+ 	int i;
+ 
+-	for (i = 0; i <= kop->crk_iparams + kop->crk_oparams; i++) {
++	for (i = 0; i < kop->crk_iparams + kop->crk_oparams; i++) {
+ 		if (kop->crk_param[i].crp_p)
+ 			free(kop->crk_param[i].crp_p);
+ 		kop->crk_param[i].crp_p = NULL;
+@@ -776,8 +1115,9 @@
+ cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
+ {
+ 	int r;
+-
++	ctx = BN_CTX_new();
+ 	r = cryptodev_bn_mod_exp(r0, I, rsa->d, rsa->n, ctx, NULL);
++	BN_CTX_free(ctx);
+ 	return (r);
+ }
+ 
+@@ -899,7 +1239,7 @@
+ 	kop.crk_op = CRK_DSA_SIGN;
+ 
+ 	/* inputs: dgst dsa->p dsa->q dsa->g dsa->priv_key */
+-	kop.crk_param[0].crp_p = (caddr_t)dgst;
++	kop.crk_param[0].crp_p = (void*)dgst;
+ 	kop.crk_param[0].crp_nbits = dlen * 8;
+ 	if (bn2crparam(dsa->p, &kop.crk_param[1]))
+ 		goto err;
+@@ -939,7 +1279,7 @@
+ 	kop.crk_op = CRK_DSA_VERIFY;
+ 
+ 	/* inputs: dgst dsa->p dsa->q dsa->g dsa->pub_key sig->r sig->s */
+-	kop.crk_param[0].crp_p = (caddr_t)dgst;
++	kop.crk_param[0].crp_p = (void*)dgst;
+ 	kop.crk_param[0].crp_nbits = dlen * 8;
+ 	if (bn2crparam(dsa->p, &kop.crk_param[1]))
+ 		goto err;
+@@ -1017,7 +1357,7 @@
+ 		goto err;
+ 	kop.crk_iparams = 3;
+ 
+-	kop.crk_param[3].crp_p = (char *)key;
++	kop.crk_param[3].crp_p = (void*) key;
+ 	kop.crk_param[3].crp_nbits = keylen * 8;
+ 	kop.crk_oparams = 1;
+ 
+@@ -1048,7 +1388,7 @@
+  * but I expect we'll want some options soon.
+  */
+ static int
+-cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
++cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
+ {
+ #ifdef HAVE_SYSLOG_R
+ 	struct syslog_data sd = SYSLOG_DATA_INIT;
+@@ -1084,14 +1424,14 @@
+ 	 * find out what asymmetric crypto algorithms we support
+ 	 */
+ 	if (ioctl(fd, CIOCASYMFEAT, &cryptodev_asymfeat) == -1) {
+-		close(fd);
++		put_dev_crypto(fd);
+ 		ENGINE_free(engine);
+ 		return;
+ 	}
+-	close(fd);
++	put_dev_crypto(fd);
+ 
+ 	if (!ENGINE_set_id(engine, "cryptodev") ||
+-	    !ENGINE_set_name(engine, "BSD cryptodev engine") ||
++	    !ENGINE_set_name(engine, "cryptodev engine") ||
+ 	    !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) ||
+ 	    !ENGINE_set_digests(engine, cryptodev_engine_digests) ||
+ 	    !ENGINE_set_ctrl_function(engine, cryptodev_ctrl) ||
+diff -Naur openssl-0.9.8u.org/crypto/engine/engine.h openssl-0.9.8u/crypto/engine/engine.h
+--- openssl-0.9.8u.org/crypto/engine/engine.h	2010-02-09 15:18:15.000000000 +0100
++++ openssl-0.9.8u/crypto/engine/engine.h	2012-03-27 14:05:15.000000000 +0200
+@@ -705,9 +705,7 @@
+  * values. */
+ void *ENGINE_get_static_state(void);
+ 
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+ void ENGINE_setup_bsd_cryptodev(void);
+-#endif
+ 
+ /* BEGIN ERROR CODES */
+ /* The following lines are auto generated by the script mkerr.pl. Any changes
+diff -Naur openssl-0.9.8u.org/crypto/evp/c_all.c openssl-0.9.8u/crypto/evp/c_all.c
+--- openssl-0.9.8u.org/crypto/evp/c_all.c	2004-08-29 18:36:04.000000000 +0200
++++ openssl-0.9.8u/crypto/evp/c_all.c	2012-03-27 14:05:15.000000000 +0200
+@@ -83,8 +83,6 @@
+ 	OpenSSL_add_all_ciphers();
+ 	OpenSSL_add_all_digests();
+ #ifndef OPENSSL_NO_ENGINE
+-# if defined(__OpenBSD__) || defined(__FreeBSD__)
+ 	ENGINE_setup_bsd_cryptodev();
+-# endif
+ #endif
+ 	}
hooks/post-receive
--
IPFire 2.x development tree

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5cbbd5f1ed37c0c465378916716319d63234a294