diff --git a/lib/fluent/command/binlog_reader.rb b/lib/fluent/command/binlog_reader.rb
index 8c2688925f..528228e3d7 100644
--- a/lib/fluent/command/binlog_reader.rb
+++ b/lib/fluent/command/binlog_reader.rb
@@ -22,6 +22,7 @@
 require 'fluent/plugin'
 require 'fluent/config/element'
 require 'fluent/engine'
+require 'fluent/version'
 
 class FluentBinlogReader
   SUBCOMMAND = %w(cat head formats)
@@ -49,7 +50,14 @@ def call
 
   def command
     command = @argv.shift
-    if !command || !SUBCOMMAND.include?(command)
+    if command
+      if command == '--version'
+        puts "#{File.basename($PROGRAM_NAME)} #{Fluent::VERSION}"
+        exit 0
+      elsif !SUBCOMMAND.include?(command)
+        usage "'#{command}' is not supported: Required subcommand : #{SUBCOMMAND.join(' | ')}"
+      end
+    else
       usage "Required subcommand : #{SUBCOMMAND.join(' | ')}"
     end
 
@@ -70,6 +78,7 @@ def initialize(argv = ARGV)
 
       @options = { plugin: [] }
       @opt_parser = OptionParser.new do |opt|
+        opt.version = Fluent::VERSION
         opt.separator 'Options:'
 
         opt.on('-p DIR', '--plugin', 'add library directory path') do |v|
diff --git a/lib/fluent/command/ca_generate.rb b/lib/fluent/command/ca_generate.rb
index ddffa49e5c..cf0493087c 100644
--- a/lib/fluent/command/ca_generate.rb
+++ b/lib/fluent/command/ca_generate.rb
@@ -1,6 +1,7 @@
 require 'openssl'
 require 'optparse'
 require 'fileutils'
+require 'fluent/version'
 
 module Fluent
   class CaGenerate
@@ -145,6 +146,7 @@ def self.generate_self_signed_server_pair(opts={})
 
     def configure_option_parser
       @opt_parser.banner = HELP_TEXT
+      @opt_parser.version = Fluent::VERSION
 
       @opt_parser.on('--key-length [KEY_LENGTH]',
                      "configure key length. (default: #{DEFAULT_OPTIONS[:private_key_length]})") do |v|
diff --git a/lib/fluent/command/cat.rb b/lib/fluent/command/cat.rb
index 1fc2ee2265..935db5dfd1 100644
--- a/lib/fluent/command/cat.rb
+++ b/lib/fluent/command/cat.rb
@@ -18,10 +18,12 @@
 require 'fluent/env'
 require 'fluent/time'
 require 'fluent/msgpack_factory'
+require 'fluent/version'
 
 op = OptionParser.new
 
 op.banner += " <tag>"
+op.version = Fluent::VERSION
 
 port = 24224
 host = '127.0.0.1'
diff --git a/lib/fluent/command/plugin_config_formatter.rb b/lib/fluent/command/plugin_config_formatter.rb
index 528a1ae642..d03caa0ca8 100644
--- a/lib/fluent/command/plugin_config_formatter.rb
+++ b/lib/fluent/command/plugin_config_formatter.rb
@@ -22,6 +22,7 @@
 require "fluent/engine"
 require "fluent/system_config"
 require "fluent/config/element"
+require 'fluent/version'
 
 class FluentPluginConfigFormatter
 
@@ -210,6 +211,7 @@ def usage(message = nil)
 
   def prepare_option_parser
     @parser = OptionParser.new
+    @parser.version = Fluent::VERSION
     @parser.banner = <<BANNER
 Usage: #{$0} [options] <type> <name>
 
diff --git a/lib/fluent/command/plugin_generator.rb b/lib/fluent/command/plugin_generator.rb
index df5abeb0d9..9b4efdba82 100644
--- a/lib/fluent/command/plugin_generator.rb
+++ b/lib/fluent/command/plugin_generator.rb
@@ -21,6 +21,7 @@
 require "open-uri"
 
 require "fluent/registry"
+require 'fluent/version'
 
 class FluentPluginGenerator
   attr_reader :type, :name
@@ -91,6 +92,7 @@ def file(source, dest)
 
   def prepare_parser
     @parser = OptionParser.new
+    @parser.version = Fluent::VERSION
     @parser.banner = <<BANNER
 Usage: fluent-plugin-generate [options] <type> <name>