diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 5110aa36..35a8dc4c 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -33,6 +33,7 @@ module Middleman
 
     # Uses callbacks
     include Hooks
+    include Hooks::InstanceHooks
 
     # Before request hook
     define_hook :before
@@ -240,5 +241,11 @@ module Middleman
     end
     alias :inspect :to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
 
+    # Hooks clones _hooks from the class to the instance.
+    # https://github.com/apotonick/hooks/blob/master/lib/hooks/instance_hooks.rb#L10
+    # Middleman expects the same list of hooks for class and instance hooks:
+    def _hooks
+      self.class._hooks
+    end
   end
 end
diff --git a/middleman-core/lib/middleman-core/core_extensions/extensions.rb b/middleman-core/lib/middleman-core/core_extensions/extensions.rb
index 9dfea24c..403176e2 100644
--- a/middleman-core/lib/middleman-core/core_extensions/extensions.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/extensions.rb
@@ -151,7 +151,7 @@ module Middleman
             run_hook :build_config
             config_context.execute_configure_callbacks(:build)
           end
-          
+
           if development?
             run_hook :development_config
             config_context.execute_configure_callbacks(:development)
diff --git a/middleman-core/lib/middleman-more/core_extensions/compass.rb b/middleman-core/lib/middleman-more/core_extensions/compass.rb
index b46b7639..1947edef 100644
--- a/middleman-core/lib/middleman-more/core_extensions/compass.rb
+++ b/middleman-core/lib/middleman-more/core_extensions/compass.rb
@@ -49,7 +49,7 @@ class Middleman::CoreExtensions::Compass < ::Middleman::Extension
     end
 
     # Call hook
-    app.run_hook :compass_config, ::Compass.configuration
+    app.run_hook_for :compass_config, app, ::Compass.configuration
 
     # Tell Tilt to use it as well (for inline sass blocks)
     ::Tilt.register 'sass', CompassSassTemplate
diff --git a/middleman-core/lib/vendored-middleman-deps/hooks-0.3.3/lib/hooks.rb b/middleman-core/lib/vendored-middleman-deps/hooks-0.3.3/lib/hooks.rb
index 02ad0964..d7c6d5dd 100644
--- a/middleman-core/lib/vendored-middleman-deps/hooks-0.3.3/lib/hooks.rb
+++ b/middleman-core/lib/vendored-middleman-deps/hooks-0.3.3/lib/hooks.rb
@@ -77,11 +77,6 @@ module Hooks
     end
 
     def define_hook_writer(name)
-      self.send(:define_method, name.to_sym) do |&block|
-        if self.class.respond_to?(name)
-          self.class.send(name.to_sym, &block)
-        end
-      end
       instance_eval *hook_writer_args(name)
     end