diff --git a/templates/os/sources/stanford.list.erb b/templates/os/sources/stanford.list.erb
index 85b4a69a8636ef1fe02cde3acc4a606676ed3cd2..c9ec228f7f26e9b94da4fcd20ed43a03a20d3095 100644
--- a/templates/os/sources/stanford.list.erb
+++ b/templates/os/sources/stanford.list.erb
@@ -3,7 +3,11 @@
    # Map Ubuntu distributions to Debian distributions since we don't
    # currently have any repositories targeted for Ubuntu releases.
    if @operatingsystem == 'Ubuntu'
-     if (@lsbdistcodename =~ /raring|trusty/)
+     if (@lsbdistcodename =~ /xenial/)
+       dist = 'stretch'
+     elsif (@lsbdistcodename =~ /wily|vivid|utopic|trusty/)
+       dist = 'jessie'
+     elsif (@lsbdistcodename =~ /saucy|raring|quantal|precise|oneiric/)
        dist = 'wheezy'
      else
        dist = 'squeeze'