---
 main/meson/APKBUILD | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/main/meson/APKBUILD b/main/meson/APKBUILD
index 58289d6482..630b7b07a6 100644
--- a/main/meson/APKBUILD
+++ b/main/meson/APKBUILD
@@ -2,28 +2,37 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=meson
 pkgver=0.51.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Fast and user friendly build system"
 url="https://mesonbuild.com"
 arch="noarch"
 license="Apache-2.0"
 depends="ninja py3-setuptools python3"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-vim"
 source="https://github.com/mesonbuild/meson/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	python3 setup.py check
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
+vim() {
+	pkgdesc="$pkgdesc (vim support)"
+	install_if="vim $pkgname=$pkgver-r$pkgrel"
+	for kind in ftdetect ftplugin indent syntax
+	do
+		mkdir -p "$subpkgdir"/usr/share/vim/vimfiles/$kind
+		install -Dm644 \
+			"$builddir"/data/syntax-highlighting/vim/$kind/meson.vim \
+			"$subpkgdir"/usr/share/vim/vimfiles/$kind/meson.vim
+	done
+}
+
 sha512sums="b0b220de2a20c355cbd2f63aff195374ad8b2dae64f0dc4efb7abf84d7a9e70b6d4239d3d94b2b8ba2de5dd6e871589848b057c842c8f256016c666e9aa882f1  meson-0.51.1.tar.gz"
-- 
2.22.0

> +subpackages="$pkgname-doc $pkgname-vim"

add ::noarch since the package has no ELF files

> -	cd "$builddir"

Please keep these on packages in main/