diff --git a/Makefile.am b/Makefile.am
index 871a343..d014cf9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,8 @@ fedora_DATA = \
     fedora-arm-kde-vfat.ks \
     fedora-arm-lxde.ks \
     fedora-arm-lxde-vfat.ks \
+    fedora-arm-mate.ks  \
+    fedora-arm-mate-vfat.ks \
     fedora-arm-minimal.ks \
     fedora-arm-minimal-vfat.ks \
     fedora-arm-partitioning.ks \
@@ -40,7 +42,8 @@ fedora_DATA = \
     fedora-livedvd-robotics.ks \
     fedora-livedvd-scientific-kde.ks \
     fedora-livecd-security.ks \
-    fedora-live-jam-kde.ks
+    fedora-live-jam-kde.ks \
+    fedora-mate-packages
 
 customdir = ${pkgdatadir}/custom/
 custom_DATA = \
diff --git a/fedora-arm-mate-vfat.ks b/fedora-arm-mate-vfat.ks
new file mode 100644
index 0000000..6009ae5
--- /dev/null
+++ b/fedora-arm-mate-vfat.ks
@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-mate-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+%post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .
+
+%end
diff --git a/fedora-arm-mate.ks b/fedora-arm-mate.ks
new file mode 100644
index 0000000..7b26b98
--- /dev/null
+++ b/fedora-arm-mate.ks
@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-mate-packages.ks
+%include fedora-arm-partitioning.ks
+
+%post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .
+
+%end