diff --git a/doc/html/changelog.html b/doc/html/changelog.html
index fa861983..eeea9e76 100644
--- a/doc/html/changelog.html
+++ b/doc/html/changelog.html
@@ -415,7 +415,7 @@
 			<li>
 				General:
 				<ul>
-					<li>Move development to Xiph.org <a href="http://git.xiph.org/?p=flac.git;a=summary">git repository</a>.</li>
+					<li>Move development to Xiph.org git repository.</li>
 					<li>The <span class="argument"><a href="documentation_tools_flac.html#flac_options_sector_align">--sector-align</a></span> option of <span class="commandname">flac</span> has been deprecated and may not exist in future versions.  <a href="http://www.etree.org/shnutils/shntool/">shntool</a> provides similar functionality.</li>
 					<li>Support for the RF64 and Wave64 formats in <span class="commandname">flac</span> (see below).</li>
 					<li>Better handling of cuesheets with non-CD-DA sample rates.</li>
diff --git a/doc/html/developers.html b/doc/html/developers.html
index 06d31c0f..12fcd038 100644
--- a/doc/html/developers.html
+++ b/doc/html/developers.html
@@ -54,8 +54,9 @@
 			<li><a href="format.html">FLAC Format Specification</a> - The formal specification.</li>
 			<li><a href="ogg_mapping.html">Ogg FLAC Mapping</a> - How FLAC should be embedded in an Ogg container.</li>
 			<li><a href="id.html">ID Registration</a> - Register an ID if you need to write custom metadata.</li>
-			<li><a href="https://git.xiph.org/?p=flac.git;a%3Dsummary">Git access</a> - for checking out the source code.</li>
-			<li><a href="http://sourceforge.net/p/flac/bugs/">Bug Tracker</a> - to submit bug reports and patches</li>
+			<li><a href="https://github.com/xiph/flac">Git access</a> - for checking out the source code.</li>
+			<li><a href="https://github.com/xiph/flac/issues">Github Issues</a> - to submit bug reports
+			<li><a href="https://github.com/xiph/flac/pulls">Github Pulls</a> - to submit patches</li>
 		</ul>
 	</div>
 	<div class="box_footer"></div>
diff --git a/doc/html/documentation_example_code.html b/doc/html/documentation_example_code.html
index dea608a2..bf078be4 100644
--- a/doc/html/documentation_example_code.html
+++ b/doc/html/documentation_example_code.html
@@ -42,7 +42,7 @@
 	</div>
 	<div class="box_header"></div>
 	<div class="box_body">
-		The FLAC source code has several small example programs that demonstrate how to use the libraries.  The source is available on the <a href="http://xiph.org/flac/download.html">download page</a>, or can be <a href="https://git.xiph.org/?p=flac.git">checked out from git</a>.  The examples complement the <a href="api/index.html">API documentation</a>.<br />
+		The FLAC source code has several small example programs that demonstrate how to use the libraries.  The source is available on the <a href="http://xiph.org/flac/download.html">download page</a>, or can be <a href="https://gitlab.xiph.org/xiph/flac">checked out from git</a>.  The examples complement the <a href="api/index.html">API documentation</a>.<br />
 		<br />
 		Currently the examples show how to encode WAV files to FLAC and vice-versa using both libFLAC and libFLAC++.  Over time we'll be adding more examples.
 	</div>
diff --git a/doc/html/license.html b/doc/html/license.html
index 22733880..b5d2accd 100644
--- a/doc/html/license.html
+++ b/doc/html/license.html
@@ -48,7 +48,7 @@
 		<br />
 		The FLAC project also makes available software that implements the formats, which is distributed according to <a href="http://opensource.org/docs/definition.php">Open Source</a> licenses as follows:<br />
 		<br />
-		The reference implementation libraries are licensed under the New <!-- <a href="http://www.xiph.org/licenses/bsd/"> --><a href="https://git.xiph.org/?p=flac.git;a=blob_plain;f=COPYING.Xiph">BSD License</a>.  In simple terms, these libraries may be used by any application, Open or proprietary, linked or incorporated in whole, so long as acknowledgement is made to Xiph.org Foundation when using the source code in whole or in derived works.  The Xiph License is free enough that the libraries have been used in commercial products to implement FLAC, including in the firmware of hardware devices where other Open Source licenses can be problematic.  In the source code these libraries are called <span class="commandname">libFLAC</span> and <span class="commandname">libFLAC++</span>.<br />
+		The reference implementation libraries are licensed under the New <a href="https://gitlab.xiph.org/xiph/flac/-/blob/master/COPYING.Xiph">BSD License</a>.  In simple terms, these libraries may be used by any application, Open or proprietary, linked or incorporated in whole, so long as acknowledgement is made to Xiph.org Foundation when using the source code in whole or in derived works.  The Xiph License is free enough that the libraries have been used in commercial products to implement FLAC, including in the firmware of hardware devices where other Open Source licenses can be problematic.  In the source code these libraries are called <span class="commandname">libFLAC</span> and <span class="commandname">libFLAC++</span>.<br />
 		<br />
 		The rest of the software that the FLAC project provides is licensed under the <a href="http://www.gnu.org/licenses/licenses.html#GPL">GNU General Public License</a> (GPL).  This software includes various utilities for converting files to and from FLAC format, plugins for audio players, et cetera.  In general, the GPL allows redistribution as long as derived works are also made available in source code form according to compatible terms.<br />
 		<br />