diff --git a/GNUmakefiles/AAsmModule b/GNUmakefiles/AAsmModule
index 4f554f14547e364a95f495e98856a7fa9b3b0cff..08ebca4efe131db30a06908445783caff358ada8 100644
--- a/GNUmakefiles/AAsmModule
+++ b/GNUmakefiles/AAsmModule
@@ -151,16 +151,16 @@ clean::
 	@echo ${COMPONENT}: cleaned
 else
 ifneq (,${SYMLINK_EXT_FIRST})
-SYMLINK_SED_PATTERN = 's,^\([^/]*\)/\(.*\),\2.\1,'
+SYMLINK_SED_PATTERN = 's,^\([^/]\+\)/\(.\+\),\2.\1,'
 else
-SYMLINK_SED_PATTERN = 's,\([^/]*\)/\([^/]*\)$$,\2.\1,'
+SYMLINK_SED_PATTERN = 's,\([^/]\+\)/\([^/]\+\)$$,\2.\1,'
 endif
 all debug export export_hdrs export_libs gpa_debug install install_rom rom_link links resources rom standalone: ${SYMLINK_DEPEND}
 	$(foreach linksource,${SOURCES_TO_SYMLINK}, \
 		$(shell \
 			linkdest=`echo ${linksource} | sed -e ${SYMLINK_SED_PATTERN} -e 's,^,objs/,'`; \
-			linkdestdir=`echo $$linkdest | sed -e 's,/[^/]*$$,,'`; \
-			linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]*,..,g'`; \
+			linkdestdir=`echo $$linkdest | sed -e 's,/[^/]\+$$,,'`; \
+			linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]\+,..,g'`; \
 			[ -d ${linksource} ] || [ -L $$linkdest ] || mkdir -p $$linkdestdir; \
 			[ -d ${linksource} ] || [ -L $$linkdest ] || ln -s $$linkbackpath/${linksource} $$linkdest; \
 		 ) \
diff --git a/GNUmakefiles/CApp b/GNUmakefiles/CApp
index 070e6f916fbf354ccd646dd09611299af410d419..7527cbbf79d8c78d50b41ba50e3ae54b82f45b1e 100644
--- a/GNUmakefiles/CApp
+++ b/GNUmakefiles/CApp
@@ -139,9 +139,9 @@ else
 all install debug resources rom rom_link links: ${SYMLINK_DEPEND}
 	$(foreach linksource,${SOURCES_TO_SYMLINK}, \
 		$(shell \
-			linkdest=`echo ${linksource} | sed -e 's,\([^/]*\)/\([^/]*\)$$,\2.\1,' -e 's,^,objs/,'`; \
-			linkdestdir=`echo $$linkdest | sed -e 's,/[^/]*$$,,'`; \
-			linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]*,..,g'`; \
+			linkdest=`echo ${linksource} | sed -e 's,\([^/]\+\)/\([^/]\+\)$$,\2.\1,' -e 's,^,objs/,'`; \
+			linkdestdir=`echo $$linkdest | sed -e 's,/[^/]\+$$,,'`; \
+			linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]\+,..,g'`; \
 			[ -d ${linksource} ] || [ -L $$linkdest ] || mkdir -p $$linkdestdir; \
 			[ -d ${linksource} ] || [ -L $$linkdest ] || ln -s $$linkbackpath/${linksource} $$linkdest; \
 		 ) \
diff --git a/GNUmakefiles/CLibrary b/GNUmakefiles/CLibrary
index a980b9ca6758b32405e660f232519d8885b7c5d2..c22be4d4ad9f68fc533fcc97f7d430cfaf2a8a70 100644
--- a/GNUmakefiles/CLibrary
+++ b/GNUmakefiles/CLibrary
@@ -135,9 +135,9 @@ else
 all_libs export export_hdrs export_libs links: ${SYMLINK_DEPEND}
 	$(foreach linksource,${SOURCES_TO_SYMLINK}, \
 		$(shell \
-			linkdest=`echo ${linksource} | sed -e 's,\([^/]*\)/\([^/]*\)$$,\2.\1,' -e 's,^,objs/,'`; \
-			linkdestdir=`echo $$linkdest | sed -e 's,/[^/]*$$,,'`; \
-			linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]*,..,g'`; \
+			linkdest=`echo ${linksource} | sed -e 's,\([^/]\+\)/\([^/]\+\)$$,\2.\1,' -e 's,^,objs/,'`; \
+			linkdestdir=`echo $$linkdest | sed -e 's,/[^/]\+$$,,'`; \
+			linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]\+,..,g'`; \
 			[ -d ${linksource} ] || [ -L $$linkdest ] || mkdir -p $$linkdestdir; \
 			[ -d ${linksource} ] || [ -L $$linkdest ] || ln -s $$linkbackpath/${linksource} $$linkdest; \
 		 ) \
diff --git a/GNUmakefiles/CModule b/GNUmakefiles/CModule
index e1852a4e41968253bc8c55d44966cc767d15e0e3..302a56486546c65e1b3055d0313d85c6eb61cc2e 100644
--- a/GNUmakefiles/CModule
+++ b/GNUmakefiles/CModule
@@ -234,9 +234,9 @@ else
 all export export_hdrs export_libs resources rom rom_link standalone install debug gpa_debug prepro links: ${SYMLINK_DEPEND}
 	$(foreach linksource,${SOURCES_TO_SYMLINK}, \
 		$(shell \
-			linkdest=`echo ${linksource} | sed -e 's,\([^/]*\)/\([^/]*\)$$,\2.\1,' -e 's,^,objs/,'`; \
-			linkdestdir=`echo $$linkdest | sed -e 's,/[^/]*$$,,'`; \
-			linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]*,..,g'`; \
+			linkdest=`echo ${linksource} | sed -e 's,\([^/]\+\)/\([^/]\+\)$$,\2.\1,' -e 's,^,objs/,'`; \
+			linkdestdir=`echo $$linkdest | sed -e 's,/[^/]\+$$,,'`; \
+			linkbackpath=`echo $$linkdestdir | sed -e 's,[^/]\+,..,g'`; \
 			[ -d ${linksource} ] || [ -L $$linkdest ] || mkdir -p $$linkdestdir; \
 			[ -d ${linksource} ] || [ -L $$linkdest ] || ln -s $$linkbackpath/${linksource} $$linkdest; \
 		 ) \
diff --git a/VersionNum b/VersionNum
index 0333ad5515259452ab7dfbe9c95de90d5a47eda5..96edb4af23c0ac5925d7774b48aa6f3886eff0f1 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,21 +1,21 @@
-/* (7.57)
+/* (7.58)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        7.57
+#define Module_MajorVersion_CMHG        7.58
 #define Module_MinorVersion_CMHG
-#define Module_Date_CMHG                19 Apr 2021
+#define Module_Date_CMHG                15 May 2021
 
-#define Module_MajorVersion             "7.57"
-#define Module_Version                  757
+#define Module_MajorVersion             "7.58"
+#define Module_Version                  758
 #define Module_MinorVersion             ""
-#define Module_Date                     "19 Apr 2021"
+#define Module_Date                     "15 May 2021"
 
-#define Module_ApplicationDate          "19-Apr-21"
+#define Module_ApplicationDate          "15-May-21"
 
 #define Module_ComponentName            "BuildSys"
 
-#define Module_FullVersion              "7.57"
-#define Module_HelpVersion              "7.57 (19 Apr 2021)"
-#define Module_LibraryVersionInfo       "7:57"
+#define Module_FullVersion              "7.58"
+#define Module_HelpVersion              "7.58 (15 May 2021)"
+#define Module_LibraryVersionInfo       "7:58"