diff --git a/mingw-w64-gedit/0003-pass-gtk-cflags-to-scanner.patch b/mingw-w64-gedit/0003-pass-gtk-cflags-to-scanner.patch
new file mode 100644
index 0000000000..6c7b222fbc
--- /dev/null
+++ b/mingw-w64-gedit/0003-pass-gtk-cflags-to-scanner.patch
@@ -0,0 +1,12 @@
+diff -Naur a/gedit/Makefile.am b/gedit/Makefile.am
+--- a/gedit/Makefile.am
++++ b/gedit/Makefile.am
+@@ -266,7 +266,7 @@
+ gedit_Gedit_3_0_gir_PROGRAM = $(builddir)/gedit/gedit$(EXEEXT)
+ gedit_Gedit_3_0_gir_INCLUDES = Gtk-3.0 GtkSource-3.0
+ gedit_Gedit_3_0_gir_EXPORT_PACKAGES = gedit
+-gedit_Gedit_3_0_gir_SCANNERFLAGS = $(foreach header,$(gedit_INST_H_FILES),--c-include="$(header)")
++gedit_Gedit_3_0_gir_SCANNERFLAGS = $(GEDIT_CFLAGS) $(foreach header,$(gedit_INST_H_FILES),--c-include="$(header)")
+ gedit_Gedit_3_0_gir_FILES = 		\
+ 	$(gedit_INST_H_FILES) 		\
+ 	$(gedit_libgedit_c_files)	\
diff --git a/mingw-w64-gedit/PKGBUILD b/mingw-w64-gedit/PKGBUILD
index cb5bd9cda8..bb1e0fb4ad 100644
--- a/mingw-w64-gedit/PKGBUILD
+++ b/mingw-w64-gedit/PKGBUILD
@@ -15,26 +15,31 @@ depends=("${MINGW_PACKAGE_PREFIX}-gtksourceview3"
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
             "${MINGW_PACKAGE_PREFIX}-pkg-config"
             "${MINGW_PACKAGE_PREFIX}-python3"
+            "${MINGW_PACKAGE_PREFIX}-vala"
             "intltool"
             "itstool"
-            "${MINGW_PACKAGE_PREFIX}-vala")
+            "gettext-devel"
+            "yelp-tools")
 options=('strip' 'staticlibs')
 license=("BSD")
 url="http://www.gnome.org"
+install=gedit-${CARCH}.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:4}/${_realname}-$pkgver.tar.xz
         0001-Tentative-fix-for-win32-build-warning.patch
         0002-metadata-manager-use-gdatetime-and-guint64.patch
         0001-metadata-manager-retry-another-blind-fix.patch
         0001-Also-change-the-format.patch
         0001-Fix-the-windows-build.patch
-        0001-Specify-INTROSPECTION_SCANNER_ENV-to-be-able-to-buil.patch)
+        0001-Specify-INTROSPECTION_SCANNER_ENV-to-be-able-to-buil.patch
+        0003-pass-gtk-cflags-to-scanner.patch)
 md5sums=('a23644771605c4226059d0b92faf70d2'
          '924ee0c750ca9f4e88edff0bf828a5bc'
          '6880986c9eb5b67832888048d837114b'
          '11e8a503b5ef5d3f6756966e7b645afa'
          '061632885f8c9f5e4687f6153ed33fa1'
          '3513625f98e48292890b278d98959442'
-         '905776dbf7dfc43064258835c9d96b4c')
+         '905776dbf7dfc43064258835c9d96b4c'
+         'f606ec2fa63eef8d1246f2042bd789d2')
 
 prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}
@@ -44,6 +49,7 @@ prepare() {
   patch -p1 -i ${srcdir}/0001-Also-change-the-format.patch
   patch -p1 -i ${srcdir}/0001-Fix-the-windows-build.patch
   patch -p1 -i ${srcdir}/0001-Specify-INTROSPECTION_SCANNER_ENV-to-be-able-to-buil.patch
+  patch -p1 -i ${srcdir}/0003-pass-gtk-cflags-to-scanner.patch
   autopoint --force
   AUTOPOINT='intltoolize --automake --copy' autoreconf -f -i
 }
@@ -66,9 +72,6 @@ build() {
 }
 
 package() {
-    cd "$srcdir/build-${MINGW_CHOST}"
-    make DESTDIR=$pkgdir install
-    find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
-  rm -rf "${pkgdir}${MINGW_PREFIX}"/share/man
-    #rm -rf "${pkgdir}${MINGW_PREFIX}"/{etc,var,libexec,share}
+  cd "$srcdir/build-${MINGW_CHOST}"
+  make DESTDIR=$pkgdir install
 }
diff --git a/mingw-w64-gedit/gedit-i686.install b/mingw-w64-gedit/gedit-i686.install
new file mode 100644
index 0000000000..375e708c36
--- /dev/null
+++ b/mingw-w64-gedit/gedit-i686.install
@@ -0,0 +1,11 @@
+post_install() {
+    mingw32/bin/glib-compile-schemas /mingw32/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/mingw-w64-gedit/gedit-x86_64.install b/mingw-w64-gedit/gedit-x86_64.install
new file mode 100644
index 0000000000..d43ee14ce7
--- /dev/null
+++ b/mingw-w64-gedit/gedit-x86_64.install
@@ -0,0 +1,11 @@
+post_install() {
+    mingw64/bin/glib-compile-schemas /mingw64/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}