diff --git a/pelicanconf.py b/pelicanconf.py
index 215e7a5..6ce2645 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -48,11 +48,11 @@ MARKDOWN = {
 SOCIAL = (
         ('twitter', 'https://twitter.com/wxcafe'),
         ('pencil-square-o', 'https://social.wxcafe.net/@wxcafe'),
-        ('github', 'https://github.com/wxcafe'),
+        ('git', 'https://git.wxcafe.net/wxcafe'),
         ('envelope', 'mailto://wxcafe@wxcafe.net'),
         ('key', 'https://pub.wxcafe.net/wxcafe.asc'),
-        ('map-o', 'https://www.openstreetmap.org/relation/105146'),
-        ('code', 'https://github.com/wxcafe/blog-source'),
+        ('map-o', 'https://www.openstreetmap.org/node/2511020426'),
+        ('code', 'https://git.wxcafe.net/wxcafe/blog-source'),
         )
 
 # Categories on right-side bar but not on top menu