diff --git a/common/locales/en/content.json b/common/locales/en/content.json
index 6241e09712..3e17239077 100644
--- a/common/locales/en/content.json
+++ b/common/locales/en/content.json
@@ -96,6 +96,9 @@
   "questEggWhaleText": "Whale",
   "questEggWhaleAdjective": "splashy",
 
+  "questEggCheetahText": "Cheetah",
+  "questEggCheetahAdjective": "honest",
+
   "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into a <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
 
   "hatchingPotionBase": "Base",
diff --git a/common/locales/en/questsContent.json b/common/locales/en/questsContent.json
index 79fb97ac5a..eaff2cad7a 100644
--- a/common/locales/en/questsContent.json
+++ b/common/locales/en/questsContent.json
@@ -277,5 +277,12 @@
   "questDilatoryDistress3Boss": "Adva, the Usurping Mermaid",
   "questDilatoryDistress3DropFish": "Fish (Food)",
   "questDilatoryDistress3DropWeapon": "Trident of Crashing Tides (Weapon)",
-  "questDilatoryDistress3DropShield": "Moonpearl Shield (Shield-Hand Item)"
+  "questDilatoryDistress3DropShield": "Moonpearl Shield (Shield-Hand Item)",
+
+  "questCheetahText": "Such a Cheetah",
+  "questCheetahNotes": "As you hike across the Sloensteadi Savannah with your friends @PainterProphet, @tivaquinn, @Unruly Hyena, and @Crawford, you're startled to see a Cheetah screeching past with a new Habitican clamped in its jaws. Under the Cheetah's scorching paws, tasks burn away as though complete -- before anyone has the chance to actually finish them! The Habitican sees you and yells, \"Please help me! This Cheetah is making me level too quickly, but I'm not getting anything done. I want to slow down and enjoy the game. Make it stop!\" You fondly remember your own fledgling days, and know that you have to help the newbie by stopping the Cheetah!",
+  "questCheetahCompletion": "The new Habitican is breathing heavily after the wild ride, but thanks you and your friends for your help. \"I'm glad that Cheetah won't be able to grab anyone else. It did leave some Cheetah eggs for us, so maybe we can raise them into more trustworthy pets!\"",
+  "questCheetahBoss": "Cheetah",
+  "questCheetahDropCheetahEgg": "Cheetah (Egg)",
+  "questCheetahUnlockText": "Unlocks purchasable Cheetah eggs in the Market"
 }
diff --git a/common/script/content.coffee b/common/script/content.coffee
index 7854259ad8..413150d667 100644
--- a/common/script/content.coffee
+++ b/common/script/content.coffee
@@ -1095,6 +1095,7 @@ api.questEggs =
   Sheep:            text: t('questEggSheepText'), adjective: t('questEggSheepAdjective'), canBuy: false
   Cuttlefish:       text: t('questEggCuttlefishText'), adjective: t('questEggCuttlefishAdjective'), canBuy: false
   Whale:            text: t('questEggWhaleText'), adjective: t('questEggWhaleAdjective'), canBuy: false
+  Cheetah:          text: t('questEggCheetahText'), adjective: t('questEggCheetahAdjective'), canBuy: false
 
 _.each api.questEggs, (egg,key) ->
   _.defaults egg,
@@ -2037,6 +2038,26 @@ api.quests =
       ]
       gp: 0
       exp: 650
+  
+  cheetah:
+    text: t('questCheetahText')
+    notes: t('questCheetahNotes')
+    completion: t('questCheetahCompletion')
+    value: 4
+    category: 'pet'
+    boss:
+      name: t('questCheetahBoss')
+      hp: 600
+      str: 1.5
+    drop:
+      items: [
+        {type: 'eggs', key: 'Cheetah', text: t('questCheetahDropCheetahEgg')}
+        {type: 'eggs', key: 'Cheetah', text: t('questCheetahDropCheetahEgg')}
+        {type: 'eggs', key: 'Cheetah', text: t('questCheetahDropCheetahEgg')}
+      ]
+      gp: 43
+      exp: 350
+      unlock: t('questCheetahUnlockText')
 
 _.each api.quests, (v,key) ->
   _.defaults v, {key,canBuy:true}
diff --git a/website/views/options/inventory/drops.jade b/website/views/options/inventory/drops.jade
index 26c2e0b5fc..dc776ff0b8 100644
--- a/website/views/options/inventory/drops.jade
+++ b/website/views/options/inventory/drops.jade
@@ -112,7 +112,7 @@
                 span.Pet_Currency_Gem1x.inline-gems
             //- buyable quest eggs. TODO: Get this from a collection so we don't have to maintain this ridiculous comma-delimited list
             //- The hard part will be the trex stuff, since it is allowed to exist with two quests
-            each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin',rock:'Rock',bunny:'Bunny',slime:'Slime',sheep:'Sheep',kraken:'Cuttlefish',whale:'Whale'}
+            each egg,quest in {gryphon:'Gryphon',hedgehog:'Hedgehog',ghost_stag:'Deer',rat:'Rat',octopus:'Octopus',dilatory_derby:'Seahorse',harpy:'Parrot',rooster:'Rooster',spider:'Spider',owl:'Owl',penguin:'Penguin',rock:'Rock',bunny:'Bunny',slime:'Slime',sheep:'Sheep',kraken:'Cuttlefish',whale:'Whale',cheetah:'Cheetah'}
               div(ng-show='user.achievements.quests.#{quest} > 0')
                 button.customize-option(class='Pet_Egg_#{egg}',
                   popover='{{::Content.eggs.#{egg}.notes()}}', popover-append-to-body='true',