diff --git a/ChangeLog b/ChangeLog
index 9b86f7bde26d28df4e268c9a347eef2b7ad81d20..6165ca6638d3a072822ed85aa319a210a8a3dd3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
 	variable.
 	(asm.d): Make config.status write dependencies for .s files into
 	asm.d.
+	(ASM_ALIGN_LOG): Set to "no" when appropriate.
 
 	* asm.m4: Use changecom to disable m4 quoting. Use divert to
 	suppress output.
diff --git a/configure.ac b/configure.ac
index c6214baee1250d9c1812f7e304d8dfe2ec46745e..934926454861e46d5dd752537ffc9fb14886a92e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,9 +478,7 @@ foo:
 ],
        [nettle_cv_asm_align_log=yes],
        [nettle_cv_asm_align_log=no])])
-  if test x$nettle_cv_asm_align_log = xyes ; then
-    ASM_ALIGN_LOG='yes'
-  fi
+  ASM_ALIGN_LOG="$nettle_cv_asm_align_log"
 fi
 
 AC_SUBST(ASM_SYMBOL_PREFIX)