diff --git a/js/shortcode_social.js b/js/shortcode_social.js
index 2db2d47..f0317de 100644
--- a/js/shortcode_social.js
+++ b/js/shortcode_social.js
@@ -27,6 +27,9 @@
           case 'flickr':
             embed_url = '//www.flickr.com/services/oembed.json/?url=' + $(this).attr('data');
             break;
+
+          case 'facebook':
+            embed_url = '//www.facebook.com/plugins/post/oembed.json/?url=' + $(this).attr('data');
         }
 
         // Flickr oembed is broken and doesn't work with jsonp.
diff --git a/src/Plugin/Shortcode/FacebookShortcode.php b/src/Plugin/Shortcode/FacebookShortcode.php
index 3e0a7a9..937c861 100644
--- a/src/Plugin/Shortcode/FacebookShortcode.php
+++ b/src/Plugin/Shortcode/FacebookShortcode.php
@@ -31,8 +31,9 @@ class FacebookShortcode extends ShortcodeBase {
     $text = Html::decodeEntities($text);
     $url = UrlHelper::parse($text);
     $url = strip_tags($url['path']);
+    $class = $attributes['class'];
 
-    return '<div class="fb-post" data-href="' . $url . '"></div>';
+    return '<div class="shortcode-social ' . $class . '" data="' . $url . '"></div>';
   }
 
   /**