diff --git a/bin/jekyll b/bin/jekyll
index 9ed9b90b..5f6640e1 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -51,7 +51,11 @@ opts = OptionParser.new do |opts|
   opts.on("--permalink [TYPE]", "Use 'date' (default) for YYYY/MM/DD") do |style| 
     Jekyll.permalink_style = (style || 'date').to_sym
   end
-
+  
+  opts.on("--version", "Display current version") do
+    puts "Jekyll " + Jekyll.version
+    exit 0
+  end
 end
 
 opts.parse!
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 7125a95c..eff1d5d2 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -43,8 +43,6 @@ require 'jekyll/tags/include'
 require 'jekyll/albino'
 
 module Jekyll
-  VERSION = '0.3.0'
-  
   class << self
     attr_accessor :source, :dest, :lsi, :pygments, :markdown_proc, :content_type, :permalink_style
   end
@@ -61,4 +59,9 @@ module Jekyll
     Jekyll.dest = dest
     Jekyll::Site.new(source, dest).process
   end
+  
+  def self.version
+    yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])))
+    "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
+  end
 end