diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh
index 9ba4af279e..9f85a16f7c 100755
--- a/board/common/cleanups.sh
+++ b/board/common/cleanups.sh
@@ -19,6 +19,7 @@ rm -rf ${TARGET}/etc/ssl/man
 rm -rf ${TARGET}/etc/ssl/misc
 rm -rf ${TARGET}/etc/ssl/private
 rm -rf ${TARGET}/etc/logrotate.d
+rm -rf ${TARGET}/etc/fstab
 
 rm -f ${TARGET}/etc/rc_maps.cfg
 rm -f ${TARGET}/etc/udev/hwdb.d/20-pci-vendor-model.hwdb
diff --git a/board/common/overlay/etc/fstab.disk b/board/common/overlay/etc/fstab.disk
index c69e0d4af5..aac1314772 100644
--- a/board/common/overlay/etc/fstab.disk
+++ b/board/common/overlay/etc/fstab.disk
@@ -1,4 +1,3 @@
 # <file system> <mount pt>            <type>   <options>         <dump> <pass>
 /dev/mmcblk0p1  /boot                 vfat     ro,defaults       0      0
 /dev/mmcblk0p3  /data                 ext4     defaults,noatime  0      0
-
diff --git a/board/common/overlay/etc/fstab.overlay b/board/common/overlay/etc/fstab.overlay
new file mode 100644
index 0000000000..f19791e871
--- /dev/null
+++ b/board/common/overlay/etc/fstab.overlay
@@ -0,0 +1,2 @@
+# <file system> <mount pt>            <type>   <options>                                                        <dump> <pass>
+overlay         /usr                  overlay  lowerdir=/usr,upperdir=/data/usr,workdir=/data/.overlay-usr      0 0
diff --git a/board/common/overlay/etc/fstab.sys b/board/common/overlay/etc/fstab.sys
index e5bb8d8767..ef75600d75 100644
--- a/board/common/overlay/etc/fstab.sys
+++ b/board/common/overlay/etc/fstab.sys
@@ -4,4 +4,3 @@ devpts          /dev/pts              devpts   gid=5,mode=620    0      0
 tmpfs           /dev/shm              tmpfs    mode=0777         0      0
 tmpfs           /tmp                  tmpfs    mode=1777         0      0
 sysfs           /sys                  sysfs    defaults          0      0
-
diff --git a/board/common/overlay/etc/init.d/S01mountall b/board/common/overlay/etc/init.d/S01mountall
index cafa43c0b3..1fa1ac2eca 100755
--- a/board/common/overlay/etc/init.d/S01mountall
+++ b/board/common/overlay/etc/init.d/S01mountall
@@ -6,6 +6,7 @@ mount_fs() {
     msg_begin "Mounting filesystems"
     /bin/mount -T /etc/fstab.disk -a &&
     /bin/mount -T /etc/fstab.extra -a &&
+    if grep -qw overlay /proc/filesystems; then /bin/mount -T /data/etc/fstab.overlay -a; fi &&
     if [[ -r /data/etc/fstab.user ]]; then /bin/mount -T /data/etc/fstab.user -a; fi
 
     test $? == 0 && msg_done || msg_fail
diff --git a/board/common/overlay/etc/profile b/board/common/overlay/etc/profile
index 0224094d57..99e7b1a3fe 100644
--- a/board/common/overlay/etc/profile
+++ b/board/common/overlay/etc/profile
@@ -27,6 +27,8 @@ if [ "$PS1" ]; then
     export TERM=linux
 fi;
 
+export HISTFILE=/data/.bash_history
+
 # custom local profile
 test -f /data/etc/profile && source /data/etc/profile
 
diff --git a/board/common/overlay/usr/share/dataskel/.overlay-usr/.empty b/board/common/overlay/usr/share/dataskel/.overlay-usr/.empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/board/common/overlay/usr/share/dataskel/usr/.empty b/board/common/overlay/usr/share/dataskel/usr/.empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig
index dae8341881..f3107c5b9c 100644
--- a/configs/odroidc2_defconfig
+++ b/configs/odroidc2_defconfig
@@ -10,7 +10,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc2/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/d76f4018945d768cfaed56d40a0e66b89bdb437a.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/6b8c51b738ad6c03baed36bb44e56172959ca265.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="odroidc2"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="meson64_odroidc2"