diff --git a/Handler/Package.hs b/Handler/Package.hs
index 5f5f392..dbe6ae8 100644
--- a/Handler/Package.hs
+++ b/Handler/Package.hs
@@ -81,7 +81,8 @@ packagePage mversion pname = do
                     [] -> return Nothing
 
     let ixInFavourOf = zip [0::Int ..] inFavourOf
-        displayedVersion = maybe (packageLatest package) (toPathPiece . snd) mversion
+        mdisplayedVersion = toPathPiece . snd <$> mversion
+        latestVersion = packageLatest package
 
     let homepage = case T.strip (packageHomepage package) of
                      x | null x -> Nothing
diff --git a/templates/package.hamlet b/templates/package.hamlet
index 5102c3b..7e2f8b0 100644
--- a/templates/package.hamlet
+++ b/templates/package.hamlet
@@ -24,23 +24,25 @@ $newline never
                        #{url}
 
             <table>
+              $forall displayedVersion <- mdisplayedVersion
+                <tr>
+                  <td align=right>Version on this page:
+                  <td>
+                    <span .version>#{displayedVersion}
               $forall li <- latests
                  <tr>
                    <td align="right">
                      <a href=@{SnapshotR (liSnapName li) StackageHomeR}>
                         #{prettyNameShort (liSnapName li)}
-                     \: #
+                     :
                    <td>
                      <span .version>
-                       #{liVersion li}
+                       <a href=@{SnapshotR (liSnapName li) (StackageSdistR (PNVName pn))}>#{liVersion li}
               <tr>
-                <td align="right">
-                  <a href="https://hackage.haskell.org/package/#{pn}">
-                     Hackage
-                  \: #
+                <td align="right">Latest on Hackage:
                 <td>
-                  <span .version>
-                    #{displayedVersion} #
+                  <a href="https://hackage.haskell.org/package/#{pn}-#{latestVersion}">
+                    <span .version>#{latestVersion}
 
             $if null latests
                 <p .add-to-nightly>