diff --git a/WHATSNEW b/WHATSNEW
index a45adf281..ebb4c7063 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -26,7 +26,9 @@ Other changes:
 
 * <loadproperties> supports loading from a resource.
 
-* <fail> accepts nested conditions.
+* <fail> accepts a nested <condition>.
+
+* Changed default tempdir for <javac> from user.dir to java.io.tmpdir.
 
 Changes from Ant 1.6.1 to current Ant 1.6 CVS version
 =====================================================
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
index 3b4451dbf..eae0a305a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -396,12 +396,8 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
                 && firstFileName >= 0) {
                 PrintWriter out = null;
                 try {
-                    File userDir = getJavac().getTempdir();
-                    if (userDir == null) {
-                        String userDirName = System.getProperty("user.dir");
-                        userDir = new File(userDirName);
-                    }
-                    tmpFile = fileUtils.createTempFile("files", "", userDir);
+                    tmpFile = fileUtils.createTempFile(
+                        "files", "", getJavac().getTempdir());
                     tmpFile.deleteOnExit();
                     out = new PrintWriter(new FileWriter(tmpFile));
                     for (int i = firstFileName; i < args.length; i++) {