diff --git a/scripts/check-kernel-patches.sh b/scripts/check-kernel-patches.sh
new file mode 100755
index 000000000..dc4063b60
--- /dev/null
+++ b/scripts/check-kernel-patches.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+kernel_patches_with_version=$(find buildroot-external -type d -regextype sed -regex ".*/linux/[0-9\.]*")
+
+if [ -n "$kernel_patches_with_version" ]; then
+	echo ""
+	echo "WARNING: Kernel patch directories with kernel version found! Check if updates are needed."
+fi
diff --git a/scripts/update-kernel-odroid-n2.sh b/scripts/update-kernel-odroid-n2.sh
new file mode 100755
index 000000000..5866d13dd
--- /dev/null
+++ b/scripts/update-kernel-odroid-n2.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+if [ -z "$1" ]; then
+    echo "Need a kernel version!"
+    exit 1
+fi
+
+defconfigs=(buildroot-external/configs/odroid_n2_defconfig)
+sed -i "s/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\".*\"/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\"$1\"/g" "${defconfigs[@]}"
+sed -i "s/| \(Odroid-N2\) | .* |/| \1 | $1 |/g" Documentation/kernel.md
+git commit -m "Linux: Update kernel $1" "${defconfigs[@]}" Documentation/kernel.md
+
+./scripts/check-kernel-patches.sh
diff --git a/scripts/update-kernel-rpi.sh b/scripts/update-kernel-rpi.sh
index 155990d6a..b699ec0a6 100755
--- a/scripts/update-kernel-rpi.sh
+++ b/scripts/update-kernel-rpi.sh
@@ -11,6 +11,9 @@ if [ -z "$2" ]; then
     exit 1
 fi
 
-sed -i "s|BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/raspberrypi/linux/.*\"|BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/raspberrypi/linux/archive/$1.tar.gz\"|g" buildroot-external/configs/*
+defconfigs=(buildroot-external/configs/rpi*_defconfig)
+sed -i "s|BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/raspberrypi/linux/.*\"|BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/raspberrypi/linux/archive/$1.tar.gz\"|g" "${defconfigs[@]}"
 sed -i "s/| Raspberry Pi\(.*\) | .* |/| Raspberry Pi\1 | $2 |/g" Documentation/kernel.md
-git commit -m "RaspberryPi: Update kernel $2 - $1" buildroot-external/configs/* Documentation/kernel.md
+git commit -m "RaspberryPi: Update kernel $2 - $1" "${defconfigs[@]}" Documentation/kernel.md
+
+./scripts/check-kernel-patches.sh
diff --git a/scripts/update-kernel-upstream.sh b/scripts/update-kernel-upstream.sh
index e1e56a5c7..85f3ebd22 100755
--- a/scripts/update-kernel-upstream.sh
+++ b/scripts/update-kernel-upstream.sh
@@ -6,6 +6,9 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-sed -i "s/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\".*\"/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\"$1\"/g" buildroot-external/configs/{generic_x86_64,ova,tinker,odroid*}_defconfig
-sed -i "s/| \(Open Virtual Appliance\|Generic x86-64\|Tinker Board\|Odroid-.*\) | .* |/| \1 | $1 |/g" Documentation/kernel.md
-git commit -m "Linux: Update kernel $1" buildroot-external/configs/* Documentation/kernel.md
+defconfigs=(buildroot-external/configs/{generic_x86_64,ova,tinker,odroid_c*,odroid_xu4}_defconfig)
+sed -i "s/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\".*\"/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\"$1\"/g" "${defconfigs[@]}"
+sed -i "s/| \(Open Virtual Appliance\|Generic x86-64\|Tinker Board\|Odroid-C.\|Odroid-XU4\) | .* |/| \1 | $1 |/g" Documentation/kernel.md
+git commit -m "Linux: Update kernel $1" "${defconfigs[@]}" Documentation/kernel.md
+
+./scripts/check-kernel-patches.sh