diff --git a/etc/bashrc b/etc/bashrc
index f04f1f6f30..47cca254f3 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -44,7 +44,7 @@ export WM_PROJECT_VERSION=dev
 #
 [ "$BASH" -o "$ZSH_NAME" ] && \
 export FOAM_INST_DIR=$(cd $(dirname ${BASH_SOURCE:-$0})/../.. && pwd -P) || \
-export FOAM_INST_DIR=$HOME/$WM_PROJECT
+export FOAM_INST_DIR=$HOME/opt/enrico/vendor/openfoam/
 # export FOAM_INST_DIR=~$WM_PROJECT
 # export FOAM_INST_DIR=/opt/$WM_PROJECT
 # export FOAM_INST_DIR=/usr/local/$WM_PROJECT
diff --git a/wmake/rules/linux64Gcc/c b/wmake/rules/linux64Gcc/c
index 5ebc53574d..db2c8bf3dd 100644
--- a/wmake/rules/linux64Gcc/c
+++ b/wmake/rules/linux64Gcc/c
@@ -10,7 +10,7 @@ cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
 
 ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
 
-LINK_LIBS   = $(cDBUG)
+LINK_LIBS   = $(cDBUG) -Wl,-rpath=$(FOAM_LIBBIN),-rpath=$(FOAM_LIBBIN)/mpi-system
 
-LINKLIBSO   = $(cc) -fuse-ld=bfd -shared
+LINKLIBSO   = $(cc) -fuse-ld=bfd -shared -Wl,-rpath=$(FOAM_LIBBIN),-rpath=$(FOAM_LIBBIN)/mpi-system
 LINKEXE     = $(cc) -fuse-ld=bfd -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++
index ca33d452d2..f89531281e 100644
--- a/wmake/rules/linux64Gcc/c++
+++ b/wmake/rules/linux64Gcc/c++
@@ -19,7 +19,7 @@ cxxtoo      = $(Ctoo)
 cctoo       = $(Ctoo)
 cpptoo      = $(Ctoo)
 
-LINK_LIBS   = $(c++DBUG)
+LINK_LIBS   = $(c++DBUG) -Wl,-rpath=$(FOAM_LIBBIN),-rpath=$(FOAM_LIBBIN)/mpi-system
 
-LINKLIBSO   = $(CC) $(c++FLAGS) -fuse-ld=bfd -shared -Xlinker --add-needed -Xlinker --no-as-needed
+LINKLIBSO   = $(CC) $(c++FLAGS) -fuse-ld=bfd -shared -Xlinker --add-needed -Xlinker --no-as-needed -Wl,-rpath=$(FOAM_LIBBIN),-rpath=$(FOAM_LIBBIN)/mpi-system
 LINKEXE     = $(CC) $(c++FLAGS) -fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-needed