diff --git a/temp/ofono/APKBUILD b/temp/ofono/APKBUILD
index 7de563dd2..850cb78f2 100644
--- a/temp/ofono/APKBUILD
+++ b/temp/ofono/APKBUILD
@@ -3,16 +3,16 @@
 pkgname=ofono
 pkgver=9999
 _pkgver=1.31
-pkgrel=4
+pkgrel=5
 pkgdesc="Infrastructure for building mobile telephony (GSM/UMTS) applications [$_pkgver]"
 url="https://01.org/ofono"
 arch="all"
 license="GPL-2.0-only"
 depends="bluez mobile-broadband-provider-info"
-makedepends="glib-dev dbus-dev eudev-dev
+makedepends="glib-dev dbus-dev ell-dev eudev-dev
 	linux-headers bsd-compat-headers libexecinfo-dev
 	autoconf automake libtool"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-scripts::noarch"
 source="https://www.kernel.org/pub/linux/network/ofono/ofono-$_pkgver.tar.xz
 	fix-explicit-bzero.patch
 	fix-TEMP_FAILURE_RETRY.patch
@@ -29,15 +29,20 @@ source="https://www.kernel.org/pub/linux/network/ofono/ofono-$_pkgver.tar.xz
 	ofono-wheel.conf"
 builddir="$srcdir/$pkgname-$_pkgver"
 
-build() {
+prepare() {
+	default_prepare
 	autoreconf -fi
+}
 
+build() {
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--sbindir=/usr/sbin \
-		--enable-tools
+		--enable-external-ell \
+		--enable-tools \
+		--enable-test
 	make
 }
 
@@ -47,12 +52,19 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	install -Dm644 "$srcdir"/$pkgname-$_pkgver/plugins/ofono.rules "$pkgdir"/usr/lib/udev/rules.d/60-ofono.rules
+	install -Dm755 tools/auto-enable "$pkgdir"/usr/bin/ofono-auto-enable
+	install -Dm644 plugins/ofono.rules "$pkgdir"/usr/lib/udev/rules.d/60-ofono.rules
 	install -Dm644 "$srcdir"/udev.rules "$pkgdir"/usr/lib/udev/rules.d/60-ofono-pmos.rules
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -Dm755 "$srcdir"/$pkgname-auto-enable.initd "$pkgdir"/etc/init.d/$pkgname-auto-enable
 	install -Dm755 "$srcdir"/ofono-wheel.conf "$pkgdir"/etc/dbus-1/system.d/
-	install -Dm755 "$builddir"/tools/auto-enable "$pkgdir"/usr/bin/ofono-auto-enable
+}
+
+scripts() {
+	pkgdesc="$pkgdesc (test scripts)"
+	depends="python3 py3-dbus py3-gobject3"
+
+	amove usr/lib/ofono/test
 }
 
 sha512sums="377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20  ofono-1.31.tar.xz
@@ -65,7 +77,7 @@ ad25dcc34bf710287c9a03fdcd61f2f2fd675691f55be30dbe7c8421753aa857906dd23b2d4f7f75
 1a55f558c2e3058eee7dae2a60538417ae0fc058f322f4740a0f46a080cc2fda2c8a8cd522d243ab8f0be2ea461ad7dc1c27d2e73bcaac5848d9c592d6386d8a  0003-common-atmodem-move-at_util_call_compare_by_id-to-dr.patch
 3e0dce12bcb65d3c6db15cfd50058e793bf1f1ae6e330bf804565afde54614227746a8d4316ccd36093f22e2cc4f62e3a32e46276ab81a7b1f3a61f56984ed78  0004-add-call-list-helper-to-manage-voice-call-lists.patch
 72d0f63c091d4b1fc5b405ec67e73f377887ee3dffd4791272122462bf4feaeec207de9b177632756e1f973a7bf7bde119c6ec6556568a6307287ba43998b7a0  0005-qmimodem-implement-voice-calls.patch
-a625f71a2b6fdcd7ac43cca64d2a532f5e5a0192b022fcf9157fad51801dc3b71c5d317a62f3f233136a6ed2bbf92e6f1c2fad2c6aa762b9719ceca02de025d1  ofono.initd
+92a760109805434c12fd4e358fc66fecc4880ed9b7dfad47cbe0c37cc8295ebbe009d975646481e92fdfdf2672cc50c234bb8ad6ddedbebff6419860b6eed83d  ofono.initd
 54a2cb55547e77c22a98c4260f2e94d9327d5d98e1b604f9413a7380ae4489247a97561cc2ab39476bc6e6fb5e673dca8053218b18ac4626addb51ecb29f0167  ofono-auto-enable.initd
 8f2893dfc291fc210ef217c4bc74d79436a0997001dd2773809625d52dd19d092cc75d3f9aa5ed2f3d4a6248d4a4e17013a7655323f7dad951f744c55b572417  udev.rules
 72cd0cd4bee1f885a990c84f7ed3ef27e0d9d2db37d9a486342204152cb02a67d5197e8014dfea59f1a95285c674695b3dc3cb2b53941781bcfc9b73d5580b1f  ofono-wheel.conf"
diff --git a/temp/ofono/ofono.initd b/temp/ofono/ofono.initd
index 051f62784..35b44ff45 100644
--- a/temp/ofono/ofono.initd
+++ b/temp/ofono/ofono.initd
@@ -1,21 +1,15 @@
 #!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Purpose License v2
-# $Header: ./gentoo-x86-cvsroot/net-misc/ofono/files/ofono.initd,v 1.1 2009/08/24 13:20:40 dagger Exp $
+supervisor=supervise-daemon
+
+name="oFono"
+description="oFono mobile telephony daemon"
+
+# libsmdpkt_wrapper.so may not be present (on devices that don't need it)
+export LD_PRELOAD=/usr/lib/preload/libsmdpkt_wrapper.so
+
+command="/usr/sbin/ofonod"
+command_args_foreground="-n"
 
 depend() {
-   need dbus
-}
-
-start() {
-   ebegin "Starting oFono"
-   # libsmdpkt_wrapper.so may not exist, if this device doesn't need it
-   start-stop-daemon --start --quiet --exec /usr/bin/env LD_PRELOAD=/usr/lib/preload/libsmdpkt_wrapper.so /usr/sbin/ofonod
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping oFono"
-   start-stop-daemon --stop --quiet --exec /usr/sbin/ofonod
-   eend $?
+	need dbus
 }