diff --git a/extra/freecad/.SRCINFO b/extra/freecad/.SRCINFO
index 44c509ee9..e45d51f57 100644
--- a/extra/freecad/.SRCINFO
+++ b/extra/freecad/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freecad
 	pkgdesc = Feature based parametric 3D CAD modeler
-	pkgver = 0.21.1
-	pkgrel = 6
+	pkgver = 0.21.2
+	pkgrel = 2
 	url = https://freecadweb.org/
 	arch = x86_64
 	license = LGPL
@@ -54,9 +54,9 @@ pkgbase = freecad
 	depends = verdict
 	optdepends = graphviz: dependency graph support
 	optdepends = openscad: OpenSCAD support
-	source = git+https://github.com/freecad/freecad#commit=f6708547a9bb3f71a4aaade12109f511a72c207c
+	source = git+https://github.com/freecad/freecad#tag=0.21.2
 	source = freecad-vtk9.3.patch
 	b2sums = SKIP
-	b2sums = 709e6321a45b050187a6c5447b4381a5e9958687a1a5f25d0418f63e85f52e040fdf37fb1aa1d2886e06edb1b5b4cce847cf4865d4e6396fdfb4839557657f53
+	b2sums = f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5
 
 pkgname = freecad
diff --git a/extra/freecad/PKGBUILD b/extra/freecad/PKGBUILD
index ca446ec47..986613b76 100644
--- a/extra/freecad/PKGBUILD
+++ b/extra/freecad/PKGBUILD
@@ -17,8 +17,8 @@ buildarch=8
 highmem=1
 
 pkgname=freecad
-pkgver=0.21.1
-pkgrel=6
+pkgver=0.21.2
+pkgrel=2
 pkgdesc='Feature based parametric 3D CAD modeler'
 arch=(x86_64)
 url='https://freecadweb.org/'
@@ -33,10 +33,10 @@ makedepends=(boost cgns cmake eigen git libharu liblas ninja openvdb openvr
              qt5-webengine shiboken2 swig utf8cpp nlohmann-json)
 optdepends=('graphviz: dependency graph support'
             'openscad: OpenSCAD support')
-source=("git+https://github.com/$pkgname/$pkgname#commit=f6708547a9bb3f71a4aaade12109f511a72c207c"
+source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver"
         freecad-vtk9.3.patch) # tag: 0.21.1
 b2sums=('SKIP'
-        '709e6321a45b050187a6c5447b4381a5e9958687a1a5f25d0418f63e85f52e040fdf37fb1aa1d2886e06edb1b5b4cce847cf4865d4e6396fdfb4839557657f53')
+        'f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5')
 
 prepare() {
   patch -d freecad -Np1 -i "$srcdir"/freecad-vtk9.3.patch
diff --git a/extra/freecad/freecad-vtk9.3.patch b/extra/freecad/freecad-vtk9.3.patch
index 948299466..9270285d6 100644
--- a/extra/freecad/freecad-vtk9.3.patch
+++ b/extra/freecad/freecad-vtk9.3.patch
@@ -1,12 +1,13 @@
 diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
-index 7e3de0070a..2f81a799de 100644
+index 7e3de0070a..dc5249158d 100644
 --- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
 +++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
-@@ -1026,7 +1026,7 @@ void SMDS_UnstructuredGrid::BuildLinks()
+@@ -1026,7 +1026,8 @@ void SMDS_UnstructuredGrid::BuildLinks()
    GetLinks()->Allocate(this->GetNumberOfPoints());
    GetLinks()->Register(this);
  //FIXME: vtk9
 -  GetLinks()->BuildLinks(this);
++  GetLinks()->SetDataSet(this);
 +  GetLinks()->BuildLinks();
    GetLinks()->Delete();
  #else