diff --git a/src/CHANGELOG b/src/CHANGELOG
index 61f6f63e7..94371948c 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -72,6 +72,8 @@ ECL 1.0
 
   - User break with Ctrl+C is now also capture under Windows.
 
+  - Temporary files are now also cleaned up when exiting via #'QUIT.
+
 * Internals:
 
   - The compiler now uses a more detailed tree to represent the code, keeping
diff --git a/src/c/main.d b/src/c/main.d
index 2cd265c58..a476b3d6d 100644
--- a/src/c/main.d
+++ b/src/c/main.d
@@ -443,6 +443,7 @@ cl_boot(int argc, char **argv)
 	if (!FIXNUMP(code))
 		FEerror("Illegal exit code: ~S.", 1, code);
 	i = fix(code);
+	cl_shutdown();
 	exit(i);
 @)