From d122b3a8247b65b0129c44a4f8c49f062f0e4bc1 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@debian.org>
Date: Sat, 17 Dec 2016 00:08:23 +0000
Subject: Updated CPE mapping and alias list.

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@47157 e39458fd-73e7-0310-bf30-c45bca0a0e42
---
 data/CPE/aliases | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 data/CPE/list    | 116 +++++++++++++++++++++++++++++++++++
 2 files changed, 295 insertions(+), 2 deletions(-)

(limited to 'data/CPE')

diff --git a/data/CPE/aliases b/data/CPE/aliases
index 0b1e655804..69b0f2d237 100644
--- a/data/CPE/aliases
+++ b/data/CPE/aliases
@@ -72,6 +72,7 @@ cpe:/a:citrix:xen
 cpe:/a:xen:xen
 cpe:/a:xen:qemu
 cpe:/a:xensource_inc:xen
+cpe:/o:xen:xen
 
 cpe:/a:videolan:vlc
 cpe:/a:videolan:vlc_media_player
@@ -205,6 +206,7 @@ cpe:/a:subversion:subversion
 
 cpe:/a:nokia:qt
 cpe:/a:trolltech:qt
+cpe:/a:digia:qt
 
 cpe:/a:ruby-lang:ruby
 cpe:/a:yukihiro_matsumoto:ruby
@@ -261,6 +263,7 @@ cpe:/a:university_of_washington:uw-imap
 
 cpe:/a:gnu:wget
 cpe:/a:wget:wget
+cpe:/a:gnu_wget_project:gnu_wget
 
 cpe:/a:kernel:linux-pam
 cpe:/a:pam:pam
@@ -276,15 +279,18 @@ cpe:/a:adobe:flash_player
 cpe:/a:macromedia:flash_player
 cpe:/a:macromedia:shockwave
 
-cpe:/a:curl:libcurl
-cpe:/a:daniel_stenberg:curl
 cpe:/a:curl:curl
+cpe:/a:daniel_stenberg:curl
+cpe:/a:haxx:curl
+cpe:/a:curl:libcurl
+cpe:/a:haxx:libcurl
 cpe:/a:libcurl:libcurl
 
 cpe:/a:mortbay:jetty
 cpe:/a:mortbay_jetty:jetty
 cpe:/a:jetty:jetty
 cpe:/a:jetty:jetty_http_server
+cpe:/a:eclipse:jetty
 
 cpe:/a:ez:ez_publish
 cpe:/a:ez_publish:ez_publish
@@ -310,6 +316,7 @@ cpe:/a:phpldapadmin:phpldapadmin
 
 cpe:/a:bestpractical:rt
 cpe:/a:best_practical_solutions:request_tracker
+cpe:/a:bestpractical:request_tracker
 
 cpe:/a:cmu:cyrus_imap_server
 cpe:/a:cyrus:imapd
@@ -345,6 +352,7 @@ cpe:/a:xiao_gang:www_interactive_mathematics_server
 
 cpe:/a:freedesktop:dbus
 cpe:/a:d-bus:d-bus
+cpe:/a:d-bus_project:d-bus
 cpe:/o:d-bus:inter-process_communication_system
 
 cpe:/a:littlecms:lcms
@@ -491,12 +499,14 @@ cpe:/a:drupal:project
 
 cpe:/a:roundcube:roundcube_webmail
 cpe:/a:roundcube_webmail_project:roundcube_webmail
+cpe:/a:roundcube:webmail
 
 cpe:/a:openssl:openssl
 cpe:/a:openssl_project:openssl
 
 cpe:/a:graphicsmagick:graphicsmagick
 cpe:/a:imagemagick:graphicsmagick
+cpe:/a:imagemagick:imagemagick
 
 cpe:/a:argyllcms:argyllcms
 cpe:/a:argyllcms:cms
@@ -640,6 +650,7 @@ cpe:/a:vnc:realvnc
 
 cpe:/a:nvidia:binary_graphics_driver
 cpe:/a:nvidia:video_driver
+cpe:/a:nvidia:gpu_driver
 
 cpe:/a:usermin:usermin
 cpe:/a:webmin:usermin
@@ -777,6 +788,165 @@ cpe:/a:puppetlabs:puppet
 cpe:/a:quassel:quassel_core
 cpe:/a:quassel-irc:quassel
 
+cpe:/a:e2fsprogs_project:e2fsprogs
+cpe:/a:ext2_filesystems_utilities:e2fsprogs
+
+cpe:/a:marco_d%27itri:ppp
+cpe:/a:samba:ppp
+
+cpe:/a:gnome:networkmanager
+cpe:/a:networkmanager_project:networkmanager
+
+cpe:/a:dracut_project:dracut
+cpe:/a:fedoraproject:dracut
+
+cpe:/a:network_block_device:nbd
+cpe:/a:wouter_verhelst:nbd
+
+cpe:/a:internet2:xmltooling
+cpe:/a:xmltooling_project:xmltooling
+
+cpe:/a:w3m:w3m
+cpe:/a:w3m_project:w3m
+
+cpe:/a:libgd:gd_graphics_library
+cpe:/a:libgd:libgd
+
+cpe:/a:freebsd:libarchive
+cpe:/a:libarchive:libarchive
+
+cpe:/a:bluez_project:bluez
+cpe:/a:bluez:bluez
+
+cpe:/a:openstack:nova
+cpe:/a:openstack:compute_%28nova%29
+cpe:/a:openstack:compute
+
+cpe:/a:will_estes:flex
+cpe:/a:flex_project:flex
+
+cpe:/a:gnome:gdkpixbuf
+cpe:/a:gnome:gdk-pixbuf
+
+cpe:/a:ruby_on_rails:ruby_on_rails
+cpe:/a:rubyonrails:ruby_on_rails
+
+cpe:/a:powerdns:powerdns
+cpe:/a:powerdns:authoritative_server
+cpe:/a:powerdns:authoritative
+
+cpe:/a:ecryptfs:ecryptfs_utils
+cpe:/a:ecryptfs:ecryptfs-utils
+
+cpe:/a:openstack:glance
+cpe:/a:openstack:image_registry_and_delivery_service_%28glance%29
+
+cpe:/a:james_clark:expat
+cpe:/a:libexpat:expat
+
+cpe:/a:cloudbees:jenkins
+cpe:/a:jenkins:jenkins
+
+cpe:/a:e-merge:unace
+cpe:/a:winace:unace
+
+cpe:/a:libgsf:libgsf
+cpe:/a:gnome:libgsf
+
+cpe:/a:oracle:sun_glassfish_enterprise_server
+cpe:/a:oracle:glassfish_server
+
+cpe:/a:libksba_library:libksba_library
+cpe:/a:libksba_project:libskba
+
+cpe:/a:symphony-cms:symphony_cms
+cpe:/a:sensiolabs:symfony
+
+cpe:/a:john_lim:adodb
+cpe:/a:adodb_project:adodb
+
+cpe:/a:gnome:eog
+cpe:/a:gnome:eye_of_gnome
+
+cpe:/a:rasterbar_software:libtorrent
+cpe:/a:arvidn:libtorrent
+
+cpe:/a:libtiff:libtiff
+cpe:/a:libtiff_project:libtiff
+
+cpe:/a:cosmin_truta:optipng
+cpe:/a:optipng_project:optipng
+
+cpe:/a:libungif:libungif
+cpe:/a:giflib_project:giflib
+
+cpe:/a:matt_johnston:dropbear_ssh_server
+cpe:/a:dropbear_ssh_project:dropbear_ssh
+
+cpe:/a:putty:putty
+cpe:/a:simon_tatham:putty
+
+cpe:/a:7-zip:7-zip
+cpe:/a:7-zip:7zip
+
+cpe:/a:git:git
+cpe:/a:git-scm:git
+cpe:/a:git_project:git
+
+cpe:/a:mozilla:nss
+cpe:/a:mozilla:network_security_services
+
+cpe:/a:pcre:pcre
+cpe:/a:pcre:perl_compatible_regular_expression_library
+
+cpe:/a:tryton:trytond
+cpe:/a:tryton:tryton
+
+cpe:/a:poppler:poppler
+cpe:/a:freedesktop:poppler
+
+cpe:/a:varnish.projects.linpro:varnish
+cpe:/a:varnish-cache:varnish
+
+cpe:/a:claws_mail:claws_mail_tools
+cpe:/a:claws-mail:claws-mail
+
+cpe:/a:phpmailer:phpmailer
+cpe:/a:phpmailer_project:phpmailer
+
+cpe:/a:cakefoundation:cakephp
+cpe:/a:cakephp:cakephp
+
+cpe:/a:gnu:grub_2
+cpe:/a:gnu:grub2
+
+cpe:/a:hostapd:hostapd
+cpe:/a:w1.fi:hostapd
+
+cpe:/a:xscreensaver:xscreensaver
+cpe:/a:xscreensaver_project:xscreensaver
+
+cpe:/a:bouncycastle:bouncy-castle-crypto-package
+cpe:/a:bouncycastle:bouncy_castle_crypto_package
+
+cpe:/a:gnome:gnome_display_manager
+cpe:/a:gnome:gdm
+
+cpe:/a:gnu:screen
+cpe:/a:gnu:gnu_screen
+
+cpe:/a:niels_provos:libevent
+cpe:/a:libevent_project:libevent
+
+cpe:/a:extplorer:extplorer
+cpe:/a:extplorer:extplorer
+
+cpe:/a:todd_miller:sudo
+cpe:/a:sudo_project:sudo
+
+cpe:/a:freedesktop:policykit
+cpe:/a:polkit_project:polkit
+
 # Dummy entries to hide noise
 #cpe:/a:webkit:webkit
 #cpe:/a:google:chrome
@@ -791,6 +961,13 @@ cpe:/a:quassel-irc:quassel
 # Dummy entries to hide noise
 #cpe:/a:mozilla:libxul
 #cpe:/a:mozilla:firefox
+#cpe:/a:mozilla:firefox_esr
 #cpe:/a:mozilla:thunderbird
 #cpe:/a:mozilla:seamonkey
 #cpe:/a:mozilla:mozilla
+
+# Dummy entries to hide noise
+#cpe:/a:kvm_qumranet:kvm
+#cpe:/a:qemu:qemu
+#cpe:/a:xensource:xen
+#cpe:/o:xen:xen
diff --git a/data/CPE/list b/data/CPE/list
index 7b84b1ff41..d1f804e937 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -29,6 +29,8 @@ amaya;cpe:/a:w3:amaya
 ampache;cpe:/a:ampache:ampache
 amsn;cpe:/a:alvaro:alvaros_messenger
 amule;cpe:/a:amule:amule
+android;cpe:/o:google:android
+ansible;cpe:/a:ansibleworks:ansible
 antiword;cpe:/a:antiword:antiword
 aolserver4;cpe:/a:aol:aolserver
 apache-ssl;cpe:/a:apache-ssl:apache-ssl
@@ -52,6 +54,7 @@ arc;cpe:/a:arc:arc
 ardour;cpe:/a:ardour:ardour
 argyll;cpe:/a:argyllcms:argyllcms
 aria2;cpe:/a:tatsuhiro_tsujikawa:aria2
+arj;cpe:/a:arj_software:arj_archiver
 arora;cpe:/a:arora-browser:arora
 arts;cpe:/a:kde:arts
 as31;cpe:/a:bdale_garbee:as31
@@ -90,6 +93,7 @@ bareftp;cpe:/a:bareftp:bareftp
 barnowl;cpe:/a:barnowl:barnowl
 base-config;cpe:/a:debian:base-config
 bash;cpe:/a:bash:bash
+batik;cpe:/a:apache:batik
 bbclone;cpe:/a:bbclone:bbclone
 bcfg2;cpe:/a:bcfg2:bcfg2
 beagle;cpe:/a:beagle:beagle
@@ -107,6 +111,7 @@ 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
+bluez;cpe:/a:bluez_project:bluez
 bmv;cpe:/a:jan_kybic:bitmap_viewer
 bnc;cpe:/a:bnc:bnc
 boa;cpe:/a:boa:boa
@@ -115,12 +120,14 @@ bogofilter;cpe:/a:bogofilter:bogofilter
 boinc;cpe:/a:berkeley:boinc_client
 bomberclone;cpe:/a:bomberclone:bomberclone
 boost;cpe:/a:boost:boost
+botan1.10;cpe:/a:botan_project:botan
 bouncycastle;cpe:/a:bouncycastle:bouncy-castle-crypto-package
 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
+btsync;cpe:/a:bittorrent:sync
 bugzilla;cpe:/a:mozilla:bugzilla
 buildbot;cpe:/a:buildbot:buildbot
 bulmages;cpe:/a:iglues:bulmages-servers
@@ -128,6 +135,7 @@ busybox;cpe:/a:rob_landley:busybox
 byacc;cpe:/a:yacc:yacc
 bzflag;cpe:/a:bzflag:bzflag_server
 bzip2;cpe:/a:bzip:bzip2
+c-ares;cpe:/a:c-ares_project:c-ares
 cabextract;cpe:/a:cabextract:cabextract
 cacti;cpe:/a:cacti:cacti
 cadaver;cpe:/a:cadaver:cadaver_webdav_client
@@ -145,15 +153,19 @@ cedet;cpe:/a:eric_m_ludlam:cedet
 celery;cpe:/a:celeryproject:celery
 centericq;cpe:/a:centericq:centericq
 centerim;cpe:/a:centerim:centerim
+ceph-deploy;cpe:/a:ceph:ceph-deploy
+ceph;cpe:/a:ceph_project:ceph
 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
+charybdis;cpe:/a:charybdis_project:charybdis
 chasen;cpe:/a:nara_institute_of_science_and_technology:chasen
 chbg;cpe:/a:chbg:chbg
 checkinstall;cpe:/a:checkinstall:checkinstall
+checkpw;cpe:/a:checkpw_project:checkpw
 cheesetracker;cpe:/a:cheese_tracker:cheese_tracker
 cheetah;cpe:/a:tavis_rudd:cheetah
 cherokee;cpe:/a:cherokee-project:cherokee
@@ -246,11 +258,13 @@ dillo;cpe:/a:dillo:dillo
 dircproxy;cpe:/a:dircproxy:dircproxy
 dist;cpe:/a:manoj_srivastava:dist
 distcc;cpe:/a:distcc:distcc
+django-markupfield;cpe:/a:django-markupfield_project:django-markupfield
 djbdns;cpe:/a:d.j.bernstein:djbdns
 dkim-milter;cpe:/a:dkim:dkim-milter
 dns2tcp;cpe:/a:hsc:dns2tcp
 dnsmasq;cpe:/a:thekelleys:dnsmasq
 dnssec-tools;cpe:/a:dnssec-tools:dnssec-tools
+docker.io;cpe:/a:docker:docker
 doctrine;cpe:/a:doctrine-project:doctrine
 docvert;cpe:/a:holloway:docvert
 dojo;cpe:/a:dojotoolkit:dojo
@@ -258,6 +272,8 @@ dokuwiki;cpe:/a:dokuwiki:dokuwiki
 dolibarr;cpe:/a:dolibarr:dolibarr
 dopewars;cpe:/a:ben_webb:dopewars
 dosbox;cpe:/a:dosbox:dosbox
+dosfstools;cpe:/a:dosfstools_project:dosfstools
+dotclear;cpe:/a:dotclear:dotclear
 dovecot;cpe:/a:dovecot:dovecot
 dpkg-cross;cpe:/a:debian:dpkg-cross
 dpkg;cpe:/a:debian:dpkg
@@ -270,11 +286,14 @@ drupal6-mod-cck;cpe:/a:yves_chedemois:cck
 drupal6-mod-views;cpe:/a:earl_miles:views
 drupal6;cpe:/a:drupal:drupal
 drupal7;cpe:/a:drupal:drupal
+drupal8;cpe:/a:drupal:drupal
 drupal;cpe:/a:drupal:drupal
 dstat;cpe:/a:dag.wieers:dstat
 dtc;cpe:/a:gplhost:dtc-common
+dulwich;cpe:/a:dulwich_project:dulwich
 duplicity;cpe:/a:duplicity:duplicity
 dvipng;cpe:/a:jan-ake_larsson:dvipng
+dwarfutils;cpe:/a:libdwarf_project:libdwarf
 e2fsprogs;cpe:/a:ext2_filesystems_utilities:e2fsprogs
 eaccelerator-src;cpe:/a:eaccelerator:eaccelerator
 ecartis;cpe:/a:ecartis:ecartis
@@ -287,6 +306,7 @@ egroupware;cpe:/a:egroupware:egroupware
 ejabberd;cpe:/a:process-one:ejabberd
 ekg;cpe:/a:ekg:ekg
 ekiga;cpe:/a:ekiga:ekiga
+elasticsearch;cpe:/a:elasticsearch:elasticsearch
 electricsheep;cpe:/a:scott_draves:electric_sheep
 elgg;cpe:/a:curveriderhq:elgg
 elinks;cpe:/a:elinks:elinks
@@ -325,10 +345,12 @@ exim4;cpe:/a:exim:exim
 exim;cpe:/a:exim:exim
 exiv2;cpe:/a:exiv2:exiv2
 expat;cpe:/a:james_clark:expat
+extplorer;cpe:/a:extplorer:extplorer).
 ez-ipupdate;cpe:/a:angus_mackay:ez-ipupdate
 ezpublish;cpe:/a:ez:ez_publish
 faad2;cpe:/a:audiocoding:faad2
 fabric;cpe:/a:fabfile:fabric
+facter;cpe:/a:puppetlabs:facter
 fai;cpe:/a:thomas_lange:fully_automated_installation
 fail2ban;cpe:/a:fail2ban:fail2ban
 faqomatic;cpe:/a:faq-o-matic:faq-o-matic
@@ -345,6 +367,7 @@ fetchmail;cpe:/a:eric_raymond:fetchmail
 fex;cpe:/a:ulli_horlacher:fex
 ffmpeg-debian;cpe:/a:ffmpeg:ffmpeg
 ffmpeg;cpe:/a:ffmpeg:ffmpeg
+file-roller;cpe:/a:paolo_bacchilega:file_roller
 file;cpe:/a:christos_zoulas:file
 filezilla;cpe:/a:filezilla:filezilla
 filter;cpe:/a:bolthole:filter
@@ -370,10 +393,13 @@ 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
+foreman;cpe:/a:theforeman:foreman
 foswiki;cpe:/a:foswiki:foswiki
 fprobe;cpe:/a:slava_astashonok:fprobe
 freebsd-sendpr;cpe:/a:freebsd:freebsd-sendpr
 freeciv;cpe:/a:freeciv:freeciv
+freeimage;cpe:/a:freeimage_project:freeimage
+freeipa;cpe:/a:freeipa:freeipa
 freenet6;cpe:/a:freenet6:freenet6
 freepbx;cpe:/a:freepbx:freepbx
 freeradius;cpe:/a:freeradius:freeradius
@@ -383,6 +409,7 @@ freevo;cpe:/a:duncan_webb:freevo
 frox;cpe:/a:frox:frox
 fsp;cpe:/a:debian:fsp
 fuse;cpe:/a:fuse:fuse
+fusionforge;cpe:/a:fusionforge:fusionforge
 fvwm;cpe:/a:fvwm:fvwm
 fwbuilder;cpe:/a:fwbuilder:firewall_builder
 gaim-encryption;cpe:/a:gaim-encryption:gaim-encryption
@@ -395,6 +422,7 @@ ganeti;cpe:/a:roman_marxer:ganeti
 ganglia-monitor-core;cpe:/a:ganglia:ganglia
 gatos;cpe:/a:gatos:gatos
 gauche;cpe:/a:gauche:gauche
+gcab;cpe:/a:gnome:gcab
 gcc-3.4;cpe:/a:gnu:gcc
 gcc-4.1;cpe:/a:gnu:gcc
 gcc-4.3;cpe:/a:gnu:gcc
@@ -421,7 +449,9 @@ giflib;cpe:/a:libungif:libungif
 gimp;cpe:/a:gimp:gimp
 git-core;cpe:/a:git:git
 git;cpe:/a:git:git
+gitlab;cpe:/a:gitlab:gitlab
 gitolite;cpe:/a:sitaram_chamarty:gitolite
+glance;cpe:/a:openstack:glance
 glassfish;cpe:/a:oracle:sun_glassfish_enterprise_server
 glib2.0;cpe:/a:gnome:glib
 glibc;cpe:/a:gnu:glibc
@@ -454,6 +484,7 @@ gnutls13;cpe:/a:gnu:gnutls
 gnutls26;cpe:/a:gnu:gnutls
 gnutls28;cpe:/a:gnu:gnutls
 gocr;cpe:/a:gocr:optical_character_recognition_utility
+golang-github-appc-docker2aci;cpe:/a:docker2aci_project:docker2aci
 gopher;cpe:/a:university_of_minnesota:gopher
 gosa;cpe:/a:gonicus:gonicus_system_administration
 gpdf;cpe:/a:gnome:gpdf
@@ -470,6 +501,7 @@ 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-bad0.10;cpe:/a:gstreamer:gstreamer
 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
@@ -481,13 +513,16 @@ gv;cpe:/a:gnu:gv
 gwt;cpe:/a:google:web_toolkit
 gxine;cpe:/a:xine:gxine
 gzip;cpe:/a:gnu:gzip
+hadoop;cpe:/a:apache:hadoop
 hammerhead;cpe:/a:geoff_wong:hammerhead
+haproxy;cpe:/a:haproxy:haproxy
 hashcach;cpe:/a:hashcash:hashcash
 hashcash;cpe:/a:hashcash:hashcash
 hastymail;cpe:/a:hastymail:hastymail2
 havp;cpe:/a:havp:havp
 heartbeat-2;cpe:/a:high_availability_linux_project:heartbeat
 heartbeat;cpe:/a:linux-ha:heartbeat
+heat;cpe:/a:openstack:heat
 heimdal;cpe:/a:heimdal:heimdal
 helix-player;cpe:/a:realnetworks:helix_player
 henplus;cpe:/a:henner_zeller:henplus
@@ -497,6 +532,7 @@ hipo;cpe:/a:pedro_villavicencio_garrido:hipo
 honeyd;cpe:/a:niels_provos:honeyd
 horde2;cpe:/a:horde:horde
 horde3;cpe:/a:horde:horde
+horizon;cpe:/a:openstack:horizon
 hostapd;cpe:/a:hostapd:hostapd
 hplip;cpe:/a:hp:linux_imaging_and_printing_project
 hpsockd;cpe:/a:hp:sockd
@@ -563,22 +599,28 @@ isoqlog;cpe:/a:enderunix:isoqlog
 jabber;cpe:/a:jabber_software_foundation:jabber_server
 jabberd14;cpe:/a:jabberd:jabberd14
 jabberd2;cpe:/a:jabberstudio:jabberd
+jackrabbit;cpe:/a:apache:jackrabbit
 jailer;cpe:/a:javier_fernandez:jailer
+jakarta-taglibs-standard;cpe:/a:apache:standard_taglibs
 jasper;cpe:/a:jasper_project:jasper
 jbossas4;cpe:/a:redhat:jboss_enterprise_application_platform
 jbosseam;cpe:/a:jboss:seam
 jenkins;cpe:/a:cloudbees:jenkins
+jetty8;cpe:/a:eclipse:jetty
 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
+joomla;cpe:/a:joomla:joomla%21
 jquery;cpe:/a:jquery:jquery
 jruby;cpe:/a:jruby:jruby
 jsboard;cpe:/a:jsboard:jsboard
 jspwiki;cpe:/a:jspwiki:jspwiki
 junkbuster;cpe:/a:junkbuster:internet_junkbuster
 kaffeine;cpe:/a:kaffeine:kaffeine_player
+kallithea;cpe:/a:kallithea:kallithea
+karchive;cpe:/a:kde:karchives
 kaya;cpe:/a:kayalang:kaya
 kde4libs;cpe:/o:kde:kdelibs
 kdebase;cpe:/o:kde:kde
@@ -599,14 +641,20 @@ 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
+keystone;cpe:/a:openstack:keystone
+kfreebsd-10;cpe:/o:freebsd:freebsd
+kfreebsd-11;cpe:/o:freebsd:freebsd
 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-9;cpe:/o:freebsd:freebsd
 kfreebsd-source;cpe:/o:freebsd:freebsd
 kfreebsd5-source;cpe:/o:freebsd:freebsd
+kgb;cpe:/a:kgb_project:kgb
 kile;cpe:/a:kile:kile
 kismet;cpe:/a:kismet:kismet
+kiwix;cpe:/a:kiwix:kiwix
 knowledgetree;cpe:/a:jam_warehouse:knowledgetree_open_source
 koffice;cpe:/a:kde:koffice
 koha;cpe:/a:koha:koha
@@ -677,6 +725,8 @@ libconvert-uulib-perl;cpe:/a:perl:convert_uulib
 libcrypt-cbc-perl;cpe:/a:lincoln_d._stein:crypt_cbc
 libcrypt-dsa-perl;cpe:/a:adam_kennedy:crypt-dsa
 libcrypt-openssl-dsa-perl;cpe:/a:perl-openssl:libcrypt-openssl-dsa-perl
+libcrypto++;cpe:/a:cryptopp:crypto%2b%2b
+libcsp;cpe:/a:libcsp_project:libcsp
 libdigest-perl;cpe:/a:gisle_aas:digest
 libdumb;cpe:/a:dynamic_universal_music_bibliotheque:dumb
 libencode-perl;cpe:/a:dan_kogai:encode_module
@@ -700,8 +750,10 @@ libhtml-parser-perl;cpe:/a:derrick_oswald:html-parser
 libhtml-template-pro-perl;cpe:/a:igor_vlasenko:html-template-pro
 libhx;cpe:/a:jan_engelhardt:libhx
 libid3tag;cpe:/a:media-libs:libid3tag
+libidn;cpe:/a:gnu:libidn
 libimager-perl;cpe:/a:imager:imager
 libio-socket-ssl-perl;cpe:/a:io-socket-ssl:io-socket-ssl
+libjbcrypt-java;cpe:/a:mindrot:jbcrypt
 libjfreechart-java;cpe:/o:jfree:jfreechart
 libksba;cpe:/a:libksba_library:libksba_library
 libmikmod;cpe:/a:raphael_assenat:libmikmod
@@ -729,6 +781,7 @@ 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
+libpng1.6;cpe:/a:libpng:libpng
 libpng3;cpe:/a:libpng:libpng
 libpng;cpe:/a:libpng:libpng
 libreoffice;cpe:/a:libreoffice:libreoffice
@@ -741,9 +794,11 @@ 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
+libspring-java;cpe:/a:pivotal_software: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-6;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
@@ -751,6 +806,7 @@ libtorrent-rasterbar;cpe:/a:rasterbar_software:libtorrent
 libtunepimp;cpe:/a:libtunepimp:libtunepimp
 libungif4;cpe:/a:libungif:libungif
 libuser;cpe:/a:miloslav_trmac:libuser
+libuv;cpe:/a:libuv_project:libuv
 libv8;cpe:/a:google:v8
 libvc;cpe:/a:andrew_hsu:libvc
 libvirt;cpe:/a:libvirt:libvirt
@@ -762,10 +818,16 @@ 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
+libxfixes;cpe:/a:x.org:libxfixes
 libxfont;cpe:/a:x.org:libxfont
+libxi;cpe:/a:x.org:libxi
 libxml2;cpe:/a:xmlsoft:libxml2
 libxml;cpe:/a:xmlsoft:libxml
+libxrandr;cpe:/a:x.org:libxrandr
+libxrender;cpe:/a:x.org:libxrender
 libxslt;cpe:/a:xmlsoft:libxslt
+libxtst;cpe:/a:x.org:libxtst
+libxvmc;cpe:/a:x.org:libxvmc
 licq;cpe:/a:licq:licq
 liferay-portal;cpe:/a:liferay:portal
 liferea;cpe:/a:liferea:liferea
@@ -782,6 +844,7 @@ linux-2.6;cpe:/o:linux:kernel
 linux-ftpd-ssl;cpe:/a:linux-ftpd-ssl:linux-ftpd-ssl
 linux-ftpd;cpe:/a:ftpd:ftpd
 linux-patch-grsecurity2;cpe:/a:grsecurity:grsecurity_kernel_patch
+linux;cpe:/o:linux:linux_kernel
 linuxdcpp;cpe:/a:linux:direct_connect
 linuxtrade;cpe:/a:linuxtrade:linuxtrade
 liquidsoap;cpe:/a:savonet:liguidsoap
@@ -804,6 +867,7 @@ 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
+lxc;cpe:/a:linuxcontainers:lxc
 lxr-cvs;cpe:/a:malcom_box:lxr_cross_referencer
 lxr;cpe:/a:malcom_box:lxr_cross_referencer
 lynx-cur;cpe:/a:lynx:lynx
@@ -811,6 +875,7 @@ lynx-ssl;cpe:/a:university_of_kansas:lynx
 lynx;cpe:/a:lynx:lynx
 m2crypto;cpe:/a:heikkitoivonen:m2crypto
 m4;cpe:/a:gnu:m4
+mactelnet;cpe:/a:mac-telnet_project:mac-telnet
 madwifi;cpe:/a:madwifi:madwifi
 mafft;cpe:/a:align.bmr.kyushu-u.ac:mafft
 magics++;cpe:/a:ecmwf:magics%2B%2B
@@ -868,11 +933,13 @@ 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
+mod-gnutls;cpe:/a:apache:mod-gnutls
 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
+mongodb;cpe:/a:mongodb:mongodb
 mongrel;cpe:/a:mongrel:mongrel
 monit;cpe:/a:tildeslash:monit
 moniwiki;cpe:/a:moniwiki:moniwiki
@@ -899,12 +966,16 @@ 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
+mupdf;cpe:/a:artifex:mupdf
 mutt;cpe:/a:mutt:mutt
 muttprint;cpe:/a:lukas_ruf:muttprint
 mydms;cpe:/a:letodms:letodms
 mydns;cpe:/a:don_moore:mydns
 myspell;cpe:/a:debian:myspell
 mysql-5.1;cpe:/a:mysql:mysql
+mysql-5.5;cpe:/a:oracle:mysql
+mysql-5.6;cpe:/a:oracle:mysql
+mysql-5.7;cpe:/a:oracle: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
@@ -945,11 +1016,13 @@ netperf;cpe:/a:netperf:netperf
 netrik;cpe:/a:netrik:netrik
 network-manager-applet;cpe:/a:gnome:networkmanager
 network-manager;cpe:/a:gnome:networkmanager
+neutron;cpe:/a:openstack:neutron
 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
+nextcloud;cpe:/a:nextcloud:nextcloud
 nexuiz;cpe:/a:alientrap:nexuiz
 nfs-utils;cpe:/a:nfs:nfs-utils
 nginx;cpe:/a:nginx:nginx
@@ -957,6 +1030,7 @@ ngircd;cpe:/a:ngircd:ngircd
 nikto;cpe:/a:nikto:nikto
 nilfs2-tools;cpe:/a:nilf:nilfs
 no-ip;cpe:/a:no-ip:no-ip2
+nodejs;cpe:/a:nodejs:node.js
 nordugrid-arc-nox;cpe:/a:nordugrid:nordugrid-arc
 nova;cpe:/a:openstack:nova
 noweb;cpe:/a:norman_ramsey:noweb
@@ -972,6 +1046,7 @@ 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-legacy-304xx;cpe:/a:nvidia:gpu_driver
 nvidia-graphics-drivers;cpe:/a:nvidia:binary_graphics_driver
 nvidia-kernel-common;cpe:/a:nvidia:video_driver
 ocaml;cpe:/a:inria:ocaml
@@ -994,6 +1069,8 @@ opendchub;cpe:/a:roshan_singh:open_direct_connect_hub
 openexr;cpe:/a:openexr:openexr
 openjdk-6;cpe:/a:sun:openjdk
 openjdk-7;cpe:/a:sun:openjdk
+openjdk-8;cpe:/a:sun:openjdk
+openjpeg2;cpe:/a:openjpeg:openjpeg
 openldap2.2;cpe:/a:openldap:openldap
 openldap2.3;cpe:/a:openldap:openldap
 openldap2;cpe:/a:openldap:openldap
@@ -1030,6 +1107,7 @@ otrs;cpe:/a:otrs:otrs
 overkill;cpe:/a:overkill:overkill
 owl-dms;cpe:/a:owl:intranet_knowledgebase
 owl;cpe:/a:ktools:owl
+owncloud;cpe:/a:owncloud:owncloud
 p3nfs;cpe:/a:koeniglich:p3nfs
 p7zip;cpe:/a:7-zip:7-zip
 pam-mysql;cpe:/a:pam-mysql:pam-mysql
@@ -1039,7 +1117,9 @@ pan;cpe:/a:pan:pan
 pango1.0;cpe:/a:pango:pango
 paramiko;cpe:/a:python_software_foundation:paramiko
 paste;cpe:/a:pythonpaste:paste
+patch;cpe:/a:gnu:patch
 pavuk;cpe:/a:pavuk:pavuk
+pax;cpe:/a:pax_project:pax
 pcal;cpe:/a:pcal:pcal
 pcre3;cpe:/a:pcre:pcre
 pcsc-lite;cpe:/a:muscle:pcsc-lite
@@ -1062,6 +1142,8 @@ php-xajax;cpe:/a:xajax:xajax
 php3;cpe:/a:php:php
 php4;cpe:/a:php:php
 php5;cpe:/a:php:php
+php6;cpe:/a:php:php
+php7.0;cpe:/a:php:php
 phpbb2;cpe:/a:phpbb:phpbb
 phpbb3;cpe:/a:phpbb:phpbb
 phpgedview;cpe:/a:phpgedview:phpgedview
@@ -1076,8 +1158,10 @@ phpsysinfo;cpe:/a:phpsysinfo:phpsysinfo
 phpwiki;cpe:/a:phpwiki:phpwiki
 picasm;cpe:/a:timo_rossi:picasm
 pidgin;cpe:/a:pidgin:pidgin
+pigz;cpe:/a:zlib:pigz
 pike7.2;cpe:/a:pike:pike
 pike7.6;cpe:/a:pike:pike
+pillow;cpe:/a:python:pillow
 pilot-qof;cpe:/a:pilot-qof:datafreedom-perl
 pimd;cpe:/a:troglobit:pimd
 pinball;cpe:/a:jochen_friedrich:pinball
@@ -1099,6 +1183,7 @@ pmake;cpe:/a:ihji:pmake
 pmount;cpe:/a:vincent_fourmond:pmount
 pmwiki;cpe:/a:pmwiki:pmwiki
 po4a;cpe:/a:po4a:po4a
+polarssl;cpe:/a:polarssl:polarssl
 policyd-weight;cpe:/a:policyd-weight:policyd-weight
 policykit-1;cpe:/a:freedesktop:policykit
 policykit;cpe:/a:freedesktop:policykit
@@ -1116,6 +1201,9 @@ 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-9.1;cpe:/a:postgresql:postgresql
+postgresql-9.4;cpe:/a:postgresql:postgresql
+postgresql-9.5;cpe:/a:postgresql:postgresql
 postgresql-ocaml;cpe:/a:ocaml:postgresql-ocaml
 postgresql;cpe:/a:postgresql:postgresql
 postgrey;cpe:/a:postgrey:postgrey
@@ -1126,6 +1214,7 @@ 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
+privoxy;cpe:/a:privoxy:privoxy
 proftpd-dfsg;cpe:/a:proftpd:proftpd
 proftpd;cpe:/a:proftpd:proftpd
 projectl;cpe:/a:debian:projectl
@@ -1135,6 +1224,7 @@ prozilla;cpe:/a:prozilla:prozilla_download_accelerator
 psi;cpe:/a:psi-im:psi
 pstotext;cpe:/a:pstotext:pstotext
 pulseaudio;cpe:/a:pulseaudio:pulseaudio
+puppet-module-puppetlabs-stdlib;cpe:/a:puppetlabs:stdlib
 puppet;cpe:/a:puppet:puppet
 pure-ftpd;cpe:/a:pureftpd:pureftpd
 putty;cpe:/a:putty:putty
@@ -1161,6 +1251,9 @@ python2.7;cpe:/a:python:python
 python2.8;cpe:/a:python:python
 python3.1;cpe:/a:python:python
 python3.2;cpe:/a:python:python
+python3.3;cpe:/a:python:python
+python3.4;cpe:/a:python:python
+python3.5;cpe:/a:python:python
 pywebdav;cpe:/a:simon_pamies:pywebdav
 qdbm;cpe:/a:qdbm:qdbm
 qemu-kvm;cpe:/a:kvm_qumranet:kvm
@@ -1168,10 +1261,12 @@ qemu;cpe:/a:qemu:qemu
 qgit;cpe:/a:qgit:qgit
 qmail;cpe:/a:dan_bernstein:qmail
 qmailadmin;cpe:/a:inter7:qmailadmin
+qpid-cpp;cpe:/a:apache:qpid
 qpopper;cpe:/a:qualcomm:qpopper
 qt-copy;cpe:/a:nokia:qt
 qt-x11-free;cpe:/a:nokia:qt
 qt4-x11;cpe:/a:nokia:qt
+qtbase-opensource-src;cpe:/a:digia:qt
 qtcreator;cpe:/a:nokia:qt_creator
 quagga;cpe:/a:quagga:quagga_routing_software_suite
 quake2;cpe:/a:id_software:quake_ii_server
@@ -1195,6 +1290,7 @@ 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
+request-tracker4;cpe:/a:bestpractical:rt
 resmgr;cpe:/a:resmgr:resmgrd
 rhapsody;cpe:/a:rhapsody_irc:rhapsody_irc
 rhythmbox;cpe:/a:gnome:rhythmbox
@@ -1218,6 +1314,8 @@ 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
+ruby2.1;cpe:/a:ruby-lang:ruby
+ruby2.2;cpe:/a:ruby-lang:ruby
 ruby;cpe:/a:ruby-lang:ruby
 runit;cpe:/a:runit:runit
 rxvt-unicode;cpe:/a:marc_lehmann:rxvt-unicode
@@ -1238,6 +1336,7 @@ scratchbox2;cpe:/a:freedesktop:scratchbox2
 screen;cpe:/a:gnu:screen
 screenie;cpe:/a:marc_gloor:screenie
 sdd;cpe:/a:jorg_schilling:sdd
+sddm;cpe:/a:sddm_project:sddm
 sdl-image1.2;cpe:/a:sdl:sdl_image
 sdm;cpe:/a:jonas_smedegaard:sdm-terminal
 secondlife-client;cpe:/a:linden_lab:second_life
@@ -1248,6 +1347,7 @@ shadow;cpe:/a:debian:shadow
 sharutils;cpe:/a:gnu:sharutils
 shibboleth-sp2;cpe:/a:internet2:shibboleth-sp
 shibboleth-sp;cpe:/a:internet2:shibboleth-sp
+shiro;cpe:/a:apache:shiro
 shorewall;cpe:/a:shorewall:shorewall
 shtool;cpe:/a:shtool:shtool
 silc-client;cpe:/a:silc:silc_client
@@ -1292,6 +1392,7 @@ spip;cpe:/a:spip:spip
 splitvt;cpe:/a:sam_lantinga:splitvt
 spread;cpe:/a:canonical:spread
 sql-ledger;cpe:/a:sql-ledger:sql-ledger
+sqlite3;cpe:/a:sqlite:sqlite
 squid3;cpe:/a:squid-cache:squid
 squid;cpe:/a:squid-cache:squid
 squidguard;cpe:/a:squidguard:squidguard
@@ -1312,6 +1413,7 @@ sun-java6;cpe:/a:sun:jdk
 sup;cpe:/a:sup:sup
 super;cpe:/a:william_deich:super
 suphp;cpe:/a:sebastian_marsching:suphp
+suricata;cpe:/a:openinfosecfoundation:suricata
 swfdec0.5;cpe:/a:swfdec:swfdec
 swfdec0.6;cpe:/a:swfdec:swfdec
 swftools;cpe:/a:swftools:swftools
@@ -1325,12 +1427,14 @@ synfig;cpe:/a:synfig:synfigstudio
 syslog-ng;cpe:/a:balabit:syslog-ng
 sysstat;cpe:/a:sysstat:sysstat
 system-config-printer;cpe:/a:redhat:system-config-printer
+systemd;cpe:/a:systemd_project:systemd
 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
+tardiff;cpe:/a:tardiff_project:tardiff
 tau;cpe:/a:uoregon:tau
 tcc;cpe:/a:fabrice_bellard:tiny_c_compiler
 tcl8.3;cpe:/a:tcl_tk:tcl_tk
@@ -1380,6 +1484,8 @@ tomcat5.5;cpe:/a:apache:tomcat
 tomcat5;cpe:/a:apache:tomcat
 tomcat6;cpe:/a:apache:tomcat
 tomcat7;cpe:/a:apache:tomcat
+tomcat8;cpe:/a:apache:tomcat
+tomcat9;cpe:/a:apache:tomcat
 toolchain-source;cpe:/a:debian:toolchain-source
 tor;cpe:/a:tor:tor
 torcs;cpe:/a:bernhard_wymann:torcs
@@ -1396,6 +1502,7 @@ tremulous;cpe:/a:tremulous:tremulous
 trickle;cpe:/a:monkey:trickle
 tripwire;cpe:/a:tripwire:tripwire
 trr19;cpe:/a:yamamoto_hirotaka:trr19
+tryton-server;cpe:/a:tryton:trytond
 tsclient;cpe:/a:erick_woods:terminal_server_client
 tss;cpe:/a:debian:tss
 tunapie;cpe:/a:james_stone:tunapie
@@ -1414,6 +1521,7 @@ typo;cpe:/a:typosphere:typo
 ucd-snmp;cpe:/a:net-snmp:net-snmp
 udev;cpe:/a:kernel:udev
 udisks;cpe:/a:freedesktop:udisks
+ufraw;cpe:/a:dcraw_project:dcraw
 uim;cpe:/a:uim:uim
 uml-utilities;cpe:/a:uml-utilities:uml-utilities
 unace;cpe:/a:e-merge:unace
@@ -1458,6 +1566,7 @@ vte;cpe:/a:nalin_dahyabhai:vte
 w3c-libwww;cpe:/a:w3c:libwww
 w3m;cpe:/a:w3m:w3m
 wafp;cpe:/a:mytty:webapplication_finger_printer
+watchdog;cpe:/a:das_watchdog_project:das_watchdog
 webauth;cpe:/a:stanford:webauth
 webcalendar;cpe:/a:k5n:webcalendar
 webcheck;cpe:/a:webcheck:webcheck
@@ -1466,11 +1575,15 @@ webgui;cpe:/a:plainblack:webgui
 webkit;cpe:/a:webkit:webkit
 webkitkde;cpe:/a:urs_wolfer:kwebkitpart
 webmin;cpe:/a:webmin:webmin
+webodf;cpe:/a:kogmbh:webodf
 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-1.10;cpe:/a:wesnoth:battle_for_wesnoth
+wesnoth-1.12;cpe:/a:wesnoth:battle_for_wesnoth
+wesnoth-1.8;cpe:/a:wesnoth:battle_for_wesnoth
 wesnoth;cpe:/a:wesnoth:wesnoth
 wget;cpe:/a:gnu:wget
 whitedune;cpe:/a:white_dune:white_dune
@@ -1485,6 +1598,7 @@ wordnet;cpe:/a:wordnet:wordnet
 wordpress-mu;cpe:/a:wordpress:wordpress_mu
 wordpress;cpe:/a:wordpress:wordpress
 wpasupplicant;cpe:/a:wpa_supplicant:wpa_supplicant
+wss4j;cpe:/a:apache:wss4j
 wu-ftpd;cpe:/a:washington_university:wu-ftpd
 wv2;cpe:/a:wvware:wv2
 wv;cpe:/a:wvware:wvware
@@ -1508,6 +1622,7 @@ xen-3.0;cpe:/a:xensource:xen
 xen-3;cpe:/a:xensource:xen
 xen-unstable;cpe:/a:xensource:xen
 xen;cpe:/a:xensource:xen
+xerces-c;cpe:/a:apache:xerces-c
 xfce4-terminal;cpe:/a:os-cillation:xfce_terminal
 xfig;cpe:/a:xfig:xfig
 xfree86;cpe:/a:x:x11
@@ -1555,6 +1670,7 @@ yiff;cpe:/a:raphael_bossek:yiff_server
 yui;cpe:/a:yahoo:yui
 zabbix;cpe:/a:zabbix:zabbix
 zaptel;cpe:/a:asterisk:zaptel
+zarafa;cpe:/a:zarafa:zarafa_collaboration_platform
 zenoss;cpe:/a:zenoss:zenoss
 zgv;cpe:/a:zgv:zgv_image_viewer
 zhcon;cpe:/a:ejoy_and_hu_yong:zhcon
-- 
cgit v1.2.3