diff --git a/.SRCINFO b/.SRCINFO
index dcd1bf4..1f381e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,20 @@
 pkgbase = sensible-utils
 	pkgdesc = Utilities for sensible alternative selection
 	pkgver = 0.0.24
-	pkgrel = 1
+	pkgrel = 2
 	url = https://salsa.debian.org/debian/sensible-utils
 	arch = any
 	license = GPL-2.0-or-later
 	checkdepends = ed
+	checkdepends = shellcheck
 	makedepends = po4a
 	depends = bash
 	provides = sensible-browser=0.0.24
 	provides = sensible-editor=0.0.24
-	conflicts = sensible-browser
 	conflicts = sensible-browser-git
-	conflicts = sensible-editor
 	conflicts = sensible-editor-git
-	conflicts = sensible-pager
 	conflicts = sensible-pager-git
-	conflicts = sensible-terminal
 	conflicts = sensible-terminal-git
-	conflicts = sensible-utils-data
 	conflicts = sensible-utils-data-git
 	conflicts = sensible-utils-git
 	source = sensible-utils-0.0.24.tar.gz::https://salsa.debian.org/debian/sensible-utils/-/archive/debian/0.0.24/sensible-utils-debian-0.0.24.tar.gz
diff --git a/.nvchecker.toml b/.nvchecker.toml
new file mode 100644
index 0000000..f96c757
--- /dev/null
+++ b/.nvchecker.toml
@@ -0,0 +1,5 @@
+[sensible-utils]
+source = "git"
+git = "https://salsa.debian.org/debian/sensible-utils.git"
+prefix = "debian/"
+include_regex = 'debian/([0-9\.]+)'
diff --git a/PKGBUILD b/PKGBUILD
index eb2a636..a97526e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,33 +5,37 @@
 
 : ${_build_man_extra=false}
 
+export -n BROWSER EDITOR VISUAL PAGER TERMINAL_EMULATOR
+
 _pkgname="sensible-utils"
 pkgname="$_pkgname"
 pkgver=0.0.24
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities for sensible alternative selection"
 url="https://salsa.debian.org/debian/sensible-utils"
 license=('GPL-2.0-or-later')
 arch=('any')
 
-depends=('bash')
-makedepends=('po4a')
-checkdepends=('ed')
+depends=(
+  'bash'
+)
+makedepends=(
+  'po4a'
+)
+checkdepends=(
+  'ed'
+  'shellcheck'
+)
 
 provides=(
   "sensible-browser=$pkgver"
   "sensible-editor=$pkgver"
 )
 conflicts=(
-  'sensible-browser'
   'sensible-browser-git'
-  'sensible-editor'
   'sensible-editor-git'
-  'sensible-pager'
   'sensible-pager-git'
-  'sensible-terminal'
   'sensible-terminal-git'
-  'sensible-utils-data'
   'sensible-utils-data-git'
   'sensible-utils-git'
 )
@@ -41,28 +45,18 @@ _pkgext="tar.gz"
 source=("$_pkgname-$pkgver.$_pkgext"::"$url/-/archive/debian/$pkgver/$_pkgsrc.$_pkgext")
 sha256sums=('2acbc0029a4b02e8447ab0c07557e0c296c21cf338e044efe37a3bd16a18e418')
 
-_env_main() {
-  export -n BROWSER EDITOR VISUAL PAGER TERMINAL_EMULATOR
-}
-
 build() {
-  _env_main
-
   cd "$_pkgsrc"
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  _env_main
-
   cd "$_pkgsrc"
   make -k check || true
 }
 
 package() {
-  _env_main
-
   cd "$_pkgsrc"
   make DESTDIR="$pkgdir/" install