diff --git a/tools/RPi/gen-rpi-kodi-patch.sh b/tools/RPi/gen-rpi-kodi-patch.sh
index 1586c4d633..45ff092ac5 100755
--- a/tools/RPi/gen-rpi-kodi-patch.sh
+++ b/tools/RPi/gen-rpi-kodi-patch.sh
@@ -82,13 +82,11 @@ else
 fi
 
 GIT_SEQUENCE_EDITOR=${BIN}/rpi-kodi-rebase.sh git rebase -i ${BASEREV}
-git format-patch --no-signature --stdout ${BASEREV} -- addons/${SKIN1} | sed -E 's#addons/skin\.[^/]*/##g' >/tmp/skin.patch
-git format-patch --no-signature --stdout ${BASEREV} -- . ":!addons/${SKIN1}" >/tmp/kodi.patch
+git format-patch --no-signature --stdout ${BASEREV} >/tmp/kodi.patch
 
 cd .. && rm -fr raspberrypi-kodi
 
 echo
-echo "New skin patch: /tmp/skin.patch"
 echo "New kodi patch: /tmp/kodi.patch"
 
 echo
@@ -101,20 +99,10 @@ echo "git checkout -b somebranch"
 
 BRANCH="${BRANCH//_/-}"
 
-echo
-if [ -s /tmp/skin.patch ]; then
-  echo "cp /tmp/skin.patch projects/RPi/patches/${SKIN2}/${SKIN2}-001-backport.patch"
-  echo "cp /tmp/skin.patch projects/RPi2/patches/${SKIN2}/${SKIN2}-001-backport.patch"
-  echo "git commit -am \"RPi/RPi2: Update ${SKIN2} support patches\""
-else
-  echo "NO SKIN PATCH REQUIRED"
-fi
-
 echo
 if [ -s /tmp/kodi.patch ]; then
   echo "cp /tmp/kodi.patch projects/RPi/patches/kodi/kodi-001-backport.patch"
-  echo "cp /tmp/kodi.patch projects/RPi2/patches/kodi/kodi-001-backport.patch"
-  echo "git commit -am \"RPi/RPi2: Update kodi support patches\""
+  echo "git commit -am \"RPi: Update kodi support patch\""
 else
   echo "NO KODI PATCH REQUIRED"
 fi
diff --git a/tools/RPi/gen-rpi-linux-patch.sh b/tools/RPi/gen-rpi-linux-patch.sh
index 4bb014f94e..c82d43a108 100755
--- a/tools/RPi/gen-rpi-linux-patch.sh
+++ b/tools/RPi/gen-rpi-linux-patch.sh
@@ -111,10 +111,8 @@ echo "git checkout -b somebranch"
 
 echo
 echo "cp /tmp/linux-01-RPi_support.patch projects/RPi/patches/linux/linux-01-RPi_support.patch"
-echo
-echo "cp /tmp/linux-01-RPi_support.patch projects/RPi2/patches/linux/linux-01-RPi_support.patch"
 
 echo
-echo "git commit -am \"RPi/RPi2: update linux support patches for linux ${KERNEL:-${BRANCH}}\""
+echo "git commit -am \"RPi: update linux support patch for linux ${KERNEL:-${BRANCH}}\""
 
 echo