diff --git a/make/defs.mk b/make/defs.mk
index 066a83d6..b79ec6bf 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -163,7 +163,7 @@ GCC_MAJOR              = $(shell  gcc -v 2>&1 | grep version | awk '{ split($$3,
 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];}')
 
-LD_VERSION             = $(shell ld --version | sed '/GNU ld/ !d; s/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
+LD_VERSION             = $(shell ld --version | sed '/GNU ld/ !d; s/.*[^ ]\+\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
 LD_MAJOR               = $(shell echo $(LD_VERSION) | cut -d. -f1)
 LD_MINOR               = $(shell echo $(LD_VERSION) | cut -d. -f2)
 LD_REV                 = $(shell echo $(LD_VERSION) | cut -d. -f3)
@@ -1000,6 +1000,16 @@ USE_YTOOLS                  = true
 EXE_SEARCH_PATH           += $(VALDI_DIR)/bin
 endif
 
+ifeq ($(USE_FPTEST),true)
+FPTEST_DIR                  = $(firstword $(wildcard $(CVS_PROJ_DIR)/fptest /opt/$(FLAVOUR_PATH_PREFIX)fptest))
+FPTEST_VERSION              = $(call version,$(FPTEST_DIR))
+RPM_REQUIRES_RUN           += $(FLAVOUR_PREFIX)fptest-run = $(FPTEST_VERSION)
+RPM_REQUIRES_DEVEL         += $(FLAVOUR_PREFIX)fptest-devel = $(FPTEST_VERSION)
+USE_YTOOLS                  = true
+INCLUDE                    += -I$(FPTEST_DIR)/include
+LIBFLAGS                   += -L$(FPTEST_DIR)/lib -lfptest -L$(HOME)/opt/iowkit/lib -liowkit
+EXE_SEARCH_PATH            += $(FPTEST_DIR)/bin
+endif
 
 ifeq ($(USE_YTOOLS),true)
 ifneq ($(PROJECT),ytools)