diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
index b91eb64bcbf69dc670a6345f5fcc58ca27e775e2..19982471f2726e10c48edf04bf894db4e4c6c788 100644
--- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java
+++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
@@ -165,14 +165,10 @@ public class ArtifactArchiver extends Recorder {
             return Messages.ArtifactArchiver_DisplayName();
         }
 
-        public String getHelpFile() {
-            return "/help/project-config/archive-artifact.html";
-        }
-
         /**
          * Performs on-the-fly validation on the file mask wildcard.
          */
-        public void doCheck(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        public void doCheckArtifacts(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
             new FormFieldValidator.WorkspaceFileMask(req,rsp).process();
         }
 
diff --git a/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly b/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly
index 5b6bfba38d7f0a6f82ba1d2d81931682323997d5..841b3f2874592c2a1f28c80ef352dedd8e69e297 100644
--- a/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly
+++ b/core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly
@@ -23,16 +23,15 @@ 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="${%Files to archive}" help="/help/tasks/artifactArchiver/includes.html">
-	  <f:textbox name="artifacts.artifacts" value="${instance.artifacts}"
-               checkUrl="'descriptorByName/ArtifactArchiver/check?value='+escape(this.value)" />
+	<f:entry title="${%Files to archive}" field="artifacts">
+	  <f:textbox />
 	</f:entry>
   <f:advanced>
-    <f:entry title="${%Excludes}" help="/help/tasks/artifactArchiver/excludes.html">
-      <f:textbox name="artifacts.excludes" value="${instance.excludes}"/>
+    <f:entry title="${%Excludes}" field="excludes">
+      <f:textbox />
     </f:entry>
-    <f:entry title="" help="/help/tasks/artifactArchiver/latestOnly.html">
-      <f:checkbox name="artifacts.latestOnly" checked="${instance.latestOnly}" />
+    <f:entry title="" field="latestOnly" >
+      <f:checkbox />
       <label class="attach-previous">${%lastBuildOnly}</label>
     </f:entry>
   </f:advanced>
diff --git a/war/resources/help/tasks/artifactArchiver/includes.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/includes.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts.html
diff --git a/war/resources/help/tasks/artifactArchiver/includes_de.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_de.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/includes_de.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_de.html
diff --git a/war/resources/help/tasks/artifactArchiver/includes_fr.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_fr.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/includes_fr.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_fr.html
diff --git a/war/resources/help/tasks/artifactArchiver/includes_ja.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_ja.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/includes_ja.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_ja.html
diff --git a/war/resources/help/tasks/artifactArchiver/includes_nl.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_nl.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/includes_nl.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_nl.html
diff --git a/war/resources/help/tasks/artifactArchiver/includes_pt_Br.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_pt_br.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/includes_pt_Br.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_pt_br.html
diff --git a/war/resources/help/tasks/artifactArchiver/includes_ru.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_ru.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/includes_ru.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_ru.html
diff --git a/war/resources/help/tasks/artifactArchiver/includes_tr.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_tr.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/includes_tr.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-artifacts_tr.html
diff --git a/war/resources/help/tasks/artifactArchiver/excludes.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/excludes.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes.html
diff --git a/war/resources/help/tasks/artifactArchiver/excludes_de.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_de.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/excludes_de.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_de.html
diff --git a/war/resources/help/tasks/artifactArchiver/excludes_fr.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_fr.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/excludes_fr.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_fr.html
diff --git a/war/resources/help/tasks/artifactArchiver/excludes_ja.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_ja.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/excludes_ja.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_ja.html
diff --git a/war/resources/help/tasks/artifactArchiver/excludes_nl.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_nl.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/excludes_nl.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_nl.html
diff --git a/war/resources/help/tasks/artifactArchiver/excludes_pt_BR.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_pt_br.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/excludes_pt_BR.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_pt_br.html
diff --git a/war/resources/help/tasks/artifactArchiver/excludes_ru.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_ru.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/excludes_ru.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_ru.html
diff --git a/war/resources/help/tasks/artifactArchiver/excludes_tr.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_tr.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/excludes_tr.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-excludes_tr.html
diff --git a/war/resources/help/tasks/artifactArchiver/latestOnly.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help-latestOnly.html
similarity index 100%
rename from war/resources/help/tasks/artifactArchiver/latestOnly.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help-latestOnly.html
diff --git a/war/resources/help/project-config/archive-artifact.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help.html
similarity index 100%
rename from war/resources/help/project-config/archive-artifact.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help.html
diff --git a/war/resources/help/project-config/archive-artifact_de.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help_de.html
similarity index 100%
rename from war/resources/help/project-config/archive-artifact_de.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help_de.html
diff --git a/war/resources/help/project-config/archive-artifact_fr.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help_fr.html
similarity index 100%
rename from war/resources/help/project-config/archive-artifact_fr.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help_fr.html
diff --git a/war/resources/help/project-config/archive-artifact_ja.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help_ja.html
similarity index 100%
rename from war/resources/help/project-config/archive-artifact_ja.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help_ja.html
diff --git a/war/resources/help/project-config/archive-artifact_pt_BR.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help_pt_BR.html
similarity index 100%
rename from war/resources/help/project-config/archive-artifact_pt_BR.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help_pt_BR.html
diff --git a/war/resources/help/project-config/archive-artifact_ru.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help_ru.html
similarity index 100%
rename from war/resources/help/project-config/archive-artifact_ru.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help_ru.html
diff --git a/war/resources/help/project-config/archive-artifact_tr.html b/core/src/main/resources/hudson/tasks/ArtifactArchiver/help_tr.html
similarity index 100%
rename from war/resources/help/project-config/archive-artifact_tr.html
rename to core/src/main/resources/hudson/tasks/ArtifactArchiver/help_tr.html