diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 9bf50b72a..e2330b264 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,8 @@
+September 10, 2009
+- Changed the SCROLLTYPE define so that any extra bits set cause it to default
+  to 7. This effects action.wad, MAP02, lines 12054 and 12059, which had them
+  at 128, so they no longer scrolled in r832+.
+
 September 9, 2009
 - Look for files in Mac-like places on Macs.
 - Fixed: The non-Windows CreatePath can fail if part of the path already
diff --git a/src/p_spec.cpp b/src/p_spec.cpp
index d70129d0f..c8b8724cc 100644
--- a/src/p_spec.cpp
+++ b/src/p_spec.cpp
@@ -1311,7 +1311,7 @@ DScroller::DScroller (fixed_t dx, fixed_t dy, const line_t *l,
 
 // Amount (dx,dy) vector linedef is shifted right to get scroll amount
 #define SCROLL_SHIFT 5
-#define SCROLLTYPE(i) ((i)<=0 ? 7:(i))
+#define SCROLLTYPE(i) (((i) <= 0) || ((i) & ~7) ? 7 : (i))
 
 // Initialize the scrollers
 static void P_SpawnScrollers(void)