diff --git a/CHANGES b/CHANGES
index 67b3fbb7..9c38233b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
   Changelog for the c-ares project
 
+* May 11 2009 (Daniel Stenberg)
+- Gregor Jasny made c-ares link with libtool 's -export-symbols-regex option to
+  only expose functions starting with ares_.
+
 * May 2 2009 (Yang Tse)
 - Use a build-time configured ares_socklen_t data type instead of socklen_t.
 
diff --git a/Makefile.am b/Makefile.am
index 47083f51..373669ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,8 +87,9 @@ if NO_UNDEFINED
 UNDEF = -no-undefined
 endif
 
+EXPORT_SYMBOLS = -export-symbols-regex '^ares_[[:alnum:]].*'
 
-libcares_la_LDFLAGS = $(UNDEF) $(VER)
+libcares_la_LDFLAGS = $(UNDEF) $(VER) $(EXPORT_SYMBOLS)
 
 # Makefile.inc provides the CSOURCES and HHEADERS defines
 include Makefile.inc
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 692b3822..6c6fb51a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -12,9 +12,10 @@ Fixed:
 
  o ares_parse_*_reply() functions now return ARES_EBADRESP instead of
    ARES_EBADNAME if the name in the response failed to decode
+ o only expose/export symbols starting with 'ares_'
 
 Thanks go to these friendly people for their efforts and contributions:
 
- Phil Blundell, Japheth Cleaver
+ Phil Blundell, Japheth Cleaver, Yang Tse, Gregor Jasny
 
 Have fun!