diff --git a/Handler/Package.hs b/Handler/Package.hs
index 0559187..b530fbc 100644
--- a/Handler/Package.hs
+++ b/Handler/Package.hs
@@ -23,9 +23,7 @@ getPackageR pn = do
         asInt = id
         haddocksLink ident version =
             HaddockR ident [concat [toPathPiece pn, "-", toPathPiece version]]
-    (latestVersion, packages, downloads, recentDownloads, Entity _ metadata) <- runDB $ do
-        mupload <- selectFirst [UploadedName ==. pn] [Desc UploadedUploaded]
-        Entity _ (Uploaded _ latestVersion _) <- maybe notFound return mupload
+    (packages, downloads, recentDownloads, Entity _ metadata) <- runDB $ do
         packages <- fmap (map reformat) $ E.select $ E.from $ \(p, s) -> do
             E.where_ $ (p ^. PackageStackage E.==. s ^. StackageId)
                    &&. (p ^. PackageName' E.==. E.val pn)
@@ -38,9 +36,8 @@ getPackageR pn = do
         now <- liftIO getCurrentTime
         let nowMinus30 = addUTCTime (-30 * 24 * 60 * 60) now
         recentDownloads <- count [DownloadPackage ==. pn, DownloadTimestamp >=. nowMinus30]
-        metadata <- fmap listToMaybe (selectList [MetadataName ==. pn] [LimitTo 1]) >>=
-                    maybe notFound return
-        return (latestVersion, packages, downloads, recentDownloads, metadata)
+        metadata <- getBy404 (UniqueMetadata pn)
+        return (packages, downloads, recentDownloads, metadata)
     readmeText <- return "TODO"
     let readmeHtml = markdown def readmeText
         deps = enumerate (metadataDeps metadata)
diff --git a/templates/package.hamlet b/templates/package.hamlet
index 373ef66..49522f7 100644
--- a/templates/package.hamlet
+++ b/templates/package.hamlet
@@ -5,7 +5,7 @@ $newline never
             <h1>
                #{pn} #
                <span .latest-version>
-                 #{latestVersion} #
+                 #{metadataVersion metadata} #
                  <small>
                      (current)
     <div .row>