diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 4dc05c2780e..d6188abd14e 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -41,9 +41,9 @@ class TopicsController < ApplicationController
     anonymous_etag(@topic_view.topic) do
       redirect_to_correct_topic && return if slugs_do_not_match
 
-      # render workaround pseudo-static HTML page for Yandex crawler (if enabled)
+      # render workaround pseudo-static HTML page for old crawlers which ignores <noscript>
       # (see http://meta.discourse.org/t/noscript-tag-and-some-search-engines/8078)
-      return render 'topics/plain', layout: false if (SiteSetting.yandex_workaround && params.has_key?('_escaped_fragment_'))
+      return render 'topics/plain', layout: false if (SiteSetting.enable_escaped_fragments && params.has_key?('_escaped_fragment_'))
 
       View.create_for(@topic_view.topic, request.remote_ip, current_user)
       track_visit_to_topic
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a902e0f74b9..606936b19f6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -78,9 +78,9 @@ module ApplicationHelper
       end
     end
 
-    # Add workaround tag for Yandex crawler
-    # (see http://help.yandex.ru/webmaster/?id=1125296)
-    result << tag('meta', name: "fragment", content: "!") if SiteSetting.yandex_workaround
+    # Add workaround tag for old crawlers which ignores <noscript>
+    # (see https://developers.google.com/webmasters/ajax-crawling/docs/specification)
+    result << tag('meta', name: "fragment", content: "!") if SiteSetting.enable_escaped_fragments
 
     result
   end
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index 6dc25428d57..85dace207b4 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -26,7 +26,8 @@ class SiteSetting < ActiveRecord::Base
   client_setting(:must_approve_users, false)
   client_setting(:ga_tracking_code, "")
   client_setting(:ga_domain_name, "")
-  client_setting(:yandex_workaround, false)
+  client_setting(:enable_escaped_fragments, false)
+  client_setting(:enable_noscript_support, true)
   client_setting(:enable_long_polling, true)
   client_setting(:polling_interval, 3000)
   client_setting(:anon_polling_interval, 30000)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 85efbd0345d..f2446deebc8 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -500,7 +500,8 @@ en:
     must_approve_users: "Admins must approve all users before they gain access"
     ga_tracking_code: "Google analytics tracking code code, eg: UA-12345678-9; see http://google.com/analytics"
     ga_domain_name: "Google analytics domain name, eg: mysite.com; see http://google.com/analytics"
-    yandex_workaround: "Enable workaround solution to help Yandex crawler (http://www.yandex.com) index your site. WARNING: enable it only if you are really have to do it."
+    enable_escaped_fragments: "Enable workaround solution to help old crawlers to index your site. WARNING: enable it only if you are really have to do it."
+    enable_noscript_support: "Enable supporting &lt;noscipt&gt; tag"
     top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|hot|read|favorited|unread|new|posted|categories"
     post_menu: "Determine which items appear on the post menu, and in what order. Example like|edit|flag|delete|share|bookmark|reply"
     share_links: "Determine which items appear on the share dialog, and in what order. Example twitter|facebook|google+|email"