diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL
index bbabc6ad89f306..0dac115073e94a 100644
--- a/ports/clapack/CONTROL
+++ b/ports/clapack/CONTROL
@@ -1,6 +1,6 @@
 Source: clapack
 Version: 3.2.1
-Port-Version: 14
+Port-Version: 15
 Homepage: https://www.netlib.org/clapack
 Description: CLAPACK (f2c'ed version of LAPACK)
 Build-Depends: openblas (!osx)
diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake
index 8fdbe7c42efc24..034c0991bd9f70 100644
--- a/ports/clapack/portfile.cmake
+++ b/ports/clapack/portfile.cmake
@@ -1,3 +1,7 @@
+if(EXISTS "${CURRENT_INSTALLED_DIR}/share/lapack-reference/copyright")
+    message(FATAL_ERROR "Can't build ${PORT} if lapack-reference is installed. Please remove lapack-reference:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
+endif()
+
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_download_distfile(ARCHIVE
diff --git a/ports/lapack-reference/CONTROL b/ports/lapack-reference/CONTROL
index 0ac1c8d0e894ee..5bb5ca6f5757da 100644
--- a/ports/lapack-reference/CONTROL
+++ b/ports/lapack-reference/CONTROL
@@ -1,6 +1,6 @@
 Source: lapack-reference
 Version: 3.8.0
-Port-Version: 1
+Port-Version: 2
 Description: LAPACK — Linear Algebra PACKage http://www.netlib.org/lapack/
 Default-Features: blas-select
 Build-Depends: vcpkg-gfortran (windows)
diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake
index 6a3ad69828bf07..39159abf737fb0 100644
--- a/ports/lapack-reference/portfile.cmake
+++ b/ports/lapack-reference/portfile.cmake
@@ -4,6 +4,10 @@
 # USE_OPTIMIZED_LAPACK (Probably not what we want. Does a find_package(LAPACK): probably for LAPACKE only builds _> own port?)
 # LAPACKE Builds LAPACKE
 # LAPACKE_WITH_TMG Build LAPACKE with tmglib routines
+if(EXISTS "${CURRENT_INSTALLED_DIR}/share/clapack/copyright")
+    message(FATAL_ERROR "Can't build ${PORT} if clapack is installed. Please remove clapack:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
+endif()
+
 include(vcpkg_find_fortran)
 SET(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
 
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index b8a17988f2569a..c2fa7b6642fdf0 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -212,12 +212,14 @@ civetweb:arm64-windows      = skip
 civetweb:arm-uwp            = skip
 civetweb:x64-uwp            = skip
 # clapack is replaced by lapack-reference.
-clapack:x64-linux = skip
-clapack:x64-osx = skip
-clapack:x64-windows = skip
-clapack:x64-windows-static = skip
-clapack:x86-windows = skip
-clapack:x64-uwp=fail
+clapack:arm64-windows=skip
+clapack:arm-uwp=skip
+clapack:x64-linux=skip
+clapack:x64-osx=skip
+clapack:x64-uwp=skip
+clapack:x64-windows-static=skip
+clapack:x64-windows=skip
+clapack:x86-windows=skip
 clblas:arm64-windows=fail
 clblast:x64-linux=fail
 clblast:x64-windows-static=fail