diff --git a/History.txt b/History.txt
index f0de13dd3b5..ae51e1efe17 100644
--- a/History.txt
+++ b/History.txt
@@ -1,6 +1,7 @@
 == HEAD
   * Bug Fixes
     * Highlight should not be able to render local files
+    * The site configuration may not always provide a 'time' setting (#184)
 
 == 0.6.2 / 2010-06-25
   * Bug Fixes
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 7570cb0bb8c..d158e33b7bd 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -28,7 +28,11 @@ def initialize(config)
     end
 
     def reset
-      self.time            = Time.parse(self.config['time'].to_s) || Time.now
+      self.time            = if self.config['time']
+                               Time.parse(self.config['time'].to_s)
+                             else
+                               Time.now
+                             end
       self.layouts         = {}
       self.posts           = []
       self.pages           = []