diff --git a/Makefile.am b/Makefile.am
index 948da10..05267bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = c
 
 scheme/load-scx.scm:
 	(echo '(user)';								\
+		echo "(batch)";							\
 		echo "(open 'dynamic-externals)";				\
 		echo "(open 'external-calls)";					\
 		echo '(run ';							\
@@ -10,7 +11,8 @@ scheme/load-scx.scm:
 		echo '	    (dynamic-load module-file)';			\
 		echo '	    (call-external (get-external initializer-name))))';	\
 		echo '(config)';						\
-		echo '(load "xlib/xlib-interfaces.scm")';				\
-		echo '(load "xlib/xlib-packages.scm")';				\
+		echo '(load "$(prefix)/scheme/xlib/xlib-interfaces.scm")';	\
+		echo '(load "$(prefix)/scheme/xlib/xlib-packages.scm")';	\
+		echo '(batch)';							\
 	) > $@
 
diff --git a/c/xlib/Makefile.am b/c/xlib/Makefile.am
index 856f4e1..e486146 100644
--- a/c/xlib/Makefile.am
+++ b/c/xlib/Makefile.am
@@ -1,12 +1,13 @@
 INCLUDES = -I@top_srcdir@/c/xlib -I@top_srcdir@/c/libs -I@x_includes@ \
 	-I@top_srcdir@/c -I@scsh_includes@
 
-
 lib_LTLIBRARIES = libscx.la
 
 libscx_la_SOURCES = \
         client.c colormap.c cursor.c display.c error.c event-types.c \
-	event.c extension.c font.c gcontext.c grab.c graphics.c init.c key.c \
+	event.c font.c gcontext.c grab.c graphics.c init.c key.c \
 	pixmap.c property.c region.c text.c types.c util.c visual.c window.c \
 	wm.c xlib.h
-#libscx_a_LDFLAGS = -export-dynamic
+
+libscx_la_LIBADD = $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) -lX11
+
diff --git a/configure.in b/configure.in
index 01e680c..02820b7 100644
--- a/configure.in
+++ b/configure.in
@@ -14,8 +14,8 @@
 
           AC_PROG_CC
  
-          AC_PATH_X
- 
+          AC_PATH_XTRA
+
           AC_ARG_WITH(scsh-includes, 
                      AC_HELP_STRING([--with-scsh-includes=DIR],  
                                     [scsh include files are in DIR [/usr/local/include]]),