diff --git a/AusRegCliever/Makefile b/AusRegCliever/Makefile
index 4585e1c..42e0780 100644
--- a/AusRegCliever/Makefile
+++ b/AusRegCliever/Makefile
@@ -1,46 +1,34 @@
 LOCATION=authoring
 #
-# LOCATION just reflects accidents of different host
-# setups, it could be made consistent acroos different 
-# dev envs if any.
-#
-#
-# Boost, the AusReg client toolkit and the latter's dependencies
-# are initially all that's required.
+# Add other locations as needed.
 #
 CC=g++
 Cc=gcc
 
-
 #ifeq ($(LOCATION),authoring)
- BOSTLIB=-L/usr/local/lib/boost
- BOSINCL=-L/usr/local/include/boost
+ BOSTLIB=-L/usr/lib/boost
+ BOSINCL=-L/usr/include/boost
+ ARTKLIB=
+ ARTKINCL=
 #endif
 
-SLIBS= -L/usr/local/lib $(BOSTLIB) $(LOG4LIB) -l boost_system -l boost_thread
+SLIBS= -L/usr/lib $(BOSTLIB) $(LOG4LIB) -l boost_system -l boost_thread
 
 ARTKFLAGS=-shared -fPIC -Wl,-soname,libAusRegEPPTK.so 
 
 ifeq ($(LOCATION),authoring)
-SINCL= -I src/include -I /usr/local/include/log4cpp  $(BOSINCL)
+SINCL= -I include -I /usr/include/log4cpp  $(BOSINCL)
 CFLAGS= -DCURRENT_DEBUG=1000  
-CINCL= -I src/include -I /usr/local/include/log4cpp 
 endif
 
 CLIBS= -L$(USRLIB) 
 
-
 CLFLAGS= -Wall -Wundef -Wpointer-arith -Wshadow \
 	 -Wcast-align -Winline -Wmissing-declarations -Wredundant-decls \
 	 -Wmissing-prototypes -Wnested-externs \
 	 -Wstrict-prototypes -Waggregate-return -Wno-implicit 
 
 # --- targets
-# Because of the dependency on introspection of the 
-# current XMLRPC API, all doesn't include md_client.
-# 
-# If MD is running do make cleanclient;make client;make all
-# to do an actual complete rebuild of the entire unix system.
 #
 
 ifeq ($(LOCATION),authoring)
@@ -52,11 +40,11 @@ cliever: build/drde-cliever
 .c.o:
 	$(Cc) -c $(CLFLAGS) -o  $<
 
-build/cliever.o: server/cliever.cpp include/*.h
-	$(CC) $(CFLAGS) server/cliever.cpp -c -o build/cliever.o $(SINCL)
+build/cliever.o: server/cliever-md.cpp include/*.h
+	$(CC) $(CFLAGS) server/cliever-md.cpp -c -o build/cliever.o $(SINCL)
 
-bin/drde-cliever: build/drde-cliever.o  build/clieverLogger.o 
-	$(CC) $(CFLAGS) -o bin/md $(SINCL) $(LIBS) build/drde-cliever.o build/clieverLogger.o  $(SLIBS)
+build/drde-cliever: build/cliever.o  build/mdLogger.o 
+	$(CC) $(CFLAGS) -o build/cliever $(SINCL) $(LIBS) build/mdLogger.o  $(SLIBS)
 	
 doxygen/index.html: etc/doxygen.config
 	doxygen etc/doxygen.config