diff --git a/acconfig.h b/acconfig.h
index 16de5b50d..079d4ae02 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -23,6 +23,9 @@
 
 @TOP@
 
+#undef PACKAGE
+#undef VERSION
+
 /* Always defined */
 #undef D_INO_IN_DIRENT
 #undef IS_AIX
diff --git a/configure.in b/configure.in
index a08b891fc..54c5e5a2a 100644
--- a/configure.in
+++ b/configure.in
@@ -51,8 +51,6 @@ ALL_LINGUAS="ca cs da de el es es_ES fi fr hu it ja ko nl no pl pt_BR ro ru sl s
 
 AM_GNOME_GETTEXT
 
-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
-
 dnl
 dnl Enforce coding standards
 dnl