diff --git a/Changelog b/Changelog
index 026eedb..a87c098 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,8 @@
 
 	* src/xscanimage.c: Tell gimp which resolution we used for the scan.
 	  Based on patch from Aurelien Jarno <lists@aurel32.net>.
+	* src/xscanimage.c doc/xscanimage.man: Move gimp menu entries to
+	  File/Acquire/xscanimage/*. Patch from Julien BLACHE <jb@jblache.org>.
 
 ******    Release of sane-frontends-1.0.10. End of code freeze *****
 
diff --git a/doc/xscanimage.man b/doc/xscanimage.man
index 8f0956d..58cfe39 100644
--- a/doc/xscanimage.man
+++ b/doc/xscanimage.man
@@ -1,7 +1,7 @@
-.TH xscanimage 1 "27 Jan 2002"
+.TH xscanimage 1 "1 Feb 2003"
 .IX xscanimage
 .SH NAME
-xscanimage - scan an image
+xscanimage \- scan an image
 .SH SYNOPSIS
 .B xscanimage
 .RB [ --version | -V ]
@@ -59,13 +59,13 @@ will be queried by
 .BR gimp (1)
 the next time it's invoked.  From then on,
 .B xscanimage
-can be invoked through "Xtns->Acquire Image->Device dialog..." menu entry.
+can be invoked through "File->Acquire->Xscanimage->Device dialog..." menu entry.
 
-You'll also find that the "Xtns->Acquire Image" menu contains short-cuts
+You'll also find that the "File->Acquire->Xscanimage" menu contains short-cuts
 to the SANE devices that were available at the time
 .B xscanimage
 was queried.  For example, the first PNM pseudo-device is typically
-available as the short-cut "Xtns->Acquire Image->pnm:0".
+available as the short-cut "File->Acquire->Xscanimage->pnm:0".
 Note that
 .BR gimp (1)
 caches these short-cuts in ~/.gimp/pluginrc.  Thus, when the list of
diff --git a/src/xscanimage.c b/src/xscanimage.c
index f70d488..433f3c7 100644
--- a/src/xscanimage.c
+++ b/src/xscanimage.c
@@ -299,7 +299,7 @@ query (void)
       "Andy Beck, Tristan Tarrant, and David Mosberger",
       "Andy Beck, Tristan Tarrant, and David Mosberger",
       "8th June 1997",
-      "<Toolbox>/Xtns/Acquire Image/Device dialog...",
+      "<Toolbox>/File/Acquire/xscanimage/Device dialog...",
       "RGB, GRAY",
       GIMP_EXTENSION,
       nargs, nreturn_vals,
@@ -314,7 +314,7 @@ query (void)
       if (encode_devname (devlist[i]->name, sizeof (name) - 11, name + 11) < 0)
 	continue;	/* name too long... */
 
-      strncpy (mpath, "<Toolbox>/Xtns/Acquire Image/", sizeof (mpath));
+      strncpy (mpath, "<Toolbox>/File/Acquire/xscanimage/", sizeof (mpath));
       len = strlen (mpath);
       for (j = 0; devlist[i]->name[j]; ++j)
 	{