diff --git a/NEWS b/NEWS
index ed3c9ef..b26aad6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+- (Mar 17 2009) Simon Josefsson:
+
+  Added a Libtool -export-symbols-regex flag to reduce the number of
+  exported symbols in shared libraries.  Reported by Mikhail Gusarov.
+
 - (Mar 16 2009) Daniel Stenberg:
 
   I renamed a few man pages to match the exact name of the functions they
diff --git a/src/Makefile.am b/src/Makefile.am
index 8766b97..eb0ad09 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.15 2009/02/23 16:22:46 bagder Exp $
+# $Id: Makefile.am,v 1.16 2009/03/17 10:19:54 jas4711 Exp $
 AUTOMAKE_OPTIONS = foreign nostdinc
 
 libssh2_la_SOURCES = channel.c comp.c crypt.c hostkey.c kex.c mac.c	\
@@ -51,4 +51,5 @@ VERSION=-version-info 1:1:0
 #
 
 libssh2_la_LDFLAGS = $(VERSION) -no-undefined \
+	-export-symbols-regex '^libssh2_.*' \
 	$(LTLIBGCRYPT) $(LTLIBSSL) $(LTLIBZ)