diff --git a/CHANGELOG b/CHANGELOG
index 781afcd3..d59f04d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 Version 3.0
 
 	New ponies: beautybrass, cloudchaser, flitter, mrbreezy, rumble, shiningarmorcrystal, 
-	            sombra, spikecrystal
+	            sombra, spikecrystal, twinkleshine
 
 	New extraponies: pizzapony
 
diff --git a/dev/pony-checklist b/dev/pony-checklist
index 27749450..babc6268 100644
--- a/dev/pony-checklist
+++ b/dev/pony-checklist
@@ -440,7 +440,7 @@ Sugarberry 		http://images1.wikia.nocookie.net/__cb20110823200833/mlp/images/thu
 Swan Dive		http://images3.wikia.nocookie.net/__cb20111214223813/mlp/images/thumb/5/5f/Swandive1.png/150px-Swandive1.png
 Sweet Dreams		http://images3.wikia.nocookie.net/__cb20110704192213/mlp/images/thumb/7/7a/Sweet_Dreams.png/150px-Sweet_Dreams.png
 Top Notch		http://images3.wikia.nocookie.net/__cb20120107205209/mlp/images/thumb/a/a7/S02E12_UUS1.png/150px-S02E12_UUS1.png
-Twinkleshine		http://images4.wikia.nocookie.net/__cb20110823215317/mlp/images/thumb/3/35/Twinkleshine.png/150px-Twinkleshine.png
+Twinkleshine
 Upper Crust		http://images2.wikia.nocookie.net/__cb20111216012939/mlp/images/2/2c/S02E09_Upper_Crust.png
 Vance Van Vendington	http://images4.wikia.nocookie.net/__cb20111216012954/mlp/images/a/a8/Kristoph_Gavin.png
 Written Script		http://images2.wikia.nocookie.net/__cb20111127145431/mlp/images/thumb/4/41/Written_Script.png/150px-Written_Script.png
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 366ed5a1..aaf0124e 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -2899,7 +2899,7 @@ sequences.
 @itemize @bullet
 @item
 New ponies: @file{beautybrass}, @file{cloudchaser}, @file{flitter}, @file{mrbreezy}, @file{rumble},
-@file{shiningarmorcrystal}, @file{sombra}, @file{spikecrystal}
+@file{shiningarmorcrystal}, @file{sombra}, @file{spikecrystal}, @file{twinkleshine}
 @item
 New extraponies: @file{pizzapony}
 @item
diff --git a/ponies/twinkleshine.pony b/ponies/twinkleshine.pony
new file mode 100644
index 00000000..0f79e7d4
--- /dev/null
+++ b/ponies/twinkleshine.pony
@@ -0,0 +1,36 @@
+$$$
+APPEARANCE: s1c1m2s17
+COAT: light pink
+EYE: blue
+FREE: no
+GROUP: mare
+KIND: unicorn
+MANE: pink
+MEDIA: TV series
+NAME: twinkleshine
+SOURCE: desktop ponies
+WIDTH: 41
+HEIGHT: 20
+
+
+$$$
+$balloon5$
+  $\$
+   $\$
+    $\$
+     ▄▀▀▀▀▀▄▄   ▄                        
+    ▄▀       ▀▀▄                         
+ ▄▀ ▀▄▀▄   ▄▄▄  ▄                        
+    ▄▀▀▄▄▀▀        ▀▄                    
+  ▀▄▄▄▄▀▄▀▀▀▄▀    ▄                      
+             ▀▀  ▄▀                      
+        ▄    ▀  ▄▀  ▄▀      ▄▄▀▀▀▀▄▄     
+    ▄▀  ▀▀  ▄▀ ▄▀  ▄▀     ▄▀        ▀▀▄  
+   ▀▄        ▄▀▄▄ ▄▀     ▄▀▄▀▀▄        ▀▄
+      ▀▀▀▀▀  ▀▄▄▀  ▀▀▄▄▄▄▄  ▄▀           
+        ▄▀▀▀▄   ▄▀▄▄▀▄▄▄▀▀ ▀▄ ▀          
+      ▄▀   ▄▀▀▀▀ ▄    ▄▄      ▀▀▀        
+       ▀▀▀     ▄▀  ▀▄▄▄▀               ▄▀
+          ▀▄▄▄   ▄▄▄▄▄                ▄▀ 
+                 ▀▄   ▀▄▄           ▄▀   
+               ▀▄▄▄▄▀    ▀▀▀▄▄▄▄▄▄▄▀     
diff --git a/ponyquotes/ponies b/ponyquotes/ponies
index 5b858754..b62549b6 100644
--- a/ponyquotes/ponies
+++ b/ponyquotes/ponies
@@ -192,6 +192,7 @@ truffleshuffle
 turf
 turnip
 twilight+twilightcrazyfromball+twilightrage+twilightzero+fillytwilight+twilightthebearded+twilighttime+twilightspike
+twinkleshine
 twist
 vinyl+djpon-3
 violet+royalribbon
diff --git a/ponyquotes/twinkleshine.0 b/ponyquotes/twinkleshine.0
new file mode 100644
index 00000000..9e5c7c41
--- /dev/null
+++ b/ponyquotes/twinkleshine.0
@@ -0,0 +1 @@
+does that pony do anything except study
diff --git a/ponyquotes/twinkleshine.1 b/ponyquotes/twinkleshine.1
new file mode 100644
index 00000000..31746294
--- /dev/null
+++ b/ponyquotes/twinkleshine.1
@@ -0,0 +1 @@
+I think they're lovely!
diff --git a/ponyquotes/twinkleshine.2 b/ponyquotes/twinkleshine.2
new file mode 100644
index 00000000..c8c04b2a
--- /dev/null
+++ b/ponyquotes/twinkleshine.2
@@ -0,0 +1 @@
+more interested in books than friends
diff --git a/ponyquotes/twinkleshine.3 b/ponyquotes/twinkleshine.3
new file mode 100644
index 00000000..60f0c071
--- /dev/null
+++ b/ponyquotes/twinkleshine.3
@@ -0,0 +1 @@
+wanna come