diff --git a/ChangeLog b/ChangeLog
index ba236979..8cf6de2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-16  Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
+
+    * configure.ac src/Makefile.am src/create_symbols_file.py
+    More OS/2 fixes from David Yeo.
+
 2007-11-12  Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
 
     * src/file_io.c tests/utils.tpl tests/benchmark.tpl
diff --git a/configure.ac b/configure.ac
index 5e5e9b95..ce3093c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,7 @@ AC_LANG([C])
 SHARED_VERSION_INFO="1:18:0"
 
 AC_PROG_CC
+AC_PROG_CXX
 AM_PROG_LIBTOOL
 
 AC_CHECK_PROG(HAVE_AUTOGEN, autogen, yes, no)
@@ -572,6 +573,9 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then
 				win32_target_dll=0
 				fi
 			;;
+		os2*)
+			SHLIB_VERSION_ARG="-Wl,-export-symbols \$(srcdir)/Symbols.os2"
+			;;
 		*)
 			;;
 		esac
diff --git a/src/Makefile.am b/src/Makefile.am
index 398c89d3..467f3f3e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -97,8 +97,11 @@ libsndfile.def: create_symbols_file.py
 cygsndfile.def: create_symbols_file.py
 	./create_symbols_file.py cygwin $(VERSION) > cygsndfile.def
 
+Symbols.os2: create_symbols_file.py
+	./create_symbols_file.py os2 $(VERSION) > Symbols.os2
+
 # Fake dependancy to force the creation of these files.
-sndfile.o : Symbols.linux Symbols.darwin libsndfile.def cygsndfile.def
+sndfile.o : Symbols.linux Symbols.darwin libsndfile.def cygsndfile.def Symbols.os2
 
 #======================================================================
 # Disable autoheader.
diff --git a/src/create_symbols_file.py b/src/create_symbols_file.py
index 301674ae..12a63f41 100755
--- a/src/create_symbols_file.py
+++ b/src/create_symbols_file.py
@@ -113,7 +113,7 @@ def os2_symbols (progname, version, name):
 	print "DATA PRELOAD MOVEABLE MULTIPLE NONSHARED"
 	print "EXPORTS\n"
 	for name, ordinal in ALL_SYMBOLS:
-        	print "%-20s @%s" % (name, ordinal)
+        	print "_%-20s @%s" % (name, ordinal)
 	print
 	return