diff --git a/ChangeLog b/ChangeLog
index 9e8318588e..56c4b5526e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov 20 07:45:50 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/mkmf.rb: adding compilation support for ObjC/ObjC++ extensions.
+	  Thanks Scott Gonyea! [ruby-core:33260]
+
 Sat Nov 20 01:57:55 2010  Akio Tajima  <artonx@yahoo.co.jp>
 
 	* common.mk: add dependency(insns.inc) to compile.obj
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 624b4cbc3e..93c1d6b522 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -9,7 +9,7 @@ require 'shellwords'
 CONFIG = RbConfig::MAKEFILE_CONFIG
 ORIG_LIBPATH = ENV['LIB']
 
-CXX_EXT = %w[cc cxx cpp]
+CXX_EXT = %w[cc mm cxx cpp]
 if File::FNM_SYSCASE.zero?
   CXX_EXT.concat(%w[C])
 end
@@ -1973,18 +1973,12 @@ site-install-rb: install-rb
       mfile.printf(compile_command, COMPILE_CXX)
     end
   end
-  %w[c].each do |e|
+  SRC_EXT.each do |e|
     COMPILE_RULES.each do |rule|
       mfile.printf(rule, e, $OBJEXT)
       mfile.printf(compile_command, COMPILE_C)
     end
   end
-  %w[m].each do |e|
-    COMPILE_RULES.each do |rule|
-      mfile.printf(rule, e, $OBJEXT)
-      mfile.printf(compile_command, COMPILE_OBJC)
-    end
-  end
 
   mfile.print "$(RUBYARCHDIR)/" if $extout
   mfile.print "$(DLLIB): "
@@ -2151,7 +2145,6 @@ COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:]
 RULE_SUBST = config_string('RULE_SUBST')
 COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<'
 COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<'
-COMPILE_OBJC = config_string('COMPILE_OBJC') || COMPILE_C
 TRY_LINK = config_string('TRY_LINK') ||
   "$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \
   "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"