diff -ruN pciutils-2.2.0/ChangeLog pciutils-2.2.1/ChangeLog
--- pciutils-2.2.0/ChangeLog	2005-09-21 14:07:45 +0200
+++ pciutils-2.2.1/ChangeLog	2005-11-26 14:00:48 +0100
@@ -1,3 +1,14 @@
+2005-11-26  Martin Mares  <mj@ucw.cz>
+
+	* Released as 2.2.1.
+
+	* lspci.c (show_machine): Subsystem vendors were printed incorrectly
+	in machine-readable modes. Thanks to Pavel Celeda for a bug report.
+
+2005-10-11  Martin Mares  <mj@ucw.cz>
+
+	* lspci.c (new_bus): Fixed a memory leak. Thanks to Paul Sangree for reporting it.
+
 2005-09-21  Martin Mares  <mj@ucw.cz>
 
 	* Released as 2.2.0.
diff -ruN pciutils-2.2.0/Makefile pciutils-2.2.1/Makefile
--- pciutils-2.2.0/Makefile	2005-09-21 14:04:54 +0200
+++ pciutils-2.2.1/Makefile	2005-11-26 14:00:57 +0100
@@ -4,8 +4,8 @@
 OPT=-O2
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
 
-VERSION=2.2.0
-DATE=2005-09-21
+VERSION=2.2.1
+DATE=2005-11-26
 
 PREFIX=/usr/local
 SBINDIR=$(PREFIX)/sbin
diff -ruN pciutils-2.2.0/README pciutils-2.2.1/README
--- pciutils-2.2.0/README	2005-09-21 14:08:42 +0200
+++ pciutils-2.2.1/README	2005-11-26 14:01:16 +0100
@@ -1,4 +1,4 @@
-This package contains the PCI Utilities, version 2.2.0.
+This package contains the PCI Utilities, version 2.2.1.
 
 Copyright (c) 1997--2005 Martin Mares <mj@ucw.cz>
 
diff -ruN pciutils-2.2.0/lspci.c pciutils-2.2.1/lspci.c
--- pciutils-2.2.0/lspci.c	2005-09-21 13:56:18 +0200
+++ pciutils-2.2.1/lspci.c	2005-11-26 12:48:29 +0100
@@ -1791,7 +1791,7 @@
       if (sv_id && sv_id != 0xffff)
 	{
 	  printf("SVendor:\t%s\n",
-		 pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, p->vendor_id, p->device_id, sv_id, sd_id));
+		 pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, sv_id));
 	  printf("SDevice:\t%s\n",
 		 pci_lookup_name(pacc, sdbuf, sizeof(sdbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_DEVICE, p->vendor_id, p->device_id, sv_id, sd_id));
 	}
@@ -1816,7 +1816,7 @@
 	printf(" -p%02x", c);
       if (sv_id && sv_id != 0xffff)
 	printf(" \"%s\" \"%s\"",
-	       pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, p->vendor_id, p->device_id, sv_id, sd_id),
+	       pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, sv_id),
 	       pci_lookup_name(pacc, sdbuf, sizeof(sdbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_DEVICE, p->vendor_id, p->device_id, sv_id, sd_id));
       else
 	printf(" \"\" \"\"");
@@ -1883,8 +1883,6 @@
 new_bus(struct bridge *b, unsigned int domain, unsigned int n)
 {
   struct bus *bus = xmalloc(sizeof(struct bus));
-
-  bus = xmalloc(sizeof(struct bus));
   bus->domain = domain;
   bus->number = n;
   bus->sibling = b->first_bus;
diff -ruN pciutils-2.2.0/pciutils.lsm pciutils-2.2.1/pciutils.lsm
--- pciutils-2.2.0/pciutils.lsm	2005-09-21 14:08:42 +0200
+++ pciutils-2.2.1/pciutils.lsm	2005-11-26 14:01:16 +0100
@@ -1,14 +1,14 @@
 Begin3
 Title:          The PCI Utilities
-Version:        2.2.0
-Entered-date:   050921
+Version:        2.2.1
+Entered-date:   051126
 Description:    This package contains various utilities for inspecting and
 		setting of devices connected to the PCI bus.
 Keywords:       kernel, pci, lspci, setpci, libpci
 Author:         mj@ucw.cz (Martin Mares)
 Maintained-by:  mj@ucw.cz (Martin Mares)
-Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.2.0.tar.gz
-Alternate-site: ftp.kernel.org pub/software/utils/pciutils/pciutils-2.2.0.tar.gz
-Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.2.0.tar.gz
+Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.2.1.tar.gz
+Alternate-site: ftp.kernel.org pub/software/utils/pciutils/pciutils-2.2.1.tar.gz
+Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.2.1.tar.gz
 Copying-policy: GPL
 End
diff -ruN pciutils-2.2.0/pciutils.spec pciutils-2.2.1/pciutils.spec
--- pciutils-2.2.0/pciutils.spec	2005-09-21 14:08:42 +0200
+++ pciutils-2.2.1/pciutils.spec	2005-11-26 14:01:16 +0100
@@ -1,5 +1,5 @@
 Name:		pciutils
-Version:	2.2.0
+Version:	2.2.1
 Release: 	1
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Copyright:	GNU GPL
diff -ruN pciutils-2.2.0/win32/config.h pciutils-2.2.1/win32/config.h
--- pciutils-2.2.0/win32/config.h	2005-09-21 14:08:42 +0200
+++ pciutils-2.2.1/win32/config.h	2005-11-26 14:01:17 +0100
@@ -2,4 +2,4 @@
 #define PCI_OS_WINDOWS
 #define PCI_HAVE_PM_INTEL_CONF
 #define PCI_PATH_IDS "pci.ids"
-#define PCILIB_VERSION "2.2.0"
+#define PCILIB_VERSION "2.2.1"
