diff --git a/configure.ac b/configure.ac
index 5f2983e..9cd74c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -577,6 +577,14 @@
                     NASLIBS="-laudio -lXt \$(X_LIBS) \$(XLIB)"],,
                    [-lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS])])
 
+dnl **** Check for libaudioio (which can be used to get solaris audio support) ****
+
+AC_SUBST(AUDIOIOLIBS,"")
+AC_CHECK_HEADERS(libaudioio.h,
+    [AC_CHECK_LIB(audioio,AudioIOGetVersion,
+                  [AUDIOIOLIBS="-laudioio"
+                   AC_DEFINE(HAVE_LIBAUDIOIO, 1, [Define if you have libaudioIO])])])
+
 dnl **** Check for broken glibc mmap64 ****
 
 AC_CACHE_CHECK( [whether mmap64 works defined as mmap], ac_cv_mmap64_works,
@@ -922,6 +930,7 @@
 	float.h \
 	ieeefp.h \
 	io.h \
+	libaudioio.h \
 	libio.h \
 	libutil.h \
 	link.h \
@@ -1412,8 +1421,9 @@
 dlls/winmm/midimap/Makefile
 dlls/winmm/wavemap/Makefile
 dlls/winmm/winealsa/Makefile
-dlls/winmm/winenas/Makefile
 dlls/winmm/winearts/Makefile
+dlls/winmm/wineaudioio/Makefile
+dlls/winmm/winenas/Makefile
 dlls/winmm/wineoss/Makefile
 dlls/winnls/Makefile
 dlls/winsock/Makefile