diff --git a/CHANGES b/CHANGES
index 6bb3cbdd7..949d879ab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,21 @@
 Changes for SVN top of tree:
 ==============================================================================
 
+New scale for chaos dragons: black dragon scale
+Includes a black dragon mail to use the scales with
+Chaos Wyverns and Dragons now drop black dragon scales
+armour/mail/blackdragonmail.base.111.png
+armour/mail/blackdragonmail.face
+armour/mail/dragonmail.arc
+flesh/dragon/dragon_black_scale.base.111.png
+flesh/dragon/dragon_black_scale.face
+flesh/dragon/dragon_sca.arc
+monster/dragon/Cwyvern.trs
+monster/dragon/Chaos_Dra/chaos_dragon.trs
+monster/dragon/dragon.trs
+shop/crea_dra_m.arc
+SilverNexus 2013-07-08
+
 New images and archetypes for Draughts
 misc/draughts/draught_red.arc
 misc/draughts/r-draughts.base.111.png
diff --git a/armour/mail/dragonmail.arc b/armour/mail/dragonmail.arc
index 6750e19f8..7ec8ff485 100644
--- a/armour/mail/dragonmail.arc
+++ b/armour/mail/dragonmail.arc
@@ -61,3 +61,27 @@ body_torso -1
 gen_sp_armour 9
 item_power 5
 end
+# Chaos dragons are harder to beat, so why not have a little better armour from their scales?
+Object black_dragon_mail
+name black dragon mail
+name_pl black dragon mails
+client_type 251
+nrof 1
+type 16
+face blackdragonmail.111
+last_sp 13
+ac 7
+resist_physical 60
+material 2048
+materialname dragonscale
+weight 60000
+value 50000
+resist_cold 25
+resist_fire 25
+resist_electricity 15
+magic 4
+identified 1
+body_torso -1
+gen_sp_armour 9
+item_power 8
+end
diff --git a/flesh/dragon/dragon_sca.arc b/flesh/dragon/dragon_sca.arc
index 983b4f590..8bf554f70 100644
--- a/flesh/dragon/dragon_sca.arc
+++ b/flesh/dragon/dragon_sca.arc
@@ -25,6 +25,15 @@ weight 25000
 name_pl green dragon scales
 client_type 627
 end
+Object black_dragon_scale
+name black dragon scale
+nrof 1
+type 73
+face dragon_black_scale.111
+weight 25000
+name_pl black dragon scales
+client_type 627
+end
 Object orange_dragon_scale
 name orange dragon scale
 nrof 1
diff --git a/monster/dragon/Chaos_Dra/chaos_dragon.trs b/monster/dragon/Chaos_Dra/chaos_dragon.trs
index 0b5d6451d..b10dc8b1a 100644
--- a/monster/dragon/Chaos_Dra/chaos_dragon.trs
+++ b/monster/dragon/Chaos_Dra/chaos_dragon.trs
@@ -1,5 +1,5 @@
 treasure chaosdragon
-  list big_dragon_parts
+  list big_dragon_chaos_parts
     chance 80
   more
   arch abil_fear
diff --git a/monster/dragon/Cwyvern.trs b/monster/dragon/Cwyvern.trs
index c9fd0ccc6..256d425df 100644
--- a/monster/dragon/Cwyvern.trs
+++ b/monster/dragon/Cwyvern.trs
@@ -1,5 +1,5 @@
 treasure Cwyvern
-  list dragon_parts
+  list dragon_chaos_parts
     chance 70
   more
   arch abil_fear
diff --git a/monster/dragon/dragon.trs b/monster/dragon/dragon.trs
index 49481899c..d39e05839 100644
--- a/monster/dragon/dragon.trs
+++ b/monster/dragon/dragon.trs
@@ -113,3 +113,48 @@ treasureone dragon_parts
   arch brain
     chance 1
   end
+# TODO: Make wings, claws, etc. have matching scales
+# Chaos wyvern parts
+treasureone dragon_chaos_parts
+  arch dragon_steak
+    chance 30
+  more
+  arch dragonclaw
+    chance 10
+  more
+  arch dragon_wing
+    chance 25
+  more
+  arch black_dragon_scale 
+    chance 5
+  more
+  arch brain
+    chance 1
+  end
+# Big dragon body parts
+treasureone big_dragon_chaos_parts
+  arch dragon_steak
+    nrof 3
+    chance 90
+  more
+  arch black_dragon_scale
+    chance 80
+    nrof 2
+  more
+  arch dragonclaw
+    chance 30
+    nrof 12
+  more
+  arch dragon_wing
+    chance 30
+    nrof 2
+  more
+  arch dragon_eye
+    chance 30
+  more
+  arch heart
+    chance 10
+  more
+  arch brain
+    chance 1
+  end
diff --git a/shop/crea_dra_m.arc b/shop/crea_dra_m.arc
index 1038a878e..9c3c5930a 100644
--- a/shop/crea_dra_m.arc
+++ b/shop/crea_dra_m.arc
@@ -28,3 +28,13 @@ food 5
 no_pick 1
 move_on walk
 end
+Object create_black_dragon_mail
+name black dragon mail: five black dragon scales
+face ambolt.111
+type 103
+other_arch black_dragon_mail
+slaying black_dragon_scale
+food 5
+no_pick 1
+move_on walk
+end