diff --git a/hsm_utils/Makefile b/hsm_utils/Makefile
index ebae89e..ce5ba31 100644
--- a/hsm_utils/Makefile
+++ b/hsm_utils/Makefile
@@ -42,12 +42,12 @@ EXAMPLES_NFLOG= $(NFAST_EXAMPLES_PATH)/nflog
 EXAMPLES_CUTILS= $(NFAST_EXAMPLES_PATH)/cutils
 
 # openssl
-OPENSSL_DIR = ./GenerateFuseID/openssl-0.9.8k
+OPENSSL_DIR = ../openssl-0.9.8k
 
 
 # Where the source lives
 SRCPATH =	.
-REFPATH =	nfuser
+REFPATH =	$(NFAST_PATH)/c/ctd/examples/nfuser
 
 CC =		gcc
 CPPFLAGS=	   -I$(SRCPATH) \
@@ -83,10 +83,8 @@ XLDLIBS= $(LIBPATH_SWORLD)/librqcard.a \
 	$(LIBPATH_NFLOG)/libnflog.a \
 	$(LIBPATH_CUTILS)/libcutils.a -lm
 
-#COMMON_OBJECTS=	simplecmd.o simplebignum.o nfutil.o nfopt.o getdate.o report.o report-usage.o nftypes.o tokenise.o
 COMMON_OBJECTS =	$(REFPATH)/simplecmd.o $(REFPATH)/simplebignum.o $(REFPATH)/nfutil.o $(REFPATH)/nfopt.o $(REFPATH)/getdate.o $(REFPATH)/report.o $(REFPATH)/report-usage.o $(REFPATH)/nftypes.o $(REFPATH)/tokenise.o
 
-#COMMON_HEADERS= simplecmd.h simplebignum.h nfutil.h nfopt.h nftypes.h tokenise.h
 COMMON_HEADERS= $(REFPATH)/simplecmd.h $(REFPATH)/simplebignum.h $(REFPATH)/nfutil.h $(REFPATH)/nfopt.h $(REFPATH)/nftypes.h $(REFPATH)/tokenise.h
 
 # We supply an up-to-date getdate.c in the cutils component. Prevent it