diff --git a/checks/ChangeLog b/checks/ChangeLog
index ab3318ba3..a61cf104d 100644
--- a/checks/ChangeLog
+++ b/checks/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-28  David Shaw  <dshaw@jabberwocky.com>
+
+	* defs.inc: Use new --list-config method to get cipher and digest
+	names.
+
 2007-07-18  David Shaw  <dshaw@jabberwocky.com>
 
 	* defs.inc (all_hash_algos): See "all_cipher_algos", below.
diff --git a/checks/defs.inc b/checks/defs.inc
index 50fca9424..ce05ff590 100755
--- a/checks/defs.inc
+++ b/checks/defs.inc
@@ -131,11 +131,11 @@ have_hash_algo () {
 }
 
 all_cipher_algos () {
-  ../g10/gpg --homedir . --version | grep "Cipher" | sed 's/^Cipher: //; s/,//g'
+  ../g10/gpg --homedir . --with-colons --list-config ciphername | sed 's/^cfg:ciphername://; s/;/ /g'
 }
 
 all_hash_algos () {
-  ../g10/gpg --homedir . --version | grep "Hash" | sed 's/^Hash: //; s/,//g'
+  ../g10/gpg --homedir . --with-colons --list-config digestname | sed 's/^cfg:digestname://; s/;/ /g'
 }
 
 set -e
diff --git a/checks/sigs-dsa.test b/checks/sigs-dsa.test
index 2294cf55a..cfdd52142 100755
--- a/checks/sigs-dsa.test
+++ b/checks/sigs-dsa.test
@@ -19,4 +19,3 @@ for da in ripemd160 sha1; do
 	break
     done
 done
-