diff --git a/.SRCINFO b/.SRCINFO
index 524830c..607a8cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sensible-utils
 	pkgdesc = Utilities for sensible alternative selection
 	pkgver = 0.0.20
-	pkgrel = 2
+	pkgrel = 3
 	url = http://packages.debian.org/source/sid/sensible-utils
 	arch = any
 	license = GPL
@@ -19,12 +19,24 @@ pkgbase = sensible-utils
 	b2sums = SKIP
 
 pkgname = sensible-browser
+	depends = bash
+	depends = coreutils
+	depends = sensible-utils-data
 
 pkgname = sensible-editor
+	depends = bash
+	depends = coreutils
+	depends = sensible-utils-data
 
 pkgname = sensible-pager
+	depends = bash
+	depends = coreutils
+	depends = sensible-utils-data
 
 pkgname = sensible-terminal
+	depends = bash
+	depends = coreutils
+	depends = sensible-utils-data
 
 pkgname = sensible-utils
 	pkgdesc = Utilities for sensible alternative selection (metapackage)
@@ -37,3 +49,4 @@ pkgname = sensible-utils
 	depends = sensible-utils-data
 
 pkgname = sensible-utils-data
+	depends = bash
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..322cb7c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/*
+!/.gitignore
+!/.SRCINFO
+!/PKGBUILD
+!/sensible-utils*.asc
diff --git a/0001-no-fork-bomb-test.patch b/0001-no-fork-bomb-test.patch
deleted file mode 100644
index 84ba4fc..0000000
--- a/0001-no-fork-bomb-test.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-6c6
-< TESTS = test/ed-as-sensible-editor test/echo-as-browser  test/ed-as-visual test/ed-as-fallback test/error-out test/fork-bomb test/shell-script test/failure-propagation test/echo-as-pager
----
-> TESTS = test/ed-as-sensible-editor test/echo-as-browser  test/ed-as-visual test/ed-as-fallback test/error-out test/shell-script test/failure-propagation test/echo-as-pager
diff --git a/0001-no-fork-bomb-test.patch.sig b/0001-no-fork-bomb-test.patch.sig
deleted file mode 100644
index c4f9e1e..0000000
Binary files a/0001-no-fork-bomb-test.patch.sig and /dev/null differ
diff --git a/PKGBUILD b/PKGBUILD
index dfb7f2a..f3f2b76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Maintainer: Fredrick R. Brennan <copypaste@kittens.ph>
+# Contributor: éclairevoyant
 # Contributor: Brian BIdulock <bidulock@openss7.org>
 
 pkgbase=sensible-utils
@@ -8,7 +9,7 @@ declare -g -a pkgname=($_pkgname)
 pkgname+=(sensible-utils sensible-utils-data)
 pkgver=0.0.20
 _debianextra=''
-pkgrel=2
+pkgrel=3
 pkgdesc="Utilities for sensible alternative selection"
 arch=('any')
 url="http://packages.debian.org/source/sid/sensible-utils"
@@ -50,8 +51,6 @@ check() {
 _package_sensible() {
   cd ${pkgbase}-${pkgver}${_debianextra}
   pkgdesc="$pkgdesc (${pkgname##*-})"
-  depends+=(sensible-utils-data)
-  [ "$pkgname" == sensible-utils-data ] && depends=(bash)
   export -n EDITOR VISUAL
   make DESTDIR="$pkgdir/" install
   shopt -s globstar
@@ -60,22 +59,27 @@ _package_sensible() {
 }
 
 package_sensible-pager() {
+  depends+=(sensible-utils-data)
   CURRENTLY_PACKAGING=sensible-pager pkgdir="$pkgdir" _package_sensible
 }
 
 package_sensible-browser() {
+  depends+=(sensible-utils-data)
   CURRENTLY_PACKAGING=sensible-browser pkgdir="$pkgdir" _package_sensible
 }
 
 package_sensible-editor() {
+  depends+=(sensible-utils-data)
   CURRENTLY_PACKAGING=editor pkgdir="$pkgdir" _package_sensible
 }
 
 package_sensible-terminal() {
+  depends+=(sensible-utils-data)
   CURRENTLY_PACKAGING=terminal pkgdir="$pkgdir" _package_sensible
 }
 
 package_sensible-utils-data() {
+  depends=(bash)
   CURRENTLY_PACKAGING=gettext pkgdir="$pkgdir" _package_sensible
 }