diff --git a/mingw-w64-cogl/0002-windows-gl-headers.patch b/mingw-w64-cogl/0002-windows-gl-headers.patch
new file mode 100644
index 0000000000..d327a89c35
--- /dev/null
+++ b/mingw-w64-cogl/0002-windows-gl-headers.patch
@@ -0,0 +1,16 @@
+--- cogl-1.18.2/cogl/cogl-gl-header.h.in.orig	2014-07-03 03:31:31.000000000 +0400
++++ cogl-1.18.2/cogl/cogl-gl-header.h.in	2014-08-05 15:21:23.358600000 +0400
+@@ -37,7 +37,13 @@
+ 
+ #include "cogl-defines.h"
+ 
++#ifdef _WIN32
++#include <windows.h>
++#include <GL/GL.h>
++#include <GL/glext.h>
++#else
+ @COGL_GL_HEADER_INCLUDES@
++#endif
+ 
+ #ifndef GL_OES_EGL_image
+ #define GLeglImageOES void *
diff --git a/mingw-w64-cogl/PKGBUILD b/mingw-w64-cogl/PKGBUILD
index 91ee5f40f2..29560c2c6e 100644
--- a/mingw-w64-cogl/PKGBUILD
+++ b/mingw-w64-cogl/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Lubosz Sarnecki <lubosz@gmail.com>
 
 _realname=cogl
-pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgtag="1.18.2"
-pkgver=2.0.0.3265.58dec43
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
+pkgver=1.18.2
 pkgrel=1
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer. (mingw-w64)"
 arch=('any')
@@ -12,36 +11,28 @@ license=('GPL2')
 makedepends=('automake' 'libtool' 'intltool' 'itstool' 'gtk-doc' 'gnome-doc-utils' 'yelp-tools')
 depends=("${MINGW_PACKAGE_PREFIX}-pango"
          "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
-         "${MINGW_PACKAGE_PREFIX}-mesa"
         )
 options=(!libtool strip staticlibs)
-source=("git://git.gnome.org/$_realname#tag=${pkgtag}"
-        "0001-msys2-fix-introspection-build.patch")
-md5sums=("SKIP"
-         "66134daa1df08ebfa143b12c08f3290e")
-
-pkgver() {
-  cd $_realname
-  major=$(grep "cogl_major_version]," configure.ac | sed 's/m4_define(\[cogl_major_version\], \[//' | sed 's/\])//')
-  minor=$(grep "cogl_minor_version]," configure.ac | sed 's/m4_define(\[cogl_minor_version\], \[//' | sed 's/\])//')
-  micro=$(grep "cogl_micro_version]," configure.ac | head -1 | sed 's/m4_define(\[cogl_micro_version\], \[//' | sed 's/\])//')
-  hash=$(git log --pretty=format:'%h' -n 1)
-  revision=$(git rev-list --count HEAD)
-  echo $major.$minor.$micro.$revision.$hash
-}
+source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:4}/${_realname}-$pkgver.tar.xz
+        "0001-msys2-fix-introspection-build.patch"
+        "0002-windows-gl-headers.patch")
+md5sums=('952155d526d35f297737266408e842b5'
+         '66134daa1df08ebfa143b12c08f3290e'
+         '8686270ab5eae668eae11e2606aa7ce0')
 
 prepare() {
-  cd $_realname
-  git am ../0001-msys2-fix-introspection-build.patch
-  NOCONFIGURE=1 ./autogen.sh
+  cd ${_realname}-$pkgver
+  patch -p1 -i ${srcdir}/0001-msys2-fix-introspection-build.patch
+  patch -p1 -i ${srcdir}/0002-windows-gl-headers.patch
+  autoreconf -fi
 }
 
 build() {
   mkdir -p "${srcdir}/build-${MINGW_CHOST}"
   [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  cp -r "${srcdir}/${_realname}" "${srcdir}/build-${MINGW_CHOST}"
+  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
   cd "${srcdir}/build-${MINGW_CHOST}"
-  ./configure \
+  ../${_realname}-$pkgver/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \