diff --git a/mingw-w64-tools/gendef/ChangeLog b/mingw-w64-tools/gendef/ChangeLog
index 018195a..3c47fba 100644
--- a/mingw-w64-tools/gendef/ChangeLog
+++ b/mingw-w64-tools/gendef/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-29  Jonathan Yong  <jon_y@users.sourceforge.net>
+
+	* src/fsredir.c (doredirect): Use GetModuleHandleW instead of LoadLibraryA.
+
 2010-07-23  Jonathan Yong  <jon_y@users.sourceforge.net>
 
 	* src/gendef.c (decode_mangle): Adjust libmangle_gc_context to
diff --git a/mingw-w64-tools/gendef/src/fsredir.c b/mingw-w64-tools/gendef/src/fsredir.c
index 1078efa..7309b82 100644
--- a/mingw-w64-tools/gendef/src/fsredir.c
+++ b/mingw-w64-tools/gendef/src/fsredir.c
@@ -38,12 +38,11 @@
 
 static void undoredirect(void) {
     revertorfunction(revert);
-    FreeLibrary(kernel32handle);
 }
 
 void doredirect(const int redir) {
   if (redir) {
-    kernel32handle = LoadLibraryA("kernel32.dll");
+    kernel32handle = GetModuleHandleW(L"kernel32.dll");
     if (!kernel32handle) {
       fprintf(stderr, "kernel32.dll failed to load, failed to disable FS redirection.\n");
       return;
@@ -56,7 +55,6 @@
       return;
     }
     if (!redirectorfunction(&revert)) {
-      FreeLibrary(kernel32handle);
       fprintf(stderr, "Wow64DisableWow64FsRedirection failed.\n");
       return;
     } else {