diff --git a/ACTK1_0/Makefile b/ACTK1_0/Makefile
index 1e55609..38e9468 100644
--- a/ACTK1_0/Makefile
+++ b/ACTK1_0/Makefile
@@ -17,8 +17,7 @@ CXXFLAGS += -D_GNU_SOURCE -O0
 
 ifeq ($(LOCATION),authoring)
 XALAN_LIB_DIR = /usr/lib/x86_64-linux-gnu/
-endif
-ifeq ($(LOCATION),production)
+else
 XALAN_LIB_DIR = /usr/lib/
 endif
 XALAN_LIB = xalan-c
@@ -85,7 +84,7 @@ $(BUILD_OBJ_DIR)/%.o: %.c
 
 
 LDFLAGS_TESTS = -L$(BUILD_LIB_DIR) -lACTK1_0 \
-				-L$(XALAN_LIB_DIR) -lxalan-c -lxalanMsg -licuuc -licudata \
+				-L$(XALAN_LIB_DIR) -lxalan-c -lxalanMsg  \
 				-L$(XERCES_LIB_DIR) -lxerces-c \
 				-lssl \
 				-lrt
diff --git a/AusRegCliever/Makefile b/AusRegCliever/Makefile
index 54deb81..0cc90cd 100644
--- a/AusRegCliever/Makefile
+++ b/AusRegCliever/Makefile
@@ -11,14 +11,14 @@ Cc=gcc
  LOG4LIB=-L/usr/lib
  
 ifeq ($(LOCATION),authoring)
- ARTKLIB=-L/home/jdaugherty/clients/reg.de/git/AusRegEPPTK/lib
- ARTKINCL=-I/home/jdaugherty/clients/reg.de/git/AusRegEPPTK/common
+ ARTKLIB=-L/home/jdaugherty/clients/reg.de/git/ACTK1_0/lib
+ ARTKINCL=-I/home/jdaugherty/clients/reg.de/git/ACTK1_0/common
 else 
- ARTKLIB=-L/home/jdaugherty/dnseppus/AusRegEPPTK/lib
- ARTKINCL=-I/home/jdaugherty/dnseppus/AusRegEPPTK/common
+ ARTKLIB=-L/home/jdaugherty/dnseppus/ACTK1_0/lib
+ ARTKINCL=-I/home/jdaugherty/dnseppus/ACTK1_0/common
 endif
 
-SLIBS= -L/usr/lib $(BOSTLIB) $(LOG4LIB) $(ARTKLIB) -l boost_system -l boost_thread -l log4cpp -l AusRegEPPTK 
+SLIBS= -L/usr/lib $(BOSTLIB) $(LOG4LIB) $(ARTKLIB) -l boost_system -l boost_thread -l log4cpp -l ACTK1_0 
 
 SINCL= -I include -I /usr/include/log4cpp  $(BOSINCL)
 CFLAGS= -DCURRENT_DEBUG=1000 -ggdb3
@@ -46,7 +46,7 @@ ACOBJS= build/cliever.o build/mdLogger.o build/masterDaemonConfig.o  build/maste
 	build/mdHost.o 	build/mdState.o  build/mdAusReg.o
 	
 	
-ARTKDEPS = -L$(ARTK_LIB_DIR) -lAusRegEPPTK \
+ARTKDEPS = -L$(ARTK_LIB_DIR) -lACTK1_0 \
 				-L$(XALAN_LIB_DIR) -lxalan-c -lxalanMsg\
 				-L$(XERCES_LIB_DIR) -lxerces-c \
 				-lssl \