diff --git a/Makefile b/Makefile
index 2a12ef8fbd..09d3d296f7 100644
--- a/Makefile
+++ b/Makefile
@@ -34,12 +34,17 @@ endif
 LOADER_DEP = $(W32_DEP) $(DS_DEP)
 LIB_LOADER = $(W32_LIB) $(DS_LIB)
 
+ALL_PRG = $(PRG)
+ifeq ($(CSS_USE),yes)
+ALL_PRG += $(PRG_FIBMAP)
+endif
 
 .SUFFIXES: .c .o
 
 # .PHONY: all clean
 
-all:	$(PRG) $(PRG_FIBMAP)
+all:	$(ALL_PRG)
+
 # $(PRG_AVIP)
 
 .c.o:
@@ -112,20 +117,25 @@ $(MPLAYER_DEP): version.h
 $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
 	$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML
 
-install: $(PRG) $(PRG_FIBMAP)
+install: $(ALL_PRG)
 	if [ ! -e $(BINDIR) ]; then \
 		mkdir -p $(BINDIR); \
 	fi
 	install -m 755 -s $(PRG) $(BINDIR)/$(PRG)
+ifeq ($(GUI),yes)
+	-ln -s $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
+endif
 	if [ ! -e $(prefix)/man/man1 ]; then \
 		mkdir -p $(prefix)/man/man1; \
 	fi
 	install -c -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+ifeq ($(CSS_USE),yes)
 	@echo "Following task requires root privs. If it fails don't panic"
 	@echo "however it means you can't use fibmap_mplayer."
 	@echo "Without this (or without running mplayer as root) you won't be"
 	@echo "able to play encrypted DVDs."
 	-install -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
+endif
 
 clean:
 	rm -f *.o *~ $(OBJS)
diff --git a/configure b/configure
index 59afd534ae..9275430e08 100755
--- a/configure
+++ b/configure
@@ -1681,13 +1681,14 @@ if [ $_gl = yes ]; then
    fi
 fi
 
+_cssdef='#undef HAVE_LIBCSS'
 _csslib=''
 _cssinc=''
 
 if [ $_dvdread = yes ]; then
-   _css='#undef HAVE_LIBCSS'
    _csslib='-ldvdread'
    _dvdreaddef='#define USE_DVDREAD'
+   _css='no'
 else
    _dvdreaddef='#undef USE_DVDREAD'
 
@@ -1697,14 +1698,12 @@ if [ $_css = yes ]; then
    else
      _csslib='-lcss'
    fi
-   _css='#define HAVE_LIBCSS'
+   _cssdef='#define HAVE_LIBCSS'
    if [ ! -z "$_cssincdir" ]; then
      _cssinc="-I${_cssincdir}"
    else
      _cssinc=""
    fi
-else
-   _css='#undef HAVE_LIBCSS'
 fi
 
 fi
@@ -2148,6 +2147,7 @@ X_LIBS=$_x11libdir $_extralibdir $_gllib $_ggilib $_sdllib $_dgalib $_x11lib $_x
 TERMCAP_LIB=$_libtermcap
 XMM_LIBS = $_xmmplibs
 LIRC_LIBS = $_lirclibs
+CSS_USE=$_css
 CSS_LIB = $_csslib
 CSS_INC = $_cssinc
 SDL_INC = $_sdlcflags
@@ -2274,7 +2274,7 @@ $_have_libkstat
 $_lircdefs
 
 /* DeCSS support using libcss */
-$_css
+$_cssdef
 
 /* Define this to enable MPEG 1/2 image postprocessing (requires FAST cpu!) */
 #define MPEG12_POSTPROC