diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4469e507..8f08df6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+### Added
+- Add a water terrain to autumn height map generation.
+
+### Fixed
+- During height map generation chasms no longer cast shadows.
+
 ## [2.5.0] 2026-10-22
 ### Added
 - Added support for FerroSpot, FerroRespawner and FerroLine
diff --git a/webapp/src/app/services/height-map/height-map.service.ts b/webapp/src/app/services/height-map/height-map.service.ts
index b002a688..d32e24b8 100644
--- a/webapp/src/app/services/height-map/height-map.service.ts
+++ b/webapp/src/app/services/height-map/height-map.service.ts
@@ -5,30 +5,30 @@ import { StateHistoryService } from '../../components/dialogs/floating-window/hi
 import { AutotileService } from '../autotile/autotile.service';
 import { GlobalEventsService } from '../global-events.service';
 import { Globals } from '../globals';
+import { JsonLoaderService } from '../json-loader.service';
 import { MapLoaderService } from '../map-loader.service';
 import { Helper } from '../phaser/helper';
 import { CCMap } from '../phaser/tilemap/cc-map';
 import { CCMapLayer } from '../phaser/tilemap/cc-map-layer';
+import { customPutTileAt } from '../phaser/tilemap/layer-helper';
 import { GfxMapper } from './gfx-mapper/gfx-mapper';
 import { BACK_WALL_MAP, BLOCK_MAP, ChipsetConfig, HOLE_BLOCK_MAP, HOLE_MAP } from './gfx-mapper/gfx-mapper.constants';
 import {
-	CHECK_DIR,
-	CHECK_ITERATE,
-	CheckDir,
-	DIAG_GFX,
-	FILL_COUNT,
-	FILL_TYPE,
-	GFX_TYPE,
-	LEVEL_COUNT,
-	SECOND_LEVEL_CHECK,
-	SHADOW_CORNER_EXCEPTION,
-	SQUARE_CORNER_CHECK,
-	SUB_TYPE,
-	WALL_LINK,
-	WallLink
+    CHECK_DIR,
+    CHECK_ITERATE,
+    CheckDir,
+    DIAG_GFX,
+    FILL_COUNT,
+    FILL_TYPE,
+    GFX_TYPE,
+    LEVEL_COUNT,
+    SECOND_LEVEL_CHECK,
+    SHADOW_CORNER_EXCEPTION,
+    SQUARE_CORNER_CHECK,
+    SUB_TYPE,
+    WALL_LINK,
+    WallLink
 } from './heightmap.constants';
-import { customPutTileAt } from '../phaser/tilemap/layer-helper';
-import { JsonLoaderService } from '../json-loader.service';
 
 interface TilesetJson {
 	[key: string]: ChipsetConfig;
@@ -352,7 +352,7 @@ export class HeightMapService {
 						let subType: SUB_TYPE | null = null;
 						if (yAdd < yStart) {
 							let newTile = 0;
-							if (doShadow) {
+							if (doShadow && !doChasm) {
 								newTile = gfxMapper.getGfx(GFX_TYPE.FILL, x, y - yOff, SUB_TYPE.SHADOW, entry.lowerTerrain);
 							}
 							this.setLayerTile(layer, x, y - yOff - yAdd, newTile);
diff --git a/webapp/src/assets/tilesets.json b/webapp/src/assets/tilesets.json
index 2280827c..163c6b83 100644
--- a/webapp/src/assets/tilesets.json
+++ b/webapp/src/assets/tilesets.json
@@ -27,6 +27,17 @@
 					"y": 5
 				},
 				"border": true
+			},
+			{
+				"ground": {
+					"x": 9,
+					"y": 12
+				},
+				"cliff": {
+					"x": 0,
+					"y": 5
+				},
+				"border": true
 			}
 		]
 	},