diff --git a/ChangeLog b/ChangeLog
index 828b81b07b..391bf68296 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
+2004-11-13  Sven Neumann  <sven@gimp.org>
+
+	* tools/pdbgen/pdb/selection.pdb: deprecate gimp_selection_clear()
+	in favor of gimp_selection_none(). Fixes bug #156765.
+
+	* app/pdb/selection_cmds.c
+	* libgimp/gimpselection_pdb.[ch]: regenerated.
+
 2004-11-13  Kevin Cozens  <kcozens@cvs.gimp.org>
 
 	* plug-ins/gfig/gfig.c
-	* plug-ins/gfig/gfig-dialog.c: Changed gimp-selection-none to
-	gimp-selection-clear (bug #156765)
+	* plug-ins/gfig/gfig-dialog.c: Changed gimp_selection_clear() to
+	gimp_selection_none() (bug #156765).
 
 2004-11-13  Kevin Cozens  <kcozens@cvs.gimp.org>
 
diff --git a/app/pdb/selection_cmds.c b/app/pdb/selection_cmds.c
index feb04d6dd9..a7e576650b 100644
--- a/app/pdb/selection_cmds.c
+++ b/app/pdb/selection_cmds.c
@@ -478,12 +478,12 @@ static ProcArg selection_clear_inargs[] =
 static ProcRecord selection_clear_proc =
 {
   "gimp_selection_clear",
-  "Set the selection to none, clearing all previous content.",
-  "This procedure sets the selection mask to empty, assigning the value 0 to every pixel in the selection channel.",
-  "Spencer Kimball & Peter Mattis",
-  "Spencer Kimball & Peter Mattis",
-  "1995-1996",
-  NULL,
+  "This procedure is deprecated! Use 'gimp_selection_none' instead.",
+  "This procedure is deprecated! Use 'gimp_selection_none' instead.",
+  "",
+  "",
+  "",
+  "gimp_selection_none",
   GIMP_INTERNAL,
   1,
   selection_clear_inargs,
diff --git a/libgimp/gimpselection_pdb.c b/libgimp/gimpselection_pdb.c
index a719523af2..14133ab9d7 100644
--- a/libgimp/gimpselection_pdb.c
+++ b/libgimp/gimpselection_pdb.c
@@ -238,10 +238,7 @@ _gimp_selection_float (gint32 drawable_ID,
  * gimp_selection_clear:
  * @image_ID: The image.
  *
- * Set the selection to none, clearing all previous content.
- *
- * This procedure sets the selection mask to empty, assigning the value
- * 0 to every pixel in the selection channel.
+ * This procedure is deprecated! Use gimp_selection_none() instead.
  *
  * Returns: TRUE on success.
  */
diff --git a/libgimp/gimpselection_pdb.h b/libgimp/gimpselection_pdb.h
index 4904c07835..19ff5c54fd 100644
--- a/libgimp/gimpselection_pdb.h
+++ b/libgimp/gimpselection_pdb.h
@@ -45,7 +45,9 @@ gboolean gimp_selection_translate   (gint32          image_ID,
 gint32   _gimp_selection_float      (gint32          drawable_ID,
 				     gint            offx,
 				     gint            offy);
+#ifndef GIMP_DISABLE_DEPRECATED
 gboolean gimp_selection_clear       (gint32          image_ID);
+#endif /* GIMP_DISABLE_DEPRECATED */
 gboolean gimp_selection_invert      (gint32          image_ID);
 gboolean gimp_selection_sharpen     (gint32          image_ID);
 gboolean gimp_selection_all         (gint32          image_ID);
diff --git a/tools/pdbgen/pdb/selection.pdb b/tools/pdbgen/pdb/selection.pdb
index 670af11378..707bc8ad3f 100644
--- a/tools/pdbgen/pdb/selection.pdb
+++ b/tools/pdbgen/pdb/selection.pdb
@@ -207,14 +207,7 @@ CODE
 }
 
 sub selection_clear {
-    $blurb = 'Set the selection to none, clearing all previous content.';
-
-    $help = <<'HELP';
-This procedure sets the selection mask to empty, assigning the value 0 to every
-pixel in the selection channel.
-HELP
-
-    &std_pdb_misc;
+    &std_pdb_deprecated ('gimp_selection_none');
 
     @inargs = ( &std_image_arg );