diff --git a/build-farm/make-adopt-build-farm.sh b/build-farm/make-adopt-build-farm.sh
index 8d3da8ffd1..6a6aa531a8 100755
--- a/build-farm/make-adopt-build-farm.sh
+++ b/build-farm/make-adopt-build-farm.sh
@@ -26,13 +26,13 @@ PLATFORM_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ -z "$ARCHITECTURE"  ]; then
    ARCHITECTURE=$(uname -p)
    if [ "$OSTYPE" = "cygwin"  ] || [ "${ARCHITECTURE}" = "unknown" ]; then ARCHITECTURE=$(uname -m); fi # Windows / Alpine
-   if [ "$ARCHITECTURE" = "x86_64"  ]; then ARCHITECTURE=x64;        fi # Linux/x64
-   if [ "$ARCHITECTURE" = "i386"    ]; then ARCHITECTURE=x64;        fi # Solaris/x64 and mac/x64
-   if [ "$ARCHITECTURE" = "sparc"   ]; then ARCHITECTURE=sparcv9;    fi # Solaris/SPARC
-   if [ "$ARCHITECTURE" = "powerpc" ]; then ARCHITECTURE=ppc64;      fi # AIX
-   if [ "$ARCHITECTURE" = "arm"     ]; then ARCHITECTURE=aarch64;    fi # mac/aarch64
-   if [ "$ARCHITECTURE" = "loongarch64" ]; then ARCHITECTURE=loongarch64;    fi # loongarch64
-   if [ "$ARCHITECTURE" = "armv7l"  ]; then ARCHITECTURE=arm;        fi # Linux/arm32
+   if [ "$ARCHITECTURE" = "x86_64"  ]; then ARCHITECTURE=x64;             fi # Linux/x64
+   if [ "$ARCHITECTURE" = "i386"    ]; then ARCHITECTURE=x64;             fi # Solaris/x64 and mac/x64
+   if [ "$ARCHITECTURE" = "sparc"   ]; then ARCHITECTURE=sparcv9;         fi # Solaris/SPARC
+   if [ "$ARCHITECTURE" = "powerpc" ]; then ARCHITECTURE=ppc64;           fi # AIX
+   if [ "$ARCHITECTURE" = "arm"     ]; then ARCHITECTURE=aarch64;         fi # mac/aarch64
+   if [ "$ARCHITECTURE" = "loongarch64" ]; then ARCHITECTURE=loongarch64; fi # loongarch64
+   if [ "$ARCHITECTURE" = "armv7l"  ]; then ARCHITECTURE=arm;             fi # Linux/arm32
    echo ARCHITECTURE not defined - assuming $ARCHITECTURE
    export ARCHITECTURE
 fi
diff --git a/sbin/build.sh b/sbin/build.sh
index 7a1b9d8d53..563d20be23 100755
--- a/sbin/build.sh
+++ b/sbin/build.sh
@@ -320,8 +320,8 @@ configureVersionStringParameter() {
   elif [[ "${BUILD_CONFIG[BUILD_VARIANT]}" == "${BUILD_VARIANT_LOONGSON}" ]]; then
     BUILD_CONFIG[VENDOR]="Loongson"
     BUILD_CONFIG[VENDOR_VERSION]="loongson"
-    BUILD_CONFIG[VENDOR_BUG_URL]=""
-    BUILD_CONFIG[VENDOR_VM_BUG_URL]=""
+    BUILD_CONFIG[VENDOR_BUG_URL]="https://github.com/loongson/jdk8u/issues"
+    BUILD_CONFIG[VENDOR_VM_BUG_URL]="https://github.com/loongson/jdk8u/issues"
   fi
   if [ "${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" != 8 ]; then
     addConfigureArg "--with-vendor-name=" "\"${BUILD_CONFIG[VENDOR]}\""