diff --git a/mingw-w64-webkitgtk3/PKGBUILD b/mingw-w64-webkitgtk3/PKGBUILD
index 55260cb181..faf1b27b4a 100644
--- a/mingw-w64-webkitgtk3/PKGBUILD
+++ b/mingw-w64-webkitgtk3/PKGBUILD
@@ -2,8 +2,8 @@
 
 _realname=webkitgtk
 _mingw_suff=mingw-w64-${CARCH}
-pkgname="${_mingw_suff}-${_realname}3"
-pkgver=2.2.6
+pkgname=("${_mingw_suff}-${_realname}2" "${_mingw_suff}-${_realname}3")
+pkgver=2.2.5
 pkgrel=1
 pkgdesc="GTK+ Web content engine library (mingw-w64)"
 arch=('any')
@@ -13,6 +13,8 @@ options=('!libtool' '!strip' 'debug' 'staticlibs')
 makedepends=("${_mingw_suff}-gcc"
 		"${_mingw_suff}-gobject-introspection"
 		"${_mingw_suff}-pkg-config"
+		"${_mingw_suff}-gtk2"
+		"${_mingw_suff}-gtk3"
 		"bison"
 		"flex"
 		"gperf"
@@ -31,7 +33,6 @@ depends=(
 		"${_mingw_suff}-glib2"
 		"${_mingw_suff}-gst-plugins-base"
 		"${_mingw_suff}-gstreamer"
-		"${_mingw_suff}-gtk3"
 		"${_mingw_suff}-geoclue"
 		"${_mingw_suff}-harfbuzz"
 		"${_mingw_suff}-icu"
@@ -46,7 +47,6 @@ depends=(
 		"${_mingw_suff}-pango"
 		"${_mingw_suff}-xz"
 		)
-optdepends=("${_mingw_suff}-gtk2: Netscape plugin support")
 source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz
 		0001-webkitgtk-remove-reference-to-nonexisting-header.mingw.patch
 		0002-webkitgtk-mingw-use-gcc-asm.mingw.patch
@@ -104,14 +104,16 @@ prepare() {
 
 	autoreconf --verbose --install -I Source/autotools
 	
-	[[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+	mkdir ${srcdir}/build-gtk{2,3}
 }
 
-build() {
+_build() {
+	_ver="$1"; shift
+	cd build-${_ver}
+
 	export PYTHON=${MINGW_PREFIX}/bin/python2
 	export RUBY=${MINGW_PREFIX}/bin/ruby
-	mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-	cd "${srcdir}/build-${MINGW_CHOST}"
+
 	../${_realname}-${pkgver}/configure \
 		--prefix=${MINGW_PREFIX} \
 		--build=${MINGW_CHOST} \
@@ -130,21 +132,54 @@ build() {
 		--enable-spellcheck \
 		--enable-optimizations \
 		--enable-geolocation \
-		--with-gtk=3.0 \
 		--with-target=win32 \
 		--enable-gles2=no \
-		--enable-egl=no
+		--enable-egl=no \
+		"$@"
 
-	make V=1
+	make V=1 all stamp-po
 }
 
-package() {
-	cd "${srcdir}/build-${MINGW_CHOST}"
+build() {
+	_build gtk3 --enable-gtk-doc --disable-webkit2 --with-gtk=3.0
+	_build gtk2 --disable-webkit2 --with-gtk=2.0
+}
+
+package_webkitgtk2() {
+	pkgdesc+=" for GTK2"
+	depends+=(${_mingw_suff}-gtk2)
+	#provides=("${_mingw_suff}-libwebkit2=${pkgver}")
+	cd "${srcdir}/build-gtk2"
 	make -j1 DESTDIR="$pkgdir" install
 	find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
 }
 
-md5sums=('245a9f8cac251662b7abf19903332038'
+package_webkitgtk3() {
+	depends+=(${_mingw_suff}-gtk3)
+	optdepends+=("${_mingw_suff}-gtk2: Netscape plugin support")
+	#provides=("${_mingw_suff}-webkitgtk3=${pkgver}" "${_mingw_suff}-libwebkit3=${pkgver}")
+	cd "${srcdir}/build-gtk3"
+	make -j1 DESTDIR="$pkgdir" install
+	find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
+}
+
+package_mingw-w64-i686-webkitgtk2() {
+	package_webkitgtk2
+}
+
+package_mingw-w64-i686-webkitgtk3() {
+	package_webkitgtk3
+}
+
+package_mingw-w64-x86_64-webkitgtk2() {
+	package_webkitgtk2
+}
+
+package_mingw-w64-x86_64-webkitgtk3() {
+	package_webkitgtk3
+}
+
+md5sums=('6083e027308cf6731c6ce394bf059fa8'
          '7408cd3f6624076ffb41c7b4364faee5'
          'b353ef80d7cab43524aaf5bf510d1778'
          '15587d5007fabb1700e2ed4a04085c30'