diff --git a/ChangeLog b/ChangeLog
index 915b7aedd4..11c8bb38f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-30  Raphaël Quinet  <raphael@gimp.org>
+
+	* data/tips/gimp-tips.xml.in: expanded old tip and mentioned that
+	it is possible to configure most window managers so that they do
+	not steal the Alt key from the applications.  Fixes bug #471565.
+
 2007-08-30  Raphaël Quinet  <raphael@gimp.org>
 
 	* plug-ins/common/pcx.c: applied modified patch from Nils
diff --git a/data/tips/gimp-tips.xml.in b/data/tips/gimp-tips.xml.in
index cc72e4c683..da808f22a7 100644
--- a/data/tips/gimp-tips.xml.in
+++ b/data/tips/gimp-tips.xml.in
@@ -85,6 +85,15 @@
       (Image→Flatten Image).
     </_thetip>
   </tip>
+  <tip level="beginner">
+    <_thetip>
+      You can adjust or move a selection by using <tt>Alt</tt>-drag.
+      If this makes the window move, your window manager uses the
+      <tt>Alt</tt> key already.  Most window managers can be
+      configured to ignore the <tt>Alt</tt> key or to use
+      the <tt>Super</tt> key (or "Windows logo") instead.
+    </_thetip>
+  </tip>
 
 <!--                                                                       -->
 <!-- Tips for intermediate users start here                                -->
@@ -140,13 +149,6 @@
       current one.
     </_thetip>
   </tip>
-  <tip level="intermediate">
-    <_thetip>
-      You can adjust or move a selection by using <tt>Alt</tt>-drag.
-      If this makes the window move, your window manager uses the
-      <tt>Alt</tt> key already.
-    </_thetip>
-  </tip>
   <tip level="intermediate">
     <_thetip>
       You can draw simple squares or circles using Edit→Stroke Selection.