diff --git a/configure.ac b/configure.ac
index ee70c7b86..b1b43ead5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,7 +381,10 @@ PKG_CHECK_MODULES([OpenSSL], [openssl],
   [have_openssl=yes
     AC_CHECK_LIB([crypto], [AES_encrypt], [have_deprecated_openssl_aes=yes])
     AC_CHECK_LIB([crypto], [EVP_aes_128_ocb], [have_evp_aes_ocb=yes])],
-  [:])
+  [AX_CHECK_LIBRARY([crypto], [openssl/aes.h], [crypto],
+    [have_openssl=yes
+      AC_CHECK_LIB([crypto], [AES_encrypt], [have_deprecated_openssl_aes=yes])
+      AC_CHECK_LIB([crypto], [EVP_aes_128_ocb], [have_evp_aes_ocb=yes])])])
 PKG_CHECK_MODULES([Nettle], [nettle], [have_nettle=yes], [:])
 AS_CASE([$with_crypto_library],
   [openssl*],
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index bd15b8398..583fc2925 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -5,8 +5,8 @@ clean-local:
 	@rm -rf version.h
 
 version.h:	../../VERSION
-	@test -s $<
-	@printf '#define BUILD_VERSION "%s"\n' "$$(cat $<)" > $@.new
+	@test -s $?
+	@printf '#define BUILD_VERSION "%s"\n' "$$(cat $?)" > $@.new
 	@set -e; if ! diff -q $@ $@.new > /dev/null 2>&1; then \
 		mv -f $@.new $@; \
 	fi