diff --git a/gf.cabal b/gf.cabal
index 966153d1c..669035a92 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -42,10 +42,13 @@ data-files: tools/gf.el
 	    www/translator/*.css
 	    www/translator/*.js
 
-source-repository head
-  type:     darcs
-  location: http://www.grammaticalframework.org/
+--source-repository head
+--  type:     darcs
+--  location: http://www.grammaticalframework.org/
 
+source-repository head
+  type:     git
+  location: https://github.com/GrammaticalFramework/GF.git
 
 flag interrupt
   Description: Enable Ctrl+Break in the shell
diff --git a/index.html b/index.html
index 51954f730..182033787 100644
--- a/index.html
+++ b/index.html
@@ -46,7 +46,8 @@ function sitesearch() {
 
   <ul>
     <li><A HREF="http://groups.google.com/group/gf-dev">User Group</A>
-    <li><a href="http://code.google.com/p/grammatical-framework/issues/list">Bug Reports</a>
+    <li><a href="https://github.com/GrammaticalFramework/GF/issues">Bug Reports</a>
+        (<a href="http://code.google.com/p/grammatical-framework/issues/list">old</a>)
     <li><a href="http://grammatical-framework.blogspot.com/">Blog</a>
   </ul>
 </div>
@@ -119,6 +120,7 @@ document.write('<div style="float: right; margin-top: 3ex;">  <form onsubmit="re
 <div class=news2>
 
   <table class=news>
+<tr><td>2017-06-29:<td>GF is moving to <a href="https://github.com/GrammaticalFramework/GF/">GitHub</a>!
 <tr><td>2017-03-13:<td><strong>GF Summer School in Riga (Latvia), 14-25 August 2017</strong>
     <a href="http://school.grammaticalframework.org/2017/">Summer
   School web page</a>.