diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py
index be538b4d..3654c381 100644
--- a/pisi/cli/commands.py
+++ b/pisi/cli/commands.py
@@ -574,8 +574,8 @@ expanded to package names.
      
         super(Upgrade, self).options(group)
         buildno_opts(self, group)
-        group.add_option("--security", action="store_true",
-                     default=False, help=_("select only security upgrades"))
+        group.add_option("--security-only", action="store_true",
+                     default=False, help=_("Security related package upgrades only"))
         group.add_option("-r", "--bypass-update-repo", action="store_true",
                      default=False, help=_("Do not update repositories"))
         group.add_option("--ignore-file-conflicts", action="store_true",
diff --git a/pisi/operations.py b/pisi/operations.py
index ecb2e457..f57bcb80 100644
--- a/pisi/operations.py
+++ b/pisi/operations.py
@@ -388,7 +388,7 @@ def upgrade_pkg_names(A = []):
     a minimum or maximum number of upgrades according to options."""
     
     ignore_build = ctx.get_option('ignore_build_no')
-    security = ctx.get_option('security')
+    security_only = ctx.get_option('security_only')
 
     if not A:
         # if A is empty, then upgrade all packages
@@ -411,7 +411,7 @@ def upgrade_pkg_names(A = []):
             ctx.ui.info(_('Package %s is not available in repositories.') % x, True)
             continue
 
-        if security: # below is a readable functional code, don't overflow lines!
+        if security_only:
             updates = [i for i in pkg.history if Version(i.release) > Version(release)]
             if not pisi.util.any(lambda i:i.type == 'security', updates):
                 continue