diff --git a/main/gnokii/APKBUILD b/main/gnokii/APKBUILD
index 9c6e513baac..b2b7e761410 100644
--- a/main/gnokii/APKBUILD
+++ b/main/gnokii/APKBUILD
@@ -2,28 +2,28 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnokii
 pkgver=0.6.31
-pkgrel=11
+pkgrel=12
 pkgdesc="Tools and user space driver for use with mobile phones"
 url="https://www.gnokii.org/"
 arch="all"
 license="GPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs xgnokii $pkgname-smsd
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-smsd
 	$pkgname-smsd-pgsql:pgsql $pkgname-smsd-mysql:mysql
 	$pkgname-smsd-sqlite:sqlite $pkgname-lang"
 
-makedepends="gtk+-dev mariadb-connector-c-dev intltool libusb-compat-dev libxpm-dev
+makedepends="mariadb-connector-c-dev intltool libusb-compat-dev libxpm-dev
 	bluez-dev libical-dev postgresql-dev sqlite-dev
 	autoconf automake libtool gettext-dev"
 source="http://www.gnokii.org/download/gnokii/gnokii-$pkgver.tar.bz2
 	gnokii.patch
-	xgnokii.patch
 	gnokii-0.6.31-gcc5.patch
 	"
 
+replaces="xgnokii"
+
 prepare() {
 	default_prepare
 	update_config_sub
-	sed -i 's|cellphone|phone|' xgnokii/xgnokii.desktop.in
 }
 
 build() {
@@ -36,7 +36,7 @@ build() {
 		--enable-security \
 		--disable-unix98test \
 		--disable-phonet \
-		--with-x
+		--without-x # Requires gtk+2.0
 	make
 }
 
@@ -51,12 +51,6 @@ libs() {
 	mv "$pkgdir"/usr/lib/libgnokii.so.* "$subpkgdir"/usr/lib/
 }
 
-xgnokii() {
-	pkgdesc="Gtk+ gnokii application"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/xgnokii "$subpkgdir"/usr/bin/
-}
-
 smsd() {
 	pkgdesc="SMS Daemon for mobile phones"
 	mkdir -p "$subpkgdir"/usr/bin/
@@ -83,7 +77,8 @@ sqlite() {
 	mkdir -p "$subpkgdir"/usr/lib/smsd
 	mv "$pkgdir"/usr/lib/smsd/*sqlite*.so "$subpkgdir"/usr/lib/smsd/
 }
-sha512sums="529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d  gnokii-0.6.31.tar.bz2
+sha512sums="
+529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d  gnokii-0.6.31.tar.bz2
 a253cd0a461b06b3d11202f36c518f6364705008c36d4e7ecd292ecd2e4288e42fbd55110405c6bb2d2d82499e047876aa92a9292b629d1323189a9164359d32  gnokii.patch
-b7033907d8bca55366b09ef976e1f1e48a31ef2630e55770200fc3818c1a36aa6478bc73cb4f180b469d21157ad5af389dc075280f22251b7402d7ab584f37dc  xgnokii.patch
-548a32f93b059e45c8616dedf49a0ce3b0e63463f8ddc3384b473d91bd12c3fab2c6e21de0b09d2b330c189454a2bf3e486aa25122ea58392d9cb11994592086  gnokii-0.6.31-gcc5.patch"
+548a32f93b059e45c8616dedf49a0ce3b0e63463f8ddc3384b473d91bd12c3fab2c6e21de0b09d2b330c189454a2bf3e486aa25122ea58392d9cb11994592086  gnokii-0.6.31-gcc5.patch
+"
diff --git a/main/gnokii/xgnokii.patch b/main/gnokii/xgnokii.patch
deleted file mode 100644
index b354166139a..00000000000
--- a/main/gnokii/xgnokii.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.in.orig
-+++ ./configure.in
-@@ -689,7 +689,7 @@
-    fi
- fi
- 
--AM_CONDITIONAL(XGNOKII, test "x$_support" = "xyes")
-+AM_CONDITIONAL(XGNOKII, test "x$x_support" = "xyes")
- 
- dnl ======================== Check for libsocket
- AC_CHECK_LIB(socket, socket)