diff --git a/bash.changes b/bash.changes
index bea30c75..e810981b 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu May 25 17:33:36 UTC 2017 - bwiedemann@suse.com
+
+- Make build reproducible in spite of profile based optimizations (boo#1040589)
+
+-------------------------------------------------------------------
+Wed May 24 12:42:20 UTC 2017 - bwiedemann@suse.com
+
+- Allow to disable do_profiling in builds (related to boo#1040589)
+
 -------------------------------------------------------------------
 Wed Apr 26 16:04:15 UTC 2017 - werner@suse.de
 
diff --git a/bash.spec b/bash.spec
index adefeabe..4f34b5a8 100644
--- a/bash.spec
+++ b/bash.spec
@@ -536,7 +536,11 @@ popd
 	--disable-strict-posix-default	\
 	--enable-separate-helpfiles=%{_datadir}/bash/helpfiles \
 	$READLINE
-  make %{?do_profiling:CFLAGS="$CFLAGS %cflags_profile_generate"} \
+  profilecflags=CFLAGS="$CFLAGS"
+%if 0%{?do_profiling}
+  profilecflags=CFLAGS="$CFLAGS %cflags_profile_generate"
+%endif
+  make "$profilecflags" \
 	all printenv recho zecho xcase
   TMPDIR=$(mktemp -d /tmp/bash.XXXXXXXXXX) || exit 1
   > $SCREENLOG
@@ -545,7 +549,12 @@ popd
 	SCREENRC=$SCREENRC SCREENDIR=$SCREENDIR \
 	screen -D -m make TESTSCRIPT=%{SOURCE4} check
   kill -TERM $pid
-  make %{?do_profiling:CFLAGS="$CFLAGS %cflags_profile_feedback -fprofile-correction" clean} all
+%if 0%{?do_profiling}
+  rm -f jobs.gcda
+  profilecflags=CFLAGS="$CFLAGS %cflags_profile_feedback -fprofile-correction"
+  clean=clean
+%endif
+  make "$profilecflags" $clean all
   make -C examples/loadables/
   make documentation