diff --git a/src/ChangeLog b/src/ChangeLog
index f69016eb2..95c1786eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-30  Pavel Roskin  <proski@gnu.org>
+
+	* mouse.h: Use definitions for GPM_B_DOWN and GPM_B_UP
+	compatible with gpm-1.20.
+	Reported by by David Martin <dmartina@excite.com>
+
 2002-10-29  Pavel Roskin  <proski@gnu.org>
 
 	* panel.h: Use spaces, not commas, in the format - they are more
diff --git a/src/TODO b/src/TODO
index e3e2cd2be..5ad4c03f9 100644
--- a/src/TODO
+++ b/src/TODO
@@ -22,9 +22,6 @@ anything can be done about it.
 
 ftp and fish with home != '/' - readjust directory to the home.
 
-Check compatibility with new gpm.  Excessive warnings on Mandrake 9.0
-have been reported.
-
 Allow modifiers for keys in mc.lib, like "shift-up".
 
 
diff --git a/src/mouse.h b/src/mouse.h
index 49d8d69b6..385aae002 100644
--- a/src/mouse.h
+++ b/src/mouse.h
@@ -72,8 +72,13 @@ void enable_mouse (void);
 void disable_mouse (void);
 
 /* Mouse wheel events */
-#define GPM_B_UP        8
-#define GPM_B_DOWN     16
+#ifndef GPM_B_DOWN
+#define GPM_B_DOWN      32
+#endif
+
+#ifndef GPM_B_UP
+#define GPM_B_UP        16
+#endif
 
 #ifdef HAVE_LIBGPM