diff --git a/examples/fp/sqrttest/Makefile b/examples/fp/sqrttest/Makefile
index 52d22c438..bc07f2939 100644
--- a/examples/fp/sqrttest/Makefile
+++ b/examples/fp/sqrttest/Makefile
@@ -4,14 +4,9 @@ CC     = gcc
 CFLAGS = -O3
 LIBS   = -lm
 LFLAGS = -L.
-# Link against the riscv-isa-sim version of SoftFloat rather than 
-# the regular version to get RISC-V NaN behavior
-IFLAGS   = -I$(RISCV)/riscv-isa-sim/softfloat
-LIBS   = $(RISCV)/riscv-isa-sim/build/libsoftfloat.a
-#IFLAGS = -I../../../addins/berkeley-softfloat-3/source/include/
-#LIBS   = ../../../addins/berkeley-softfloat-3/build/Linux-x86_64-GCC/softfloat.a
+IFLAGS = -I$(WALLY)/addins/berkeley-softfloat-3/source/include/
+LIBS   = $(WALLY)/addins/berkeley-softfloat-3/build/Linux-x86_64-GCC/softfloat.a -lm -lquadmath
 SRCS   = $(wildcard *.c)
-
 PROGS = $(patsubst %.c,%,$(SRCS))
 
 all:	$(PROGS)