diff --git a/CHANGES b/CHANGES
index 8cc0e134..8bdc129f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -171,5 +171,9 @@ o devutil/jcs and make: now adding an EXTRAVERSION string to `uname -r`
 -------
 o merged changes of V_1_1_5-2 -> V_1_1_5-2F3
 o msgfmt: bugfix, fmt_user was not correctly recognized, breaking up_format.c
+o usrv: bugfix, "allclients" destination was ignored
 o benno added "#include <errno.h>" to contr/YQueue/YQueue.h
 
+1.1.8-2
+-------
+o merged changes of V_1_1_5-2F3 -> V_1_1_5-2F4
diff --git a/VERSION b/VERSION
index 993e186f..fbe97bdc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.8-0-dev
+1.1.8-2-dev
diff --git a/make/cfg_dev.mk b/make/cfg_dev.mk
index 8c643b3d..8c971dd9 100644
--- a/make/cfg_dev.mk
+++ b/make/cfg_dev.mk
@@ -54,6 +54,7 @@ COMPILE_DEBUG_CODE    = true
 #USE_MEMWATCH         = true
 #USE_EFENCE           = true
 #USE_MPATROL          = true
+#USE_VALGRIND          = true
 USE_COMPILER_DEBUG_OPTS = true
 #USE_TIMER             = true
 #LOG_THREAD_NAMES      = true
diff --git a/make/defs.mk b/make/defs.mk
index b7c7c925..9555613c 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -202,6 +202,12 @@ ifeq ($(USE_MPATROL),true)
 	PROJECT_LDFLAGS     += -lmpatrolmt -lbfd -liberty
 endif
 
+ifeq ($(USE_VALGRIND),true)
+	PROJECT_CFLAGS      += -include /usr/include/valgrind/memcheck.h
+	PROJECT_CPPFLAGS    += -include /usr/include/valgrind/memcheck.h
+	# PROJECT_LDFLAGS     += 
+endif
+
 ifeq ($(USE_TIMER),true)
 CFLAGS    += -D_USE_TIMER_
 CPPFLAGS  += -D_USE_TIMER_
diff --git a/make/ytools.mk.in b/make/ytools.mk.in
index 8ce5c559..a2c11582 100644
--- a/make/ytools.mk.in
+++ b/make/ytools.mk.in
@@ -61,6 +61,9 @@ else
 	ifneq ($(USE_COMPILER_DEBUG_OPTS),true)
 		PROJECT_CFLAGS      += -DNDEBUG
 		PROJECT_CPPFLAGS    += -DNDEBUG
+	else
+		PROJECT_CFLAGS      += -fno-inline
+		PROJECT_CPPFLAGS    += -fno-inline
 	endif
 endif