diff --git a/Makefile b/Makefile
index 1ce87edc2e7b510e8433d2341ac51e2edc1ba7aa..df87a1edfa9f2fe8a3605ce6c2d86373093e614e 100644
--- a/Makefile
+++ b/Makefile
@@ -190,7 +190,7 @@ configure: $(VARIANTNAMES:.variant=.variant_configure)
 		&& (( $(RM) -rf $$pkg/build/$$variant \
 		&& mkdir -p $$pkg/build/$$variant \
 		&& cd $$pkg/build/$$variant \
-		&& $(LOFARDIR)/autoconf_share/lofarconf --prefix=/opt/LOFAR/$$inst_var ) \
+		&& $(LOFARDIR)/autoconf_share/lofarconf --prefix=/data/LOFAR/installed/$$inst_var ) \
 			|| echo ":::::: ERROR" ) \
 		&& echo \
 		&& echo ":::::: FINISHED CONFIGURING VARIANT $$variant FOR PACKAGE $$pkg" \
@@ -333,7 +333,7 @@ configure: $(VARIANTNAMES:.variant=.variant_configure)
 
 # Rules for building documentation using doxygen or doc++.
 # Default output directory is docxxhtml.
-DOCDIR := /data/LOFAR/docxxhtml
+DOCDIR := /data/LOFAR/installed/docxxhtml
 DOXYGEN := /usr/bin/doxygen
 
 docxx: