diff --git a/doc/authors.html b/doc/authors.html
index 18c420b72..f96dfcfde 100644
--- a/doc/authors.html
+++ b/doc/authors.html
@@ -24,6 +24,10 @@
     <td><a href="mailto:bertrand@landryhetu.com">Bertrand Landry Hetu</a></td>
     <td>Mac OS X port</td>
   </tr>
+  <tr>
+    <td><a href="mailto:vttom@users.sourceforge.net">Tom Chadwick</a></td>
+    <td>PageUp/PageDown on X servers without mouse wheel support</td>
+  </tr>
 </table>
 </p>
 </body>
diff --git a/lib/platform/CXWindowsScreen.cpp b/lib/platform/CXWindowsScreen.cpp
index 677bfc542..ad62425be 100644
--- a/lib/platform/CXWindowsScreen.cpp
+++ b/lib/platform/CXWindowsScreen.cpp
@@ -31,6 +31,7 @@
 #else
 #	include <X11/X.h>
 #	include <X11/Xutil.h>
+#	define XK_MISCELLANY
 #	define XK_XKB_KEYS
 #	include <X11/keysymdef.h>
 #	if HAVE_X11_EXTENSIONS_XTEST_H
@@ -583,6 +584,20 @@ CXWindowsScreen::fakeMouseWheel(SInt32 delta) const
 	const unsigned int xButton = mapButtonToX(static_cast<ButtonID>(
 												(delta >= 0) ? -1 : -2));
 	if (xButton == 0) {
+		// If we get here, then the XServer does not support the scroll
+		// wheel buttons, so send PageUp/PageDown keystrokes instead.
+		// Patch by Tom Chadwick.
+		KeyCode keycode = 0;
+		if (delta >= 0) {
+			keycode = XKeysymToKeycode(m_display, XK_Page_Up);
+		}
+		else {
+			keycode = XKeysymToKeycode(m_display, XK_Page_Down);
+		}
+		if (keycode != 0) {
+			XTestFakeKeyEvent(m_display, keycode, True,  CurrentTime);
+			XTestFakeKeyEvent(m_display, keycode, False, CurrentTime);
+		}
 		return;
 	}