diff --git a/CCache/ccache.c b/CCache/ccache.c
index d1696da88..e7dd1d30a 100644
--- a/CCache/ccache.c
+++ b/CCache/ccache.c
@@ -712,12 +712,13 @@ static void from_cache(int first)
 			passfail = retrieve_from_cache(hashname, output_file, hardlink);
 		}
 
-		free(stderr_file);
 		if (passfail == -1) {
 			close(fd_stderr);
 			unlink(stderr_file);
+			free(stderr_file);
 			return;
 		}
+		free(stderr_file);
 	}
 
 	/* get rid of the intermediate preprocessor file */
diff --git a/CHANGES.current b/CHANGES.current
index 15337ca00..2932b5003 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.9 (in progress)
 ===========================
 
+2012-11-14: [ccache-swig] Apply patch #3586392 from Frederik Deweerdt to fix some error cases - incorrectly using
+            memory after it has been deleted.
+
 2012-11-09: vzeitlin
             [Python] Fix overflow when passing values greater than LONG_MAX from Python 3 for parameters with unsigned long C type.