diff --git a/main/epdfview/APKBUILD b/main/epdfview/APKBUILD
index b6470e361e9..e5541a16ff0 100644
--- a/main/epdfview/APKBUILD
+++ b/main/epdfview/APKBUILD
@@ -1,15 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=epdfview
 pkgver=0.1.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A free lightweight PDF document viewer."
 url="http://www.emma-soft.com/projects/epdfview/"
 arch="all"
 license="GPL"
 depends="desktop-file-utils hicolor-icon-theme"
 makedepends="poppler-gtk-dev cups-dev autoconf automake"
+subpackages="$pkgname-lang"
 source="http://www.emma-soft.com/projects/$pkgname/chrome/site/releases/$pkgname-$pkgver.tar.bz2
 	$pkgname.desktop.patch
+	epdfview-0.1.8-glib-2.31-build-fix.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -19,7 +21,7 @@ prepare() {
 		case $i in
 		*.patch)
 			msg "$i"
-			patch -p0 -i "$srcdir"/$i || return 1;;
+			patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
 	# make automake happy
@@ -53,4 +55,5 @@ package() {
 }
 
 md5sums="e50285b01612169b2594fea375f53ae4  epdfview-0.1.8.tar.bz2
-fbf22bbabdbb7544db615ac5775d57e2  epdfview.desktop.patch"
+c87ed492dcf64a0b41476989c9282f8b  epdfview.desktop.patch
+6e52b4bd6996530443eb4477c6f21e3f  epdfview-0.1.8-glib-2.31-build-fix.patch"
diff --git a/main/epdfview/epdfview-0.1.8-glib-2.31-build-fix.patch b/main/epdfview/epdfview-0.1.8-glib-2.31-build-fix.patch
new file mode 100644
index 00000000000..6e7f20460dc
--- /dev/null
+++ b/main/epdfview/epdfview-0.1.8-glib-2.31-build-fix.patch
@@ -0,0 +1,11 @@
+Index: trunk/src/gtk/StockIcons.h
+===================================================================
+--- trunk/src/gtk/StockIcons.h	(revision 325)
++++ trunk/src/gtk/StockIcons.h	(revision 369)
+@@ -19,5 +19,5 @@
+ #define __STOCK_ICONS_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
diff --git a/main/epdfview/epdfview.desktop.patch b/main/epdfview/epdfview.desktop.patch
index d86fc308830..93dbc03d4bd 100644
--- a/main/epdfview/epdfview.desktop.patch
+++ b/main/epdfview/epdfview.desktop.patch
@@ -1,5 +1,5 @@
---- data/epdfview.desktop.bak	2009-04-05 16:55:56.000000000 -0700
-+++ data/epdfview.desktop	2009-04-05 16:56:33.000000000 -0700
+--- a/data/epdfview.desktop.bak	2009-04-05 16:55:56.000000000 -0700
++++ b/data/epdfview.desktop	2009-04-05 16:56:33.000000000 -0700
 @@ -7,7 +7,7 @@
  GenericName=PDF Viewer
  GenericName[ca]=Visor PDF