diff --git a/documentation/manual/tags.textile b/documentation/manual/tags.textile
index e446af1ab7..52b728d8f8 100644
--- a/documentation/manual/tags.textile
+++ b/documentation/manual/tags.textile
@@ -287,6 +287,14 @@ Optionally, you can restrict the tag to only some messages. The wildcard charact
 
 bc. #{i18n keys:['title', 'menu.*'] /}
 
+By default, the #{i18n /} tag renders a
+
+bc. <script type="text/javascript">...</script>
+
+tag around the generated JavaScript. You can hide this tag by setting @noScriptTag@ to @true@:
+
+bc. #{i18n keys:['title', 'menu.*'], noScriptTag:true /}
+
 h2. <a name="if">if</a>
 
 Evaluates the given test, and if true, evaluates the tag body.
diff --git a/framework/templates/tags/i18n.tag b/framework/templates/tags/i18n.tag
index a2894f2df8..33e4f19d0c 100644
--- a/framework/templates/tags/i18n.tag
+++ b/framework/templates/tags/i18n.tag
@@ -6,8 +6,9 @@ if (_keys) {
 }
 js_messages=new com.google.gson.Gson().toJson(ymessages);
 }%
+#{if !_noScriptTag}
 <script type="text/javascript">
-
+#{/if}
 var i18nMessages = ${js_messages};
 
 /**
@@ -40,5 +41,6 @@ var i18n = function(code) {
     }
     return message;
 };
-
+#{if !_noScriptTag}
 </script>
+#{/if}