diff --git a/core/pom.xml b/core/pom.xml
index 41be046f927eef89a69706df4254ef62bfffde4f..d2345b6d3c5205c6fe4c88b0b4f5d06994a68de5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -557,7 +557,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jvnet.hudson</groupId>
       <artifactId>commons-jelly</artifactId>
-      <version>1.1-hudson-20091217</version>
+      <version>1.1-hudson-20091221</version>
     </dependency>
     <dependency>
       <groupId>org.acegisecurity</groupId>
diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
index 0363ab36db04e2875215b82daa15c80e4a1b2d70..3f2860108124680a23e7c36901a4429be7f370c5 100644
--- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Used to asynchronously update executor queue
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form" xmlns:p="/lib/hudson/project">
   <l:ajax>
     <p:matrix autoRefresh="${it.isBuilding()}">
diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/main.jelly b/core/src/main/resources/hudson/matrix/MatrixBuild/main.jelly
index 43bb90fd7a6e0eda1b7372494365f11514e9e21d..1701ef174d889a18aea172cc87076a97bdb35da6 100644
--- a/core/src/main/resources/hudson/matrix/MatrixBuild/main.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixBuild/main.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <st:include page="ajaxMatrix.jelly" />
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
index 1fba0a0a5c70b2054f944d7659665d3b393b631b..3046cc7fb839307f95e9dcc24b96f3a16cc4e686 100644
--- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Used to asynchronously update executor queue
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form" xmlns:p="/lib/hudson/project">
   <l:ajax>
     <p:matrix autoRefresh="true">
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
index 98b075f87d3387bc148daabe4d1399da2bad3efa..2f4a4afcec394bedf89c4ee629ac9b2833a8d052 100644
--- a/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <p:config-disableBuild/>
   <f:section title="${%Advanced Project Options}">
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly
index 0b7da4c17d87c006e2ee690a1827256a00588e47..cdc7fd8e03e2affcabc15b9174cc431cb1f5f12f 100644
--- a/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
   <l:layout title="${it.name}">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.jelly
index 489155118e03e506d52edabdbff76dfe7bd10867..583f693ef4b8404f29909eb5f8c8062382d73114 100644
--- a/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixProject/newJobDetail.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <div>
   ${%body}
 </div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Hudson/configure.jelly b/core/src/main/resources/hudson/model/Hudson/configure.jelly
index 8f2a7ebafed05dc64eb1ac6c7ae82d848ba0206a..1deff4af3e8baf100c0e1a78265482ce2c174421 100644
--- a/core/src/main/resources/hudson/model/Hudson/configure.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/configure.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout norefresh="true" permission="${it.ADMINISTER}">
   <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/User/builds.jelly b/core/src/main/resources/hudson/model/User/builds.jelly
index ba6e3a865ef8fcdb92a934a04acf1017dc7a67ff..c744d02f2d471d2669201e5d3baf2129f4c4ecb1 100644
--- a/core/src/main/resources/hudson/model/User/builds.jelly
+++ b/core/src/main/resources/hudson/model/User/builds.jelly
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName}">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/User/configure.jelly b/core/src/main/resources/hudson/model/User/configure.jelly
index 601c650f16ebc27817f59cf71eef136e70fb21fe..52908cef48deb526fc5890c49c1074127c3ad3cb 100644
--- a/core/src/main/resources/hudson/model/User/configure.jelly
+++ b/core/src/main/resources/hudson/model/User/configure.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Config page
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <!-- TODO: we need a different permission for this page -->
   <!--     <j:when test="${h.currentUser==it or h.hasPermission(app.ADMINISTER)}"> -->
diff --git a/core/src/main/resources/hudson/model/User/delete.jelly b/core/src/main/resources/hudson/model/User/delete.jelly
index 2b227b349d2612462f78d8adae96f4d7f878259e..9731b949dcf7c30dd9e897e840782872ade713d0 100644
--- a/core/src/main/resources/hudson/model/User/delete.jelly
+++ b/core/src/main/resources/hudson/model/User/delete.jelly
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout>
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/User/index.jelly b/core/src/main/resources/hudson/model/User/index.jelly
index 07942cdebe7d9328c66427d7110fe063c9b1f239..9bdb6e1ef15901f3e13026213f31630cf4833773 100644
--- a/core/src/main/resources/hudson/model/User/index.jelly
+++ b/core/src/main/resources/hudson/model/User/index.jelly
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName}">
     <st:include page="sidepanel.jelly" />
diff --git a/core/src/main/resources/hudson/model/User/sidepanel.jelly b/core/src/main/resources/hudson/model/User/sidepanel.jelly
index ce3050a8afd61ea55f7c3892588fca9b6794ba33..0741dcc44352345e342bbe811f7f98f452667cbc 100644
--- a/core/src/main/resources/hudson/model/User/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/User/sidepanel.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Side panel for the user view
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:header />
   <l:side-panel>