diff --git a/Makefile b/Makefile
index 3819fec6f..19095927a 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,10 @@ doc:
 .PHONY: run.local run.opt.local top
 
 run.local: byte
-	CAML_LD_LIBRARY_PATH=src/server src/server/${PROJECTNAME} -c local/etc/${PROJECTNAME}.conf
+	CAML_LD_LIBRARY_PATH=src/server:$(CAML_LD_LIBRARY_PATH) src/server/${PROJECTNAME} -c local/etc/${PROJECTNAME}.conf
 
 run.opt.local: opt
-	CAML_LD_LIBRARY_PATH=src/server src/server/${PROJECTNAME}.opt -c local/etc/${PROJECTNAME}.conf
+	CAML_LD_LIBRARY_PATH=src/server:$(CAML_LD_LIBRARY_PATH) src/server/${PROJECTNAME}.opt -c local/etc/${PROJECTNAME}.conf
 
 top:
 	cd src/server && ${MAKE} top
diff --git a/src/Makefile b/src/Makefile
index 4204fc7ec..261e35d53 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -64,7 +64,7 @@ confs: ../$(PROJECTNAME).conf.sample ../local/etc/${PROJECTNAME}.conf
 	  > $@
 
 ../local/etc/$(PROJECTNAME).conf: files/${PROJECTNAME}.conf.in ../Makefile.config Makefile
-	mkdir -p ../local/etc
+	mkdir -p ../local/etc ../local/var/log ../local/var/run
 	cat $< \
 	  | sed s%80\</port\>%8080\</port\>%g \
 	  | sed s%_LOGDIR_%$(SRC)/local/var/log%g \