diff --git a/data/game.cfg b/data/game.cfg
index a37a24dd2d2..3a9b3a058f4 100644
--- a/data/game.cfg
+++ b/data/game.cfg
@@ -82,6 +82,7 @@
 		[movement costs]
 		deep water=100
 		shallow water=3
+		swamp water=3
 		grassland=1
 		sand=2
 		forest=2
@@ -97,6 +98,7 @@
 		[defense]
 		deep water=80
 		shallow water=70
+		swamp water=70
 		grassland=60
 		sand=70
 		forest=50
@@ -124,6 +126,7 @@
 		[movement costs]
 		deep water=100
 		shallow water=2
+		swamp water=2
 		grassland=1
 		sand=2
 		forest=2
@@ -139,6 +142,7 @@
 		[defense]
 		deep water=80
 		shallow water=70
+		swamp water=70
 		grassland=70
 		sand=70
 		forest=60
@@ -165,6 +169,7 @@
 		[movement costs]
 		deep water=100
 		shallow water=4
+		swamp water=4
 		grassland=1
 		sand=2
 		forest=2
@@ -180,6 +185,7 @@
 		[defense]
 		deep water=80
 		shallow water=80
+		swamp water=80
 		grassland=70
 		sand=70
 		forest=60
@@ -206,6 +212,7 @@
 		[movement costs]
 		deep water=100
 		shallow water=2
+		swamp water=2
 		grassland=1
 		sand=2
 		forest=2
@@ -221,6 +228,7 @@
 		[defense]
 		deep water=70
 		shallow water=60
+		swamp water=60
 		grassland=40
 		sand=60
 		forest=30
@@ -248,6 +256,7 @@
 		[movement costs]
 		deep water=100
 		shallow water=4
+		swamp water=4
 		grassland=1
 		sand=2
 		forest=3
@@ -263,6 +272,7 @@
 		[defense]
 		deep water=80
 		shallow water=80
+		swamp water=80
 		grassland=60
 		sand=70
 		forest=70
@@ -289,6 +299,7 @@
 		[movement costs]
 		deep water=100
 		shallow water=3
+		swamp water=3
 		grassland=1
 		sand=2
 		forest=1
@@ -304,6 +315,7 @@
 		[defense]
 		deep water=80
 		shallow water=70
+		swamp water=70
 		grassland=60
 		sand=70
 		forest=30
@@ -329,6 +341,7 @@
  		[movement costs]
  		deep water=2
  		shallow water=1
+ 		swamp water=1
  		grassland=1
  		sand=1
  		forest=1
@@ -344,6 +357,7 @@
  		[defense]
  		deep water=70
  		shallow water=60
+ 		swamp water=60
  		grassland=50
  		sand=60
  		forest=30
@@ -370,6 +384,7 @@
 		[movement costs]
 		deep water=1
 		shallow water=1
+		swamp water=1
 		grassland=1
 		sand=1
 		forest=1
@@ -385,6 +400,7 @@
 		[defense]
 		deep water=50
 		shallow water=50
+		swamp water=50
 		grassland=50
 		sand=50
 		forest=50
@@ -411,6 +427,7 @@
 		[movement costs]
 		deep water=1
 		shallow water=1
+		swamp water=2
 		grassland=4
 		sand=3
 		forest=6
@@ -426,6 +443,7 @@
 		[defense]
 		deep water=40
 		shallow water=30
+		swamp water=30
 		grassland=70
 		sand=70
 		forest=70
@@ -452,6 +470,7 @@
 		[movement costs]
 		deep water=100
 		shallow water=4
+		swamp water=4
 		grassland=1
 		sand=2
 		forest=3
@@ -467,6 +486,7 @@
 		[defense]
 		deep water=80
 		shallow water=70
+		swamp water=70
 		grassland=70
 		sand=70
 		forest=70
@@ -493,6 +513,7 @@
 		[movement costs]
 		deep water=100
 		shallow water=3
+		swamp water=3
 		grassland=1
 		sand=2
 		forest=2
@@ -508,6 +529,7 @@
 		[defense]
 		deep water=80
 		shallow water=70
+		swamp water=70
 		grassland=60
 		sand=70
 		forest=50
@@ -534,6 +556,7 @@
 		[movement costs]
 		deep water=1
 		shallow water=1
+		swamp water=1
 		grassland=1
 		sand=1
 		forest=1
@@ -549,6 +572,7 @@
 		[defense]
 		deep water=50
 		shallow water=50
+		swamp water=50
 		grassland=50
 		sand=50
 		forest=50
diff --git a/data/maps/swampland b/data/maps/swampland
index 491c479ff22..0df1ce009cc 100644
--- a/data/maps/swampland
+++ b/data/maps/swampland
@@ -1,46 +1,46 @@
-dddccrrrdcccddrrdddcccddcccccddddrrrrD
-ccccddrrddcccdrDrddcccddcDcrrrdrdrrddd
-ccccdCdrdrddccrrrdddcddrrrrrrrrrrrdCdd
-ccccC2CrrrrrccrdrcrccrrdrdddccrrDrC1CD
-cdcddddrrrrddcddddccrcddddddccccrcCCCd
-dddrdrrrrddcccccddrrccddDddrrcccccdddd
-dcrrrDrrrddcccccccrrdcdddrrDrccccrrrdd
-dcrrrrrrrrddcccccdrrrcrrrrrrrccccrrrDr
-cccrrrrrrrrrcccrrdrrrcccrrrccccccdrddr
-ccccrdrrrrrrccrrrdddrrcccrrcccrddDdddd
-rcccddddrdcccrrrddddrrrrcccrccrddddddd
-rrcdddddddccrrrrdddddrrcccrrrcdcdddddd
-rrddddDdddcdrrrrrrddddrdcdDcccccdddddd
-rrdddddddddddrrDrrrrdddddddccccrdrdDdr
-rrrdddddddddrrrrrrrrdddddddccrrrrrrrrr
-rrrrdrdcdcccrrrddrrrccdddddddrrrrrrrrr
-rrrrrcrrccccrrrddccccccdddddrrDrrrddrr
-rrDrrcccccccrdddcccccrdddddcrrrrddddrr
-rrrdddcdcrddddddcccrrrrrrrccccrddddddr
-rcdddddddrddddddddddrDrrrrcccccddddddr
-ccccccdCdrrDdcdddddrrrrrrrcccccdddddrr
-ccccccC3Crrcccrrrrrrrrrdddddcccddddcrr
-cccccddddcccccrrrrrrrrdddC6Cdrrrdrdccc
-crcdddddcccccdrdrdrcccddddCddrrrrrcccc
-rrrddddrrccrddddddcccccddddddrDrrrcccr
-rDrrdrrrrccrddddddcccccdddddrrrrrdddrr
-rrrrrrrrccrDdddddddrrrdddddcrcrdddddrr
-rdrdrcrcccrrrddddrrrDrrrrrccccccddddrr
-ddddddcccccrrrrrccccrrrdrdccccccdddrrr
-ddddddcccccrrdrcccccrddddddrcccddddrDr
-dddddddccdddddddcccccddddrrrrddddrrrrc
-dddddrrrrrddddddrrcccddddrrrdddcrccccc
-rrdrrDrrrddddddddrrddddrrrrrrrrccccccc
-rccrrrrrrdddddddrrrdddddrrrrDrrcccrrcr
-cccrrrrrrrdddddrrDrrdddddddrrrrrccccrr
-cccccdddrrrrrrrrrrrrrrdddddrrrrrrdcddr
-crdddCdddrrrrrrdddddrrrcrrrrrddddddddr
-rrddC4CdccrcrrddddddddccccrddddCdddddr
-rrddCCCdcccccdddddddddccccccddC5Cdddrr
-rddddddrcccccdddddddddcccccdddddddddrr
-dddddrdrcccccdddddddddcccrrddddddcccrr
-dddrrrrrrrrrrddddddddrrrrrrrddddcccccc
-rrdrrrDrrdrrrrdddDdddrrrrdrDrrdrcccccc
-rcccrrrdddddrrrcdcdrrrrrddddrdrrcccccc
-rccccddddddddrccccccrrrdddddddrrDrcccr
-rrcccddddddddrcccccccrdddddddddrrrrrrr
+dddwwrrrdwwwddrrdddwwwddwwwwwddddrrrrD
+wwwwddrrddwwwdrDrddwwwddwDwrrrdrdrrddd
+wwwwdCdrdrddwwrrrdddwddrrrrrrrrrrrdCdd
+wwwwC2CrrrrrwwrdrwwwwrrdrdddwwrrDrC1CD
+wdwddddrrrrddwddddwwrwddddddwwwwrwCCCd
+dddrdrrrrddwwwwwddrrwwddDddrrwwwwwdddd
+dwrrrDrrrddwwwwwwwrrdwdddrrDrwwwwrrrdd
+dwrrrrrrrrddwwwwwdrrrwrrrrrrrwwwwrrrDr
+wwwrrrrrrrrrwwwrrdrrrwwwrrrwwwwwwdrddr
+wwwwrdrrrrrrwwrrrdddrrwwwrrwwwrddDdddd
+rwwwddddrdwwwrrrddddrrrrwwwrwwrddddddd
+rrwdddddddwwrrrrdddddrrwwwrrrwdwdddddd
+rrddddDdddwdrrrrrrddddrdwdDwwwwwdddddd
+rrdddddddddddrrDrrrrdddddddwwwwrdrdDdr
+rrrdddddddddrrrrrrrrdddddddwwrrrrrrrrr
+rrrrdrdwdwwwrrrddrrrwwdddddddrrrrrrrrr
+rrrrrwrrwwwwrrrddwwwwwwdddddrrDrrrddrr
+rrDrrwwwwwwwrdddwwwwwrdddddwrrrrddddrr
+rrrdddwdwrddddddwwwrrrrrrrwwwwrddddddr
+rwdddddddrddddddddddrDrrrrwwwwwddddddr
+wwwwwwdCdrrDdwdddddrrrrrrrwwwwwdddddrr
+wwwwwwC3Crrwwwrrrrrrrrrdddddwwwddddwrr
+wwwwwddddwwwwwrrrrrrrrdddC6Cdrrrdrdwww
+wrwdddddwwwwwdrdrdrwwwddddCddrrrrrwwww
+rrrddddrrwwrddddddwwwwwddddddrDrrrwwwr
+rDrrdrrrrwwrddddddwwwwwdddddrrrrrdddrr
+rrrrrrrrwwrDdddddddrrrdddddwrwrdddddrr
+rdrdrwrwwwrrrddddrrrDrrrrrwwwwwwddddrr
+ddddddwwwwwrrrrrwwwwrrrdrdwwwwwwdddrrr
+ddddddwwwwwrrdrwwwwwrddddddrwwwddddrDr
+dddddddwwdddddddwwwwwddddrrrrddddrrrrw
+dddddrrrrrddddddrrwwwddddrrrdddwrwwwww
+rrdrrDrrrddddddddrrddddrrrrrrrrwwwwwww
+rwwrrrrrrdddddddrrrdddddrrrrDrrwwwrrwr
+wwwwrrrrrrdddddrrDrrdddddddrrrrrwwwwrr
+wwwwwdddrrrrrrrrrrrrrrdddddrrrrrrdwddr
+wrdddCdddrrrrrrdddddrrrwrrrrrddddddddr
+rrddC4CdwwrwrrddddddddwwwwrddddCdddddr
+rrddCCCdwwwwwdddddddddwwwwwwddC5Cdddrr
+rddddddrwwwwwdddddddddwwwwwdddddddddrr
+dddddrdrwwwwwdddddddddwwwrrddddddwwwrr
+dddrrrrrrrrrrddddddddrrrrrrrddddwwwwww
+rrdrrrDrrdrrrrdddDdddrrrrdrDrrdrwwwwww
+rwwwrrrdddddrrrwdwdrrrrrddddrdrrwwwwww
+rwwwwddddddddrwwwwwwrrrdddddddrrDrwwwr
+rrwwwddddddddrwwwwwwwrdddddddddrrrrrrr
diff --git a/data/scenarios/Swamp_Of_Dread.cfg b/data/scenarios/Swamp_Of_Dread.cfg
index 9fcabd19fcf..d9ab46e249a 100644
--- a/data/scenarios/Swamp_Of_Dread.cfg
+++ b/data/scenarios/Swamp_Of_Dread.cfg
@@ -15,7 +15,7 @@
 
 	objectives="
 Victory:
-@Pass threw the swamp
+@Defeat all enemy leaders
 Defeat
 #Death of Konrad
 #Death of Delfador"
diff --git a/data/terrain.cfg b/data/terrain.cfg
index 6c337e8e4ee..ea435b30f9f 100644
--- a/data/terrain.cfg
+++ b/data/terrain.cfg
@@ -12,6 +12,12 @@ char=c
 blue=250
 [/terrain]
 
+[terrain]
+image=swampwater,swampwater2,swampwater3
+name=swamp water
+char=w
+[/terrain]
+
 [terrain]
 image=bridge-n-s
 name=bridge