diff --git a/make/defs.mk b/make/defs.mk
index a0e2189a..79000cb6 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -45,8 +45,6 @@ YTOOLS_VERSION_STR     = \"@PACKAGE_VERSION@\"
 #	TOPDIR        := $(MODDIR)
 #endif
 
-CPP                    = g++
-
 EXE_SH                += $(wildcard *.sh *.pl)
 MKFILES               += $(wildcard *.mk)
 
@@ -305,11 +303,8 @@ endif
 LDFLAGS               += -L$(LIBDIR) $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS)
 LDREST                += $(LDAUDIO) $(LDFFTW)  -ldl
 CC                     = $(YAMD)gcc
-#CPP                    = $(YAMD)g++
-#CPP                    = gfilt
-ifeq ($(USE_RPMLIBS),)
-	CPP            = sh $(MODDIR)/contrib/gfilt/gfilt
-else
+CPP                    = sh $(firstword $(wildcard $(MODDIR)/contrib/gfilt/gfilt $(MODDIR)/bin/gfilt))
+ifeq ($(strip $(CPP)),sh)
 	CPP            = g++
 endif
 RM                     = rm