diff --git a/Makefile b/Makefile
index 5891ff7f6c..d6dbb91597 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,12 @@ PRG_FIBMAP = fibmap_mplayer
 PRG_CFG = codec-cfg
 PRG_MENCODER = mencoder
 
+# Do not strip the binaries at installation
+ifeq ($(STRIPBINARIES),yes)
+INSTALLSTRIP = -s
+endif
+
+
 # these subdirectories required installation due binaries within them
 ifeq ($(VIDIX),yes)
 SUBDIRS += libdha vidix
@@ -221,14 +227,14 @@ ifeq ($(VIDIX),yes)
 	$(DO_MAKE)
 endif
 	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
-	$(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG)
+	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
 ifeq ($(GUI),yes)
 	-ln -sf $(PRG) $(BINDIR)/gmplayer
 endif
 	if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi
 	$(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
 ifeq ($(MENCODER),yes)
-	$(INSTALL) -m 755 -s $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
+	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
 	-ln -sf mplayer.1 $(MANDIR)/man1/mencoder.1
 endif
 	@if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
@@ -249,7 +255,7 @@ endif
 ifeq ($(DVDKIT),yes)
 ifeq ($(DVDKIT_SHARED),yes)
 	if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
-	$(INSTALL) -m 755 -s libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
+	$(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
 endif
 endif
 ifeq ($(CSS_USE),yes)
@@ -257,7 +263,7 @@ ifeq ($(CSS_USE),yes)
 	@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)
+	-$(INSTALL) -o 0 -g 0 -m 4755 $(INSTALLSTRIP) $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
 endif
 
 uninstall:
diff --git a/configure b/configure
index 67e7f37296..bbc204d5ae 100755
--- a/configure
+++ b/configure
@@ -3639,8 +3639,10 @@ fi
 #############################################################################
 
 # Checking for CFLAGS
+_stripbinaries=yes
 if test "$_profile" || test "$_debug" ; then
   CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile"
+  _stripbinaries=no
 elif test -z "$CFLAGS" ; then
   if test "$host_arch" != "mips" ; then
     CFLAGS="-O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer"
@@ -3650,6 +3652,7 @@ elif test -z "$CFLAGS" ; then
   # always compile with '-g' if .developer:
   if test -f ".developer" ; then
     CFLAGS="-g $CFLAGS"
+    _stripbinaries=no
   fi
 else
   cat <<EOF
@@ -3796,6 +3799,7 @@ AWK = $_awk
 OPTFLAGS = $CFLAGS
 EXTRA_INC = $_inc_extra $_inc_gtk
 WIN32_PATH = -DWIN32_PATH=\\"$_win32libdir\\"
+STRIPBINARIES = $_stripbinaries
 
 STREAMING = $_streaming
 STREAMING_LIB = $_ld_streaming