diff --git a/make/cfg_dev.mk b/make/cfg_dev.mk
index ac312f08..ac9f84d1 100644
--- a/make/cfg_dev.mk
+++ b/make/cfg_dev.mk
@@ -52,7 +52,8 @@ COMPILE_DEBUG_CODE    = true
 #USE_EFENCE           = true
 #USE_MPATROL          = true
 USE_COMPILER_DEBUG_OPTS = true
-#USE_COMPILER_OPTIMIZATION = true
-#USE_TRACING           = true
 #USE_TIMER             = true
 #LOG_THREAD_NAMES      = true
+#USE_COMPILER_OPTIMIZATION_OPTS = true
+#USE_TRACING           = true
+USE_TIMER             = true
diff --git a/make/cfg_dist.mk b/make/cfg_dist.mk
index 5cd63333..215c6412 100644
--- a/make/cfg_dist.mk
+++ b/make/cfg_dist.mk
@@ -49,7 +49,7 @@ LIBTYPE          = shared
 #USE_MEMWATCH         = true
 #USE_EFENCE           = true
 #USE_MPATROL          = true
-#USE_COMPILER_DEBUG_OPTS = true
-#USE_COMPILER_OPTIMIZATION = true
+USE_COMPILER_DEBUG_OPTS = true
+#USE_COMPILER_OPTIMIZATION_OPTS = true
 #USE_TRACING           = true
 #USE_TIMER             = true
diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk
index 821a1203..41577bd7 100644
--- a/make/linux-rpm.mk
+++ b/make/linux-rpm.mk
@@ -66,7 +66,7 @@ all: rpm
 
 # file rules
 $(KERNEL_PKG):
-	mkdir -p $(dirname $(KERNEL_PKG)
+	mkdir -p $(dir $(KERNEL_PKG))
 	ftp -a ftp.kernel.org:/pub/linux/kernel/v$(basename $(KERNEL_VERSION))/$(KERNEL_TGZ)
 	install -m 664 $(KERNEL_TGZ) $@
 
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 8d30fb62..28c663b3 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -15,7 +15,7 @@ endif
 RPM_VERSION = $(VERSION)
 TAG_VERSION = V_$(shell echo $(VERSION) | sed 's/[\.-]/_/g')
 
-CLEAN                    += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
+CLEAN                     += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
 DIST_SRC_DIR              = dist/src/$(RPM_PROJECT)-$(RPM_VERSION)
 DIST_PCKG_DIR             = dist/pckg
 
@@ -84,7 +84,10 @@ cpfiles.dist:
 
 %.tar.gz: cpfiles.dist cpmod.dist
 	mkdir -p $(DIST_PCKG_DIR)
-	tar -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))
+	tar -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR)) \
+		$(addprefix --exclude=,$(notdir $(basename $(shell find . -name *.in))))
+
+bla:
 
 %.src.rpm: %.tar.gz
 	rpm -ts $<
diff --git a/make/ytools.mk.in b/make/ytools.mk.in
index 76c81cbf..8ce5c559 100644
--- a/make/ytools.mk.in
+++ b/make/ytools.mk.in
@@ -48,4 +48,20 @@ else
 	include $(TOPDIR)/make/cfg_dist.mk
 endif
 
+ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
+	PROJECT_CFLAGS      += -Wall -g3
+	PROJECT_CPPFLAGS    += -Wall -g3
+	PROJECT_LDFLAGS     += -Wall -g3
+endif
+
+ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
+	PROJECT_CFLAGS      += -funroll-loops -O2
+	PROJECT_CPPFLAGS    += -funroll-loops -O2
+else
+	ifneq ($(USE_COMPILER_DEBUG_OPTS),true)
+		PROJECT_CFLAGS      += -DNDEBUG
+		PROJECT_CPPFLAGS    += -DNDEBUG
+	endif
+endif
+
 LDFLAGS += -lytools -ldl -pthread