diff --git a/lensfun/build/tibs/compiler/gcc.mak b/lensfun/build/tibs/compiler/gcc.mak
index 928f99c..cbc5b71 100644
--- a/lensfun/build/tibs/compiler/gcc.mak
+++ b/lensfun/build/tibs/compiler/gcc.mak
@@ -11,7 +11,7 @@ ifneq ($(TARGET),windows)
 GCC.CFLAGS.SHARED ?= -fPIC
 endif
 
-GCC.CFLAGS.release = -s -O3 -fomit-frame-pointer -funroll-loops
+GCC.CFLAGS.release = -g -O3 -fomit-frame-pointer -funroll-loops
 GCC.CFLAGS.debug = -D__DEBUG__ -g
 
 ifeq ($(ARCH),arm)
@@ -30,7 +30,7 @@ GCC.LD ?= g++
 GCC.LDFLAGS = $(GCC.LDFLAGS.$(MODE))
 GCC.LDFLAGS.LIBS = $(LDLIBS) -lm
 
-GCC.LDFLAGS.release = -s
+GCC.LDFLAGS.release = -g
 GCC.LDFLAGS.debug = -gdwarf-2 -g3
 
 GCC.LINKLIB = $(if $(findstring $L,$1),,$(if $(findstring /,$1),$1,-l$1))
diff --git a/lensfun/tools/makedep/BUILDING b/lensfun/tools/makedep/BUILDING
index 5167b6f..f1bc088 100644
--- a/lensfun/tools/makedep/BUILDING
+++ b/lensfun/tools/makedep/BUILDING
@@ -1,4 +1,4 @@
 To build the tool, just compile all the .cpp file together into a executable called
 makedep{.exe}. With the GNU C compiler this is just:
 
-g++ -s -O3 -fomit-frame-pointer -fno-exceptions -fno-rtti -o makedep *.cpp
+g++ -g -O3 -fomit-frame-pointer -fno-exceptions -fno-rtti -o makedep *.cpp