diff --git a/talksapp/README.md b/talksapp/README.md
index 2c47a2f..7f6d58b 100644
--- a/talksapp/README.md
+++ b/talksapp/README.md
@@ -1,7 +1,7 @@
 talksapp
 ========
 
-This directory contains the source for [go-talks.appspot.com](http://go-talks.appspot.com).
+This directory contains the source for [talks.godoc.org](https://talks.godoc.org).
 
 Development Environment Setup
 -----------------------------
diff --git a/talksapp/assets/home.article b/talksapp/assets/home.article
index 3dbab6a..46ddab6 100644
--- a/talksapp/assets/home.article
+++ b/talksapp/assets/home.article
@@ -1,4 +1,4 @@
-go-talks.appspot.org
+talks.godoc.org
 
 Francesc Campoy (maintainer)
 @francesc
@@ -13,8 +13,8 @@
 
 The syntax for URLs is:
 
-    https://go-talks.appspot.com/github.com/owner/project/file.ext
-    https://go-talks.appspot.com/github.com/owner/project/sub/directory/file.ext
+    https://talks.godoc.org/github.com/owner/project/file.ext
+    https://talks.godoc.org/github.com/owner/project/sub/directory/file.ext
 
 The supported file extensions (.ext) are .slide and .article.
 
diff --git a/talksapp/main.go b/talksapp/main.go
index 1cf85ac..1af8b4f 100644
--- a/talksapp/main.go
+++ b/talksapp/main.go
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd.
 
-// Package talksapp implements the go-talks.appspot.com server.
+// Package talksapp implements the talks.godoc.org server.
 package talksapp
 
 import (
diff --git a/talksapp/main_test.go b/talksapp/main_test.go
index 280e705..5934d8e 100644
--- a/talksapp/main_test.go
+++ b/talksapp/main_test.go
@@ -34,8 +34,8 @@
 			t.Fatalf("expected status: %d, got: %d", http.StatusOK, w.Code)
 		}
 
-		if !strings.Contains(w.Body.String(), "go-talks.appspot.org") {
-			t.Fatal("expected response to contain: go-talks.appspot.org")
+		if !strings.Contains(w.Body.String(), "talks.godoc.org") {
+			t.Fatal("expected response to contain: talks.godoc.org")
 		}
 	})
 }