diff --git a/lib/middleman/features/blog.rb b/lib/middleman/features/blog.rb
index 0fde10bf..759da01e 100644
--- a/lib/middleman/features/blog.rb
+++ b/lib/middleman/features/blog.rb
@@ -4,10 +4,7 @@ module Middleman
   module Features
     module Blog
       class << self
-        def registered(app)
-          # Depend on FrontMatter
-          app.activate Middleman::Features::FrontMatter
-          
+        def registered(app)          
           # Include helpers
           app.helpers Middleman::Features::Blog::Helpers
           
diff --git a/lib/middleman/server.rb b/lib/middleman/server.rb
index 75a66638..590460fe 100644
--- a/lib/middleman/server.rb
+++ b/lib/middleman/server.rb
@@ -49,6 +49,8 @@ module Middleman
     # Activate Webservices Proxy package
     # register Middleman::Features::Proxy
     
+    register Middleman::Features::FrontMatter
+    
     # Activate Lorem helpers
     register Middleman::Features::Lorem