diff --git a/ChangeLog b/ChangeLog
index c7e85ef34..664b7da0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun  3 15:12:11 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* configure.in (METACITY_LIBS): put -lXext into SHAPE_LIBS
+
 2002-06-03  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* src/tools/metacity-properties.desktop.in: Someone forgot to mark
diff --git a/configure.in b/configure.in
index c6cf79c6f..e040d980e 100644
--- a/configure.in
+++ b/configure.in
@@ -121,8 +121,7 @@ if test "$found_shape" = "true"; then
    AC_DEFINE(HAVE_SHAPE)
 fi
 
-## we don't put SHAPE_LIBS in here, they should be in X_EXTRA_LIBS I think. we'll see
-METACITY_LIBS="$XINERAMA_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_LIBS"
+METACITY_LIBS="$XINERAMA_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_LIBS"
 METACITY_MESSAGE_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_MESSAGE_LIBS"
 METACITY_WINDOW_DEMO_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_WINDOW_DEMO_LIBS"
 METACITY_PROPS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_PROPS_LIBS"