diff --git a/configure.in b/configure.in
index 027681c1e..2e91b579e 100644
--- a/configure.in
+++ b/configure.in
@@ -89,8 +89,8 @@ AC_CHECK_HEADERS(sys/utsname.h sys/wait.h syslog.h termio.h)
 AC_CHECK_HEADERS(termios.h tmpdir.h unistd.h util.h utmp.h utmpx.h)
 
 if test "$ac_cv_header_err_h" = no; then
-	EXTRA_HEADERS="$EXTRA_HEADERS err.h"
-	AC_SUBST(EXTRA_HEADERS)
+	EXTRA_HDRS="$EXTRA_HDRS err.h"
+	AC_SUBST(EXTRA_HDRS)
 fi
 
 dnl Checks for libraries.
diff --git a/include/Makefile.am b/include/Makefile.am
index 390ba7daf..ec351dd8c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -10,7 +10,7 @@ include_HEADERS = \
 	asn1.h asn1_err.h bits.h cache.h config_file.h des.h error.h \
 	getarg.h gssapi.h hdb.h hdb_asn1.h hdb_err.h heim_err.h kafs.h \
 	keytab.h krb5.h krb5_err.h md4.h md5.h otp.h parse_time.h \
-	parse_units.h roken.h sha.h sl.h store.h @EXTRA_HEADERS@
+	parse_units.h roken.h sha.h sl.h store.h @EXTRA_HDRS@
 
 EXTRA_HEADERS = err.h