diff --git a/ChangeLog b/ChangeLog
index 6cdcfd7f78..1c3308463f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 30 19:58:16 2017  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir
+	  not includedir, the latter is outside the ruby installation.
+	  [ruby-core:72496] [Bug #11881]
+
 Fri Jun 30 19:56:06 2017  Eric Wong  <e@80x24.org>
 
 	* variable.c (check_autoload_required): do not assume a provided feature
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index fdba7097d6..c14d1ef715 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -131,7 +131,7 @@ File.foreach "config.status" do |line|
       if universal
         val.sub!(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || '\&'}])
       end
-    when /^includedir$/
+    when /^oldincludedir$/
       val = '"$(SDKROOT)"'+val if /darwin/ =~ arch
     end
     v = "  CONFIG[\"#{name}\"] #{eq} #{val}\n"
diff --git a/version.h b/version.h
index 7a52ff7c21..bb57cf7181 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.5"
 #define RUBY_RELEASE_DATE "2017-06-30"
-#define RUBY_PATCHLEVEL 318
+#define RUBY_PATCHLEVEL 319
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 6