diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index d12a1f21f8814eb86e75497cd28f8760e00c2de3..8963f6e60492d9de2cda17763c5181ff34cd91b1 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Removal of all javascript stuff (gems and files) when generating a new
+    application using the `--skip-javascript` option.
+
+    *Robin Dupret*
+
 *   Make the application name snake cased when it contains spaces
 
     The application name is used to fill the `database.yml` and
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 6f1b7e2218d71795b1ac9ea62abe7ef6be1bb38b..e65a0b1de05e70ec4ebe495211c0933c1ed0e3eb 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -207,13 +207,6 @@ def assets_gemfile_entry
           gem 'uglifier', '>= 1.3.0'
         GEMFILE
 
-        if options[:skip_javascript]
-          gemfile += <<-GEMFILE
-            #{coffee_gemfile_entry}
-            #{javascript_runtime_gemfile_entry}
-          GEMFILE
-        end
-
         gemfile.gsub(/^[ \t]+/, '')
       end
 
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index db6b11abfa590d3d106611b216964328788ae247..095a165fc0f8e2183e0e195cd1511c1f45870429 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -129,7 +129,9 @@ def vendor
     end
 
     def vendor_javascripts
-      empty_directory_with_keep_file 'vendor/assets/javascripts'
+      unless options[:skip_javascript]
+        empty_directory_with_keep_file 'vendor/assets/javascripts'
+      end
     end
 
     def vendor_stylesheets
@@ -225,6 +227,12 @@ def finish_template
         build(:leftovers)
       end
 
+      def delete_js_folder_skipping_javascript
+        if options[:skip_javascript]
+          remove_dir 'app/assets/javascripts'
+        end
+      end
+
       public_task :apply_rails_template, :run_bundle
 
     protected
diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
index c3d1578818b09dc899b56d5609b711a13fa1e610..4cf47bd0a09d9b1d699005074af82d2f6af5f846 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -4,7 +4,6 @@
   <title><%= camelized %></title>
   <%- if options[:skip_javascript] -%>
   <%%= stylesheet_link_tag    "application", media: "all" %>
-  <%%= javascript_include_tag "application" %>
   <%- else -%>
   <%%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
   <%%= javascript_include_tag "application", "data-turbolinks-track" => true %>
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 24f01c878c80d24eafd3737ac600c2ceefcf4e08..9b0c9ebf5beac575e4d8910d333a90221ac20ced 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -298,15 +298,17 @@ def test_other_javascript_libraries
 
   def test_javascript_is_skipped_if_required
     run_generator [destination_root, "--skip-javascript"]
-    assert_file "app/assets/javascripts/application.js" do |contents|
-      assert_no_match %r{^//=\s+require\s}, contents
-    end
+
+    assert_no_file "app/assets/javascripts"
+    assert_no_file "vendor/assets/javascripts"
+
     assert_file "app/views/layouts/application.html.erb" do |contents|
       assert_match(/stylesheet_link_tag\s+"application", media: "all" %>/, contents)
-      assert_match(/javascript_include_tag\s+"application" \%>/, contents)
+      assert_no_match(/javascript_include_tag\s+"application" \%>/, contents)
     end
+
     assert_file "Gemfile" do |content|
-      assert_match(/coffee-rails/, content)
+      assert_no_match(/coffee-rails/, content)
     end
   end