diff --git a/build-aux/getswdb.sh b/build-aux/getswdb.sh
index 83ecdb2f3..cd419f2bd 100755
--- a/build-aux/getswdb.sh
+++ b/build-aux/getswdb.sh
@@ -1,190 +1,190 @@
 #!/bin/sh
 # Get the online version of the GnuPG software version database
 # Copyright (C) 2014  Werner Koch
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # The URL of the file to retrieve.
 urlbase="https://versions.gnupg.org/"
 
 WGET=wget
 GPGV=gpgv
 
 srcdir=$(dirname "$0")
 distsigkey="$srcdir/../g10/distsigkey.gpg"
 
 # Convert a 3 part version number it a numeric value.
 cvtver () {
   awk 'NR==1 {split($NF,A,".");X=1000000*A[1]+1000*A[2]+A[3];print X;exit 0}'
 }
 
 # Prints usage information.
 usage()
 {
     cat <<EOF
 Usage: $(basename $0) [OPTIONS]
 Get the online version of the GnuPG software version database
 Options:
     --skip-download    Assume download has already been done.
     --skip-verify      Do not check signatures
     --skip-selfcheck   Do not check GnuPG version
     --find-sha1sum     Print the name of the sha1sum utility
     --find-sha256sum   Print the name of the sha256sum utility
     --help             Print this help.
 EOF
     exit $1
 }
 
 #
 # Parse options
 #
 skip_download=no
 skip_verify=no
 skip_selfcheck=no
 find_sha1sum=no
 find_sha256sum=no
 while test $# -gt 0; do
     case "$1" in
 	# Set up `optarg'.
 	--*=*)
 	    optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
 	    ;;
 	*)
 	    optarg=""
 	    ;;
     esac
 
     case $1 in
         --help|-h)
 	    usage 0
 	    ;;
         --skip-download)
             skip_download=yes
             ;;
         --skip-verify)
             skip_verify=yes
             ;;
         --skip-selfcheck)
             skip_selfcheck=yes
             ;;
         --find-sha1sum)
             find_sha1sum=yes
             ;;
         --find-sha256sum)
             find_sha256sum=yes
             ;;
 	*)
 	    usage 1 1>&2
 	    ;;
     esac
     shift
 done
 
 # Mac OSX has only a shasum and not sha1sum
 if [ ${find_sha1sum} = yes ]; then
     for i in sha1sum shasum ; do
        tmp=$($i </dev/null 2>/dev/null | cut -d ' ' -f1)
        if [ x"$tmp" = x"da39a3ee5e6b4b0d3255bfef95601890afd80709" ]; then
            echo "$i"
            exit 0
        fi
     done
     echo "false"
     exit 1
 fi
 
 # Mac OSX has only a shasum and not sha256sum
 if [ ${find_sha256sum} = yes ]; then
     for i in 'shasum -a 256' sha256sum ; do
        tmp=$($i </dev/null 2>/dev/null | cut -d ' ' -f1)
        tmp2="e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
        if [ x"$tmp" = x"$tmp2" ]; then
            echo "$i"
            exit 0
        fi
     done
     echo "false"
     exit 1
 fi
 
 
 # Get GnuPG version from VERSION file.  For a GIT checkout this means
 # that ./autogen.sh must have been run first.  For a regular tarball
 # VERSION is always available.
 if [ ! -f "$srcdir/../VERSION" ]; then
     echo "VERSION file missing - run autogen.sh first." >&2
     exit 1
 fi
 version=$(cat "$srcdir/../VERSION")
 version_num=$(echo "$version" | cvtver)
 
 if [ $skip_verify = no ]; then
   if ! $GPGV --version >/dev/null 2>/dev/null ; then
     echo "command \"gpgv\" is not installed" >&2
     echo "(please install an older version of GnuPG)" >&2
     exit 1
   fi
 fi
 
 #
 # Download the list and verify.
 #
 if [ $skip_download = yes ]; then
   if [ ! -f swdb.lst ]; then
       echo "swdb.lst is missing." >&2
       exit 1
   fi
   if [ $skip_verify = no ]; then
     if [ ! -f swdb.lst.sig ]; then
       echo "swdb.lst.sig is missing." >&2
       exit 1
     fi
   fi
 else
   if ! $WGET --version >/dev/null 2>/dev/null ; then
       echo "command \"wget\" is not installed" >&2
       exit 1
   fi
 
   if ! $WGET -q -O swdb.lst "$urlbase/swdb.lst" ; then
       echo "download of swdb.lst failed." >&2
       exit 1
   fi
   if [ $skip_verify = no ]; then
     if ! $WGET -q -O swdb.lst.sig "$urlbase/swdb.lst.sig" ; then
       echo "download of swdb.lst.sig failed." >&2
       exit 1
     fi
   fi
 fi
 if [ $skip_verify = no ]; then
   if ! $GPGV --keyring "$distsigkey" swdb.lst.sig swdb.lst; then
     echo "list of software versions is not valid!" >&2
     exit 1
  fi
 fi
 
 #
 # Check that the online version of GnuPG is not less than this version
 # to help detect rollback attacks.
 #
 if [ $skip_selfcheck = no ]; then
-  gnupg_ver=$(awk '$1=="gnupg21_ver" {print $2;exit}' swdb.lst)
+  gnupg_ver=$(awk '$1=="gnupg22_ver" {print $2;exit}' swdb.lst)
   if [ -z "$gnupg_ver" ]; then
-      echo "GnuPG 2.1 version missing in swdb.lst!" >&2
+      echo "GnuPG 2.2 version missing in swdb.lst!" >&2
       exit 1
   fi
   gnupg_ver_num=$(echo "$gnupg_ver" | cvtver)
   if [ $(( $gnupg_ver_num >= $version_num )) = 0 ]; then
       echo "GnuPG version in swdb.lst is less than this version!" >&2
       echo "  This version: $version" >&2
       echo "  SWDB version: $gnupg_ver" >&2
       exit 1
   fi
 fi