diff --git a/doc/html/changelog.html b/doc/html/changelog.html
index f1c3f7d8..d5867146 100644
--- a/doc/html/changelog.html
+++ b/doc/html/changelog.html
@@ -53,7 +53,6 @@
 
 		<br />
 
-<!--
 		<a name="flac_1_1_4"><b>FLAC 1.1.4</b></a>
 
 		<br />
@@ -83,31 +82,32 @@
 				<ul>
 					<li>Improved compression with no impact on format or decoding speed.</li>
 					<li>Encoding and decoding speedups across the board.  Encoding at -8 is twice as fast.</li>
-					<li>Added a new option <span class="argument"><a href="documentation_tools_flac.html#flac_options_warnings_as_errors">-w,-@@@@@@-warnings-as-errors</a></span> for treating all warnings as errors.</li>
-					<li>Allow <span class="argument"><a href="documentation_tools_flac.html#flac_options_picture">-@@@@@@-picture</a></span> option to take only a filename, and have all other attributes extracted from the file itself.</li>
+					<li>Added a new option <span class="argument"><a href="documentation_tools_flac.html#flac_options_warnings_as_errors">-w,--warnings-as-errors</a></span> for treating all warnings as errors.</li>
+					<li>Allow <span class="argument"><a href="documentation_tools_flac.html#flac_options_picture">--picture</a></span> option to take only a filename, and have all other attributes extracted from the file itself.</li>
 					<li>Fixed a bug that caused suboptimal default compression settings in some locales (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1608883&amp;group_id=13478&amp;atid=113478">SF #1608883</a>).</li>
 					<li>Fixed a bug where FLAC-to-FLAC transcoding of a corrupted FLAC file would truncate the transcoded file at the first error (<a href="http://sourceforge.net/tracker/index.php?func=detail&amp;aid=1615019&amp;group_id=13478&amp;atid=113478">SF #1615019</a>).</li>
 					<li>Fixed a bug where using <span class="argument"><a href="documentation_tools_flac.html#flac_options_decode_through_errors">-F</a></span> with FLAC-to-FLAC transcoding of a corrupted FLAC would have no effect (<a href="http://sourceforge.net/tracker/index.php?func=detail&amp;aid=1615391&amp;group_id=13478&amp;atid=113478">SF #1615391</a>).</li>
-					<li>Fixed a bug where for new PICTURE metadata blocks specified with <span class="argument"><a href="documentation_tools_flac.html#flac_options_picture">-@@@@@@-picture</a></span> would not be transferred during FLAC-to-FLAC transcoding (<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=1627993&group_id=13478&atid=113478">SF #1627993</a>).</li>
+					<li>Fixed a bug where for new PICTURE metadata blocks specified with <span class="argument"><a href="documentation_tools_flac.html#flac_options_picture">--picture</a></span> would not be transferred during FLAC-to-FLAC transcoding (<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=1627993&group_id=13478&atid=113478">SF #1627993</a>).</li>
 				</ul>
 			</li>
 			<li>
 				metaflac:
 				<ul>
-					<li>Allow <span class="argument"><a href="documentation_tools_metaflac.html#metaflac_shorthand_import_picture_from">-@@@@@@-import-picture-from</a></span> option to take only a filename, and have all other attributes extracted from the file itself.</li>
+					<li>Allow <span class="argument"><a href="documentation_tools_metaflac.html#metaflac_shorthand_import_picture_from">--import-picture-from</a></span> option to take only a filename, and have all other attributes extracted from the file itself.</li>
 					<li>(none)</li>
 				</ul>
 			</li>
 			<li>
 				plugins:
 				<ul>
-					<li>(none)</li>
+					<li>Fixed a bug in the XMMS plugin where Ctrl-3 (file info) would cause a crash if the file did not exist (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1634941&amp;group_id=13478&amp;amp;atid=313478">SF #1634941</a>).</li>
 				</ul>
 			</li>
 			<li>
 				build system:
 				<ul>
-					<li>Fixed a makefile linkage bug with libogg (<a href="http://sourceforge.net/tracker/index.php?func=detail&amp;aid=1611414&amp;group_id=13478&amp;atid=113478">SF #1611414</a>).</li>
+					<li>Fixed a makefile linkage bug with libogg (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1611414&amp;group_id=13478&amp;atid=113478">SF #1611414</a>).</li>
+					<li>Added pgk-config files for libFLAC and libFLAC++ (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1647881&amp;group_id=13478&amp;atid=313478">SF #1647881</a>).</li>
 				</ul>
 			</li>
 			<li>
@@ -130,7 +130,7 @@
 					<li>
 						libFLAC:
 						<ul>
-							<li>(none)</li>
+							<li>FLAC__stream_encoder_set_metadata() now makes a copy of the "metadata" array of pointers (but not copies of the objects themselves) so the client does not need to maintain its copy of the array after the call.</li>
 						</ul>
 					</li>
 					<li>
@@ -145,7 +145,6 @@
 
 		<br />
 
--->
 		<a name="flac_1_1_3"><b>FLAC 1.1.3</b></a>
 
 		<br />