diff --git a/src/client/cmdUser/userSetCaps.go b/src/client/cmdUser/userSetCaps.go
index 16cef5fecb5bd3956a6b44788c892895005dcb49..15ab6393148156a4eaa5ac200cfb74f16629db9a 100644
--- a/src/client/cmdUser/userSetCaps.go
+++ b/src/client/cmdUser/userSetCaps.go
@@ -41,18 +41,20 @@ List of user capabilities:
 `
     caps := caps.GetUserCapsNames()
     i := 0
+    count := 0
     for _, v := range caps {
         if (i == 0) {
             usage += "           "
         }
         usage += v + " "
         i += 1
-        if (i >= 5) {
+        count += 1
+        if (i >= 5 && count < len(caps)) {
             usage = u.AppendNewLine(usage)
             i = 0
         }
     }
-    u.PrintErr(usage)
+    u.PrintlnErr(usage)
 }
 
 func (cmd *SetCaps)Run(args []string) int {
diff --git a/src/client/cmdVM/vmAddAccess.go b/src/client/cmdVM/vmAddAccess.go
index 7f1a921149ed1fe8da4f492165a55181bdfdc3ab..3e0c9e64a7111309ad26bf0946328de260ff5e81 100644
--- a/src/client/cmdVM/vmAddAccess.go
+++ b/src/client/cmdVM/vmAddAccess.go
@@ -43,18 +43,20 @@ List of VM access capabilities:
 `
     caps := caps.GetVMAccessCapsNames()
     i := 0
+    count := 0
     for _, v := range caps {
         if (i == 0) {
             usage += "           "
         }
         usage += v + " "
         i += 1
-        if (i >= 5) {
+        count += 1
+        if (i >= 5 && count < len(caps)) {
             usage = u.AppendNewLine(usage)
             i = 0
         }
     }
-    u.PrintErr(usage)
+    u.PrintlnErr(usage)
     printRegexUsageDetails()
 }
 
diff --git a/src/client/version/version.go b/src/client/version/version.go
index 2b4b5abd8935ff089a7a2b38873c47cb6ae4dc69..0d0925bd6669c16c2cb9afefd396f9e73a53f73b 100644
--- a/src/client/version/version.go
+++ b/src/client/version/version.go
@@ -7,7 +7,7 @@ import (
 const (
     major  = 1
     minor  = 11
-    bugfix = 0
+    bugfix = 1
 )
 
 var version params.Version = params.NewVersion(major, minor, bugfix)
diff --git a/src/common/caps/caps.go b/src/common/caps/caps.go
index f4173606612292915c66975a726108e988761047..602d1fb68052803533908bf235fda6fec020b9e1 100644
--- a/src/common/caps/caps.go
+++ b/src/common/caps/caps.go
@@ -1,6 +1,7 @@
 package caps
 
 import (
+    "sort"
     "errors"
 )
 
@@ -131,6 +132,12 @@ func GetUserCapsNames() []string {
     for key, _ := range userCaps {
         caps = append(caps, key)
     }
+
+    // Sort caps by name
+    sort.Slice(caps, func(i, j int) bool {
+        return caps[i] < caps[j]
+    })
+
     return caps
 }
 
@@ -139,5 +146,11 @@ func GetVMAccessCapsNames() []string {
     for key, _ := range vmAccessCaps {
         caps = append(caps, key)
     }
+
+    // Sort caps by name
+    sort.Slice(caps, func(i, j int) bool {
+        return caps[i] < caps[j]
+    })
+
     return caps
 }