diff --git a/metadata/com.googlecode.droidwall.txt b/metadata/com.googlecode.droidwall.txt
index 4fdeae3580..12591fe59d 100644
--- a/metadata/com.googlecode.droidwall.txt
+++ b/metadata/com.googlecode.droidwall.txt
@@ -1,4 +1,4 @@
-Categories:Internet
+Categories:Security,Internet
 License:GPLv3
 Web Site:https://code.google.com/p/droidwall
 Source Code:https://droidwall.googlecode.com/svn/tags/v1.5.7
diff --git a/metadata/com.kibab.android.EncPassChanger.txt b/metadata/com.kibab.android.EncPassChanger.txt
index 85356f30db..74ba4052c6 100644
--- a/metadata/com.kibab.android.EncPassChanger.txt
+++ b/metadata/com.kibab.android.EncPassChanger.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Security
 License:NewBSD
 Web Site:https://github.com/kibab/encpasschanger
 Source Code:https://github.com/kibab/encpasschanger
diff --git a/metadata/com.koushikdutta.superuser.txt b/metadata/com.koushikdutta.superuser.txt
index c07b8cb20f..02d0438c9b 100644
--- a/metadata/com.koushikdutta.superuser.txt
+++ b/metadata/com.koushikdutta.superuser.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Security
 License:Apache2
 Web Site:https://github.com/koush/Superuser
 Source Code:https://github.com/koush/Superuser
diff --git a/metadata/com.shadcat.secdroid.txt b/metadata/com.shadcat.secdroid.txt
index e5aae0146a..b9116cdb55 100644
--- a/metadata/com.shadcat.secdroid.txt
+++ b/metadata/com.shadcat.secdroid.txt
@@ -1,4 +1,4 @@
-Categories:None
+Categories:Security
 License:GPLv2+
 Web Site:https://github.com/x942/secdroid
 Source Code:https://github.com/x942/secdroid
diff --git a/metadata/dev.ukanth.ufirewall.txt b/metadata/dev.ukanth.ufirewall.txt
index 831cbb70bf..8b819f04b4 100644
--- a/metadata/dev.ukanth.ufirewall.txt
+++ b/metadata/dev.ukanth.ufirewall.txt
@@ -1,4 +1,4 @@
-Categories:Internet
+Categories:Security,Internet
 License:GPLv3
 Web Site:https://github.com/ukanth/afwall/wiki
 Source Code:https://github.com/ukanth/afwall
diff --git a/metadata/info.guardianproject.browser.txt b/metadata/info.guardianproject.browser.txt
index 1aa613def6..75ded644cd 100644
--- a/metadata/info.guardianproject.browser.txt
+++ b/metadata/info.guardianproject.browser.txt
@@ -1,4 +1,4 @@
-Categories:Internet
+Categories:Internet,Security
 License:GPL
 Web Site:https://guardianproject.info/apps/orweb
 Source Code:https://github.com/guardianproject/orweb
diff --git a/metadata/info.guardianproject.cacert.txt b/metadata/info.guardianproject.cacert.txt
index e791937c60..62b2b3ba16 100644
--- a/metadata/info.guardianproject.cacert.txt
+++ b/metadata/info.guardianproject.cacert.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Security
 License:GPLv3
 Web Site:https://guardianproject.info/2011/09/05/cacertman-app-to-address-diginotar-other-bad-cas
 Source Code:https://github.com/guardianproject/cacert
diff --git a/metadata/net.i2p.android.router.txt b/metadata/net.i2p.android.router.txt
index 2bfae30f45..6868554cf3 100644
--- a/metadata/net.i2p.android.router.txt
+++ b/metadata/net.i2p.android.router.txt
@@ -1,4 +1,4 @@
-Categories:Internet
+Categories:Security,Internet
 License:Apache2
 Web Site:http://i2p2.de
 Source Code:https://github.com/i2p
diff --git a/metadata/net.thauvin.erik.android.noussd.txt b/metadata/net.thauvin.erik.android.noussd.txt
index 236261953d..cb27e1cb96 100644
--- a/metadata/net.thauvin.erik.android.noussd.txt
+++ b/metadata/net.thauvin.erik.android.noussd.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Security
 License:NewBSD
 Web Site:http://mobile.thauvin.net/android/#noussd
 Source Code:https://github.com/ethauvin/NoUSSD
diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt
index b946017fef..798ce39070 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:System,Security
 License:GPLv3
 Web Site:http://sufficientlysecure.org/index.php/adaway
 Source Code:https://github.com/dschuermann/ad-away
diff --git a/metadata/org.fdroid.superuser.txt b/metadata/org.fdroid.superuser.txt
index f4889c7ab1..eb15d54208 100644
--- a/metadata/org.fdroid.superuser.txt
+++ b/metadata/org.fdroid.superuser.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Security
 License:Apache2
 Web Site:https://github.com/koush/Superuser
 Source Code:https://github.com/koush/Superuser
diff --git a/metadata/org.projectvoodoo.simplecarrieriqdetector.txt b/metadata/org.projectvoodoo.simplecarrieriqdetector.txt
index 5f2188e649..90c34e9ece 100644
--- a/metadata/org.projectvoodoo.simplecarrieriqdetector.txt
+++ b/metadata/org.projectvoodoo.simplecarrieriqdetector.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Security
 License:WTFPL
 Web Site:https://twitter.com/supercurio
 Source Code:https://github.com/project-voodoo/simple_carrieriq_detector_app
diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt
index 86e45a2e9c..134c7abe7e 100644
--- a/metadata/org.torproject.android.txt
+++ b/metadata/org.torproject.android.txt
@@ -1,4 +1,4 @@
-Categories:Internet
+Categories:Security,Internet
 License:NewBSD
 Web Site:http://www.torproject.org/docs/android.html.en
 Source Code:https://gitweb.torproject.org/orbot.git