diff --git a/ChangeLog b/ChangeLog
index 6db823fe5c..ec45b2c276 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jan  6 20:55:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): ignore rest from first dot from
+	  TARGET to generate init function name.
+	  this is followup of r30464.
+
 Thu Jan  6 11:27:01 2011  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index a4388862a3..0b39551033 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1895,7 +1895,7 @@ def create_makefile(target, srcprefix = nil)
         makedef = %{-pe "$_.sub!(/^(?=\\w)/,'#{EXPORT_PREFIX}') unless 1../^EXPORTS$/i"}
       end
     else
-      makedef = %{-e "puts 'EXPORTS', '#{EXPORT_PREFIX}Init_$(TARGET)'"}
+      makedef = %{-e "puts 'EXPORTS', '#{EXPORT_PREFIX}' + 'Init_$(TARGET)'.sub(/\\..*\\z/,'')"}
     end
     if makedef
       $cleanfiles << '$(DEFFILE)'