diff --git a/WHATSNEW b/WHATSNEW
index a8676b3a4..459215d30 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -120,6 +120,8 @@ Fixed bugs:
   execution dir relative executable. The resolveExecutable must be used to 
   pick up such executables.
 
+* splash screen would disppear when build was finished.
+
 Other changes:
 --------------
 * The filesetmanifest attribute of <jar> has been reenabled.
diff --git a/build.xml b/build.xml
index 83215b493..a2554fefc 100644
--- a/build.xml
+++ b/build.xml
@@ -1516,8 +1516,9 @@
           <exclude name="org/example/**"/>
           <exclude name="${ant.package}/taskdefs/TaskdefTest*Task.java"/>
 
-          <!-- interactive test -->
+          <!-- interactive tests -->
           <exclude name="${ant.package}/taskdefs/TestProcess.java"/>
+          <exclude name="${optional.package}/splash/SplashScreenTest.java"/>
 
           <!-- only run these tests if their required libraries are
                installed -->
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java
index 76ac67fc9..859af7873 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -139,7 +139,11 @@ class SplashScreen extends JWindow implements ActionListener, BuildListener {
     }
 
     public void buildStarted(BuildEvent event){ actionPerformed(null);}
-    public void buildFinished(BuildEvent event){actionPerformed(null);}
+    public void buildFinished(BuildEvent event){
+        pb.setValue(max);
+        setVisible(false);
+        dispose();
+    }
     public void targetStarted(BuildEvent event){actionPerformed(null);}
     public void targetFinished(BuildEvent event){actionPerformed(null);}
     public void taskStarted(BuildEvent event){actionPerformed(null);}
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java
new file mode 100644
index 000000000..43368f0ee
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java
@@ -0,0 +1,92 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 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", "Ant", 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.optional.splash;
+
+import org.apache.tools.ant.Project;
+
+/**
+ * This is an "interactive" test, it passes if the splash screen
+ * disappears after the "finished" but before the "exiting" message.
+ *
+ * This even isn't a JUnit test case.
+ *
+ * @since Ant 1.5.2
+ */
+public class SplashScreenTest {
+
+    public static void main(String[] args) {
+        Project p = new Project();
+        SplashTask t = new SplashTask();
+        t.setProject(p);
+        t.execute();
+
+        // give it some time to display
+        try {
+            Thread.currentThread().sleep(2000);
+        } catch (InterruptedException e) {
+        } // end of try-catch
+
+        p.fireBuildFinished(null);
+        System.err.println("finished");
+
+        try {
+            Thread.currentThread().sleep(2000);
+        } catch (InterruptedException e) {
+        } // end of try-catch
+        System.err.println("exiting");
+        System.exit(0);
+    }
+}
+