diff --git a/ChangeLog b/ChangeLog
index a6a1e78a59..13f93c8803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-02  Sven Neumann  <sven@gimp.org>
+
+	* tools/pdbgen/pdb/guides.pdb
+	* app/pdb/guides_cmds.c: fixed gimp_image_find_next_guide() which
+	was broken for the case when the image had no guides at all. Fixes
+	the hanging rotate plug-in (bug #106823).
+
 2003-03-01  Michael Natterer  <mitch@gimp.org>
 
 	* app/widgets/gimppreviewrenderer.[ch]: added "gint bytes" to the
diff --git a/app/pdb/guides_cmds.c b/app/pdb/guides_cmds.c
index aa81556f72..6b0d9aee00 100644
--- a/app/pdb/guides_cmds.c
+++ b/app/pdb/guides_cmds.c
@@ -298,7 +298,7 @@ image_find_next_guide_invoker (Gimp     *gimp,
 
   if (success)
     {
-      success     = FALSE;
+      success     = (gimage->guides == NULL);
       guide_found = FALSE;
     
       for (guides = gimage->guides; guides; guides = g_list_next (guides))
diff --git a/tools/pdbgen/pdb/guides.pdb b/tools/pdbgen/pdb/guides.pdb
index 4ed70219af..a94115ebf6 100644
--- a/tools/pdbgen/pdb/guides.pdb
+++ b/tools/pdbgen/pdb/guides.pdb
@@ -143,7 +143,7 @@ HELP
 	vars => [ 'GList *guides', 'gboolean guide_found' ],
 	code => <<'CODE'
 {
-  success     = FALSE;
+  success     = (gimage->guides == NULL);
   guide_found = FALSE;
 
   for (guides = gimage->guides; guides; guides = g_list_next (guides))