diff --git a/bin/console-conf-serial-wrapper b/bin/console-conf-serial-wrapper
new file mode 100755
index 00000000..857d7d0e
--- /dev/null
+++ b/bin/console-conf-serial-wrapper
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+echo -n 'Press enter to configure: '
+read REPLY
+exec console-conf --serial "$@"
diff --git a/debian/changelog b/debian/changelog
index 7e5108b9..3774c843 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+subiquity (0.0.13) UNRELEASED; urgency=medium
+
+  * debian/console-conf.*.serial: Start the console-conf wrappers from
+    their path in /usr/share/subiquity; no need to have them in /usr/bin.
+  * bin/console-conf-serial-wrapper: add --serial to the command-line.
+  * debian/console-conf.serial-console-conf@.service: don't pass --serial,
+    this is meant to be parameters to agetty, not to the login program.
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Tue, 30 Aug 2016 13:57:46 -0400
+
 subiquity (0.0.12) yakkety; urgency=medium
 
   [ Mathieu Trudel-Lapierre ]
diff --git a/debian/console-conf.console-conf@.service b/debian/console-conf.console-conf@.service
index 45a05917..29b16b84 100644
--- a/debian/console-conf.console-conf@.service
+++ b/debian/console-conf.console-conf@.service
@@ -11,7 +11,7 @@ ConditionPathExists=!/var/lib/console-conf/complete
 [Service]
 Environment=PYTHONPATH=/usr/share/subiquity
 ExecStartPre=/bin/systemctl stop getty@%I
-ExecStart=-/sbin/agetty -n --noclear -l /usr/bin/console-conf-wrapper %I $TERM
+ExecStart=-/sbin/agetty -n --noclear -l /usr/share/subiquity/console-conf-wrapper %I $TERM
 ExecStop=/bin/systemctl start getty@%I
 #ExecStopPost=/bin/echo "Post stop, starting getty@%I"
 #ExecStopPost=/bin/systemctl start getty@%I
diff --git a/debian/console-conf.install b/debian/console-conf.install
index f7627695..04c7aafc 100644
--- a/debian/console-conf.install
+++ b/debian/console-conf.install
@@ -1,3 +1,4 @@
 bin/console-conf-tui                 usr/share/subiquity
 bin/console-conf-wrapper             usr/share/subiquity
+bin/console-conf-serial-wrapper      usr/share/subiquity
 usr/share/subiquity/console_conf
diff --git a/debian/console-conf.links b/debian/console-conf.links
index cf6df64b..e63bfb82 100644
--- a/debian/console-conf.links
+++ b/debian/console-conf.links
@@ -1,2 +1 @@
 /usr/share/subiquity/console-conf-tui            /usr/bin/console-conf
-/usr/share/subiquity/console-conf-wrapper        /usr/bin/console-conf-wrapper
diff --git a/debian/console-conf.serial-console-conf@.service b/debian/console-conf.serial-console-conf@.service
index 1e278d97..fc1eb020 100644
--- a/debian/console-conf.serial-console-conf@.service
+++ b/debian/console-conf.serial-console-conf@.service
@@ -8,7 +8,7 @@ ConditionPathExists=!/var/lib/console-conf/complete
 [Service]
 Environment=PYTHONPATH=/usr/share/subiquity
 ExecStartPre=/bin/systemctl stop serial-getty@%I
-ExecStart=-/sbin/agetty -n --noclear -l /usr/bin/console-conf-wrapper --serial %I $TERM
+ExecStart=-/sbin/agetty -n --noclear -l /usr/share/subiquity/console-conf-serial-wrapper %I $TERM
 ExecStop=/bin/systemctl start serial-getty@%I
 Type=idle
 Restart=always