diff --git a/src/cli/command_parser.rb b/src/cli/command_parser.rb
index 95010b1437..5e22060c9a 100755
--- a/src/cli/command_parser.rb
+++ b/src/cli/command_parser.rb
@@ -41,7 +41,6 @@ module CommandParser
             @commands = Hash.new
             @formats = Hash.new
             @script = nil
-            @usage = ""
 
             @args = args
             @options = Hash.new
@@ -59,6 +58,10 @@ module CommandParser
             @usage = "Usage: #{str}"
         end
 
+        def version(str)
+            @version = str
+        end
+
         def set(e, *args, &block)
             case e
             when :option
@@ -145,13 +148,15 @@ module CommandParser
         end
 
         def help
-            puts @usage
+            puts @usage if @usage
             puts
             print_options
             puts
             print_commands
             puts
             print_formatters
+            puts
+            puts @version if @version
         end
 
         private
diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb
index 4bf8afbf87..201f31dc32 100644
--- a/src/cli/one_helper.rb
+++ b/src/cli/one_helper.rb
@@ -20,6 +20,15 @@ require 'OpenNebula'
 include OpenNebula
 
 module OpenNebulaHelper
+    ONE_VERSION=<<-EOT
+OpenNebula 2.3.0
+Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may obtain
+a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+EOT
+
     ########################################################################
     # Options
     ########################################################################
@@ -89,8 +98,7 @@ module OpenNebulaHelper
             if OpenNebula.is_error?(rc)
                 return -1, rc.message
             else
-                rname=Object.const_get(self.class.name)::RESOURCE
-                puts "#{rname} #{id}: #{verbose}" if options[:verbose]
+                puts "#{self.rname} #{id}: #{verbose}" if options[:verbose]
                 return 0
             end
         end
diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index 4f03a6670a..939fa68abe 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -17,13 +17,15 @@
 require 'one_helper'
 
 class OneVMHelper < OpenNebulaHelper::OneHelper
-    RESOURCE = "VM"
-
     def create_resource(template_file, options)
         template=File.read(template_file)
         super(template, options)
     end
 
+    def self.rname
+        "VM"
+    end
+
     private
 
     def factory(id=nil)
diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb
index d15eb2fc32..e6b749e4ae 100644
--- a/src/cli/one_helper/onevnet_helper.rb
+++ b/src/cli/one_helper/onevnet_helper.rb
@@ -17,13 +17,15 @@
 require 'one_helper'
 
 class OneVNetHelper < OpenNebulaHelper::OneHelper
-    RESOURCE = "VNET"
-
     def create_resource(template_file, options)
         template=File.read(template_file)
         super(template, options)
     end
 
+    def self.rname
+        "VNET"
+    end
+
     private
 
     def factory(id=nil)
diff --git a/src/cli/onevm b/src/cli/onevm
index 2417307718..67829e85dc 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -32,6 +32,7 @@ require 'one_helper/onevm_helper'
 
 cmd=CommandParser::CmdParser.new(ARGV) do
     usage "onevm COMMAND [args..] [options..]"
+    version OpenNebulaHelper::ONE_VERSION
 
     helper = OneVMHelper.new
 
diff --git a/src/cli/onevnet b/src/cli/onevnet
index 7a61053d34..035cbb3883 100755
--- a/src/cli/onevnet
+++ b/src/cli/onevnet
@@ -32,6 +32,7 @@ require 'one_helper/onevnet_helper'
 
 cmd=CommandParser::CmdParser.new(ARGV) do
     usage "onevnet COMMAND [args..] [options..]"
+    version OpenNebulaHelper::ONE_VERSION
 
     helper = OneVNetHelper.new