diff --git a/portage_exporter.sh b/portage_exporter.sh
index 9d7cdee..ce0a55f 100755
--- a/portage_exporter.sh
+++ b/portage_exporter.sh
@@ -11,14 +11,18 @@ TMP_FILE=$PROM_FILE.$$
 
 CRITICAL=(
   "www-servers/"
-  "www-client/"
+  "mail-mta/postfix"
+  "net-mail/dovecot"
   "www-apps/"
   "dev-libs/openssl"
   "net-libs/gnutls"
+)
+CRITICAL_DESKTOP=(
+  "dev-libs/openssl"
+  "net-libs/gnutls"
   "webkit"
   "webengine"
-  "mail-mta/postfix"
-  "net-mail/dovecot"
+  "www-client/"
   )
 
 function dumpInfo () {
@@ -33,11 +37,13 @@ function dumpInfo () {
   update_count="$("${mychroot[@]}" eix --pure-packages -u -c | wc -l)"
   selected_update_count="$("${mychroot[@]}" eix --pure-packages -u -c --selected | wc -l)"
   critical_update_count="$("${mychroot[@]}" eix --pure-packages -u -c | grep ${CRITICAL[@]/#/-e } | wc -l)"
+  critical_desktop_update_count="$("${mychroot[@]}" eix --pure-packages -u -c | grep ${CRITICAL_DESKTOP[@]/#/-e } | wc -l)"
   glsa_count="$("${mychroot[@]}" glsa-check -t all 2> /dev/null | wc -l )"
   echo portage_age_seconds\{host=\""$HOSTNAME"\", root=\""$root"\"\} "$age_seconds"
   echo portage_package_update_count\{host=\""$HOSTNAME"\", root=\""$root"\"\} "$update_count"
   echo portage_selected_package_update_count\{host=\""$HOSTNAME"\", root=\""$root"\"\} "$selected_update_count"
-  echo portage_critical_package_update_count\{host=\""$HOSTNAME"\", root=\""$root"\"\} "$critical_update_count"
+  echo portage_critical_package_update_count\{host=\""$HOSTNAME"\", root=\""$root"\"\, type=\"server\"} "$critical_update_count"
+  echo portage_critical_package_update_count\{host=\""$HOSTNAME"\", root=\""$root"\"\, type=\"desktop\"} "$critical_desktop_update_count"
   echo portage_glsa_count\{host=\""$HOSTNAME"\", root=\""$root"\"\} "$glsa_count"
 }