diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index fa505e837..7e9dadb1f 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,10 @@
+May 19, 2006
+- Fixed: FloorAndCeiling_Raise/Lower did not work with slopes because they
+  used ZatPointDist instead of PointToDist to calculate the destination
+  distance for the plane equation.
+- Fixed: Sky scroll positions could "jump" once they wrapped past position
+  32767. An fmod now keeps them within range of the sky textures' real widths.
+
 May 19, 2006 (Changes by Graf Zahl)
 - Increased the StrifeTypes array to 999 entries so that custom WADs have 
   more flexibility when defining dialogs.
diff --git a/src/p_floor.cpp b/src/p_floor.cpp
index f0f6082e6..c1d35d6a7 100644
--- a/src/p_floor.cpp
+++ b/src/p_floor.cpp
@@ -1026,15 +1026,15 @@ bool EV_DoElevator (line_t *line, DElevator::EElevator elevtype,
 		// [RH] elevate up by a specific amount
 		case DElevator::elevateRaise:
 			elevator->m_Direction = 1;
-			elevator->m_FloorDestDist = sec->floorplane.ZatPointDist (sec->soundorg[0], sec->soundorg[1], floorheight + height);
-			elevator->m_CeilingDestDist = sec->ceilingplane.ZatPointDist (sec->soundorg[0], sec->soundorg[1], ceilingheight + height);
+			elevator->m_FloorDestDist = sec->floorplane.PointToDist (sec->soundorg[0], sec->soundorg[1], floorheight + height);
+			elevator->m_CeilingDestDist = sec->ceilingplane.PointToDist (sec->soundorg[0], sec->soundorg[1], ceilingheight + height);
 			break;
 
 		// [RH] elevate down by a specific amount
 		case DElevator::elevateLower:
 			elevator->m_Direction = -1;
-			elevator->m_FloorDestDist = sec->floorplane.ZatPointDist (sec->soundorg[0], sec->soundorg[1], floorheight - height);
-			elevator->m_CeilingDestDist = sec->ceilingplane.ZatPointDist (sec->soundorg[0], sec->soundorg[1], ceilingheight - height);
+			elevator->m_FloorDestDist = sec->floorplane.PointToDist (sec->soundorg[0], sec->soundorg[1], floorheight - height);
+			elevator->m_CeilingDestDist = sec->ceilingplane.PointToDist (sec->soundorg[0], sec->soundorg[1], ceilingheight - height);
 			break;
 		}
 	}
diff --git a/src/r_anim.cpp b/src/r_anim.cpp
index 786fbdc3a..f8204d977 100644
--- a/src/r_anim.cpp
+++ b/src/r_anim.cpp
@@ -803,6 +803,6 @@ void R_UpdateAnimations (DWORD mstime)
 
 	// Scroll the sky
 	double ms = mstime * FRACUNIT;
-	sky1pos = fixed_t(ms * level.skyspeed1);
-	sky2pos = fixed_t(ms * level.skyspeed2);
+	sky1pos = fixed_t(fmod (ms * level.skyspeed1, double(TexMan[sky1texture]->GetWidth() << FRACBITS)));
+	sky2pos = fixed_t(fmod (ms * level.skyspeed2, double(TexMan[sky2texture]->GetWidth() << FRACBITS)));
 }