diff --git a/README.rdoc b/README.rdoc
index df3bc4dfcc..e31495529f 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -111,6 +111,13 @@ Binary packages are available for:
 * SuSE[http://download.opensuse.org/repositories/devel:/languages:/ruby:/extensions/]
 * Fedora[http://s390.koji.fedoraproject.org/koji/packageinfo?packageID=6756]
 
+If you are installing on Solaris, OpenSolaris, or illumos will need to install
+libxslt[http://www.opencsw.org/package/libxslt/] and
+libxml[http://www.opencsw.org/package/libxml2_2/] from OpenCSW.  After these
+libraries have been installed, run:
+
+    NOKOGIRI_USE_SYSTEM_LIBRARIES=true sudo gem install nokogiri
+
 == DEVELOPMENT:
 
 === Developing on C Ruby (MRI)
diff --git a/ext/nokogiri/extconf.rb b/ext/nokogiri/extconf.rb
index bfbfe4e82f..d0dd74311d 100644
--- a/ext/nokogiri/extconf.rb
+++ b/ext/nokogiri/extconf.rb
@@ -74,6 +74,9 @@ def have_iconv?
     # First search /opt/local for macports
     '/opt/local/include',
 
+    # Then check for OpenCSW packages
+    '/opt/csw/include',
+
     # Then search /usr/local for people that installed from source
     '/usr/local/include',
 
@@ -92,6 +95,9 @@ def have_iconv?
       # First search /opt/local for macports
       '/opt/local/lib',
 
+      # Then check for OpenCSW packages
+      '/opt/csw/lib',
+
       # Then search /usr/local for people that installed from source
       '/usr/local/lib',