diff --git a/addon/usr/bin/makesd b/addon/usr/bin/makesd
index 84355a1..48c7efd 100755
--- a/addon/usr/bin/makesd
+++ b/addon/usr/bin/makesd
@@ -1,53 +1,10 @@
 #!/bin/sh
 
-DRV=/dev/sda
+umount /dev/sda
+umount /dev/sda1
+umount /dev/sda2
+umount /dev/sda3
 
-echo ""
-
-if [[ $EUID -ne 0 ]]; then
-   echo "This script requires root rights. Quiting..."
-   echo ""
-   exit 0
-fi
-
-if [ ! -e "${DRV}" ]; then
-   echo "Couldn't find USB storage"
-   exit 0
-fi
-
-read -p "Do you wish to partition USB(${DRV}) device? " yn
-case $yn in
-   [Yy]* )
-           echo ""
-           echo "Unmounting some partitions (errors are ok here)..."
-           umount ${DRV}
-           umount ${DRV}1
-           umount ${DRV}2
-           umount ${DRV}3
-           echo ""
-           echo "Erasing of first 64MB of card..."
-           dd if=/dev/zero of=${DRV} bs=1M count=64 || exit 0
-
-           echo "Partitioning..."
-           (sfdisk ${DRV} <<-__END__
-              502M,+,0xB
-              2M,500M,0x83
-              1M,1M,0xA2
-__END__
-) || exit 0
-           sleep 3
-           echo "Copying partitions..."
-           dd if=/dev/mmcblk0p3 of=${DRV}3 || exit 0
-           dd if=/dev/mmcblk0p2 of=${DRV}2 || exit 0
-           sync
-           echo "Done!"
-           echo ""
-           echo "NOTE:"
-           echo "Plug the card into Windows PC and format with FAT32/exFAT using 32KB or 64KB"
-           echo "cluster size and copy MiSTer with menu.rbf there."
-           echo "If you just update the Linux part, then you don't need to format the card,"
-           echo "all files will be left as-is."
-       ;;
-   * ) ;;
-esac
+cd /make_sd
+./create_sd.sh /dev/sda
 
diff --git a/copy_to_sd.sh b/copy_to_sd.sh
deleted file mode 100755
index 6a7b5a8..0000000
--- a/copy_to_sd.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-DIR=$PWD
-SRCDIR=${DIR}
-DSTDIR=/media/rootfs
-
-if [[ $EUID -ne 0 ]]; then
-   echo "This script requires root rights. Quiting..."
-   echo ""
-   exit 0
-fi
-
-if [ -z $1 ]; then
-   echo "No SD device specified"
-   exit 0
-fi
-
-if [ ! -e $1 ] || [ ! -e ${1}3 ] || [ ! -e ${1}2 ] || [ ! -e ${1}1 ] ; then
-   echo "Specified device doesn't look like correct SD card"
-   exit 0
-fi
-
-echo ""
-echo "Unmounting some partitions (errors are ok here)..."
-umount ${DSTDIR}
-
-echo "Formatting Linux partition..."
-mkfs.ext4 -L rootfs ${1}2 || exit 0
-echo ""
-
-echo "Copying U-Boot loader..."
-dd if=${SRCDIR}/u-boot-with-spl.sfp of=${1}3
-
-echo "Mounting Linux partition..."
-if [ ! -d ${DSTDIR} ]; then
-   mkdir -p ${DSTDIR} || exit 0
-fi
-mount ${1}2 ${DSTDIR} || exit 0
-
-echo "Copying main rootfs files..."
-tar xfp ${SRCDIR}/rootfs.tar.gz --warning=no-timestamp -C ${DSTDIR} || exit 0
-
-echo "Copying kernel modules rootfs files..."
-tar xfp ${SRCDIR}/modules.tar.gz --strip-components=2 --warning=no-timestamp -C ${DSTDIR}/lib || exit 0
-
-echo "Copying devices firmwares..."
-mkdir -p ${DSTDIR}/lib/firmware || exit 0
-tar xfp ${SRCDIR}/firmware.tar.gz --warning=no-timestamp -C ${DSTDIR}/lib/firmware || exit 0
-
-echo "Copying additional modifications..."
-cp -f -r ${SRCDIR}/addon/* ${DSTDIR} || exit 0
-mkdir -p ${DSTDIR}/media/fat || exit 0
-echo "/dev/mmcblk0p1 /media/fat auto defaults,sync,nofail 0 0" >>${DSTDIR}/etc/fstab
-sed 's/getty/agetty/g' -i ${DSTDIR}/etc/inittab
-sed 's/115200//g' -i ${DSTDIR}/etc/inittab
-sed '/::sysinit:\/bin\/mount \-a/a ::sysinit:\/etc\/resync\ \&' -i ${DSTDIR}/etc/inittab
-sed '/::sysinit:\/bin\/mount \-a/a ::sysinit:\/media\/fat\/MiSTer\ \&' -i ${DSTDIR}/etc/inittab
-sed '/PATH/ s/$/:\/media\/fat/' -i ${DSTDIR}/etc/profile
-cat >> ${DSTDIR}/etc/profile <<- __EOF__
-
-export LC_ALL=en_US.UTF-8
-resize >/dev/null
-mount -o remount,rw /
-
-__EOF__
-
-echo "Copying kernel..."
-mkdir -p ${DSTDIR}/boot || exit 0
-cp -f -r ${SRCDIR}/zImage ${DSTDIR}/boot/zImage || exit 0
-cp -f -r ${SRCDIR}/socfpga.dtb ${DSTDIR}/boot/socfpga.dtb || exit 0
-
-echo "Fixing permissions..."
-chown -R root:root ${DSTDIR} || exit 0
-sync
-
-echo "Unmounting Linux partition..."
-umount ${DSTDIR} || exit 0
-
-echo "Done!"
-echo ""
-
diff --git a/create_sd.sh b/create_sd.sh
index 26e3254..de82c44 100755
--- a/create_sd.sh
+++ b/create_sd.sh
@@ -38,8 +38,94 @@ case $yn in
               1M,1M,0xA2
 __END__
 ) || exit 0
-	  sleep 3
-          ./copy_to_sd.sh $1
+	sleep 3
+
+	DIR=$PWD
+	SRCDIR=${DIR}
+	DSTDIR=/media/rootfs
+
+	if [[ $EUID -ne 0 ]]; then
+	   echo "This script requires root rights. Quiting..."
+	   echo ""
+	   exit 0
+	fi
+
+	if [ -z $1 ]; then
+	   echo "No SD device specified"
+	   exit 0
+	fi
+
+	if [ ! -e $1 ] || [ ! -e ${1}3 ] || [ ! -e ${1}2 ] || [ ! -e ${1}1 ] ; then
+	   echo "Specified device doesn't look like correct SD card"
+	   exit 0
+	fi
+
+	echo ""
+	echo "Unmounting some partitions (errors are ok here)..."
+	umount ${DSTDIR}
+
+	echo "Formatting Linux partition..."
+	mkfs.ext4 -L rootfs ${1}2 || exit 0
+	echo ""
+
+	echo "Copying U-Boot loader..."
+	dd if=${SRCDIR}/u-boot-with-spl.sfp of=${1}3
+
+	echo "Mounting Linux partition..."
+	if [ ! -d ${DSTDIR} ]; then
+	   mkdir -p ${DSTDIR} || exit 0
+	fi
+	mount ${1}2 ${DSTDIR} || exit 0
+
+	echo "Copying main rootfs files..."
+	tar xfp ${SRCDIR}/rootfs.tar.gz --warning=no-timestamp -C ${DSTDIR} || exit 0
+
+	echo "Copying kernel modules rootfs files..."
+	tar xfp ${SRCDIR}/modules.tar.gz --strip-components=2 --warning=no-timestamp -C ${DSTDIR}/lib || exit 0
+
+	echo "Copying devices firmwares..."
+	mkdir -p ${DSTDIR}/lib/firmware || exit 0
+	tar xfp ${SRCDIR}/firmware.tar.gz --warning=no-timestamp -C ${DSTDIR}/lib/firmware || exit 0
+
+	echo "Copying additional modifications..."
+	cp -f -r ${SRCDIR}/addon/* ${DSTDIR} || exit 0
+	mkdir -p ${DSTDIR}/media/fat || exit 0
+	echo "/dev/mmcblk0p1 /media/fat auto defaults,sync,nofail 0 0" >>${DSTDIR}/etc/fstab
+	sed 's/getty/agetty/g' -i ${DSTDIR}/etc/inittab
+	sed 's/115200//g' -i ${DSTDIR}/etc/inittab
+	sed '/::sysinit:\/bin\/mount \-a/a ::sysinit:\/etc\/resync\ \&' -i ${DSTDIR}/etc/inittab
+	sed '/::sysinit:\/bin\/mount \-a/a ::sysinit:\/media\/fat\/MiSTer\ \&' -i ${DSTDIR}/etc/inittab
+	sed '/PATH/ s/$/:\/media\/fat/' -i ${DSTDIR}/etc/profile
+
+cat >> ${DSTDIR}/etc/profile <<- __EOF__
+
+export LC_ALL=en_US.UTF-8
+resize >/dev/null
+mount -o remount,rw /
+
+__EOF__
+
+	echo "Copying kernel..."
+	mkdir -p ${DSTDIR}/boot || exit 0
+	cp -f -r ${SRCDIR}/zImage ${DSTDIR}/boot/zImage || exit 0
+	cp -f -r ${SRCDIR}/socfpga.dtb ${DSTDIR}/boot/socfpga.dtb || exit 0
+
+	echo "Copying this installer..."
+	mkdir -p ${DSTDIR}/media/rootfs || exit 0
+	mkdir -p ${DSTDIR}/make_sd || exit 0
+	cp -f -r ${SRCDIR}/* ${DSTDIR}/make_sd || exit 0
+
+	echo "Fixing permissions..."
+	chown -R root:root ${DSTDIR} || exit 0
+	sync
+
+	echo "Unmounting Linux partition..."
+	umount ${DSTDIR} || exit 0
+
+	echo "Done!"
+	echo ""
+
+
        ;;
    * ) ;;
 esac