diff --git a/common/shlibs b/common/shlibs
index 115857e6438..a70b5e925cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -474,9 +474,9 @@ libsoup-2.4.so.1 libsoup-2.34.0_1
 libsoup-gnome-2.4.so.1 libsoup-gnome-2.34.0_1
 libunique-3.0.so.0 libunique-2.91.4_1
 libwebkit-1.0.so webkit-gtk-1.3.12_1
-libwebkitgtk-1.0.so.0 webkit-gtk-1.3.12_1
+libwebkitgtk-1.0.so.0 webkitgtk2-2.4.8_2
 libwebkitgtk-3.0.so.0 webkitgtk-2.0.0_1
-libjavascriptcoregtk-1.0.so.0 webkit-gtk-1.3.12_1
+libjavascriptcoregtk-1.0.so.0 webkitgtk2-2.4.8_2
 libjavascriptcoregtk-3.0.so.0 webkitgtk-2.0.0_1
 libwebkit2gtk-3.0.so.25 webkitgtk-2.0.0_1
 libgimp-2.0.so.0 libgimp-2.8.10_3
diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template
index 79e934592a5..32c6c5054c3 100644
--- a/srcpkgs/webkitgtk/template
+++ b/srcpkgs/webkitgtk/template
@@ -1,9 +1,9 @@
 # Template file for 'webkitgtk'
 pkgname=webkitgtk
 version=2.4.8
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gtk-doc --with-gtk=3.0 --disable-schemas-compile
+configure_args="--disable-gtk-doc --disable-schemas-compile
  --enable-accelerated-compositing $(vopt_enable gir introspection)
  $(vopt_enable wayland wayland-target) $(vopt_enable x11 x11-target)"
 short_desc="GTK+3 port of the WebKit browser engine"
@@ -34,8 +34,43 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gir"
 fi
 
+# Explicit order since webkitgtk2-devel depends on webkitgtk2
+subpackages="webkitgtk-devel webkitgtk2 webkitgtk2-devel"
+
 pre_configure() {
 	autoreconf -fi
+
+	local v
+	for v in 3.0 2.0; do
+		mkdir -p /tmp/$v
+		cp -a $wrksrc/* /tmp/$v
+		mv /tmp/$v $wrksrc/$v
+	done
+}
+
+do_configure() {
+	local v
+	for v in 3.0 2.0; do
+		cd $wrksrc/$v
+
+		if [ $v = 2.0 ]; then
+			configure_args+=" --disable-webkit2"
+		fi
+		./configure $configure_args --with-gtk=${v}
+	done
+}
+
+do_build() {
+	local v
+	for v in 3.0 2.0; do
+		cd $wrksrc/$v
+		make $makejobs
+	done
+}
+
+do_install() {
+	cd $wrksrc/3.0
+	make DESTDIR=$DESTDIR install
 }
 
 webkitgtk-devel_package() {
@@ -51,3 +86,30 @@ webkitgtk-devel_package() {
 		vmove usr/share/gtk-doc
 	}
 }
+
+webkitgtk2_package() {
+    short_desc="${short_desc/3/2}"
+	replaces="webkit-gtk>=0"
+	pkg_install() {
+		cd $wrksrc/2.0
+		make DESTDIR=$PKGDESTDIR install
+	}
+}
+
+webkitgtk2-devel_package() {
+	depends="gtk+-devel libsoup-devel webkitgtk2>=${version}_${revision}"
+	short_desc="${short_desc/3/2} - development files"
+	replaces="webkit-gtk-devel>=0"
+	pkg_install() {
+		local parent=$PKGDESTDIR/../webkitgtk2-${version}
+
+		install -d $PKGDESTDIR/usr/{lib,share}
+		mv $parent/usr/include $PKGDESTDIR/usr
+		mv $parent/usr/lib/pkgconfig $PKGDESTDIR/usr/lib
+		if [ "$build_option_gir" ]; then
+			mv $parent/usr/share/gir-1.0 $PKGDESTDIR/usr/share
+		fi
+		mv $parent/usr/lib/*.so $PKGDESTDIR/usr/lib
+		mv $parent/usr/share/gtk-doc $PKGDESTDIR/usr/share
+	}
+}
diff --git a/srcpkgs/webkitgtk2 b/srcpkgs/webkitgtk2
new file mode 120000
index 00000000000..f1f77c4975f
--- /dev/null
+++ b/srcpkgs/webkitgtk2
@@ -0,0 +1 @@
+webkitgtk
\ No newline at end of file
diff --git a/srcpkgs/webkitgtk2-devel b/srcpkgs/webkitgtk2-devel
new file mode 120000
index 00000000000..f1f77c4975f
--- /dev/null
+++ b/srcpkgs/webkitgtk2-devel
@@ -0,0 +1 @@
+webkitgtk
\ No newline at end of file