diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog
index 85af1cc9345194561e9bc37b8acad3e368b149bc..1b39364b072d853e5c4f84f0d61ea66e5d066ba9 100644
--- a/smartmontools/ChangeLog
+++ b/smartmontools/ChangeLog
@@ -2,6 +2,9 @@ $Id$
 
 2022-03-02  Christian Franke  <franke@computer.org>
 
+	do_release: Add '--nocheck' option.
+	Changes build command from 'make distcheck' to 'make dist'.
+
 	do_release: Add '--checkout' option.
 	Checks out a new working copy suitable for releases.
 
diff --git a/smartmontools/do_release b/smartmontools/do_release
index 8126183b3e497072d53d8069f5a16b1d6d99908c..a6ee6c96ce383ed7cdffacdcce8a257c50127b08 100755
--- a/smartmontools/do_release
+++ b/smartmontools/do_release
@@ -24,7 +24,7 @@ usage()
 {
   cat <<EOF
 Usage: $myname --checkout[=URL] DESTDIR
-       $myname [--commit] RC[1-9]|FINAL
+       $myname [--nocheck] [--commit] RC[1-9]|FINAL
 EOF
   exit 1
 }
@@ -50,11 +50,15 @@ fi
 
 # Release ...
 COMMIT=
+DIST=distcheck
 RC=
 
-case "$1" in
+while true; do case "$1" in
   --commit) COMMIT=yes; shift ;;
-esac
+  --nocheck) DIST=dist; shift ;;
+  *-) usage ;;
+  *) break ;;
+esac; done
 
 case "$*" in
   RC[1-9]) RC="$1" ;;
@@ -138,7 +142,7 @@ fi
 mkdir build
 cd build
 ../configure
-make distcheck || exit 1
+make $DIST || exit 1
 make maintainer-clean
 cd ..
 
@@ -149,13 +153,13 @@ rm -rvf build
 
 md5sum $TARFILE > $TARFILE.md5
 
-set +v
-
 # Sign tarball
 if [ -n "$KEYID" ] && gpg --list-secret-keys $KEYID >/dev/null 2>/dev/null; then
   gpg --default-key $KEYID --armor --detach-sign ./smartmontools-$VERSIONRC.tar.gz
 fi
 
+set +v
+
 # Update configure.ac only after trunk releases
 if [ -z "$RC" -a "$DIRPAT" = "trunk" ]; then
   # Comment out timestamp