diff --git a/README b/README
index ef68aead..66891bdf 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 ==========
-FLAC - 0.8
+FLAC - 0.9
 ==========
 
 This is the source release for the FLAC project.  The
diff --git a/configure.in b/configure.in
index 0b61cb43..139b8ddb 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(src/flac/main.c)
-AM_INIT_AUTOMAKE(flac, 0.8)
+AM_INIT_AUTOMAKE(flac, 0.9)
 
 # We need two libtools, one that builds both shared and static, and
 # one that builds only static.  This is because the resulting libtool
diff --git a/doc/comparison.html b/doc/comparison.html
index 135b484a..b40539cc 100644
--- a/doc/comparison.html
+++ b/doc/comparison.html
@@ -151,7 +151,7 @@
 		</TR>
 		<TR>
 			<TD ALIGN="RIGHT" BGCOLOR="#F4F4CC">
-				flac v0.8
+				flac v0.9
 			</TD>
 			<TD>
 				YES
@@ -398,7 +398,7 @@
 		<TR><TD>LPAC 1.20 (-r, normal)</TD><TD>20:49.34</TD><TD>393.16 MB</TD><TD>0.5223</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, high)</TD><TD>88:20.18</TD><TD>393.12 MB</TD><TD>0.5223</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, extra high)</TD><TD>109:27.86</TD><TD>393.93 MB</TD><TD>0.5234</TD></TR>
-		<TR BGCOLOR="#D3D4C5"><TD>flac 0.8 (-6)</TD><TD>17:37.42</TD><TD>398.19 MB</TD><TD>0.5290</TD></TR>
+		<TR BGCOLOR="#D3D4C5"><TD>flac 0.9 (-6)</TD><TD>17:37.42</TD><TD>398.19 MB</TD><TD>0.5290</TD></TR>
 		<TR><TD>WavPack 3.6 (high)</TD><TD>10:05.48</TD><TD>403.70 MB</TD><TD>0.5363</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Kexis 0.2.2</TD><TD>17:17.42</TD><TD>416.93 MB</TD><TD>0.5539</TD></TR>
 		<TR><TD>Shorten 2.3a (-p0 -b1024)</TD><TD>6:41.17</TD><TD>417.24 MB</TD><TD>0.5543</TD></TR>
@@ -440,7 +440,7 @@
 		<TR><TD>Monkey's Audio (high)</TD><TD>0:41.98</TD><TD>43.85 MB</TD><TD>0.7500</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>RKAU 1.06 (high)</TD><TD>8:12.44</TD><TD>43.87 MB</TD><TD>0.7503</TD></TR>
 		<TR><TD>RKAU 1.06 (normal)</TD><TD>2:59.56</TD><TD>43.88 MB</TD><TD>0.7504</TD></TR>
-		<TR BGCOLOR="#D3D4C5"><TD>flac 0.8 (-6)</TD><TD>1:24.76</TD><TD>44.38 MB</TD><TD>0.7590</TD></TR>
+		<TR BGCOLOR="#D3D4C5"><TD>flac 0.9 (-6)</TD><TD>1:24.76</TD><TD>44.38 MB</TD><TD>0.7590</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, high)</TD><TD>6:51.24</TD><TD>44.42 MB</TD><TD>0.7598</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, normal)</TD><TD>1:45.72</TD><TD>44.44 MB</TD><TD>0.7601</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, extra high)</TD><TD>7:50.80</TD><TD>44.44 MB</TD><TD>0.7601</TD></TR>
@@ -463,7 +463,7 @@
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, normal)</TD><TD>1:52.22</TD><TD>40.57 MB</TD><TD>0.6314</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, high)</TD><TD>7:36.55</TD><TD>40.61 MB</TD><TD>0.6320</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, extra high)</TD><TD>9:49.64</TD><TD>40.71 MB</TD><TD>0.6336</TD></TR>
-		<TR><TD>flac 0.8 (-6)</TD><TD>1:32.16</TD><TD>41.01 MB</TD><TD>0.6382</TD></TR>
+		<TR><TD>flac 0.9 (-6)</TD><TD>1:32.16</TD><TD>41.01 MB</TD><TD>0.6382</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>WavPack 3.6 (high)</TD><TD>0:52.37</TD><TD>41.72 MB</TD><TD>0.6492</TD></TR>
 		<TR><TD>Kexis 0.2.2</TD><TD>1:30.85</TD><TD>42.75 MB</TD><TD>0.6652</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Shorten 2.3a (-p8 -b2048)</TD><TD>0:50.22</TD><TD>43.05 MB</TD><TD>0.6701</TD></TR>
@@ -482,7 +482,7 @@
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, extra high)</TD><TD>6:04.27</TD><TD>23.95 MB</TD><TD>0.7175</TD></TR>
 		<TR><TD>RKAU 1.06 (normal)</TD><TD>1:32.20</TD><TD>24.04 MB</TD><TD>0.7202</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>RKAU 1.06 (high)</TD><TD>3:21.70</TD><TD>24.04 MB</TD><TD>0.7202</TD></TR>
-		<TR><TD>flac 0.8 (-6)</TD><TD>0:48.17</TD><TD>24.31 MB</TD><TD>0.7284</TD></TR>
+		<TR><TD>flac 0.9 (-6)</TD><TD>0:48.17</TD><TD>24.31 MB</TD><TD>0.7284</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Shorten 2.3a (-p8 -b2048)</TD><TD>0:27.03</TD><TD>25.12 MB</TD><TD>0.7525</TD></TR>
 		<TR><TD>WavPack 3.6 (high)</TD><TD>0:28.07</TD><TD>25.44 MB</TD><TD>0.7621</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Kexis 0.2.2</TD><TD>0:47.07</TD><TD>26.03 MB</TD><TD>0.7799</TD></TR>
@@ -501,7 +501,7 @@
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, normal)</TD><TD>1:07.58</TD><TD>23.45 MB</TD><TD>0.6000</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, high)</TD><TD>4:47.03</TD><TD>23.49 MB</TD><TD>0.6008</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, extra high)</TD><TD>5:50.53</TD><TD>23.52 MB</TD><TD>0.6016</TD></TR>
-		<TR><TD>flac 0.8 (-6)</TD><TD>0:55.86</TD><TD>23.57 MB</TD><TD>0.6028</TD></TR>
+		<TR><TD>flac 0.9 (-6)</TD><TD>0:55.86</TD><TD>23.57 MB</TD><TD>0.6028</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>WavPack 3.6 (high)</TD><TD>0:31.44</TD><TD>24.30 MB</TD><TD>0.6217</TD></TR>
 		<TR><TD>Shorten 2.3a (-p8 -b2048)</TD><TD>0:30.45</TD><TD>24.72 MB</TD><TD>0.6324</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Kexis 0.2.2</TD><TD>0:55.13</TD><TD>24.80 MB</TD><TD>0.6345</TD></TR>
@@ -515,7 +515,7 @@
 		</TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Monkey's Audio (extra high)</TD><TD>1:15.79</TD><TD>30.12 MB</TD><TD>0.6670</TD></TR>
 		<TR><TD>Monkey's Audio (high)</TD><TD>0:29.68</TD><TD>30.32 MB</TD><TD>0.6716</TD></TR>
-		<TR BGCOLOR="#D3D4C5"><TD>flac 0.8 (-6)</TD><TD>1:06.17</TD><TD>30.81 MB</TD><TD>0.6824</TD></TR>
+		<TR BGCOLOR="#D3D4C5"><TD>flac 0.9 (-6)</TD><TD>1:06.17</TD><TD>30.81 MB</TD><TD>0.6824</TD></TR>
 		<TR><TD>RKAU 1.06 (high)</TD><TD>6:52.69</TD><TD>30.83 MB</TD><TD>0.6828</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>RKAU 1.06 (normal)</TD><TD>2:41.42</TD><TD>30.87 MB</TD><TD>0.6837</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, normal)</TD><TD>1:20.29</TD><TD>31.03 MB</TD><TD>0.6871</TD></TR>
@@ -537,7 +537,7 @@
 		<TR BGCOLOR="#D3D4C5"><TD>Monkey's Audio (extra high)</TD><TD>1:28.45</TD><TD>34.65 MB</TD><TD>0.6535</TD></TR>
 		<TR><TD>Monkey's Audio (high)</TD><TD>0:24.17</TD><TD>34.91 MB</TD><TD>0.6586</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, normal)</TD><TD>1:34.16</TD><TD>35.10 MB</TD><TD>0.6621</TD></TR>
-		<TR><TD>flac 0.8 (-6)</TD><TD>1:16.50</TD><TD>35.16 MB</TD><TD>0.6633</TD></TR>
+		<TR><TD>flac 0.9 (-6)</TD><TD>1:16.50</TD><TD>35.16 MB</TD><TD>0.6633</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, high)</TD><TD>6:39.29</TD><TD>35.17 MB</TD><TD>0.6633</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, extra high)</TD><TD>7:39.28</TD><TD>35.19 MB</TD><TD>0.6638</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Shorten 2.3a (-p8 -b2048)</TD><TD>0:40.44</TD><TD>35.39 MB</TD><TD>0.6676</TD></TR>
@@ -558,7 +558,7 @@
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, extra high)</TD><TD>3:06.27</TD><TD>7.48 MB</TD><TD>0.3591</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, high)</TD><TD>2:21.16</TD><TD>7.48 MB</TD><TD>0.3593</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Monkey's Audio (high)</TD><TD>0:12.58</TD><TD>7.56 MB</TD><TD>0.3634</TD></TR>
-		<TR><TD>flac 0.8 (-6)</TD><TD>0:28.10</TD><TD>7.83 MB</TD><TD>0.3760</TD></TR>
+		<TR><TD>flac 0.9 (-6)</TD><TD>0:28.10</TD><TD>7.83 MB</TD><TD>0.3760</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>WavPack 3.6 (high)</TD><TD>0:16.11</TD><TD>7.99 MB</TD><TD>0.3838</TD></TR>
 		<TR><TD>Shorten 2.3a (-p0 -b1024)</TD><TD>0:07.92</TD><TD>8.16 MB</TD><TD>0.3921</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Shorten 2.3a (-p8 -b2048)</TD><TD>0:13.88</TD><TD>8.28 MB</TD><TD>0.3977</TD></TR>
@@ -578,7 +578,7 @@
 		<TR><TD>LPAC 1.20 (-r, normal)</TD><TD>1:28.02</TD><TD>22.32 MB</TD><TD>0.3972</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, extra high)</TD><TD>8:13.86</TD><TD>22.38 MB</TD><TD>0.3983</TD></TR>
 		<TR><TD>WavPack 3.6 (high)</TD><TD>0:43.84</TD><TD>22.53 MB</TD><TD>0.4010</TD></TR>
-		<TR BGCOLOR="#D3D4C5"><TD>flac 0.8 (-6)</TD><TD>1:16.36</TD><TD>22.64 MB</TD><TD>0.4030</TD></TR>
+		<TR BGCOLOR="#D3D4C5"><TD>flac 0.9 (-6)</TD><TD>1:16.36</TD><TD>22.64 MB</TD><TD>0.4030</TD></TR>
 		<TR><TD>Kexis 0.2.2</TD><TD>1:14.81</TD><TD>23.42 MB</TD><TD>0.4168</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Shorten 2.3a (-p0 -b1024)</TD><TD>0:29.33</TD><TD>23.63 MB</TD><TD>0.4205</TD></TR>
 		<TR><TD>Shorten 2.3a (-p8 -b2048)</TD><TD>0:38.05</TD><TD>25.58 MB</TD><TD>0.4552</TD></TR>
@@ -597,7 +597,7 @@
 		<TR><TD>LPAC 1.20 (-r, extra high)</TD><TD>12:18.79</TD><TD>35.83 MB</TD><TD>0.3558</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, normal)</TD><TD>2:33.43</TD><TD>36.05 MB</TD><TD>0.3580</TD></TR>
 		<TR><TD>WavPack 3.6 (high)</TD><TD>1:17.06</TD><TD>37.88 MB</TD><TD>0.3762</TD></TR>
-		<TR BGCOLOR="#D3D4C5"><TD>flac 0.8 (-6)</TD><TD>2:14.98</TD><TD>38.18 MB</TD><TD>0.3792</TD></TR>
+		<TR BGCOLOR="#D3D4C5"><TD>flac 0.9 (-6)</TD><TD>2:14.98</TD><TD>38.18 MB</TD><TD>0.3792</TD></TR>
 		<TR><TD>Shorten 2.3a (-p0 -b1024)</TD><TD>0:50.03</TD><TD>39.34 MB</TD><TD>0.3907</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Kexis 0.2.2</TD><TD>2:12.79</TD><TD>39.89 MB</TD><TD>0.3962</TD></TR>
 		<TR><TD>WaveZIP</TD><TD>1:05.60</TD><TD>43.67 MB</TD><TD>0.4337</TD></TR>
@@ -616,7 +616,7 @@
 		<TR><TD>RKAU 1.06 (normal)</TD><TD>1:58.42</TD><TD>10.97 MB</TD><TD>0.3994</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>RKAU 1.06 (high)</TD><TD>5:20.71</TD><TD>11.21 MB</TD><TD>0.4083</TD></TR>
 		<TR><TD>WavPack 3.6 (high)</TD><TD>0:22.32</TD><TD>11.52 MB</TD><TD>0.4193</TD></TR>
-		<TR BGCOLOR="#D3D4C5"><TD>flac 0.8 (-6)</TD><TD>0:38.49</TD><TD>11.70 MB</TD><TD>0.4259</TD></TR>
+		<TR BGCOLOR="#D3D4C5"><TD>flac 0.9 (-6)</TD><TD>0:38.49</TD><TD>11.70 MB</TD><TD>0.4259</TD></TR>
 		<TR><TD>Shorten 2.3a (-p0 -b1024)</TD><TD>0:13.56</TD><TD>12.01 MB</TD><TD>0.4374</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Kexis 0.2.2</TD><TD>0:37.61</TD><TD>12.14 MB</TD><TD>0.4419</TD></TR>
 		<TR><TD>WaveZIP</TD><TD>0:18.75</TD><TD>13.08 MB</TD><TD>0.4765</TD></TR>
@@ -634,7 +634,7 @@
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, normal)</TD><TD>0:25.98</TD><TD>7.27 MB</TD><TD>0.4436</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, high)</TD><TD>2:21.30</TD><TD>7.34 MB</TD><TD>0.4480</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, extra high)</TD><TD>3:00.91</TD><TD>7.38 MB</TD><TD>0.4500</TD></TR>
-		<TR><TD>flac 0.8 (-6)</TD><TD>0:22.26</TD><TD>7.38 MB</TD><TD>0.4504</TD></TR>
+		<TR><TD>flac 0.9 (-6)</TD><TD>0:22.26</TD><TD>7.38 MB</TD><TD>0.4504</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>WavPack 3.6 (high)</TD><TD>0:13.17</TD><TD>7.41 MB</TD><TD>0.4520</TD></TR>
 		<TR><TD>Shorten 2.3a (-p0 -b1024)</TD><TD>0:07.99</TD><TD>7.47 MB</TD><TD>0.4558</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Kexis 0.2.2</TD><TD>0:21.79</TD><TD>7.50 MB</TD><TD>0.4572</TD></TR>
@@ -652,7 +652,7 @@
 		<TR><TD>Monkey's Audio (high)</TD><TD>0:15.69</TD><TD>12.68 MB</TD><TD>0.5228</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, normal)</TD><TD>0:41.22</TD><TD>12.75 MB</TD><TD>0.5253</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, high)</TD><TD>3:40.65</TD><TD>12.88 MB</TD><TD>0.5309</TD></TR>
-		<TR BGCOLOR="#D3D4C5"><TD>flac 0.8 (-6)</TD><TD>0:34.14</TD><TD>12.90 MB</TD><TD>0.5318</TD></TR>
+		<TR BGCOLOR="#D3D4C5"><TD>flac 0.9 (-6)</TD><TD>0:34.14</TD><TD>12.90 MB</TD><TD>0.5318</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, extra high)</TD><TD>4:53.81</TD><TD>12.92 MB</TD><TD>0.5323</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>WavPack 3.6 (high)</TD><TD>0:20.21</TD><TD>13.15 MB</TD><TD>0.5420</TD></TR>
 		<TR><TD>Shorten 2.3a (-p0 -b1024)</TD><TD>0:12.71</TD><TD>13.28 MB</TD><TD>0.5475</TD></TR>
@@ -672,7 +672,7 @@
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, high)</TD><TD>23:13.96</TD><TD>97.80 MB</TD><TD>0.4579</TD></TR>
 		<TR><TD>LPAC 1.20 (-r, normal)</TD><TD>5:46.84</TD><TD>98.04 MB</TD><TD>0.4590</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>LPAC 1.20 (-r, extra high)</TD><TD>30:04.06</TD><TD>98.10 MB</TD><TD>0.4593</TD></TR>
-		<TR><TD>flac 0.8 (-6)</TD><TD>4:59.47</TD><TD>98.31 MB</TD><TD>0.4603</TD></TR>
+		<TR><TD>flac 0.9 (-6)</TD><TD>4:59.47</TD><TD>98.31 MB</TD><TD>0.4603</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>WavPack 3.6 (high)</TD><TD>2:50.35</TD><TD>99.53 MB</TD><TD>0.4660</TD></TR>
 		<TR><TD>Shorten 2.3a (-p0 -b1024)</TD><TD>1:53.28</TD><TD>102.54 MB</TD><TD>0.4801</TD></TR>
 		<TR BGCOLOR="#D3D4C5"><TD>Shorten 2.3a (-p8 -b2048)</TD><TD>2:34.37</TD><TD>102.59 MB</TD><TD>0.4803</TD></TR>
diff --git a/include/FLAC/format.h b/include/FLAC/format.h
index 64a68104..9dad9cc0 100644
--- a/include/FLAC/format.h
+++ b/include/FLAC/format.h
@@ -40,7 +40,7 @@
 #ifdef VERSION
 #define FLAC__VERSION_STRING VERSION
 #else
-#define FLAC__VERSION_STRING "0.8"
+#define FLAC__VERSION_STRING "0.9"
 #endif
 
 extern const byte     FLAC__STREAM_SYNC_STRING[4]; /* = "fLaC" */;