diff --git a/Gui/bitmap.h b/Gui/bitmap.h
index c9d18b123c..9a6d5ebf18 100644
--- a/Gui/bitmap.h
+++ b/Gui/bitmap.h
@@ -18,4 +18,4 @@ typedef struct _txSample
 extern int bpRead( char * fname, txSample * bf );
 extern int conv24to32( txSample * bf );
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Gui/bitmap/bitmap.h b/Gui/bitmap/bitmap.h
index c9d18b123c..9a6d5ebf18 100644
--- a/Gui/bitmap/bitmap.h
+++ b/Gui/bitmap/bitmap.h
@@ -18,4 +18,4 @@ typedef struct _txSample
 extern int bpRead( char * fname, txSample * bf );
 extern int conv24to32( txSample * bf );
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Gui/bitmap/bmp/bmp.h b/Gui/bitmap/bmp/bmp.h
index 9a58a955ee..86ad5737fb 100644
--- a/Gui/bitmap/bmp/bmp.h
+++ b/Gui/bitmap/bmp/bmp.h
@@ -25,4 +25,4 @@
 
 extern int bmpRead( unsigned char * fname,txSample * bF );
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Gui/bitmap/tga/tga.h b/Gui/bitmap/tga/tga.h
index fae0b915e2..19f67149fd 100644
--- a/Gui/bitmap/tga/tga.h
+++ b/Gui/bitmap/tga/tga.h
@@ -18,4 +18,4 @@ extern void tgaWriteBuffer( char * fname,unsigned char * Buffer,int sx,int sy,in
 extern void tgaWriteTexture( char * filename,txSample * bf );
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Makefile b/Makefile
index 6645b88428..010f426c1f 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,9 @@ A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB)
 VO_LIBS = -Llibvo -lvo $(MLIB_LIB) $(X_LIBS)
 
 PARTS = mp3lib libac3 libmpeg2 opendivx libavcodec encore libvo libao2 drivers drivers/syncfb
+ifeq ($(GUI),yes)
+PARTS += Gui
+endif
 
 ifneq ($(W32_LIB),)
 PARTS += loader loader/DirectShow
@@ -74,8 +77,13 @@ opendivx/libdecore.a:
 encore/libencore.a:
 	$(MAKE) -C encore
 
+Gui/libgui.a:
+	$(MAKE) -C Gui
 
 MPLAYER_DEP = mplayer.o $(OBJS) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS) 
+ifeq ($(GUI),yes)
+MPLAYER_DEP += Gui/libgui.a
+endif
 mplayerwithoutlink: $(MPLAYER_DEP)	
 	@for a in $(PARTS); do $(MAKE) -C $$a all ; done
 
diff --git a/configure b/configure
index 4417033795..9873b6370f 100755
--- a/configure
+++ b/configure
@@ -1202,23 +1202,17 @@ for ac_option do
         _select='#define HAVE_AUDIO_SELECT'
 	;;
   --enable-gui)
-        cat <<EOF
-
-You've tried to enable GUI support.
-
-GUI code was just imported to CVS, and we didn't finished integration yet!
-It's under heavy development, and it isn't trivial how to compile and run.
-Do NOT flood our mailboxes with GUI-related questions and bugreports now!
-We're busy with development, but we know the problems you want to report.
-
-Please wait until we announce it on mplayer-users list and News on homepage.
-
-EOF
-	exit
+  	_gui=yes
+	;;
+  --enable-new-gui)
+  	_gui=yes
 	;;
   --enable-streaming)
   	_streaming=yes
 	;;
+  --enable-divx4)
+  	_divx4linux=yes
+	;;
   --disable-css)
 	_css=no
 	;;
@@ -1325,15 +1319,9 @@ EOF
   --disable-divx4)
   	_divx4linux=no
 	;;
-  --enable-divx4)
-  	_divx4linux=yes
-	;;
   --disable-vorbis)
   	_vorbis=no
 	;;
-  --enable-new-gui)
-  	_gui=yes
-	;;
   --with-win32libdir=*)
         _win32libdir=`echo $ac_option | cut -d '=' -f 2`
 	_win32libdirnotify=no
@@ -2192,6 +2180,7 @@ HAVE_MLIB=$_mlib
 GTKLIB=$_gtklib
 GLIBLIB=$_gliblib
 GUI_LIBS = $_gui_lib
+GUI=$_gui
 DEBUG=-DDEBUG
 
 EOF
diff --git a/libvo/sub.c b/libvo/sub.c
index 52b9edf9f6..a4d5d3d81c 100644
--- a/libvo/sub.c
+++ b/libvo/sub.c
@@ -4,7 +4,7 @@
 //static int vo_font_loaded=-1;
 font_desc_t* vo_font=NULL;
 
-unsigned char* vo_osd_text="00:00:00";
+unsigned char* vo_osd_text=NULL;
 int sub_unicode=0;
 int sub_utf8=0;