diff --git a/Site/text/contact.markdown b/Site/text/contact.markdown
index f078a3c..bd9d34e 100644
--- a/Site/text/contact.markdown
+++ b/Site/text/contact.markdown
@@ -2,6 +2,6 @@
 Contact
 -------
 
-GitX is actively maintained on Github at [http://github.com/pieter/gitx](http://www.github.com/pieter/gitx/wikis). If you find any bugs or have feature requests, you can put them there.
+The GitX repository can be found on Github at [http://github.com/pieter/gitx](http://www.github.com/pieter/gitx/wikis).
 
-GitX is actively maintained by Pieter de Bie. You can email him at [frimmirf@gmail.com](mailto:frimmirf+gitx@gmail.com)
\ No newline at end of file
+GitX has a mailing list at [gitx@googlegroups.com](mailto:gitx@googlegroups.com) to which you can email any questions or patches. GitX is actively maintained by Pieter de Bie. You can email him at [frimmirf@gmail.com](mailto:frimmirf+gitx@gmail.com).
\ No newline at end of file
diff --git a/Site/text/contribute.markdown b/Site/text/contribute.markdown
index 8ae7da3..66a752d 100644
--- a/Site/text/contribute.markdown
+++ b/Site/text/contribute.markdown
@@ -14,7 +14,7 @@ If you want to contribute to GitX, you can just clone the repository and start w
 	<code>git clone <a href="git://github.com/pieter/gitx.git">git://github.com/pieter/gitx.git</a></code>
 </pre>
 
-You can use the Github "pull" feature to send me a notification of your changes. Alternatively, you can <a href="mailto:frimmirf+gitx@gmail.com">email me</a> patches.
+The preferred way of contributing is by sending patches to the [Mailinglist](mailto:gitx@googlegroups.com).
 
 If you're not sure what to do, you can take a look at the [TODO list on
 Github](http://github.com/pieter/gitx/wikis/TODO). If you want to work on the
@@ -23,11 +23,9 @@ HTML side of GitX (such as the detailed view), you should take a look at the
 
 <h3>Bug Report</h3>
 
-
 If you find or want to fix bugs, you should take a look at our [Bug
 Tracker](http://gitx.lighthouseapp.com/projects/17830-gitx). If you can't
-reach Lighthouse or don't want to register for an account, you can also add
-bugs on the [Github Bugs page](http://github.com/pieter/gitx/wikis/bugs).
+reach Lighthouse or don't want to register for an account, you can also send the bugs to mailing list.
 	
 <h3>Donate</h3>
 <p>
diff --git a/Site/text/links.markdown b/Site/text/links.markdown
index 48b1c15..43ed82f 100644
--- a/Site/text/links.markdown
+++ b/Site/text/links.markdown
@@ -11,8 +11,13 @@
 	<li><a href="http://www.ohloh.net/projects/gitx" title="GitX on ohloh">GitX on ohloh</a></li>
 	<li><a href="http://cia.vc/stats/project/gitx" title="GitX on CIA.vc">GitX on CIA.vc</a></li>
 </ul>
+
+<h3>Mailing list</h3>
+
+* [Google Groups](http://groups.google.com/group/gitx)
+* [Nabble archive](http://n2.nabble.com/GitX-f3079826.html)
+
 <h3>Bug Reporting</h3>
 <ul>
 	<li><a href="http://gitx.lighthouseapp.com/projects/17830-gitx" title="Bug reporting on Lighthouse">Bug reporting on Lighthouse</a></li>
-	<li><a href="http://github.com/pieter/gitx/wikis/bugs" title="Bug reporting on Github">Bug reporting on Github</a></li>
 </ul>