diff --git a/build.xml b/build.xml
index 8585e91ad..025933546 100644
--- a/build.xml
+++ b/build.xml
@@ -267,7 +267,7 @@
                unless="jdk1.4+" />
       <exclude name="${ant.package}/AntSecurityManager.java"
                unless="jdk1.2+" />
-      <exclude name="${ant.package}/NoExitSecurityManager.java"
+      <exclude name="${ant.package}/util/optional/NoExitSecurityManager.java"
                unless="jdk1.2+" />
       <exclude name="${ant.package}/listener/Log4jListener.java"
                unless="log4j.present" />
diff --git a/src/main/org/apache/tools/ant/ExitException.java b/src/main/org/apache/tools/ant/ExitException.java
index 2dc45f447..09618e333 100644
--- a/src/main/org/apache/tools/ant/ExitException.java
+++ b/src/main/org/apache/tools/ant/ExitException.java
@@ -56,7 +56,7 @@ package org.apache.tools.ant;
 /**
  * Used to report exit status of classes which call System.exit()
  *
- * @see NoExitSecurityManager
+ * @see org.apache.tools.ant.util.optional.NoExitSecurityManager
  *
  * @author Conor MacNeill
  */
diff --git a/src/main/org/apache/tools/ant/NoExitSecurityManager.java b/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java
similarity index 95%
rename from src/main/org/apache/tools/ant/NoExitSecurityManager.java
rename to src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java
index 618e596f5..9a88487c9 100644
--- a/src/main/org/apache/tools/ant/NoExitSecurityManager.java
+++ b/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2001 The Apache Software Foundation.  All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,9 @@
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
-package org.apache.tools.ant;
+package org.apache.tools.ant.util.optional;
+
+import org.apache.tools.ant.ExitException;
 
 import java.security.Permission;