diff --git a/dev-dotnet/wxnet/Manifest b/dev-dotnet/wxnet/Manifest
index c2559fd98..7c094252f 100644
--- a/dev-dotnet/wxnet/Manifest
+++ b/dev-dotnet/wxnet/Manifest
@@ -1,7 +1,7 @@
 AUX Defs.in.patch 1327 RMD160 5c886330f26cb59fb5455d4f1da7b5ef79d565bd SHA1 b12283392209415f1de1a15178be8683d5725d0e SHA256 001b835b3046842a175ba5d4e93b6ca4a0072e8a6fc1dcc051e0bfa48a9b87cb
-AUX fpic.patch 489 RMD160 4b34f22ec6e69678d7b37bc63cea6a7d64e6c711 SHA1 0ef66d2a8c5d34cffe6556e7b0d821bc583295a1 SHA256 3a611caf5ddd217b367777e5462d207d2094ca05d023c7551f3fa5ffbe13e0f4
 AUX premake.lua.patch 26535 RMD160 f068ed978182751e2f9def996e0ebb3567cd4aab SHA1 57de5b48c96dcd25f6997e92f792a46b5407b697 SHA256 44812d09aa8bca02af1cd60ed04afe0423c58bda3340daebaa99855a28ac0d19
 AUX premake.patch 1613 RMD160 87df1d896aed2bc8bcbbf545890b65ea1e44f2ad SHA1 13f8af2626520683ff1eae75d0242207d9567617 SHA256 33abc208b9beefb40c670137872baf01c14afca8ce9aa2a679a269c47dceda15
-AUX wx-config-helper.patch 539 RMD160 6562b48240983f82dbf83f13b9aa93f5589405c3 SHA1 c1b46297f923921861dda0bd97c5e086cfb298b4 SHA256 260e0c7ba5ac51dcb8dc0671c42a917dc2dca870d74e70446e04ed6431a32944
+AUX wx-config-helper.patch 564 RMD160 b4fba1efb26c2ddc3092379391fbbf388427fd52 SHA1 d4e3b5ec2a7fad263efea513a91f49a5cfcd99ce SHA256 949fc359581e65d5ab26c850f3abf52fd1c993aae879a270424e9f806d9e4649
+AUX wxnet-64bit.patch 834 RMD160 58ce5594ab2496747526f5ae2d40a850c0683564 SHA1 22a27799508f5b64c61a8fd42298531fb243df7c SHA256 d2f97d29be959dcccdf5317bf50af8e9268e44d0109ebc669dee7e046404c489
 DIST wx.NET-0.7.2-Source.tar.gz 1778579 RMD160 d0f560477bfcfe916091da8f1ee06f202d975a79 SHA1 c5971278174169762b756031cf2415ac5d94b848 SHA256 e93a068b0a9b7265d86cd02ab3db3d86a472e3584595271cfbe5715d9ee88bb1
-EBUILD wxnet-0.7.2.ebuild 2006 RMD160 aa5f476baa15c021ce224289647b00dc1c6f64ff SHA1 1b73152cdbb0a11a6ed0c31ff96335c9b92160f8 SHA256 bc4634f740419c865344f9ca6b545bcb52e1ff31b9d27d3f6ac2d10453324a6d
+EBUILD wxnet-0.7.2.ebuild 1706 RMD160 6cf246edcce00652e53a2abe1614a5f739be8b45 SHA1 1d0639a46b4a3321bc7b0f54e3ce861826aa4d35 SHA256 8897071b90e993f197f67af1b5d4e27ad5b4e2ba9de735d23be17a1fd972fdfc
diff --git a/dev-dotnet/wxnet/files/digest-wxnet-0.7.2 b/dev-dotnet/wxnet/files/digest-wxnet-0.7.2
deleted file mode 100644
index f7835e028..000000000
--- a/dev-dotnet/wxnet/files/digest-wxnet-0.7.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c6363b655cc18e4890ad4aabfbcc56bc wx.NET-0.7.2-Source.tar.gz 1778579
-RMD160 d0f560477bfcfe916091da8f1ee06f202d975a79 wx.NET-0.7.2-Source.tar.gz 1778579
-SHA256 e93a068b0a9b7265d86cd02ab3db3d86a472e3584595271cfbe5715d9ee88bb1 wx.NET-0.7.2-Source.tar.gz 1778579
diff --git a/dev-dotnet/wxnet/files/fpic.patch b/dev-dotnet/wxnet/files/fpic.patch
deleted file mode 100644
index 2b0b8f6d8..000000000
--- a/dev-dotnet/wxnet/files/fpic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru wx.NET-0.7.2/Src/wx-c/premake.lua wx.NET-0.7.2-mine/Src/wx-c/premake.lua
---- wx.NET-0.7.2/Src/wx-c/premake.lua	2005-05-18 00:32:07.000000000 +0200
-+++ wx.NET-0.7.2-mine/Src/wx-c/premake.lua	2006-02-19 17:56:11.000000000 +0100
-@@ -67,7 +67,7 @@
-         linkoptions  = "$(shell " .. wxconfig .. " --static --libs)"
-     end
- 
--    buildoptions = buildoptions .. " -W -Wall -ansi"
-+    buildoptions = buildoptions .. " -W -Wall -ansi -fPIC"
- 
-     -- Mac options
-     if (mac) then
diff --git a/dev-dotnet/wxnet/files/wx-config-helper.patch b/dev-dotnet/wxnet/files/wx-config-helper.patch
index 91ea1df7b..117e5a307 100644
--- a/dev-dotnet/wxnet/files/wx-config-helper.patch
+++ b/dev-dotnet/wxnet/files/wx-config-helper.patch
@@ -1,5 +1,5 @@
---- wx-config-helper.orig	2005-01-28 23:52:05.954412376 +0100
-+++ wx-config-helper	2005-01-28 23:21:53.680919824 +0100
+--- a/Build/Common/wx-config-helper	2005-01-28 23:52:05.954412376 +0100
++++ b/Build/Common/wx-config-helper	2005-01-28 23:21:53.680919824 +0100
 @@ -238,7 +238,7 @@
     $wx_cmd .= " --libs";
     my $wx_out = `$wx_cmd`;
diff --git a/dev-dotnet/wxnet/files/wxnet-64bit.patch b/dev-dotnet/wxnet/files/wxnet-64bit.patch
new file mode 100644
index 000000000..1f10a7ece
--- /dev/null
+++ b/dev-dotnet/wxnet/files/wxnet-64bit.patch
@@ -0,0 +1,23 @@
+--- a/Src/wx-c/listctrl.cxx	2010-02-15 23:58:28.951428758 +0100
++++ b/Src/wx-c/listctrl.cxx	2010-02-15 23:59:55.188427966 +0100
+@@ -180,9 +180,9 @@
+ //-----------------------------------------------------------------------------
+  
+ extern "C" WXEXPORT
+-bool wxListCtrl_SetItemData(wxListCtrl* self, int item, void* data)
++bool wxListCtrl_SetItemData(wxListCtrl* self, size_t item, void* data)
+ {
+-    return self->SetItemData(item, (int)data)?1:0;
++    return self->SetItemData(item, (size_t)data)?1:0;
+ }
+ 
+ //-----------------------------------------------------------------------------
+@@ -687,7 +687,7 @@
+ extern "C" WXEXPORT
+ void wxListItem_SetData(wxListItem* self, void* data)
+ {
+-	self->SetData((int)data);
++	self->SetData((size_t)data);
+ }
+ 
+ //-----------------------------------------------------------------------------
diff --git a/dev-dotnet/wxnet/wxnet-0.7.2.ebuild b/dev-dotnet/wxnet/wxnet-0.7.2.ebuild
index 3dbb986c2..551f6aa76 100644
--- a/dev-dotnet/wxnet/wxnet-0.7.2.ebuild
+++ b/dev-dotnet/wxnet/wxnet-0.7.2.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
 inherit eutils wxwidgets mono
 
 DESCRIPTION="wxWidgets bindings for mono"
@@ -13,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="doc examples utils unicode"
-RDEPEND=">=x11-libs/wxGTK-2.6.1:2.6"
+RDEPEND=">=x11-libs/wxGTK-2.6.1:2.6[unicode]"
 DEPEND="${RDEPEND}
 		>=dev-lang/mono-1.0.4-r1
 		dev-lang/perl
@@ -23,28 +25,18 @@ S="${WORKDIR}/wx.NET-${PV}"
 
 pkg_setup() {
 	export WX_GTK_VER="2.6"
-
-	# This would need a bit of tweaking or do we want to force gtk2-unicode version?
-	need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE"
 }
 
-src_unpack() {
-	unpack ${A} || die "Unpacking the source failed"
-
+src_prepare() {
 	epatch "${FILESDIR}"/premake.patch
 	epatch "${FILESDIR}"/premake.lua.patch
 
-	# Call this conditonally only when arch is amd64?
-	if use amd64;then
-		 epatch "${FILESDIR}"/fpic.patch
-	fi
-
 	cd "${S}"/Build/Linux || die "Could not change directory"
 	cp Defs.in.template Defs.in
 	epatch "${FILESDIR}"/Defs.in.patch
-
-	cd "${S}"/Build/Common || die "Could not change directory"
+	cd "${S}"
 	epatch "${FILESDIR}"/wx-config-helper.patch
+	epatch "${FILESDIR}"/wxnet-64bit.patch
 }
 
 src_compile() {