1 files changed, 13 insertions, 4 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 50d72f8a2e..5281dbbbd7 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -609,11 +609,20 @@ Default options, which never appear in option summary.
     puts ARGV.options
     exit
   end
-  DefaultList.long['version'] = Switch::NoArgument.new do
-    if v = ARGV.options.ver
-      puts v
-      exit
+  DefaultList.long['version'] = Switch::OptionalArgument.new do |pkg|
+    if pkg
+      begin
+        require 'optparse/version'
+      rescue LoadError
+        pkg = nil
+      else
+        show_version(*pkg.split(/,/))
+      end
     end
+    unless pkg
+      puts v if v = ARGV.options.ver
+    end
+    exit
   end
 
 =begin