--- nsis-2.46.ebuild	2010-05-23 22:11:56.000000000 +0300
+++ nsis-2.46.ebuild	2012-07-06 11:01:33.486641985 +0300
@@ -3,12 +3,17 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.46.ebuild,v 1.2 2010/05/23 19:11:56 vapier Exp $
 
 EAPI="2"
-mingw32_variants=$(echo {,i{6,5,4,3}86-{,pc-}}mingw32)
+
+inherit eutils
+
+mingw32_variants=$(echo {,i{6,5,4,3}86-{,pc-,w32-,w64-}}mingw32)
 
 DESCRIPTION="Nullsoft Scriptable Install System"
 HOMEPAGE="http://nsis.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
+	http://f0rt.users.sourceforge.net/makensis_64bit.patch
+	http://f0rt.users.sourceforge.net/nsis_w64-mingw.patch"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
@@ -46,6 +51,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${DISTDIR}/makensis_64bit.patch"
+	epatch "${DISTDIR}/nsis_w64-mingw.patch"
+
 	# a dirty but effective way of killing generated docs
 	use doc || echo > Docs/src/SConscript
 }
@@ -63,14 +71,14 @@ get_additional_options() {
 		SKIPSTUBS=\"$(use zlib || echo zlib) $(use bzip2 || echo bzip2)\" \
 		SKIPUTILS=\"NSIS Menu\"
 	use config-log && echo NSIS_CONFIG_LOG=yes
-	# remove the following line when nsis bug 1753070 will be fixed
-	use amd64 && echo APPEND_CCFLAGS=-m32 APPEND_LINKFLAGS=-m32
 
-	local tcpfx=$($(mingw_CTARGET)-gcc -print-file-name=libshell32.a)
+	local mingwprefix=$(mingw_CTARGET)
+	local tcpfx=$(${mingwprefix}-gcc -print-file-name=libshell32.a)
 	tcpfx=${tcpfx%/lib/libshell32.a}
 	echo \
 		PREFIX_PLUGINAPI_INC=${tcpfx}/include \
 		PREFIX_PLUGINAPI_LIB=${tcpfx}/lib
+	echo CROSS_W32=${mingwprefix}-
 }
 
 do_scons() {