diff --git a/Import.hs b/Import.hs
index 5664773..8eafce5 100644
--- a/Import.hs
+++ b/Import.hs
@@ -20,6 +20,11 @@ parseLtsPair t1 = do
     (y, "") <- either (const Nothing) Just $ decimal t3
     Just (x, y)
 
+packageUrl :: SnapName -> PackageName -> Version -> Route App
+packageUrl sname pkgname pkgver = SnapshotR sname sdistR
+  where
+    sdistR = StackageSdistR (PNVNameVersion pkgname pkgver)
+
 haddockUrl :: SnapName
            -> Text -- ^ package-version
            -> Text -- ^ module name
diff --git a/templates/stackage-diff.hamlet b/templates/stackage-diff.hamlet
index d2b90b6..d069288 100644
--- a/templates/stackage-diff.hamlet
+++ b/templates/stackage-diff.hamlet
@@ -33,15 +33,23 @@
                 $else
                   <option value=@{StackageDiffR name1 name2'}>#{toPathPiece name2'}
       <tbody>
-        $forall (PackageName name, VersionChange verChange) <- toDiffList snapDiff
+        $forall (pkgname, VersionChange verChange) <- toDiffList snapDiff
           <tr>
             $case verChange
-              $of This (Version oldVersion)
-                <td>#{name}-#{oldVersion}
+              $of This oldVersion
                 <td>
-              $of That (Version newVersion)
+                  <a href=@{packageUrl name1 pkgname oldVersion}>
+                    #{pkgname}-#{oldVersion}
                 <td>
-                <td>#{name}-#{newVersion}
-              $of These (Version oldVersion) (Version newVersion)
-                <td>#{name}-#{oldVersion}
-                <td>#{name}-#{newVersion}
+              $of That newVersion
+                <td>
+                <td>
+                  <a href=@{packageUrl name2 pkgname newVersion}>
+                    #{pkgname}-#{newVersion}
+              $of These oldVersion newVersion
+                <td>
+                  <a href=@{packageUrl name1 pkgname oldVersion}>
+                    #{pkgname}-#{oldVersion}
+                <td>
+                  <a href=@{packageUrl name2 pkgname newVersion}>
+                    #{pkgname}-#{newVersion}
diff --git a/templates/stackage-home.hamlet b/templates/stackage-home.hamlet
index 76179fe..3f4146e 100644
--- a/templates/stackage-home.hamlet
+++ b/templates/stackage-home.hamlet
@@ -53,8 +53,7 @@ $newline never
                 $forall pli <- packages
                     <tr>
                         <td>
-                            <a href=@{SnapshotR name $ StackageSdistR $ PNVNameVersion (PackageName $ toPathPiece $ pliName pli) $ Version (pliVersion pli)}>
-                                #{pliName pli}
-                                -#{pliVersion pli}
+                            <a href=@{packageUrl name (PackageName $ pliName pli) (Version $ pliVersion pli)}>
+                                #{pliName pli}-#{pliVersion pli}
                         <td>
                             #{strip $ pliSynopsis pli}