diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index cb9baa15ae8..a123561d7ba 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-12  Doug Evans  <dje@google.com>
+
+	* gdb.base/fileio.exp: Make $dir2 writable after the test is done
+	so that "rm -rf $builddir" Just Works.
+
 2013-11-12  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.ada/mi_exc_info: New testcase.
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index b9dfb38a212..f77218fe77b 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -253,5 +253,10 @@ gdb_test continue \
 
 gdb_exit
 
+# Make dir2 writable again so rm -rf of a build tree Just Works.
+if {[file exists $dir2] && ![file writable $dir2]} {
+    system "chmod +w $dir2"
+}
+
 set timeout $oldtimeout
 return 0