diff -ruN pciutils-2.2.5/.gitignore.orig pciutils-2.2.6/.gitignore.orig
--- pciutils-2.2.5/.gitignore.orig	1970-01-01 01:00:00.000000000 +0100
+++ pciutils-2.2.6/.gitignore.orig	2006-09-09 14:55:17.000000000 +0200
@@ -0,0 +1,7 @@
+*.a
+*.o
+*.8
+lspci
+setpci
+update-pciids
+pci.ids.gz
diff -ruN pciutils-2.2.5/ChangeLog pciutils-2.2.6/ChangeLog
--- pciutils-2.2.5/ChangeLog	2007-05-04 11:43:25.000000000 +0200
+++ pciutils-2.2.6/ChangeLog	2007-06-20 20:47:40.000000000 +0200
@@ -1,3 +1,17 @@
+2007-06-20  Martin Mares  <mj@ucw.cz>
+
+	* Released as 2.2.6.
+
+	* Makefile: Added an "install-lib" target. Thanks to Dan Nicholson
+	for a patch.
+
+	* Makefile, lib/Makefile: Generate and install pkg-config file
+	for libpci. Again by Dan Nicholson.
+
+2007-06-20  Thomas Schwinge  <tschwinge@gnu.org>
+
+	* lib/i386-io-hurd.h: Rewritten for new Hurd kernels.
+
 2007-05-04  Martin Mares  <mj@ucw.cz>
 
 	* Released as 2.2.5.
diff -ruN pciutils-2.2.5/Makefile pciutils-2.2.6/Makefile
--- pciutils-2.2.5/Makefile	2007-05-04 11:43:16.000000000 +0200
+++ pciutils-2.2.6/Makefile	2007-06-20 20:47:02.000000000 +0200
@@ -4,18 +4,23 @@
 OPT=-O2
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
 
-VERSION=2.2.5
-DATE=2007-05-04
+VERSION=2.2.6
+DATE=2007-06-20
 
 PREFIX=/usr/local
 SBINDIR=$(PREFIX)/sbin
 SHAREDIR=$(PREFIX)/share
 IDSDIR=$(SHAREDIR)
 MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
+INCDIR=$(PREFIX)/include
+LIBDIR=$(PREFIX)/lib
+PKGCFDIR=$(LIBDIR)/pkgconfig
 INSTALL=install
 DIRINSTALL=install -d
 PCILIB=lib/libpci.a
+PCILIBPC=lib/libpci.pc
 PCIINC=lib/config.h lib/header.h lib/pci.h lib/types.h lib/sysdep.h
+PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/types.h
 
 -include lib/config.mk
 
@@ -50,7 +55,7 @@
 
 clean:
 	rm -f `find . -name "*~" -o -name "*.[oa]" -o -name "\#*\#" -o -name TAGS -o -name core -o -name "*.orig"`
-	rm -f update-pciids lspci setpci lib/config.* lib/example *.8 pci.ids.*
+	rm -f update-pciids lspci setpci lib/config.* lib/example *.8 pci.ids.* lib/*.pc
 	rm -rf maint/dist
 
 distclean: clean
@@ -63,6 +68,12 @@
 	$(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR)
 	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
 
+install-lib: $(PCIINC_INS) $(PCILIB) $(PCILIBPC)
+	$(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PKGCFDIR)
+	$(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci
+	$(INSTALL) -c -m 644 $(PCILIB) $(DESTDIR)$(LIBDIR)
+	$(INSTALL) -c -m 644 $(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
+
 uninstall: all
 	rm -f $(DESTDIR)$(SBINDIR)/lspci $(DESTDIR)$(SBINDIR)/setpci $(DESTDIR)$(SBINDIR)/update-pciids
 	rm -f $(DESTDIR)$(IDSDIR)/$(PCI_IDS)
diff -ruN pciutils-2.2.5/README pciutils-2.2.6/README
--- pciutils-2.2.5/README	2007-05-04 11:43:47.000000000 +0200
+++ pciutils-2.2.6/README	2007-06-20 20:48:06.000000000 +0200
@@ -1,4 +1,4 @@
-This package contains the PCI Utilities, version 2.2.5.
+This package contains the PCI Utilities, version 2.2.6.
 
 Copyright (c) 1997--2006 Martin Mares <mj@ucw.cz>
 
diff -ruN pciutils-2.2.5/lib/.gitignore pciutils-2.2.6/lib/.gitignore
--- pciutils-2.2.5/lib/.gitignore	2006-09-09 11:47:39.000000000 +0200
+++ pciutils-2.2.6/lib/.gitignore	2007-06-20 20:43:16.000000000 +0200
@@ -1,2 +1,3 @@
 config.h
 config.mk
+libpci.pc
diff -ruN pciutils-2.2.5/lib/Makefile pciutils-2.2.6/lib/Makefile
--- pciutils-2.2.5/lib/Makefile	2006-07-30 14:02:07.000000000 +0200
+++ pciutils-2.2.6/lib/Makefile	2007-06-20 20:43:16.000000000 +0200
@@ -7,6 +7,7 @@
 INCL=internal.h pci.h config.h header.h sysdep.h types.h
 
 PCILIB=libpci.a
+PCILIBPC=libpci.pc
 
 ifdef PCI_HAVE_PM_LINUX_SYSFS
 OBJS += sysfs.o
@@ -49,13 +50,21 @@
 PCILIB=libpciutils.a
 endif
 
-all: $(PCILIB)
+all: $(PCILIB) $(PCILIBPC)
 
 $(PCILIB): $(OBJS)
 	rm -f $@
 	ar rcs $@ $^
 	ranlib $@
 
+$(PCILIBPC): $(PCILIBPC).in
+	sed <$< >$@ -e 's,@PREFIX@,$(PREFIX),' \
+		-e 's,@INCDIR@,$(INCDIR),' \
+		-e 's,@LIBDIR@,$(LIBDIR),' \
+		-e 's,@IDSDIR@,$(IDSDIR),' \
+		-e 's,@VERSION@,$(VERSION),' \
+		-e 's,@LIBZ@,$(LIBZ),'
+
 access.o: access.c $(INCL)
 i386-ports.o: i386-ports.c $(INCL) i386-io-hurd.h i386-io-linux.h i386-io-sunos.h
 proc.o: proc.c $(INCL) pread.h
diff -ruN pciutils-2.2.5/lib/configure pciutils-2.2.6/lib/configure
--- pciutils-2.2.5/lib/configure	2007-02-06 12:58:14.000000000 +0100
+++ pciutils-2.2.6/lib/configure	2007-06-20 20:43:16.000000000 +0200
@@ -121,7 +121,8 @@
 if [ "$zlib" = yes ] ; then
 	echo >>$c '#define PCI_COMPRESSED_IDS'
 	echo >>$c '#define PCI_IDS "pci.ids.gz"'
-	echo >>$m 'LDFLAGS+=-lz'
+	echo >>$m 'LIBZ=-lz'
+	echo >>$m 'LDFLAGS+=$(LIBZ)'
 else
 	echo >>$c '#define PCI_IDS "pci.ids"'
 fi
diff -ruN pciutils-2.2.5/lib/i386-io-hurd.h pciutils-2.2.6/lib/i386-io-hurd.h
--- pciutils-2.2.5/lib/i386-io-hurd.h	2006-08-01 12:18:51.000000000 +0200
+++ pciutils-2.2.6/lib/i386-io-hurd.h	2007-06-20 20:36:31.000000000 +0200
@@ -5,46 +5,23 @@
  *	Copyright (c) 2003 Martin Mares <mj@ucw.cz>
  *	Copyright (c) 2006 Samuel Thibault <samuel.thibault@ens-lyon.org> and
  *	                   Thomas Schwinge <tschwinge@gnu.org>
+ *	Copyright (c) 2007 Thomas Schwinge <tschwinge@gnu.org>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
 #include <sys/io.h>
 
-#include <mach/machine/mach_i386.h>
-#include <device/device.h>
-#include <hurd.h>
-
-#include <stdio.h>
-
-static mach_port_t io_port;
-
 static inline int
-intel_setup_io(struct pci_access *a)
+intel_setup_io(struct pci_access *a UNUSED)
 {
-  mach_port_t device;
-
-  if ((errno = get_privileged_ports(NULL, &device)))
-    a->warning("i386-io-hurd: Can't get_privileged_ports(): %m");
-
-  if (!errno && (errno = device_open(device, D_READ | D_WRITE, "io", &io_port)))
-    a->warning("i386-io-hurd: Can't device_open(): %m");
-
-  mach_port_deallocate(mach_task_self(), device);
-
-  if (!errno && (errno = i386_io_port_add(mach_thread_self(), io_port)))
-    a->warning("i386-io-hurd: Can't i386_io_port_add(): %m");
-
-  return errno ? 0 : 1;
+  return (ioperm (0, 65535, 1) == -1) ? 0 : 1;
 }
 
 static inline int
-intel_cleanup_io(struct pci_access *a)
+intel_cleanup_io(struct pci_access *a UNUSED)
 {
-  if ((errno = i386_io_port_remove(mach_thread_self(), io_port)))
-    a->warning("i386-io-hurd: Can't i386_io_port_remove(): %m");
-
-  mach_port_deallocate(mach_task_self(), io_port);
+  ioperm (0, 65535, 0);
 
   return -1;
 }
diff -ruN pciutils-2.2.5/lib/libpci.pc.in pciutils-2.2.6/lib/libpci.pc.in
--- pciutils-2.2.5/lib/libpci.pc.in	1970-01-01 01:00:00.000000000 +0100
+++ pciutils-2.2.6/lib/libpci.pc.in	2007-06-20 20:43:16.000000000 +0200
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+includedir=@INCDIR@
+libdir=@LIBDIR@
+idsdir=@IDSDIR@
+
+Name: libpci
+Description: libpci
+Version: @VERSION@
+Libs: -L${libdir} -lpci @LIBZ@
+Cflags: -I${includedir}
diff -ruN pciutils-2.2.5/pciutils.lsm pciutils-2.2.6/pciutils.lsm
--- pciutils-2.2.5/pciutils.lsm	2007-05-04 11:43:47.000000000 +0200
+++ pciutils-2.2.6/pciutils.lsm	2007-06-20 20:48:06.000000000 +0200
@@ -1,14 +1,14 @@
 Begin3
 Title:          The PCI Utilities
-Version:        2.2.5
-Entered-date:   070504
+Version:        2.2.6
+Entered-date:   070620
 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.5.tar.gz
-Alternate-site: ftp.kernel.org pub/software/utils/pciutils/pciutils-2.2.5.tar.gz
-Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.2.5.tar.gz
+Primary-site:   atrey.karlin.mff.cuni.cz pub/linux/pci/pciutils-2.2.6.tar.gz
+Alternate-site: ftp.kernel.org pub/software/utils/pciutils/pciutils-2.2.6.tar.gz
+Alternate-site: metalab.unc.edu pub/Linux/hardware/pciutils-2.2.6.tar.gz
 Copying-policy: GPL
 End
diff -ruN pciutils-2.2.5/pciutils.spec pciutils-2.2.6/pciutils.spec
--- pciutils-2.2.5/pciutils.spec	2007-05-04 11:43:47.000000000 +0200
+++ pciutils-2.2.6/pciutils.spec	2007-06-20 20:48:06.000000000 +0200
@@ -1,5 +1,5 @@
 Name:		pciutils
-Version:	2.2.5
+Version:	2.2.6
 Release: 	1
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Copyright:	GNU GPL
diff -ruN pciutils-2.2.5/win32/config.h pciutils-2.2.6/win32/config.h
--- pciutils-2.2.5/win32/config.h	2007-05-04 11:43:47.000000000 +0200
+++ pciutils-2.2.6/win32/config.h	2007-06-20 20:48:06.000000000 +0200
@@ -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.5"
+#define PCILIB_VERSION "2.2.6"
