diff --git a/CHANGELOG b/CHANGELOG
index fb2a24d3..2b42c0af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 Version 2.8
 
-	New ponies: airheart, bastionyorsets, peppermoon, shiningarmorweding, starlight,
+	New ponies: airheart, bastionyorsets, peppermoon, shiningarmorwedding, starlight,
 	            sunnyrays, tenderheart, tomtherock
 
 	Pony symlink added: georgewachingtony → bastionyorsets
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 9913a215..d34b5034 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -1867,7 +1867,7 @@ sequences.
 @heading Version 2.8
 @itemize @bullet
 @item
-New ponies: @file{airheart}, @file{bastionyorsets}, @file{peppermoon}, @file{shinngarmorwedingi},
+New ponies: @file{airheart}, @file{bastionyorsets}, @file{peppermoon}, @file{shiningarmorwedding},
 @file{starlight}, @file{sunnyrays}, @file{tenderheart}, @file{tomtherock}
 @item
 Pony symlink added:
diff --git a/ponies/shiningarmorweding.pony b/ponies/shiningarmorwedding.pony
similarity index 100%
rename from ponies/shiningarmorweding.pony
rename to ponies/shiningarmorwedding.pony
diff --git a/ponyquotes/ponies b/ponyquotes/ponies
index 59e94c1c..151a194b 100644
--- a/ponyquotes/ponies
+++ b/ponyquotes/ponies
@@ -149,7 +149,7 @@ screwball
 screwloose
 seaswirl
 shadowbolts
-shiningarmor+shiningarmorguard
+shiningarmor+shiningarmorguard+shiningarmorwedding
 silverspeed
 silverspoon
 silverstar
diff --git a/ttyponies/shiningarmorweding.pony b/ttyponies/shiningarmorwedding.pony
similarity index 100%
rename from ttyponies/shiningarmorweding.pony
rename to ttyponies/shiningarmorwedding.pony