Index: uspace/srv/pci/libpci/pci_ids.h
===================================================================
--- uspace/srv/pci/libpci/pci_ids.h	(revision 5b3cf90fc58406e0a1987ff4a0c1e5e21a8b774b)
+++ uspace/srv/pci/libpci/pci_ids.h	(revision fa5526dd259d2b66a5a281ba811ad7e537f57737)
@@ -387,5 +387,5 @@
 "		174b 7c28  Sapphire Radeon 9600XT (Secondary)",
 "		1787 4003  Radeon 9600 XT (Secondary)",
-"	4173  RV350 ?? [Radeon 9550] (Secondary)",
+"	4173  RV350 \?\? [Radeon 9550] (Secondary)",
 "	4237  Radeon 7000 IGP",
 "	4242  R200 BB [Radeon All in Wonder 8500DV]",
@@ -669,5 +669,5 @@
 "		1002 0048  Rage Fury Pro",
 "		1002 2000  Rage Fury MAXX AGP 4x (TMDS) (VGA device)",
-"		1002 2001  Rage Fury MAXX AGP 4x (TMDS) (Extra device?!)",
+"		1002 2001  Rage Fury MAXX AGP 4x (TMDS) (Extra device\?!)",
 "	5047  Rage 128 PG/PRO",
 "	5048  Rage 128 PH/PRO AGP 2x",
@@ -1636,5 +1636,5 @@
 "		1028 0121  PowerEdge 2650",
 "102b  Matrox Graphics, Inc.",
-"	0010  MGA-I [Impression?]",
+"	0010  MGA-I [Impression\?]",
 "	0100  MGA 1064SG [Mystique]",
 "	0518  MGA-II [Athena]",
@@ -2438,5 +2438,5 @@
 "	9970  W9970CF",
 "1051  Anigma, Inc.",
-"1052  ?Young Micro Systems",
+"1052  \?Young Micro Systems",
 "1053  Young Micro Systems",
 "1054  Hitachi, Ltd",
@@ -3049,5 +3049,5 @@
 "		1002 0001  TV-Wonder",
 "		1002 0003  TV-Wonder/VE",
-"	036c  Bt879(??) Video Capture",
+"	036c  Bt879(\?\?) Video Capture",
 "		13e9 0070  Win/TV (Video Section)",
 "	036e  Bt878 Video Capture",
@@ -4124,5 +4124,5 @@
 "		10de 01dc  Quadro  FX Go350M",
 "	01df  GeForce 7300 GS",
-"	01e0  nForce2 AGP (different version?)",
+"	01e0  nForce2 AGP (different version\?)",
 "		147b 1c09  NV7 Motherboard",
 "	01e8  nForce2 AGP",
@@ -5097,5 +5097,5 @@
 "	1216  EN-1216 Ethernet Adapter",
 "		1113 2242  EN2242 10/100 Ethernet Mini-PCI Card",
-"		111a 1020  SpeedStream 1020 PCI 10/100 Ethernet Adaptor [EN-1207F-TX ?]",
+"		111a 1020  SpeedStream 1020 PCI 10/100 Ethernet Adaptor [EN-1207F-TX \?]",
 "	1217  EN-1217 Ethernet Adapter",
 "	5105  10Mbps Network card",
@@ -6557,5 +6557,5 @@
 "123f  C-Cube Microsystems",
 "	00e4  MPEG",
-"	8120  E4?",
+"	8120  E4\?",
 "		11bd 0006  DV500 E4",
 "		11bd 000a  DV500 E4",
@@ -6633,5 +6633,5 @@
 "125d  ESS Technology",
 "	0000  ES336H Fax Modem (Early Model)",
-"	1948  Solo?",
+"	1948  Solo\?",
 "	1968  ES1968 Maestro 2",
 "		1028 0085  ES1968 Maestro-2 PCI",
@@ -6923,5 +6923,5 @@
 "		122d 4057  MSP3880SP-A",
 "	4311  Riptide HSF 56k PCI Modem",
-"		127a 4311  Ring Modular? Riptide HSF RT HP Dom",
+"		127a 4311  Ring Modular\? Riptide HSF RT HP Dom",
 "		13e0 0210  HP-GVC",
 "	4320  Riptide PCI Audio Controller",
@@ -8383,5 +8383,5 @@
 "		1414 0003  Wireless Notebook Adapter MN-720",
 "		1414 0004  Wireless PCI Adapter MN-730",
-"	4326  BCM4307 Chipcommon I/O Controller?",
+"	4326  BCM4307 Chipcommon I/O Controller\?",
 "	4401  BCM4401 100Base-T",
 "		1043 80a8  A7V8X motherboard",
@@ -8692,5 +8692,5 @@
 "1505  ITA INGENIEURBURO FUR TESTAUFGABEN GmbH",
 "1506  CHAMELEON Systems Inc",
-"1507  Motorola ?? / HTEC",
+"1507  Motorola \?\? / HTEC",
 "	0001  MPC105 [Eagle]",
 "	0002  MPC106 [Grackle]",
@@ -9468,5 +9468,5 @@
 "270f  Chaintech Computer Co. Ltd",
 "2711  AVID Technology Inc.",
-"2a15  3D Vision(???)",
+"2a15  3D Vision(\?\?\?)",
 "3000  Hansol Electronics Inc.",
 "3142  Post Impression Systems.",
Index: uspace/srv/pci/update-ids
===================================================================
--- uspace/srv/pci/update-ids	(revision 5b3cf90fc58406e0a1987ff4a0c1e5e21a8b774b)
+++ uspace/srv/pci/update-ids	(revision fa5526dd259d2b66a5a281ba811ad7e537f57737)
@@ -1,5 +1,5 @@
 #! /bin/bash
 
-wget http://pciids.sourceforge.net/v2.2/pci.ids
+wget -O pci.ids http://pciids.sourceforge.net/v2.2/pci.ids
 
 cat > pci_ids.h <<EOF
@@ -8,5 +8,6 @@
 EOF
 
-cat pci.ids | grep -v '^#.*' | grep -v '^$' | tr \" \' | sed -n 's/\(.*\)/"\1",/p' >> pci_ids.h
+cat pci.ids | grep -v '^#.*' | grep -v '^$' | tr \" \' | \
+    sed -n 's/\(.*\)/"\1",/p' | sed 's/?/\\?/g' >> pci_ids.h
 
 cat >> pci_ids.h <<EOF