diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-concave-bl.png b/data/core/images/terrain/castle/encampment-ruin/regular-concave-bl.png
new file mode 100644
index 000000000000..a39771e0efa7
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-concave-bl.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-concave-br.png b/data/core/images/terrain/castle/encampment-ruin/regular-concave-br.png
new file mode 100644
index 000000000000..25de99a5d557
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-concave-br.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-concave-l.png b/data/core/images/terrain/castle/encampment-ruin/regular-concave-l.png
new file mode 100644
index 000000000000..a6a398fe51a5
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-concave-l.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-concave-r.png b/data/core/images/terrain/castle/encampment-ruin/regular-concave-r.png
new file mode 100644
index 000000000000..0ea5472cd0e0
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-concave-r.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-concave-tl.png b/data/core/images/terrain/castle/encampment-ruin/regular-concave-tl.png
new file mode 100644
index 000000000000..b18edeaa80ce
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-concave-tl.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-concave-tr.png b/data/core/images/terrain/castle/encampment-ruin/regular-concave-tr.png
new file mode 100644
index 000000000000..e632348da9c9
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-concave-tr.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-convex-bl.png b/data/core/images/terrain/castle/encampment-ruin/regular-convex-bl.png
new file mode 100644
index 000000000000..a2475f118780
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-convex-bl.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-convex-br.png b/data/core/images/terrain/castle/encampment-ruin/regular-convex-br.png
new file mode 100644
index 000000000000..f8074272e19c
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-convex-br.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-convex-l.png b/data/core/images/terrain/castle/encampment-ruin/regular-convex-l.png
new file mode 100644
index 000000000000..e324004d6a32
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-convex-l.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-convex-r.png b/data/core/images/terrain/castle/encampment-ruin/regular-convex-r.png
new file mode 100644
index 000000000000..f46c9d5484e7
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-convex-r.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-convex-tl.png b/data/core/images/terrain/castle/encampment-ruin/regular-convex-tl.png
new file mode 100644
index 000000000000..00e57e31aaeb
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-convex-tl.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-convex-tr.png b/data/core/images/terrain/castle/encampment-ruin/regular-convex-tr.png
new file mode 100644
index 000000000000..55c8d0a54873
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-convex-tr.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-keep-tile.png b/data/core/images/terrain/castle/encampment-ruin/regular-keep-tile.png
new file mode 100644
index 000000000000..db5a1c3e3058
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-keep-tile.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular-tile.png b/data/core/images/terrain/castle/encampment-ruin/regular-tile.png
new file mode 100644
index 000000000000..d8bc8dece7dd
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular-tile.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular2-concave-br.png b/data/core/images/terrain/castle/encampment-ruin/regular2-concave-br.png
new file mode 100644
index 000000000000..04cc95f31e5c
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular2-concave-br.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular2-concave-l.png b/data/core/images/terrain/castle/encampment-ruin/regular2-concave-l.png
new file mode 100644
index 000000000000..e250f4c48e75
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular2-concave-l.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular2-concave-tl.png b/data/core/images/terrain/castle/encampment-ruin/regular2-concave-tl.png
new file mode 100644
index 000000000000..f921155654d9
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular2-concave-tl.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular2-convex-bl.png b/data/core/images/terrain/castle/encampment-ruin/regular2-convex-bl.png
new file mode 100644
index 000000000000..0713cda18c24
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular2-convex-bl.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/regular2-convex-br.png b/data/core/images/terrain/castle/encampment-ruin/regular2-convex-br.png
new file mode 100644
index 000000000000..5f29958c55f0
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/regular2-convex-br.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/tent.png b/data/core/images/terrain/castle/encampment-ruin/tent.png
new file mode 100644
index 000000000000..63304bac4ce3
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/tent.png differ
diff --git a/data/core/images/terrain/castle/encampment-ruin/tent2.png b/data/core/images/terrain/castle/encampment-ruin/tent2.png
new file mode 100644
index 000000000000..f3e5e7d2a272
Binary files /dev/null and b/data/core/images/terrain/castle/encampment-ruin/tent2.png differ
diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg
index 39b1a09bde08..2794a21e6cd3 100644
--- a/data/core/terrain-graphics.cfg
+++ b/data/core/terrain-graphics.cfg
@@ -562,6 +562,9 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:BASE                Ket                                  interior/wood-tan           LAYER=-2}
 {NEW:OVERLAY             Ket                                  interior/wood-tan-debris}
 
+{NEW:BASE                (Cer,Ker)                            flat/dirt-dark}
+{NEW:OVERLAY             Ker                                  castle/encampment-ruin/tent}
+
 {NEW:BASE                (Ce*,Ke*)                            flat/dirt}
 {NEW:OVERLAY             Ke                                   castle/encampment/tent}
 {NEW:OVERLAY             Kea                                  castle/encampment/tent-snow}
@@ -678,6 +681,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 # Encampment
 
 {NEW:CASTLEWALL             Ce,Ke         (!,C*,K*,X*)           C*       castle/encampment/regular}
+{NEW:CASTLEWALL             Cer,Ker         (!,C*,K*,X*)           C*       castle/encampment-ruin/regular}
 {NEW:CASTLEWALL             Cea,Kea       (!,C*,K*,X*)           C*       castle/encampment/snow}
 {NEW:CASTLEWALL2            Ket           (C*)              (!,C*,K*,X*)  castle/encampment/tall-keep-castle}
 {NEW:CASTLEWALL             Ket           (!,K*,X*)              K*       castle/encampment/tall-keep}
@@ -695,8 +699,8 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:TRANSITION           !,Ce*,Ke*,!,C*       !,Ket,!,Ce*,Ke*             -370               flat/dirt FLAG=inside}
 {NEW:TRANSITION           !,Ket,!,Ce*,Ke*      !,Ce*,Ke*,!,C*              -370               flat/dirt}
 
-{NEW:TRANSITION           !,Ket,Co*,!,C*,Ke*   Co*                         -380               flat/dirt-dark FLAG=inside}
-{NEW:TRANSITION           Co*                  !,Ket,Co*,!,C*,Ke*          -380               flat/dirt-dark}
+{NEW:TRANSITION           !,Ket,Co*,Ker,Cer,!,C*,Ke*   Co*,Ker,Cer                         -380               flat/dirt-dark FLAG=inside}
+{NEW:TRANSITION           Ker,Cer,Co*                  !,Ket,Co*,Ker,Cer,!,C*,Ke*          -380               flat/dirt-dark}
 
 # Base transitions between various water castles
 
diff --git a/data/core/terrain.cfg b/data/core/terrain.cfg
index d6fb0b38cd6a..10d52f44944f 100644
--- a/data/core/terrain.cfg
+++ b/data/core/terrain.cfg
@@ -1853,6 +1853,18 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     editor_group=castle
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=castle/encampment-ruin/regular-tile
+    id=encampment_ruin
+    name= _ "Encampment"
+    editor_name= _ "Ruined Encampment"
+    string=Cer
+    aliasof=Ct
+    unit_height_adjust=3
+    recruit_onto=yes
+    editor_group=castle
+[/terrain_type]
+
 [terrain_type]
     symbol_image=castle/encampment/snow-tile
     id=encampment_snow
@@ -2040,6 +2052,18 @@ Merfolk and nagas have 60% defense in submerged villages, whereas land based uni
     editor_group=castle
 [/terrain_type]
 
+[terrain_type]
+    symbol_image=castle/encampment-ruin/regular-keep-tile
+    id=encampment_ruin_keep
+    name= _ "Ruined Encampment Keep"
+    string=Ker
+    aliasof=Ct
+    unit_height_adjust=0
+    recruit_from=yes
+    recruit_onto=yes
+    editor_group=castle
+[/terrain_type]
+
 [terrain_type]
     symbol_image=castle/encampment/tall-keep-tile
     id=encampment_keep_tall