diff --git a/Gemfile b/Gemfile
index 665ff45a2..2ebd52d8a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -89,9 +89,9 @@ gem 'rails-assets-jquery',                              '1.11.1' # Should be kep
 gem 'js_image_paths',                                   '0.0.1'
 gem 'js-routes',                                        '0.9.9'
 gem 'rails-assets-punycode',                            '1.3.2'
-gem 'rails-assets-markdown-it',                         '3.0.1'
-gem 'rails-assets-markdown-it-hashtag',                 '0.2.1'
-gem 'rails-assets-markdown-it-diaspora-mention',        '0.1.0'
+gem 'rails-assets-markdown-it',                         '3.0.3'
+gem 'rails-assets-markdown-it-hashtag',                 '0.2.2'
+gem 'rails-assets-markdown-it-diaspora-mention',        '0.1.2'
 gem 'rails-assets-markdown-it--markdown-it-for-inline', '0.1.0'
 
 # jQuery plugins
diff --git a/Gemfile.lock b/Gemfile.lock
index b6e6e7943..df814078d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -439,9 +439,9 @@ GEM
     rails-assets-jquery.slimscroll (1.3.3)
       rails-assets-jquery (>= 1.7)
     rails-assets-markdown-it--markdown-it-for-inline (0.1.0)
-    rails-assets-markdown-it (3.0.1)
-    rails-assets-markdown-it-diaspora-mention (0.1.0)
-    rails-assets-markdown-it-hashtag (0.2.1)
+    rails-assets-markdown-it (3.0.3)
+    rails-assets-markdown-it-diaspora-mention (0.1.2)
+    rails-assets-markdown-it-hashtag (0.2.2)
     rails-assets-perfect-scrollbar (0.5.7)
       rails-assets-jquery (>= 1.10)
     rails-assets-punycode (1.3.2)
@@ -685,10 +685,10 @@ DEPENDENCIES
   rails-assets-jquery-idletimer (= 1.0.1)
   rails-assets-jquery-placeholder (= 2.0.8)
   rails-assets-jquery-textchange (= 0.2.3)
-  rails-assets-markdown-it (= 3.0.1)
+  rails-assets-markdown-it (= 3.0.3)
   rails-assets-markdown-it--markdown-it-for-inline (= 0.1.0)
-  rails-assets-markdown-it-diaspora-mention (= 0.1.0)
-  rails-assets-markdown-it-hashtag (= 0.2.1)
+  rails-assets-markdown-it-diaspora-mention (= 0.1.2)
+  rails-assets-markdown-it-hashtag (= 0.2.2)
   rails-assets-perfect-scrollbar (= 0.5.7)
   rails-assets-punycode (= 1.3.2)
   rails-i18n (= 4.0.3)
diff --git a/spec/javascripts/app/helpers/text_formatter_spec.js b/spec/javascripts/app/helpers/text_formatter_spec.js
index 9de8e584f..a646388fc 100644
--- a/spec/javascripts/app/helpers/text_formatter_spec.js
+++ b/spec/javascripts/app/helpers/text_formatter_spec.js
@@ -20,7 +20,7 @@ describe("app.helpers.textFormatter", function(){
     it("renders tags as links", function() {
       var formattedText = this.formatter('#'+this.tags.join(" #"));
       _.each(this.tags, function(tag) {
-        var link ='<a class="tag" href="/tags/'+tag.toLowerCase()+'">#'+tag+'</a>';
+        var link ='<a href="/tags/'+tag.toLowerCase()+'" class="tag">#'+tag.replace("<","&lt;")+'</a>';
         expect(formattedText).toContain(link);
       });
     });