diff --git a/ChangeLog b/ChangeLog
index e74727b1ac..e3aecd3003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-26  Christian Dywan  <christian@imendio.com>
+
+	Bug 561504 – testgtk should load rc file from sub folder
+
+	* tests/testgtk.c (main):
+        Make testgtk look in subfolder and warn if not found
+
 2008-11-25  Johan Dahlin  <jdahlin@async.com.br>
 
 	Bug 559947 – Unchecked dependency on python>=2.4
diff --git a/tests/testgtk.c b/tests/testgtk.c
index ccb06c8fae..49dc119c30 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -13895,6 +13895,10 @@ main (int argc, char *argv[])
    */
   if (file_exists ("testgtkrc"))
     gtk_rc_add_default_file ("testgtkrc");
+  else if (file_exists ("tests/testgtkrc"))
+    gtk_rc_add_default_file ("tests/testgtkrc");
+  else
+    g_warning ("Couldn't find file \"testgtkrc\".");
 
   g_set_application_name ("GTK+ Test Program");