diff --git a/Makefile b/Makefile
index 33d0ac8f5670b2fc113bbca5020c483032550057..cb668cda1eb4914a9049068e7102f33590b37f3e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,17 @@
 
 PREFIX=
 ECLIPSEBIN=
+DLLSUFFIX=so
+COLIBRIARCH=x86_64_linux
 
 build:
-	rm -f Src/COLIBRI/lib/v7/x86_64_linux/* Src/COLIBRI/simplex_ocaml.pl
-	(cd Src/COLIBRI/simplex_ocaml; ECLIPSEBIN=$(ECLIPSEBIN) dune build simplex_ocaml_mod_v7.so simplex_ocaml.pl)
+	rm -f Src/COLIBRI/lib/v7/$(COLIBRIARCH)/* Src/COLIBRI/simplex_ocaml.pl
+	(cd Src/COLIBRI/simplex_ocaml; ECLIPSEBIN=$(ECLIPSEBIN) dune build --verbose simplex_ocaml_mod_v7.$(DLLSUFFIX) simplex_ocaml.pl)
 	(cd Src/COLIBRI/simplex_ocaml; cp _build/default/simplex_ocaml.pl ..)
-	mkdir -p Src/COLIBRI/lib/v7/x86_64_linux
-	(cd Src/COLIBRI/simplex_ocaml; cp _build/default/simplex_ocaml_mod_v7.so ../lib/v7/x86_64_linux/simplex_ocaml.so)
-	(cd Src/Floats; g++ -fPIC -O -D__LINUX__ -I $(ECLIPSEBIN)/include/x86_64_linux -shared EclipseInterfaceSimFloat2.2.cpp Floatcpp-3.0_SimFloat2.2.cpp -o ../COLIBRI/lib/v7/x86_64_linux/float_util.so)
-	(cd Src/COLIBRI; export ECLIPSEDIR=$(ECLIPSEBIN); export LD_LIBRARY_PATH="$(ECLIPSEBIN)/lib/x86_64_linux:$(LD_LIBRARY_PATH)"; $(ECLIPSEBIN)/lib/x86_64_linux/eclipse.exe -g 3000M -b col_solve_dumpeco.pl -e halt)
+	mkdir -p Src/COLIBRI/lib/v7/$(COLIBRIARCH)
+	(cd Src/COLIBRI/simplex_ocaml; cp _build/default/simplex_ocaml_mod_v7.$(DLLSUFFIX) ../lib/v7/$(COLIBRIARCH)/simplex_ocaml.$(DLLSUFFIX))
+	(cd Src/Floats; g++ -fPIC -O -D__LINUX__ -I $(ECLIPSEBIN)/include/$(COLIBRIARCH) EclipseInterfaceSimFloat2.2.cpp Floatcpp-3.0_SimFloat2.2.cpp -o ../COLIBRI/lib/v7/$(COLIBRIARCH)/float_util.$(DLLSUFFIX))
+	(cd Src/COLIBRI; export ECLIPSEDIR=$(ECLIPSEBIN); export LD_LIBRARY_PATH="$(ECLIPSEBIN)/lib/$(COLIBRIARCH):$(LD_LIBRARY_PATH)"; $(ECLIPSEBIN)/lib/$(COLIBRIARCH)/eclipse.exe -g 3000M -b col_solve_dumpeco.pl -e halt)
 
 
 install: