diff --git a/lib/setup.js b/lib/setup.js
index 1a020dbfcc..ff8ab633fc 100644
--- a/lib/setup.js
+++ b/lib/setup.js
@@ -57,7 +57,9 @@ var yargs = require('yargs')
         tools.appName + ' clean\n' +
         tools.appName + ' backup\n' +
         tools.appName + ' restore <backup name or path>' +
-        tools.appName + ' <command> --timeout 5000')
+        tools.appName + ' <command> --timeout 5000' +
+        tools.appName + ' --version' +
+        tools.appName + ' [adapter] -v')
     .default('objects',   '127.0.0.1')
     .default('states',   '127.0.0.1')
     .default('lang',    'en')
@@ -2200,8 +2202,23 @@ switch (yargs.argv._[0]) {
         break;
 
     default:
-        yargs.showHelp();
-
+        if (yargs.argv.v || yargs.argv.version) {
+            var iopckg;
+            if (yargs.argv._[0]) {
+                try {
+                    iopckg = require('iobroker.' + yargs.argv._[0] + '/package.json');
+                } catch (err) {
+                    iopckg = {version: '"' + yargs.argv._[0] + '" not found'};
+                }
+            } else {
+                iopckg = require(__dirname + '/../package.json');
+            }
+            console.log(iopckg.version);
+        } else {
+            yargs.showHelp();
+        }
+        processExit();
+        break;
 }
 
 // Save objects before exit