diff --git a/debian/calamares-settings-lubuntu.install b/debian/calamares-settings-lubuntu.install
index 2283f95..f6a6f93 100644
--- a/debian/calamares-settings-lubuntu.install
+++ b/debian/calamares-settings-lubuntu.install
@@ -1,5 +1,5 @@
-lubuntu/calamares.desktop etc/skel/Desktop/
-lubuntu/calamares-logs-helper usr/bin/
 lubuntu/branding/ etc/calamares/
+lubuntu/calamares-logs-helper usr/bin/
+lubuntu/calamares.desktop etc/skel/Desktop/
 lubuntu/modules/ etc/calamares/
 lubuntu/settings.conf etc/calamares/
diff --git a/debian/changelog b/debian/changelog
index 6768a35..b2f7687 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calamares-settings-ubuntu (15) UNRELEASED; urgency=medium
+
+  * Add a calamares-settings-ubuntu-common package with an automirror module.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 09 Aug 2018 21:23:30 -0500
+
 calamares-settings-ubuntu (14) cosmic; urgency=medium
 
   * Don't copy initrd from the live install, because that contains casper.
diff --git a/debian/control b/debian/control
index 9ddf3d2..2f116ab 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,12 @@ Vcs-Browser: https://git.launchpad.net/ubuntu-calamares-settings
 
 Package: calamares-settings-lubuntu
 Architecture: all
-Depends: calamares, squashfs-tools, ${misc:Depends}
+Depends: calamares-settings-ubuntu-common (= ${binary:Version}), ${misc:Depends}
 Description: Lubuntu Calamares Settings and Branding
- This package contains the calamares settings and branding for Lubuntu Next.
+ This package contains the Calamares settings and branding for Lubuntu Next.
+
+Package: calamares-settings-ubuntu-common
+Architecture: any
+Depends: calamares, squashfs-tools, ${misc:Depends}
+Description: Common Calamares Settings
+ This package contains the common Calamares settings for all flavors.
diff --git a/debian/rules b/debian/rules
index 2d33f6a..9c1a940 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,12 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@
+
+override_dh_missing:
+	dh_missing
+	mkdir -pv debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/calamares/modules
+	cp -vr common/modules/* debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/calamares/modules
+	chmod -R 755 debian/calamares-settings-ubuntu-common/usr/lib/