diff --git a/include/cdio/Makefile.am b/include/cdio/Makefile.am
index b50edd12..750ad495 100644
--- a/include/cdio/Makefile.am
+++ b/include/cdio/Makefile.am
@@ -22,7 +22,7 @@ if BUILD_CD_PARANOIA
 paranoiaheaders = cdda.h cdtext.h 
 endif
 
-cdio_config.h: $(top_srcdir)/config.h
+cdio_config.h: $(top_builddir)/config.h
 	echo  '#ifndef __CDIO_CONFIG_H__' > cdio_config.h
 	echo  '#define __CDIO_CONFIG_H__' >> cdio_config.h
 	cat  $(top_builddir)/config.h >>cdio_config.h
diff --git a/src/util.h b/src/util.h
index 13ae841b..a8c902a0 100644
--- a/src/util.h
+++ b/src/util.h
@@ -56,7 +56,7 @@
 #endif
 
 #ifdef ENABLE_NLS
-#include <locale.h>
+#    include <locale.h>
 #    include <libintl.h>
 #    define _(String) dgettext ("cdinfo", String)
 #else
diff --git a/test/check_common_fn.in b/test/check_common_fn.in
index 6601288d..f1d5a28f 100755
--- a/test/check_common_fn.in
+++ b/test/check_common_fn.in
@@ -21,7 +21,7 @@ SKIP_TEST_EXITCODE=77
 # Some output changes depending on TZ and locale. Set this so we get known
 # results
 TZ=CUT
-LC_TIME='en_US'
+LC_TIME=$(locale -a | grep 'en_US' &2>/dev/null)
 export TZ LC_TIME
 
 check_result() {