diff --git a/bash.changes b/bash.changes
index 774904f8..1aafa0b9 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 28 13:53:55 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Use well defined HOSTTYPE, as well as OS, VENDOR, and MACHTYPE (boo#1186296)
+
 -------------------------------------------------------------------
 Wed May  5 14:59:54 UTC 2021 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/bash.spec b/bash.spec
index 562eb2b3..d15dc7b1 100644
--- a/bash.spec
+++ b/bash.spec
@@ -430,7 +430,8 @@ test ${rl1[2]} = ${rl2[2]} || exit 1
 %if 0%{?do_profiling}
   profilecflags=CFLAGS="$CFLAGS %cflags_profile_generate"
 %endif
-  make "$profilecflags" \
+  makeopts="Machine=%{_target_cpu} OS=linux VENDOR=suse MACHTYPE=%{_target_cpu}-suse-linux"
+  make $makeopts "$profilecflags" \
 	all printenv recho zecho xcase
   TMPDIR=$(mktemp -d /tmp/bash.XXXXXXXXXX) || exit 1
   > $SCREENLOG
@@ -444,9 +445,9 @@ test ${rl1[2]} = ${rl2[2]} || exit 1
   profilecflags=CFLAGS="$CFLAGS %cflags_profile_feedback -fprofile-correction"
   clean=clean
 %endif
-  make "$profilecflags" $clean all
-  make -C examples/loadables/
-  make documentation
+  make $makeopts "$profilecflags" $clean all
+  make $makeopts -C examples/loadables/
+  make $makeopts documentation
 
 %install
   %make_install