diff --git a/html-src/rules/swisspatience.html b/html-src/rules/swisspatience.html
new file mode 100644
index 00000000..b14e4f4a
--- /dev/null
+++ b/html-src/rules/swisspatience.html
@@ -0,0 +1,22 @@
+<h1>Swiss Patience</h1>
+<p>
+Gypsy type. 1 deck. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+Nine tableau piles are dealt, with five cards in the centermost pile,
+and descending numbers of cards going left and right.
+<p>
+Tableau piles are built down by alternate color.  Cards and sequences
+can be moved between tableau piles.  Aces are treated as being a higher
+rank than kings.  Only aces or sequences beginning with aces can be moved
+to empty tableau piles.  Foundations are built up by rank, starting with
+twos, and building up to aces.
+<p>
+When there are no moves left, you can deal cards from the talon, one to
+each tableau pile.  The game is won if all cards are moved to the
+foundations.
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index cc51cfe0..52b559ea 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -485,7 +485,7 @@ class GI:
         ('fc-2.12',   tuple(range(774, 811)) + (16681,) +
          tuple(range(22217, 22219))),
         ('fc-2.14', tuple(range(811, 827))),
-        ('fc-2.16', tuple(range(827, 842)))
+        ('fc-2.16', tuple(range(827, 843)))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py
index aaac3d97..f74dd572 100644
--- a/pysollib/games/gypsy.py
+++ b/pysollib/games/gypsy.py
@@ -958,6 +958,33 @@ class Thirty(Game):
     getQuickPlayScore = Game._getSpiderQuickPlayScore
 
 
+# ************************************************************************
+# * Swiss Patience
+# ************************************************************************
+
+class SwissPatience_RowStack(AC_RowStack):
+    def acceptsCards(self, from_stack, cards):
+        if cards[0].rank == ACE and len(self.cards) > 0:
+            return False
+        return AC_RowStack.acceptsCards(self, from_stack, cards)
+
+
+class SwissPatience(Gypsy):
+    Layout_Method = staticmethod(Layout.klondikeLayout)
+    Foundation_Class = StackWrapper(SS_FoundationStack, base_rank=1, mod=13)
+    RowStack_Class = StackWrapper(SwissPatience_RowStack, base_rank=ACE,
+                                  mod=13)
+
+    def createGame(self):
+        Gypsy.createGame(self, rows=9)
+
+    def startGame(self):
+        self.startDealSample()
+        for i in range(1, 5):
+            self.s.talon.dealRow(rows=self.s.rows[i:-i], flip=0, frames=0)
+        self._startAndDealRow()
+
+
 # register the game
 registerGame(GameInfo(1, Gypsy, "Gypsy",
                       GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL))
@@ -1034,3 +1061,5 @@ registerGame(GameInfo(725, TopsyTurvyQueens, "Topsy-Turvy Queens",
                       GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED))
 registerGame(GameInfo(792, KingsSecrets, "King's Secrets",
                       GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED))
+registerGame(GameInfo(842, SwissPatience, "Swiss Patience",
+                      GI.GT_GYPSY, 1, 0, GI.SL_BALANCED))