diff --git a/community/freecad/PKGBUILD b/community/freecad/PKGBUILD
index 55e4ee3ad..f0490b8ff 100644
--- a/community/freecad/PKGBUILD
+++ b/community/freecad/PKGBUILD
@@ -17,7 +17,7 @@ highmem=1
 
 pkgname=freecad
 pkgver=0.19.4
-pkgrel=2
+pkgrel=3
 pkgdesc='General purpose 3D CAD modeler'
 arch=(x86_64)
 url='https://freecadweb.org/'
@@ -33,17 +33,22 @@ makedepends=(adios2 boost cmake cgns coin eigen fmt gcc-fortran gendesk git
 source=(freecad.xml
         freecad-boost.patch
         freecad-vtk9.patch
-        "git+https://github.com/FreeCAD/FreeCAD#commit=476ecf091941bead59b14e44afa6064d5a66afa3") # tag: 0.19.4
+        "git+https://github.com/$pkgname/$pkgname#commit=476ecf091941bead59b14e44afa6064d5a66afa3") # tag: 0.19.4
 b2sums=('f5f295b9b5f268126feffbe3f3344c124faf5e2263f3f071348bd7f5d0bf2e30eb33fcf174d0ab76ad80ca7bd8ddea95ccbaf7f33f0896189ac78603fecb9485'
         '6ec5dcead7f3438b387aeb3f608b910105d493aafcd47ae84715cdfe6f8651926056283ec4aeeab542b89df9fd9ffc2dbb74f5593e864acd23c8b352033ed1dc'
         '242702f926101c57774046548068d17b22bd582ba1a1c45534ac8ceaa174c56277db80f32bed8ad1475b37006a1d777193b6c098ed8a733772152a898d1dd825'
         'SKIP')
 
 prepare() {
+  (
+    cd $pkgname
+    # fix missing include for std::unique_ptr
+    git cherry-pick -n 4fea37b3bc5a3a9fce789dac6d2444f240bd3313
+  )
   # Fix Boost linking with VTK 9 (thanks Fedora)
-  patch -d FreeCAD -p1 -i ../freecad-boost.patch
+  patch -d $pkgname -p1 -i ../freecad-boost.patch
   # Fix build with VTK 9 (thanks Fedora)
-  patch -d FreeCAD -p1 -i ../freecad-vtk9.patch
+  patch -d $pkgname -p1 -i ../freecad-vtk9.patch
   # Generate desktop shortcut
   gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name FreeCAD \
     --mimetypes='application/x-extension-fcstd' --startupnotify=true
@@ -68,7 +73,7 @@ build() {
     -D FREECAD_USE_QT_FILEDIALOG=ON \
     -D PYTHON_EXECUTABLE=/usr/bin/python \
     -G Ninja \
-    -S FreeCAD
+    -S $pkgname
   ninja -C build
 }
 
@@ -76,24 +81,21 @@ package() {
   DESTDIR="$pkgdir" ninja -C build install
 
   # Desktop shortcut
-  install -Dm644 freecad.desktop \
-    "$pkgdir/usr/share/applications/freecad.desktop"
+  install -Dm644 $pkgname.desktop -t "$pkgdir/usr/share/applications/"
 
   # MIME info
-  install -Dm644 freecad.xml "$pkgdir/usr/share/mime/packages/freecad.xml"
+  install -Dm644 $pkgname.xml -t "$pkgdir/usr/share/mime/packages/"
 
   # Thumbnailer
-  install -Dm755 FreeCAD/src/Tools/freecad-thumbnailer \
-    "$pkgdir/usr/bin/freecad-thumbnailer"
+  install -Dm755 $pkgname/src/Tools/$pkgname-thumbnailer -t "$pkgdir/usr/bin/"
   install -Dm644 \
     "$pkgdir/usr/lib/freecad/share/thumbnailers/FreeCAD.thumbnailer" \
     "$pkgdir/usr/share/thumbnailers/FreeCAD.thumbnailer"
   rm -f "$pkgdir/usr/lib/freecad/share/thumbnailers/FreeCAD.thumbnailer"
 
   # Icons
-  cd FreeCAD/src/Gui/Icons
-  install -Dm644 freecad.svg \
-    "$pkgdir/usr/share/icons/hicolor/scalable/apps/freecad.svg"
+  cd $pkgname/src/Gui/Icons
+  install -Dm644 $pkgname.svg -t "$pkgdir/usr/share/icons/hicolor/scalable/apps/"
   for i in 16 32 48 64; do
     install -Dm644 "freecad-icon-$i.png" \
       "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/freecad.png"