diff --git a/Frame.C b/Frame.C
index 4af2ce2..0388708 100644
--- a/Frame.C
+++ b/Frame.C
@@ -1253,13 +1253,7 @@ void Frame::draw() {
       fl_xyline(2, h()-3, w()-3, 2);
     }
 #else
-# if FL_MAJOR_VERSION>1
-    static fltk::FrameBox framebox(0,"AAAAJJWWNNTT");
-    drawstyle(style(),fltk::INVISIBLE); // INVISIBLE = draw edge only
-    framebox.draw(Rectangle(w(),h()));
-# else
     fl_frame("AAAAWWJJTTNN",0,0,w(),h());
-# endif
 #endif
     if (!flag(THIN_BORDER) && label_h > 3) {
 #ifdef SHOW_CLOCK
diff --git a/Makefile b/Makefile
index 762c4ff..13989dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,10 @@
 SHELL=/bin/sh
 
 PROGRAM = flwm
-VERSION = 1.01
+VERSION = 1.02
 
 CXXFILES = main.C Frame.C Rotated.C Menu.C FrameWindow.C Desktop.C Hotkeys.C
 
-LIBS = -lfltk
-
 MANPAGE = 1
 
 ################################################################
@@ -16,7 +14,7 @@ OBJECTS = $(CXXFILES:.C=.o)
 all:	makeinclude $(PROGRAM)
 
 $(PROGRAM) : $(OBJECTS)
-	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LIBS) $(LDLIBS)
+	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LIBS)
 
 makeinclude: configure
 	./configure
@@ -73,12 +71,12 @@ debug: $(PROGRAM_D)
 OBJECTS_D = $(CXXFILES:.C=.do) $(CFILES:.c=.do)
 
 .C.do :
-	$(CXX) -I.. $(CXXFLAGS_D) -c -o $@ $<
+	$(CXX) -I.. $(CXXFLAGS) -DDEBUG -c -o $@ $<
 .c.do :
-	$(CC) -I.. $(CFLAGS_D) -c -o $@ $<
+	$(CC) -I.. $(CFLAGS) -DDEBUG -o $@ $<
 
 $(PROGRAM_D) : $(OBJECTS_D)
-	$(CXX) $(LDFLAGS) -o $(PROGRAM_D) $(OBJECTS_D) $(LIBS) $(LDLIBS)
+	$(CXX) $(LDFLAGS) -o $(PROGRAM_D) $(OBJECTS_D) $(LIBS)
 
 rotated_test: Rotated.o rotated_test.C
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o rotated_test rotated_test.C Rotated.o $(LIBS) $(LDLIBS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o rotated_test rotated_test.C Rotated.o $(LIBS) $(LIBS)
diff --git a/Menu.C b/Menu.C
index b8244e2..e89aeb7 100644
--- a/Menu.C
+++ b/Menu.C
@@ -329,7 +329,7 @@ scan_wmx_dir (char *path, int bufindex, int nest)
   if (dir) {
     struct dirent* ent;
     while ((ent=readdir(dir))) {
-    if (ent->d_name[0] == '.')
+      if (ent->d_name[0] == '.')
         continue;
       strcpy(path+pathlen, ent->d_name);
       if (stat(path, &st) < 0) continue;
diff --git a/configure.in b/configure.in
index 90c5298..8546fef 100644
--- a/configure.in
+++ b/configure.in
@@ -11,6 +11,14 @@ echo "Ignoring libraries \"$X_PRE_LIBS\" requested by configure."
 dnl# LIBS="$LIBS$X_LIBS$X_PRE_LIBS"
 LIBS="$LIBS$X_LIBS"
 
+AC_ARG_ENABLE(fltk2,[  --enable-fltk2          use fltk2 (default=no)])
+if test x$enable_fltk2 = xyes; then
+    LIBS="-lfltk2 -lXft -lXinerama -lXi $LIBS"
+    CXXFLAGS="$CXXFLAGS -I/usr/local/include/fltk/compat"
+else
+    LIBS="-lfltk -lXft -lXinerama $LIBS"
+fi
+
 MAKEDEPEND="\$(CXX) -M"
 
 dnl# add warnings and optimization to compiler switches:
@@ -18,10 +26,8 @@ dnl# do this last so messing with switches does not break tests
 if test -n "$GXX"; then
     # GNU C compiler
     # -Wno-return-type is necessary for Xlib header files on many systems:
-    CFLAGS="$CFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
-    CFLAGS_D="$CFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
-    CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
-    CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+    CFLAGS="$CFLAGS -Wall -Wno-return-type $X_CFLAGS"
+    CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type $X_CFLAGS"
 else
 if test "`(uname) 2>/dev/null`" = IRIX; then
   if expr "`(uname -r)`" \>= 6.2; then
@@ -33,27 +39,19 @@ if test "`(uname) 2>/dev/null`" = IRIX; then
     MAKEDEPEND="CC -M"
     # -woff 3322 is necessary due to errors in Xlib headers on IRIX
     CFLAGS="$CFLAGS -fullwarn -O2 $X_CFLAGS"
-    CFLAGS_D="$CFLAGS -fullwarn -gslim -DDEBUG $X_CFLAGS"
     CXXFLAGS="$CXXFLAGS -fullwarn -woff 3322 -O2 $X_CFLAGS"
-    CXXFLAGS_D="$CXXFLAGS -fullwarn -woff 3322 -gslim -DDEBUG $X_CFLAGS"
   else
     # old Irix compiler:
     CFLAGS="$CFLAGS -O2 $X_CFLAGS"
-    CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
     CXXFLAGS="$CXXFLAGS +w +pp -O2 $X_CFLAGS"
-    CXXFLAGS_D="$CXXFLAGS +w +pp -g -DDEBUG $X_CFLAGS"
   fi
 else
     # generic C compiler:
-    CFLAGS="$CFLAGS -O $X_CFLAGS"
-    CFLAGS_D="$CFLAGS -g -DDEBUG $X_CFLAGS"
-    CXXFLAGS="$CXXFLAGS -O $X_CFLAGS"
-    CXXFLAGS_D="$CXXFLAGS -g -DDEBUG $X_CFLAGS"
+    CFLAGS="$CFLAGS $X_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 fi
 fi
 AC_SUBST(MAKEDEPEND)
-AC_SUBST(CFLAGS_D)
-AC_SUBST(CXXFLAGS_D)
 dnl# AC_CONFIG_HEADER(config.h:configh.in)
 AC_OUTPUT(makeinclude)
 
diff --git a/makeinclude.in b/makeinclude.in
index 28ae844..a0101a2 100644
--- a/makeinclude.in
+++ b/makeinclude.in
@@ -16,11 +16,9 @@ MAKEDEPEND =@MAKEDEPEND@
 
 # flags for C++ compiler:
 CFLAGS		=@CFLAGS@
-CFLAGS_D	=@CFLAGS_D@
 CXXFLAGS	=@CXXFLAGS@
-CXXFLAGS_D	=@CXXFLAGS_D@
 
 # libraries to link with:
-LDLIBS	=@LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
+LIBS	=@LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
 
 INSTALL	=@INSTALL@