diff --git a/bin/sizeent b/bin/sizeent
index 3ebe922b..ef286756 100755
--- a/bin/sizeent
+++ b/bin/sizeent
@@ -35,7 +35,7 @@ while read X ; do
     echo "<!ENTITY size-${PKG} \"NOT_FOUND\">"
     echo  "" >&2
     echo  "... ERROR ...: $X, probably a removed or non-amd64 package." >&2
-    echo  ".............:         See http://packages.qa.debian.org/common/index.html" >&2
+    echo  ".............:         See https://tracker.debian.org/" >&2
   fi
 done
 
diff --git a/xslt/table.xsl b/xslt/table.xsl
index 9c245980..983a848f 100644
--- a/xslt/table.xsl
+++ b/xslt/table.xsl
@@ -78,16 +78,7 @@ Process raw XML file:
     <xsl:when test="contains(., '@-@psize1@-@')">
       <!-- column 3 is size -->
       <xsl:copy>
-      <xsl:choose>
-        <xsl:when test="starts-with(normalize-space(../entry[1]), 'lib')">
-          <!-- library -->
-          <xsl:text disable-output-escaping="yes">&lt;ulink url="http://packages.qa.debian.org/</xsl:text><xsl:value-of select='normalize-space(concat(substring(normalize-space(../entry[1]), 1, 4), "/", normalize-space(../entry[1])))'/><xsl:text disable-output-escaping="yes">.html"&gt;@-@amp@-@size-</xsl:text><xsl:value-of select="translate( normalize-space(../entry[1]), $uletters, $lletters)"/><xsl:text disable-output-escaping="yes">;&lt;/ulink&gt;</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- non-library -->
-          <xsl:text disable-output-escaping="yes">&lt;ulink url="http://packages.qa.debian.org/</xsl:text><xsl:value-of select='normalize-space(concat(substring(normalize-space(../entry[1]), 1, 1), "/", normalize-space(../entry[1])))'/><xsl:text disable-output-escaping="yes">.html"&gt;@-@amp@-@size-</xsl:text><xsl:value-of select="translate( normalize-space(../entry[1]), $uletters, $lletters)"/><xsl:text disable-output-escaping="yes">;&lt;/ulink&gt;</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
+        <xsl:text disable-output-escaping="yes">&lt;ulink url="https://tracker.debian.org/pkg/</xsl:text><xsl:value-of select='normalize-space(../entry[1])'/><xsl:text disable-output-escaping="yes">"&gt;@-@amp@-@size-</xsl:text><xsl:value-of select="translate( normalize-space(../entry[1]), $uletters, $lletters)"/><xsl:text disable-output-escaping="yes">;&lt;/ulink&gt;</xsl:text>
       </xsl:copy>
     </xsl:when>
     <xsl:otherwise>
@@ -104,16 +95,7 @@ Process raw XML file:
     <xsl:when test="contains(., '@-@psize2@-@')">
       <!-- column 4 is size -->
       <xsl:copy>
-      <xsl:choose>
-        <xsl:when test="starts-with(normalize-space(../entry[2]), 'lib')">
-          <!-- library -->
-          <xsl:text disable-output-escaping="yes">&lt;ulink url="http://packages.qa.debian.org/</xsl:text><xsl:value-of select='normalize-space(concat(substring(normalize-space(../entry[2]), 1, 4), "/", normalize-space(../entry[2])))'/><xsl:text disable-output-escaping="yes">.html"&gt;@-@amp@-@size-</xsl:text><xsl:value-of select="translate( normalize-space(../entry[2]), $uletters, $lletters)"/><xsl:text disable-output-escaping="yes">;&lt;/ulink&gt;</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- non-library -->
-          <xsl:text disable-output-escaping="yes">&lt;ulink url="http://packages.qa.debian.org/</xsl:text><xsl:value-of select='normalize-space(concat(substring(normalize-space(../entry[2]), 1, 1), "/", normalize-space(../entry[2])))'/><xsl:text disable-output-escaping="yes">.html"&gt;@-@amp@-@size-</xsl:text><xsl:value-of select="translate( normalize-space(../entry[2]), $uletters, $lletters)"/><xsl:text disable-output-escaping="yes">;&lt;/ulink&gt;</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
+        <xsl:text disable-output-escaping="yes">&lt;ulink url="https://tracker.debian.org/pkg/</xsl:text><xsl:value-of select='normalize-space(../entry[1])'/><xsl:text disable-output-escaping="yes">"&gt;@-@amp@-@size-</xsl:text><xsl:value-of select="translate( normalize-space(../entry[1]), $uletters, $lletters)"/><xsl:text disable-output-escaping="yes">;&lt;/ulink&gt;</xsl:text>
       </xsl:copy>
     </xsl:when>
     <xsl:otherwise>