diff --git a/community/corebird/APKBUILD b/community/corebird/APKBUILD
index 55cdc09e5d9..3c3b9ad49b7 100644
--- a/community/corebird/APKBUILD
+++ b/community/corebird/APKBUILD
@@ -7,34 +7,34 @@ pkgdesc="Corebird is a modern, easy and fun Twitter client"
 url="http://corebird.baedert.org/"
 arch="all"
 license="GPL3"
-depends=""
-depends_dev=""
 makedepends="gtk+3.0-dev rest-dev json-glib-dev sqlite-dev libsoup-dev libgee-dev
 		vala tiff automake autoconf libtool intltool glib-dev libxml2-utils file"
-install=""
-options="libtool"
+options="libtool !check"
 subpackages="$pkgname-lang $pkgname-doc"
 source="${pkgname}-${pkgver}.tar.gz::https://github.com/baedert/$pkgname/archive/$pkgver.tar.gz
-		disable-gst-check.diff"
+		disable-gst-check.patch"
 builddir=${srcdir}/${pkgname}-${pkgver}
 
+prepare() {
+	cd "$builddir"
+	NOCONFIGURE=yes ./autogen.sh
+	default_prepare
+}
+
 build() {
 	cd "$builddir"
-	NOCONFIGURE=yes ./autogen.sh
-	patch -p1 < "$srcdir"/disable-gst-check.diff
 	./configure \
 		--prefix=/usr \
 		--disable-video \
 		--disable-gst-check \
-		--disable-spellcheck \
-		|| return 1
-	make || return 1
+		--disable-spellcheck
+	make
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="eb0356c28bd4a3385c2194a4a05448741a579c521df481cff8c5f873e8769ccfe72a38a3fa709a43276b107a94c8c900e9163c517fcd7fe23cd738ff59de3eb0  corebird-1.5.tar.gz
-ce31141924a58b9081453b4c9490b22f2d039624a8f06d8f9418c5b8581cb8443a57db304d1112331dda547905cbe3df0c26f08f62ff78a2b210465fc3506e94  disable-gst-check.diff"
+ce31141924a58b9081453b4c9490b22f2d039624a8f06d8f9418c5b8581cb8443a57db304d1112331dda547905cbe3df0c26f08f62ff78a2b210465fc3506e94  disable-gst-check.patch"
diff --git a/community/corebird/disable-gst-check.diff b/community/corebird/disable-gst-check.patch
similarity index 100%
rename from community/corebird/disable-gst-check.diff
rename to community/corebird/disable-gst-check.patch