diff --git a/BioArchLinux/mesquite/PKGBUILD b/BioArchLinux/mesquite/PKGBUILD
index 4195e58e6b..084e907f9f 100644
--- a/BioArchLinux/mesquite/PKGBUILD
+++ b/BioArchLinux/mesquite/PKGBUILD
@@ -1,22 +1,22 @@
-# Maintainer: syne <madlikene at aim dot com>
+# Maintainer: Guoyi Zhang <guoyi zhang at malacology dot net>
+# Contributor: syne <madlikene at aim dot com>
 # Contributor: Anton Bazhenov <anton.bazhenov at gmail>
 # Contributor: Mick Elliot <micke at sfu dot ca>
+
 pkgname=mesquite
-pkgver=3.6
-#_pkgver=3.6-Linux
-#buildver=build-917
-pkgrel=6
+pkgver=3.70_build_940
+pkgrel=0
 pkgdesc="A modular, extendible software for evolutionary biology, designed to help biologists organize and analyze comparative data about organisms"
 arch=('any')
 url="http://mesquiteproject.org"
-license=('(L)GPL')
-depends=('java-runtime')
-source=(https://github.com/MesquiteProject/MesquiteCore/releases/download/v$pkgver/Mesquite_Folder$pkgver-Linux.tgz
+license=('LGPL')
+depends=('java-runtime=8')
+source=($pkgname-${pkgver: 0: 4}::https://github.com/MesquiteProject/MesquiteCore/releases/download/v${pkgver//_/-}/Mesquite.${pkgver: 0: 4}-Linux.tgz
         $pkgname.png
         $pkgname.desktop
 	$pkgname.sh
         )
-md5sums=('671cf1b579a9fef2a8cf4771e1accd85'
+md5sums=('7243fc05bb877cf6997296d436903936'
          '8b62ba93f95aab14a8643bf5b939f465'
          '279160bcf1544a78e0b0372279bfa68d'
          'f6ff62edbf95e40d21c7bceadb35ecfe')
diff --git a/BioArchLinux/mesquite/lilac.py b/BioArchLinux/mesquite/lilac.py
deleted file mode 100644
index 8c66f58ed6..0000000000
--- a/BioArchLinux/mesquite/lilac.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python3
-
-from lilaclib import *
-
-def pre_build():
-  update_pkgver_and_pkgrel(_G.newver.lstrip('v'))
-
-def post_build():
-  git_add_files('PKGBUILD')
-  git_commit()
diff --git a/BioArchLinux/mesquite/lilac.yaml b/BioArchLinux/mesquite/lilac.yaml
index d0abf8815e..c965f57c84 100644
--- a/BioArchLinux/mesquite/lilac.yaml
+++ b/BioArchLinux/mesquite/lilac.yaml
@@ -2,8 +2,17 @@ build_prefix: extra-x86_64
 maintainers:
   - github: starsareintherose
     email: kuoi@bioarchlinux.org
+pre_build_script: |
+  update_pkgver_and_pkgrel(_G.newver.lstrip('v'))
+  run_cmd(['updpkgsums'])
+post_build_script: |
+  git_add_files('PKGBUILD')
+  git_commit()
+  update_aur_repo()
 update_on:
   - source: github
     github: MesquiteProject/MesquiteCore
     use_max_tag: true
-    include_regex: ^v[^-]+
+    prefix: 'v'
+    from_pattern: (\d+\.\d+-\w+-\d+)
+    to_pattern: \1\.\2_\3_\4