diff --git a/sql/schema.sql b/sql/schema.sql
index f8403c4..73512df 100644
--- a/sql/schema.sql
+++ b/sql/schema.sql
@@ -176,7 +176,8 @@ INSERT INTO systems (id, name, release, short, relorder) VALUES
   (122,'Fedora',     '22',    'fedora-22',       21),
   (123,'Fedora',     '23',    'fedora-23',       22),
   (124,'Fedora',     '24',    'fedora-24',       23),
-  (125,'Fedora',     '25',    'fedora-25',       24);
+  (125,'Fedora',     '25',    'fedora-25',       24),
+  (126,'Ubuntu',     '17.04', 'ubuntu-zesty',    25);
 
 
 -- Removes any path components and compression extensions from the filename.
diff --git a/util/common.sh b/util/common.sh
index 4ba7f74..5644731 100644
--- a/util/common.sh
+++ b/util/common.sh
@@ -11,7 +11,6 @@ index() {
 
 
 # Convenient wrapper around index() for debian repos
-# TODO: Use x86_64 for new releases
 # Usage: index_dev sys mirror distro list-of-components [contents]
 #   contents:
 #     empty for global Contents-i386.gz location
@@ -22,11 +21,12 @@ index_deb() {
   local MIRROR=$2
   local DISTRO=$3
   local COMPONENTS=$4
-  local CONTENTS=${5:-"dists/$DISTRO/Contents-i386.gz"}
+  local ARCH=${6:-"i386"}
+  local CONTENTS=${5:-"dists/$DISTRO/Contents-$ARCH.gz"}
 
   for CMP in $COMPONENTS; do
     local CONT=$CONTENTS
-    test $CONT = cmp && CONT="dists/$DISTRO/$CMP/Contents-i386.gz"
-    index deb --sys "$SYS" --mirror "$MIRROR" --contents "$MIRROR$CONT" --packages "${MIRROR}dists/$DISTRO/$CMP/binary-i386/Packages.gz"
+    test $CONT = cmp && CONT="dists/$DISTRO/$CMP/Contents-$ARCH.gz"
+    index deb --sys "$SYS" --mirror "$MIRROR" --contents "$MIRROR$CONT" --packages "${MIRROR}dists/$DISTRO/$CMP/binary-$ARCH/Packages.gz"
   done
 }
diff --git a/util/ubuntu.sh b/util/ubuntu.sh
index 97be7e2..b879d22 100755
--- a/util/ubuntu.sh
+++ b/util/ubuntu.sh
@@ -7,11 +7,12 @@ CMIRROR=http://nl.archive.ubuntu.com/ubuntu/
 
 
 # Shortcut for a standard Ubuntu repo, usage:
-#   stdrepo name mirror
+#   stdrepo name mirror arch
 stdrepo() {
-    index_deb ubuntu-$1 $2 $1 "main multiverse restricted universe"
-    index_deb ubuntu-$1 $2 $1-updates "main multiverse restricted universe"
-    index_deb ubuntu-$1 $2 $1-security "main multiverse restricted universe"
+    local ARCH=${3:-"i386"}
+    index_deb ubuntu-$1 $2 $1 "main multiverse restricted universe" "" $ARCH
+    index_deb ubuntu-$1 $2 $1-updates "main multiverse restricted universe" "" $ARCH
+    index_deb ubuntu-$1 $2 $1-security "main multiverse restricted universe" "" $ARCH
 }
 
 
@@ -100,6 +101,9 @@ case $1 in
     yakkety)
         stdrepo yakkety $CMIRROR
         ;;
+    zesty)
+        stdrepo zesty $CMIRROR amd64
+        ;;
     old)
         $0 warty
         $0 hoary
@@ -128,6 +132,7 @@ case $1 in
         $0 trusty   # until 2019-04
         $0 xenial   # until 2021-04
         $0 yakkety  # until 2017-07
+        $0 zesty    # until 2018-01
         ;;
     all)
         $0 old
diff --git a/www/index.pl b/www/index.pl
index aea4ac1..2117042 100755
--- a/www/index.pl
+++ b/www/index.pl
@@ -276,7 +276,8 @@ sub about {
      supported releases from a local mirror.  All components (main, universe,
      restricted and multiverse) from the $release, $release-updates and
      $release-security repositories are indexed. Indexing started around mid
-     June 2012.</dd>
+     June 2012. All releases before 2017 were indexed from the i386
+     repositories, starting with 17.04 the amd64 repositories were used.</dd>
    </dl>
    <p>
    Only packages for a single architecture (i386 or amd64) are scanned.  To my