diff --git a/Makefile b/Makefile
index 8ff26c5a..25bf0c87 100644
--- a/Makefile
+++ b/Makefile
@@ -271,6 +271,11 @@ else ifeq ($(UNAME_S),Linux)
     MK_LDFLAGS  += -L/usr/local/lib -lzmq -lhighs
 endif
 
+ifneq ($(CONDA_PREFIX),)
+	MK_CPPFLAGS += -isystem $(CONDA_PREFIX)/include -isystem $(CONDA_PREFIX)/include/highs
+	MK_LDFLAGS  += -L$(CONDA_PREFIX)/lib
+endif
+
 ifdef LLAMA_NO_CCACHE
 GGML_NO_CCACHE := 1
 DEPRECATE_WARNING := 1