diff --git a/html-src/rules/octagon.html b/html-src/rules/octagon.html
new file mode 100644
index 00000000..5110334e
--- /dev/null
+++ b/html-src/rules/octagon.html
@@ -0,0 +1,20 @@
+<h1>Octagon</h1>
+<p>
+Forty Thieves type. 2 decks. 3 redeals.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+Five cards are dealt into each of four tableau piles, located
+in the corners of the play area.  The eight aces are dealt to
+eight foundations, each located on the edges of the play area.
+The tableau piles are built down by same suit.  Cards can be
+dealt from the talon (placed in the middle of the play area)
+one at a time, and can be moved to the tableau or foundations.
+Three redeals are allowed.
+<p>
+Foundations are built up by same suit.  The game is won when
+all cards are moved to the foundations.
diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py
index 839a454e..e2fd45e6 100644
--- a/pysollib/games/fortythieves.py
+++ b/pysollib/games/fortythieves.py
@@ -745,8 +745,8 @@ class Octagon(Game):
 
         l, s = Layout(self), self.s
 
-        w1 = l.XS+12*l.XOFFSET
-        w, h = l.XM+2*l.XS+2*w1, l.YM+4*l.YS
+        w1 = max(l.XS + 12 * l.XOFFSET, l.XM + 2 * l.XS + l.XS // 2)
+        w, h = l.XM + 2 * l.XS + 2 * w1, l.YM + 4 * l.YS
         self.setSize(w, h)
 
         for x, y in ((l.XM,                l.YM),