diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am
index 9632044f..29213343 100644
--- a/src/pkcs11/Makefile.am
+++ b/src/pkcs11/Makefile.am
@@ -6,9 +6,7 @@ libdir = ${prefix}/lib/pkcs11
 
 INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
 
-CFLAGS = -g
-
-LDFLAGS = -g @LDFLAGS@ @LIBDL@ @LIBOPENSC@
+LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBOPENSC@
 
 SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \
 	framework-pkcs15.c
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index f8d21ab5..5676a13d 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,6 +1,5 @@
 # Process this file with automake to create Makefile.in
 
-CC = gcc
 INCLUDES = @CFLAGS_PCSC@ @CFLAGS_OPENSC@
 LDFLAGS = @LDFLAGS@ @LIBOPENSC@