diff --git a/fetch_cacao_dev.sh b/fetch_cacao_dev.sh
index 5c9d698e..6d680dec 100755
--- a/fetch_cacao_dev.sh
+++ b/fetch_cacao_dev.sh
@@ -5,6 +5,21 @@ if [ -d "plugins/cacao-src" ]; then
     echo "	Already installed -> pulling"
     (cd plugins/cacao-src; git pull)
 else
-    git clone -b dev https://github.com/cacao-org/cacao plugins/cacao-src
+    [ -d "$HOME/githubalt/cacao/.git" ] \
+    && repository="file://$HOME/githubalt/cacao" branchopt= \
+    || repository="https://github.com/cacao-org/cacao.git" branchopt="-b dev"
+    echo git clone $branchopt "$repository" plugins/cacao-src
+    git clone $branchopt "$repository" plugins/cacao-src
     echo ""
 fi
+
+PATCHFN=patch_cacao_lapacke_optional.txt
+( [ -r  "./$PATCHFN" ] \
+  && cd plugins/cacao-src/computeCalib/ \
+  && PATCHPATH="../../../$PATCHFN" \
+  && [ -r  "$PATCHPATH" ] \
+  && patch -s --reject-file=- -f -p 2 < "$PATCHPATH" \
+  && echo "Successfully patched CACAO computeCalib/CMakeList.txt" \
+  || echo "Failed to patch CACAO computeCalib/CMakeList.txt" \
+  || true
+)
diff --git a/patch_cacao_lapacke_optional.txt b/patch_cacao_lapacke_optional.txt
new file mode 100644
index 00000000..f3e6ffc7
--- /dev/null
+++ b/patch_cacao_lapacke_optional.txt
@@ -0,0 +1,16 @@
+diff --git a/computeCalib/CMakeLists.txt b/computeCalib/CMakeLists.txt
+index 15b1646b..6a07c81f 100644
+--- a/computeCalib/CMakeLists.txt
++++ b/computeCalib/CMakeLists.txt
+@@ -44,8 +44,10 @@ set(LINKLIBS
+ 	CLIcore
+ 	milkinfo
+ 	cacaoAOloopControl
+-	lapacke
+ )
++if(NOT MKL_FOUND)
++  list(APPEND LINKLIBS lapacke)
++endif()
+ 
+ 
+