diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96db417..e7b6aed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Release Notes
 
 ### Version 2.15.3
-- add Huntsman/Damsel, Noble, Al-Hadikhia, Golem, Fearmonger to list of available characters
+- add Huntsman/Damsel, Noble, Al-Hadikhia, Golem, Fearmonger, Puzzlemaster to list of available characters
 
 ### Version 2.15.2
 - added mobile web application support
diff --git a/src/assets/icons/puzzlemaster.png b/src/assets/icons/puzzlemaster.png
new file mode 100644
index 0000000..f38520f
Binary files /dev/null and b/src/assets/icons/puzzlemaster.png differ
diff --git a/src/roles.json b/src/roles.json
index 4563fec..479265b 100644
--- a/src/roles.json
+++ b/src/roles.json
@@ -1410,6 +1410,20 @@
     "setup": false,
     "ability": "Each night*, if either good living neighbour is drunk or poisoned, you die."
   },
+  {
+    "id": "puzzlemaster",
+    "name": "Puzzlemaster",
+    "edition": "",
+    "team": "outsider",
+    "firstNight": 0,
+    "firstNightReminder": "",
+    "otherNight": 0,
+    "otherNightReminder": "",
+    "reminders": ["Drunk",
+        "Guess used"],
+    "setup": false,
+    "ability": "1 player is drunk, even if you die. If you guess (once) who it is, learn the Demon player, but guess wrong & get false info."
+  },
   {
     "id": "heretic",
     "name": "Heretic",
@@ -1502,20 +1516,6 @@
     "setup": false,
     "ability": "If you publicly claim to be the Goblin when nominated & are executed that day, your team wins."
   },
-  {
-    "id": "mezepheles",
-    "name": "Mezepheles",
-    "edition": "",
-    "team": "minion",
-    "firstNight": 25,
-    "firstNightReminder": "Show the Mezepheles their secret word.",
-    "otherNight": 18,
-    "otherNightReminder": "Wake the 1st good player that said the Mezepheles' secret word and show them the 'You are' card and the thumbs down evil signal.",
-    "reminders": ["Turns evil",
-        "No ability"],
-    "setup": false,
-    "ability": "You start knowing a secret word. The 1st good player to say this word becomes evil that night."
-  },
   {
     "id": "mephit",
     "name": "Mephit",
@@ -1530,6 +1530,20 @@
     "setup": false,
     "ability": "You start knowing a secret word. The 1st good player to say this word becomes evil that night."
   },
+  {
+    "id": "mezepheles",
+    "name": "Mezepheles",
+    "edition": "",
+    "team": "minion",
+    "firstNight": 25,
+    "firstNightReminder": "Show the Mezepheles their secret word.",
+    "otherNight": 18,
+    "otherNightReminder": "Wake the 1st good player that said the Mezepheles' secret word and show them the 'You are' card and the thumbs down evil signal.",
+    "reminders": ["Turns evil",
+        "No ability"],
+    "setup": false,
+    "ability": "You start knowing a secret word. The 1st good player to say this word becomes evil that night."
+  },
   {
     "id": "marionette",
     "name": "Marionette",