diff --git a/blog/migrating-away-from-puppet-to-cdist.mdwn b/blog/migrating-away-from-puppet-to-cdist.mdwn
index f6de4888..1cf5b417 100644
--- a/blog/migrating-away-from-puppet-to-cdist.mdwn
+++ b/blog/migrating-away-from-puppet-to-cdist.mdwn
@@ -1,7 +1,8 @@
 [[!meta title="Migrating away from puppet to cdist"]]
 
-For those not being subscribed to the puppet-mailing list,
-here's my "goodbye and thanks for the fish"-message to puppet:
+For those not being subscribed to the puppet-users mailing list,
+here's my
+["goodbye and thanks for the fish"-message](http://groups.google.com/group/puppet-users/browse_thread/thread/83801a03c0fea665?pli=1):
 
     Date: Mon, 4 Apr 2011 19:26:06 +0200
     From: Nico -telmich- Schottelius <nico-puppet-users --at-- schottelius.org>
diff --git a/sitemap.mdwn b/sitemap.mdwn
index 12c66d73..7996d854 100644
--- a/sitemap.mdwn
+++ b/sitemap.mdwn
@@ -1,3 +1,3 @@
-[[!map pages="* and !*.js and !*.png and !*.gif and !*/*/*"]]
+[[!map pages="* and !*.js and !*.png and !*.gif and !*/*/* and !includes/*"]]
 
 [[!tag meta]]
diff --git a/software/uc.mdwn b/software/uc.mdwn
index 13e0e7ec..ffbd7a69 100644
--- a/software/uc.mdwn
+++ b/software/uc.mdwn
@@ -30,7 +30,4 @@ To upgrade in the current branch use
 
 ## Support
 
-### IRC
-
-You can join the development ***IRC channel***
-[#cLinux on irc.freenode.org](irc://irc.freenode.org/#cLinux).
+[[!inline pages="includes/irc" archive="no" raw=yes show=0]]