diff --git a/BioArchLinux/bwa/PKGBUILD b/BioArchLinux/bwa/PKGBUILD
index 7f76b60144..ccf5ed7ff7 100644
--- a/BioArchLinux/bwa/PKGBUILD
+++ b/BioArchLinux/bwa/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: PumpkinCheshire <sollyonzou at gmail dot com>
 
 pkgname=bwa
-pkgver=v0.7.17.r27.g3ddd7b8
-pkgrel=6
+pkgver=0.7.17.r47.gb56db22
+pkgrel=1
 pkgdesc="Burrows-Wheeler Aligner maps low-divergent sequences against a large reference genome. https://doi.org/10.1093/bioinformatics/btp324"
 arch=('x86_64')
 url="http://bio-bwa.sourceforge.net/"
@@ -13,7 +13,7 @@ source=('git+https://github.com/lh3/bwa.git')
 sha256sums=('SKIP')
 
 pkgver() {
-    git -C ${pkgname} describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    git -C ${pkgname} describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
@@ -24,4 +24,6 @@ build() {
 package() {
     install -Dm755 -t "${pkgdir}/usr/bin" ${srcdir}/${pkgname}/bwa
     install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ${pkgname}/COPYING
+    cd $srcdir/${pkgname}
+    install -Dm644 *.h -t "${pkgdir}/usr/include/bwa"
 }
diff --git a/BioArchLinux/vcflib/PKGBUILD b/BioArchLinux/vcflib/PKGBUILD
index d0fb83e76a..a6fdd1bf87 100644
--- a/BioArchLinux/vcflib/PKGBUILD
+++ b/BioArchLinux/vcflib/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Guoyi
 pkgname=vcflib
 pkgver=1.0.3
-pkgrel=4
+pkgrel=5
 pkgdesc="C++ library and cmdline tools for parsing and manipulating VCF files doi: 10.1101/2021.05.21.445151"
 arch=('x86_64')
 url="https://github.com/vcflib/vcflib"
@@ -64,4 +64,14 @@ package() {
   mv ${pkgdir}/usr/lib/pyvcf*  ${pkgdir}/usr/lib/pyvcflib.so
   mkdir ${pkgdir}/usr/share
   mv ${pkgdir}/usr/man ${pkgdir}/usr/share
+  # sed -i 's|bindings/cpp/WFAligner.hpp|WFA2/bindings/cpp/WFAligner.hpp|g' ${pkgdir}/usr/include/Variant.h
+  # install -d ${pkgdir}/usr/include/vcflib
+  # mv ${pkgdir}/usr/include/{*.h,*.hpp} ${pkgdir}/usr/include/vcflib
+
+  # another packages called wfa2lib
+  install -Dm644 $srcdir/${pkgname}/contrib/WFA2-lib/bindings/cpp/*.hpp -t ${pkgdir}/usr/include/bindings/cpp
+  install -Dm644 $srcdir/${pkgname}/contrib/WFA2-lib/wavefront/*.h  -t ${pkgdir}/usr/include/wavefront
+  install -Dm644 $srcdir/${pkgname}/contrib/WFA2-lib/utils/*.h  -t ${pkgdir}/usr/include/utils
+  install -Dm644 $srcdir/${pkgname}/contrib/WFA2-lib/system/*.h  -t ${pkgdir}/usr/include/system
+  install -Dm644 $srcdir/${pkgname}/contrib/WFA2-lib/alignment/*.h  -t ${pkgdir}/usr/include/alignment
 }
diff --git a/prepare/freebayes/PKGBUILD b/prepare/freebayes/PKGBUILD
index d8a6571fb8..c380e9b9be 100644
--- a/prepare/freebayes/PKGBUILD
+++ b/prepare/freebayes/PKGBUILD
@@ -21,11 +21,15 @@ prepare() {
   sed -i "s|dependency('libvcflib'|cc.find_library('libvcflib'|g" meson.build
   sed -i "s|dependency('libseqlib'|cc.find_library('libseqlib'|g" meson.build
   # sed -i "167c include_directories : [ seqlib_inc]," meson.build
+
+  # fix limits
+  sed -i "/#include <limits>/d" intervaltree/IntervalTree.h
+  sed -i "8i #include <limits>" intervaltree/IntervalTree.h
 }
 build() {
   cd "$pkgname"
   test -d build || mkdir build
-  meson --prefix=/usr --buildtype=release  build -Dprefer_system_deps=true
+  meson --prefix=/usr --buildtype=release --includedir=/usr/include/vcflib	  build -Dprefer_system_deps=true
   cd build
   ninja -v
 }
diff --git a/prepare/seqlib/PKGBUILD b/prepare/seqlib/PKGBUILD
index 1ccc69b10d..4eabfe4c56 100644
--- a/prepare/seqlib/PKGBUILD
+++ b/prepare/seqlib/PKGBUILD
@@ -37,7 +37,8 @@ package() {
     gcc  -shared *.o -o lib${mylib}.so
     rm -rf *.o
   done
-
+  cd $srcdir/${pkgname}
+  sed -i 's|htslib/htslib/|htslib/|g' SeqLib/*.h
   mkdir -p ${pkgdir}/usr/include/
   cp -rf SeqLib ${pkgdir}/usr/include/
 }