[Secure-testing-commits] r16060 - data/CPE

Petter Reinholdtsen
Fri, 04 Feb 2011 20:55:40 -0000

Author: pere
Date: 2011-02-04 20:55:37 +0000 (Fri, 04 Feb 2011)
New Revision: 16060

Modified:
   data/CPE/aliases
   data/CPE/list
Log:
More CPE entries and aliases.

Modified: data/CPE/aliases
==================================================================---
data/CPE/aliases	2011-02-04 07:51:00 UTC (rev 16059)
+++ data/CPE/aliases	2011-02-04 20:55:37 UTC (rev 16060)
@@ -531,6 +531,7 @@
 cpe:/a:sun:virtualbox
 cpe:/a:virtualox:virtualox
 cpe:/a:sun:xvm_virtualbox
+cpe:/a:oracle:vm_virtualbox

 cpe:/a:mailscanner:mailscanner
 cpe:/a:debian:mailscanner
@@ -650,19 +651,49 @@
 cpe:/a:id_software:quake_ii_server
 cpe:/a:id_software:quake_ii_server_linux

+cpe:/a:chmlib:chmlib
+cpe:/a:jed_wing:chm_lib
+
+cpe:/a:marc_lehmann:rxvt-unicode
+cpe:/a:rxvt-unicode:rxvt-unicode
+
+cpe:/a:andy_lo-a-foe:alsaplayer
+cpe:/a:alsaplayer:alsaplayer
+
+cpe:/a:ekiga:ekiga
+cpe:/a:gnome:ekiga
+
+cpe:/a:jam_warehouse:knowledgetree_open_source
+cpe:/a:knowledgetree:knowledgetree
+cpe:/a:knowledgetree:open_source
+cpe:/a:knowledgetree_document_management:knowledgetree_document_management
+
+cpe:/a:qualcomm:qpopper
+cpe:/a:debian:qpopper
+
+cpe:/a:gnu:lsh
+cpe:/a:lysator:lsh
+
+cpe:/a:webkit:webkit
+cpe:/a:apple:webkit
+
+cpe:/a:sun:jre
+cpe:/a:oracle:jre
+
 # Dummy entries to hide noise
+#cpe:/a:webkit:webkit
 #cpe:/a:google:chrome
-#cpe:/a:webkit:webkit
-#cpe:/a:apple:webkit
 #cpe:/a:apple:safari

+# Dummy entries to hide noise
+#cpe:/a:sun:jre
+#cpe:/a:sun:jdk
+#cpe:/a:sun:openjdk
+#cpe:/a:redhat:icedtea
+
+# Dummy entries to hide noise
 #cpe:/a:mozilla:libxul
 #cpe:/a:mozilla:firefox
 #cpe:/a:mozilla:thunderbird
 #cpe:/a:mozilla:seamonkey
 #cpe:/a:mozilla:mozilla
-
-#cpe:/a:sun:jdk
-#cpe:/a:sun:openjdk
-#cpe:/a:sun:jre
-#cpe:/a:oracle:jre

Modified: data/CPE/list
==================================================================---
data/CPE/list	2011-02-04 07:51:00 UTC (rev 16059)
+++ data/CPE/list	2011-02-04 20:55:37 UTC (rev 16060)
@@ -1,40 +1,62 @@
+a2ps;cpe:/a:gnu:a2ps
+abc2ps;cpe:/a:abc2ps:abc2ps
 abcm2ps;cpe:/a:jef_moine:abcm2ps
+abcmidi;cpe:/a:abcmidi:abcmidi
 abiword;cpe:/a:abisource:community_abiword
+abuse;cpe:/a:abuse:abuse-sdl
 acidbase;cpe:/a:base:basic_analysis_and_security_engine
 acl;cpe:/a:xfs:acl
 acon;cpe:/a:ahmed_abdel-hamid_mohamed:acon
 acpid;cpe:/a:tim_hockin:acpid
 adns;cpe:/a:gnu:adns
+adplug;cpe:/a:audacious_media_player_team:adplug
+adzapper;cpe:/a:cameron_simpson:adzapper
 aegis;cpe:/a:aegis:aegis
+affix-kernel;cpe:/a:nokia:affix
 affix;cpe:/a:nokia:affix
 afuse;cpe:/a:afuse:afuse
+aircrack-ng;cpe:/a:aircrack-ng:airodump-ng
 ajaxterm;cpe:/a:antony_lesuisse:ajaxterm
+albatross;cpe:/a:albatross:albatross
 alien-arena;cpe:/a:icculus:alien_arena
 alpine;cpe:/a:university_of_washington:alpine
+alsa-lib;cpe:/o:redhat:enterprise_linux, cpe:/o:alsa:alsa-lib
+alsaplayer;cpe:/a:andy_lo-a-foe:alsaplayer
 amarok;cpe:/a:amarok:amarok
 amaya;cpe:/a:w3:amaya
 ampache;cpe:/a:ampache:ampache
 amsn;cpe:/a:alvaro:alvaros_messenger
 amule;cpe:/a:amule:amule
+antiword;cpe:/a:antiword:antiword
 aolserver4;cpe:/a:aol:aolserver
+apache-ssl;cpe:/a:apache-ssl:apache-ssl
 apache2;cpe:/a:apache:http_server
 apache;cpe:/a:apache:http_server
+apachetop;cpe:/a:apachetop:apachetop
 apertium;cpe:/a:apertium:apertium
 apport;cpe:/a:apport:apport
 apr-util;cpe:/a:apache:apr-util
 apr;cpe:/a:apache:portable_runtime
+apt-cacher;cpe:/a:debian:apt-cacher
 apt-listchanges;cpe:/a:debian:apt-listchanges
+apt-setup;cpe:/a:debian:apt-setup
 apt;cpe:/a:debian:apt
 aptlinex;cpe:/a:debian:aptlinex
 aptoncd;cpe:/a:aptoncd:aptoncd
+aqualung;cpe:/a:aqualung:aqualung
 arb;cpe:/a:lehrstuhl_fur_mikrobiologie:arb
+arc;cpe:/a:arc:arc
 ardour;cpe:/a:ardour:ardour
 argyll;cpe:/a:argyllcms:argyllcms
 aria2;cpe:/a:tatsuhiro_tsujikawa:aria2
 arora;cpe:/a:arora-browser:arora
 arts;cpe:/a:kde:arts
+asn1c;cpe:/a:asn.1_compiler:asn.1_compiler
+aspell;cpe:/a:gnu:aspell
+astats;cpe:/a:astats:astats
 asterisk-addons;cpe:/a:asterisk:asterisk-addons
 asterisk;cpe:/a:digium:asterisk
+atari800;cpe:/o:atari800:atari800
 audacity;cpe:/a:audacity:audacity
 audiofile;cpe:/a:68k:audiofile
 audiolink;cpe:/a:audiolink:audiolink
@@ -46,12 +68,15 @@
 automake;cpe:/a:gnu:automake
 avahi;cpe:/a:avahi:avahi
 aview;cpe:/a:amiga:aview
+awffull;cpe:/a:awffull:awffull
 awstats;cpe:/a:awstats:awstats
 axis2c;cpe:/a:apache:axis2
 axis;cpe:/a:apache:axis2
 axyl;cpe:/a:axyl:axyl
 b2evolution;cpe:/a:b2evolution:b2evolution
 backintime;cpe:/a:le-web:backintime
+backup-manager;cpe:/a:sukria:backup_manager
+backupninja;cpe:/a:debian:backupninja
 backuppc;cpe:/a:craig_barratt:backuppc
 bacula;cpe:/a:jose_luis_tallon:bacula_common
 balsa;cpe:/a:gnome:balsa
@@ -61,6 +86,7 @@
 barnowl;cpe:/a:barnowl:barnowl
 base-config;cpe:/a:debian:base-config
 bash;cpe:/a:bash:bash
+bbclone;cpe:/a:bbclone:bbclone
 beagle;cpe:/o:beagle:beagle
 beanstalkd;cpe:/a:wildbit:beanstalkd
 bind9;cpe:/a:isc:bind
@@ -71,8 +97,11 @@
 bk2site;cpe:/a:jose_m.vidal:bk2site
 blender;cpe:/a:blender:blender
 blosxom;cpe:/a:blosxom:blosxom
+bluez-hcidump;cpe:/a:bluez_project:hcidump
 bluez-libs;cpe:/a:bluez:bluez_libs
 bluez-utils;cpe:/a:bluez:bluez_utils
+bmv;cpe:/a:jan_kybic:bitmap_viewer
+bnc;cpe:/a:bnc:bnc
 boa;cpe:/a:boa:boa
 bochs;cpe:/a:bochs:bochs
 bogofilter;cpe:/a:bogofilter:bogofilter
@@ -82,6 +111,8 @@
 bozohttpd;cpe:/a:eterna:bozohttpd
 bristol;cpe:/a:nick_copeland:bristol
 brltty;cpe:/a:mielke:brltty
+bsdgames;cpe:/a:joey_hess:bsdgames
+bsmtpd;cpe:/a:debian:bsmtpd
 bugzilla;cpe:/a:mozilla:bugzilla
 buildbot;cpe:/a:buildbot:buildbot
 bulmages;cpe:/a:iglues:bulmages-servers
@@ -92,20 +123,29 @@
 cacti;cpe:/a:cacti:cacti
 cadaver;cpe:/a:cadaver:cadaver_webdav_client
 cakephp;cpe:/a:cakefoundation:cakephp
+calife;cpe:/a:calife:calife
 camlimages;cpe:/a:jun_furuse:camlimages
+capi4hylafax;cpe:/a:julian_pawlowski:capi4hylafax
 caudium;cpe:/a:caudium:caudium
 cbrpager;cpe:/a:jcoppens:cbrpager
 cdcontrol;cpe:/a:gleydson_mazioli_da_silva:cdcontrol
+cdrtools;cpe:/a:cdrtools:cdrecord
 cdrw-taper;cpe:/a:tivano:cdrw-taper
 cecilia;cpe:/a:cecilia:cecilia
 centericq;cpe:/a:centericq:centericq
 centerim;cpe:/a:centerim:centerim
 cfengine2;cpe:/a:gnu:cfengine
 cfengine;cpe:/a:gnu:cfengine
+cfs;cpe:/a:matt_blaze:cryptographic_file_system
+cgiirc;cpe:/a:cgiirc:cgiirc
 cgiwrap;cpe:/a:nathan_neulinger:cgiwrap
 changetrack;cpe:/a:cameron_morland:changetrack
+chbg;cpe:/a:chbg:chbg
 checkinstall;cpe:/a:checkinstall:checkinstall
+cheesetracker;cpe:/a:cheese_tracker:cheese_tracker
+cheetah;cpe:/a:tavis_rudd:cheetah
 cherokee;cpe:/a:cherokee-project:cherokee
+cherrypy2.1;cpe:/a:cherrypy:cherrypy
 cherrypy3;cpe:/a:cherrypy:cherrypy
 chetcpasswd;cpe:/a:chetcpasswd:chetcpasswd
 chm2pdf;cpe:/a:karakas-online:chm2pdf
@@ -115,22 +155,28 @@
 citadel;cpe:/a:debian:citadel_server
 clamav;cpe:/a:clamav:clamav
 classpath;cpe:/a:gnu:classpath
+claws-mail;cpe:/a:claws_mail:claws_mail_tools
 cluster-agents;cpe:/a:linux-ha:ocf_resource_agents
 cmake;cpe:/a:kitware:cmake
 cmus;cpe:/a:cmus:cmus
 cobbler;cpe:/a:michael_dehaan:cobbler
 coccinelle;cpe:/a:emn:coccinelle
 collectd;cpe:/a:collectd:collectd
+colloquy;cpe:/a:colloquy:colloquy
 comix;cpe:/a:comix:comix
+common-lisp-controller;cpe:/a:common-lisp-controller:common-lisp-controller
 condor;cpe:/a:condor_project:condor
 conquest;cpe:/a:radscan:conquest
 convirt;cpe:/a:convirture:convirt
+coolkey;cpe:/a:fedoraproject:coolkey
 coreutils;cpe:/a:gnu:coreutils
 couchdb;cpe:/a:apache:couchdb
 courier-authlib;cpe:/a:courier-mta:courtier-authlib
 courier;cpe:/a:double_precision_incorporated:courier_mta
 cowbell;cpe:/a:more-cowbell:cowbell
 cpio;cpe:/a:gnu:cpio
+cplay;cpe:/a:cplay:cplay
+crawl;cpe:/a:linley_henzell:crawl
 crip;cpe:/a:crip:crip
 cron;cpe:/a:paul_vixie:vixie_cron
 crossfire-maps;cpe:/a:crossfire:crossfire
@@ -147,25 +193,42 @@
 cvsnt;cpe:/a:march-hare:cvsnt
 cvstrac;cpe:/a:cvstrac:cvstrac
 cyrus-imapd-2.2;cpe:/a:cmu:cyrus_imap_server
+cyrus-imapd;cpe:/a:carnegie_mellon_university:cyrus_imap_server
 cyrus-sasl2;cpe:/a:carnegie_mellon_university:cyrus-sasl
+cyrus-sasl;cpe:/a:cyrus:sasl
 cyrus21-imapd;cpe:/a:cmu:cyrus_imap_server
 dansguardian;cpe:/a:daniel_barron:dansguardian
+dar;cpe:/a:dar:dar
 dash;cpe:/a:dash:dash
+davfs2;cpe:/a:davfs2:davfs2
+dazuko-source;cpe:/a:dazuko:dazuko
+dbmail;cpe:/a:dbmail:dbmail
 dbus-glib;cpe:/a:freedesktop:dbus-glib
 dbus;cpe:/a:freedesktop:dbus
+dcc;cpe:/a:distributed_checksum_clearinghouse:dcc
+dcl;cpe:/a:michael_dean:double_choco_latte
+debian-goodies;cpe:/a:debian:debian-goodies
+debmake;cpe:/a:debian:debmake
 deliver;cpe:/a:chip_salzenberg:deliver
+deluge-torrent;cpe:/a:deluge_team:deluge
 denyhosts;cpe:/a:denyhosts:denyhosts
 destar;cpe:/a:holger_schurig:destar
 devil;cpe:/a:denton_woods:devil
 devscripts;cpe:/a:devscripts_devel_team:devscripts
+dgen;cpe:/a:dgen:emulator
+dhcdbd;cpe:/a:gnome:dhcdbd
 dhcp3;cpe:/a:isc:dhcp
 dhcp;cpe:/a:isc:dhcp
+dhcpcd;cpe:/a:phystech:dhcpcd
 dhis-server;cpe:/a:guus_sliepen:dhis-server
+dhis-tools-dns;cpe:/a:dhis_tools:dns_package
 dia;cpe:/a:dia:dia
 dibbler;cpe:/a:dibbler:dibbler
 digitaldj;cpe:/a:nostatic:digitaldj
 dillo;cpe:/a:dillo:dillo
+dircproxy;cpe:/a:dircproxy:dircproxy
 dist;cpe:/a:manoj_srivastava:dist
+distcc;cpe:/a:distcc:distcc
 djbdns;cpe:/a:d.j.bernstein:djbdns
 dkim-milter;cpe:/a:dkim:dkim-milter
 dns2tcp;cpe:/a:hsc:dns2tcp
@@ -175,6 +238,7 @@
 dojo;cpe:/a:dojotoolkit:dojo
 dokuwiki;cpe:/a:dokuwiki:dokuwiki
 dopewars;cpe:/a:ben_webb:dopewars
+dosbox;cpe:/a:dosbox:dosbox
 dovecot;cpe:/a:dovecot:dovecot
 dpkg-cross;cpe:/a:debian:dpkg-cross
 dpkg;cpe:/a:debian:dpkg
@@ -191,7 +255,9 @@
 dtc;cpe:/a:gplhost:dtc-common
 duplicity;cpe:/a:duplicity:duplicity
 dvipng;cpe:/a:jan-ake_larsson:dvipng
+e2fsprogs;cpe:/a:ext2_filesystems_utilities:e2fsprogs
 eaccelerator-src;cpe:/a:eaccelerator:eaccelerator
+ecartis;cpe:/a:ecartis:ecartis
 eclipse;cpe:/a:eclipse:eclipse_ide
 ecryptfs-utils;cpe:/a:ecryptfs:ecryptfs_utils
 ed;cpe:/a:gnu:ed
@@ -199,6 +265,7 @@
 egroupware;cpe:/a:egroupware:egroupware
 ejabberd;cpe:/a:process-one:ejabberd
 ekg;cpe:/a:ekg:ekg
+ekiga;cpe:/a:ekiga:ekiga
 electricsheep;cpe:/a:scott_draves:electric_sheep
 elgg;cpe:/a:curveriderhq:elgg
 elinks;cpe:/a:elinks:elinks
@@ -218,25 +285,33 @@
 enscript;cpe:/a:gnu:enscript
 eog;cpe:/a:gnome:eog
 epiphany-browser;cpe:/a:gnome:epiphany
+eric;cpe:/a:eric_integrated_development_environment:eric_integrated_development_environment
 erlang;cpe:/a:erlang:erlang
 eterm;cpe:/a:eterm:eterm
 ethereal;cpe:/a:wireshark:wireshark
+ettercap;cpe:/a:ettercap:ettercap
 eucalyptus;cpe:/a:eucalyptus:eucalyptus
 evince;cpe:/a:redhat:evince
 evolution-data-server;cpe:/a:gnome:evolution-data-server
 evolution;cpe:/a:gnome:evolution
 ewiki;cpe:/a:erfurtwiki:erfurtwiki
+exiftags;cpe:/a:aertherwide:exiftags
+exim-tls;cpe:/a:exim:exim
 exim4;cpe:/a:exim:exim
 exim;cpe:/a:exim:exim
 exiv2;cpe:/a:exiv2:exiv2
 expat;cpe:/a:james_clark:expat
+ez-ipupdate;cpe:/a:angus_mackay:ez-ipupdate
 ezpublish;cpe:/a:ez:ez_publish
 faad2;cpe:/a:audiocoding:faad2
 fai;cpe:/a:thomas_lange:fully_automated_installation
 fail2ban;cpe:/a:fail2ban:fail2ban
+faqomatic;cpe:/a:faq-o-matic:faq-o-matic
 fastjar;cpe:/a:matthias_klose:fastjar
+fbi;cpe:/a:fbi:fbi
 fckeditor;cpe:/a:fckeditor:fckeditor
 fcron;cpe:/a:thibault_godouet:fcron
+festalon;cpe:/a:festalon:festalon
 festival;cpe:/a:cstr:festival
 feta;cpe:/a:debian:feta
 fetchmail;cpe:/a:eric_raymond:fetchmail
@@ -244,10 +319,13 @@
 ffmpeg;cpe:/a:ffmpeg:ffmpeg
 file;cpe:/a:christos_zoulas:file
 filezilla;cpe:/a:filezilla:filezilla
+filter;cpe:/a:bolthole:filter
+findutils;cpe:/a:gnu:findutils
 firebird1.5;cpe:/a:firebird:firebird
 firebird2.0;cpe:/a:firebird:firebird
 firebird2.1;cpe:/a:firebird:firebird
 firebird2;cpe:/a:firebird:firebird
+fireflier;cpe:/a:fireflier:fireflier
 firefox-sage;cpe:/a:sage.mozdev:sage
 firefox;cpe:/a:mozilla:firefox
 firehol;cpe:/a:firehol:firehol
@@ -257,29 +335,44 @@
 flashplugin-nonfree;cpe:/a:adobe:flash_player
 flatpress;cpe:/a:flatpress:flatpress
 flex;cpe:/a:will_estes:flex
+flexbackup;cpe:/a:flexbackup:flexbackup
 flim;cpe:/a:gnu:flim
+fluxbox;cpe:/a:fluxbox-team:fluxbot
 flyspray;cpe:/a:flyspray:flyspray
 fml;cpe:/a:fumitoshi_ukai:fml
 fontforge;cpe:/a:alexej_kryukov:fontforge
+foomatic-filters;cpe:/a:linuxprinting.org:foomatic-filters
 foswiki;cpe:/a:foswiki:foswiki
+fprobe;cpe:/a:slava_astashonok:fprobe
 freebsd-sendpr;cpe:/a:freebsd:freebsd-sendpr
 freeciv;cpe:/a:freeciv:freeciv
+freenet6;cpe:/a:freenet6:freenet6
 freepbx;cpe:/a:freepbx:freepbx
 freeradius;cpe:/a:freeradius:freeradius
+freeswan;cpe:/a:frees_wan:frees_wan
 freetype;cpe:/a:freetype:freetype
 freevo;cpe:/a:duncan_webb:freevo
+frox;cpe:/a:frox:frox
+fsp;cpe:/a:debian:fsp
 fuse;cpe:/a:fuse:fuse
+fvwm;cpe:/a:fvwm:fvwm
 fwbuilder;cpe:/a:fwbuilder:firewall_builder
+gaim-encryption;cpe:/a:gaim-encryption:gaim-encryption
 gaim;cpe:/a:rob_flynn:gaim
+galeon;cpe:/a:galeon:galeon_browser
 gallery2;cpe:/a:menalto:gallery
 gallery3;cpe:/a:menalto:gallery
 gallery;cpe:/a:menalto:gallery
 ganeti;cpe:/a:roman_marxer:ganeti
 ganglia-monitor-core;cpe:/a:ganglia:ganglia
+gatos;cpe:/a:gatos:gatos
+gauche;cpe:/a:gauche:gauche
 gcc-3.4;cpe:/a:gnu:gcc
 gcc-4.1;cpe:/a:gnu:gcc
 gcc-4.3;cpe:/a:gnu:gcc
 gccxml;cpe:/a:gccxml:gccxml
+gconf2;cpe:/a:gnome:gconf
+gdal;cpe:/a:gdal:gdal
 gdb;cpe:/a:gnu:gdb
 gdk-pixbuf;cpe:/a:gnome:gdkpixbuf
 gdm;cpe:/a:gnome:gdm
@@ -289,7 +382,9 @@
 geoip;cpe:/a:geoip:geoip
 geronimo;cpe:/a:apache:geronimo
 geshi;cpe:/a:geshi:geshi
+getmail;cpe:/a:getmail:getmail
 gettext;cpe:/a:gnu:gettext
+gfax;cpe:/a:debian:gfax
 gforge;cpe:/a:gforge:gforge
 ghostscript;cpe:/a:artifex:gpl_ghostscript
 gif2png;cpe:/a:catb:gif2png
@@ -304,13 +399,17 @@
 gmime2.4;cpe:/a:gnome:gmime
 gnash;cpe:/a:gnu:gnash
 gnats;cpe:/a:gnu:gnats
+gnatsweb;cpe:/a:yngve_svendsen:gnatsweb
+gnelib;cpe:/a:gillius_programming:game_networking_engine
 gnome-peercast;cpe:/a:peercast:peercast
 gnome-power-manager;cpe:/a:gnome:power_manager
 gnome-screensaver;cpe:/a:gnome:screensaver
 gnome-shell;cpe:/a:gnome:gnome-shell
 gnome-subtitles;cpe:/a:pedro_castro:gnome-subtitles
+gnubiff;cpe:/a:gnu:gnubiff
 gnucash;cpe:/a:gnucash:gnucash
 gnudip;cpe:/a:gnudip:gnudip
+gnumail;cpe:/a:gnu:gnumail
 gnumeric;cpe:/a:gnome:gnumeric
 gnump3d;cpe:/a:gnu:gnump3d
 gnunet;cpe:/a:gnunet:gnunet
@@ -321,25 +420,38 @@
 gnutls12;cpe:/a:gnu:gnutls
 gnutls13;cpe:/a:gnu:gnutls
 gnutls26;cpe:/a:gnu:gnutls
+gocr;cpe:/a:gocr:optical_character_recognition_utility
+gopher;cpe:/a:university_of_minnesota:gopher
+gosa;cpe:/a:gonicus:gonicus_system_administration
 gpdf;cpe:/a:gnome:gpdf
+gpgme1.0;cpe:/a:gnu:gpgme
 gpicview;cpe:/a:lxde:gpicview
 gpsd;cpe:/a:berlios:gps_daemon
 gpsdrive;cpe:/a:gpsdrive:gpsdrive
 graphicsmagick;cpe:/a:graphicsmagick:graphicsmagick
 graphviz;cpe:/a:graphviz:graphviz
+grip;cpe:/a:grip:grip
 groff;cpe:/a:gnu:groff
 grub2;cpe:/a:gnu:grub_2
 grub;cpe:/a:gnu:grub_legacy
 gs-esp;cpe:/a:ghostscript:ghostscript
 gs-gpl;cpe:/a:ghostscript:ghostscript
+gsambad;cpe:/a:gsambad:gsambad
 gst-plugins-base0.10;cpe:/a:gstreamer:gst-plugins-base
 gst-plugins-good0.10;cpe:/a:gstreamer:good_plug-ins
+gtetrinet;cpe:/a:gtetrinet:gtetrinet
 gtk+2.0;cpe:/a:gtk:gtk%2B
+gtkdiskfree;cpe:/a:gtkdiskfree:gtkdiskfree
+guilt;cpe:/a:debian:guilt
 gupnp;cpe:/a:gupnp:gupnp
 gv;cpe:/a:gnu:gv
+gwt;cpe:/a:google:web_toolkit
+gxine;cpe:/a:xine:gxine
 gzip;cpe:/a:gnu:gzip
 hashcach;cpe:/a:hashcash:hashcash
+hashcash;cpe:/a:hashcash:hashcash
 havp;cpe:/a:havp:havp
+heartbeat-2;cpe:/a:high_availability_linux_project:heartbeat
 heartbeat;cpe:/a:linux-ha:heartbeat
 heimdal;cpe:/a:heimdal:heimdal
 helix-player;cpe:/a:realnetworks:helix_player
@@ -348,27 +460,42 @@
 hiki;cpe:/a:hiki:hiki
 hipo;cpe:/a:pedro_villavicencio_garrido:hipo
 honeyd;cpe:/a:niels_provos:honeyd
+horde2;cpe:/a:horde:horde
 horde3;cpe:/a:horde:horde
+hostapd;cpe:/a:hostapd:hostapd
 hplip;cpe:/a:hp:linux_imaging_and_printing_project
+hpsockd;cpe:/a:hp:sockd
+hsftp;cpe:/a:samhain_labs:hsftp
 hsolink;cpe:/a:pharscape:hsolink
+ht;cpe:/a:ht_editor:ht_editor
 htdig;cpe:/a:htdig:htdig
+htget;cpe:/a:htget:htget
 htmldoc;cpe:/a:htmldoc:htmldoc
+htmlheadline;cpe:/a:toshiaki_kanosue:htmlheadline
 htop;cpe:/a:htop:htop
 httrack;cpe:/a:httrack:httrack
 hybserv;cpe:/a:dinko_korunic:hybserv2
 hylafax;cpe:/a:hylafax:hylafax
+hyperestraier;cpe:/a:hyper_estraier:hyper_estraier
 hypermail;cpe:/a:hypermail-project:hypermail
 hztty;cpe:/a:yongguang_zhang:hztty
 ibackup;cpe:/a:gnu:ibackup
 iceape;cpe:/a:mozilla:seamonkey
+icecast-server;cpe:/a:icecast:icecast
 icecast2;cpe:/a:icecast:icecast
 icedove;cpe:/a:mozilla:thunderbird
 iceweasel;cpe:/a:mozilla:firefox
 icu;cpe:/a:icu_project:international_components_for_unicode
+id3lib3.8.3;cpe:/a:id3lib:id3lib
+ident2;cpe:/a:michael_bacarella:ident2
+ihu;cpe:/a:ihu:i_hear_u
 ikiwiki;cpe:/a:ikiwiki:ikiwiki
+ilohamail;cpe:/a:ilohamail:ilohamail
+im-switch;cpe:/a:im-switch:im-switch
 imagemagick;cpe:/a:imagemagick:imagemagick
 imlib2;cpe:/a:carsten_haitzler:imlib2
 imlib;cpe:/a:imlib:imlib
+imp3;cpe:/a:horde:imp
 imp4;cpe:/a:horde:imp
 impose+;cpe:/a:dov_grobgeld:impose%2B
 imwheel;cpe:/a:imwheel:imwheel
@@ -377,25 +504,36 @@
 ingo1;cpe:/a:horde:ingo_h3
 initramfs-tools;cpe:/a:debian:initramfs-tools
 inkscape;cpe:/a:inkscape:inkscape
+inn2;cpe:/a:isc:inn
+inotify-tools;cpe:/a:inotify:inotify-tools
 inspircd;cpe:/a:inspire_ircd:inspircd
 interchange;cpe:/a:interchange_development_group:interchange
+ipcalc;cpe:/a:krischan_jodies:ip_calculator
+ipmenu;cpe:/a:david_stes:ipmenu
 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;cpe:/a:ircu:ircu
 ircd-ratbox;cpe:/a:ircd-ratbox:ircd-ratbox
+irm;cpe:/a:stackworks_enterprises:information_resource_manager
 irrlicht;cpe:/a:irrlicht:irrlicht
 irssi;cpe:/a:irssi:irssi
 isc-dhcp;cpe:/a:isc:dhcp
 iscsitarget;cpe:/a:iscsitarget:iscsitarget
+isoqlog;cpe:/a:enderunix:isoqlog
+jabber;cpe:/a:jabber_software_foundation:jabber_server
 jailer;cpe:/a:javier_fernandez:jailer
 jasper;cpe:/a:jasper_project:jasper
 jbossas4;cpe:/a:redhat:jboss_enterprise_application_platform
+jbosseam;cpe:/a:jboss:seam
 jetty;cpe:/a:mortbay:jetty
 jffnms;cpe:/a:jffnms:just_for_fun_network_management_system
+jftpgw;cpe:/a:jftpgw:jftpgw
 jhead;cpe:/a:sentex:jhead
+jitterbug;cpe:/a:samba:jitterbug
 jquery;cpe:/a:jquery:jquery
+jsboard;cpe:/a:jsboard:jsboard
 jspwiki;cpe:/a:jspwiki:jspwiki
 junkbuster;cpe:/a:junkbuster:internet_junkbuster
 kaffeine;cpe:/a:kaffeine:kaffeine_player
@@ -405,6 +543,9 @@
 kdegraphics;cpe:/a:kde:kdegraphics
 kdelibs;cpe:/o:kde:kdelibs
 kernel-image-2.6.8-9-amd64-generic;cpe:/o:linux:kernel
+kernel-patch-2.4-grsecurity;cpe:/a:grsecurity:grsecurity_kernel_patch
+kernel-patch-adamantix;cpe:/a:the_pax_team:pax_linux
+kernel-patch-grsecurity2;cpe:/a:grsecurity:grsecurity_kernel_patch
 kernel-source-2.2.20;cpe:/o:linux:kernel
 kernel-source-2.4.24;cpe:/o:linux:kernel
 kernel-source-2.4.27;cpe:/o:linux:kernel
@@ -413,26 +554,42 @@
 kernel-source-2.6.8;cpe:/o:linux:kernel
 kernel-source-2.6.8;cpe:/o:linux:kernel
 kernel-source-2.6.9;cpe:/o:linux:kernel
+ketm;cpe:/a:ketm:ketm
 kfreebsd-5;cpe:/o:freebsd:freebsd
 kfreebsd-6;cpe:/o:freebsd:freebsd
 kfreebsd-7;cpe:/o:freebsd:freebsd
 kfreebsd-8;cpe:/o:freebsd:freebsd
+kfreebsd-source;cpe:/o:freebsd:freebsd
+kfreebsd5-source;cpe:/o:freebsd:freebsd
 kile;cpe:/a:kile:kile
 kismet;cpe:/a:kismet:kismet
+knowledgetree;cpe:/a:jam_warehouse:knowledgetree_open_source
 koffice;cpe:/a:kde:koffice
 konversation;cpe:/a:konversation:konversation
 konwert;cpe:/a:krzysztof_kozlowski:konwert
+kphone;cpe:/a:kphone:kphone
+krb4;cpe:/a:mit:kerberos
 krb5;cpe:/a:mit:kerberos
 kronolith2;cpe:/a:horde:kronolith
+kronolith;cpe:/a:horde:kronolith
+krusader;cpe:/a:krusader:krusader
 ktorrent2.2;cpe:/a:ktorrent:ktorrent
 ktorrent;cpe:/a:ktorrent:ktorrent
 kvirc;cpe:/a:kvirc:kvirc
 kvm;cpe:/a:kvm_qumranet:kvm
+l2tpd;cpe:/a:l2tpd:l2tpd
+l2tpns;cpe:/a:l2tpns:l2tpns
+lam;cpe:/a:mandrakesoft:mandrake_lam-runtime
 lasso;cpe:/a:lasso:lasso
 lastfm;cpe:/a:last:last.fm
+latex2rtf;cpe:/a:latex2rtf:latex2rtf
 lazarus;cpe:/a:lazarus:lazarus
+lbreakout2;cpe:/a:lgames:lbreakout2
 lcdproc;cpe:/a:lcdproc:lcdproc
 lcms;cpe:/a:littlecms:lcms
+ldap-account-manager;cpe:/a:ldap_account_manager:ldap_account_manager
+ldapdiff;cpe:/a:ldapdiff:ldapdiff
+ldapscripts;cpe:/a:ldapscripts:ldapscripts
 ldm;cpe:/a:ltsp:linux_terminal_server_project
 ldns;cpe:/a:nlnetlabs:ldns
 leafnode;cpe:/a:leafnode:leafnode
@@ -442,19 +599,37 @@
 lftp;cpe:/a:alexander_v._lukyanov:lftp
 lha;cpe:/a:tsugio_okamoto:lha
 lib3ds;cpe:/a:jan_eric_krprianidis:lib3ds
+libapache-auth-ldap;cpe:/a:dave_carrigan:auth_ldap
+libapache-mod-auth-kerb;cpe:/a:mod_auth_kerb:mod_auth_kerb
+libapache-mod-auth-pgsql;cpe:/a:guiseppe_tanzilli_and_matthias_eckermann:mod_auth_pgsql
+libapache-mod-auth-radius;cpe:/a:apache:mod_auth_radius
 libapache-mod-jk;cpe:/a:apache:mod_jk
+libapache-mod-python;cpe:/a:apache:mod_python
 libapache-mod-security;cpe:/a:modsecurity:modsecurity
+libapache-mod-ssl;cpe:/a:mod_ssl:mod_ssl
+libapache2-mod-auth-pgsql;cpe:/a:guiseppe_tanzilli_and_matthias_eckermann:mod_auth_pgsql
 libapache2-mod-fcgid;cpe:/a:apache:mod_fcgid
+libapache2-mod-jk2;cpe:/a:apache_software_foundation:mod_jk
 libapache2-mod-perl2;cpe:/a:apache:mod_perl
+libapache2-mod-python;cpe:/a:apache:mod_python
+libapreq2;cpe:/a:libapreq2:libapreq2
+libarchive-tar-perl;cpe:/a:cpan:archive_tar_perl_module
 libarchive;cpe:/a:freebsd:libarchive
 libast;cpe:/a:libast:libast
+libcairo;cpe:/a:redhat:cairo
+libcdio;cpe:/a:gnu:libcdio
 libcgi-pm-perl;cpe:/a:andy_armstrong:cgi.pm
+libcgi-session-perl;cpe:/a:sherzod_ruzmetov:cgi_session
 libcgi-simple-perl;cpe:/a:andy_armstrong:cgi-simple
 libcompface;cpe:/a:james_ashton:compface
+libcompress-raw-bzip2-perl;cpe:/a:bzip:compress-raw-bzip2
 libcompress-raw-zlib-perl;cpe:/a:paul_marquess:compress-raw-zlib_perl_module
 libconvert-uulib-perl;cpe:/a:perl:convert_uulib
+libcrypt-cbc-perl;cpe:/a:lincoln_d._stein:crypt_cbc
 libcrypt-openssl-dsa-perl;cpe:/a:perl-openssl:libcrypt-openssl-dsa-perl
+libdumb;cpe:/a:dynamic_universal_music_bibliotheque:dumb
 libesmtp;cpe:/a:stafford.uklinux:libesmtp
+libevent;cpe:/a:niels_provos:libevent
 libexif;cpe:/a:curtis_galloway:libexif
 libextractor;cpe:/a:libextractor:libextractor
 libfishsound;cpe:/a:xiph:libfishsound
@@ -462,47 +637,70 @@
 libgadu;cpe:/a:wojtek_kaniewsk:libgadu
 libgd2;cpe:/a:libgd:gd_graphics_library
 libgd;cpe:/a:libgd:gd_graphics_library
+libgda2;cpe:/a:gnome:libgda2
 libgdiplus;cpe:/a:mono-project:libgdiplus
+libgems-ruby;cpe:/a:rubyforge:rubygems
 libglpng;cpe:/a:glpng:glpng
+libgsf;cpe:/a:libgsf:libgsf
+libgtop2;cpe:/a:libgtop:libgtop
 libhtml-parser-perl;cpe:/a:derrick_oswald:html-parser
 libhx;cpe:/a:jan_engelhardt:libhx
 libid3tag;cpe:/a:media-libs:libid3tag
 libimager-perl;cpe:/a:imager:imager
 libio-socket-ssl-perl;cpe:/a:io-socket-ssl:io-socket-ssl
+libjfreechart-java;cpe:/o:jfree:jfreechart
+libksba;cpe:/a:libksba_library:libksba_library
 libmikmod;cpe:/a:raphael_assenat:libmikmod
 libmodplug;cpe:/a:konstanty_bialkowski:libmodplug
+libmusicbrainz-2.0;cpe:/a:musicbrainz:libmusicbrainz
+libmusicbrainz-2.1;cpe:/a:musicbrainz:libmusicbrainz
 libnasl;cpe:/a:finkproject:libnasl
 libnet-dns-perl;cpe:/a:nlnet_labs:net_dns
 libnfsidmap;cpe:/a:nfsv4:nfsidmap
 libnids;cpe:/a:rafal_wojtczuk:libnids
 libnss-db;cpe:/a:piotr_roszatycki:libnss-db
+libnss-ldap;cpe:/a:padl_software:nss_ldap
+libopenobex;cpe:/a:openobex:openobex
 libpam-krb5;cpe:/a:eyrie:pam-krb5
+libpam-ldap;cpe:/a:padl_software:pam_ldap
 libpam-mount;cpe:/a:pam_mount:pam_mount
+libpam-radius-auth;cpe:/a:apache:mod_auth_radius
+libpam-radius-auth;cpe:/a:apache:mod_auth_radius
 libpam-ssh;cpe:/a:andrew_j.korty:pam_ssh
 libphp-adodb;cpe:/a:john_lim:adodb
 libphp-cas;cpe:/a:ja-sig:phpcas_client_library
 libphp-jpgraph;cpe:/a:aditus:jpgraph
+libphp-phpmailer;cpe:/a:phpmailer:phpmailer
 libphp-snoopy;cpe:/a:andrei_zmievski:snoopy
 libpng3;cpe:/a:libpng:libpng
 libpng;cpe:/a:libpng:libpng
+libsafe;cpe:/a:avaya:libsafe
 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
+libspf;cpe:/a:libspf:libspf
 libspring-2.5-java;cpe:/a:springsource:spring_framework
 libstruts1.2-java;cpe:/a:apache:struts
+libtasn1-2;cpe:/a:free_software_foundation_inc.:libtasn1
+libtasn1-3;cpe:/a:free_software_foundation_inc.:libtasn1
+libtasn1;cpe:/a:free_software_foundation_inc.:libtasn1
 libthai;cpe:/a:linux.thai:libthai
 libtool;cpe:/a:gnu:libtool
 libtorrent-rasterbar;cpe:/a:rasterbar_software:libtorrent
 libtunepimp;cpe:/a:libtunepimp:libtunepimp
+libungif4;cpe:/a:libungif:libungif
 libuser;cpe:/a:miloslav_trmac:libuser
 libv8;cpe:/a:google:v8
+libvc;cpe:/a:andrew_hsu:libvc
 libvirt;cpe:/a:libvirt:libvirt
+libvncserver;cpe:/a:libvncserver:libvncserver
 libvorbis;cpe:/a:xiph.org:libvorbis
 libwmf;cpe:/a:francis_james_franklin:libwmf
 libwpd;cpe:/a:libwpd:libwpd_library
 libwww-perl;cpe:/a:search.cpan:libwww-perl
+libx11;cpe:/a:x.org:libx11
 libxcrypt;cpe:/a:opensuse:libxcrypt
 libxfont;cpe:/a:x.org:libxfont
 libxml2;cpe:/a:xmlsoft:libxml2
@@ -512,7 +710,10 @@
 liferea;cpe:/a:liferea:liferea
 lighttpd;cpe:/a:lighttpd:lighttpd
 lilo;cpe:/a:lilo:lilo
+link-grammar;cpe:/a:link_grammar:link_grammar
 links2;cpe:/a:twibright:links
+links;cpe:/a:links:links
+linpopup;cpe:/a:linpopup:linpopup
 lintian;cpe:/a:debian:lintian
 linux-2.6.24;cpe:/o:linux:kernel
 linux-2.6;cpe:/o:linux:kernel
@@ -522,15 +723,26 @@
 linuxdcpp;cpe:/a:linux:direct_connect
 linuxtrade;cpe:/a:linuxtrade:linuxtrade
 liquidsoap;cpe:/a:savonet:liguidsoap
+lm-sensors;cpe:/a:lm_sensors:lm_sensors
 lmbench;cpe:/a:bitmover:lmbench
+log2mail;cpe:/a:log2mail:log2mail
+logcheck;cpe:/a:psionic:logcheck
+logwatch;cpe:/a:logwatch:logwatch
+lookup-el;cpe:/a:lookup:lookup
 loop-aes-utils;cpe:/a:debian_loop-aes_team:loop-aes-utils
+lsh-utils;cpe:/a:gnu:lsh
 ltp;cpe:/a:alastair_mckinstry:ltp-network-test
+ltrace;cpe:/a:juan_cespedes:ltrace
+ltris;cpe:/a:lgames:ltris
 ltsp;cpe:/a:ltsp:linux_terminal_server_project
+lurker;cpe:/a:lurker:lurker
 lustre;cpe:/a:lustre:lustre-tests
+lvm10;cpe:/a:lvm:logical_volume_management_utilities
 lvm2;cpe:/a:heinz_mauelshagen:lvm2
 lxr-cvs;cpe:/a:malcom_box:lxr_cross_referencer
 lxr;cpe:/a:malcom_box:lxr_cross_referencer
 lynx-cur;cpe:/a:lynx:lynx
+lynx-ssl;cpe:/a:university_of_kansas:lynx
 lynx;cpe:/a:lynx:lynx
 m2crypto;cpe:/a:heikkitoivonen:m2crypto
 m4;cpe:/a:gnu:m4
@@ -538,23 +750,29 @@
 mafft;cpe:/a:align.bmr.kyushu-u.ac:mafft
 magics++;cpe:/a:ecmwf:magics%2B%2B
 magpierss;cpe:/a:kellan_elliott-mccrea:magpierss
+mah-jong;cpe:/a:nicolas_boullis:mah-jong
 mahara;cpe:/a:mahara:mahara
+mail-notification;cpe:/a:nongnu:mail_notification
 maildirsync;cpe:/a:jose_carlos_medeiros:maildirsync
 maildrop;cpe:/a:maildrop:maildrop
 mailman;cpe:/a:gnu:mailman
 mailscanner;cpe:/a:mailscanner:mailscanner
 mailutils;cpe:/a:gnu:mailutils
 mako;cpe:/a:makotemplates:mako
+mambo;cpe:/a:mambo:mambo
 mantis;cpe:/a:mantisbt:mantisbt
 mapserver;cpe:/a:umn:mapserver
 maradns;cpe:/a:maradns:maradns
+mason;cpe:/a:william_stearns:mason
 masqmail;cpe:/a:masqmail:masqmail
+mathopd;cpe:/a:mathopd:mathopd
 mathtex;cpe:/a:forkosh:mathtex
 matrixssl;cpe:/a:peersec_networks:matrixssl
 maxdb-7.5.00;cpe:/a:mysql:maxdb
 mayavi;cpe:/a:abottoms:mayavi
 mc;cpe:/a:midnight_commander:midnight_commander
 mecab;cpe:/a:mecab:mecab
+mediawiki1.5;cpe:/a:mediawiki:mediawiki
 mediawiki1.7;cpe:/a:mediawiki:mediawiki
 mediawiki;cpe:/a:mediawiki:mediawiki
 mednafen;cpe:/a:david_shadoff:mednafen
@@ -562,6 +780,7 @@
 mercurial;cpe:/a:mercurial:mercurial
 merkaartor;cpe:/a:merkaartor:merkaartor
 metamail;cpe:/a:metamail_corporation:metamail
+mgdiff;cpe:/a:rogers_software_source:mgdiff_patch_viewer
 mgetty;cpe:/a:gert_doering:mgetty
 mgt;cpe:/a:steve_robbins:mgt
 mh-book;cpe:/a:peter_s_galbraith:mh-book
@@ -570,23 +789,31 @@
 migrationtools;cpe:/a:padl_software:migrationtools
 mimedefang;cpe:/a:roaring_penguin:mimedefang
 mimetex;cpe:/a:forkosh:mimetex
+mimms;cpe:/a:mimms:mimms
 mini-httpd;cpe:/a:acme:mini_httpd
 miredo;cpe:/a:miredo:miredo
 mistelix;cpe:/a:mistelix:mistelix
 mldonkey;cpe:/a:mldonkey:mldonkey
 mlmmj;cpe:/a:mlmmj:mlmmj
+mlterm;cpe:/a:mlterm:mlterm
 mn-fit;cpe:/a:zeus.physik.uni-bonn:mn_fit
 mnemo2;cpe:/a:horde:mnemo_h3
+mnemo;cpe:/a:horde:mnemo
 mnogosearch;cpe:/a:mnogosearch:mnogosearch
 mod-auth-mysql;cpe:/a:joey_schulze:mod_auth_mysql
+mod-auth-shadow;cpe:/a:mod_auth_shadow:mod_auth_shadow
+module-assistant;cpe:/a:eduard_bloch:module-assistant
 moin;cpe:/a:moinmo:moinmoin
 mojarra;cpe:/a:oracle:mojarra
 mon;cpe:/a:jim_trocki:mon
 mondo;cpe:/a:mondo:rescue
 mongrel;cpe:/a:mongrel:mongrel
+monit;cpe:/a:tildeslash:monit
+moniwiki;cpe:/a:moniwiki:moniwiki
 monkeysphere;cpe:/a:monkeysphere_project:monkeysphere
 mono-debugger;cpe:/a:debian:mono-debugger
 mono;cpe:/a:mono_project:mono
+monopd;cpe:/a:monopd:monopd
 monotone;cpe:/a:monotone:monotone
 moodle;cpe:/a:moodle:moodle
 moon;cpe:/a:novell:moonlight
@@ -602,6 +829,7 @@
 mpop;cpe:/a:martin_lambers:mpop
 msmtp;cpe:/a:martin_lambers:msmtp
 mt-daapd;cpe:/a:fireflymediaserver:fireflymediaserver
+mtink;cpe:/a:jean-jacques_sarton:mtink
 mtr;cpe:/a:matt_kimball_and_roger_wolff:mtr
 multi-gnome-terminal;cpe:/a:mohammed_sameer:multi-gnome-terminal
 multipath-tools;cpe:/a:christophe.varoqui:multipath-tools
@@ -618,54 +846,75 @@
 mysql-ocaml;cpe:/a:mysql-ocaml:mysql-ocaml
 mysql;cpe:/a:mysql:mysql
 nag2;cpe:/a:horde:nag_h3
+nag;cpe:/a:horde:nag
+nagios-plugins;cpe:/a:nagios:plugins
 nagios2;cpe:/a:nagios:nagios
 nagios3;cpe:/a:nagios:nagios
 nagios;cpe:/a:nagios:nagios
 namazu2;cpe:/a:namazu:namazu
 nano;cpe:/a:gnu:nano
+nanoblogger;cpe:/a:nanoblogger:nanoblogger
+nas;cpe:/a:radscan:network_audio_system
 nasm;cpe:/a:nasm:nasm
 nautilus-python;cpe:/a:gnome:nautilus-python
+nbd;cpe:/a:network_block_device:nbd
 ncftp;cpe:/a:ncftp_software:ncftp
 ncompress;cpe:/a:ncompress:ncompress
 ncpfs;cpe:/a:ncpfs:ncpfs
+nd;cpe:/a:nd:nd
 neon26;cpe:/a:webdav:neon
 neon27;cpe:/a:webdav:neon
 neon;cpe:/a:webdav:neon
 nessus-core;cpe:/a:nessus:nessus
+net-acct;cpe:/a:ulrich_callmeier:net-acct
 net-snmp;cpe:/a:net-snmp:net-snmp
 netatalk;cpe:/a:netatalk:netatalk
 netdisco-mibs-installer;cpe:/a:oliver_gorwits:netdisco_mibs_installer
+netkit-ftp;cpe:/a:netkit-ftp:netkit_ftp
+netkit-telnet-ssl;cpe:/a:telnetd:telnetd-ssl
 netmrg;cpe:/a:netmrg:netmrg
 netpanzer;cpe:/a:pyrosoft_inc:netpanzer
 netpbm-free;cpe:/a:netpbm:netpbm
 netperf;cpe:/a:netperf:netperf
+netrik;cpe:/a:netrik:netrik
 network-manager-applet;cpe:/a:gnome:networkmanager
 network-manager;cpe:/a:gnome:networkmanager
 newsbeuter;cpe:/a:newsbeuter:newsbeuter
 newsgate;cpe:/a:debian:newsgate
+newspost;cpe:/a:newspost:newspost
 newsx;cpe:/a:fedora:newsx
 newt;cpe:/a:fedorahosted:newt
 nexuiz;cpe:/a:alientrap:nexuiz
 nfs-utils;cpe:/a:nfs:nfs-utils
 nginx;cpe:/a:nginx:nginx
 ngircd;cpe:/a:ngircd:ngircd
+nikto;cpe:/a:nikto:nikto
 nilfs2-tools;cpe:/a:nilf:nilfs
 no-ip;cpe:/a:no-ip:no-ip2
 nordugrid-arc-nox;cpe:/a:nordugrid:nordugrid-arc
+noweb;cpe:/a:norman_ramsey:noweb
 nsd3;cpe:/a:nlnetlabs:nsd
 nsd;cpe:/a:nlnetlabs:nsd
 nss;cpe:/a:mozilla:nss
+nstx;cpe:/a:nstx:ip_over_dns_utility
+ntfs-3g;cpe:/a:ntfs-3g:ntfs-3g
+ntlmaps;cpe:/a:ntlmaps:ntlmaps
 ntop;cpe:/a:ntop:ntop
 ntp;cpe:/a:ntp:ntp
 nufw;cpe:/a:nufw:nufw
 nusoap;cpe:/a:dietrich_ayala:nusoap
+nvclock;cpe:/a:gentoo:nvclock
 nvidia-cg-toolkit;cpe:/a:federico_di_gregorio:nvidia-cg-toolkit
 nvidia-graphics-drivers;cpe:/a:nvidia:binary_graphics_driver
+nvidia-kernel-common;cpe:/a:nvidia:video_driver
+ocp;cpe:/a:open_cubic_player:open_cubic_player
 ocrodjvu;cpe:/a:jwilk:ocrodjvu
 ocsinventory-agent;cpe:/a:ocsinventory-ng:ocsinventory-agent
 ocsinventory-server;cpe:/a:ocsinventory-ng:ocs_inventory_ng
 oftc-hybrid;cpe:/a:oftc:oftc-hybrid
+oftpd;cpe:/a:oftpd:oftpd
 ogle;cpe:/a:alan_woodland:ogle
+oops;cpe:/a:igor_khasilev:oops_proxy_server
 op;cpe:/a:swapoff:op
 open-iscsi;cpe:/a:redhat:open_iscsi
 openafs;cpe:/a:openafs:openafs
@@ -677,23 +926,31 @@
 openldap2.3;cpe:/a:openldap:openldap
 openldap2;cpe:/a:openldap:openldap
 openldap;cpe:/a:openldap:openldap
+openmosixview;cpe:/a:openmosixview:openmosixview
 openmotif;cpe:/a:integrated_computer_solutions:openmotif
 openoffice.org;cpe:/a:sun:openoffice.org
 opensaml2;cpe:/a:internet2:opensaml
 opensaml;cpe:/a:internet2:opensaml
 opensc;cpe:/a:opensc-project:opensc
 openser;cpe:/a:openser:openser
+openslp;cpe:/a:openslp:openslp
 openssh;cpe:/a:openssh:openssh
+openssl094;cpe:/a:openssl:openssl
+openssl095;cpe:/a:openssl:openssl
 openssl096;cpe:/a:openssl:openssl
 openssl097;cpe:/a:openssl:openssl
 openssl;cpe:/a:openssl:openssl
 openswan;cpe:/a:openswan:openswan
 openttd;cpe:/a:openttd:openttd
 openvpn;cpe:/a:openvpn:openvpn
+openwebmail;cpe:/a:open_webmail:open_webmail
 openx;cpe:/a:openx:openx
 opie;cpe:/a:nrl:opie
+oprofile;cpe:/a:oprofile:oprofile
 optipng;cpe:/a:cosmin_truta:optipng
 os-prober;cpe:/a:debian:os-prober
+osh;cpe:/a:osh:osh
+osiris;cpe:/a:brian_wotring:osiris
 otrs2;cpe:/a:otrs:otrs
 otrs;cpe:/a:otrs:otrs
 overkill;cpe:/a:overkill:overkill
@@ -709,6 +966,7 @@
 paramiko;cpe:/a:python_software_foundation:paramiko
 paste;cpe:/a:pythonpaste:paste
 pavuk;cpe:/a:pavuk:pavuk
+pcal;cpe:/a:pcal:pcal
 pcre3;cpe:/a:pcre:pcre
 pcsc-lite;cpe:/a:muscle:pcsc-lite
 pdfjam;cpe:/a:pdfjam:pdfjam
@@ -718,10 +976,14 @@
 pdnsd;cpe:/a:pdnsd:pdnsd
 peercast;cpe:/a:peercast:peercast
 pennmush;cpe:/a:pennmush:pennmush
+perdition;cpe:/a:vergenet:perdition_mail_retrieval_proxy
 perl;cpe:/a:perl:perl
 perlbal;cpe:/a:perlbal:perlbal
+petris;cpe:/a:petris:petris
 php-apc;cpe:/a:pecl-php:alternative_php_cache
 php-htmlpurifier;cpe:/a:htmlpurifier:htmlpurifier
+php-xajax;cpe:/a:xajax:xajax
+php3;cpe:/a:php:php
 php4;cpe:/a:php:php
 php5;cpe:/a:php:php
 phpbb2;cpe:/a:phpbb:phpbb
@@ -736,10 +998,15 @@
 phpqladmin;cpe:/a:phpqladmin:phpqladmin
 phpsysinfo;cpe:/a:phpsysinfo:phpsysinfo
 phpwiki;cpe:/a:phpwiki:phpwiki
+picasm;cpe:/a:timo_rossi:picasm
 pidgin;cpe:/a:pidgin:pidgin
+pike7.2;cpe:/a:pike:pike
 pike7.6;cpe:/a:pike:pike
+pilot-qof;cpe:/a:pilot-qof:datafreedom-perl
 pimd;cpe:/a:troglobit:pimd
 pinball;cpe:/a:jochen_friedrich:pinball
+pine;cpe:/a:university_of_washington:pine
+pinentry;cpe:/a:gentoo:app-crypt_pinentry
 pioneers;cpe:/a:pioneers:pioneers
 pivot;cpe:/a:pivot:pivot
 piwigo;cpe:/a:piwigo:piwigo
@@ -755,9 +1022,14 @@
 policyd-weight;cpe:/a:policyd-weight:policyd-weight
 policykit;cpe:/a:freedesktop:policykit
 polipo;cpe:/a:pps.jussieu:polipo
+polygen;cpe:/a:polygen:polygen
+popfile;cpe:/a:popfile:popfile
 poppler;cpe:/a:poppler:poppler
+postfix-gld;cpe:/a:salim_gasmi:gld
+postfix-policyd;cpe:/a:policyd:policyd
 postfix;cpe:/a:postfix:postfix
 postgresql-7.4;cpe:/a:postgresql:postgresql
+postgresql-8.0;cpe:/a:postgresql:postgresql
 postgresql-8.1;cpe:/a:postgresql:postgresql
 postgresql-8.2;cpe:/a:postgresql:postgresql
 postgresql-8.3;cpe:/a:postgresql:postgresql
@@ -765,21 +1037,28 @@
 postgresql-9.0;cpe:/a:postgresql:postgresql
 postgresql-ocaml;cpe:/a:ocaml:postgresql-ocaml
 postgresql;cpe:/a:postgresql:postgresql
+postgrey;cpe:/a:postgrey:postgrey
 pound;cpe:/a:apsis:pound
+powersave;cpe:/a:powersave:powersave
 ppp;cpe:/a:marco_d%27itri:ppp
+pptpd;cpe:/a:poptop:pptp_server
+ppxp;cpe:/a:debian:ppxp
 prewikka;cpe:/a:prelude-technologies:prewikka
 printfilters-ppd;cpe:/a:a_mennucc1:printfilters-ppd
 proftpd-dfsg;cpe:/a:proftpd:proftpd
 proftpd;cpe:/a:proftpd:proftpd
 projectl;cpe:/a:debian:projectl
 prototypejs;cpe:/a:prototypejs:prototype_javascript_framework
+prozilla;cpe:/a:prozilla:prozilla_download_accelerator
 psi;cpe:/a:psi-im:psi
 pstotext;cpe:/a:pstotext:pstotext
 pulseaudio;cpe:/a:pulseaudio:pulseaudio
 puppet;cpe:/a:puppet:puppet
+pure-ftpd;cpe:/a:pureftpd:pureftpd
 putty;cpe:/a:putty:putty
 pvpgn;cpe:/a:pvpgn:pvpgn
 pwlib;cpe:/a:openh323_project:pwlib
+py2play;cpe:/a:py2play:py2play
 pyfribidi;cpe:/a:kobi_zamir:pyfribidi
 pyftpd;cpe:/a:radovan_garabik:pyftpd
 pygresql;cpe:/a:pygresql:pygresql
@@ -789,6 +1068,8 @@
 python-dns;cpe:/a:debian:python-dns
 python-formencode;cpe:/a:formencode:formencode
 python-pyftpdlib;cpe:/a:g.rodola:pyftpdlib
+python2.1;cpe:/a:python:python
+python2.2;cpe:/a:python:python
 python2.3;cpe:/a:python:python
 python2.4;cpe:/a:python:python
 python2.5;cpe:/a:python:python
@@ -797,19 +1078,26 @@
 python2.8;cpe:/a:python:python
 python3.1;cpe:/a:python:python
 python3.2;cpe:/a:python:python
+qdbm;cpe:/a:qdbm:qdbm
 qemu;cpe:/a:qemu:qemu
 qgit;cpe:/a:qgit:qgit
 qmail;cpe:/a:dan_bernstein:qmail
+qmailadmin;cpe:/a:inter7:qmailadmin
+qpopper;cpe:/a:qualcomm:qpopper
+qt-copy;cpe:/a:nokia:qt
 qt-x11-free;cpe:/a:nokia:qt
 qt4-x11;cpe:/a:nokia:qt
 qtcreator;cpe:/a:nokia:qt_creator
 quagga;cpe:/a:quagga:quagga_routing_software_suite
 quake2;cpe:/a:id_software:quake_ii_server
 quassel;cpe:/a:quassel:quassel_core
+queue;cpe:/a:gnu:queue
 r-base;cpe:/a:r_foundation:r
 radiance;cpe:/a:radiance:radiance
 rails;cpe:/a:ruby_on_rails:ruby_on_rails
 rancid;cpe:/a:shrubbery:rancid
+rar;cpe:/a:rarlab:unrar
+razor;cpe:/a:vipul:razor-agents
 rccp;cpe:/a:zak_b_elep:rccp
 rdesktop;cpe:/a:rdesktop:rdesktop
 realtimebattle;cpe:/a:remi_vanicat:realtimebattle
@@ -818,21 +1106,29 @@
 rekonq;cpe:/a:adjam:rekonq
 reportbug-ng;cpe:/a:reportbug-ng:reportbug-ng
 reportbug;cpe:/a:reportbug-ng:reportbug
+reprepro;cpe:/a:debian:reprepro
 request-tracker3.4;cpe:/a:bestpractical:rt
 request-tracker3.6;cpe:/a:bestpractical:rt
 request-tracker3.8;cpe:/a:bestpractical:rt
+resmgr;cpe:/a:resmgr:resmgrd
+rhapsody;cpe:/a:rhapsody_irc:rhapsody_irc
 rhythmbox;cpe:/a:gnome:rhythmbox
 rkhunter;cpe:/a:john_horne:rkhunter
+rlpr;cpe:/a:rlpr:rlpr
 roaraudio;cpe:/a:roaraudio:roaraudio
 robocode;cpe:/a:robocode:robocode
 root-system;cpe:/a:root:root
 roundcube;cpe:/a:roundcube:roundcube_webmail
 roundup;cpe:/a:roundup:roundup
+rp-pppoe;cpe:/a:roaring_penguin:pppoe
 rpm;cpe:/a:rpm:rpm
+rsnapshot;cpe:/a:rsnapshot:filesystem_snapshot_utility
 rssh;cpe:/a:rssh:rssh
 rsync;cpe:/a:rsync:rsync
 rsyslog;cpe:/a:rsyslog:rsyslog
 rt73;cpe:/h:ralinktech:rt73
+ruby-gnome2;cpe:/a:ruby_gnome2:ruby_gnome2
+ruby1.6;cpe:/a:ruby-lang:ruby
 ruby1.8;cpe:/a:ruby-lang:ruby
 ruby1.9.1;cpe:/a:ruby-lang:ruby
 ruby1.9;cpe:/a:ruby-lang:ruby
@@ -840,6 +1136,7 @@
 runit;cpe:/a:runit:runit
 rxvt-unicode;cpe:/a:marc_lehmann:rxvt-unicode
 rxvt;cpe:/a:rxvt:rxvt
+sa-exim;cpe:/a:sa-exim:sa-exim
 sabre;cpe:/a:debian:xsabre
 sahana;cpe:/a:sahanafoundation:sahana
 salome;cpe:/a:salome-platform:salome
@@ -848,41 +1145,62 @@
 samizdat;cpe:/a:nongnu:samizdat
 sarg;cpe:/a:sarg:squid_analysis_report_generator
 scilab;cpe:/a:scilab:scilab
+scorched3d;cpe:/a:scorched_3d:scorched_3d
+scponly;cpe:/a:scponly:scponly
 scratchbox2;cpe:/a:freedesktop:scratchbox2
 screen;cpe:/a:gnu:screen
 screenie;cpe:/a:marc_gloor:screenie
+sdd;cpe:/a:jorg_schilling:sdd
 sdl-image1.2;cpe:/a:sdl:sdl_image
 sdm;cpe:/a:jonas_smedegaard:sdm-terminal
+secondlife-client;cpe:/a:linden_lab:second_life
 sendmail;cpe:/a:sendmail:sendmail
 serendipity;cpe:/a:s9y:serendipity
 sgml2x;cpe:/a:alcovebook:sgml2x
 shadow;cpe:/a:debian:shadow
+sharutils;cpe:/a:gnu:sharutils
 shibboleth-sp2;cpe:/a:internet2:shibboleth-sp
 shibboleth-sp;cpe:/a:internet2:shibboleth-sp
+shorewall;cpe:/a:shorewall:shorewall
 shtool;cpe:/a:shtool:shtool
 silc-client;cpe:/a:silc:silc_client
 silc-server;cpe:/a:silc:silc-server
 silc-toolkit;cpe:/a:silc:silc_toolkit
 silverstripe;cpe:/a:silverstripe:silverstripe
+simpleproxy;cpe:/a:simpleproxy:simpleproxy
+sing;cpe:/a:sing:sing
 sitebar;cpe:/a:sitebar:sitebar
+skktools;cpe:/a:skk_openlab:skk_tools
 slash;cpe:/a:slashcode.com:slash
 sleuthkit;cpe:/a:sleuth_kit:the_sleuth_kith
 slim;cpe:/a:simone_rota:slim_simple_login_manager
 slocate;cpe:/a:slocate:slocate
 slurm-llnl;cpe:/a:llnl:slurm
 smail;cpe:/a:smail:smail
+smartlist;cpe:/a:smartlist:smartlist
 smarty;cpe:/a:smarty:smarty
 smb4k;cpe:/a:smb4k:smb4k
 smbind;cpe:/a:blentz:smbind
+sms-pl;cpe:/a:sms:sms
 smsclient;cpe:/a:smsclient:smsclient
+smstools;cpe:/a:stefan_frings:sms_server_tools
 sng;cpe:/a:eric_raymond:sng
 snort;cpe:/a:snort:snort
 socat;cpe:/a:dest-unreach:socat
+sork-accounts;cpe:/a:horde:accounts
+sork-forwards;cpe:/a:horde:forwards
+sork-passwd-h3;cpe:/a:horde:passwd
+sork-passwd;cpe:/a:horde:passwd
+sork-vacation;cpe:/a:horde:vaction
+sox;cpe:/a:sox:sox
 spamass-milter;cpe:/a:georg_greve:spamassassin_milter_plugin
 spamassassin;cpe:/a:spamassassin:spamassassin
+spe;cpe:/a:stani:stanis_python_editor
+speedtouch;cpe:/a:speedtouch:speedtouch_usb_driver
 spice;cpe:/a:redhat:qspice
 spip;cpe:/a:spip:spip
 splitvt;cpe:/a:sam_lantinga:splitvt
+spread;cpe:/a:canonical:spread
 sql-ledger;cpe:/a:sql-ledger:sql-ledger
 squid3;cpe:/a:squid-cache:squid
 squid;cpe:/a:squid-cache:squid
@@ -890,7 +1208,10 @@
 squirrelmail;cpe:/a:squirrelmail:squirrelmail
 ssmtp;cpe:/a:ssmtp:ssmtp
 sssd;cpe:/a:fedoraproject:sssd
+star;cpe:/a:joerg_schilling:star_tape_archiver
 stardict;cpe:/a:stardict:stardict
+stlport5;cpe:/a:stlport:stlport
+storebackup;cpe:/a:storebackup:storebackup
 streamripper;cpe:/a:streamripper:streamripper
 strongswan;cpe:/a:strongswan:strongswan
 stunnel4;cpe:/a:stunnel:stunnel
@@ -898,6 +1219,8 @@
 sudo;cpe:/a:todd_miller:sudo
 sun-java5;cpe:/a:sun:jdk
 sun-java6;cpe:/a:sun:jdk
+sup;cpe:/a:sup:sup
+super;cpe:/a:william_deich:super
 suphp;cpe:/a:sebastian_marsching:suphp
 swfdec0.5;cpe:/a:swfdec:swfdec
 swfdec0.6;cpe:/a:swfdec:swfdec
@@ -906,11 +1229,14 @@
 sylpheed-claws;cpe:/a:sylpheed-claws:sylpheed-claws
 sylpheed;cpe:/a:sylpheed:sylpheed
 sympa;cpe:/a:sympa:sympa
+synaesthesia;cpe:/a:synaesthesia:synaesthesia
 synfig;cpe:/a:synfig:synfigstudio
 syslog-ng;cpe:/a:balabit:syslog-ng
+sysstat;cpe:/a:sysstat:sysstat
 systemimager;cpe:/a:dann_frazier:systemimager-server
 systemtap;cpe:/a:systemtap:systemtap
 t-prot;cpe:/a:jochen_striepe:t-prot
+t1lib;cpe:/a:t1lib:t1lib
 tangerine;cpe:/a:alex_launi:tangerine
 tar;cpe:/a:gnu:tar
 tau;cpe:/a:uoregon:tau
@@ -918,9 +1244,12 @@
 tcl8.3;cpe:/a:tcl_tk:tcl_tk
 tcl8.4;cpe:/a:tcl_tk:tcl_tk
 tcpdump;cpe:/a:tcpdump:tcpdump
+tcpick;cpe:/a:francesco_stablum:tcpick
+tcpreen;cpe:/a:tcpreen:tcpreen
 tdiary;cpe:/a:tdiary:tdiary
 teamspeak-client;cpe:/a:teamspeak:teamspeak
 teamspeak-server;cpe:/a:teamspeak:teamspeak
+teg;cpe:/a:teg:tenes_empanadas_graciela
 tetex-bin;cpe:/a:tetex:tetex
 texinfo;cpe:/a:gnu:texinfo
 texlive-bin;cpe:/a:tug:tex_live
@@ -931,17 +1260,23 @@
 thttpd;cpe:/a:acme:thttpd
 thunderbird;cpe:/a:mozilla:thunderbird
 tiff3;cpe:/a:libtiff:libtiff
+tiff3g;cpe:/a:libtiff:libtiff
 tiff;cpe:/a:libtiff:libtiff
 tiger;cpe:/a:tiger:tiger
 tightvnc;cpe:/a:tightvnc:tightvnc
 tikiwiki;cpe:/a:tikiwiki:tikiwiki_cms_groupware
+tin;cpe:/a:tin:tin
 tintin++;cpe:/a:tintin:tintin%2B%2B
+tinymux;cpe:/a:tinymux:tinymux
 tk8.3;cpe:/a:tcl_tk:tcl_tk
 tk8.4;cpe:/a:tcl_tk:tcl_tk
 tk8.5;cpe:/a:tcl_tk:tcl_tk
+tkdiff;cpe:/a:tkdiff:tkdiff
 tkman;cpe:/a:tkman:tkman
 tkusr;cpe:/a:ldrolez:tkusr
 tmsnc;cpe:/a:tmsnc:tmsnc
+tn5250;cpe:/a:mochasoft:tn5250
+tnftp;cpe:/a:luke_mewburn:tnftp
 tomboy;cpe:/a:gnome:tomboy
 tomcat4;cpe:/a:apache:tomcat
 tomcat5.5;cpe:/a:apache:tomcat
@@ -949,42 +1284,62 @@
 tomcat6;cpe:/a:apache:tomcat
 tor;cpe:/a:tor:tor
 torcs;cpe:/a:bernhard_wymann:torcs
+tork;cpe:/a:anonymityanywhere:tork
+torque;cpe:/a:cluster_resources:torque_resource_manager
 torrentflux;cpe:/a:torrentflux:torrentflux
 tqsllib;cpe:/a:arrl:tqsllib
 trac-git;cpe:/a:nanosleep:trac-git
 trac;cpe:/a:edgewall:trac
+tramp;cpe:/a:gnu:tramp
 transmission;cpe:/a:transmissionbt:transmission
 trickle;cpe:/a:monkey:trickle
+tripwire;cpe:/a:tripwire:tripwire
+trr19;cpe:/a:yamamoto_hirotaka:trr19
 tss;cpe:/a:debian:tss
 tunapie;cpe:/a:james_stone:tunapie
 turba2;cpe:/a:debian:turba
+turba;cpe:/a:horde:turba
 turbogears2;cpe:/a:turbogears:turbogears2
+turqstat;cpe:/a:softwolves_software:turquoise_superstat
 tutos2;cpe:/a:tutos:tutos
 tutos;cpe:/a:tutos:tutos
 tuxguitar;cpe:/a:herac:tuxguitar
+tuxpaint;cpe:/a:new_breed_software:tux_paint
 twiki;cpe:/a:twiki:twiki
 typespeed;cpe:/a:typespeed:typespeed
 typo3-src;cpe:/a:typo3:typo3
 typo;cpe:/a:typosphere:typo
+ucd-snmp;cpe:/a:net-snmp:net-snmp
 udev;cpe:/a:kernel:udev
 udisks;cpe:/a:freedesktop:udisks
+uim;cpe:/a:uim:uim
 uml-utilities;cpe:/a:uml-utilities:uml-utilities
 unace;cpe:/a:e-merge:unace
+unalz;cpe:/a:unalz:unalz
 unbound;cpe:/a:nlnet_labs:unbound
+unp;cpe:/a:debian:unp
+unrar-nonfree;cpe:/a:rarlab:unrar
 unrealircd;cpe:/a:unrealircd:unrealircd
+unrtf;cpe:/a:zack_smith:unrtf
 unzip;cpe:/a:info-zip:unzip
+unzoo;cpe:/a:unzoo:unzoo
 usermin;cpe:/a:usermin:usermin
 ust;cpe:/a:lttng:ust
 util-linux;cpe:/a:linux:util-linux
+util-vserver;cpe:/a:vserver:util-vserver
 uudeview;cpe:/a:uudeview:uudeview
 uw-imap;cpe:/a:university_of_washington:imap
 uzbl;cpe:/a:uzbl:uzbl
 valgrind;cpe:/a:valgrind:valgrind
 varnish;cpe:/a:varnish.projects.linpro:varnish
+vbox3;cpe:/a:vbox3:vbox3
 vdccm;cpe:/a:synce:vdccm
 vdr;cpe:/a:tvdr:vdr
 verlihub;cpe:/a:verlihub-project:verlihub
+vice;cpe:/a:vice:vice
 videocache;cpe:/a:saini:videocache
+viewcvs;cpe:/a:viewcvs:viewcvs
+viewglob;cpe:/a:viewglob:viewglob
 viewvc;cpe:/a:viewvc:viewvc
 vim;cpe:/a:vim:vim
 vinagre;cpe:/a:gnome:vinagre
@@ -992,6 +1347,7 @@
 virtualbox-ose;cpe:/a:sun:virtualbox
 vlc;cpe:/a:videolan:vlc_media_player
 vnc4;cpe:/a:realvnc:realvnc
+vobcopy;cpe:/a:vobcopy:vobcopy
 vsftpd;cpe:/a:redhat:vsftpd
 vte;cpe:/a:nalin_dahyabhai:vte
 w3c-libwww;cpe:/a:w3c:libwww
@@ -999,6 +1355,7 @@
 wafp;cpe:/a:mytty:webapplication_finger_printer
 webauth;cpe:/a:stanford:webauth
 webcalendar;cpe:/a:k5n:webcalendar
+webcheck;cpe:/a:webcheck:webcheck
 webcit;cpe:/a:citadel:webcit
 webgui;cpe:/a:plainblack:webgui
 webkit;cpe:/a:webkit:webkit
@@ -1007,24 +1364,33 @@
 weborf;cpe:/a:salvo_tomaselli:weborf_http_server
 websvn;cpe:/a:tigris:websvn
 weechat;cpe:/a:flashtux:weechat
+weex;cpe:/a:weex:weex
+wengophone;cpe:/a:wengo:wengophone
 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
+wine;cpe:/a:wine:wine
 wireshark;cpe:/a:wireshark:wireshark
+wmaker;cpe:/a:windowmaker:windowmaker
 wml;cpe:/a:website_meta_language:website_meta_language
 wordnet;cpe:/a:wordnet:wordnet
 wordpress-mu;cpe:/a:wordpress:wordpress_mu
 wordpress;cpe:/a:wordpress:wordpress
 wpasupplicant;cpe:/a:wpa_supplicant:wpa_supplicant
+wu-ftpd;cpe:/a:washington_university:wu-ftpd
+wv2;cpe:/a:wvware:wv2
 wv;cpe:/a:wvware:wvware
 wxwidgets2.6;cpe:/a:wxwidgets:wxwidgets
 wxwidgets2.8;cpe:/a:wxwidgets:wxwidgets
 wxwindows2.4;cpe:/a:wxwidgets:wxwidgets
 wyrd;cpe:/a:paul_pelzl:wyrd
+wzdftpd;cpe:/a:wzdftpd:wzdftpd
 xapian-omega;cpe:/a:xapian:omega
 xastir;cpe:/a:xastir:xastir
+xboard;cpe:/a:tim_mann:xboard
+xboing;cpe:/a:xboing:xboing
 xcal;cpe:/a:lars_bahner:xcal
 xcftools;cpe:/a:henning_makholm:xcftools
 xchat;cpe:/a:xchat:xchat
@@ -1036,21 +1402,35 @@
 xen-3;cpe:/a:xensource:xen
 xen-unstable;cpe:/a:xensource:xen
 xen;cpe:/a:xensource:xen
+xfce4-terminal;cpe:/a:os-cillation:xfce_terminal
 xfig;cpe:/a:xfig:xfig
 xfree86;cpe:/a:x:x11
+xfs;cpe:/a:x.org:x_font_server
 xfsdump;cpe:/a:xfsdump:xfsdump
 xine-lib;cpe:/a:xine:xine-lib
 xine-ui;cpe:/a:xine:xine-ui
+xitalk;cpe:/a:xintercepttalk:xitalk
+xli;cpe:/a:xli:xli
 xloadimage;cpe:/a:xloadimage:xloadimage
+xmail;cpe:/a:davide_libenzi:xmail
 xmame;cpe:/a:xmame:xmame
 xmcd;cpe:/a:ti_kan:xmcd
+xmlstarlet;cpe:/a:xmlstarlet:command_line_xml_toolkit
 xmltooling;cpe:/a:internet2:xmltooling
+xmms;cpe:/a:x_multimedia_system:x_multimedia_system
+xmp;cpe:/a:claudio_matsuoka:extended_module_player
+xonix;cpe:/a:xonix:xonix
 xorg-server;cpe:/a:x:x11
 xorg-x11;cpe:/a:x:x11
+xorg;cpe:/a:x.org:x.org
+xpcd;cpe:/a:xpcd:xpcd
 xpdf;cpe:/a:xpdf:xpdf
 xpvm;cpe:/a:xpvm:xpvm
 xrdp;cpe:/a:xrdp:xrdp
 xscreensaver;cpe:/a:xscreensaver:xscreensaver
+xshisen;cpe:/a:xshisen:xshisen
+xsok;cpe:/a:michael_bischoff:xsok
+xsp;cpe:/a:mono:xsp
 xsupplicant;cpe:/a:xsupplicant:xsupplicant
 xterm;cpe:/a:invisible-island:xterm
 xulrunner;cpe:/a:mozilla:libxul
@@ -1059,13 +1439,20 @@
 xyssl;cpe:/a:xyssl:xyssl
 xzgv;cpe:/a:xzgv:xzgv
 yacy;cpe:/a:michael_christen:yacy
+yardradius;cpe:/a:yard_radius:yard_radius
+yarssr;cpe:/a:yarssr:yarssr
+yate;cpe:/a:yet_another_telephony_engine:yet_another_telephony_engine
 yaws;cpe:/a:yaws:yaws
 yelp;cpe:/a:gnome:yelp
+yiff;cpe:/a:raphael_bossek:yiff_server
 yui;cpe:/a:yahoo:yui
 zabbix;cpe:/a:zabbix:zabbix
 zaptel;cpe:/a:asterisk:zaptel
 zenoss;cpe:/a:zenoss:zenoss
+zgv;cpe:/a:zgv:zgv_image_viewer
 zhcon;cpe:/a:ejoy_and_hu_yong:zhcon
+zinf;cpe:/a:zinf:zinf
+zip;cpe:/a:info-zip:zip
 ziproxy;cpe:/a:daniel_mealha_cabrita:ziproxy
 zlib;cpe:/a:gnu:zlib
 znc;cpe:/a:znc:znc
@@ -1074,6 +1461,8 @@
 zoneminder;cpe:/a:zoneminder:zoneminder
 zoo;cpe:/a:rahul_dhesi:zoo
 zope-ldapuserfolder;cpe:/a:jens_vagelpohl:zope-ldapuserfolder
+zope-zms;cpe:/a:zms_publishing:zms
+zope-zwiki;cpe:/a:zwiki:zwiki
 zope2.10;cpe:/a:zope:zope
 zope2.11;cpe:/a:zope:zope
 zope2.7;cpe:/a:zope:zope
@@ -1082,3 +1471,5 @@
 zope3;cpe:/a:zope:zope
 zoph;cpe:/a:zoph:zoph
 zsh;cpe:/a:zsh:zsh
+zvbi;cpe:/a:zapping:zapping_vbi_library
+zziplib;cpe:/a:zziplib:zziplib