diff --git a/Handler/Haddock.hs b/Handler/Haddock.hs
index 0f921fa..05dd0f0 100644
--- a/Handler/Haddock.hs
+++ b/Handler/Haddock.hs
@@ -68,6 +68,11 @@ putUploadHaddockR = getUploadHaddockR
 getHaddockR :: SnapSlug -> [Text] -> Handler ()
 getHaddockR slug rest = do
     stackageEnt <- runDB $ do
+        onS3 <- fmap isJust $ getBy $ UniqueDocsOnS3 slug
+        when onS3 $ redirect $ concat
+            $ "http://haddock.stackage.org/"
+            : toPathPiece slug
+            : map (cons '/') rest
         ment <- getBy $ UniqueSnapshot slug
         case ment of
             Just ent -> do
diff --git a/config/models b/config/models
index acc4aab..ff72a50 100644
--- a/config/models
+++ b/config/models
@@ -15,6 +15,10 @@ Verkey
     email Text
     verkey Text
 
+DocsOnS3
+    slug SnapSlug
+    UniqueDocsOnS3 slug
+
 Stackage
     user UserId
     ident PackageSetIdent