diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index b4988469e..4c2c8d280 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-20  Pavel Roskin  <proski@gnu.org>
+
+	* Makefile.in: Move i18n part of EXTRALIBS to INTLLIBS.  Use
+	INTLLIBS when linking gmc-client.
+	Reported by Christian Schaller <Uraeus@linuxrising.org>
+
 2001-08-19  Pavel Roskin  <proski@gnu.org>
 
 	* gdesktop-icon.c: Include "global.h".
diff --git a/gnome/Makefile.in b/gnome/Makefile.in
index 319cc3765..521f4bc23 100644
--- a/gnome/Makefile.in
+++ b/gnome/Makefile.in
@@ -24,7 +24,8 @@ LDFLAGS       = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEUI_LIBS@
 CORBA_LDFLAGS = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEGNORBA_LIBS@
 DEFS = $(XDEFS)
 LIBS = $(XLIBS) @TERMNET@
-EXTRALIBS = -L../vfs @LVFS@ -L../gtkedit -lgtkedit @LINTL@ @LIBICONV@
+INTLLIBS = @LINTL@ @LIBICONV@
+EXTRALIBS = -L../vfs @LVFS@ -L../gtkedit -lgtkedit $(INTLLIBS)
 DEPLIBS = $(top_builddir)/vfs/@LIBVFS@ \
 	$(top_builddir)/gtkedit/@libgtkedit@ @INTLDEPS@
 INSTALL = @INSTALL@
@@ -246,7 +247,7 @@ corba-gmc: $(OBJS) $(CORBAOBJS) $(DEPLIBS)
 	$(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(EXTRALIBS) $(CORBA_LDFLAGS) $(LIBS)
 
 gmc-client: $(CLIENTOBJS)
-	$(CC) -o gmc-client $(CLIENTOBJS) $(CORBA_LDFLAGS) $(LIBS)
+	$(CC) -o gmc-client $(CLIENTOBJS) $(INTLLIBS) $(CORBA_LDFLAGS) $(LIBS)
 
 mc.keys: mc.keys.in Makefile
 	sed -e 's^\@icondir\@^$(icondir)^g' \