diff --git a/ChangeLog b/ChangeLog
index 43223c59b..2d9f1fde4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-01  Havoc Pennington  <hp@redhat.com>
+
+	* src/screen.c (meta_screen_new): Xlib doesn't like NULL for out
+	arguments; fix for #80472 from lbedford
+
 2002-04-30  Havoc Pennington  <hp@pobox.com>
 
 	* src/keybindings.c: finish mopping up mode_switch_mask field
diff --git a/src/run-metacity.sh b/src/run-metacity.sh
index 474139c73..8e99b82d8 100755
--- a/src/run-metacity.sh
+++ b/src/run-metacity.sh
@@ -38,9 +38,13 @@ if test -n "$DEMO_TEST"; then
   TEST_CLIENT='./tools/metacity-window-demo'
 fi
 
+if test -n "$XINERAMA"; then
+  XINERAMA_FLAGS='+xinerama'
+fi
+
 if test -z "$ONLY_WM"; then
   echo "Launching Xnest"
-  Xnest -ac $XNEST_DISPLAY -scrns $SCREENS -geometry 640x480 -bw 15 &
+  Xnest -ac $XNEST_DISPLAY -scrns $SCREENS -geometry 640x480 -bw 15 $XINERAMA_FLAGS &
   ## usleep 800000
   sleep 1
 
diff --git a/src/screen.c b/src/screen.c
index a4a6dfeb5..14c71b8a2 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -164,6 +164,7 @@ meta_screen_new (MetaDisplay *display,
   MetaScreen *screen;
   Window xroot;
   Display *xdisplay;
+  int xinerama_event_base, xinerama_error_base;
   
   /* Only display->name, display->xdisplay, and display->error_traps
    * can really be used in this function, since normally screens are
@@ -220,7 +221,9 @@ meta_screen_new (MetaDisplay *display,
   screen->n_xinerama_infos = 0;
 
 #ifdef HAVE_XINERAMA
-  if (XineramaQueryExtension (display->xdisplay, NULL, NULL))
+  if (XineramaQueryExtension (display->xdisplay,
+                              &xinerama_event_base,
+                              &xinerama_error_base))
     {
       XineramaScreenInfo *infos;
       int n_infos;