diff --git a/build.xml b/build.xml
index e82b922db..973456442 100644
--- a/build.xml
+++ b/build.xml
@@ -323,7 +323,8 @@
     <delete dir="${dist.dir}/checkstyle-${version}" />
     <mkdir dir="${dist.dir}/checkstyle-${version}" />
     <jar jarfile="${dist.dir}/checkstyle-${version}/checkstyle-${version}.jar"
-         basedir="target/checkstyle" />
+         basedir="target/checkstyle"
+         manifest="config/manifest.mf" />
     <!-- copy the JARS and make a mega JAR out of them -->
     <copy file="${regexp.jar}" todir="${dist.dir}/checkstyle-${version}" />
     <copy file="${antlr.jar}" todir="${dist.dir}/checkstyle-${version}" />
@@ -336,7 +337,8 @@
            dest="${dist.dir}/checkstyle-${version}/tmp" />
     <delete dir="${dist.dir}/checkstyle-${version}/tmp/META-INF" />
     <jar jarfile="${dist.dir}/checkstyle-${version}/checkstyle-all-${version}.jar"
-         basedir="${dist.dir}/checkstyle-${version}/tmp" />
+         basedir="${dist.dir}/checkstyle-${version}/tmp"
+         manifest="config/manifest.mf" />
     <delete dir="${dist.dir}/checkstyle-${version}/tmp" />
     <!-- copy documentation -->
     <copy todir="${dist.dir}/checkstyle-${version}">
@@ -371,17 +373,18 @@
     <mkdir dir="${dist.dir}/checkstyle-src-${version}" />
     <copy todir="${dist.dir}/checkstyle-src-${version}">
       <fileset dir=".">
+        <exclude name="src/checkstyle/**/Generated*.java"/>
+        <exclude name="src/checkstyle/**/Generated*.txt"/>
         <include name="LICENSE*"/>
         <include name="README"/>
         <include name="RIGHTS.antlr"/>
         <include name="TODO"/>
         <include name="build.xml"/>
+        <include name="config/**"/>
         <include name="contrib/**"/>
         <include name="docs/*"/>
-        <include name="src/**"/>
         <include name="lib/**"/>
-        <exclude name="src/checkstyle/**/Generated*.java"/>
-        <exclude name="src/checkstyle/**/Generated*.txt"/>
+        <include name="src/**"/>
       </fileset>
     </copy>
     <!-- Produce the final distributions -->
diff --git a/config/manifest.mf b/config/manifest.mf
new file mode 100644
index 000000000..b7c58b91e
--- /dev/null
+++ b/config/manifest.mf
@@ -0,0 +1 @@
+Main-Class: com.puppycrawl.tools.checkstyle.Main