diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 6d598cfd9d..3904a1c4db 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -145,7 +145,7 @@ endif
 ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
 define fixup-libtool-files
 	$(Q)find $(2)/usr/lib* -name "*.la" | xargs --no-run-if-empty \
-		$(SED) "s:$(PER_PACKAGE_DIR)/[^/]+/:$(PER_PACKAGE_DIR)/$(1)/:g"
+		$(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g"
 endef
 endif
 
diff --git a/support/scripts/fix-rpath b/support/scripts/fix-rpath
index 9fc9ef8514..3e67e770e5 100755
--- a/support/scripts/fix-rpath
+++ b/support/scripts/fix-rpath
@@ -141,7 +141,7 @@ main() {
         # the per-package host directory is not within ${rootdir}. So,
         # we rewrite all RPATHs pointing to per-package directories so
         # that they point to the global host directry.
-        changed_rpath=$(echo ${rpath} | sed "s@${PER_PACKAGE_DIR}/[^/]+/host@${HOST_DIR}@")
+        changed_rpath=$(echo ${rpath} | sed "s@${PER_PACKAGE_DIR}/[^/]\+/host@${HOST_DIR}@")
         if test "${rpath}" != "${changed_rpath}" ; then
             ${PATCHELF} --set-rpath ${changed_rpath} "${file}"
         fi