diff --git a/CHANGES b/CHANGES
index ccaeb0cf5bc433de2a52fa9f4f72cb2df0af652b..99ee52c1e8b6a122a5fc0f17baa4fd5c9a2bef35 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
-? - ??
-- Can build with --disable-esd option
+0.8.5 - March 12, 2004
+- Support now for the ALSA 1.0 API
+- Can build with --disable-esd option again
+- Minor build fixes
+- ALSA mmap() mode can be enabled/disabled at runtime using "use_mmap"
+  option.
+- Patch to OSS plugin to fix skipping issues with some drivers
+  (like emu10k1).
 
 0.8.4 - October 4, 2003
 - Added AIX sound driver from Stefan Tibus <sjti@gmx.net>
diff --git a/README b/README
index 37422e8ac61ad9c760b48b6afa124fa4d52be9da..f0e37778d68402f384814cc0e2053e4656697af9 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-libao - A Cross-platform Audio Library, Version 0.8.4
+libao - A Cross-platform Audio Library, Version 0.8.5
 
 Originally Copyright (C) Aaron Holtzman - May 1999
-Changes Copyright (C) Stan Seibert - July 2000
+Changes Copyright (C) Stan Seibert - July 2000-March 2004
 More Changes Copyright (C) Jack Moffitt - October 2000
 
 libao is free software; you can redistribute it and/or modify
diff --git a/debian/copyright b/debian/copyright
index 9c8be533ed1257af5a1d4826eed34e1ed345eb79..0c42efff204a1a6957c8d032282a52a63a09ed09 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,15 @@ Sun, 29 Oct 2000 00:39:24 -0500.
 It was downloaded from http://www.vorbis.com/download_unix.psp
 
 Upstream Authors:	Aaron Holtzman
-			Stan Seibert <indigo@aztec.asu.edu>
+			Stan Seibert <volsung@xiph.org>
 			Jack Moffitt <jack@xiph.org>
 			Ralph Giles <giles@xiph.org>
+			Warren Dukes <shank@xiph.org>			
 
 Copyright:
 
 Originally Copyright (C) Aaron Holtzman - May 1999
-Changes Copyright (C) Stan Seibert - July 2000
+Changes Copyright (C) Stan Seibert - July 2000-March 2004
 
 You are free to distribute this software under the terms of the GNU
 General Public License.  On Debian systems, the complete text of the
diff --git a/doc/ao_append_option.html b/doc/ao_append_option.html
index 08119fbfdc5a6b1d1b8afba5223e60cf87df2e5e..302b3cf12e8ff826e7d7158762d19d70380edee8 100644
--- a/doc/ao_append_option.html
+++ b/doc/ao_append_option.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -59,7 +59,7 @@ int ao_append_option(<a href="ao_option.html">ao_option</a> **options, const cha
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_close.html b/doc/ao_close.html
index ec6ac1451994208e73e3cfa937bd267b469d1665..0bf6ae65cf9d772b7264161c41ec52017d54e607 100644
--- a/doc/ao_close.html
+++ b/doc/ao_close.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -54,7 +54,7 @@ device was writing to a file, the file may be corrupted.</li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_default_driver_id.html b/doc/ao_default_driver_id.html
index db53eed3926258106ddfdec90b4ea8a9c8bff902..e5b877a3d339c9fbbcdd66b7cd7cdb7b9036781e 100644
--- a/doc/ao_default_driver_id.html
+++ b/doc/ao_default_driver_id.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -53,7 +53,7 @@ to test your application.</p>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_device.html b/doc/ao_device.html
index 8813aa7102a3b2d99c9602fe2f6f37c8726db7e1..d8ccf3e5157873796ba0cc072479a7c3e47f4447 100644
--- a/doc/ao_device.html
+++ b/doc/ao_device.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -79,7 +79,7 @@ different byte orders, otherwise set to NULL</dd>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_driver_id.html b/doc/ao_driver_id.html
index c07eaf0f75cd8e60b6ae417b840360d79aafa564..663c2651291fd82d6c4c385f8bdeac5d34dad2b0 100644
--- a/doc/ao_driver_id.html
+++ b/doc/ao_driver_id.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -54,7 +54,7 @@ drivers</a> for valid short names.</dd>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_driver_info.html b/doc/ao_driver_info.html
index 4917dc5b87b97d17915cebeefd3fdab85d3d6aa7..6898cf5ec1555ca27976b25862fe168eca86ce1e 100644
--- a/doc/ao_driver_info.html
+++ b/doc/ao_driver_info.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -57,7 +57,7 @@ an actual driver</li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_driver_info_list.html b/doc/ao_driver_info_list.html
index cd850a5af9c31c9b51c84405648602d89bed0d15..b9dcd9054e6d905ccc5d72b51529491aa0bbbcc8 100644
--- a/doc/ao_driver_info_list.html
+++ b/doc/ao_driver_info_list.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -53,7 +53,7 @@ elements.</li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_file_extension.html b/doc/ao_file_extension.html
index a7de59b8536a2d0f90373d536aff1af0a5d5b7db..a596f285909c77839f7e1142db7c4da6066a3762 100644
--- a/doc/ao_file_extension.html
+++ b/doc/ao_file_extension.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -58,7 +58,7 @@ this driver does not exist.</li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_free_options.html b/doc/ao_free_options.html
index a88e0eccfba5fc337ae593d6a54e5ee1f4dc53d4..6278615d4d35a5ba2b27ffe361e833d06eec680b 100644
--- a/doc/ao_free_options.html
+++ b/doc/ao_free_options.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -46,7 +46,7 @@ function does nothing.</dd>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_info.html b/doc/ao_info.html
index ced5a3c6414c0d383d1fed3f9144e79daf1a7c79..78d9e1e651f96e43ddca1c6cd125844a68f0590e 100644
--- a/doc/ao_info.html
+++ b/doc/ao_info.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -84,7 +84,7 @@ driver.</dd>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_initialize.html b/doc/ao_initialize.html
index 3a8173cae7a4044e185afdcb382e7604f90aec59..9d3a8e16e4324a0c5ae538cdb2b56c213b94dca0 100644
--- a/doc/ao_initialize.html
+++ b/doc/ao_initialize.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -49,7 +49,7 @@ ao_shutdown(), then call ao_initialize() again.
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_open_file.html b/doc/ao_open_file.html
index 63aef74a558a8cfe86696b419662f7af5eb9afc8..f6c3935f5d72a1d3375ee56b14fefd20e16c3ea9 100644
--- a/doc/ao_open_file.html
+++ b/doc/ao_open_file.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -90,7 +90,7 @@ just the input sample format.
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_open_live.html b/doc/ao_open_live.html
index dc35933318a57cca3cb91812be5f29ead0c6c689..388c7c848e2affed90fa31d9d5ebfc6c736a3b69 100644
--- a/doc/ao_open_live.html
+++ b/doc/ao_open_live.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -76,7 +76,7 @@ href="ao_open_file.html">ao_open_file()</a> instead.
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_option.html b/doc/ao_option.html
index 2741f6dd2c49af8ac7832e695e60110b42913a62..960a29890803aacfd26beb857171e0c9051cf0d8 100644
--- a/doc/ao_option.html
+++ b/doc/ao_option.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -50,7 +50,7 @@ the list.</dd>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_play.html b/doc/ao_play.html
index c8ad7beddf2ba3e5097c96c284c7c7170fb9b0c3..1003ed3991956c4a7e3843a7fc739b9cc72baece 100644
--- a/doc/ao_play.html
+++ b/doc/ao_play.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -58,7 +58,7 @@ int ao_play(<a href="ao_device.html">ao_device</a> *device, void *output_samples
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_plugin_close.html b/doc/ao_plugin_close.html
index cb388a0782e42d9bd549557b68351a23ff9922f6..39cfec12d568ba4f73571a12081c18ff4569eb7d 100644
--- a/doc/ao_plugin_close.html
+++ b/doc/ao_plugin_close.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -52,7 +52,7 @@ device was writing to a file, the file may be corrupted.</li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_plugin_device_clear.html b/doc/ao_plugin_device_clear.html
index 0666500853e4f2593c1e2ece7062d8063c226603..7da767a76520d27fc50b4f9ae6afb3609913d93b 100644
--- a/doc/ao_plugin_device_clear.html
+++ b/doc/ao_plugin_device_clear.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -44,7 +44,7 @@ void ao_plugin_device_clear(<a href="ao_device.html">ao_device</a> *device);
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_plugin_device_init.html b/doc/ao_plugin_device_init.html
index 8fbb6209be5149563faf4e0ca6d8486bbc2354ac..bd19d44dca8d2619508e9e53c2d6da8af480d7d9 100644
--- a/doc/ao_plugin_device_init.html
+++ b/doc/ao_plugin_device_init.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -58,7 +58,7 @@ called to ensure the deallocate of all private data structures.</li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_plugin_driver_info.html b/doc/ao_plugin_driver_info.html
index cd02e5d6977c25260233be5427b3398fb5d3a10d..4960df30098a691227cf6d5711d7729aaae2ba5b 100644
--- a/doc/ao_plugin_driver_info.html
+++ b/doc/ao_plugin_driver_info.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -45,7 +45,7 @@ not be modified. </li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_plugin_file_extension.html b/doc/ao_plugin_file_extension.html
index c1dcd52959245f108e1e7c4549e8f74d66d7d0cf..47cfef485632310f6cedfd7bf3c8f7ba10bdd8a1 100644
--- a/doc/ao_plugin_file_extension.html
+++ b/doc/ao_plugin_file_extension.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -50,7 +50,7 @@ function.</li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_plugin_open.html b/doc/ao_plugin_open.html
index 3edfde941cbb57f9c5614d398a4ea1eea6ea0d70..5a0ab834f5b3f1861ddfe61dcdeeae3cd6a5306a 100644
--- a/doc/ao_plugin_open.html
+++ b/doc/ao_plugin_open.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -62,7 +62,7 @@ called to ensure the deallocate of all private data structures.</li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_plugin_play.html b/doc/ao_plugin_play.html
index 8763f3a2e419596a895b85f85f8e27cd8d781b27..98be3488dcbe9c81b0c553be76aad943ffd61721 100644
--- a/doc/ao_plugin_play.html
+++ b/doc/ao_plugin_play.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -61,7 +61,7 @@ called.</li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_plugin_set_option.html b/doc/ao_plugin_set_option.html
index 718fd19fe7e702613d7f3b620ff0821d316916f1..0582f8d916fa5bfba84eb690553cbbd88dffcdf7 100644
--- a/doc/ao_plugin_set_option.html
+++ b/doc/ao_plugin_set_option.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -64,7 +64,7 @@ called to ensure the deallocate of all private data structures.</li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_plugin_test.html b/doc/ao_plugin_test.html
index 28e1fcb4580b0c024eec0e359a91202597c5209c..052e35f9eba04a019b953aa09f4186e9f632c048 100644
--- a/doc/ao_plugin_test.html
+++ b/doc/ao_plugin_test.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -50,7 +50,7 @@ options.</li>
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_sample_format.html b/doc/ao_sample_format.html
index 7c72372d2f8c59a5ee0a7f8696edb415521e6671..81c0ac563ee13a411cb1b1043c61fb6f8989d607 100644
--- a/doc/ao_sample_format.html
+++ b/doc/ao_sample_format.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -53,7 +53,7 @@
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/ao_shutdown.html b/doc/ao_shutdown.html
index 5837acdbceb65403b7c563d284157e9f3ad7307a..8f8f8b4abc856f319bcb1618761e12e8caebb9a9 100644
--- a/doc/ao_shutdown.html
+++ b/doc/ao_shutdown.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -46,7 +46,7 @@ calling ao_shutdown().
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/config.html b/doc/config.html
index f887fd06dad74b8371b63e7b66fe9203de6adc0e..ac580e0d2292caf9c59c96808701488fb96958f4 100644
--- a/doc/config.html
+++ b/doc/config.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -47,7 +47,7 @@ There can be no extra spaces anywhere on the line.  Comment lines begin with a <
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/drivers.html b/doc/drivers.html
index 500e31eb1c5a6acdc2fc72aafebfafbb966b0c42..adfe7ee8d8a2ac70c09b4df70c2e79b5c11efc53 100644
--- a/doc/drivers.html
+++ b/doc/drivers.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -237,7 +237,7 @@ easily used to define an appropriate default output device
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/index.html b/doc/index.html
index 7598790886c051fde489a184fbe5e4b62199edfa..231bfbc54b5cb297648bca820ea2b118d3cb6a63 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -43,7 +43,7 @@ platforms.  It currently supports:
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/libao-api.html b/doc/libao-api.html
index fb7cf576ed8f64e3a858d1b9d0cbcc3d599ca18b..2acef596b51d96cae8419189d95bd69e9275759b 100644
--- a/doc/libao-api.html
+++ b/doc/libao-api.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -52,7 +52,7 @@
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/overview.html b/doc/overview.html
index 5b043f1840a296d8e3eb0bd84ae4837e9ed93914..28ce44ab0c15a2429c9d356d0ac2e469d3643bb3 100644
--- a/doc/overview.html
+++ b/doc/overview.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -100,7 +100,7 @@ library.
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/plugin-api.html b/doc/plugin-api.html
index af44a1649d516cbb0fe2ffe93a75635d21b1c8c8..26388626b64ea57220969e6dbaf09b727c74175f 100644
--- a/doc/plugin-api.html
+++ b/doc/plugin-api.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -34,7 +34,7 @@
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/doc/plugin-overview.html b/doc/plugin-overview.html
index b2bd698341e84b73bfa7b00f0e71cf4f3ec9377b..6018f6c9619a4e0aad4ca1da066729fd5c5a539e 100644
--- a/doc/plugin-overview.html
+++ b/doc/plugin-overview.html
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
@@ -159,7 +159,7 @@ href="ao_info.html">ao_info</a> structure.
 <td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung@xiph.org">volsung@xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.4 - 20030901</p></td>
+<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
 </tr>
 </table>
 
diff --git a/libao.spec b/libao.spec
index ffddf7f6d6002f0511d328fd764e50c19e5ba555..c3c9f7e70ad71576d42aac4b82a291e1b65071b8 100644
--- a/libao.spec
+++ b/libao.spec
@@ -1,5 +1,5 @@
 Name:		libao
-Version:	0.8.4
+Version:	0.8.5
 Release:	1
 Summary:	Cross-Platform Audio Output Library
 
@@ -82,7 +82,10 @@ fi
 %{_libdir}/pkgconfig/ao.pc
 
 %changelog
-* Fri Oct 5 2002 Stan Seibert <volsung@xiph.org> 0.8.4-1
+* Fri Mar 11 2004 Stan Seibert <volsung@xiph.org> 0.8.5-1
+- Version bump
+
+* Fri Oct 5 2003 Stan Seibert <volsung@xiph.org> 0.8.4-1
 - Remove alsa libraries from RPM since RedHat doesn't ship with ALSA
   ALSA users will need to recompile from source.
 - Add ao.pc to -devel