diff --git a/debian/changelog b/debian/changelog
index 3bb8f3f8..d91a4c82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.494) bionic; urgency=medium
+
+  * Run subiquity on any serial consoles that the user told systemd
+    about.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 31 Jan 2018 21:58:33 +1300
+
 livecd-rootfs (2.493) bionic; urgency=medium
 
   * Set a default archive mirror - needed for germinate.
diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
new file mode 100644
index 00000000..9aef8ee3
--- /dev/null
+++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
@@ -0,0 +1,2 @@
+[Service]
+ExecStartPre=/bin/systemctl start serial-subiquity@%i.service
diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service
new file mode 100644
index 00000000..d5d588ad
--- /dev/null
+++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Subiquity, the installer for Ubuntu Server %I
+BindsTo=dev-%i.device
+After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
+After=rc-local.service
+ConditionPathExists=!/run/subiquity/complete
+StartLimitInterval=0
+
+[Service]
+Environment=PYTHONPATH=/usr/share/subiquity
+ExecStartPre=/bin/systemctl stop serial-getty@%I
+ExecStart=/sbin/agetty -n --keep-baud -l /snap/bin/subiquity --login-options "--serial" 115200,38400,9600 %I $TERM
+ExecStopPost=/bin/systemctl start serial-getty@%I
+Type=idle
+Restart=always
+RestartSec=0
+UtmpIdentifier=%I
+TTYPath=/dev/%I
+TTYReset=yes
+TTYVHangup=yes
+KillMode=process
+IgnoreSIGPIPE=no
+SendSIGHUP=yes
diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service
index 826e234d..3a7edb15 100644
--- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service
+++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service
@@ -22,9 +22,3 @@ TTYVTDisallocate=yes
 KillMode=process
 IgnoreSIGPIPE=no
 SendSIGHUP=yes
-
-#KillMode=process
-#Restart=always
-#StandardInput=tty-force
-#StandardOutput=tty
-#StandardError=tty
diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
index 89d44bd2..5357f04f 100644
--- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
+++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
@@ -26,9 +26,3 @@ TTYVTDisallocate=yes
 KillMode=process
 IgnoreSIGPIPE=no
 SendSIGHUP=yes
-
-#KillMode=process
-#Restart=always
-#StandardInput=tty-force
-#StandardOutput=tty
-#StandardError=tty