diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 3eba2281c42e7162ab0b5802d973dccbfec6712d..25e2d27a01dd1e59cbba72259d77fb2ece071fc8 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.1.0 (unreleased)*
 
+* Implicit actions named not_implemented can be rendered [Santiago Pastorino]
+
 * Wildcard route will always matching the optional format segment by default. For example if you have this route:
 
     map '*pages' => 'pages#show'
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index 07ff5ad9f353dbb74bb4beaacf8b1fc52acc6b60..0951267fea63a06e9c3f46a733cafd8d04200fe0 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -1,3 +1,4 @@
+require 'erubis'
 require 'active_support/configurable'
 require 'active_support/descendants_tracker'
 require 'active_support/core_ext/module/anonymous'
@@ -18,6 +19,7 @@ class Base
     include ActiveSupport::Configurable
     extend ActiveSupport::DescendantsTracker
 
+    undef_method :not_implemented
     class << self
       attr_reader :abstract
       alias_method :abstract?, :abstract
diff --git a/actionpack/test/controller/new_base/render_implicit_action_test.rb b/actionpack/test/controller/new_base/render_implicit_action_test.rb
index 667a9021be4224b2d726c9d7d198e8308f77f455..3bb3016fdbebf7b2a67e05392fc9dc4d51c85462 100644
--- a/actionpack/test/controller/new_base/render_implicit_action_test.rb
+++ b/actionpack/test/controller/new_base/render_implicit_action_test.rb
@@ -3,8 +3,9 @@
 module RenderImplicitAction
   class SimpleController < ::ApplicationController
     self.view_paths = [ActionView::FixtureResolver.new(
-      "render_implicit_action/simple/hello_world.html.erb" => "Hello world!",
-      "render_implicit_action/simple/hyphen-ated.html.erb" => "Hello hyphen-ated!"
+      "render_implicit_action/simple/hello_world.html.erb"     => "Hello world!",
+      "render_implicit_action/simple/hyphen-ated.html.erb"     => "Hello hyphen-ated!",
+      "render_implicit_action/simple/not_implemented.html.erb" => "Not Implemented"
     )]
 
     def hello_world() end
@@ -25,9 +26,17 @@ class RenderImplicitActionTest < Rack::TestCase
       assert_status 200
     end
 
+    test "render an action called not_implemented" do
+      get "/render_implicit_action/simple/not_implemented"
+
+      assert_body   "Not Implemented"
+      assert_status 200
+    end
+
     test "action_method? returns true for implicit actions" do
       assert SimpleController.new.action_method?(:hello_world)
       assert SimpleController.new.action_method?(:"hyphen-ated")
+      assert SimpleController.new.action_method?(:not_implemented)
     end
   end
 end