diff --git a/ChangeLog b/ChangeLog
index 6c43b045b..32ae1437f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
    comment so that the Makefile.in is still a syntactically valid Makefile
    (useful to run the distprep target)
  - (tim) [regress/cert-hostkey.sh] Typo. Missing $ on variable name.
+ - (tim) [regress/cert-hostkey.sh] Add missing TEST_SSH_ECC guard around some
+   ecdsa bits.
 
 20110213
  - (djm) [misc.c] include time.h for nanosleep() prototype
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index 6ccf54cc0..3b147b9f7 100644
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -72,9 +72,11 @@ done
 	echon '@revoked '
 	echon "* "
 	cat $OBJ/cert_host_key_rsa.pub
-	echon '@revoked '
-	echon "* "
-	cat $OBJ/cert_host_key_ecdsa.pub
+	if test "x$TEST_SSH_ECC" = "xyes"; then
+		echon '@revoked '
+		echon "* "
+		cat $OBJ/cert_host_key_ecdsa.pub
+	fi
 	echon '@revoked '
 	echon "* "
 	cat $OBJ/cert_host_key_dsa.pub