diff --git a/ChangeLog b/ChangeLog
index 274db4c3b2..a1f050ede4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov  5 00:14:15 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/extconf.rb: fixing ffi library location on windows.
+	  Thanks Usa! [ruby-core:32930]
+
 Thu Nov  4 20:04:44 2010  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c (rb_newobj): force garbage_collect() if GC.stress == true.
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index dcc2c43cfd..03b0ac2765 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -13,7 +13,7 @@ unless have_header('ffi.h')
   end
 end
 
-unless have_library('ffi')
+unless have_library('ffi') || have_library('libffi')
   abort "libffi is missing. Please install libffi."
 end