diff --git a/ChangeLog b/ChangeLog
index 17d87d8..a580d3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3478,3 +3478,8 @@ Wed Apr 12 21:18:19 PDT 2000	Michael Jennings <mej@eterm.org>
 	are, I hope you like it.
 	
 -------------------------------------------------------------------------------
+Wed Apr 12 21:46:41 PDT 2000	Michael Jennings <mej@eterm.org>
+
+	Fixed auto mode problems.  That was a really dumb oversight.
+	
+-------------------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index cb745cc..015f86e 100644
--- a/configure.in
+++ b/configure.in
@@ -293,7 +293,9 @@ AC_ARG_WITH(imlib,
 if test $USE_IMLIB -eq 1 ; then
   AC_CHECK_LIB(Imlib2, imlib_create_image,
                GRLIBS="-lImlib2"
+               AC_CHECK_LIB(ttf, TT_Init_FreeType, GRLIBS="$GRLIBS -lttf", , $SUBLIBS $X_LIBS)
                AC_CHECK_LIB(dl, dlopen, GRLIBS="$GRLIBS -ldl", , $SUBLIBS $X_LIBS)
+               AC_CHECK_LIB(m, pow, GRLIBS="$GRLIBS -lm", , $SUBLIBS $X_LIBS)
                AC_DEFINE(PIXMAP_SUPPORT)
                AC_DEFINE(BACKING_STORE)
               ,
diff --git a/src/pixmap.c b/src/pixmap.c
index 92ef2b6..0f24082 100644
--- a/src/pixmap.c
+++ b/src/pixmap.c
@@ -646,9 +646,6 @@ paste_simage(simage_t *simg, unsigned char which, Drawable d, unsigned short x,
             FREE(reply);
             enl_ipc_sync();
             if (pmap) {
-              if (mask) {
-                shaped_window_apply_mask(pmap, mask);
-              }
               gc = XCreateGC(Xdisplay, d, 0, NULL);
               XSetClipMask(Xdisplay, gc, mask);
               XSetClipOrigin(Xdisplay, gc, x, y);
@@ -888,7 +885,6 @@ render_simage(simage_t * simg, Window win, unsigned short width, unsigned short
             enl_ipc_sync();
             if (pmap) {
               if (mask) {
-                shaped_window_apply_mask(pmap, mask);
                 XSetClipMask(Xdisplay, gc, mask);
                 XSetClipOrigin(Xdisplay, gc, 0, 0);
               }