diff --git a/core/src/main/resources/hudson/matrix/JDKAxis/config.jelly b/core/src/main/resources/hudson/matrix/JDKAxis/config.jelly
index 9e82ffbbd7d94eb86bcd2de7ad933002ec2d9a09..767862c2904af61f02a485015b3f81f9472a6111 100644
--- a/core/src/main/resources/hudson/matrix/JDKAxis/config.jelly
+++ b/core/src/main/resources/hudson/matrix/JDKAxis/config.jelly
@@ -26,8 +26,7 @@ THE SOFTWARE.
 <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">
   <f:entry>
     <j:forEach var="jdk" items="${app.JDKs}">
-      <f:checkbox name="values" json="${jdk.name}" checked="${instance.values.contains(jdk.name)}" />
-      <label class="attach-previous">${jdk.name}</label>
+      <f:checkbox name="values" json="${jdk.name}" checked="${instance.values.contains(jdk.name)}" title="${jdk.name}" />
       <st:nbsp/>
     </j:forEach>
   </f:entry>
diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries.jelly b/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
index 37a3a7a2b5fba4c3b22ecbbf570da2927894b36c..57361cffcceaa0e6c9af29c7cc064da89d7f9fd6 100644
--- a/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
+++ b/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
@@ -39,8 +39,8 @@ THE SOFTWARE.
 
   <f:entry title="${%Jobs}">
     <j:forEach var="job" items="${app.items}">
-      <f:checkbox name="${job.name}" checked="${it.contains(job)}" />
-      ${job.name} <br/>
+      <f:checkbox name="${job.name}" checked="${it.contains(job)}" title="${job.name}" />
+      <br/>
     </j:forEach>
   </f:entry>
 
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
index 16ef1fd017b33c3478ac12ca9e1f734a30386815..b3704be5bcddbf3efdeca27434e3c1b16861e47a 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <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">
 	<f:entry title="" help="/help/security/private-realm/allow-signup.html">
-	  <f:checkbox name="privateRealm.allowsSignup" checked="${h.defaultToTrue(instance.allowsSignup())}" />
-    <label class="attach-previous">${%Allow users to sign up}</label>
+	  <f:checkbox name="privateRealm.allowsSignup" checked="${h.defaultToTrue(instance.allowsSignup())}"
+            title="${%Allow users to sign up}"/>
   </f:entry>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/security/csrf/DefaultCrumbIssuer/config.jelly b/core/src/main/resources/hudson/security/csrf/DefaultCrumbIssuer/config.jelly
index 9fa86ab4e804878be46e04bfa142d54eaff607b4..c216bfc3d1ce1872dfca30156ee587685e985cce 100644
--- a/core/src/main/resources/hudson/security/csrf/DefaultCrumbIssuer/config.jelly
+++ b/core/src/main/resources/hudson/security/csrf/DefaultCrumbIssuer/config.jelly
@@ -1,6 +1,5 @@
 <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">
     <f:entry title="" field="excludeClientIPFromCrumb">
-        <f:checkbox checked="${instance.isExcludeClientIPFromCrumb()}" />
-        <label class="attach-previous">${%Enable proxy compatibility}</label>
+        <f:checkbox checked="${instance.isExcludeClientIPFromCrumb()}" title="${%Enable proxy compatibility}" />
     </f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly
index a5a45919e24bd93ea09b69feefff7b10bd510aa0..839dca3a8cef2598736e32830bd872b5eaffccf1 100644
--- a/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly
+++ b/core/src/main/resources/hudson/slaves/SimpleScheduledRetentionStrategy/config.jelly
@@ -35,6 +35,6 @@ THE SOFTWARE.
                checkMessage="${%Scheduled Uptime is mandatory and must be a number.}"/>
     </f:entry>
     <f:entry title="${%Keep on-line while jobs are running}">
-    <f:checkbox name="retentionStrategy.keepUpWhenActive" checked="${h.defaultToTrue(instance.keepUpWhenActive)}"/>
+      <f:checkbox name="retentionStrategy.keepUpWhenActive" checked="${h.defaultToTrue(instance.keepUpWhenActive)}"/>
     </f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly b/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly
index 841b3f2874592c2a1f28c80ef352dedd8e69e297..32d2770cb512d70850dc16c7749e019ca28a2e68 100644
--- a/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly
+++ b/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly
@@ -31,8 +31,7 @@ THE SOFTWARE.
       <f:textbox />
     </f:entry>
     <f:entry title="" field="latestOnly" >
-      <f:checkbox />
-      <label class="attach-previous">${%lastBuildOnly}</label>
+      <f:checkbox title="${%lastBuildOnly}"/>
     </f:entry>
   </f:advanced>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly b/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly
index 2c9a9ab60398b0bfaab38c5033c82f8ed0f9dc15..20404ab40715f92989bdea9d35cdf92649dc5ce0 100644
--- a/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly
+++ b/core/src/main/resources/hudson/tasks/BuildTrigger/config.jelly
@@ -29,8 +29,8 @@ THE SOFTWARE.
 	</f:entry>
   <j:if test="${descriptor.showEvenIfUnstableOption(targetType)}">
     <f:entry title="">
-      <f:checkbox name="evenIfUnstable" checked="${instance.threshold.toString()=='UNSTABLE'}" />
-      <label class="attach-previous">${%Trigger even if the build is unstable}</label>
+      <f:checkbox name="evenIfUnstable" checked="${instance.threshold.toString()=='UNSTABLE'}"
+              title="${%Trigger even if the build is unstable}"/>
     </f:entry>
   </j:if>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/tasks/Fingerprinter/config.jelly b/core/src/main/resources/hudson/tasks/Fingerprinter/config.jelly
index a7062f9f632890f326590583fb0cc1a5bb73129c..a7af0c7aeb1daab1fa64d196edf73ad33ca56ba8 100644
--- a/core/src/main/resources/hudson/tasks/Fingerprinter/config.jelly
+++ b/core/src/main/resources/hudson/tasks/Fingerprinter/config.jelly
@@ -29,12 +29,12 @@ THE SOFTWARE.
                checkUrl="'descriptorByName/Fingerprinter/check?value='+encodeURIComponent(this.value)" />
   </f:entry>
   <f:entry title="">
-    <f:checkbox name="recordBuildArtifacts" checked="${instance.recordBuildArtifacts}" />
-    <label class="attach-previous">${%Fingerprint all archived artifacts}</label>
+    <f:checkbox name="recordBuildArtifacts" checked="${instance.recordBuildArtifacts}"
+            title="${%Fingerprint all archived artifacts}"/>
   </f:entry>
   <!-- keepDependencies is actually a property of the Job, not Fingerprinter: -->
   <f:entry title="" help="/help/tasks/fingerprint/keepDependencies.html">
-    <f:checkbox name="keepDependencies" checked="${it.keepDependencies}" />
-    <label class="attach-previous">${%Keep the build logs of dependencies}</label> 
+    <f:checkbox name="keepDependencies" checked="${it.keepDependencies}"
+            title="${%Keep the build logs of dependencies}"/>
   </f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/tasks/JavadocArchiver/config.jelly b/core/src/main/resources/hudson/tasks/JavadocArchiver/config.jelly
index ba777ec44eadbd5f386439d2464e784c3edb6697..b664e2ba9e575c449bc980bde2671ba64cd590e1 100644
--- a/core/src/main/resources/hudson/tasks/JavadocArchiver/config.jelly
+++ b/core/src/main/resources/hudson/tasks/JavadocArchiver/config.jelly
@@ -29,7 +29,7 @@ THE SOFTWARE.
         checkUrl="'descriptorByName/JavadocArchiver/check?value='+encodeURIComponent(this.value)"/>
   </f:entry>
   <f:entry help="/help/project-config/javadoc-keep-all.html">
-    <f:checkbox name="keep_all" checked="${instance.keepAll}" />
-    <label class="attach-previous">${%Retain Javadoc for each successful build}</label>
+    <f:checkbox name="keep_all" checked="${instance.keepAll}"
+            title="${%Retain Javadoc for each successful build}"/>
   </f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/tasks/Mailer/config.jelly b/core/src/main/resources/hudson/tasks/Mailer/config.jelly
index ca806221b57b32dcc743b8ba25a5e00bd237d237..7c53e5d57d51addf5fdd2b8d7dafc8863c9b4ee5 100644
--- a/core/src/main/resources/hudson/tasks/Mailer/config.jelly
+++ b/core/src/main/resources/hudson/tasks/Mailer/config.jelly
@@ -27,12 +27,11 @@ THE SOFTWARE.
     <f:textbox name="mailer_recipients" value="${instance.recipients}"/>
   </f:entry>
   <f:entry title="">
-    <f:checkbox name="mailer_notifyEveryUnstableBuild" checked="${h.defaultToTrue(!instance.dontNotifyEveryUnstableBuild)}" />
-    <label class="attach-previous">${%Send e-mail for every unstable build}</label>
+    <f:checkbox name="mailer_notifyEveryUnstableBuild" checked="${h.defaultToTrue(!instance.dontNotifyEveryUnstableBuild)}"
+            title="${%Send e-mail for every unstable build}"/>
   </f:entry>
   <f:entry title="" help="/help/tasks/mailer/sendToindividuals.html">
     <f:checkbox name="mailer_sendToIndividuals" checked="${instance.sendToIndividuals}"
-        />
-    <label class="attach-previous">${%Send separate e-mails to individuals who broke the build}</label>
+        title="${%Send separate e-mails to individuals who broke the build}"/>
   </f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config.jelly b/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config.jelly
index b1e4d3f038e801b60090896c79e3fe787f4113db..37436e5d3d4de642e392e28b2c4e31740eb5d394 100644
--- a/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config.jelly
+++ b/core/src/main/resources/hudson/tasks/junit/JUnitResultArchiver/config.jelly
@@ -30,8 +30,7 @@ THE SOFTWARE.
 		<f:textbox />
 	</f:entry>
 	<f:entry field="keepLongStdio" title="">
-		<f:checkbox name="keepLongStdio" checked="${instance.keepLongStdio}"/>
-		<label class="attach-previous">${%Retain long standard output/error}</label>
+		<f:checkbox name="keepLongStdio" checked="${instance.keepLongStdio}" title="${%Retain long standard output/error}"/>
 	</f:entry>
 	<j:invokeStatic var="testDataPublisherDescriptors"
 		className="hudson.tasks.junit.TestDataPublisher" method="all" />
diff --git a/core/src/main/resources/hudson/tools/JDKInstaller/config.jelly b/core/src/main/resources/hudson/tools/JDKInstaller/config.jelly
index 2f3c49982a612b1c71afb06641b0b4afcbfb5e9b..13bb137598fc5f1ee202ecf69aa659a061b0b50d 100644
--- a/core/src/main/resources/hudson/tools/JDKInstaller/config.jelly
+++ b/core/src/main/resources/hudson/tools/JDKInstaller/config.jelly
@@ -44,7 +44,6 @@ THE SOFTWARE.
     </j:choose>
   </f:entry>
   <f:entry title="" field="acceptLicense">
-    <f:checkbox/>
-    <label class="attach-previous">${%I agree to the Java SE Development Kit License Agreement}</label>
+    <f:checkbox title="${%I agree to the Java SE Development Kit License Agreement}"/>
   </f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/lib/form/checkbox.jelly b/core/src/main/resources/lib/form/checkbox.jelly
index 5e9ba3894b381111d96fbd73aed72a3fa232fb44..c5877914058bb671d36f5a2dc81761d0b7439906 100644
--- a/core/src/main/resources/lib/form/checkbox.jelly
+++ b/core/src/main/resources/lib/form/checkbox.jelly
@@ -46,6 +46,10 @@ THE SOFTWARE.
     <st:attribute name="field">
       Used for databinding. TBD.
     </st:attribute>
+    <st:attribute name="title">
+      If specified, this human readable text will follow the checkbox, and clicking this text also
+      toggles the checkbox.
+    </st:attribute>
   </st:documentation>
   <f:prepareDatabinding />
   <input type="checkbox"
@@ -54,4 +58,10 @@ THE SOFTWARE.
          onclick="${attrs.onclick}" id="${attrs.id}" class="${attrs.negative!=null ? 'negative' : null} ${attrs.checkUrl!=null?'validated':''}"
          checkUrl="${attrs.checkUrl}" json="${attrs.json}"
          checked="${(attrs.checked ?: instance[attrs.field] ?: attrs.default) ? 'true' : null}"/>
+  <j:if test="${attrs.title!=null}">
+    <label class="attach-previous">
+      <j:whitespace> </j:whitespace>
+      ${attrs.title}
+    </label>
+  </j:if>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/form/optionalBlock.jelly b/core/src/main/resources/lib/form/optionalBlock.jelly
index 4bcbcc3cc485874ca3c78465916c20c1978524b2..5602254766a5db0e38c572a30535d40054b62949 100644
--- a/core/src/main/resources/lib/form/optionalBlock.jelly
+++ b/core/src/main/resources/lib/form/optionalBlock.jelly
@@ -62,9 +62,7 @@ THE SOFTWARE.
   <tr class="optional-block-start ${attrs.inline?'':'row-set-start'}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning -->
     <td colspan="3">
       <f:checkbox name="${attrs.name}" onclick="javascript:updateOptionalBlock(this,true)"
-                  negative="${attrs.negative}" checked="${attrs.checked}" field="${attrs.field}" />
-      <st:nbsp/>
-      <label class="attach-previous">${title}</label>
+                  negative="${attrs.negative}" checked="${attrs.checked}" field="${attrs.field}" title="${title}" />
     </td>
     <j:if test="${attrs.help!=null}">
       <td>
diff --git a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly
index 6fed304baffd7e5bb5dd8458aaf7fc55cc5c7f3d..a934c4bec59ba52640c9205d252c3455a529f008 100644
--- a/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly
+++ b/maven-plugin/src/main/resources/hudson/maven/RedeployPublisher/config.jelly
@@ -31,13 +31,11 @@ THE SOFTWARE.
       <f:textbox />
     </f:entry>
     <f:entry field="uniqueVersion">
-      <f:checkbox />
-      <label class="attach-previous">${%Assign unique versions to snapshots}</label>
+      <f:checkbox title="${%Assign unique versions to snapshots}"/>
     </f:entry>
     <j:if test="${descriptor.showEvenIfUnstableOption()}">
       <f:entry field="evenIfUnstable">
-        <f:checkbox />
-        <label>${%Deploy even if the build is unstable}</label>
+        <f:checkbox title="${%Deploy even if the build is unstable}" />
       </f:entry>
     </j:if>
   </f:advanced>
diff --git a/ui-samples-plugin/src/main/resources/hudson/plugins/ui_samples/DropdownList/Banana/config.jelly b/ui-samples-plugin/src/main/resources/hudson/plugins/ui_samples/DropdownList/Banana/config.jelly
index 0792f815e6845619eab547e1778ecd88b50b3e80..8079626f8cf3603efe4dfb1215064ca62963d527 100644
--- a/ui-samples-plugin/src/main/resources/hudson/plugins/ui_samples/DropdownList/Banana/config.jelly
+++ b/ui-samples-plugin/src/main/resources/hudson/plugins/ui_samples/DropdownList/Banana/config.jelly
@@ -24,6 +24,6 @@ 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">
 <f:entry title="">
-  <f:checkbox name="yellow" checked="${fruit.yellow}"/> Yellow?
+  <f:checkbox name="yellow" checked="${fruit.yellow}" title="Yellow?"/>
 </f:entry>
 </j:jelly>