diff --git a/source/_includes/head.html b/source/_includes/head.html
index d174112..be371e9 100644
--- a/source/_includes/head.html
+++ b/source/_includes/head.html
@@ -18,8 +18,8 @@
   {% if page.keywords %}
     <meta name="keywords" content="{{page.keywords}}"/>
   {% endif %}
-
-  <link rel="canonical" href="{{ site.url }}{{ page.url }}"/>
+  {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
+  <link rel="canonical" href="{{ canonical }}">
   <link href="{{ root_url }}/favicon.png" rel="shortcut icon" />
   <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
   <script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>
diff --git a/source/help/index.markdown b/source/help/index.markdown
index b06893c..8aa65bc 100644
--- a/source/help/index.markdown
+++ b/source/help/index.markdown
@@ -14,11 +14,11 @@ Don't feel like reading the documentation? You've come to the right place! Actua
 
 ## Getting/Giving Help
 
-If you have a question, or if you love helping others, Join me on:
+If you have a question, or if you love helping others:
 
-1. **IRC** in the #octopress channel on irc.freenode.net
-2. **[Convore](http://convore.com/octopress/)** a web chat system. If I'm not there, leave a message.
-3. **[Post an issue](http://github.com/imathis/octopress/issues)** on Github's issue tracker.
+1. Join the #Octopress IRC channel on irc.freenode.net.
+2. [Post an issue](http://github.com/imathis/octopress/issues) on Github's issue tracker.
+3. Mention [@Octopress](http://twitter.com/octopress) on Twitter.
 
 ## Contributing