diff --git a/README.md b/README.md
index 3b593f9285..201df0734c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-This is an web site project based on [Awestruct](http://awestruct.org/).  It generates the complete web site and documentation of the [Netty project](http://netty.io/).  
+This is an web site project based on [Awestruct](https://github.com/awestruct/awestruct).  It generates the complete web site and documentation of the [Netty project](http://netty.io/).  
 
 To contribute to the project documentation, simply fork this repository and issue a pull request.
 
diff --git a/news/2012-06-25-new-web-site-and-3-5-1-final.html.haml b/news/2012-06-25-new-web-site-and-3-5-1-final.html.haml
index 2486c3afec..e3ed569c4e 100644
--- a/news/2012-06-25-new-web-site-and-3-5-1-final.html.haml
+++ b/news/2012-06-25-new-web-site-and-3-5-1-final.html.haml
@@ -8,7 +8,7 @@ disqus_identifier: 1654514869765240033
 :plain
   <div class="entry-content">
   <p>There are two different yet exciting news this week.</p>
-  <p>As you might have noticed already, the Netty web site went from <span class="wikiexternallink"><a href="http://awestruct.org/">Awestruct</a></span> to <span class="wikiexternallink"><a href="http://www.xwiki.org/">XWiki</a></span>.  With this change, any registered user can now edit the documentation area of the web site on the fly.  You can use either WYSIWYG editor or wiki markup to edit the pages.  Previously, contributing to our documentation required a contributor to fork a repository and issue a pull request, which was sometimes a barrier to some people.  I expect this change will help more people contribute to the documentation in the long term.</p>
+  <p>As you might have noticed already, the Netty web site went from <span class="wikiexternallink"><a href="https://github.com/awestruct/awestruct">Awestruct</a></span> to <span class="wikiexternallink"><a href="http://www.xwiki.org/">XWiki</a></span>.  With this change, any registered user can now edit the documentation area of the web site on the fly.  You can use either WYSIWYG editor or wiki markup to edit the pages.  Previously, contributing to our documentation required a contributor to fork a repository and issue a pull request, which was sometimes a barrier to some people.  I expect this change will help more people contribute to the documentation in the long term.</p>
   <p>Another good news is that Netty 3.5.1.Final has been released.  Here's the rough list of the notable changes:</p>
   <ul>
   <li>
diff --git a/news/2013-02-19-new-web-site-agin.html.md b/news/2013-02-19-new-web-site-agin.html.md
index 9ad0c544da..6be2149424 100644
--- a/news/2013-02-19-new-web-site-agin.html.md
+++ b/news/2013-02-19-new-web-site-agin.html.md
@@ -13,7 +13,7 @@ Previously, I was hosting 'netty.io' using [XWiki](http://www.xwiki.org/) on AWS
 
 Although the WYSIWYG editing experice provided by XWiki was extraordinarily superb and it was one of the biggest reason we moved to XWiki, we didn't get as much documentation contribution as we wished.  Given the amount of contribution we got so far, I concluded that the cost of running a full web application doesn't worth enough.  I think this is not necessarily because of the technology we adopted but because of where we are at as a relatively small project.
 
-Consequently, I rebuilt our web site using [Awestruct](http://awestruct.org/) again.  This time, it was much easier to build the web site because I was already familiar with Awestruct and thanks to great toolkits like [Twitter Bootstrap](http://twitter.github.com/bootstrap/) and [Font Awesome](http://fortawesome.github.com/Font-Awesome/).
+Consequently, I rebuilt our web site using [Awestruct](https://github.com/awestruct/awestruct) again.  This time, it was much easier to build the web site because I was already familiar with Awestruct and thanks to great toolkits like [Twitter Bootstrap](http://twitter.github.com/bootstrap/) and [Font Awesome](http://fortawesome.github.com/Font-Awesome/).
 
 Does this mean we went completely backward and our documentation is unmodifiable?  Not at all.  If you browse [the documentation page](http://netty.io/wiki/index.html), you will find that all documentation pages are periodically auto-generated from [the Github Wiki](https://github.com/netty/netty/wiki).  You can just visit the wiki to submit your changes and they will be deployed automatically.  As usual, your contribution to our documentation will make us very excited, even if it is such a tiny thing as fixing typos and grammar.