diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml
new file mode 100644
index 000000000..e00eb4ae3
--- /dev/null
+++ b/src/etc/testcases/taskdefs/jar.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+
+<project name="jar-test" basedir=".">
+
+  <target name="test1">
+    <jar/>
+  </target>
+
+  <target name="test2">
+    <jar
+    	jarfile="jar.tmp"
+    	manifest="none"
+    />
+  </target>
+
+  <target name="test3">
+    <jar
+    	jarfile="jar.tmp"
+	whenempty="format C: /y" 
+    />
+  </target>
+
+  <target name="test4">
+   <!-- delete the tmp.jar or the next test will fail -->
+   <delete file="tmp.jar"/>
+   <jar
+    	jarfile="tmp.jar"
+	basedir="."
+	includes="jar.xml"
+    />
+  </target>
+
+  <!-- This test is to make sure upToDate is working -->
+  <target name="test5">
+    <jar
+    	jarfile="tmp.jar"
+	basedir="."
+	includes="jar.xml"
+    />
+  </target>
+
+</project>
\ No newline at end of file
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java
index 215c1f4c0..825a8f2ce 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java
@@ -75,6 +75,12 @@ public class Jar extends Zip {
         emptyBehavior = "create";
     }
 
+    public void execute() {
+        if (manifest != null && !manifest.exists())
+            throw new BuildException("Manifest file: " + manifest + " does not exists.");
+        super.execute();
+    }
+
     public void setJarfile(File jarFile) {
         super.setZipfile(jarFile);
     }
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
new file mode 100644
index 000000000..36b4932b5
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
@@ -0,0 +1,100 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.taskdefs;
+
+import java.io.File;
+import java.util.Date;
+
+/**
+ * @author Erik Meade <emeade@geekfarm.org>
+ */
+public class JarTest extends TaskdefsTest {
+
+    private static long jarModifiedDate;
+    private static String tempJar = "src/etc/testcases/taskdefs/tmp.jar";
+
+    public JarTest(String name) {
+        super(name);
+    }
+
+    public void setUp() {
+        configureProject("src/etc/testcases/taskdefs/jar.xml");
+    }
+
+    public void test1() {
+        expectBuildException("test1", "required argument not specified");
+    }
+
+    public void test2() {
+        expectBuildException("test2", "manifect file does not exist");
+    }
+
+    public void test3() {
+        expectBuildException("test3", "Unrecognized whenempty attribute: format C: /y");
+    }
+
+    public void test4() {
+        executeTarget("test4");
+        File jarFile = new File(tempJar);
+        assert(jarFile.exists());
+        jarModifiedDate = jarFile.lastModified();
+    }
+
+    public void XXXtest5() {
+        executeTarget("test5");
+        File jarFile = new File(tempJar);
+        assertEquals(jarModifiedDate, jarFile.lastModified());
+    }
+}