Index: pciutils-2.2.4/update-pciids.sh
===================================================================
--- pciutils-2.2.4.orig/update-pciids.sh
+++ pciutils-2.2.4/update-pciids.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 set -e
 SRC="http://pciids.sourceforge.net/v2.2/pci.ids"
-DEST=pci.ids
+DEST=pci.ids.d/pci.ids.dist
 PCI_COMPRESSED_IDS=
 GREP=grep
 
 if [ -n "$PCI_COMPRESSED_IDS" ] ; then
@@ -53,6 +53,12 @@ if [ -f $DEST ] ; then
 	chmod -f --reference=$DEST.old $DEST.neww 2>/dev/null || true
 fi
 mv $DEST.neww $DEST
 rm $DEST.new
+if [ -x /usr/bin/merge-pciids -a -x /usr/bin/python ]; then
+	merge-pciids
+else
+	echo "WARNING: merge-pciids or python missing"
+	cp -p $DEST /usr/share/pci.ids
+fi
 
 echo "Done."
Index: pciutils-2.2.4/Makefile
===================================================================
--- pciutils-2.2.4.orig/Makefile
+++ pciutils-2.2.4/Makefile
@@ -41,9 +41,9 @@ lspci.o: lspci.c pciutils.h $(PCIINC)
 setpci.o: setpci.c pciutils.h $(PCIINC)
 common.o: common.c pciutils.h $(PCIINC)
 
 update-pciids: update-pciids.sh
-	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
+	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/pci.ids.d/pci.ids.dist@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=@"
 	chmod +x $@
 
 %.8: %.man
 	M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#"