diff --git a/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js b/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
index 806c65725..daa954ad6 100644
--- a/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
+++ b/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
@@ -28,4 +28,3 @@ dojo.widget.manager.registerWidgetPackage('struts.widget');
 
 dojo.require("struts.widget.*");
 dojo.require("dojo.widget.Editor2");
-dojo.hostenv.writeIncludes(); // not needed, but allows the Venkman debugger to work with the includes
diff --git a/plugins/dojo/src/main/resources/template/ajax/head.ftl b/plugins/dojo/src/main/resources/template/ajax/head.ftl
index b063a3f2a..f5dd79866 100644
--- a/plugins/dojo/src/main/resources/template/ajax/head.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/head.ftl
@@ -69,7 +69,13 @@
 
 <script language="JavaScript" type="text/javascript"
         src="${base}/struts/ajax/dojoRequire.js"></script>
+<#if parameters.debug?default(false)>
+<script language="JavaScript" type="text/javascript">
+    dojo.hostenv.writeIncludes(true);
+</script>     
+</#if>        
 <link rel="stylesheet" href="${base}/struts/xhtml/styles.css" type="text/css"/>
+
 <script language="JavaScript" src="${base}/struts/utils.js" type="text/javascript"></script>
 <script language="JavaScript" src="${base}/struts/xhtml/validation.js" type="text/javascript"></script>
 <script language="JavaScript" src="${base}/struts/css_xhtml/validation.js" type="text/javascript"></script>
\ No newline at end of file
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
index 6223ced41..6c58d317b 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
@@ -21,6 +21,10 @@
 <script language="JavaScript" type="text/javascript" src="/struts/ajax/dojoRequire.js">
 </script>
 
+<script language="JavaScript" type="text/javascript">
+    dojo.hostenv.writeIncludes(true);
+</script>
+
 <link rel="stylesheet" href="/struts/xhtml/styles.css" type="text/css"/>
 
 <script language="JavaScript" src="/struts/utils.js" type="text/javascript">