diff --git a/ChangeLog b/ChangeLog
index f4b26c79bab668e09aef236f4daf3de5edc2c2bd..f0e7faa18933f20e4e9cd5ee2aac9d63b780afde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-10-07  Niels Möller  <nisse@lysator.liu.se>
 
+	* configure.ac: Delete check for ALIGNOF_UINT64_T, no longer
+	needed.
+	* config.m4.in: Likewise delete ALIGNOF_UINT64_T.
+
 	* camellia-crypt.c (camellia_crypt): Updated call to
 	_camellia_crypt.
 	* camellia-internal.h (_camellia_crypt): Updated prototype.
diff --git a/config.m4.in b/config.m4.in
index 4c6565f5c2bb196d7bc3569e6b7903a0c5fe2e98..52db8d29d989d06ca1ac6d8cb3120f2937229115 100644
--- a/config.m4.in
+++ b/config.m4.in
@@ -4,7 +4,6 @@ define(<ELF_STYLE>, <@ASM_ELF_STYLE@>)dnl
 define(<TYPE_FUNCTION>, <@ASM_TYPE_FUNCTION@>)dnl
 define(<TYPE_PROGBITS>, <@ASM_TYPE_PROGBITS@>)dnl
 define(<ALIGN_LOG>, <@ASM_ALIGN_LOG@>)dnl
-define(<ALIGNOF_UINT64_T>, <@ALIGNOF_UINT64_T@>)dnl
 define(<W64_ABI>, <@W64_ABI@>)dnl
 divert(1)
 @ASM_MARK_NOEXEC_STACK@
diff --git a/configure.ac b/configure.ac
index 037fbe97278767962ae71cf17c4f9e726fac5860..7f1e9cb05ae8beafc604abb45c2f4533dca19f4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -617,10 +617,6 @@ AC_TYPE_UID_T
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_CHECK_SIZEOF(long)
-AC_CHECK_ALIGNOF(uint64_t)
-
-ALIGNOF_UINT64_T="$ac_cv_alignof_uint64_t"
-AC_SUBST(ALIGNOF_UINT64_T)
 
 AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h],,
 [enable_openssl=no