diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template
index 442e974358..abe72ed198 100644
--- a/srcpkgs/glib/glib-devel.template
+++ b/srcpkgs/glib/glib-devel.template
@@ -2,7 +2,7 @@
 #
 depends="python perl libglib-devel-${version}_${revision}"
 short_desc="${short_desc} -- development files"
-pycompile_dirs="usr/lib/gdbus-2.0/codegen"
+pycompile_dirs="/usr/share/glib-2.0"
 
 do_install() {
 	vmkdir usr/bin
@@ -13,10 +13,10 @@ do_install() {
 		[ "$(basename ${f})" = "gdbus" ] && continue
 		[ "$(basename ${f})" = "gsettings" ] && continue
 		[ "$(basename ${f})" = "glib-compile-schemas" ] && continue
+		[ "$(basename ${f})" = "gresource" ] && continue
+		[ "$(basename ${f})" = "gobject-query" ] && continue
 		mv ${f} ${DESTDIR}/usr/bin
 	done
-	vmove usr/lib/gdbus-2.0 usr/lib
-
 	for f in gtk-doc aclocal glib-2.0 gdb; do
 		vmove usr/share/${f} usr/share
 	done
@@ -25,6 +25,8 @@ do_install() {
 		[ "$(basename ${f})" = "gdbus.1" ] && continue
 		[ "$(basename ${f})" = "gsettings.1" ] && continue
 		[ "$(basename ${f})" = "glib-compile-schemas.1" ] && continue
+		[ "$(basename ${f})" = "gresource.1" ] && continue
+		[ "$(basename ${f})" = "gobject-query.1" ] && continue
 		mv ${f} ${DESTDIR}/usr/share/man/man1
 	done
 }
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 80a599d49f..f0f8d357ea 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,18 +1,18 @@
 # Template build file for 'glib'
 pkgname=glib
-version=2.34.3
-revision=3
+version=2.36.0
+revision=1
 subpackages="libglib-devel glib-devel"
 build_style=gnu-configure
 configure_args="--disable-fam --with-pcre=system --enable-static --enable-man"
-hostmakedepends="pkg-config python libxslt docbook-xsl"
-makedepends="zlib-devel pcre-devel>=8.30 libffi-devel"
+hostmakedepends="pkg-config perl python libxslt docbook-xsl"
+makedepends="zlib-devel pcre-devel>=8.30 libffi-devel dbus-devel elfutils-devel"
 short_desc="The GNU library of C routines"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 license="LGPL-2.1"
-distfiles="${GNOME_SITE}/glib/2.34/glib-$version.tar.xz"
-checksum=855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7
+distfiles="${GNOME_SITE}/glib/2.36/glib-$version.tar.xz"
+checksum=455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227
 
 if [ "$XBPS_CROSS_BUILD" ]; then
 	configure_args="${configure_args} glib_cv_long_long_format=I64
@@ -23,10 +23,9 @@ if [ "$XBPS_CROSS_BUILD" ]; then
 			ac_cv_func_posix_getpwuid_r=yes
 			ac_cv_func_posix_getgrgid_r=yes
 			ac_cv_func_posix_getgrgid_r=yes"
-	hostmakedepends="automake gettext-devel which gtk-doc pkg-config glib-devel"
-	makedepends="zlib-devel pcre-devel>=8.30 libffi-devel"
+	hostmakedepends="${hostmakedepends} libtool automake which
+		gtk-doc gettext-devel glib-devel"
 	pre_configure() {
-		sed -e "s|AM_PROG_CC_STDC|AC_PROG_CC|g" -i configure.ac
 		NOCONFIGURE=1 ./autogen.sh
 	}
 fi