diff --git a/.circleci/config.yml b/.circleci/config.yml
index 835a59234..fcb0307a8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,9 +1,9 @@
 version: 2.1
 
 jobs:
-  build:
+  build-linux:
     docker:
-      - image: cimg/base:2023.12
+      - image: cimg/base:2024.01
     resource_class: large
     environment:
       NUMBER_OF_CPUS: 4
@@ -11,5 +11,25 @@ jobs:
       - checkout
       - run: sudo apt-get update
       - run: sudo apt-get install g++ clang git make libgtk-3-dev libnotify-dev libbz2-dev libssl-dev xdotool
+      - run: ./configure
       - run: make -f Makefile -j ${NUMBER_OF_CPUS}
-      - run: make -f umkMakefile.in -j ${NUMBER_OF_CPUS}
+      - run: make -f umkMakefile -j ${NUMBER_OF_CPUS}
+  build-mac:
+    macos:
+      xcode: 15.1.0
+    environment:
+      NUMBER_OF_CPUS: 4
+    steps:
+      - checkout
+      - run: ./configure
+      - run: make -f umkMakefile -j ${NUMBER_OF_CPUS}
+      - run: ./umk ./uppsrc ide CLANG -brs ./theide
+
+workflows:
+  build-linux:
+    jobs:
+      - build-linux
+  
+  build-mac:
+    jobs:
+      - build-mac
diff --git a/configure_makefile b/configure_makefile
index 71fdf0767..c116ec510 100755
--- a/configure_makefile
+++ b/configure_makefile
@@ -59,6 +59,7 @@ fi
 
 if [[ "$uname" == 'Darwin' ]]; then
 	echo Configuring $1 for MacOS
+	sed -i.bak 's/-DflagPOSIX -DflagLINUX/-DflagPOSIX -DflagBSD -DflagOSX/' $1
 	sed -i.bak 's/-Wl,--gc-sections $(LINKOPTIONS)/$(LINKOPTIONS)/' $1
 	sed -i.bak 's/\`pkg-config --cflags .*\`/ /' $1
 	sed -i.bak 's/\`pkg-config --libs .*\`/ /' $1
@@ -67,6 +68,5 @@ if [[ "$uname" == 'Darwin' ]]; then
 	sed -i.bak 's/-Wl,-s/ /' $1
 	sed -i.bak 's/-Wl,--start-group/ /' $1
 	sed -i.bak 's/-Wl,--end-group/ /' $1
-	sed -i.bak 's/-DflagLINUX/-DflagBSD -DflagOSX/' umkMakefile
 	sed -i.bak 's/$(LIBPATH) -Wl,-O,2 $(LDFLAGS)/$(LIBPATH) $(LDFLAGS)/' $1
 fi
diff --git a/uppsrc/ide/Builders/Install.cpp b/uppsrc/ide/Builders/Install.cpp
index 986a35936..b543b0f16 100644
--- a/uppsrc/ide/Builders/Install.cpp
+++ b/uppsrc/ide/Builders/Install.cpp
@@ -160,8 +160,8 @@ void CreateBuildMethods()
 			bm.Replace(var, h);
 		};
 		
-		Path("$INCLUDE$", "/opt/local/include;/usr/include;/opt/homebrew/include;/opt/homebrew/opt/openssl/include");
-		Path("$LIB$", "/opt/local/lib;/usr/lib;/opt/homebrew/lib;/opt/homebrew/opt/openssl/lib");
+		Path("$INCLUDE$", "/opt/local/include;/usr/include;/usr/local/include;/opt/homebrew/include;/opt/homebrew/opt/openssl/include");
+		Path("$LIB$", "/opt/local/lib;/usr/lib;/usr/local/lib;/opt/homebrew/lib;/opt/homebrew/opt/openssl/lib");
 		
 		String common;
 	#ifdef CPU_ARM