diff --git a/ChangeLog b/ChangeLog
index c14e9024..8046cf73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-09  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
+
+ * src/build.c: 
+   Fix a memory leak. Based on input by Daniel Marjamäki. Thanks for the
+   catch.
+
+
 2010-09-08  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/ui_utils.h, src/msgwindow.c, src/msgwindow.h, src/main.c:
diff --git a/src/build.c b/src/build.c
index 64be6c43..26a60cfa 100644
--- a/src/build.c
+++ b/src/build.c
@@ -996,7 +996,11 @@ static void process_build_output_line(const gchar *str, gint color)
 	g_strchomp(msg);
 
 	if (! NZV(msg))
+	{
+		if (msg != NULL)
+			g_free(msg);
 		return;
+	}
 
 	if (build_parse_make_dir(msg, &tmp))
 	{