diff --git a/pdb/app.pl b/pdb/app.pl
index c5773cb159..fcf0031a56 100644
--- a/pdb/app.pl
+++ b/pdb/app.pl
@@ -935,13 +935,29 @@ sub generate {
 		$help .= "Deprecated: There is no replacement for this procedure.";
 	    }
 	    else {
+                my $replacement = $proc->{deprecated};
+                chomp $replacement;
+                if ($replacement =~ / /) {
+                  # Use the deprecated string as-is.
+                  $replacement =~ s/"/\\"/g;
+                }
+                elsif ($replacement =~ /:/) {
+                  # Replacement is a GEGL operation.
+                  $replacement = "filter \\\"$replacement\\\"";
+                }
+                else {
+                  # Replacement is another function.
+                  $replacement =~ s/-/_/g;
+                  $replacement .= '()';
+                }
+
 		if (!$blurb) {
 		    $blurb = "Deprecated: Use '$proc->{deprecated}' instead.";
 		}
 		if ($help) {
 		    $help .= "\n\n";
 		}
-		$help .= "Deprecated: Use '$proc->{deprecated}' instead.";
+		$help .= "Deprecated: Use $replacement instead.";
 	    }
 	}
 
@@ -980,9 +996,14 @@ sub generate {
 CODE
 
         if ($proc->{deprecated}) {
+            my $replacement = $proc->{deprecated};
+            chomp $replacement;
+            if ($replacement =~ /"/) {
+              $replacement =~ s/"/\\"/g;
+            }
 	    $out->{register} .= <<CODE;
   gimp_procedure_set_deprecated (procedure,
-                                 "$proc->{deprecated}");
+                                 "$replacement");
 CODE
 	}
 
diff --git a/pdb/lib.pl b/pdb/lib.pl
index 8fe10e54f6..d47baf532e 100644
--- a/pdb/lib.pl
+++ b/pdb/lib.pl
@@ -561,8 +561,21 @@ CODE
                                     "for this procedure.");
         }
         else {
-            my $underscores = $proc->{deprecated};
-            $underscores =~ s/-/_/g;
+            my $replacement = $proc->{deprecated};
+            chomp $replacement;
+            if ($replacement =~ / /) {
+              # Use the deprecated string as-is.
+              #$replacement =~ s/"/\\"/g;
+            }
+            elsif ($replacement =~ /:/) {
+              # Replacement is a GEGL operation.
+              $replacement = "filter \"$replacement\"";
+            }
+            else {
+              # Replacement is another function.
+              $replacement =~ s/-/_/g;
+              $replacement .= '()';
+            }
 
             if ($proc->{blurb}) {
                 $procdesc = &desc_wrap($proc->{blurb}) . "\n *\n";
@@ -571,7 +584,7 @@ CODE
                 $procdesc .= &desc_wrap($proc->{help}) . "\n *\n";
             }
             $procdesc .= &desc_wrap("Deprecated: " .
-                                    "Use $underscores() instead.");
+                                    "Use $replacement instead.");
         }
     }
     else {