diff --git a/ChangeLog b/ChangeLog
index 231ea8385..9e6e2b11c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-08-23  Pavel Roskin  <proski@gnu.org>
 
+	* configure.in: Make GLIB_LIBS a separate AC_SUBST'ed variable,
+	use only for the programs that need it (mc and mcserv).
+
 	* configure.in: Fix help text for gpm and ncurses.  Properly
 	handle --without-ncurses.
 	Reported by Moritz Barsnick <moritz@barsnick.net>
diff --git a/configure.in b/configure.in
index 6f1e0256a..f522aa89d 100644
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ AC_PATH_PROGS([GLIB_CONFIG], [glib-config glib12-config],,[$glib_path])
 
 AC_ARG_VAR([GLIB_CONFIG], [Path to glib-config])
 AM_PATH_GLIB(1.2.0,,[AC_MSG_ERROR([Test for GLIB failed.  MC requires GLIB.])])
-LIBS="$LIBS $GLIB_LIBS"
+AC_SUBST(GLIB_LIBS)
 
 
 AC_HEADER_MAJOR
diff --git a/src/Makefile.am b/src/Makefile.am
index 345d296cf..21fcd8af3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ endif
 endif
 
 mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
-	$(INTLLIBS) $(TERMNET) $(MCLIBS) $(LIBICONV)
+	$(INTLLIBS) $(TERMNET) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV)
 
 CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h
 
diff --git a/vfs/Makefile.am b/vfs/Makefile.am
index d3edcd5da..685bbcff6 100644
--- a/vfs/Makefile.am
+++ b/vfs/Makefile.am
@@ -102,7 +102,7 @@ endif
 
 mcserv_SOURCES = mcserv.c tcputil.c
 
-mcserv_LDFLAGS = $(TERMNET) $(PAMLIBS) $(LCRYPT)
+mcserv_LDFLAGS = $(TERMNET) $(PAMLIBS) $(LCRYPT) $(GLIB_LIBS)
 
 SAMBA_DIST =			\
 	Makefile.in		\