More mappings after comparing with NVE.

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

1 files changed, 133 insertions, 133 deletions

diff --git a/data/CPE/list b/data/CPE/list
index 3d3203dcbb..cea9f7229d 100644
--- a/data/CPE/list
+++ b/data/CPE/list
@@ -3,17 +3,17 @@ acl
 acon
 acpid
 activeldap
-adns
+adns;cpe:/a:gnu:adns
 advi
 aegis
-afuse
+afuse;cpe:/a:afuse:afuse
 ajaxterm
 alien-arena
 alpine
 am-utils
-amarok
+amarok;cpe:/a:amarok:amarok
 amaya
-ampache
+ampache;cpe:/a:ampache:ampache
 amsn;cpe:/a:alvaro:alvaros_messenger
 amule
 aolserver4
@@ -25,7 +25,7 @@ apr
 apr-util;cpe:/a:apache:apr-util
 apt
 apt-listchanges
-aptlinex
+aptlinex;cpe:/a:debian:aptlinex
 aptoncd
 arb
 ardour
@@ -33,13 +33,13 @@ argyll
 aria2;cpe:/a:tatsuhiro_tsujikawa:aria2
 arora
 arts
-asterisk-addons
+asterisk-addons;cpe:/a:asterisk:asterisk-addons
 asterisk;cpe:/a:digium:asterisk
 atmailopen
 audacity
 audiofile
 audiolink
-audit
+audit;cpe:/a:linux:audit
 auth2db
 automake1.10;cpe:/a:gnu:automake
 automake1.7;cpe:/a:gnu:automake
@@ -47,10 +47,10 @@ automake1.9;cpe:/a:gnu:automake
 automake;cpe:/a:gnu:automake
 avahi;cpe:/a:avahi:avahi
 aview
-awstats
+awstats;cpe:/a:awstats:awstats
 axis
 axis2c;cpe:/a:apache:axis2
-axyl
+axyl;cpe:/a:axyl:axyl
 ayttm
 babel
 backintime
@@ -67,12 +67,12 @@ bind9;cpe:/a:isc:bind
 bind;cpe:/a:isc:bind
 binutils
 bip
-bitlbee
+bitlbee;cpe:/a:bitlbee:bitlbee
 bk2site
 blender
-blosxom
-bluez-libs
-bluez-utils
+blosxom;cpe:/a:blosxom:blosxom
+bluez-libs;cpe:/a:bluez:bluez_libs
+bluez-utils;cpe:/a:bluez:bluez_utils
 boa
 bochs
 bogofilter
@@ -95,16 +95,16 @@ cairo
 cakephp
 camlimages
 camserv
-caudium
-cbrpager
+caudium;cpe:/a:caudium:caudium
+cbrpager;cpe:/a:jcoppens:cbrpager
 ccid
 cdcontrol
 cdrw-taper
-cecilia
-centerim
-cgiwrap
+cecilia;cpe:/a:cecilia:cecilia
+centerim;cpe:/a:centerim:centerim
+cgiwrap;cpe:/a:nathan_neulinger:cgiwrap
 changetrack
-checkinstall
+checkinstall;cpe:/a:checkinstall:checkinstall
 cherokee
 cherrypy3
 chm2pdf
@@ -121,13 +121,13 @@ cobbler;cpe:/a:michael_dehaan:cobbler
 coccinelle
 coin3
 collectd
-comix
+comix;cpe:/a:comix:comix
 compiz-fusion-plugins-main
-condor
+condor;cpe:/a:condor_project:condor
 convirt
-coreutils
+coreutils;cpe:/a:gnu:coreutils
 couchdb;cpe:/a:apache:couchdb
-courier-authlib
+courier-authlib;cpe:/a:courier-mta:courtier-authlib
 cowbell
 cpio;cpe:/a:gnu:cpio
 crip
@@ -140,7 +140,7 @@ ctorrent
 cups;cpe:/a:cups:cups
 cupsys;cpe:/a:cups:cups
 curl;cpe:/a:curl:libcurl
-cuteflow
+cuteflow;cpe:/a:cuteflow-bin:cuteflow_bin
 cvs
 cvsnt;cpe:/a:march-hare:cvsnt
 cyrus-imapd-2.2
@@ -161,10 +161,10 @@ dia
 digitaldj
 dillo
 dist
-djbdns
+djbdns;cpe:/a:d.j.bernstein:djbdns
 dkim-milter
-dns2tcp
-dnsmasq
+dns2tcp;cpe:/a:hsc:dns2tcp
+dnsmasq;cpe:/a:thekelleys:dnsmasq
 dnspython
 dnssec-tools
 docvert
@@ -190,7 +190,7 @@ eaccelerator-src
 ebug-http
 eclipse
 ecryptfs-utils
-ed
+ed;cpe:/a:gnu:ed
 eggdrop
 eglibc
 egroupware;cpe:/a:egroupware:egroupware
@@ -203,15 +203,15 @@ emacs-jabber
 emacs21;cpe:/a:gnu:emacs
 emacs22;cpe:/a:gnu:emacs
 emacs23;cpe:/a:gnu:emacs
-emacspeak
+emacspeak;cpe:/a:emacspeak_inc:emacspeak
 ember
 emesene;cpe:/a:emesene:emesene
 encfs;cpe:/a:arg0:encfs
-enscript
+enscript;cpe:/a:gnu:enscript
 eog
 epiphany-browser
 erlang
-eterm
+eterm;cpe:/a:eterm:eterm
 ethereal
 eucalyptus
 evince;cpe:/a:redhat:evince
@@ -220,10 +220,10 @@ evolution-data-server
 ewiki
 exaile
 exim4;cpe:/a:exim:exim
-exiv2
+exiv2;cpe:/a:exiv2:exiv2
 expat
 ezpublish;cpe:/a:ez:ez_publish
-faad2
+faad2;cpe:/a:audiocoding:faad2
 fail2ban
 fastjar;cpe:/a:matthias_klose:fastjar
 fckeditor
@@ -234,13 +234,13 @@ fetchmail;cpe:/a:eric_raymond:fetchmail
 ffmpeg-debian;cpe:/a:ffmpeg:ffmpeg
 ffmpeg;cpe:/a:ffmpeg:ffmpeg
 file
-firebird2
-firebird2.0
-firebird2.1
+firebird2;cpe:/a:firebird:firebird
+firebird2.0;cpe:/a:firebird:firebird
+firebird2.1;cpe:/a:firebird:firebird
 firefox-sage
 firehol
 flamethrower
-flashplugin-nonfree
+flashplugin-nonfree;cpe:/a:adobe:flash_player
 flatpress
 flex;cpe:/a:will_estes:flex
 flyspray
@@ -256,9 +256,9 @@ freevo;cpe:/a:duncan_webb:freevo
 fuse;cpe:/a:fuse:fuse
 fwbuilder
 gaim;cpe:/a:rob_flynn:gaim
-gallery
-gallery2
-gallery3
+gallery;cpe:/a:menalto:gallery
+gallery2;cpe:/a:menalto:gallery
+gallery3;cpe:/a:menalto:gallery
 ganeti
 ganglia-monitor-core
 gcc-4.3;cpe:/a:gnu:gcc
@@ -281,7 +281,7 @@ ghostscript;cpe:/a:artifex:gpl_ghostscript
 gif2png
 gimp;cpe:/a:gimp:gimp
 git
-git-core
+git-core;cpe:/a:git:git
 gitolite
 glassfish
 glib2.0;cpe:/a:gnome:glib
@@ -291,7 +291,7 @@ gmanedit
 gmime2.2;cpe:/a:gnome:gmime
 gmime2.4;cpe:/a:gnome:gmime
 gnash;cpe:/a:gnu:gnash
-gnome-peercast
+gnome-peercast;cpe:/a:peercast:peercast
 gnome-power-manager
 gnome-screensaver;cpe:/a:gnome:screensaver
 gnome-shell
@@ -308,10 +308,10 @@ gnustep-base;cpe:/a:gnustep:gnustep_base
 gnutls13;cpe:/a:gnu:gnutls
 gnutls26;cpe:/a:gnu:gnutls
 gollem
-gpicview
+gpicview;cpe:/a:lxde:gpicview
 gpsdrive;cpe:/a:gpsdrive:gpsdrive
-graphicsmagick
-graphviz
+graphicsmagick;cpe:/a:graphicsmagick:graphicsmagick
+graphviz;cpe:/a:graphviz:graphviz
 grmonitor
 grub2;cpe:/a:gnu:grub_2
 grubcpe:/a:gnu:grub_legacy
@@ -327,25 +327,25 @@ gupnp
 gv;cpe:/a:gnu:gv
 gzip;cpe:/a:gnu:gzip
 hamlib
-havp
+havp;cpe:/a:havp:havp
 heartbeat
 heimdal
 henplus
 hercules
-hf
+hf;cpe:/a:hf:hf
 hipo
 hobix
 honeyd
 horde3;cpe:/a:horde:horde
-hplip
+hplip;cpe:/a:hp:linux_imaging_and_printing_project
 hsolink;cpe:/a:pharscape:hsolink
 htmldoc
 htop
-httrack
+httrack;cpe:/a:httrack:httrack
 hybserv;cpe:/a:dinko_korunic:hybserv2
 hypermail
 hypre
-ibackup
+ibackup;cpe:/a:gnu:ibackup
 iceape;cpe:/a:mozilla:seamonkey
 icedove;cpe:/a:mozilla:thunderbird
 iceweasel;cpe:/a:mozilla:firefox
@@ -354,15 +354,15 @@ ike
 ikiwiki;cpe:/a:ikiwiki:ikiwiki
 imagemagick;cpe:/a:imagemagick:imagemagick
 imlib
-imlib2
+imlib2;cpe:/a:carsten_haitzler:imlib2
 imp4;cpe:/a:horde:imp
 impose+
 incron
 ingo1
 initramfs-tools
 insighttoolkit
-inspircd
-interchange
+inspircd;cpe:/a:inspire_ircd:inspircd
+interchange;cpe:/a:interchange_development_group:interchange
 ipplan
 ipsec-tools
 iputils
@@ -375,7 +375,7 @@ isc-dhcp;cpe:/a:isc:dhcp
 iscsitarget;cpe:/a:iscsitarget:iscsitarget
 jags
 jailer
-jasper
+jasper;cpe:/a:jasper_project:jasper
 jbig2dec
 jbossas4
 jetty
@@ -415,7 +415,7 @@ lasso
 lastfm
 lazarus
 lcms;cpe:/a:littlecms:lcms
-ldm
+ldm;cpe:/a:ltsp:linux_terminal_server_project
 ldns
 lftp
 lib3ds;cpe:/a:jan_eric_krprianidis:lib3ds
@@ -438,7 +438,7 @@ libdbd-pg-perl
 libesmtp;cpe:/a:stafford.uklinux:libesmtp
 libexif
 libextractor
-libfishsound
+libfishsound;cpe:/a:xiph:libfishsound
 libfwbuilder
 libgadu
 libgd2;cpe:/a:libgd:gd_graphics_library
@@ -448,8 +448,8 @@ libgnucrypto-java
 libhtml-parser-perl
 libhtml-prototype-perl
 libhx;cpe:/a:jan_engelhardt:libhx
-libid3tag
-libimager-perl
+libid3tag;cpe:/a:media-libs:libid3tag
+libimager-perl;cpe:/a:imager:imager
 libio-socket-ssl-perl;cpe:/a:io-socket-ssl:io-socket-ssl
 libjson-ruby
 libmcrypt
@@ -475,9 +475,9 @@ libsdp
 libsmi
 libsndfile
 libsoup
-libspf2
+libspf2;cpe:/a:libspf:libspf2
 libspring-2.5-java;cpe:/a:springsource:spring_framework
-libstruts1.2-java
+libstruts1.2-java;cpe:/a:apache:struts
 libthai
 libtheora
 libtk-img
@@ -487,7 +487,7 @@ libtunepimp
 libuser;cpe:/a:miloslav_trmac:libuser
 libv8
 libvirt;cpe:/a:libvirt:libvirt
-libvorbis
+libvorbis;cpe:/a:xiph.org:libvorbis
 libvpx
 libwmf
 libwordpress-xmlrpc-perl
@@ -496,26 +496,26 @@ libxcrypt
 libxerces2-java
 libxfont
 libxml
-libxml2
-libxslt
-licq
+libxml2;cpe:/a:xmlsoft:libxml2
+libxslt;cpe:/a:xmlsoft:libxslt
+licq;cpe:/a:licq:licq
 lighttpd;cpe:/a:lighttpd:lighttpd
-lilo
-links2
+lilo;cpe:/a:lilo:lilo
+links2;cpe:/a:twibright:links
 lintian
 linux-2.6.24;cpe:/o:linux:kernel
 linux-2.6;cpe:/o:linux:kernel
 linux-ftpd
 linux-ftpd-ssl
-linux-patch-grsecurity2
+linux-patch-grsecurity2;cpe:/a:grsecurity:grsecurity_kernel_patch
 linux-patch-tuxonice
-linuxdcpp
+linuxdcpp;cpe:/a:linux:direct_connect
 linuxtrade
 liquidsoap
 litmus
 lmbench;cpe:/a:bitmover:lmbench
 ltp
-ltsp
+ltsp;cpe:/a:ltsp:linux_terminal_server_project
 lucene2
 lustre
 lvm2;cpe:/a:heinz_mauelshagen:lvm2
@@ -525,7 +525,7 @@ lxsession
 lynx-cur;cpe:/a:lynx:lynx
 lynx;cpe:/a:lynx:lynx
 m2crypto
-m4
+m4;cpe:/a:gnu:m4
 mafft
 magics++
 magpierss
@@ -551,7 +551,7 @@ mediawiki;cpe:/a:mediawiki:mediawiki
 mednafen
 memcached
 memcachedb
-mercurial
+mercurial;cpe:/a:mercurial:mercurial
 merkaartor
 mgetty
 mgt
@@ -566,10 +566,10 @@ mldonkey
 mlmmj
 mn-fit
 mnemo2
-mod-auth-mysql
+mod-auth-mysql;cpe:/a:joey_schulze:mod_auth_mysql
 moin;cpe:/a:moinmo:moinmoin
 mojarra;cpe:/a:oracle:mojarra
-mon
+mon;cpe:/a:jim_trocki:mon
 mondo
 monkeysphere
 mono-debugger
@@ -577,7 +577,7 @@ mono;cpe:/a:mono_project:mono
 monotone
 moodle;cpe:/a:moodle:moodle
 moon
-motion
+motion;cpe:/a:lavrsen:motion
 movabletype-opensource;cpe:/a:sixapart:movabletype
 mp4h
 mpfr
@@ -587,7 +587,7 @@ mpop
 msmtp
 msp-webserver
 mt-daapd
-mtr
+mtr;cpe:/a:matt_kimball_and_roger_wolff:mtr
 multi-gnome-terminal
 multipath-tools
 mutt;cpe:/a:mutt:mutt
@@ -600,12 +600,12 @@ mysql-dfsg-5.0;cpe:/a:mysql:mysql
 mysql-dfsg-5.1;cpe:/a:mysql:mysql
 mysql-ocaml
 nag2
-nagios2
-nagios3
+nagios2;cpe:/a:nagios:nagios
+nagios3;cpe:/a:nagios:nagios
 naim
-namazu2
+namazu2;cpe:/a:namazu:namazu
 nano;cpe:/a:gnu:nano
-nasm
+nasm;cpe:/a:nasm:nasm
 nautilus-python
 ncbi-tools6
 ncompress
@@ -621,11 +621,11 @@ netmrg
 netpbm-free
 network-manager
 network-manager-applet
-newsbeuter
+newsbeuter;cpe:/a:newsbeuter:newsbeuter
 newsgate
-newsx
+newsx;cpe:/a:fedora:newsx
 newt
-nfs-utils
+nfs-utils;cpe:/a:nfs:nfs-utils
 nginx
 ngircd
 nilfs2-tools
@@ -664,14 +664,14 @@ openmpi
 openoffice.org;cpe:/a:sun:openoffice.org
 opensaml
 opensaml2
-opensc
+opensc;cpe:/a:opensc-project:opensc
 openscenegraph
 openssh;cpe:/a:openssh:openssh
 openssl097;cpe:/a:openssl:openssl
 openssl;cpe:/a:openssl:openssl
-openswan
+openswan;cpe:/a:openswan:openswan
 openttd;cpe:/a:openttd:openttd
-openvpn
+openvpn;cpe:/a:openvpn:openvpn
 openx
 opie;cpe:/a:nrl:opie
 optipng
@@ -683,8 +683,8 @@ owl-dms
 p3nfs
 p7zip
 pam;cpe:/a:kernel:linux-pam
-pam-pgsql
-pan
+pam-pgsql;cpe:/a:libpam-pgsql:libpam-pgsql
+pan;cpe:/a:pan:pan
 pango1.0;cpe:/a:pango:pango
 paramiko
 paraview
@@ -693,17 +693,17 @@ parser-mysql
 passenger
 paste;cpe:/a:pythonpaste:paste
 pax
-pcre3
+pcre3;cpe:/a:pcre:pcre
 pcsc-lite;cpe:/a:muscle:pcsc-lite
 pdfjam
 pdkim
-pdns
-pdns-recursor
-pdnsd
+pdns;cpe:/a:powerdns:powerdns
+pdns-recursor;cpe:/a:powerdns:recursor
+pdnsd;cpe:/a:pdnsd:pdnsd
 pdsh
 peercast
 perl;cpe:/a:perl:perl
-perlbal
+perlbal;cpe:/a:perlbal:perlbal
 pgfouine
 php-apc
 php-htmlpurifier
@@ -730,7 +730,7 @@ pinball
 piwigo
 piwik;cpe:/a:piwik:piwik
 pixelpost
-plait
+plait;cpe:/a:stephenjungels:plait
 planet
 planet-venus
 plone3;cpe:/a:plone:plone
@@ -739,11 +739,11 @@ pmount;cpe:/a:vincent_fourmond:pmount
 poco
 poker-network
 polarssl
-policyd-weight
+policyd-weight;cpe:/a:policyd-weight:policyd-weight
 policykit
 polipo
 poppler;cpe:/a:poppler:poppler
-postfix
+postfix;cpe:/a:postfix:postfix
 postgresql-7.4;cpe:/a:postgresql:postgresql
 postgresql-8.1;cpe:/a:postgresql:postgresql
 postgresql-8.2;cpe:/a:postgresql:postgresql
@@ -756,7 +756,7 @@ prewikka
 printfilters-ppd
 pristine-tar
 proftpd-dfsg;cpe:/a:proftpd:proftpd
-projectl
+projectl;cpe:/a:debian:projectl
 prototypejs
 psi
 pulseaudio
@@ -789,28 +789,28 @@ quagga
 quassel
 qutecom
 qwik
-r-base
+r-base;cpe:/a:r_foundation:r
 r-base-core-ra
 radiance
-rails
+rails;cpe:/a:ruby_on_rails:ruby_on_rails
 rancid
 rccp
-rdesktop
+rdesktop;cpe:/a:rdesktop:rdesktop
 realtimebattle
 redhat-cluster;cpe:/a:redhat:cman
 redland
 redmine
 refpolicy
 rekonq
-reportbug
-reportbug-ng
+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
-robocode
+robocode;cpe:/a:robocode:robocode
 root-system
 roundcube;cpe:/a:roundcube:roundcube_webmail
 roundup;cpe:/a:roundup:roundup
@@ -833,7 +833,7 @@ salome
 samba;cpe:/a:samba:samba
 samhain
 samizdat
-sarg
+sarg;cpe:/a:sarg:squid_analysis_report_generator
 scilab
 scratchbox2
 screen
@@ -848,15 +848,15 @@ sgml2x
 shadow
 shibboleth-sp
 shibboleth-sp2
-silc-client
-silc-server
-silc-toolkit
+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
 simgear
 sip-tester
 siproxd
 ski
-slash
+slash;cpe:/a:slashcode.com:slash
 slim
 slurm-llnl
 smart
@@ -864,7 +864,7 @@ smarty
 smbind;cpe:/a:blentz:smbind
 smsclient
 sng
-snort
+snort;cpe:/a:snort:snort
 socat
 sork-passwd-h3
 spamass-milter
@@ -872,24 +872,24 @@ speex
 spice;cpe:/a:redhat:qspice
 spip
 splitvt
-sql-ledger
+sql-ledger;cpe:/a:sql-ledger:sql-ledger
 squid;cpe:/a:squid-cache:squid
 squid3;cpe:/a:squid-cache:squid
 squidguard;cpe:/a:squidguard:squidguard
 squirrelmail;cpe:/a:squirrelmail:squirrelmail
-ssmtp
+ssmtp;cpe:/a:ssmtp:ssmtp
 sssd;cpe:/a:fedoraproject:sssd
 stardict
 streamripper
-strongswan
-stunnel4
+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
-swfdec0.5
-swfdec0.6
+swfdec0.5;cpe:/a:swfdec:swfdec
+swfdec0.6;cpe:/a:swfdec:swfdec
 swftools;cpe:/a:swftools:swftools
 sword
 symfony
@@ -915,9 +915,9 @@ tgt;cpe:/a:zaal:tgt
 thin
 thttpd
 tiff;cpe:/a:libtiff:libtiff
-tiger
+tiger;cpe:/a:tiger:tiger
 tightvnc;cpe:/a:tightvnc:tightvnc
-tikiwiki
+tikiwiki;cpe:/a:tikiwiki:tikiwiki_cms_groupware
 tintin++
 tk8.3
 tk8.4
@@ -925,7 +925,7 @@ tk8.5
 tkman
 tkusr
 tla
-tmsnc
+tmsnc;cpe:/a:tmsnc:tmsnc
 tomboy
 tomcat-native
 tomcat5;cpe:/a:apache:tomcat
@@ -939,15 +939,15 @@ trac;cpe:/a:edgewall:trac
 trac-git
 transmission;cpe:/a:transmissionbt:transmission
 trickle
-tss
+tss;cpe:/a:debian:tss
 tunapie
-turba2
+turba2;cpe:/a:debian:turba
 turbogears2
 tutos
 tutos2
 tuxguitar
 tuxonice-userui
-twiki
+twiki;cpe:/a:twiki:twiki
 typo
 typo3-src;cpe:/a:typo3:typo3
 udev;cpe:/a:kernel:udev
@@ -958,8 +958,8 @@ unbound;cpe:/a:nlnet_labs:unbound
 unrealircd;cpe:/a:unrealircd:unrealircd
 unzip;cpe:/a:info-zip:unzip
 ust
-util-linux
-uudeview
+util-linux;cpe:/a:linux:util-linux
+uudeview;cpe:/a:uudeview:uudeview
 uw-imap
 uzbl;cpe:/a:uzbl:uzbl
 valgrind
@@ -1001,7 +1001,7 @@ wicd
 wims
 wireshark;cpe:/a:wireshark:wireshark
 wml
-wordnet
+wordnet;cpe:/a:wordnet:wordnet
 wordpress;cpe:/a:wordpress:wordpress
 wordpress-mu
 wxwidgets2.6
@@ -1015,12 +1015,12 @@ xcal
 xcftools
 xchat
 xdg-utils
-xemacs21
-xemacs21-packages
-xen
-xen-3
-xen-3.0
-xen-unstable
+xemacs21;cpe:/a:gnu:xemacs
+xemacs21-packages;cpe:/a:gnu:xemacs
+xen;cpe:/a:xensource:xen
+xen-3;cpe:/a:xensource:xen
+xen-3.0;cpe:/a:xensource:xen
+xen-unstable;cpe:/a:xensource:xen
 xerces-c
 xerces-c2
 xerces27
@@ -1033,7 +1033,7 @@ xmlrpc-c
 xmlsec1
 xmltooling
 xmovie
-xorg-server
+xorg-server;cpe:/a:x:x11
 xotcl
 xpdf;cpe:/a:xpdf:xpdf
 xrdp
@@ -1045,7 +1045,7 @@ xwine
 xyssl
 yacy
 yaws
-yelp
+yelp;cpe:/a:gnome:yelp
 yui
 zabbix;cpe:/a:zabbix:zabbix
 zaptel
@@ -1054,12 +1054,12 @@ ziproxy;cpe:/a:daniel_mealha_cabrita:ziproxy
 znc;cpe:/a:znc:znc
 zodb
 zonecheck
-zoneminder
+zoneminder;cpe:/a:zoneminder:zoneminder
 zope-cmfplone
 zope-ldapuserfolder
 zope2.10;cpe:/a:zope:zope
 zope2.11;cpe:/a:zope:zope
 zope2.9;cpe:/a:zope:zope
 zope3;cpe:/a:zope:zope
-zoph
+zoph;cpe:/a:zoph:zoph
 zorp