diff --git a/lib/setup.js b/lib/setup.js
index ff8ab633fc..a1b9c8e86b 100644
--- a/lib/setup.js
+++ b/lib/setup.js
@@ -58,7 +58,7 @@ var yargs = require('yargs')
         tools.appName + ' backup\n' +
         tools.appName + ' restore <backup name or path>' +
         tools.appName + ' <command> --timeout 5000' +
-        tools.appName + ' --version' +
+        tools.appName + ' version [adapter]' +
         tools.appName + ' [adapter] -v')
     .default('objects',   '127.0.0.1')
     .default('states',   '127.0.0.1')
@@ -2201,6 +2201,23 @@ switch (yargs.argv._[0]) {
         })();
         break;
 
+    case 'v':
+    case 'version':
+        (function () {
+            var adapter = yargs.argv._[1];
+            if (adapter) {
+                try {
+                    iopckg = require('iobroker.' + adapter + '/package.json');
+                } catch (err) {
+                    iopckg = {version: '"' + adapter + '" not found'};
+                }
+            } else {
+                iopckg = require(__dirname + '/../package.json');
+            }
+            console.log(iopckg.version);
+        })();
+        break;
+
     default:
         if (yargs.argv.v || yargs.argv.version) {
             var iopckg;