diff --git a/pepscripts/06copy-files-to-target b/pepscripts/06copy-files-to-target
index cf9c7a5..bbc9a12 100755
--- a/pepscripts/06copy-files-to-target
+++ b/pepscripts/06copy-files-to-target
@@ -8,6 +8,7 @@
 
 # setup a folder structure
 mkdir -p /target/etc/skel/.local/share/pmostools
+mkdir -p /target/etc/skel/.config/autostart
 mkdir -p /target/opt/pepconf
 mkdir -p /target/opt/pypep/dbpep
 mkdir -p /target/etc/default
@@ -39,6 +40,7 @@ cp /preseed/database/* /target/opt/pypep/dbpep
 cp /preseed/polkit/* /target/usr/share/polkit-1/actions
 cp /preseed/pixmaps/* /target/usr/share/pixmaps
 cp /preseed/lightdm/* /target/etc/lightdm
+cp /preseed/autostart/* /target/etc/skel/autostart
 
 # Copy recursive files and sub-directories
 cp -r /preseed/grub/themes /target/boot/grub
diff --git a/pepscriptsdev/06copy-files-to-target b/pepscriptsdev/06copy-files-to-target
index f0ca5e5..fac626c 100755
--- a/pepscriptsdev/06copy-files-to-target
+++ b/pepscriptsdev/06copy-files-to-target
@@ -8,6 +8,7 @@
 
 # setup a folder structure
 mkdir -p /target/etc/skel/.local/share/pmostools
+mkdir -p /target/etc/skel/.config/autostart
 mkdir -p /target/opt/pepconf
 mkdir -p /target/opt/pypep/dbpep
 mkdir -p /target/etc/default
@@ -39,6 +40,7 @@ cp /preseed/database/* /target/opt/pypep/dbpep
 cp /preseed/polkit/* /target/usr/share/polkit-1/actions
 cp /preseed/pixmaps/* /target/usr/share/pixmaps
 cp /preseed/lightdm/* /target/etc/lightdm
+cp /preseed/autostart/* /target/etc/skel/autostart
 
 # Copy recursive files and sub-directories
 cp -r /preseed/grub/themes /target/boot/grub