diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
index f3a54b8ddc..aed4644290 100644
--- a/ext/iconv/charset_alias.rb
+++ b/ext/iconv/charset_alias.rb
@@ -1,4 +1,5 @@
 #! /usr/bin/ruby
+# :stopdoc:
 require 'rbconfig'
 require 'optparse'
 
@@ -27,13 +28,12 @@ end
 def charset_alias(config_charset, mapfile, target = OS)
   map = Hash::Ordered.new
   comments = []
-  match = false
   open(config_charset) do |input|
-    input.find {|line| /^case "\$os" in/ =~ line} or return
+    input.find {|line| /^case "\$os" in/ =~ line} or break
     input.find {|line|
       /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/ =~ line and
       $&.split('|').any? {|pattern| File.fnmatch?(pattern.strip, target)}
-    } or return
+    } or break
     input.find do |line|
       case line
       when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/
@@ -50,7 +50,7 @@ def charset_alias(config_charset, mapfile, target = OS)
   end
   case target
   when /linux|-gnu/
-#    map.delete('ascii')
+    # map.delete('ascii')
   when /cygwin|os2-emx/
     # get rid of tilde/yen problem.
     map['shift_jis'] = 'cp932'
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
index 71221d60a1..c6e5fa1244 100644
--- a/ext/iconv/extconf.rb
+++ b/ext/iconv/extconf.rb
@@ -27,8 +27,12 @@ if have_func("iconv", "iconv.h") or
   if conf
     prefix = '$(srcdir)'
     prefix =  $nmake ? "{#{prefix}}" : "#{prefix}/"
-    wrapper = "./iconv.rb"
-    $INSTALLFILES = [[wrapper, "$(RUBYARCHDIR)"]]
+    if $extout
+      wrapper = "$(RUBYARCHDIR)/iconv.rb"
+    else
+      wrapper = "./iconv.rb"
+      $INSTALLFILES = [[wrapper, "$(RUBYARCHDIR)"]]
+    end
     if String === conf
       require 'uri'
       scheme = URI.parse(conf).scheme