diff --git a/configure.ac b/configure.ac
index acfc2ea6c148be7080e5e0bfb861d1a35a7712ba..cbabf835f457fb5822d59e040a3261b65562d6e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,9 @@ if test "x$GCC" = "xyes"; then
 	# Hide inline methods
 	CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
 
+	# Assorted warnings
+	CXXFLAGS="$CXXFLAGS -Wcast-align"
+
 	case "$host" in
 		arm-*-*)
 			# Request byte alignment on arm
diff --git a/src/Makefile.am b/src/Makefile.am
index f7cf5939be1829ee77e043a5f0220952dcd557a7..b981346dba2457228e39b60bdc772366a7200b1e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
 
-# The following warning options are useful for debugging: -Wpadded -Wcast-align
+# The following warning options are useful for debugging: -Wpadded
 #AM_CXXFLAGS =
 
 lib_LTLIBRARIES = libharfbuzz.la