diff --git a/bin/buildiso.in b/bin/buildiso.in
index ed0aa77..a546698 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -78,13 +78,13 @@ make_overlay() {
 	msg "Prepare overlay-image"
 	
         mkdir -p ${work_dir}/overlay/etc/pacman.d
-      
-	copy_overlay_livecd "${work_dir}/overlay"
         
+      	copy_overlay_livecd "${work_dir}/overlay"
+	
+        copy_livecd_init "${work_dir}/overlay"
+	
 	copy_livecd '@pkgdatadir@/livecd'
 	    
-	copy_livecd_init "${work_dir}/overlay"
-	
         #wget -O ${work_dir}/overlay/etc/pacman.d/mirrorlist http://git.manjaro.org/packages-sources/basis/blobs/raw/master/pacman-mirrorlist/mirrorlist
                
 	# copy over manjaro-tools.conf
diff --git a/lib/.util-iso.sh.kate-swp b/lib/.util-iso.sh.kate-swp
new file mode 100644
index 0000000..64c8d3c
Binary files /dev/null and b/lib/.util-iso.sh.kate-swp differ
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 0111531..8453b85 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -135,6 +135,10 @@ configure_services(){
 		  msg2 "Setting $svc ..."
 		  chroot-run $1 systemctl enable $svc
 	      fi
+	      if [[ -f $1/etc/systemd/system/$svc ]];then
+		  msg2 "Setting $svc ..."
+		  chroot-run $1 systemctl enable $svc
+	      fi
       done
    fi
 }