diff --git a/locales/en/pets.json b/locales/en/pets.json
index 8a47beacb6..f82f17b569 100644
--- a/locales/en/pets.json
+++ b/locales/en/pets.json
@@ -30,6 +30,10 @@
     "beastMastName": "Beast Master",
     "beastMastText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
     "beastMastText2": " and has released their pets a total of <%= count %> times",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMastName": "Mount Master",
+    "mountMastText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMastText2": " and has released their mounts a total of <%= count %> times",
     "dropsEnabled": "Drops Enabled!",
     "itemDrop": "An item has dropped!",
     "firstDrop": "You've unlocked the Drop System! Now when you complete tasks, you have a small chance of finding an item. You just found a <strong><%= eggText %> Egg</strong>! <%= eggNotes %>",
diff --git a/script/content.coffee b/script/content.coffee
index 6e3beff2ca..954f235edb 100644
--- a/script/content.coffee
+++ b/script/content.coffee
@@ -767,6 +767,15 @@ api.questPets = _.transform api.questEggs, (m, egg) ->
   _.defaults m, _.transform api.hatchingPotions, (m2, pot) ->
     m2[egg.key + "-" + pot.key] = true
 
+## added for mountmaster -- yes, the transforms are correct, since the same strings are used for both pets and mounts
+api.mounts = _.transform api.dropEggs, (m, egg) ->
+  _.defaults m, _.transform api.hatchingPotions, (m2, pot) ->
+    m2[egg.key + "-" + pot.key] = true
+
+api.questMounts = _.transform api.questEggs, (m, egg) ->
+  _.defaults m, _.transform api.hatchingPotions, (m2, pot) ->
+    m2[egg.key + "-" + pot.key] = true
+
 api.food =
   # Base
   Meat:                 canBuy:true, canDrop:true, text: t('foodMeat'), target: 'Base', article: ''
diff --git a/script/index.coffee b/script/index.coffee
index 32a8f592c4..bfd4208d79 100644
--- a/script/index.coffee
+++ b/script/index.coffee
@@ -332,11 +332,13 @@ api.countPets = (originalCount, pets) ->
     count-- if pets[pet]
   count
 
-api.countMounts= (originalCount, mounts) ->
-  count = if originalCount? then originalCount else _.size(mounts)
+api.countMounts = (originalCount, mounts) ->
+  count2 = if originalCount? then originalCount else _.size(mounts)
+  for mount of content.questPets
+    count2-- if mounts[mount]
   for mount of content.specialMounts
-    count-- if mounts[mount]
-  count
+    count2-- if mounts[mount]
+  count2
 
 ###
 ------------------------------------------------------