More mappings after comparing with NVE.

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@15987 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 380 insertions, 380 deletions

diff --git a/data/CPE/list b/data/CPE/list
index cea9f7229d..96bfd58ca1 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -1,34 +1,34 @@
 acidbase
-acl
-acon
-acpid
+acl;cpe:/a:xfs:acl
+acon;cpe:/a:ahmed_abdel-hamid_mohamed:acon
+acpid;cpe:/a:tim_hockin:acpid
 activeldap
 adns;cpe:/a:gnu:adns
 advi
-aegis
+aegis;cpe:/a:aegis:aegis
 afuse;cpe:/a:afuse:afuse
-ajaxterm
-alien-arena
-alpine
+ajaxterm;cpe:/a:antony_lesuisse:ajaxterm
+alien-arena;cpe:/a:icculus:alien_arena
+alpine;cpe:/a:university_of_washington:alpine
 am-utils
 amarok;cpe:/a:amarok:amarok
-amaya
+amaya;cpe:/a:w3:amaya
 ampache;cpe:/a:ampache:ampache
 amsn;cpe:/a:alvaro:alvaros_messenger
-amule
-aolserver4
+amule;cpe:/a:amule:amule
+aolserver4;cpe:/a:aol:aolserver
 apache2;cpe:/a:apache:http_server
 apache;cpe:/a:apache:http_server
-apertium
-apport
-apr
+apertium;cpe:/a:apertium:apertium
+apport;cpe:/a:apport:apport
+apr;cpe:/a:apache:portable_runtime
 apr-util;cpe:/a:apache:apr-util
-apt
-apt-listchanges
+apt;cpe:/a:debian:apt
+apt-listchanges;cpe:/a:debian:apt-listchanges
 aptlinex;cpe:/a:debian:aptlinex
-aptoncd
+aptoncd;cpe:/a:aptoncd:aptoncd
 arb
-ardour
+ardour;cpe:/a:ardour:ardour
 argyll
 aria2;cpe:/a:tatsuhiro_tsujikawa:aria2
 arora
@@ -36,28 +36,28 @@ arts
 asterisk-addons;cpe:/a:asterisk:asterisk-addons
 asterisk;cpe:/a:digium:asterisk
 atmailopen
-audacity
-audiofile
-audiolink
+audacity;cpe:/a:audacity:audacity
+audiofile;cpe:/a:68k:audiofile
+audiolink;cpe:/a:audiolink:audiolink
 audit;cpe:/a:linux:audit
-auth2db
+auth2db;cpe:/a:auth2db:auth2db
 automake1.10;cpe:/a:gnu:automake
 automake1.7;cpe:/a:gnu:automake
 automake1.9;cpe:/a:gnu:automake
 automake;cpe:/a:gnu:automake
 avahi;cpe:/a:avahi:avahi
-aview
+aview;cpe:/a:amiga:aview
 awstats;cpe:/a:awstats:awstats
 axis
 axis2c;cpe:/a:apache:axis2
 axyl;cpe:/a:axyl:axyl
 ayttm
 babel
-backintime
-backuppc
-bacula
-banshee
-bareftp
+backintime;cpe:/a:le-web:backintime
+backuppc;cpe:/a:craig_barratt:backuppc
+bacula;cpe:/a:jose_luis_tallon:bacula_common
+banshee;cpe:/a:banshee-project:banshee
+bareftp;cpe:/a:bareftp:bareftp
 barnowl;cpe:/a:barnowl:barnowl
 base-files
 bash;cpe:/a:bash:bash
@@ -66,77 +66,77 @@ belpic
 bind9;cpe:/a:isc:bind
 bind;cpe:/a:isc:bind
 binutils
-bip
+bip;cpe:/a:bip.t1r:bip
 bitlbee;cpe:/a:bitlbee:bitlbee
-bk2site
-blender
+bk2site;cpe:/a:jose_m.vidal:bk2site
+blender;cpe:/a:blender:blender
 blosxom;cpe:/a:blosxom:blosxom
 bluez-libs;cpe:/a:bluez:bluez_libs
 bluez-utils;cpe:/a:bluez:bluez_utils
-boa
+boa;cpe:/a:boa:boa
 bochs
-bogofilter
-boinc
-boost
+bogofilter;cpe:/a:bogofilter:bogofilter
+boinc;cpe:/a:berkeley:boinc_client
+boost;cpe:/a:boost:boost
 bozohttpd;cpe:/a:eterna:bozohttpd
-bristol
+bristol;cpe:/a:nick_copeland:bristol
 brltty
 bugzilla;cpe:/a:mozilla:bugzilla
-buildbot
+buildbot;cpe:/a:buildbot:buildbot
 bulmages
 busybox
 byacc
 bzip2;cpe:/a:bzip:bzip2
-cabextract
+cabextract;cpe:/a:cabextract:cabextract
 cableswig
 cacti;cpe:/a:cacti:cacti
 cadaver
 cairo
-cakephp
-camlimages
+cakephp;cpe:/a:cakefoundation:cakephp
+camlimages;cpe:/a:jun_furuse:camlimages
 camserv
 caudium;cpe:/a:caudium:caudium
 cbrpager;cpe:/a:jcoppens:cbrpager
 ccid
-cdcontrol
-cdrw-taper
+cdcontrol;cpe:/a:gleydson_mazioli_da_silva:cdcontrol
+cdrw-taper;cpe:/a:tivano:cdrw-taper
 cecilia;cpe:/a:cecilia:cecilia
 centerim;cpe:/a:centerim:centerim
 cgiwrap;cpe:/a:nathan_neulinger:cgiwrap
-changetrack
+changetrack;cpe:/a:cameron_morland:changetrack
 checkinstall;cpe:/a:checkinstall:checkinstall
-cherokee
-cherrypy3
-chm2pdf
+cherokee;cpe:/a:cherokee-project:cherokee
+cherrypy3;cpe:/a:cherrypy:cherrypy
+chm2pdf;cpe:/a:karakas-online:chm2pdf
 chora2
 chromium-browser;cpe:/a:google:chrome
 chrony;cpe:/a:tuxfamily:chrony
-citadel
+citadel;cpe:/a:debian:citadel_server
 clamav;cpe:/a:clamav:clamav
-classpath
-cluster-agents
+classpath;cpe:/a:gnu:classpath
+cluster-agents;cpe:/a:linux-ha:ocf_resource_agents
 cmake
-cmus
+cmus;cpe:/a:cmus:cmus
 cobbler;cpe:/a:michael_dehaan:cobbler
-coccinelle
+coccinelle;cpe:/a:emn:coccinelle
 coin3
-collectd
+collectd;cpe:/a:collectd:collectd
 comix;cpe:/a:comix:comix
 compiz-fusion-plugins-main
 condor;cpe:/a:condor_project:condor
-convirt
+convirt;cpe:/a:convirture:convirt
 coreutils;cpe:/a:gnu:coreutils
 couchdb;cpe:/a:apache:couchdb
 courier-authlib;cpe:/a:courier-mta:courtier-authlib
 cowbell
 cpio;cpe:/a:gnu:cpio
-crip
+crip;cpe:/a:crip:crip
 cron
 crossfire-maps
-cscope
-csound
-ctn
-ctorrent
+cscope;cpe:/a:cscope:cscope
+csound;cpe:/a:csound:csound
+ctn;cpe:/a:erl_wustl:ctn
+ctorrent;cpe:/a:rahul:ctorrent
 cups;cpe:/a:cups:cups
 cupsys;cpe:/a:cups:cups
 curl;cpe:/a:curl:libcurl
@@ -144,163 +144,163 @@ cuteflow;cpe:/a:cuteflow-bin:cuteflow_bin
 cvs
 cvsnt;cpe:/a:march-hare:cvsnt
 cyrus-imapd-2.2
-cyrus-sasl2
+cyrus-sasl2;cpe:/a:carnegie_mellon_university:cyrus-sasl
 cyrus-sasl2-heimdal
 dash
 dbus-glib;cpe:/a:freedesktop:dbus-glib
 dbus;cpe:/a:freedesktop:dbus
 deliver;cpe:/a:chip_salzenberg:deliver
 deluge-torrent
-destar
-devil
-devscripts
-dhcp
-dhcp3
-dhis-server
-dia
-digitaldj
-dillo
-dist
+destar;cpe:/a:holger_schurig:destar
+devil;cpe:/a:denton_woods:devil
+devscripts;cpe:/a:devscripts_devel_team:devscripts
+dhcp;cpe:/a:isc:dhcp
+dhcp3;cpe:/a:isc:dhcp
+dhis-server;cpe:/a:guus_sliepen:dhis-server
+dia;cpe:/a:dia:dia
+digitaldj;cpe:/a:nostatic:digitaldj
+dillo;cpe:/a:dillo:dillo
+dist;cpe:/a:manoj_srivastava:dist
 djbdns;cpe:/a:d.j.bernstein:djbdns
-dkim-milter
+dkim-milter;cpe:/a:dkim:dkim-milter
 dns2tcp;cpe:/a:hsc:dns2tcp
 dnsmasq;cpe:/a:thekelleys:dnsmasq
 dnspython
 dnssec-tools
-docvert
-dojo
+docvert;cpe:/a:holloway:docvert
+dojo;cpe:/a:dojotoolkit:dojo
 dokuwiki;cpe:/a:dokuwiki:dokuwiki
-dopewars
+dopewars;cpe:/a:ben_webb:dopewars
 dotlrn
 dovecot;cpe:/a:dovecot:dovecot
-dpkg-cross
+dpkg-cross;cpe:/a:debian:dpkg-cross
 dpkg;cpe:/a:debian:dpkg
 dracut
-dropbox
+dropbox;cpe:/a:dropbox:dropbox
 drupal;cpe:/a:drupal:drupal
 drupal-4.7;cpe:/a:drupal:drupal
 drupal5;cpe:/a:drupal:drupal
 drupal6;cpe:/a:drupal:drupal
 drupal6-mod-cck
-drupal6-mod-views
-dstat
-dtc
+drupal6-mod-views;cpe:/a:earl_miles:views
+dstat;cpe:/a:dag.wieers:dstat
+dtc;cpe:/a:gplhost:dtc-common
 dvipng;cpe:/a:jan-ake_larsson:dvipng
-eaccelerator-src
+eaccelerator-src;cpe:/a:eaccelerator:eaccelerator
 ebug-http
-eclipse
-ecryptfs-utils
+eclipse;cpe:/a:eclipse:eclipse_ide
+ecryptfs-utils;cpe:/a:ecryptfs:ecryptfs_utils
 ed;cpe:/a:gnu:ed
-eggdrop
+eggdrop;cpe:/a:eggheads:eggdrop
 eglibc
 egroupware;cpe:/a:egroupware:egroupware
 ejabberd;cpe:/a:process-one:ejabberd
 ekg
-elgg
-elinks
-elog
-emacs-jabber
+elgg;cpe:/a:curveriderhq:elgg
+elinks;cpe:/a:elinks:elinks
+elog;cpe:/a:elog:elog
+emacs-jabber;cpe:/a:emacs:emacs-jabber
 emacs21;cpe:/a:gnu:emacs
 emacs22;cpe:/a:gnu:emacs
 emacs23;cpe:/a:gnu:emacs
 emacspeak;cpe:/a:emacspeak_inc:emacspeak
-ember
+ember;cpe:/a:erik_hjortsberg:ember
 emesene;cpe:/a:emesene:emesene
 encfs;cpe:/a:arg0:encfs
 enscript;cpe:/a:gnu:enscript
-eog
-epiphany-browser
-erlang
+eog;cpe:/a:gnome:eog
+epiphany-browser;cpe:/a:gnome:epiphany
+erlang;cpe:/a:erlang:erlang
 eterm;cpe:/a:eterm:eterm
 ethereal
-eucalyptus
+eucalyptus;cpe:/a:eucalyptus:eucalyptus
 evince;cpe:/a:redhat:evince
 evolution;cpe:/a:gnome:evolution
-evolution-data-server
-ewiki
+evolution-data-server;cpe:/a:gnome:evolution-data-server
+ewiki;cpe:/a:erfurtwiki:erfurtwiki
 exaile
 exim4;cpe:/a:exim:exim
 exiv2;cpe:/a:exiv2:exiv2
-expat
+expat;cpe:/a:james_clark:expat
 ezpublish;cpe:/a:ez:ez_publish
 faad2;cpe:/a:audiocoding:faad2
-fail2ban
+fail2ban;cpe:/a:fail2ban:fail2ban
 fastjar;cpe:/a:matthias_klose:fastjar
-fckeditor
+fckeditor;cpe:/a:fckeditor:fckeditor
 fcron;cpe:/a:thibault_godouet:fcron
 festival
 feta
 fetchmail;cpe:/a:eric_raymond:fetchmail
 ffmpeg-debian;cpe:/a:ffmpeg:ffmpeg
 ffmpeg;cpe:/a:ffmpeg:ffmpeg
-file
+file;cpe:/a:christos_zoulas:file
 firebird2;cpe:/a:firebird:firebird
 firebird2.0;cpe:/a:firebird:firebird
 firebird2.1;cpe:/a:firebird:firebird
 firefox-sage
-firehol
+firehol;cpe:/a:firehol:firehol
 flamethrower
 flashplugin-nonfree;cpe:/a:adobe:flash_player
-flatpress
+flatpress;cpe:/a:flatpress:flatpress
 flex;cpe:/a:will_estes:flex
-flyspray
-fml
-fontforge
-foswiki
-freebsd-sendpr
+flyspray;cpe:/a:flyspray:flyspray
+fml;cpe:/a:fumitoshi_ukai:fml
+fontforge;cpe:/a:alexej_kryukov:fontforge
+foswiki;cpe:/a:foswiki:foswiki
+freebsd-sendpr;cpe:/a:freebsd:freebsd-sendpr
 freeciv;cpe:/a:freeciv:freeciv
-freepbx
+freepbx;cpe:/a:freepbx:freepbx
 freeradius;cpe:/a:freeradius:freeradius
 freetype;cpe:/a:freetype:freetype
 freevo;cpe:/a:duncan_webb:freevo
 fuse;cpe:/a:fuse:fuse
-fwbuilder
+fwbuilder;cpe:/a:fwbuilder:firewall_builder
 gaim;cpe:/a:rob_flynn:gaim
 gallery;cpe:/a:menalto:gallery
 gallery2;cpe:/a:menalto:gallery
 gallery3;cpe:/a:menalto:gallery
-ganeti
-ganglia-monitor-core
+ganeti;cpe:/a:roman_marxer:ganeti
+ganglia-monitor-core;cpe:/a:ganglia:ganglia
 gcc-4.3;cpe:/a:gnu:gcc
-gccxml
+gccxml;cpe:/a:gccxml:gccxml
 gcj-4.1
 gcj-4.2
 gcj-4.3
 gcj-4.4
 gdcm
 gdm;cpe:/a:gnome:gdm
-gdrae
-geda-gnetlist
-gedit
-geronimo
-geshi
+gdrae;cpe:/a:alejandro_garrido_mota:gdrae
+geda-gnetlist;cpe:/a:geda:gnetlist
+gedit;cpe:/a:gnome:gedit
+geronimo;cpe:/a:apache:geronimo
+geshi;cpe:/a:geshi:geshi
 gforge;cpe:/a:gforge:gforge
 gforge-plugin-scmcvs
 ggobi
 ghostscript;cpe:/a:artifex:gpl_ghostscript
-gif2png
+gif2png;cpe:/a:catb:gif2png
 gimp;cpe:/a:gimp:gimp
-git
+git;cpe:/a:git:git
 git-core;cpe:/a:git:git
 gitolite
 glassfish
 glib2.0;cpe:/a:gnome:glib
 glibc;cpe:/a:gnu:glibc
 glpi
-gmanedit
+gmanedit;cpe:/a:gmanedit2:gmanedit
 gmime2.2;cpe:/a:gnome:gmime
 gmime2.4;cpe:/a:gnome:gmime
 gnash;cpe:/a:gnu:gnash
 gnome-peercast;cpe:/a:peercast:peercast
-gnome-power-manager
+gnome-power-manager;cpe:/a:gnome:power_manager
 gnome-screensaver;cpe:/a:gnome:screensaver
-gnome-shell
+gnome-shell;cpe:/a:gnome:gnome-shell
 gnome-subtitles;cpe:/a:pedro_castro:gnome-subtitles
 gnome-vfs2
 gnome-xcf-thumbnailer
 gnu-smalltalk
-gnucash
-gnudip
+gnucash;cpe:/a:gnucash:gnucash
+gnudip;cpe:/a:gnudip:gnudip
 gnumeric;cpe:/a:gnome:gnumeric
 gnupg;cpe:/a:gnupg:gnupg
 gnupg2;cpe:/a:gnupg:gnupg
@@ -318,32 +318,32 @@ grubcpe:/a:gnu:grub_legacy
 gs-esp;cpe:/a:ghostscript:ghostscript
 gs-gpl;cpe:/a:ghostscript:ghostscript
 gst-plugins-bad0.10
-gst-plugins-base0.10
+gst-plugins-base0.10;cpe:/a:gstreamer:gst-plugins-base
 gst-plugins-good0.10;cpe:/a:gstreamer:good_plug-ins
 gstreamer0.10-ffmpeg
 gtk+2.0;cpe:/a:gtk:gtk%2B
 guile-1.6
-gupnp
+gupnp;cpe:/a:gupnp:gupnp
 gv;cpe:/a:gnu:gv
 gzip;cpe:/a:gnu:gzip
 hamlib
 havp;cpe:/a:havp:havp
 heartbeat
 heimdal
-henplus
+henplus;cpe:/a:henner_zeller:henplus
 hercules
 hf;cpe:/a:hf:hf
-hipo
+hipo;cpe:/a:pedro_villavicencio_garrido:hipo
 hobix
 honeyd
 horde3;cpe:/a:horde:horde
 hplip;cpe:/a:hp:linux_imaging_and_printing_project
 hsolink;cpe:/a:pharscape:hsolink
-htmldoc
-htop
+htmldoc;cpe:/a:htmldoc:htmldoc
+htop;cpe:/a:htop:htop
 httrack;cpe:/a:httrack:httrack
 hybserv;cpe:/a:dinko_korunic:hybserv2
-hypermail
+hypermail;cpe:/a:hypermail-project:hypermail
 hypre
 ibackup;cpe:/a:gnu:ibackup
 iceape;cpe:/a:mozilla:seamonkey
@@ -356,37 +356,37 @@ imagemagick;cpe:/a:imagemagick:imagemagick
 imlib
 imlib2;cpe:/a:carsten_haitzler:imlib2
 imp4;cpe:/a:horde:imp
-impose+
-incron
+impose+;cpe:/a:dov_grobgeld:impose%2B
+incron;cpe:/a:inotify:incron
 ingo1
 initramfs-tools
 insighttoolkit
 inspircd;cpe:/a:inspire_ircd:inspircd
 interchange;cpe:/a:interchange_development_group:interchange
-ipplan
-ipsec-tools
-iputils
-ircd-hybrid
+ipplan;cpe:/a:richard_ellerbrock:ipplan
+ipsec-tools;cpe:/a:ipsec-tools:ipsec-tools
+iputils;cpe:/a:skbuff:iputils
+ircd-hybrid;cpe:/a:ircd-hybrid:ircd-hybrid
 ircd-ircu
-ircd-ratbox
+ircd-ratbox;cpe:/a:ircd-ratbox:ircd-ratbox
 irrlicht
 irssi;cpe:/a:irssi:irssi
 isc-dhcp;cpe:/a:isc:dhcp
 iscsitarget;cpe:/a:iscsitarget:iscsitarget
 jags
-jailer
+jailer;cpe:/a:javier_fernandez:jailer
 jasper;cpe:/a:jasper_project:jasper
 jbig2dec
-jbossas4
-jetty
-jhead
+jbossas4;cpe:/a:redhat:jboss_enterprise_application_platform
+jetty;cpe:/a:mortbay:jetty
+jhead;cpe:/a:sentex:jhead
 jifty
 jquery
 jscropperui
-jspwiki
+jspwiki;cpe:/a:jspwiki:jspwiki
 kadu
 karrigell
-kaya
+kaya;cpe:/a:kayalang:kaya
 kde4libs;cpe:/o:kde:kdelibs
 kdebase-workspace
 kdebase;cpe:/o:kde:kde
@@ -403,44 +403,44 @@ knowledgeroot
 kolab-cyrus-imapd
 kolab-webclient
 kompozer
-konwert
+konwert;cpe:/a:krzysztof_kozlowski:konwert
 krb5;cpe:/a:mit:kerberos
 kronolith2
-ktorrent
-ktorrent2.2
+ktorrent;cpe:/a:ktorrent:ktorrent
+ktorrent2.2;cpe:/a:ktorrent:ktorrent
 kvirc;cpe:/a:kvirc:kvirc
 kvm;cpe:/a:kvm_qumranet:kvm
 lam
-lasso
-lastfm
-lazarus
+lasso;cpe:/a:lasso:lasso
+lastfm;cpe:/a:last:last.fm
+lazarus;cpe:/a:lazarus:lazarus
 lcms;cpe:/a:littlecms:lcms
 ldm;cpe:/a:ltsp:linux_terminal_server_project
-ldns
-lftp
+ldns;cpe:/a:nlnetlabs:ldns
+lftp;cpe:/a:alexander_v._lukyanov:lftp
 lib3ds;cpe:/a:jan_eric_krprianidis:lib3ds
 libannodex
-libapache-mod-jk
-libapache-mod-security
+libapache-mod-jk;cpe:/a:apache:mod_jk
+libapache-mod-security;cpe:/a:modsecurity:modsecurity
 libapache2-mod-auth-shadow
-libapache2-mod-fcgid
-libapache2-mod-perl2
+libapache2-mod-fcgid;cpe:/a:apache:mod_fcgid
+libapache2-mod-perl2;cpe:/a:apache:mod_perl
 libaws
 libcdaudio
-libcgi-pm-perl
-libcgi-simple-perl
-libcompface
+libcgi-pm-perl;cpe:/a:andy_armstrong:cgi.pm
+libcgi-simple-perl;cpe:/a:andy_armstrong:cgi-simple
+libcompface;cpe:/a:james_ashton:compface
 libcompress-raw-bzip2-perl
-libcompress-raw-zlib-perl
+libcompress-raw-zlib-perl;cpe:/a:paul_marquess:compress-raw-zlib_perl_module
 libconvert-uulib-perl
-libcrypt-openssl-dsa-perl
+libcrypt-openssl-dsa-perl;cpe:/a:perl-openssl:libcrypt-openssl-dsa-perl
 libdbd-pg-perl
 libesmtp;cpe:/a:stafford.uklinux:libesmtp
-libexif
+libexif;cpe:/a:curtis_galloway:libexif
 libextractor
 libfishsound;cpe:/a:xiph:libfishsound
-libfwbuilder
-libgadu
+libfwbuilder;cpe:/a:fwbuilder:firewall_builder
+libgadu;cpe:/a:wojtek_kaniewsk:libgadu
 libgd2;cpe:/a:libgd:gd_graphics_library
 libgdiplus;cpe:/a:mono-project:libgdiplus
 libglpng;cpe:/a:glpng:glpng
@@ -454,8 +454,8 @@ libio-socket-ssl-perl;cpe:/a:io-socket-ssl:io-socket-ssl
 libjson-ruby
 libmcrypt
 libmikmod;cpe:/a:raphael_assenat:libmikmod
-libmodplug
-libnasl
+libmodplug;cpe:/a:konstanty_bialkowski:libmodplug
+libnasl;cpe:/a:finkproject:libnasl
 libnet-dns-perl
 libnids;cpe:/a:rafal_wojtczuk:libnids
 libnss-db;cpe:/a:piotr_roszatycki:libnss-db
@@ -465,44 +465,44 @@ libpam-heimdal
 libpam-krb5;cpe:/a:eyrie:pam-krb5
 libpam-mount;cpe:/a:pam_mount:pam_mount
 libpam-ssh;cpe:/a:andrew_j.korty:pam_ssh
-libphp-cas
+libphp-cas;cpe:/a:ja-sig:phpcas_client_library
 libphp-jpgraph
 libphp-snoopy
 libpng;cpe:/a:libpng:libpng
 libprelude
 libsamplerate
-libsdp
-libsmi
-libsndfile
-libsoup
+libsdp;cpe:/a:openfabrics:libsdp
+libsmi;cpe:/a:tu-braunschweig:libsmi
+libsndfile;cpe:/a:mega-nerd:libsndfile
+libsoup;cpe:/a:joe_shaw:libsoup
 libspf2;cpe:/a:libspf:libspf2
 libspring-2.5-java;cpe:/a:springsource:spring_framework
 libstruts1.2-java;cpe:/a:apache:struts
-libthai
+libthai;cpe:/a:linux.thai:libthai
 libtheora
 libtk-img
-libtool
-libtorrent-rasterbar
+libtool;cpe:/a:gnu:libtool
+libtorrent-rasterbar;cpe:/a:rasterbar_software:libtorrent
 libtunepimp
 libuser;cpe:/a:miloslav_trmac:libuser
-libv8
+libv8;cpe:/a:google:v8
 libvirt;cpe:/a:libvirt:libvirt
 libvorbis;cpe:/a:xiph.org:libvorbis
 libvpx
-libwmf
+libwmf;cpe:/a:francis_james_franklin:libwmf
 libwordpress-xmlrpc-perl
-libwww-perl
+libwww-perl;cpe:/a:search.cpan:libwww-perl
 libxcrypt
 libxerces2-java
 libxfont
-libxml
+libxml;cpe:/a:xmlsoft:libxml
 libxml2;cpe:/a:xmlsoft:libxml2
 libxslt;cpe:/a:xmlsoft:libxslt
 licq;cpe:/a:licq:licq
 lighttpd;cpe:/a:lighttpd:lighttpd
 lilo;cpe:/a:lilo:lilo
 links2;cpe:/a:twibright:links
-lintian
+lintian;cpe:/a:debian:lintian
 linux-2.6.24;cpe:/o:linux:kernel
 linux-2.6;cpe:/o:linux:kernel
 linux-ftpd
@@ -510,95 +510,95 @@ linux-ftpd-ssl
 linux-patch-grsecurity2;cpe:/a:grsecurity:grsecurity_kernel_patch
 linux-patch-tuxonice
 linuxdcpp;cpe:/a:linux:direct_connect
-linuxtrade
-liquidsoap
+linuxtrade;cpe:/a:linuxtrade:linuxtrade
+liquidsoap;cpe:/a:savonet:liguidsoap
 litmus
 lmbench;cpe:/a:bitmover:lmbench
-ltp
+ltp;cpe:/a:alastair_mckinstry:ltp-network-test
 ltsp;cpe:/a:ltsp:linux_terminal_server_project
 lucene2
-lustre
+lustre;cpe:/a:lustre:lustre-tests
 lvm2;cpe:/a:heinz_mauelshagen:lvm2
 lxr;cpe:/a:malcom_box:lxr_cross_referencer
 lxr-cvs;cpe:/a:malcom_box:lxr_cross_referencer
 lxsession
 lynx-cur;cpe:/a:lynx:lynx
 lynx;cpe:/a:lynx:lynx
-m2crypto
+m2crypto;cpe:/a:heikkitoivonen:m2crypto
 m4;cpe:/a:gnu:m4
-mafft
-magics++
+mafft;cpe:/a:align.bmr.kyushu-u.ac:mafft
+magics++;cpe:/a:ecmwf:magics%2B%2B
 magpierss
 mahara;cpe:/a:mahara:mahara
-maildirsync
+maildirsync;cpe:/a:jose_carlos_medeiros:maildirsync
 maildrop;cpe:/a:maildrop:maildrop
 mailman;cpe:/a:gnu:mailman
-mailscanner
-mako
+mailscanner;cpe:/a:mailscanner:mailscanner
+mako;cpe:/a:makotemplates:mako
 mantis;cpe:/a:mantisbt:mantisbt
 mapserver;cpe:/a:umn:mapserver
 maradns;cpe:/a:maradns:maradns
 matanza
-mathtex
+mathtex;cpe:/a:forkosh:mathtex
 matrixssl
-maxdb-7.5.00
-mayavi
+maxdb-7.5.00;cpe:/a:sap:maxdb
+mayavi;cpe:/a:abottoms:mayavi
 mcabber
 mediamate
 mediatomb
-mediawiki1.7
+mediawiki1.7;cpe:/a:mediawiki:mediawiki
 mediawiki;cpe:/a:mediawiki:mediawiki
-mednafen
-memcached
+mednafen;cpe:/a:david_shadoff:mednafen
+memcached;cpe:/a:memcachedb:memcached
 memcachedb
 mercurial;cpe:/a:mercurial:mercurial
-merkaartor
-mgetty
-mgt
-mh-book
+merkaartor;cpe:/a:merkaartor:merkaartor
+mgetty;cpe:/a:gert_doering:mgetty
+mgt;cpe:/a:steve_robbins:mgt
+mh-book;cpe:/a:peter_s_galbraith:mh-book
 mhonarc;cpe:/a:mhonarc:mhonarc
-midori
-mimetex
-mini-httpd
-mistelix
+midori;cpe:/a:christian_dywan:midori
+mimetex;cpe:/a:forkosh:mimetex
+mini-httpd;cpe:/a:acme:mini_httpd
+mistelix;cpe:/a:mistelix:mistelix
 mksh
-mldonkey
-mlmmj
-mn-fit
+mldonkey;cpe:/a:mldonkey:mldonkey
+mlmmj;cpe:/a:mlmmj:mlmmj
+mn-fit;cpe:/a:zeus.physik.uni-bonn:mn_fit
 mnemo2
 mod-auth-mysql;cpe:/a:joey_schulze:mod_auth_mysql
 moin;cpe:/a:moinmo:moinmoin
 mojarra;cpe:/a:oracle:mojarra
 mon;cpe:/a:jim_trocki:mon
 mondo
-monkeysphere
-mono-debugger
+monkeysphere;cpe:/a:monkeysphere_project:monkeysphere
+mono-debugger;cpe:/a:debian:mono-debugger
 mono;cpe:/a:mono_project:mono
-monotone
+monotone;cpe:/a:monotone:monotone
 moodle;cpe:/a:moodle:moodle
 moon
 motion;cpe:/a:lavrsen:motion
 movabletype-opensource;cpe:/a:sixapart:movabletype
 mp4h
-mpfr
-mpg123
+mpfr;cpe:/a:mpfr:gnu_mpfr
+mpg123;cpe:/a:mpg123:mpg123
 mplayer;cpe:/a:mplayer:mplayer
 mpop
 msmtp
 msp-webserver
 mt-daapd
 mtr;cpe:/a:matt_kimball_and_roger_wolff:mtr
-multi-gnome-terminal
-multipath-tools
+multi-gnome-terminal;cpe:/a:mohammed_sameer:multi-gnome-terminal
+multipath-tools;cpe:/a:christophe.varoqui:multipath-tools
 mutt;cpe:/a:mutt:mutt
-muttprint
+muttprint;cpe:/a:lukas_ruf:muttprint
 mydms;cpe:/a:letodms:letodms
 myspell
 mysql-5.1;cpe:/a:mysql:mysql
 mysql-dfsg-4.1;cpe:/a:mysql:mysql
 mysql-dfsg-5.0;cpe:/a:mysql:mysql
 mysql-dfsg-5.1;cpe:/a:mysql:mysql
-mysql-ocaml
+mysql-ocaml;cpe:/a:mysql-ocaml:mysql-ocaml
 nag2
 nagios2;cpe:/a:nagios:nagios
 nagios3;cpe:/a:nagios:nagios
@@ -606,7 +606,7 @@ naim
 namazu2;cpe:/a:namazu:namazu
 nano;cpe:/a:gnu:nano
 nasm;cpe:/a:nasm:nasm
-nautilus-python
+nautilus-python;cpe:/a:gnome:nautilus-python
 ncbi-tools6
 ncompress
 ncpfs;cpe:/a:ncpfs:ncpfs
@@ -615,46 +615,46 @@ neon26;cpe:/a:webdav:neon
 neon27;cpe:/a:webdav:neon
 neon;cpe:/a:webdav:neon
 net-snmp;cpe:/o:net-snmp:net_snmp
-netatalk
-netdisco-mibs-installer
-netmrg
+netatalk;cpe:/a:netatalk:netatalk
+netdisco-mibs-installer;cpe:/a:oliver_gorwits:netdisco_mibs_installer
+netmrg;cpe:/a:netmrg:netmrg
 netpbm-free
 network-manager
-network-manager-applet
+network-manager-applet;cpe:/a:gnome:networkmanager
 newsbeuter;cpe:/a:newsbeuter:newsbeuter
-newsgate
+newsgate;cpe:/a:debian:newsgate
 newsx;cpe:/a:fedora:newsx
-newt
+newt;cpe:/a:fedorahosted:newt
 nfs-utils;cpe:/a:nfs:nfs-utils
-nginx
+nginx;cpe:/a:nginx:nginx
 ngircd
 nilfs2-tools
-no-ip
-nordugrid-arc-nox
-nsd
+no-ip;cpe:/a:no-ip:no-ip2
+nordugrid-arc-nox;cpe:/a:nordugrid:nordugrid-arc
+nsd;cpe:/a:nlnetlabs:nsd
 nsd3
 nspr
 nss
 nss-ldapd
-ntop
+ntop;cpe:/a:ntop:ntop
 ntp;cpe:/a:ntp:ntp
-nusoap
-nvidia-cg-toolkit
-ocrodjvu
-ocsinventory-agent
+nusoap;cpe:/a:dietrich_ayala:nusoap
+nvidia-cg-toolkit;cpe:/a:federico_di_gregorio:nvidia-cg-toolkit
+ocrodjvu;cpe:/a:jwilk:ocrodjvu
+ocsinventory-agent;cpe:/a:ocsinventory-ng:ocsinventory-agent
 ocsinventory-server;cpe:/a:ocsinventory-ng:ocs_inventory_ng
-oftc-hybrid
-ogle
-okular;
+oftc-hybrid;cpe:/a:oftc:oftc-hybrid
+ogle;cpe:/a:alan_woodland:ogle
+okular
 op
 op-panel
 open-iscsi
 openacs
-openafs
-openconnect
+openafs;cpe:/a:openafs:openafs
+openconnect;cpe:/a:infradead:openconnect
 opendb
 opendchub;cpe:/a:roshan_singh:open_direct_connect_hub
-openexr
+openexr;cpe:/a:openexr:openexr
 openjdk-6;cpe:/a:sun:openjdk
 openldap2.2;cpe:/a:openldap:openldap
 openldap2.3;cpe:/a:openldap:openldap
@@ -672,21 +672,21 @@ openssl;cpe:/a:openssl:openssl
 openswan;cpe:/a:openswan:openswan
 openttd;cpe:/a:openttd:openttd
 openvpn;cpe:/a:openvpn:openvpn
-openx
+openx;cpe:/a:openx:openx
 opie;cpe:/a:nrl:opie
-optipng
-os-prober
+optipng;cpe:/a:cosmin_truta:optipng
+os-prober;cpe:/a:debian:os-prober
 otrs;cpe:/a:otrs:otrs
 otrs2;cpe:/a:otrs:otrs
-owl
-owl-dms
-p3nfs
-p7zip
+owl;cpe:/a:ktools:owl
+owl-dms;cpe:/a:owl:intranet_knowledgebase
+p3nfs;cpe:/a:koeniglich:p3nfs
+p7zip;cpe:/a:7-zip:7-zip
 pam;cpe:/a:kernel:linux-pam
 pam-pgsql;cpe:/a:libpam-pgsql:libpam-pgsql
 pan;cpe:/a:pan:pan
 pango1.0;cpe:/a:pango:pango
-paramiko
+paramiko;cpe:/a:python_software_foundation:paramiko
 paraview
 parser
 parser-mysql
@@ -695,18 +695,18 @@ paste;cpe:/a:pythonpaste:paste
 pax
 pcre3;cpe:/a:pcre:pcre
 pcsc-lite;cpe:/a:muscle:pcsc-lite
-pdfjam
+pdfjam;cpe:/a:pdfjam:pdfjam
 pdkim
 pdns;cpe:/a:powerdns:powerdns
 pdns-recursor;cpe:/a:powerdns:recursor
 pdnsd;cpe:/a:pdnsd:pdnsd
 pdsh
-peercast
+peercast;cpe:/a:peercast:peercast
 perl;cpe:/a:perl:perl
 perlbal;cpe:/a:perlbal:perlbal
 pgfouine
 php-apc
-php-htmlpurifier
+php-htmlpurifier;cpe:/a:htmlpurifier:htmlpurifier
 php-json-ext
 php-mail
 php-net-ping
@@ -716,23 +716,23 @@ phpbb2;cpe:/a:phpbb:phpbb
 phpbb3;cpe:/a:phpbb:phpbb
 phpgedview;cpe:/a:phpgedview:phpgedview
 phpgroupware;cpe:/a:phpgroupware:phpgroupware
-phpicalendar
-phpldapadmin
+phpicalendar;cpe:/a:phpicalendar:phpicalendar
+phpldapadmin;cpe:/a:deon_george:phpldapadmin
 phpmyadmin;cpe:/a:phpmyadmin:phpmyadmin
-phpmyid
-phppgadmin
-phpqladmin
+phpmyid;cpe:/a:phpmyid:phpmyid
+phppgadmin;cpe:/a:phppgadmin:phppgadmin
+phpqladmin;cpe:/a:phpqladmin:phpqladmin
 pidgin;cpe:/a:pidgin:pidgin
 pike7.6
 pilot-qof
 pimd;cpe:/a:troglobit:pimd
 pinball
-piwigo
+piwigo;cpe:/a:piwigo:piwigo
 piwik;cpe:/a:piwik:piwik
 pixelpost
 plait;cpe:/a:stephenjungels:plait
-planet
-planet-venus
+planet;cpe:/a:intertwingly:planet
+planet-venus;cpe:/a:intertwingly:planet_venus
 plone3;cpe:/a:plone:plone
 plt-scheme
 pmount;cpe:/a:vincent_fourmond:pmount
@@ -740,8 +740,8 @@ poco
 poker-network
 polarssl
 policyd-weight;cpe:/a:policyd-weight:policyd-weight
-policykit
-polipo
+policykit;cpe:/a:freedesktop:policykit
+polipo;cpe:/a:pps.jussieu:polipo
 poppler;cpe:/a:poppler:poppler
 postfix;cpe:/a:postfix:postfix
 postgresql-7.4;cpe:/a:postgresql:postgresql
@@ -750,30 +750,30 @@ postgresql-8.2;cpe:/a:postgresql:postgresql
 postgresql-8.3;cpe:/a:postgresql:postgresql
 postgresql-8.4;cpe:/a:postgresql:postgresql
 postgresql-9.0;cpe:/a:postgresql:postgresql
-postgresql-ocaml
-ppp
-prewikka
-printfilters-ppd
+postgresql-ocaml;cpe:/a:ocaml:postgresql-ocaml
+ppp;cpe:/a:marco_d%27itri:ppp
+prewikka;cpe:/a:prelude-technologies:prewikka
+printfilters-ppd;cpe:/a:a_mennucc1:printfilters-ppd
 pristine-tar
 proftpd-dfsg;cpe:/a:proftpd:proftpd
 projectl;cpe:/a:debian:projectl
 prototypejs
-psi
-pulseaudio
+psi;cpe:/a:psi-im:psi
+pulseaudio;cpe:/a:pulseaudio:pulseaudio
 puppet;cpe:/a:puppet:puppet
-pvpgn
-pyfribidi
-pyftpd
-pygresql
+pvpgn;cpe:/a:pvpgn:pvpgn
+pyfribidi;cpe:/a:kobi_zamir:pyfribidi
+pyftpd;cpe:/a:radovan_garabik:pyftpd
+pygresql;cpe:/a:pygresql:pygresql
 python-4suite
-python-cherrypy
+python-cherrypy;cpe:/a:cherrypy:cherrypy
 python-cjson;cpe:/a:dan_pascu:python-cjson
 python-crypto
 python-defaults
 python-django;cpe:/a:djangoproject:django
 python-dns
-python-formencode
-python-pyftpdlib
+python-formencode;cpe:/a:formencode:formencode
+python-pyftpdlib;cpe:/a:g.rodola:pyftpdlib
 python-xml
 python2.4;cpe:/a:python:python
 python2.5;cpe:/a:python:python
@@ -784,44 +784,44 @@ python3.2;cpe:/a:python:python
 qemu-kvm
 qemu;cpe:/a:qemu:qemu
 qt4-x11;cpe:/a:nokia:qt
-qtcreator
-quagga
+qtcreator;cpe:/a:nokia:qt_creator
+quagga;cpe:/a:quagga:quagga_routing_software_suite
 quassel
 qutecom
 qwik
 r-base;cpe:/a:r_foundation:r
 r-base-core-ra
-radiance
+radiance;cpe:/a:radiance:radiance
 rails;cpe:/a:ruby_on_rails:ruby_on_rails
-rancid
-rccp
+rancid;cpe:/a:shrubbery:rancid
+rccp;cpe:/a:zak_b_elep:rccp
 rdesktop;cpe:/a:rdesktop:rdesktop
-realtimebattle
+realtimebattle;cpe:/a:remi_vanicat:realtimebattle
 redhat-cluster;cpe:/a:redhat:cman
 redland
-redmine
+redmine;cpe:/a:redmine:redmine
 refpolicy
-rekonq
+rekonq;cpe:/a:adjam:rekonq
 reportbug;cpe:/a:reportbug-ng:reportbug
 reportbug-ng;cpe:/a:reportbug-ng:reportbug-ng
 request-tracker3.4;cpe:/a:bestpractical:rt
 request-tracker3.6;cpe:/a:bestpractical:rt
 request-tracker3.8;cpe:/a:bestpractical:rt
-rhythmbox
-rkhunter
-roaraudio
+rhythmbox;cpe:/a:gnome:rhythmbox
+rkhunter;cpe:/a:john_horne:rkhunter
+roaraudio;cpe:/a:roaraudio:roaraudio
 robocode;cpe:/a:robocode:robocode
-root-system
+root-system;cpe:/a:root:root
 roundcube;cpe:/a:roundcube:roundcube_webmail
 roundup;cpe:/a:roundup:roundup
 rpm;cpe:/a:rpm:rpm
 rsync;cpe:/a:rsync:rsync
-rsyslog
+rsyslog;cpe:/a:rsyslog:rsyslog
 rt-extension-emailcompletion
 rt2400
 rt2500
 rt2570
-rt73
+rt73;cpe:/h:ralinktech:rt73
 ruby1.8;cpe:/a:ruby-lang:ruby
 ruby1.9.1;cpe:/a:ruby-lang:ruby
 ruby1.9;cpe:/a:ruby-lang:ruby
@@ -829,25 +829,25 @@ ruby;cpe:/a:ruby-lang:ruby
 rxvt
 sabre
 sahana;cpe:/a:sahanafoundation:sahana
-salome
+salome;cpe:/a:salome-platform:salome
 samba;cpe:/a:samba:samba
-samhain
-samizdat
+samhain;cpe:/a:samhain_labs:samhain
+samizdat;cpe:/a:nongnu:samizdat
 sarg;cpe:/a:sarg:squid_analysis_report_generator
-scilab
-scratchbox2
-screen
-screenie
+scilab;cpe:/a:scilab:scilab
+scratchbox2;cpe:/a:freedesktop:scratchbox2
+screen;cpe:/a:gnu:screen
+screenie;cpe:/a:marc_gloor:screenie
 scriptaculous
 sdcc
-sdl-image1.2
-sdm
-sendmail
+sdl-image1.2;cpe:/a:sdl:sdl_image
+sdm;cpe:/a:jonas_smedegaard:sdm-terminal
+sendmail;cpe:/a:sendmail:sendmail
 serendipity;cpe:/a:s9y:serendipity
-sgml2x
+sgml2x;cpe:/a:alcovebook:sgml2x
 shadow
-shibboleth-sp
-shibboleth-sp2
+shibboleth-sp;cpe:/a:internet2:shibboleth-sp
+shibboleth-sp2;cpe:/a:internet2:shibboleth-sp
 silc-client;cpe:/a:silc:silc_client
 silc-server;cpe:/a:silc:silc-server
 silc-toolkit;cpe:/a:silc:silc_toolkit
@@ -857,21 +857,21 @@ sip-tester
 siproxd
 ski
 slash;cpe:/a:slashcode.com:slash
-slim
-slurm-llnl
+slim;cpe:/a:simone_rota:slim_simple_login_manager
+slurm-llnl;cpe:/a:llnl:slurm
 smart
-smarty
+smarty;cpe:/a:smarty:smarty
 smbind;cpe:/a:blentz:smbind
-smsclient
-sng
+smsclient;cpe:/a:smsclient:smsclient
+sng;cpe:/a:eric_raymond:sng
 snort;cpe:/a:snort:snort
-socat
+socat;cpe:/a:dest-unreach:socat
 sork-passwd-h3
 spamass-milter
 speex
 spice;cpe:/a:redhat:qspice
-spip
-splitvt
+spip;cpe:/a:spip:spip
+splitvt;cpe:/a:sam_lantinga:splitvt
 sql-ledger;cpe:/a:sql-ledger:sql-ledger
 squid;cpe:/a:squid-cache:squid
 squid3;cpe:/a:squid-cache:squid
@@ -879,76 +879,76 @@ squidguard;cpe:/a:squidguard:squidguard
 squirrelmail;cpe:/a:squirrelmail:squirrelmail
 ssmtp;cpe:/a:ssmtp:ssmtp
 sssd;cpe:/a:fedoraproject:sssd
-stardict
-streamripper
+stardict;cpe:/a:stardict:stardict
+streamripper;cpe:/a:streamripper:streamripper
 strongswan;cpe:/a:strongswan:strongswan
 stunnel4;cpe:/a:stunnel:stunnel
 subversion;cpe:/a:apache:subversion
 sudo;cpe:/a:todd_miller:sudo
 sun-java5;cpe:/a:sun:jdk
 sun-java6;cpe:/a:sun:jdk
-suphp
+suphp;cpe:/a:sebastian_marsching:suphp
 swfdec0.5;cpe:/a:swfdec:swfdec
 swfdec0.6;cpe:/a:swfdec:swfdec
 swftools;cpe:/a:swftools:swftools
-sword
+sword;cpe:/a:the_sword_project:sword
 symfony
 sympa;cpe:/a:sympa:sympa
 synfig
-syslog-ng
+syslog-ng;cpe:/o:balabit:syslog-ng
 system-tools-backends
-systemimager
+systemimager;cpe:/a:dann_frazier:systemimager-server
 systemtap;cpe:/a:systemtap:systemtap
-t-prot
-tangerine
+t-prot;cpe:/a:jochen_striepe:t-prot
+tangerine;cpe:/a:alex_launi:tangerine
 tar;cpe:/a:gnu:tar
-tau
+tau;cpe:/a:uoregon:tau
 tdiary;cpe:/a:tdiary:tdiary
 tdom
-teamspeak-client
-teamspeak-server
+teamspeak-client;cpe:/a:teamspeak:teamspeak
+teamspeak-server;cpe:/a:teamspeak:teamspeak
 texlive-base
 texlive-bin;cpe:/a:tug:tex_live
-texmacs
-textpattern
+texmacs;cpe:/a:texmacs:texmacs
+textpattern;cpe:/a:textpattern:textpattern
 tgt;cpe:/a:zaal:tgt
-thin
-thttpd
+thin;cpe:/a:macournoyer:thin
+thttpd;cpe:/a:acme:thttpd
 tiff;cpe:/a:libtiff:libtiff
 tiger;cpe:/a:tiger:tiger
 tightvnc;cpe:/a:tightvnc:tightvnc
 tikiwiki;cpe:/a:tikiwiki:tikiwiki_cms_groupware
-tintin++
-tk8.3
-tk8.4
-tk8.5
-tkman
-tkusr
+tintin++;cpe:/a:tintin:tintin%2B%2B
+tk8.3;cpe:/a:tcl_tk:tcl_tk
+tk8.4;cpe:/a:tcl_tk:tcl_tk
+tk8.5;cpe:/a:tcl_tk:tcl_tk
+tkman;cpe:/a:tkman:tkman
+tkusr;cpe:/a:ldrolez:tkusr
 tla
 tmsnc;cpe:/a:tmsnc:tmsnc
-tomboy
+tomboy;cpe:/a:gnome:tomboy
 tomcat-native
 tomcat5;cpe:/a:apache:tomcat
 tomcat5.5;cpe:/a:apache:tomcat
 tomcat6;cpe:/a:apache:tomcat
 tor;cpe:/a:tor:tor
-torcs
+torcs;cpe:/a:bernhard_wymann:torcs
 torrentflux
-tqsllib
+tqsllib;cpe:/a:arrl:tqsllib
 trac;cpe:/a:edgewall:trac
-trac-git
+trac-git;cpe:/a:nanosleep:trac-git
 transmission;cpe:/a:transmissionbt:transmission
-trickle
+trickle;cpe:/a:monkey:trickle
 tss;cpe:/a:debian:tss
-tunapie
+tunapie;cpe:/a:james_stone:tunapie
 turba2;cpe:/a:debian:turba
-turbogears2
-tutos
-tutos2
-tuxguitar
+turbogears2;cpe:/a:turbogears:turbogears2
+tutos;cpe:/a:tutos:tutos
+tutos2;cpe:/a:tutos:tutos
+tuxguitar;cpe:/a:herac:tuxguitar
 tuxonice-userui
 twiki;cpe:/a:twiki:twiki
-typo
+typo;cpe:/a:typosphere:typo
 typo3-src;cpe:/a:typo3:typo3
 udev;cpe:/a:kernel:udev
 udisks;cpe:/a:freedesktop:udisks
@@ -957,63 +957,63 @@ udunits
 unbound;cpe:/a:nlnet_labs:unbound
 unrealircd;cpe:/a:unrealircd:unrealircd
 unzip;cpe:/a:info-zip:unzip
-ust
+ust;cpe:/a:lttng:ust
 util-linux;cpe:/a:linux:util-linux
 uudeview;cpe:/a:uudeview:uudeview
-uw-imap
+uw-imap;cpe:/a:university_of_washington:imap
 uzbl;cpe:/a:uzbl:uzbl
-valgrind
-varnish
+valgrind;cpe:/a:valgrind:valgrind
+varnish;cpe:/a:varnish.projects.linpro:varnish
 vdccm
-vdr
-verlihub
-videocache
+vdr;cpe:/a:tvdr:vdr
+verlihub;cpe:/a:verlihub-project:verlihub
+videocache;cpe:/a:saini:videocache
 viewvc;cpe:/a:viewvc:viewvc
 vim;cpe:/a:vim:vim
-vinagre
-vips
+vinagre;cpe:/a:gnome:vinagre
+vips;cpe:/a:vips:vips
 virtualbox-guest-additions
-virtualbox-ose
+virtualbox-ose;cpe:/a:sun:virtualbox
 vlc;cpe:/a:videolan:vlc_media_player
 vmware-package
 vnc4
 vsftpd;cpe:/a:redhat:vsftpd
-vte
+vte;cpe:/a:nalin_dahyabhai:vte
 vxl
 w3c-libwww
 w3m;cpe:/a:w3m:w3m
 wafp;cpe:/a:mytty:webapplication_finger_printer
-webauth
+webauth;cpe:/a:stanford:webauth
 webcalendar;cpe:/a:k5n:webcalendar
-webcit
-webgui
+webcit;cpe:/a:citadel:webcit
+webgui;cpe:/a:plainblack:webgui
 webhelpers
 webkit;cpe:/a:webkit:webkit
 webkitkde
-webmin
+webmin;cpe:/a:webmin:webmin
 weborf;cpe:/a:salvo_tomaselli:weborf_http_server
-websvn
-weechat
-wesnoth
-wget
-whitedune
-wicd
-wims
+websvn;cpe:/a:tigris:websvn
+weechat;cpe:/a:flashtux:weechat
+wesnoth;cpe:/a:wesnoth:wesnoth
+wget;cpe:/a:gnu:wget
+whitedune;cpe:/a:white_dune:white_dune
+wicd;cpe:/a:wicd:wicd
+wims;cpe:/a:georges_khaznadar:wims
 wireshark;cpe:/a:wireshark:wireshark
-wml
+wml;cpe:/a:website_meta_language:website_meta_language
 wordnet;cpe:/a:wordnet:wordnet
 wordpress;cpe:/a:wordpress:wordpress
-wordpress-mu
-wxwidgets2.6
-wxwidgets2.8
-wxwindows2.4
-wyrd
-xapian-omega
+wordpress-mu;cpe:/a:wordpress:wordpress_mu
+wxwidgets2.6;cpe:/a:wxwidgets:wxwidgets
+wxwidgets2.8;cpe:/a:wxwidgets:wxwidgets
+wxwindows2.4;cpe:/a:wxwidgets:wxwidgets
+wyrd;cpe:/a:paul_pelzl:wyrd
+xapian-omega;cpe:/a:xapian:omega
 xar
-xastir
-xcal
-xcftools
-xchat
+xastir;cpe:/a:xastir:xastir
+xcal;cpe:/a:lars_bahner:xcal
+xcftools;cpe:/a:henning_makholm:xcftools
+xchat;cpe:/a:xchat:xchat
 xdg-utils
 xemacs21;cpe:/a:gnu:xemacs
 xemacs21-packages;cpe:/a:gnu:xemacs
@@ -1024,10 +1024,10 @@ xen-unstable;cpe:/a:xensource:xen
 xerces-c
 xerces-c2
 xerces27
-xfig
+xfig;cpe:/a:xfig:xfig
 xine-lib;cpe:/a:xine:xine-lib
 xmacs21
-xmcd
+xmcd;cpe:/a:ti_kan:xmcd
 xml-security-c
 xmlrpc-c
 xmlsec1
@@ -1036,27 +1036,27 @@ xmovie
 xorg-server;cpe:/a:x:x11
 xotcl
 xpdf;cpe:/a:xpdf:xpdf
-xrdp
+xrdp;cpe:/a:xrdp:xrdp
 xscreensaver
 xterm
 xulrunner
-xvidcore
-xwine
-xyssl
-yacy
-yaws
+xvidcore;cpe:/a:xvid:xvid
+xwine;cpe:/a:xwine:xwine
+xyssl;cpe:/a:xyssl:xyssl
+yacy;cpe:/a:michael_christen:yacy
+yaws;cpe:/a:yaws:yaws
 yelp;cpe:/a:gnome:yelp
-yui
+yui;cpe:/a:yahoo:yui
 zabbix;cpe:/a:zabbix:zabbix
-zaptel
+zaptel;cpe:/a:asterisk:zaptel
 zenoss;cpe:/a:zenoss:zenoss
 ziproxy;cpe:/a:daniel_mealha_cabrita:ziproxy
 znc;cpe:/a:znc:znc
-zodb
-zonecheck
+zodb;cpe:/a:zope:zodb
+zonecheck;cpe:/a:zonecheck:zonecheck
 zoneminder;cpe:/a:zoneminder:zoneminder
 zope-cmfplone
-zope-ldapuserfolder
+zope-ldapuserfolder;cpe:/a:jens_vagelpohl:zope-ldapuserfolder
 zope2.10;cpe:/a:zope:zope
 zope2.11;cpe:/a:zope:zope
 zope2.9;cpe:/a:zope:zope