diff --git a/ChangeLog b/ChangeLog
index d8fbe291d..a04365ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-11-10  Pavel Roskin  <proski@gnu.org>
 
+	* configure.ac: Use AC_GNU_SOURCE, which prevents redefining
+	_GNU_SOURCE.  Bump Autoconf version to 2.54, where AC_GNU_SOURCE
+	appeared.
+	Reported by Leonard den Ottolander <leonard@den.ottolander.nl>
+
 	* configure.ac: Use gettext 0.14.3.
 	* acinclude.m4 (MC_ASM_LABELS): Remove, it's not needed with
 	recent versions of gettext.
diff --git a/configure.ac b/configure.ac
index b5e6bfdbc..040403618 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Configure.in file for the Midnight Commander
 dnl
 
 AC_INIT([GNU Midnight Commander], [], [mc-devel@gnome.org])
-AC_PREREQ(2.53)
+AC_PREREQ(2.54)
 AC_CONFIG_SRCDIR(src/main.c)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE(mc, 4.6.1a)
@@ -13,6 +13,7 @@ AM_MAINTAINER_MODE
 
 AC_CANONICAL_HOST
 
+AC_GNU_SOURCE
 AC_AIX
 AC_MINIX
 AC_ISC_POSIX
@@ -142,9 +143,6 @@ aux*)
     LIBS="$LIBS -lposix"
     AC_DEFINE(_POSIX_SOURCE)
     ;;
-linux*)
-    AC_DEFINE(_GNU_SOURCE,, [Define to request GNU feature set on Linux])
-    ;;
 esac
 
 dnl Extended Character Sets