diff --git a/ChangeLog b/ChangeLog
index 5ced0fa0ee..ecd5a2c244 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-06  Sven Neumann  <sven@gimp.org>
+
+	* libgimpwidgets/gimpcolorprofilestore.c
+	(gimp_color_profile_store_load_profile): check if the file exists
+	before adding it to the history. Fixes bug #528958.
+
 2008-05-05  Michael Natterer  <mitch@gimp.org>
 
 	* app/actions/drawable-commands.c
diff --git a/libgimpwidgets/gimpcolorprofilestore.c b/libgimpwidgets/gimpcolorprofilestore.c
index ab73b2914d..ada4ae92af 100644
--- a/libgimpwidgets/gimpcolorprofilestore.c
+++ b/libgimpwidgets/gimpcolorprofilestore.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
  * gimpprofilestore.c
- * Copyright (C) 2004-2007  Sven Neumann <sven@gimp.org>
+ * Copyright (C) 2004-2008  Sven Neumann <sven@gimp.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -590,9 +590,11 @@ gimp_color_profile_store_load_profile (GimpColorProfileStore *store,
     {
       gchar *filename = g_filename_from_uri (uri, NULL, NULL);
 
-      if (filename)
-        gimp_color_profile_store_history_insert (store, &iter,
-                                                 filename, label, index);
+      if (filename && g_file_test (filename, G_FILE_TEST_IS_REGULAR))
+        {
+          gimp_color_profile_store_history_insert (store, &iter,
+                                                   filename, label, index);
+        }
 
       g_free (filename);
       g_free (label);