diff --git a/Makefile b/Makefile
index 6a11c05..41294ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-UBUNTU_BOXES= precise quantal raring saucy trusty utopic vivid
+UBUNTU_BOXES= precise quantal raring saucy trusty utopic vivid wily
 DEBIAN_BOXES= squeeze wheezy sid jessie
 CENTOS_BOXES= 6
 FEDORA_BOXES= rawhide 23 22 21 20 19
diff --git a/common/download.sh b/common/download.sh
index 14373bf..6053d62 100755
--- a/common/download.sh
+++ b/common/download.sh
@@ -26,7 +26,7 @@ fi
 
 # If we got to this point, we need to create the container
 log "Creating container..."
-if [ $RELEASE = 'raring' ]; then
+if [ $RELEASE = 'raring' ] || [ $RELEASE = 'wily' ]; then
   utils.lxc.create -t ubuntu -- \
                    --release ${RELEASE} \
                    --arch ${ARCH}
@@ -50,9 +50,9 @@ else
                    --release ${RELEASE} \
                    --arch ${ARCH}
 fi
-
-if [ ${DISTRIBUTION} = 'fedora' -o \
-     ${DISTRIBUTION} = 'debian' -a ${RELEASE} = 'jessie' ]
+if [ ${DISTRIBUTION} = 'fedora' ] ||\
+   [ ${DISTRIBUTION} = 'ubuntu' -a ${RELEASE} = 'wily' ] ||\
+   [ ${DISTRIBUTION} = 'debian' -a ${RELEASE} = 'jessie' ]
 then
   # Improve systemd support:
   # - The fedora template does it but the fedora images from the download
diff --git a/conf/ubuntu-wily b/conf/ubuntu-wily
new file mode 100644
index 0000000..869d6af
--- /dev/null
+++ b/conf/ubuntu-wily
@@ -0,0 +1,10 @@
+# Template used to create this container: /usr/share/lxc/templates/lxc-ubuntu
+# Parameters passed to the template: --release wily --arch amd64
+# For additional config options, please look at lxc.container.conf(5)
+
+# Common configuration
+lxc.include = /usr/share/lxc/config/ubuntu.common.conf
+
+# settings for systemd with PID 1:
+lxc.kmsg = 0
+lxc.autodev = 1
diff --git a/debian/install-extras.sh b/debian/install-extras.sh
index fc2d37e..88f9a8d 100755
--- a/debian/install-extras.sh
+++ b/debian/install-extras.sh
@@ -19,7 +19,7 @@ PACKAGES=(vim curl wget man-db openssh-server bash-completion python-software-pr
 if [ $DISTRIBUTION = 'ubuntu' ]; then
   PACKAGES+=' software-properties-common'
 fi
-if [ $RELEASE != 'raring' ] && [ $RELEASE != 'saucy' ] && [ $RELEASE != 'trusty' ] ; then
+if [ $RELEASE != 'raring' ] && [ $RELEASE != 'saucy' ] && [ $RELEASE != 'trusty' ] && [ $RELEASE != 'wily' ] ; then
   PACKAGES+=' nfs-common'
 fi
 utils.lxc.attach apt-get update