diff --git a/doc/docs.html b/doc/docs.html
index e8152bb352b..54c2299f5bf 100644
--- a/doc/docs.html
+++ b/doc/docs.html
@@ -117,6 +117,22 @@ same variable in a different goroutine.
 
 <h2 id="videos_talks">Videos and Talks</h2>
 
+<h3 id="writing_web_apps"><a href="http://www.youtube.com/watch?v=-i0hat7pdpk">Writing Web Apps in Go</a></h3>
+<p>
+A talk by Rob Pike and Andrew Gerrand presented at Google I/O 2011.
+It walks through the construction and deployment of a simple web application
+and unveils the <a href="http://blog.golang.org/2011/05/go-and-google-app-engine.html">Go runtime for App Engine</a>.
+See the <a href="/doc/talks/io2011/Writing_Web_Apps_in_Go.pdf">presentation slides</a>.
+</p>
+
+<h3 id="real_world_go"><a href="http://www.youtube.com/watch?v=7QDVRowyUQA">Real World Go</a></h3>
+<p>
+A talk by Andrew Gerrand presented at Google I/O Bootcamp 2011.
+It gives a broad overview of Go's type system and concurrency model
+and provides four examples of Go programs that solve real problems.
+See the <a href="/doc/talks/io2011/Real_World_Go.pdf">presentation slides</a>.
+</p>
+
 <h3 id="go_programming"><a href="http://www.youtube.com/watch?v=jgVhBThJdXc">Go Programming</a></h3>
 <p>
 A presentation delivered by Rob Pike and Russ Cox at Google I/O 2010.  It
diff --git a/doc/frontpage.css b/doc/frontpage.css
index bcdca64011d..299855ce9ac 100644
--- a/doc/frontpage.css
+++ b/doc/frontpage.css
@@ -80,6 +80,9 @@ span.keyword {
 #content-videos .thumbnail._004 {
   background: url(/doc/video-004.png);
 }
+#content-videos .thumbnail._005 {
+  background: url(/doc/video-005.jpg);
+}
 #content-videos a.video {
   display: inline-block;
   width: 150px;
diff --git a/doc/root.html b/doc/root.html
index f98f9c243c8..6722d0018be 100644
--- a/doc/root.html
+++ b/doc/root.html
@@ -60,7 +60,7 @@ google.setOnLoadCallback(loadFeed);
       <div id="content-rotating">
       <div id="content-videos">
         <h2>Go Videos <span class="more">| <a href="/doc/docs.html#videos_talks">More...</a></span></h2>
-        <a class="video" href="http://osdc.blip.tv/file/4432146/"><img src="/doc/play_overlay.png" class="thumbnail _004" /> <span class="caption title">&ldquo;Practical Go Programming&rdquo;</span> <span class="caption description">OSDC Tech Talk</span></a>
+        <a class="video" href="http://www.youtube.com/watch?v=-i0hat7pdpk"><img src="/doc/play_overlay.png" class="thumbnail _005" /> <span class="caption title">&ldquo;Writing Web Apps in Go&rdquo;</span> <span class="caption description">Google I/O 2011</span></a>
       </div>
       <h2>Go Blog <span class="more">| <a href="http://blog.golang.org/">More...</a></span></h2>
       <div id="content-blog">
@@ -80,7 +80,7 @@ google.setOnLoadCallback(loadFeed);
             <li><a href="/doc/docs.html">Other Documentation</a></li>
           </ul>
         </div>
-        <div id="resources-contributors" class="resources">
+        <div id="resources-contributors" >
           <h3>For developers:</h3>
           <ul>
             <li><a href="http://godashboard.appspot.com/package">Package Dashboard</a></li>
diff --git a/doc/talks/io2011/Real_World_Go.pdf b/doc/talks/io2011/Real_World_Go.pdf
new file mode 100644
index 00000000000..2a187116ba5
Binary files /dev/null and b/doc/talks/io2011/Real_World_Go.pdf differ
diff --git a/doc/talks/io2011/Writing_Web_Apps_in_Go.pdf b/doc/talks/io2011/Writing_Web_Apps_in_Go.pdf
new file mode 100644
index 00000000000..ca4702ee969
Binary files /dev/null and b/doc/talks/io2011/Writing_Web_Apps_in_Go.pdf differ
diff --git a/doc/video-005.jpg b/doc/video-005.jpg
new file mode 100644
index 00000000000..32371581f52
Binary files /dev/null and b/doc/video-005.jpg differ