diff --git a/stepmania/configure.ac b/stepmania/configure.ac
index 440926c7e2..87055be4c8 100644
--- a/stepmania/configure.ac
+++ b/stepmania/configure.ac
@@ -71,14 +71,6 @@ fi
 # not sure
 # SDL_LIBS="`echo $SDL_LIBS | sed 's_-L/usr/lib/\?[[ $]]__'`"
 
-AC_SEARCH_LIBS(IMG_Load, [SDL_image], have_SDL_image=yes,  have_SDL_image=no)
-if test "$have_SDL_image" = "no"; then
-  echo
-  echo "*** SDL_image is required to build StepMania; please make sure that"
-  echo "*** it is installed to continue the build process."
-  exit 1
-fi
-
 have_libpng=yes
 AC_SEARCH_LIBS(png_create_read_struct, [png], ,  have_libpng=no)
 AC_CHECK_HEADER(png.h, , have_libpng=no)
diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am
index fb37faa474..b96f825c1a 100644
--- a/stepmania/src/Makefile.am
+++ b/stepmania/src/Makefile.am
@@ -206,7 +206,7 @@ RageSoundReader_Resample_Good.cpp RageSoundReader_Resample_Good.h \
 RageSoundResampler.cpp RageSoundResampler.h RageSounds.cpp RageSounds.h \
 RageSurface_Load.cpp RageSurface_Load.h RageSurface_Load_PNG.cpp RageSurface_Load_PNG.h \
 RageSurface_Load_JPEG.cpp RageSurface_Load_JPEG.h RageSurface_Load_GIF.cpp RageSurface_Load_GIF.h \
-RageSurface_Load_BMP.cpp RageSurface_Load_BMP.h \
+RageSurface_Load_BMP.cpp RageSurface_Load_BMP.h RageSurface_Load_XPM.cpp RageSurface_Load_XPM.h \
 RageTexture.cpp RageTexture.h \
 RageTextureID.cpp RageTextureID.h RageTextureManager.cpp RageTextureManager.h RageThreads.cpp RageThreads.h \
 RageTimer.cpp RageTimer.h RageTypes.h RageUtil.cpp RageUtil.h RageUtil_CharConversions.cpp RageUtil_CharConversions.h \
@@ -262,7 +262,6 @@ main_LDADD = \
 		  $(LUA_LIBS) \
 		  $(SDL_LIBS) \
 		  $(XLIBS) \
-		  -lSDL_image \
 		  $(srcdir)/libresample/libresample.a
 
 stepmania_SOURCES = $(main_SOURCES)