diff --git a/make/defs-orig.mk b/make/defs-orig.mk
index 79b1653b..ee10f869 100644
--- a/make/defs-orig.mk
+++ b/make/defs-orig.mk
@@ -24,6 +24,11 @@ DIST_WINVERSION        = $(shell echo $(WINVERSION) | sed -e "s/-dev//")
 LOCAL_DIST_VERSION     = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//")
 LOCAL_DIST_WINVERSION  = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
 
+GCC_VERSION = $(shell  gcc -v 2>&1 | grep version | awk '{ print $$3;}')
+GCC_MAJOR   = $(shell  gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[1];}')
+GCC_MINOR   = $(shell  gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[2];}')
+GCC_REV     = $(shell  gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[3];}')
+
 #ifndef $(TOPDIR)
 #	TOPDIR := $(MODDIR)
 #endif
@@ -83,7 +88,14 @@ CFLAGS    = $(INCLUDE) $(PROJECT_CFLAGS)   $(CFLAGS_DEBUG)   $(LOCAL_CFLAGS)   $
 CPPFLAGS  = $(INCLUDE) $(PROJECT_CPPFLAGS) $(CPPFLAGS_DEBUG) $(LOCAL_CPPFLAGS) $(YLIB_CPPFLAGS)
 LDFFTW    = -lrfftw -lfftw -lm
 #LDAUDIO   = -laudiofile
-LDFLAGS   = -L$(LIBDIR) -l$(LIBNAME) -lg++ -lstdc++ $(PROJECT_LDFLAGS) $(LOCAL_LDFLAGS) 
+
+ifeq ($(GCC_MAJOR),2)
+LPPFLAGS  = -lg++ -lstdc++
+else
+LPPFLAGS  = -lg++-3 -lstdc++ -L/usr/local/lib
+endif
+
+LDFLAGS   = -L$(LIBDIR) -l$(LIBNAME) $(LPPFLAGS) $(PROJECT_LDFLAGS) $(LOCAL_LDFLAGS) 
 LDREST    = -ldl $(LDAUDIO) $(LDFFTW) 
 CC        = $(YAMD)gcc
 CPP       = $(YAMD)g++
@@ -91,11 +103,6 @@ RM        = rm
 AR        = ar
 INSTALL   = install
 
-GCC_VERSION = $(shell  gcc -v 2>&1 | grep version | awk '{ print $3;}')
-GCC_MAJOR   = $(shell  gcc -v 2>&1 | grep version | awk '{ split($3,a,"."); print a[1];}')
-GCC_MINOR   = $(shell  gcc -v 2>&1 | grep version | awk '{ split($3,a,"."); print a[2];}')
-GCC_REV     = $(shell  gcc -v 2>&1 | grep version | awk '{ split($3,a,"."); print a[3];}')
-
 define make_subdirs
 	set -e; for D in $(SUBDIRS) ; do make -C $$D ; done
 endef