diff --git a/src/Linkification/Embedding.coffee b/src/Linkification/Embedding.coffee
index 67d915bb6..00b6ea54f 100644
--- a/src/Linkification/Embedding.coffee
+++ b/src/Linkification/Embedding.coffee
@@ -310,7 +310,7 @@ Embedding =
           loop:     true
     ,
       key: 'Pastebin'
-      regExp: /^\w+:\/\/(?:\w+\.)?pastebin\.com\/(?!u\/)(?:[\w\.]+\?i\=)?(\w+)/
+      regExp: /^\w+:\/\/(?:\w+\.)?pastebin\.com\/(?!u\/)(?:[\w.]+(?:\/|\?i\=))?(\w+)/
       el: (a) ->
         div = $.el 'iframe',
           src: "//pastebin.com/embed_iframe.php?i=#{a.dataset.uid}"