diff --git a/configure.ac b/configure.ac
index acfe307..75b88fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,6 @@ AC_ARG_ENABLE([tests],
 AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = xyes])
 
 AS_CASE([$host_cpu],
-	[*sparc*], [CPPFLAGS="$CPPFLAGS -D__STRICT_ALIGNMENT"],
 	[*arm*], [host_cpu=arm],
 	[*amd64*], [host_cpu=x86_64 HOSTARCH=intel],
 	[i?86], [HOSTARCH=intel],
diff --git a/include/compat/machine/endian.h b/include/compat/machine/endian.h
index 54267a8..4dcb60d 100644
--- a/include/compat/machine/endian.h
+++ b/include/compat/machine/endian.h
@@ -41,6 +41,7 @@
 #define __STRICT_ALIGNMENT
 #if defined(__i386)    || defined(__i386__)    || \
     defined(__x86_64)  || defined(__x86_64__)  || \
+    defined(__s390__)  || defined(__s390x__)   || \
     defined(__aarch64__)                       || \
     ((defined(__arm__) || defined(__arm)) && __ARM_ARCH >= 6)
 #undef __STRICT_ALIGNMENT