diff --git a/x11-libs/gtk+/gtk+-2.24.30.ebuild b/x11-libs/gtk+/gtk+-2.24.30.ebuild
index 65b0c24..66d271c 100644
--- a/x11-libs/gtk+/gtk+-2.24.30.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.30.ebuild
@@ -13,9 +13,10 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-IUSE="aqua cups examples +introspection test vim-syntax xinerama"
+IUSE="aqua cups examples +introspection test vim-syntax win32 xinerama"
 REQUIRED_USE="
-	xinerama? ( !aqua )
+	xinerama? ( !aqua !win32 )
+	aqua? ( !win32 )
 "
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -32,7 +33,7 @@ COMMON_DEPEND="
 
 	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	!aqua? (
+	!aqua? ( !win32? (
 		>=x11-libs/cairo-1.12.14-r4:=[X]
 		>=x11-libs/gdk-pixbuf-2.30.7:2[X]
 		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
@@ -45,20 +46,20 @@ COMMON_DEPEND="
 		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
 		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-	)
+	) )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/gobject-introspection-common
 	>=dev-util/gtk-doc-am-1.20
 	sys-devel/gettext
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	!aqua? (
+	!aqua? ( !win32? (
 		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
 		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
 		>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
 		>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
 		xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
-	)
+	) )
 	test? (
 		x11-themes/hicolor-icon-theme
 		media-fonts/font-misc-misc
@@ -172,8 +173,8 @@ multilib_src_configure() {
 
 	ECONF_SOURCE=${S} \
 	gnome2_src_configure \
-		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
-		$(usex aqua "" --with-xinput) \
+		$(usex aqua --with-gdktarget=quartz $(usex win32 --with-gdktarget=win32 --with-gdktarget=x11)) \
+		$(usex aqua "" $(usex win32 "" --with-xinput)) \
 		$(use_enable cups cups auto) \
 		$(multilib_native_use_enable introspection) \
 		$(use_enable xinerama) \