diff --git a/gcp/appengine/source_mapper.py b/gcp/appengine/source_mapper.py
index 37889db60bb..30614a74d5e 100644
--- a/gcp/appengine/source_mapper.py
+++ b/gcp/appengine/source_mapper.py
@@ -89,12 +89,21 @@ class MercurialVCS(VCSViewer):
                            r'&revcount={range_limit}')
 
 
+class SavannahVCS(VCSViewer):
+  VCS_URL_REGEX = re.compile(
+      r'(https?://git\.savannah\.(?:non)?gnu\.org)/git/(.*\.git)$')
+  VCS_REVISION_SUB = r'\1/cgit/\2/commit?id={revision}'
+  VCS_REVISION_DIFF_SUB = (r'\1/cgit/\2/diff/'
+                           r'?id={end_revision}&id2={start_revision}')
+
+
 VCS_LIST = [
     FreeDesktopVCS,
     GitHubVCS,
     GitLabVCS,
     GoogleSourceVCS,
     MercurialVCS,
+    SavannahVCS,
 ]