diff --git a/modules/wolfgame.py b/modules/wolfgame.py
index 3db6037..e23664e 100644
--- a/modules/wolfgame.py
+++ b/modules/wolfgame.py
@@ -1079,7 +1079,7 @@ def goat(cli, nick, chan, rest):
     if var.PHASE != "day":
         cli.notice(nick, "You can only do that in the day.")
         return
-    if var.GOATED:
+    if var.GOATED and nick != var.ROLES["goat herder"]:
         cli.notice(nick, "You can only do that once per day.")
         return
     ul = list(var.USERS.keys())
@@ -2398,6 +2398,10 @@ def start(cli, nick, chann_, rest):
                 var.GUNNERS[gnr] = math.ceil(var.SHOTS_MULTIPLIER * len(pl))
     del var.ROLES["gunner"]
 
+    var.ROLES["goat herder"] = None
+    if var.GOAT_HERDER:
+        var.ROLES["goat herder"] = random.choice(pl)
+
     var.ROLES["villager"] = villagers
 
     cli.msg(chan, ("{0}: Welcome to Werewolf, the popular detective/social party "+
diff --git a/settings/wolfgame.py b/settings/wolfgame.py
index 3e32065..acc9c23 100644
--- a/settings/wolfgame.py
+++ b/settings/wolfgame.py
@@ -26,6 +26,8 @@ LEAVE_STASIS_PENALTY = 3
 IDLE_STASIS_PENALTY = 2
 PART_STASIS_PENALTY = 4
 
+GOAT_HERDER = True
+
 SELF_LYNCH_ALLOWED = True
 
 CARE_BOLD = True