diff --git a/ChangeLog b/ChangeLog
index 3793e7bb5..28ad5998e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-04-04  Bradley Bell  <btb@icculus.org>
 
+	* arch/dos/joyc.c, arch/include/joy.h, arch/linux/joydefs.c,
+	arch/linux/joystick.c, arch/linux/include/joystick.h,
+	arch/sdl/joy.c, arch/win32/joyhh.c, arch/win32/include/joy.h,
+	main/kconfig.c: change MAX_BUTTONS to JOY_MAX_BUTTONS
+
 	* arch/sdl/joy.c, main/kconfig.c: don't use hardcoded descriptions
 	of joystick buttons/axes