Index: src/newgrf_station.cpp
===================================================================
--- src/newgrf_station.cpp	(revision 16708)
+++ src/newgrf_station.cpp	(working copy)
@@ -448,7 +448,7 @@
 			return st->TileBelongsToRailStation(tile) ? GetStationAnimationFrame(tile) : UINT_MAX;
 
 		case 0x67: { // Land info of nearby tile
-			Axis axis = GetRailStationAxis(tile);
+			Axis axis = IsRailWaypoint(tile) ? GetWaypointAxis(tile) : GetRailStationAxis(tile);
 
 			if (parameter != 0) tile = GetNearbyTile(parameter, tile); // only perform if it is required
 
Index: src/station_map.h
===================================================================
--- src/station_map.h	(revision 16708)
+++ src/station_map.h	(working copy)
@@ -68,13 +68,13 @@
 
 static inline uint8 GetStationAnimationFrame(TileIndex t)
 {
-	assert(IsTileType(t, MP_STATION));
+	assert(IsTileType(t, MP_STATION) || IsRailWaypointTile(t));
 	return _me[t].m7;
 }
 
 static inline void SetStationAnimationFrame(TileIndex t, uint8 frame)
 {
-	assert(IsTileType(t, MP_STATION));
+	assert(IsTileType(t, MP_STATION) || IsRailWaypointTile(t));
 	_me[t].m7 = frame;
 }
 
@@ -295,13 +295,13 @@
 
 static inline void SetStationTileRandomBits(TileIndex t, byte random_bits)
 {
-	assert(IsTileType(t, MP_STATION));
+	assert(IsTileType(t, MP_STATION) || IsRailWaypointTile(t));
 	SB(_m[t].m3, 4, 4, random_bits);
 }
 
 static inline byte GetStationTileRandomBits(TileIndex t)
 {
-	assert(IsTileType(t, MP_STATION));
+	assert(IsTileType(t, MP_STATION) || IsRailWaypointTile(t));
 	return GB(_m[t].m3, 4, 4);
 }
 
Index: docs/landscape.html
===================================================================
--- docs/landscape.html	(revision 16708)
+++ docs/landscape.html	(working copy)
@@ -184,7 +184,7 @@
     <ul>
      <li>m1: <a href="#OwnershipInfo">owner</a> of the tile</li>
      <li>m2: see waypoint and signals</li>
-     <li>m3 bits 7..4: see signals</li>
+     <li>m3 bits 7..4: see waypoint and signals</li>
      <li>m3 bits 3..0 = <a name="TrackType">track type</a>:
       <table>
        <tr>
@@ -452,9 +452,10 @@
        <li>m2 bit 11: opposite track is reserved, too</li>
       </ul>
      </li>
-     <li>m5 bit 7 set, bit 6 clear: checkpoint
+     <li>m5 bit 7 set, bit 6 clear: waypoint
       <ul>
        <li>m2: index into the array of waypoints.</li>
+       <li>m3 bits 7..4: persistent random data for newstations</li>
        <li>m5 bit 0:
         <table>
          <tr>
@@ -469,6 +470,7 @@
         </table>
        </li>
        <li>m5 bit 4: pbs reservation state</li>
+       <li>m7: animation frame</li>
       </ul>
      </li>
      <li>m5 bit 7 set, bit 6 set: railway depot
Index: docs/landscape_grid.html
===================================================================
--- docs/landscape_grid.html	(revision 16708)
+++ docs/landscape_grid.html	(working copy)
@@ -124,11 +124,11 @@
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</td>
+      <td class="bits">XXXX <span class="option">~~</span>XX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits">XX<span class="free">O</span>X <span class="free">OOO</span>X</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
       <td rowspan=3>2</td>