diff --git a/doc/Changelog b/doc/Changelog
index 3bc5c81dd..ffe305b36 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- dependencies for compat items, for crosscompile.
 	- mingw32 crosscompile changes, dependencies and zipfile creation.
 	  and with System.dll from the windows NSIS you can make setup.exe.
+	- package libgcc_s_sjlj exception handler for NSISdl.dll.
 
 14 July 2009: Wouter
 	- updated ldns tarball for solaris x64 compile assistance.
diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index 504503411..fce2c2c9c 100644
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -74,6 +74,10 @@ section "DLV - dlv.isc.org" SectionDLV
 	# add estimated size for key (Kb)
 	AddSize 2
 	SetOutPath $INSTDIR
+
+	# libgcc exception lib used by NSISdl plugin (in crosscompile).
+	File /nonfatal "/oname=$PLUGINSDIR\libgcc_s_sjlj-1.dll" "/usr/i686-pc-mingw32/sys-root/mingw/bin/libgcc_s_sjlj-1.dll"
+
 	NSISdl::download "http://ftp.isc.org/www/dlv/dlv.isc.org.key" "$INSTDIR\dlv.isc.org.key"
 	Pop $R0 # result from Inetc::get
 	${If} $R0 != "success"