diff --git a/site/pages/community.md b/site/pages/community.md
index 4c030f4..1d6d98e 100644
--- a/site/pages/community.md
+++ b/site/pages/community.md
@@ -7,30 +7,26 @@ Simple support.
* [Users](mailto:user@steve.apache.org) ([Subscribe](mailto:user-subscribe@steve.apache.org), [Unsubscribe](mailto:user-unsubscribe@steve.apache.org))
* [Developers](mailto:dev@steve.apache.org) ([Subscribe](mailto:dev-subscribe@steve.apache.org), [Unsubscribe](mailto:dev-unsubscribe@steve.apache.org))
* [Commits](mailto:commits@steve.apache.org) ([Subscribe](mailto:commits-subscribe@steve.apache.org), [Unsubscribe](mailto:commits-unsubscribe@steve.apache.org))
-* [Issues](mailto:issues@steve.apache.org) ([Subscribe](mailto:issues-subscribe@steve.apache.org), [Unsubscribe](mailto:issues-unsubscribe@steve.apache.org))
-
## Archives
-* [users](http://steve.markmail.org/search/?q=#query:%20list%3Aorg.apache.steve.user)
-* [development](http://steve.markmail.org/search/?q=#query:%20list%3Aorg.apache.steve.dev)
-* [commits](http://steve.markmail.org/search/?q=#query:%20list%3Aorg.apache.steve.commits)
-* [issues](http://steve.markmail.org/search/?q=#query:%20list%3Aorg.apache.steve.issues)
-
+* [users](https://lists.apache.org/list.html?commits@steve.apache.org)
+* [development](https://lists.apache.org/list.html?dev@steve.apache.org)
+* [commits](https://lists.apache.org/list.html?commits@steve.apache.org)
-## JIRA
-* [STEVE](https://issues.apache.org/jira/browse/STEVE)
+## Issue tracking
+* [Github Issues](https://github.com/apache/steve/issues)
+* (Historical) [JIRA](https://issues.apache.org/jira/browse/STEVE)
## Contributing
Contributing to the project is a great way to support the community. Some great links for getting involved
-- [Source Code](dev/source-code.html)
-- [Contribution Tips](dev/contribution-tips.html)
-- [Developer Documentation](dev/index.html)
-- [IRC](http://webchat.freenode.net/?channels=apache-steve): #apache-steve on freenode.
+- [Source Code](develop.html)
+
+
## PMC Members
@@ -41,10 +37,6 @@ Contributing to the project is a great way to support the community. Some great
diff --git a/site/pages/dev/index.html b/site/pages/dev/index.html
deleted file mode 100644
index 3111321..0000000
--- a/site/pages/dev/index.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/site/pages/dev/source-code.mdtext b/site/pages/dev/source-code.mdtext
deleted file mode 100644
index 3c3097a..0000000
--- a/site/pages/dev/source-code.mdtext
+++ /dev/null
@@ -1,46 +0,0 @@
-Title: Source Code
-
-## pySTeVe
-PySTeVe can be browsed via the [web interface](https://svn.apache.org/viewvc/steve/trunk/pysteve/).
-
-You can check out the source code at: [https://svn.apache.org/repos/asf/steve/trunk/pysteve/](https://svn.apache.org/repos/asf/steve/trunk/pysteve/):
-
-
- $svn co https://svn.apache.org/repos/asf/steve/trunk/pysteve/
-
-
-PySTeVe requires no building/compiling, but does require a setup, as explained on the [try it out](/demo.html) page.
-
-
-
-
-## Older sources
-You can browse the source code via the [web interface](http://svn.apache.org/viewvc/steve/trunk/)
-.
-
-You can download (aka checkout) the sources of Apache STeVe with
-Subversion client using the following URL [http://svn.apache.org/repos/asf/steve/trunk](http://svn.apache.org/repos/asf/steve/trunk)
-.
-
-Performing the checkout from the command line using the subversion client
-is as easy as executing the following command:
-> $ svn co [http://svn.apache.org/repos/asf/steve/trunk](http://svn.apache.org/repos/asf/steve/trunk)
-
-If you are experiencing problems with errors like "400 Bad Request
-(http://svn.apache.org)", try using:
-> $ svn co [https://svn.apache.org/repos/asf/steve/trunk](https://svn.apache.org/repos/asf/steve/trunk)
-
-
-# Continuous integration
-
-Apache STeVe continuous integration relies on [Apache Buildbot](http://ci.apache.org/).
-All builders are available [from the page](http://ci.apache.org/builders).
-
-* [Apache STeVe under Ubuntu](http://ci.apache.org/builders/steve-trunk-ubuntu)
-* [Apache STeVe under Windows](http://ci.apache.org/builders/steve-trunk-win)
-
-
-# Building
-
-*TODO fill in*
-
diff --git a/site/pages/develop.md b/site/pages/develop.md
new file mode 100644
index 0000000..9e3de4c
--- /dev/null
+++ b/site/pages/develop.md
@@ -0,0 +1,23 @@
+Title: Developer Information
+
+## pySTeVe
+
+The PySTeVe source code is contained within the main [STeVE GitHub
+repository](https://github.com/apache/steve).
+
+PySTeVe requires no building/compiling, but does require a setup, as explained in the [Quickstart Guide](/demo.html).
+
+
+# Continuous integration
+
+Apache STeVe continuous integration relies on [Apache Buildbot](http://ci.apache.org/).
+All builders are available [from the page](http://ci.apache.org/builders).
+
+* [Apache STeVe under Ubuntu](http://ci.apache.org/builders/steve-trunk-ubuntu)
+* [Apache STeVe under Windows](http://ci.apache.org/builders/steve-trunk-win)
+
+
+# Building
+
+*TODO fill in*
+
diff --git a/site/theme/templates/index.html b/site/theme/templates/index.html
index 44209d6..25aca51 100644
--- a/site/theme/templates/index.html
+++ b/site/theme/templates/index.html
@@ -11,10 +11,10 @@