diff --git a/debian/control b/debian/control
index 6746516031..ea532ca812 100644
--- a/debian/control
+++ b/debian/control
@@ -38,8 +38,7 @@ Build-Depends:
 	libghc-yesod-form-dev (>= 1.3.15) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
 	libghc-yesod-static-dev (>= 1.2.4) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
 	libghc-yesod-default-dev (>= 1.2.0) [i386 amd64 armel armhf kfreebsd-amd64 powerpc ppc64el],
-	libghc-hamlet-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
-	libghc-shakespeare-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
+	libghc-shakespeare-dev (>= 2.0.0) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
 	libghc-clientsession-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
 	libghc-warp-dev (>= 3.0.0.5) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
 	libghc-warp-tls-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
diff --git a/git-annex.cabal b/git-annex.cabal
index 25b1b6438a..3849ec92d4 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -227,9 +227,9 @@ Executable git-annex
      warp (>= 3.0.0.5),
      warp-tls,
      wai, wai-extra,
-     blaze-builder, crypto-api, hamlet, clientsession,
+     blaze-builder, crypto-api, clientsession,
      template-haskell, aeson,
-     shakespeare
+     shakespeare (>= 2.0.0)
     CPP-Options: -DWITH_WEBAPP
 
   if flag(Webapp) && flag (Webapp-secure)