diff --git a/science/elmerfem/files/patch-CMakeLists.txt b/science/elmerfem/files/patch-CMakeLists.txt
index 0705ce62cb0c..84ff78a182c6 100644
--- a/science/elmerfem/files/patch-CMakeLists.txt
+++ b/science/elmerfem/files/patch-CMakeLists.txt
@@ -1,20 +1,20 @@
---- CMakeLists.txt.orig	2026-01-22 12:37:18 UTC
+--- CMakeLists.txt.orig	2026-04-29 13:04:57 UTC
 +++ CMakeLists.txt
-@@ -615,7 +615,7 @@ ADD_DEFINITIONS(-DUSE_ARPACK)
+@@ -655,7 +655,7 @@ ADD_DEFINITIONS(-DUSE_ARPACK)
  #FortranCInterface_VERIFY(CXX)
  
  # Set up rpaths to point ELMER_INSTALL_LIB_DIR
 -IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 +IF((${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD"))
    SET(ELMERSOLVER_RPATH_STRING "\$ORIGIN/../${ELMER_INSTALL_LIB_DIR}")
    SET(ELMERLIB_RPATH_STRING "\$ORIGIN/")
  ELSEIF(APPLE)
-@@ -689,7 +689,7 @@ ADD_SUBDIRECTORY(fem)
+@@ -729,7 +729,7 @@ ADD_SUBDIRECTORY(fem)
  ADD_SUBDIRECTORY(fhutiter)
  ADD_SUBDIRECTORY(meshgen2d)
  ADD_SUBDIRECTORY(fem)
 -ADD_SUBDIRECTORY(mathlibs)
 +#ADD_SUBDIRECTORY(mathlibs)
  ADD_SUBDIRECTORY(elmergrid)
  ADD_SUBDIRECTORY(license_texts)
  
diff --git a/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp b/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp
new file mode 100644
index 000000000000..e761e4c30f12
--- /dev/null
+++ b/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp
@@ -0,0 +1,13 @@
+--- ElmerGUI/Application/cad/cadview.cpp.orig	2026-04-29 13:04:57 UTC
++++ ElmerGUI/Application/cad/cadview.cpp
+@@ -687,7 +687,9 @@ TopoDS_Shape CadView::readStep(QString fileName) {
+ 
+ TopoDS_Shape CadView::readStep(QString fileName) {
+   TopoDS_Shape shape;
+-  Handle_TopTools_HSequenceOfShape shapes;
++  /* Patch from upstream 827b6124abc626c85daec970ca3920868709a230 */
++  /* Handle_TopTools_HSequenceOfShape shapes; */
++  Handle(TopTools_HSequenceOfShape) shapes;
+   STEPControl_Reader stepReader;
+   IFSelect_ReturnStatus status;
+