diff --git a/data/abilities.js b/data/abilities.js
index 9703bec1c4..e82208c507 100644
--- a/data/abilities.js
+++ b/data/abilities.js
@@ -2321,7 +2321,14 @@ exports.BattleAbilities = {
 	"stancechange": {
 		desc: "The Pokemon changes form depending on how it battles. Defense form for Status moves, and Offense form for attacking moves.",
 		shortDesc: "The Pokemon changes form depending on how it battles.",
-		//todo after adding aegislash forms
+		onBeforeMove: function(attacker, defender, move) {
+			if (attacker.template.baseSpecies !== 'Aegislash') return;
+			var targetSpecies = (move.category === 'Status'?'Aegislash':'Aegislash-Blade');
+			this.debug('target: '+targetSpecies+', current: '+attacker.template.species);
+			if (attacker.template.species !== targetSpecies && attacker.formeChange(targetSpecies)) {
+				this.add('-formechange', attacker, targetSpecies);
+			}
+		},
 		id: "stancechange",
 		name: "Stance Change",
 		rating: 4.5,
diff --git a/data/pokedex.js b/data/pokedex.js
index ef60cac0b5..eb97f41f2b 100644
--- a/data/pokedex.js
+++ b/data/pokedex.js
@@ -738,6 +738,7 @@ meowstic:{num:678,species:"Meowstic",types:["Psychic"],baseStats:{hp:80,atk:42,d
 honedge:{num:679,species:"Honedge",types:["Steel","Ghost"],baseStats:{hp:40,atk:90,def:130,spa:35,spd:30,spe:10},abilities:{0:"No Guard"},heightm:0.8,weightkg:2,color:"",evos:["doublade"],eggGroups:[""]},
 doublade:{num:680,species:"Doublade",types:["Steel","Ghost"],baseStats:{hp:60,atk:110,def:150,spa:55,spd:50,spe:30},abilities:{0:"No Guard"},heightm:0.8,weightkg:4.5,color:"",prevo:"honedge",evos:["aegislash"],eggGroups:[""]},
 aegislash:{num:681,species:"Aegislash",types:["Steel","Ghost"],baseStats:{hp:60,atk:60,def:150,spa:60,spd:150,spe:60},abilities:{0:"Stance Change"},heightm:0,weightkg:0,color:"",prevo:"doublade",eggGroups:[""]},
+aegislashblade:{num:681,species:"Aegislash-Blade",baseSpecies:"Aegislash",forme:"Blade",formeLetter:"B",types:["Steel","Ghost"],baseStats:{hp:60,atk:150,def:60,spa:150,spd:60,spe:60},abilities:{0:"Stance Change"},heightm:0,weightkg:0,color:"",prevo:"doublade",eggGroups:[""]},
 spritzee:{num:682,species:"Spritzee",types:["Fairy"],baseStats:{hp:80,atk:45,def:55,spa:75,spd:70,spe:10},abilities:{0:"Healer"},heightm:0.2,weightkg:0.5,color:"",evos:["aromatisse"],eggGroups:[""]},
 aromatisse:{num:683,species:"Aromatisse",types:["Fairy"],baseStats:{hp:100,atk:65,def:75,spa:95,spd:90,spe:30},abilities:{0:"Healer"},heightm:0.8,weightkg:15.5,color:"",prevo:"spritzee",eggGroups:[""]},
 swirlix:{num:684,species:"Swirlix",types:["Fairy"],baseStats:{hp:80,atk:75,def:70,spa:45,spd:55,spe:10},abilities:{0:"Sweet Veil"},heightm:0.4,weightkg:3.5,color:"",evos:["slurpuff"],eggGroups:[""]},