diff --git a/CHANGELOG b/CHANGELOG
index 8bd66e82..ff77d4e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@ Version 3.0.2
 	New ponies: brucemane, cremebrulee, deepblue, hairytipper, mantishy, mule, peachbottom, rainbowdrop,
 		    strawberrycream, unclewing, wildflower
 
-	New extraponies: milky
+	New extraponies: fluffle, milky
 
 	Default value for -W has been changed from 40 to 60.
 
diff --git a/extraponies/fluffle.pony b/extraponies/fluffle.pony
new file mode 100644
index 00000000..c43c4322
--- /dev/null
+++ b/extraponies/fluffle.pony
@@ -0,0 +1,51 @@
+$$$
+BALLOON: top
+BALLOON BOTTOM: 0
+BALLOON TOP: 3
+COAT: pink
+DISPLAY: full, left
+EYE: blue
+FREE: yes
+GROUP: mare, background, protagonist
+KIND: earth, fluffy
+LICENSE: cc-by-sa (Creative Commons Attribution-ShareAlike 3.0 Unported)
+LINK: regular
+MANE: pink
+MEDIA: fluffletown.tumblr.com
+NAME: Fluffle Puff
+OTHER NAMES: Fluffe Puff (Used many times)
+POSE: watch
+SOURCE: [jristz]
+WIDTH: 49
+HEIGHT: 27
+
+License summary:   https://creativecommons.org/licenses/by-sa/3.0
+Full license text: https://creativecommons.org/licenses/by-sa/3.0/legalcode
+$$$
+$balloon8$
+         $\$                                       
+          $\$                                      
+           $\$                                     
+        ▄▄▄▄██▄▄█▄▄▄ ▄▄                          
+      ▄▄▄███████████▄██▄▄█▄▄  ▄▄ ▄               
+     ▀▀████████████▄██▄█████▄██▄█▄▄▄▄▄█          
+   ▄▄▄█████████████▄█▄▄▄███████████████▄▄▄       
+    ▄▄█▄████████████▄▄█▄▄████████████████▄▄▄     
+   ▀▀██▄▄▄██▄▄▄▄▄▄▄▄▄█▄▄███████████████████▄▄    
+    ▀▄▄▄█▄▄██▄█▄█▄▄█████████████████████████▄▄   
+    ▄▀▄▄▄▄▄▄██▄█▄▄▄██████████████████████████▄▀  
+    ▄███▄▄▄███▄▄▄▄███████████████████████████▄▄▄ 
+    ███▄██▄▄██████████████████████████████████▄  
+   ▄████▄▄█▄▄▄▄██▄████████████████████████████▄▄ 
+   ▀▄█████▄▄▄█▄▄▄██████████████████████████████▄▀
+   ▄████▄██████████████████████████████████████▄▄
+   █▄███▄█████▄█████████████████████████████████ 
+    █████████▄▄████████████████████████████████▄ 
+    ▄████▄█▄█████████████████████████████████▄█▀ 
+     █████▄██████████████████████████████████▄▄  
+      ▄▀█████████████████████████████████████▄▀  
+        ▄█████████████████████████████████▄██▀   
+        ▀▀▄███████████████████████████████▄▀▀    
+           ▄█▀█▀▄█▄█▄██▄█▄▄█▄███▄██▄█▄▀▄█ ▀      
+            ▀ ▀ ▀█▄▄█▄█▄▄▄▄▄██▄█▄▀▀  ▀           
+                                                 
diff --git a/extrapony-wishlist b/extrapony-wishlist
index 80459674..a0407d67 100644
--- a/extrapony-wishlist
+++ b/extrapony-wishlist
@@ -21,7 +21,7 @@ source of the names: http://trotsworth.deviantart.com/art/Profile-Barbara-255653
 Lord Solaris
 Prince Artemis (based on season 2 luna)
 Nightterror Nebula
-Barbara (or Barbra)
+Barbara, Bárbara (or Barbra)
 Eris (or Eris Void)
 King Nymphamos
 Queen Oscura
@@ -35,12 +35,11 @@ Dazler (A pony that mess words) (RDP: Rainbow Fun Factory (but her use other nam
 Adult Nyx (fanfic Past Sins)
 Pinkie Pie (disguised as a Wonderbolt with a saddle as wings) (RDP: Cupcakes)
 Rainbow Real (A wingless Dash from 'RDP: Someting that only we know', and from the fanfic)
-Fluffle Puff (a Fluffy pony, Dan Mascot from 'Dan vs FiM')
-Rarity (or Cashity (for distinktion) from PONY.MOV)
-Pinkie Pie (or Pinkie (for distinktion) from PONY.MOV)
-Fluttershy (or Killershy, Murdershy or Flutterbad (for distinktion) from PONY.MOV)
+Rarity (or Cashity (for distinction) from PONY.MOV)
+Pinkie Pie (or Pinkie (for distinction) from PONY.MOV)
+Fluttershy (or Killershy, Murdershy or Flutterbad (for distinction) from PONY.MOV)
 Rainbow Dash (disguised as a gorilla, RDP: Cupcakes)
-Spider Sparkle (Twilight Sparkle from fanfic 'Spiderses', the RDP is Far more seroius than the Tollfic)
+Spider Sparkle (Twilight Sparkle from fanfic 'Spiderses', the RDP is Far more serious than the Tollfic)
 Cloudy Sunrine (fanfic: Cloud Meet Twilight)
 Robo Dash (Kill, Destroy, Swag) (from PONY.MOV)
 Firewall (with they Smartphone and Ciggarrets if possible) (fanfic: Through the Eyes of Another Pony)
@@ -49,7 +48,7 @@ LitlePip (Fallout Equestria)
 Manie Belle (Anarchy Sweetie Belle) (Tumblr)
 Mapplejack (cartoon Network: MAD)
 Tick Tock (unicorn friend of DrWhooves) (fanfic: CRISIS Equestria) (Probably a unicorn version of DrHooves is enough)
-Sun Flare (Raged Celestia as same way is Nightmare Moon a raged Luna)
+Sun Flare (Raged Celestia as same way is Nightmare Moon is a raged Luna)
 Fluttermac (Fusionated as one character.......you watch Dragon Ball Z right?)
 
 Tara Strong OC (As same john De Lancie have an OC, Tara have one too)
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index ae378032..3be96b1c 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -3010,7 +3010,7 @@ New ponies: @file{brucemane}, @file{cremebrulee}, @file{deepblue}, @file{hairyti
 @file{mule}, @file{peachbottom}, @file{unclewing}, @file{rainbowdrop}, @file{strawberrycream},
 @file{wildflower}
 @item
-New extraponies: @file{milky}
+New extraponies: @file{fluffle}, @file{milky}
 @item
 Default value for @option{-W}, the message wrapping column, has been changed from 40 to 60, to wrap messages better.
 @item