diff --git a/documentation.html b/documentation.html
index 7a2f9b07b..359e1ddce 100644
--- a/documentation.html
+++ b/documentation.html
@@ -51,6 +51,11 @@
 
 <h1 id="d4">Supported sites</h1>
 
+<p>
+youtube-dl can download videos from a lot of sites, here's a list with some of the most popular.
+For a complete list, see the <a href="supportedsites.html">Supported sites</a> pages or execute <code>youtube-dl --list-extractors</code>.
+</p>
+
 <ul>
 <li>YouTube.com.</li>
 <li>YouTube.com playlists (playlist URLs in "view_play_list" form).</li>
@@ -86,10 +91,6 @@ Unsupported, see https://github.com/rg3/youtube-dl/issues/300
 <li>A generic downloader that works in some sites.</li>
 </ul>
 
-<p>
-For a complete list, execute <code>youtube-dl --list-extractors</code>.
-</p>
-
 <h1 id="d5">Proxy support</h1>
 
 <p>youtube-dl supports downloading videos through a proxy, by setting the <em>http_proxy</em> environment variable to the proxy URL, as in <code>http://proxy_machine_name:port/</code>.</p>
diff --git a/supportedsites.html b/supportedsites.html
new file mode 100644
index 000000000..21c3c78fc
--- /dev/null
+++ b/supportedsites.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+<title>youtube-dl: Supported sites</title>
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body>
+
+<table class="heading"><tr>
+	<td class="title"><a href="index.html">youtube-dl</a></td>
+	<td class="subtitle">Supported sites</td>
+</tr></table>
+
+<p>Here's is the list of all the supported sites, ordered alphabetically:</p>
+<ul>
+	<li><b>1up.com</b></li>
+	<li><b>220.ro</b></li>
+	<li><b>3sat</b></li>
+	<li><b>56.com</b></li>
+	<li><b>8tracks</b></li>
+	<li><b>ARD</b></li>
+	<li><b>AUEngine</b></li>
+	<li><b>AddAnime</b></li>
+	<li><b>AppleTrailers</b></li>
+	<li><b>Bandcamp</b></li>
+	<li><b>Break</b></li>
+	<li><b>Brightcove</b></li>
+	<li><b>CNN</b></li>
+	<li><b>CSpan</b></li>
+	<li><b>Canalc2</b></li>
+	<li><b>CollegeHumor</b></li>
+	<li><b>ComedyCentral</b>: The Daily Show / Colbert Report</li>
+	<li><b>CondeNast</b>: Condé Nast media group: GQ, Glamour, Vanity Fair, Vogue, W Magazine, WIRED</li>
+	<li><b>Criterion</b></li>
+	<li><b>DailymotionPlaylist</b></li>
+	<li><b>DepositFiles</b></li>
+	<li><b>Dotsub</b></li>
+	<li><b>Escapist</b></li>
+	<li><b>Flickr</b></li>
+	<li><b>Freesound</b></li>
+	<li><b>FunnyOrDie</b></li>
+	<li><b>GameSpot</b></li>
+	<li><b>Gametrailers</b></li>
+	<li><b>Hark</b></li>
+	<li><b>HotNewHipHop</b></li>
+	<li><b>Howcast</b></li>
+	<li><b>Hypem</b></li>
+	<li><b>Ina</b></li>
+	<li><b>InfoQ</b></li>
+	<li><b>Instagram</b></li>
+	<li><b>JeuxVideo</b></li>
+	<li><b>Jukebox</b></li>
+	<li><b>Kankan</b></li>
+	<li><b>Livestream</b></li>
+	<li><b>MTV</b></li>
+	<li><b>MySpass</b></li>
+	<li><b>NBA</b></li>
+	<li><b>NBCNews</b></li>
+	<li><b>ORF</b></li>
+	<li><b>Ooyala</b></li>
+	<li><b>PBS</b></li>
+	<li><b>Pornotube</b></li>
+	<li><b>RBMARadio</b></li>
+	<li><b>RTLnow</b></li>
+	<li><b>RedTube</b></li>
+	<li><b>RingTV</b></li>
+	<li><b>Roxwel</b></li>
+	<li><b>Sina</b></li>
+	<li><b>Slashdot</b></li>
+	<li><b>Sohu</b></li>
+	<li><b>Spiegel</b></li>
+	<li><b>Statigram</b></li>
+	<li><b>Steam</b></li>
+	<li><b>TED</b></li>
+	<li><b>TF1</b></li>
+	<li><b>Teamcoco</b></li>
+	<li><b>ThisAV</b></li>
+	<li><b>TrailerAddict</b></li>
+	<li><b>Trilulilu</b></li>
+	<li><b>Tudou</b></li>
+	<li><b>Tumblr</b></li>
+	<li><b>Tutv</b></li>
+	<li><b>Unistra</b></li>
+	<li><b>Vbox7</b></li>
+	<li><b>Veoh</b></li>
+	<li><b>Vevo</b></li>
+	<li><b>Vine</b></li>
+	<li><b>Weibo</b></li>
+	<li><b>Wimp</b></li>
+	<li><b>WorldStarHipHop</b></li>
+	<li><b>XHamster</b></li>
+	<li><b>XNXX</b></li>
+	<li><b>XVideos</b></li>
+	<li><b>Yahoo</b>: Yahoo screen</li>
+	<li><b>YouJizz</b></li>
+	<li><b>YouPorn</b></li>
+	<li><b>Youku</b></li>
+	<li><b>ZDF</b></li>
+	<li><b>archive.org</b>: archive.org videos</li>
+	<li><b>arte.tv</b></li>
+	<li><b>blip.tv</b></li>
+	<li><b>blip.tv:user</b></li>
+	<li><b>canalplus.fr</b></li>
+	<li><b>dailymotion</b></li>
+	<li><b>eHow</b></li>
+	<li><b>exfm</b>: ex.fm</li>
+	<li><b>facebook</b></li>
+	<li><b>generic</b>: Generic downloader that works on some sites</li>
+	<li><b>ign.com</b></li>
+	<li><b>justin.tv</b></li>
+	<li><b>keek</b></li>
+	<li><b>liveleak</b></li>
+	<li><b>metacafe</b></li>
+	<li><b>mixcloud</b> (Currently broken)</li>
+	<li><b>muzu.tv</b></li>
+	<li><b>myvideo</b></li>
+	<li><b>photobucket</b></li>
+	<li><b>plus.google</b>: Google Plus</li>
+	<li><b>screen.yahoo:search</b>: Yahoo screen search</li>
+	<li><b>soundcloud</b></li>
+	<li><b>soundcloud:set</b></li>
+	<li><b>stanfordoc</b>: Stanford Open ClassRoom</li>
+	<li><b>techtv.mit.edu</b></li>
+	<li><b>ustream</b></li>
+	<li><b>video.google:search</b>: Google Video search</li>
+	<li><b>video.mit.edu</b></li>
+	<li><b>videofy.me</b></li>
+	<li><b>vimeo</b></li>
+	<li><b>vimeo:channel</b></li>
+	<li><b>wat.tv</b></li>
+	<li><b>youtube</b>: YouTube.com</li>
+	<li><b>youtube:channel</b>: YouTube.com channels</li>
+	<li><b>youtube:favorites</b>: YouTube.com favourite videos, "ytfav" keyword (requires authentication)</li>
+	<li><b>youtube:playlist</b>: YouTube.com playlists</li>
+	<li><b>youtube:recommended</b>: YouTube.com recommended videos, "ytrec" keyword (requires authentication)</li>
+	<li><b>youtube:search</b>: YouTube.com searches</li>
+	<li><b>youtube:show</b>: YouTube.com (multi-season) shows</li>
+	<li><b>youtube:subscriptions</b>: YouTube.com subscriptions feed, "ytsubs" keyword(requires authentication)</li>
+	<li><b>youtube:user</b>: YouTube.com user videos (URL or "ytuser" keyword)</li>
+	<li><b>youtube:watch_later</b>: Youtube watch later list, "ytwatchlater" keyword (requires authentication)</li>
+</ul>
+
+<div class="note">
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">
+<img alt="Creative Commons License" style="border-width:0"
+src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a><br />
+Copyright © 2006-2013 Ricardo Garcia Gonzalez</div>
+</body>
+</html>
diff --git a/supportedsites.html.in b/supportedsites.html.in
new file mode 100644
index 000000000..819df072a
--- /dev/null
+++ b/supportedsites.html.in
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+<title>youtube-dl: Supported sites</title>
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body>
+
+<table class="heading"><tr>
+	<td class="title"><a href="index.html">youtube-dl</a></td>
+	<td class="subtitle">Supported sites</td>
+</tr></table>
+
+<p>Here's is the list of all the supported sites, ordered alphabetically:</p>
+<ul>
+@SITES@
+</ul>
+
+<div class="note">
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">
+<img alt="Creative Commons License" style="border-width:0"
+src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a><br />
+Copyright © 2006-2013 Ricardo Garcia Gonzalez</div>
+</body>
+</html>