diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index 5c09052d9..208f42e74 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -123,7 +123,6 @@ library
                    , data-default
                    , directory
                    , filepath
-                   , hamlet
                    , hjsmin
                    , http-conduit
                    , http-client          >= 0.2 && < 0.4
@@ -134,7 +133,17 @@ library
                    , parsec
                    , regexpr              >= 0.5.1
                    , safe                 >= 0.2
-                   , shakespeare-text
+-- http://www.yesodweb.com/blog/2014/04/consolidation-progress
+-- in order to support both the old and new versions of shakespeare,
+-- you just need to ensure that you have both the shakespeare and
+-- deprecated packages listed in your cabal file. In other words, if
+-- previously you depended on hamlet, now you should depend on hamlet
+-- and shakespeare. When you're ready to drop backwards compatibility,
+-- simply put a lower bound of >= 2.0 on shakespeare and remove the
+-- deprecated packages.
+                   , hamlet
+                   , shakespeare-text >= 1.0 && < 1.2
+                   , shakespeare      >= 1.0 && < 2.1
                    , template-haskell
                    , text
                    , time
@@ -216,7 +225,6 @@ executable         hledger-web
                    , data-default
                    , directory
                    , filepath
-                   , hamlet
                    , hjsmin
                    , http-conduit
                    , http-client          >= 0.2 && < 0.4
@@ -227,7 +235,9 @@ executable         hledger-web
                    , parsec
                    , regexpr              >= 0.5.1
                    , safe                 >= 0.2
-                   , shakespeare-text
+                   , hamlet
+                   , shakespeare-text >= 1.0 && < 1.2
+                   , shakespeare      >= 1.0 && < 2.1
                    , template-haskell
                    , text
                    , time
diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal
index 6fd9c26dd..47b547e89 100644
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@@ -83,7 +83,16 @@ library
                  ,process
                  ,regexpr >= 0.5.1
                  ,safe >= 0.2
-                 ,shakespeare-text == 1.0.*
+-- http://www.yesodweb.com/blog/2014/04/consolidation-progress
+-- in order to support both the old and new versions of shakespeare,
+-- you just need to ensure that you have both the shakespeare and
+-- deprecated packages listed in your cabal file. In other words, if
+-- previously you depended on hamlet, now you should depend on hamlet
+-- and shakespeare. When you're ready to drop backwards compatibility,
+-- simply put a lower bound of >= 2.0 on shakespeare and remove the
+-- deprecated packages.
+                 ,shakespeare-text >= 1.0 && < 1.2
+                 ,shakespeare      >= 1.0 && < 2.1
                  ,split >= 0.1 && < 0.3
                  ,text >= 0.11 && < 1.2
                  ,tabular >= 0.2 && < 0.3
@@ -143,7 +152,8 @@ executable hledger
                  ,process
                  ,regexpr >= 0.5.1
                  ,safe >= 0.2
-                 ,shakespeare-text == 1.0.*
+                 ,shakespeare-text >= 1.0 && < 1.2
+                 ,shakespeare      >= 1.0 && < 2.1
                  ,split >= 0.1 && < 0.3
                  ,tabular >= 0.2 && < 0.3
                  ,text >= 0.11 && < 1.2
@@ -176,7 +186,8 @@ test-suite tests
                , process
                , regexpr
                , safe
-               , shakespeare-text
+               , shakespeare-text >= 1.0 && < 1.2
+               , shakespeare      >= 1.0 && < 2.1
                , split
                ,tabular >= 0.2 && < 0.3
                , test-framework