diff --git a/railties/lib/rails/generators/rails/app/templates/bin/setup b/railties/lib/rails/generators/rails/app/templates/bin/setup
index 3a5a2cc1e3a174c48aa7d3029fb066b8ea004bad..0d41f2fe4c0748bb4793e837129594102ea23d77 100644
--- a/railties/lib/rails/generators/rails/app/templates/bin/setup
+++ b/railties/lib/rails/generators/rails/app/templates/bin/setup
@@ -25,5 +25,5 @@ chdir APP_ROOT do
   system 'ruby bin/rake log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  touch 'tmp/restart.txt'
+  system 'ruby bin/rake restart'
 end
diff --git a/railties/lib/rails/tasks/restart.rake b/railties/lib/rails/tasks/restart.rake
index 1e8940b675bb592857d57253f2d08554a9504911..f36c86d81b56f4fb1871acee6823ca1bd062d3a9 100644
--- a/railties/lib/rails/tasks/restart.rake
+++ b/railties/lib/rails/tasks/restart.rake
@@ -1,4 +1,5 @@
 desc "Restart app by touching tmp/restart.txt"
 task :restart do
+  FileUtils.mkdir_p('tmp')
   FileUtils.touch('tmp/restart.txt')
 end
diff --git a/railties/test/application/rake/restart_test.rb b/railties/test/application/rake/restart_test.rb
index 35099913fb00663531fcffbd30a901e807a4986f..4cae199e6ba2be6c167d8ad57b114e0579ff9afb 100644
--- a/railties/test/application/rake/restart_test.rb
+++ b/railties/test/application/rake/restart_test.rb
@@ -13,12 +13,12 @@ def setup
       def teardown
         teardown_app
       end
-      
+
       test 'rake restart touches tmp/restart.txt' do
         Dir.chdir(app_path) do
           `rake restart`
           assert File.exist?("tmp/restart.txt")
-          
+
           prev_mtime = File.mtime("tmp/restart.txt")
           sleep(1)
           `rake restart`
@@ -26,6 +26,14 @@ def teardown
           assert_not_equal prev_mtime, curr_mtime
         end
       end
+
+      test 'rake restart should work even if tmp folder does not exist' do
+        Dir.chdir(app_path) do
+          FileUtils.remove_dir('tmp')
+          `rake restart`
+          assert File.exist?('tmp/restart.txt')
+        end
+      end
     end
   end
 end