diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 0abf5ff7cdb..e40f79079f2 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -25,18 +25,23 @@ checksum="be97b8e900853c43dde8816f2ce49801fb672cffdf48ac7af9782abfb8a74af4
  c647e307d6cc62ba00bfd888e82da83844bf1e72f2c98bed2f1d95bac229b950
  baa642c906576d4d98d041d0acb80d85dd6eff6e3c16a009b1abf1ccd2bc0a61"
 
+skip_extraction="${_recast_commit}.tar.gz ${_bullet_tag}.tar.gz"
+
 if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
 	broken="https://gitlab.com/OpenMW/openmw/issues/564"
 fi
 
 post_extract() {
-	mv openmw-openmw-${version}/* .
-	mkdir -p build/fetched
+	mkdir -p build/fetched/recastnavigation \
+		build/fetched/bullet \
+		build/extern
 	ln -s -r build/fetched extern/fetched
+	ln -s -r build/fetched build/extern/fetched
 	ln -s -r build/fetched components/fetched
 	ln -s -r build/fetched fetched
-	mv -v bullet3-${_bullet_tag} build/fetched/bullet
-	mv -v recastnavigation-${_recast_commit} build/fetched/recastnavigation
+
+	vsrcextract -C build/fetched/recastnavigation "${_recast_commit}.tar.gz"
+	vsrcextract -C build/fetched/bullet "${_bullet_tag}.tar.gz"
 }
 
 openmw-cs_package() {