diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index d11703c27a..f0d929d7a0 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -9,6 +9,7 @@ PKG_DEPENDS_TARGET="toolchain dtc:host"
 PKG_LICENSE="GPL"
 PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
 PKG_IS_KERNEL_PKG="yes"
+PKG_STAMP="$UBOOT_SYSTEM"
 
 PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader"
 [ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader"
diff --git a/scripts/build b/scripts/build
index db6ac4f707..13a3545078 100755
--- a/scripts/build
+++ b/scripts/build
@@ -49,8 +49,6 @@ if [ -f $STAMP ]; then
     rm -f $STAMP
   elif [ ! "$BUILD_WITH_DEBUG" = "$STAMP_BUILD_WITH_DEBUG" ]; then
     rm -f $STAMP
-  elif [ "${PKG_NAME}" = "u-boot" -a ! "$UBOOT_SYSTEM" = "$STAMP_UBOOT_SYSTEM" ]; then
-    rm -f $STAMP
   else
     # stamp matched: already built, do nothing
     pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "build" "already built"
@@ -502,8 +500,5 @@ PKG_DEEPHASH=$(calculate_stamp)
 for i in PKG_NAME PKG_DEEPHASH BUILD_WITH_DEBUG; do
   echo "STAMP_$i=\"${!i}\"" >> $STAMP
 done
-if [ "${PKG_NAME}" = "u-boot" ]; then
-  echo "STAMP_UBOOT_SYSTEM=\"${UBOOT_SYSTEM}\"" >> $STAMP
-fi
 
 pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "build" "built"