diff --git a/html-src/rules/smokey.html b/html-src/rules/smokey.html
new file mode 100644
index 00000000..2658abde
--- /dev/null
+++ b/html-src/rules/smokey.html
@@ -0,0 +1,18 @@
+<h1>Smokey</h1>
+<p>
+Klondike type. 1 deck. 2 redeals.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Like <a href="klondike.html">Klondike</a>,
+but piles build down by same color
+(sequences can be moved only if they build down by same suit),
+and only two redeals.
+
+<h3>Notes</h3>
+<p>
+Smokey was invented by Ann Edwards.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 4f547e32..6fed1835 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -444,6 +444,7 @@ class GI:
         ("Art Cabral", (9,)),
         ("Richard A. Canfield", (105, 835,)),
         ("Lillian Davies and Christa Baran", (605,)),
+        ("Ann Edwards", (869,)),
         ("Robert Harbin", (381,)),
         ("Robert Hogue", (22216, 22217, 22218, 22231,)),
         ("Erik den Hollander", (344, 544,)),
@@ -547,7 +548,7 @@ class GI:
          tuple(range(22217, 22219))),
         ('fc-2.14', tuple(range(811, 827))),
         ('fc-2.15', tuple(range(827, 855)) + tuple(range(22400, 22407))),
-        ('dev', tuple(range(855, 869)))
+        ('dev', tuple(range(855, 870)))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py
index 3024e9d3..f0d0f337 100644
--- a/pysollib/games/klondike.py
+++ b/pysollib/games/klondike.py
@@ -220,6 +220,18 @@ class Whitehead(Klondike):
     getQuickPlayScore = Game._getSpiderQuickPlayScore
 
 
+# ************************************************************************
+# * Smokey
+# ************************************************************************
+
+class Smokey(Klondike):
+    RowStack_Class = StackWrapper(Whitehead_RowStack, base_rank=KING)
+    Hint_Class = CautiousDefaultHint
+
+    def createGame(self):
+        Klondike.createGame(self, max_rounds=3)
+
+
 # ************************************************************************
 # * Small Harp (Klondike in a different layout)
 # ************************************************************************
@@ -1633,3 +1645,5 @@ registerGame(GameInfo(855, HalfKlondike, "Half Klondike",
                       suits=(1, 2)))
 registerGame(GameInfo(861, Wildflower, "Wildflower",
                       GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL))
+registerGame(GameInfo(869, Smokey, "Smokey",
+                      GI.GT_KLONDIKE, 1, 2, GI.SL_BALANCED))