diff --git a/ChangeLog b/ChangeLog
index 3332f11199..b9a3f9549a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-18  Sven Neumann  <sven@gimp.org>
+
+	* app/pdb/parasite_cmds.c
+	* tools/pdbgen/pdb/parasite.pdb: fixed nasty bug in perl expression
+	that caused all parasite PDB functions to work on global gimp parasites
+	instead of image and drawable ones.
+	
 2001-09-17  Sven Neumann  <sven@gimp.org>
 
 	* app/gimprc.c (gimprc_init): 
diff --git a/app/pdb/parasite_cmds.c b/app/pdb/parasite_cmds.c
index 87683e1e96..d8f64334c7 100644
--- a/app/pdb/parasite_cmds.c
+++ b/app/pdb/parasite_cmds.c
@@ -277,7 +277,7 @@ drawable_parasite_find_invoker (Gimp     *gimp,
 
   if (success)
     {
-      parasite = gimp_parasite_copy (gimp_parasite_find (gimp, name));
+      parasite = gimp_parasite_copy (gimp_drawable_parasite_find (drawable, name));
       success = parasite != NULL;
     }
 
@@ -345,7 +345,7 @@ drawable_parasite_attach_invoker (Gimp     *gimp,
     success = FALSE;
 
   if (success)
-    gimp_parasite_attach (gimp, parasite);
+    gimp_drawable_parasite_attach (drawable, parasite);
 
   return procedural_db_return_args (&drawable_parasite_attach_proc, success);
 }
@@ -397,7 +397,7 @@ drawable_parasite_detach_invoker (Gimp     *gimp,
     success = FALSE;
 
   if (success)
-    gimp_parasite_detach (gimp, name);
+    gimp_drawable_parasite_detach (drawable, name);
 
   return procedural_db_return_args (&drawable_parasite_detach_proc, success);
 }
@@ -447,7 +447,7 @@ drawable_parasite_list_invoker (Gimp     *gimp,
     success = FALSE;
 
   if (success)
-    parasites = gimp_parasite_list (gimp, &num_parasites);
+    parasites = gimp_drawable_parasite_list (drawable, &num_parasites);
 
   return_args = procedural_db_return_args (&drawable_parasite_list_proc, success);
 
@@ -519,7 +519,7 @@ image_parasite_find_invoker (Gimp     *gimp,
 
   if (success)
     {
-      parasite = gimp_parasite_copy (gimp_parasite_find (gimp, name));
+      parasite = gimp_parasite_copy (gimp_image_parasite_find (gimage, name));
       success = parasite != NULL;
     }
 
@@ -587,7 +587,7 @@ image_parasite_attach_invoker (Gimp     *gimp,
     success = FALSE;
 
   if (success)
-    gimp_parasite_attach (gimp, parasite);
+    gimp_image_parasite_attach (gimage, parasite);
 
   return procedural_db_return_args (&image_parasite_attach_proc, success);
 }
@@ -639,7 +639,7 @@ image_parasite_detach_invoker (Gimp     *gimp,
     success = FALSE;
 
   if (success)
-    gimp_parasite_detach (gimp, name);
+    gimp_image_parasite_detach (gimage, name);
 
   return procedural_db_return_args (&image_parasite_detach_proc, success);
 }
@@ -689,7 +689,7 @@ image_parasite_list_invoker (Gimp     *gimp,
     success = FALSE;
 
   if (success)
-    parasites = gimp_parasite_list (gimp, &num_parasites);
+    parasites = gimp_image_parasite_list (gimage, &num_parasites);
 
   return_args = procedural_db_return_args (&image_parasite_list_proc, success);
 
diff --git a/tools/pdbgen/pdb/parasite.pdb b/tools/pdbgen/pdb/parasite.pdb
index a613fd23c0..2f496bf450 100644
--- a/tools/pdbgen/pdb/parasite.pdb
+++ b/tools/pdbgen/pdb/parasite.pdb
@@ -53,12 +53,12 @@ sub convert_proc {
     # gimp_parasite_copy -> GIMP_parasite_copy -> gimp_parasite_copy
     # because of a lack op perl knowledge :)  --Mitch
 
-    $invoke{code} =~ s/gimp_parasite_copy/GIMP_parasite_copy/e;
+    $invoke{code} =~ s/gimp_parasite_copy/GIMP_parasite_copy/;
 
-    $invoke{code} =~ s/gimp_/"gimp_$type_"/e;
-    $invoke{code} =~ s/"gimp, "/"$var, "/e;
+    $invoke{code} =~ s/gimp_/"gimp_$type\_"/e;
+    $invoke{code} =~ s/gimp, /"$var, "/e;
 
-    $invoke{code} =~ s/GIMP_parasite_copy/gimp_parasite_copy/e;
+    $invoke{code} =~ s/GIMP_parasite_copy/gimp_parasite_copy/;
 }
 
 # The defs