diff --git a/core/src/main/resources/lib/form/repeatable.jelly b/core/src/main/resources/lib/form/repeatable.jelly
index 2671320631f14b01c667b9215212351ab558ba8c..e5fa81394cec997584a19c77daac1ef84a154dfe 100644
--- a/core/src/main/resources/lib/form/repeatable.jelly
+++ b/core/src/main/resources/lib/form/repeatable.jelly
@@ -53,9 +53,9 @@
 <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">
   <j:set var="id" value="${h.generateId()}"/>
 
-  <div class="repeated-container" id="block${id}-container">
-    <!-- this is the master copy -->
-    <div id="block${id}-master" class="repeated-chunk" style="display:none">
+  <div class="repeated-container">
+    <!-- The first DIV is the master copy. -->
+    <div class="repeated-chunk" style="display:none">
       <d:invokeBody />
     </div>
     <!-- then populate them for each item -->
@@ -75,15 +75,9 @@
       </j:forEach>
     </j:if>
 
-    <div id="block${id}-insertion-point" />
+    <div class="repeatable-insertion-point" />
     <j:if test="${!attrs.noAddButton}">
       <input type="button" value="Add" class="repeatable-add" />
     </j:if>
   </div>
-  <script>
-    object(repetableSupport).init(
-      'block${id}-container',
-      'block${id}-master',
-      'block${id}-insertion-point');
-  </script>
 </j:jelly>
\ No newline at end of file
diff --git a/war/resources/scripts/hudson-behavior.js b/war/resources/scripts/hudson-behavior.js
index d4e1cc82dc63aed263e733d862699259f5150f72..35bb2af3235f8b6746f33d103a3234383d98ec6e 100644
--- a/war/resources/scripts/hudson-behavior.js
+++ b/war/resources/scripts/hudson-behavior.js
@@ -184,6 +184,15 @@ var hudsonRules = {
         e.onclick = function() {
             repetableSupport.onDelete(this);
         };
+    },
+
+    "DIV.repeated-container" : function(e) {
+        // compute the insertion point
+        var ip = e.lastChild;
+        while(!Element.hasClassName(ip,"repeatable-insertion-point"))
+            ip = ip.previousSibling;
+        // set up the logic
+        object(repetableSupport).init( e, e.firstChild, ip);
     }
 };