diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index af83c3f95..72f8fa658 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-26  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* mkimport: cd away from temp directory or Windows will have problems
+	removing the directory.
+
 2010-02-26  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/strptime.cc: Implement support for era, alt_digits and POSIX
diff --git a/winsup/cygwin/mkimport b/winsup/cygwin/mkimport
index abca72964..70c81048f 100755
--- a/winsup/cygwin/mkimport
+++ b/winsup/cygwin/mkimport
@@ -80,4 +80,5 @@ for my $f (keys %text) {
 unlink $libdll;
 system $ar, 'crus', $libdll, glob('*.o'), @ARGV;
 unlink glob('*.o');
+chdir '/tmp';	# Allow $dir directory removal on Windows
 exit 1 if $?;