diff --git a/.meteor/packages b/.meteor/packages
index ede3901..d73ab95 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -39,3 +39,5 @@ mizzao:user-status
 dburles:eslint
 kevohagan:sweetalert
 mizzao:autocomplete
+markdown
+simple:highlight.js
diff --git a/.meteor/versions b/.meteor/versions
index ddb771d..8ddac3c 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -52,6 +52,7 @@ less@2.5.1
 livedata@1.0.15
 localstorage@1.0.5
 logging@1.0.8
+markdown@1.0.5
 meteor@1.1.10
 meteor-base@1.0.1
 meteorhacks:inject-initial@1.0.3
@@ -81,6 +82,7 @@ routepolicy@1.0.6
 service-configuration@1.0.5
 session@1.1.1
 sha@1.0.4
+simple:highlight.js@1.2.0
 skeleton:skeleton@2.0.4
 softwarerero:accounts-t9n@1.1.4
 spacebars@1.0.7
diff --git a/client/views/shared/_post.html b/client/views/shared/_post.html
index a3f6409..ff9ae7f 100644
--- a/client/views/shared/_post.html
+++ b/client/views/shared/_post.html
@@ -3,7 +3,7 @@
     <div class="twelve columns">
       {{#with post}}
         <div class="post">
-          {{simpleFormat body}}
+        {{#markdown}}{{body}}{{/markdown}}
           <hr>
           <a href="{{pathFor 'profile' _id=author._id}}">
             {{> avatar user=author size='extra-small' shape='circle' class='u-pull-left avatar'}}