2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3d930f97..2c6c69ff 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,7 @@ $(objects): Makefile Makefile.settings config.h
 $(OUTFILE): $(objects) $(subdirs)
 	@echo '*' Linking $(OUTFILE)
 	@$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS)
-ifndef DEBUG
+ifneq ($(firstword $(STRIP)), \#)
 	@echo '*' Stripping $(OUTFILE)
 	@-$(STRIP) $(OUTFILE)
 endif
diff --git a/configure b/configure
index 280408ee..1daaf26d 100755
--- a/configure
+++ b/configure
@@ -40,7 +40,7 @@ purple=0
 
 doc=1
 debug=0
-strip=1
+strip=0
 gcov=0
 asan=0
 plugins=1
@@ -286,7 +286,7 @@ if [ "$debug" = "1" ]; then
 	echo 'DEBUG=1' >> Makefile.settings
 	CFLAGS="$CFLAGS -g3 -DDEBUG -O0"
 else
-	[ -z "$CFLAGS" ] && CFLAGS="-O2 -fno-strict-aliasing"
+	[ -z "$CFLAGS" ] && CFLAGS="-g -O2 -fno-strict-aliasing"
 fi
 
 if [ "$pie" = "1" ]; then