diff --git a/ChangeLog b/ChangeLog
index 631a3bd2..943be33b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
  * plugins/filebrowser.c:
    Implement reading and evaluating hidden file attribute on Windows.
    Fix broken "Go Up" if the current path ends with a slash.
+ * THANKS, src/about.c, src/prefix.c:
+   Replace free() by g_free() (patch by Daniel Marjamaki, thanks).
 
 
 2010-05-15  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
diff --git a/THANKS b/THANKS
index 01826107..db33dfac 100644
--- a/THANKS
+++ b/THANKS
@@ -78,6 +78,7 @@ Can Koy <cankoy(at)ymail(dot)com> - Multiple changes/improvements
 Yoann Le Montagner <yoann(dot)le-montagner(at)m4x(dot)org> - set VTE bold color
 Dimitar Zhekov <hamster(at)mbox(dot)contact(dot)bg> - matching brace improvements patch
 Ondrej Donek <ondrejd(at)gmail(dot)com> - Support for creating PHP classes with the classbuilder plugin
+Daniel Marjamaki <danielm77(at)spray(dot)se> - Small improvements
 
 Translators:
 ------------
diff --git a/src/about.c b/src/about.c
index 94a70682..82c072ac 100644
--- a/src/about.c
+++ b/src/about.c
@@ -84,7 +84,8 @@ static const gint prev_translators_len = G_N_ELEMENTS(prev_translators);
 static const gchar *contributors =
 "Alexander Rodin, Alexey Antipov, Andrew Rowland, Anh Phạm, blackdog, Bo Lorentsen, Bob Doan, "
 "Bronisław Białek, Can Koy, Catalin Marinas, "
-"Chris Macksey, Christoph Berg, Colomban Wendling, Conrad Steenberg, Daniel Richard G., Dave Moore, "
+"Chris Macksey, Christoph Berg, Colomban Wendling, Conrad Steenberg, Daniel Richard G., "
+"Daniel Marjamaki, Dave Moore, "
 "Dimitar Zhekov, Dirk Weber, Elias Pschernig, Eric Forgeot, Eugene Arshinov, Felipe Pena, François Cami, "
 "Giuseppe Torelli, Guillaume de Rorthais, Guillaume Hoffmann, Herbert Voss, Jason Oster, "
 "Jean-François Wauthy, Jeff Pohlmeyer, Jesse Mayes, John Gabriele, Jon Senior, Jon Strait, Josef Whiter, "
diff --git a/src/prefix.c b/src/prefix.c
index f420d6dd..f06380d0 100644
--- a/src/prefix.c
+++ b/src/prefix.c
@@ -206,18 +206,18 @@ br_extract_prefix (const char *path)
 	tmp = g_strndup ((char *) path, end - path);
 	if (!*tmp)
 	{
-		free (tmp);
+		g_free (tmp);
 		return strdup ("/");
 	}
 	end = strrchr (tmp, '/');
 	if (!end) return tmp;
 
 	result = g_strndup (tmp, end - tmp);
-	free (tmp);
+	g_free (tmp);
 
 	if (!*result)
 	{
-		free (result);
+		g_free (result);
 		result = strdup ("/");
 	}