diff --git a/rakelib/install.rake b/rakelib/install.rake
index b48b54368..3c71b9c2f 100644
--- a/rakelib/install.rake
+++ b/rakelib/install.rake
@@ -146,7 +146,7 @@ module Installer
   end
 
   def xcode4_template_dir
-    "#{xcode_dir}/Library/Xcode/Templates"
+    "~/Library/Developer/Xcode/Templates/Application"
   end
 
   def xcode_usr_bin
@@ -349,13 +349,13 @@ namespace :install do
 
   task :nibtool do
     puts 'Installing IB support'
-    makedirs xcode_usr_bin
-    ln_sfh "#{FRAMEWORK_USR_BIN}/rb_nibtool", xcode_usr_bin
+    ln_sfh "#{FRAMEWORK_USR_BIN}/rb_nibtool", "#{xcode_dir}/Tools/"
   end
 
   task :xcode_templates do
     # TODO only install templates for installed Xcodes
     puts 'Installing XCode templates'
+    makedirs xcode4_template_dir
     install_recursive 'misc/xcode4-templates', xcode4_template_dir, :mode => prog_mode
     install_recursive 'misc/xcode-templates', xcode3_template_dir, :mode => prog_mode
   end