diff --git a/CHANGELOG.ja.rdoc b/CHANGELOG.ja.rdoc
index e3f805bc67..163180283c 100644
--- a/CHANGELOG.ja.rdoc
+++ b/CHANGELOG.ja.rdoc
@@ -4,6 +4,7 @@
 
   * The "nokogiri" script now has more verbose output when passed the `--rng` option. (Thanks, Dan Radez!)
   * Build support on hardened Debian systems that use `-Werror=format-security`. #680.
+  * Better build support for systems with pkg-config. #584
 
 * Bugfixes
 
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 499a4ee6ae..fdcfb136cd 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -4,6 +4,7 @@
 
   * The "nokogiri" script now has more verbose output when passed the `--rng` option. (Thanks, Dan Radez!)
   * Build support on hardened Debian systems that use `-Werror=format-security`. #680.
+  * Better build support for systems with pkg-config. #584
 
 * Bugfixes
 
diff --git a/ext/nokogiri/extconf.rb b/ext/nokogiri/extconf.rb
index e0e20d3a89..d842e8988e 100644
--- a/ext/nokogiri/extconf.rb
+++ b/ext/nokogiri/extconf.rb
@@ -99,7 +99,9 @@ def asplode(lib)
   abort "-----\n#{lib} is missing.  please visit http://nokogiri.org/tutorials/installing_nokogiri.html for help with installing dependencies.\n-----"
 end
 
-pkg_config('libxslt') if RUBY_PLATFORM =~ /mingw/
+pkg_config('libxslt')
+pkg_config('libxml-2.0')
+pkg_config('libiconv')
 
 asplode "libxml2"  unless find_header('libxml/parser.h')
 asplode "libxslt"  unless find_header('libxslt/xslt.h')