diff --git a/.travis.yml b/.travis.yml
index 3d23d5fd7c..75ed2f5955 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,4 +75,3 @@ notifications:
   email:
     recipients:
       - ${ADMIN_EMAIL}
-      - ${AUTHOR_EMAIL}
diff --git a/README.md b/README.md
index c122d01731..a57566834c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,8 @@
 <a href="https://in.waw.pl/systemd-github-state/systemd-systemd-pull-requests.svg"><img align="right" src="https://in.waw.pl/systemd-github-state/systemd-systemd-pull-requests-small.svg" alt="Count of open pull requests over time"></a>
 [![Build Status](https://semaphoreci.com/api/v1/projects/28a5a3ca-3c56-4078-8b5e-7ed6ef912e14/443470/shields_badge.svg)](https://semaphoreci.com/systemd/systemd)<br/>
 [![Coverity Scan Status](https://scan.coverity.com/projects/350/badge.svg)](https://scan.coverity.com/projects/350)<br/>
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1369/badge)](https://bestpractices.coreinfrastructure.org/projects/1369)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1369/badge)](https://bestpractices.coreinfrastructure.org/projects/1369)<br/>
+[![Build Status](https://travis-ci.org/systemd/systemd.svg?branch=master)](https://travis-ci.org/systemd/systemd)
 
 ## Details
 
diff --git a/tools/coverity.sh b/tools/coverity.sh
index 3e8d874728..561d127d1e 100755
--- a/tools/coverity.sh
+++ b/tools/coverity.sh
@@ -1,5 +1,10 @@
 #!/bin/env bash
 
+# The official unmodified version of the script can be found at
+# https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh
+
+set -e
+
 # Declare build command
 COVERITY_SCAN_BUILD_COMMAND="ninja -C cov-build"
 
@@ -135,8 +140,12 @@ _upload()
 	  --form version=$SHA \
 	  --form description="Travis CI build" \
 	  $UPLOAD_URL)
+	printf "\033[33;1mThe response is\033[0m\n%s\n" "$response"
 	status_code=$(echo "$response" | sed -n '$p')
-	if [ "$status_code" != "201" ]; then
+	# Coverity Scan used to respond with 201 on successfully receieving analysis results.
+	# Now for some reason it sends 200 and may change back in the foreseeable future.
+	# See https://github.com/pmem/pmdk/commit/7b103fd2dd54b2e5974f71fb65c81ab3713c12c5
+	if [ "$status_code" != "200" ]; then
 	  TEXT=$(echo "$response" | sed '$d')
 	  echo -e "\033[33;1mCoverity Scan upload failed: $TEXT.\033[0m"
 	  exit 1