diff -pruN 30/auto-raidcfg 30ubuntu1/auto-raidcfg
--- 30/auto-raidcfg	2015-07-10 06:30:28.000000000 +0000
+++ 30ubuntu1/auto-raidcfg	2015-12-02 15:27:51.000000000 +0000
@@ -4,6 +4,20 @@
 
 # Mostly based on mdcfg
 
+expand_raidid() {
+	new_raid_devices=
+	for raid_device; do
+		if [ "${raid_device#raidid=}" != "$raid_device" ]; then
+			for match in $(cat "/var/lib/partman/raidids/${raid_device#raidid=}"); do
+				new_raid_devices="${new_raid_devices:+$new_raid_devices }$match"
+			done
+		else
+			new_raid_devices="${new_raid_devices:+$new_raid_devices }$raid_device"
+		fi
+	done
+	echo "$new_raid_devices"
+}
+
 create_raid() {
 	RAID_TYPE="$1"
 	DEV_COUNT="$2"
@@ -23,6 +37,10 @@ create_raid() {
 	MOUNTPOINT="$5"
 	RAID_DEVICES=$(echo $6 | sed -e "s/#/ /g")
 	SPARE_DEVICES=$(echo $7 | sed -e "s/#/ /g")
+
+	RAID_DEVICES="$(expand_raidid $RAID_DEVICES)"
+	SPARE_DEVICES="$(expand_raidid $SPARE_DEVICES)"
+
 	EXTRA_ARGS=$(echo $8 | sed -e "s/#/ /g")
 
 	NAMED_SPARES=$(echo $SPARE_DEVICES | wc -w)
diff -pruN 30/debian/changelog 30ubuntu1/debian/changelog
--- 30/debian/changelog	2015-07-10 06:32:07.000000000 +0000
+++ 30ubuntu1/debian/changelog	2015-12-02 15:29:06.000000000 +0000
@@ -1,3 +1,12 @@
+partman-auto-raid (30ubuntu1) xenial; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Add raidid= syntax to partman-auto-raid/recipe to make it possible to
+      preseed RAID creation without having to guess partition device names
+      in advance.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 02 Dec 2015 10:29:04 -0500
+
 partman-auto-raid (30) unstable; urgency=medium
 
   * Add support for additional arguments to mdadm, making it possible to
@@ -29,6 +38,15 @@ partman-auto-raid (27) unstable; urgency
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 20 Sep 2014 12:44:58 +0200
 
+partman-auto-raid (26ubuntu1) utopic; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Add raidid= syntax to partman-auto-raid/recipe to make it possible to
+      preseed RAID creation without having to guess partition device names
+      in advance.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 07 Jul 2014 11:04:16 +0100
+
 partman-auto-raid (26) unstable; urgency=medium
 
   [ Updated translations ]
@@ -63,6 +81,15 @@ partman-auto-raid (23) unstable; urgency
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 14 Jul 2013 12:45:08 +0200
 
+partman-auto-raid (22ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Add raidid= syntax to partman-auto-raid/recipe to make it possible to
+      preseed RAID creation without having to guess partition device names
+      in advance.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 03 Jun 2013 12:56:21 +0100
+
 partman-auto-raid (22) unstable; urgency=low
 
   * Team upload
@@ -72,6 +99,15 @@ partman-auto-raid (22) unstable; urgency
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 18 May 2013 13:13:11 +0200
 
+partman-auto-raid (21ubuntu1) quantal; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Add raidid= syntax to partman-auto-raid/recipe to make it possible to
+      preseed RAID creation without having to guess partition device names
+      in advance.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 03 Jul 2012 14:06:11 +0100
+
 partman-auto-raid (21) unstable; urgency=low
 
   * Team upload
@@ -88,6 +124,15 @@ partman-auto-raid (21) unstable; urgency
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 16 Jun 2012 07:29:16 +0200
 
+partman-auto-raid (20ubuntu1) precise; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Add raidid= syntax to partman-auto-raid/recipe to make it possible to
+      preseed RAID creation without having to guess partition device names
+      in advance.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 11 Apr 2012 15:19:03 +0100
+
 partman-auto-raid (20) unstable; urgency=low
 
   [ Updated translations ]
@@ -112,6 +157,15 @@ partman-auto-raid (20) unstable; urgency
 
  -- Otavio Salvador <otavio@debian.org>  Thu, 15 Mar 2012 14:56:29 -0300
 
+partman-auto-raid (19ubuntu1) oneiric; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Add raidid= syntax to partman-auto-raid/recipe to make it possible to
+      preseed RAID creation without having to guess partition device names
+      in advance.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 03 May 2011 19:44:14 +0100
+
 partman-auto-raid (19) unstable; urgency=low
 
   * Team upload
@@ -130,6 +184,15 @@ partman-auto-raid (19) unstable; urgency
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 24 Apr 2011 12:35:55 +0200
 
+partman-auto-raid (18ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Add raidid= syntax to partman-auto-raid/recipe to make it possible to
+      preseed RAID creation without having to guess partition device names
+      in advance.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 31 Jan 2011 14:50:00 +0000
+
 partman-auto-raid (18) unstable; urgency=low
 
   [ Updated translations ]
@@ -140,6 +203,15 @@ partman-auto-raid (18) unstable; urgency
 
  -- Otavio Salvador <otavio@debian.org>  Fri, 24 Dec 2010 20:18:51 -0200
 
+partman-auto-raid (17ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Add raidid= syntax to partman-auto-raid/recipe to make it possible to
+      preseed RAID creation without having to guess partition device names
+      in advance.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 15 Nov 2010 13:06:13 +0000
+
 partman-auto-raid (17) unstable; urgency=low
 
   [ Colin Watson ]
@@ -160,6 +232,15 @@ partman-auto-raid (17) unstable; urgency
 
  -- Otavio Salvador <otavio@debian.org>  Fri, 12 Nov 2010 10:15:36 -0200
 
+partman-auto-raid (16ubuntu1) natty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Add raidid= syntax to partman-auto-raid/recipe to make it possible to
+      preseed RAID creation without having to guess partition device names
+      in advance.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 13 Oct 2010 15:22:45 +0100
+
 partman-auto-raid (16) unstable; urgency=low
 
   [ Colin Watson ]
@@ -189,6 +270,14 @@ partman-auto-raid (16) unstable; urgency
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 11 Jul 2010 18:42:32 +0200
 
+partman-auto-raid (15ubuntu1) karmic; urgency=low
+
+  * Add raidid= syntax to partman-auto-raid/recipe to make it possible to
+    preseed RAID creation without having to guess partition device names in
+    advance.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 26 Aug 2009 23:18:31 +0100
+
 partman-auto-raid (15) unstable; urgency=low
 
   [ Max Vozeler ]
diff -pruN 30/debian/control 30ubuntu1/debian/control
--- 30/debian/control	2013-12-03 23:52:52.000000000 +0000
+++ 30ubuntu1/debian/control	2015-12-02 15:24:30.000000000 +0000
@@ -1,11 +1,13 @@
 Source: partman-auto-raid
 Section: debian-installer
 Priority: standard
-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
+Maintainer: Ubuntu Installer Team <ubuntu-installer@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Simon Huggins <huggie@earth.li>, Christian Perrier <bubulle@debian.org>
 Build-Depends: debhelper (>= 9), dh-di, po-debconf (>= 0.5.0)
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/partman-auto-raid.git
-Vcs-Git: git://anonscm.debian.org/d-i/partman-auto-raid.git
+XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/partman-auto-raid.git
+XS-Debian-Vcs-Git: git://anonscm.debian.org/d-i/partman-auto-raid.git
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/partman-auto-raid/ubuntu
 
 Package: partman-auto-raid
 Package-Type: udeb
diff -pruN 30/display.d/initial_auto_raid 30ubuntu1/display.d/initial_auto_raid
--- 30/display.d/initial_auto_raid	2013-12-03 23:52:52.000000000 +0000
+++ 30ubuntu1/display.d/initial_auto_raid	2015-12-02 15:24:30.000000000 +0000
@@ -16,6 +16,22 @@ fi
 mkdir -p /var/lib/partman
 touch /var/lib/partman/initial_auto_raid
 
+# Look around for raidids before stopping parted_server
+rm -rf /var/lib/partman/raidids
+mkdir -p /var/lib/partman/raidids
+for dev in $DEVICES/*; do
+	[ -d "$dev" ] || continue
+	cd "$dev"
+	open_dialog PARTITIONS
+	while { read_line num id size type fs path name; [ "$id" ]; }; do
+		[ -f "$id/raidid" ] || continue
+		raidid="$(cat "$id/raidid")"
+		echo "$path" >>"/var/lib/partman/raidids/$raidid"
+	done
+	close_dialog
+done
+cd /
+
 confirm_changes partman-md || exit 1
 
 commit_changes partman/text/commit_failed || exit $?
