diff --git a/actions/api.php b/actions/api.php
index 452ed8e824..8b92889f8a 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -129,6 +129,7 @@ class ApiAction extends Action
                                 'laconica/config',
                                 'laconica/wadl',
                                 'tags/timeline',
+                                'oembed/oembed',
                                 'groups/timeline');
 
         static $bareauth = array('statuses/user_timeline',
diff --git a/actions/attachment.php b/actions/attachment.php
index ee4cd9640d..c6a5d0d523 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -98,6 +98,28 @@ class AttachmentAction extends Action
         return $a->title();
     }
 
+    function extraHead()
+    {
+        $this->element('link',array('rel'=>'alternate',
+            'type'=>'application/json+oembed',
+            'href'=>common_local_url(
+                'api',
+                array('apiaction'=>'oembed','method'=>'oembed.json'),
+                array('url'=>
+                    common_local_url('attachment',
+                        array('attachment' => $this->attachment->id)))),
+            'title'=>'oEmbed'),null);
+        $this->element('link',array('rel'=>'alternate',
+            'type'=>'text/xml+oembed',
+            'href'=>common_local_url(
+                'api',
+                array('apiaction'=>'oembed','method'=>'oembed.xml'),
+                array('url'=>
+                    common_local_url('attachment',
+                        array('attachment' => $this->attachment->id)))),
+            'title'=>'oEmbed'),null);
+    }
+
     /**
      * Handle input
      *
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 1ec38a76bc..8f73dc824a 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -275,6 +275,20 @@ class ShownoticeAction extends OwnerDesignAction
             $this->element('meta', array('name' => 'microid',
                                          'content' => $id->toString()));
         }
+        $this->element('link',array('rel'=>'alternate',
+            'type'=>'application/json+oembed',
+            'href'=>common_local_url(
+                'api',
+                array('apiaction'=>'oembed','method'=>'oembed.json'),
+                array('url'=>$this->notice->uri)),
+            'title'=>'oEmbed'),null);
+        $this->element('link',array('rel'=>'alternate',
+            'type'=>'text/xml+oembed',
+            'href'=>common_local_url(
+                'api',
+                array('apiaction'=>'oembed','method'=>'oembed.xml'),
+                array('url'=>$this->notice->uri)),
+            'title'=>'oEmbed'),null);
     }
 }
 
diff --git a/actions/twitapilaconica.php b/actions/twitapilaconica.php
index 8cd7a64b9f..442fdbcef2 100644
--- a/actions/twitapilaconica.php
+++ b/actions/twitapilaconica.php
@@ -171,4 +171,5 @@ class TwitapilaconicaAction extends TwitterapiAction
         parent::handle($args);
         $this->serverError(_('API method under construction.'), 501);
     }
+
 }
diff --git a/classes/File.php b/classes/File.php
index 56d9f98278..68d385d1ea 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -79,9 +79,8 @@ class File extends Memcached_DataObject
 
         if (isset($redir_data['type'])
             && ('text/html' === substr($redir_data['type'], 0, 9))
-            && ($oembed_data = File_oembed::_getOembed($given_url))
-            && isset($oembed_data['json'])) {
-            File_oembed::saveNew($oembed_data['json'], $file_id);
+            && ($oembed_data = File_oembed::_getOembed($given_url))) {
+                File_oembed::saveNew($oembed_data, $file_id);
         }
         return $x;
     }
diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index 69230e4a48..bbf112729b 100644
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -56,33 +56,46 @@ class File_oembed extends Memcached_DataObject
         return array(false, false, false);
     }
 
-    function _getOembed($url, $maxwidth = 500, $maxheight = 400, $format = 'json') {
-        $cmd = common_config('oohembed', 'endpoint') . '?url=' . urlencode($url);
-        if (is_int($maxwidth)) $cmd .= "&maxwidth=$maxwidth";
-        if (is_int($maxheight)) $cmd .= "&maxheight=$maxheight";
-        if (is_string($format)) $cmd .= "&format=$format";
-        $oe = @file_get_contents($cmd);
-        if (false === $oe) return false;
-        return array($format => (('json' === $format) ? json_decode($oe, true) : $oe));
+    function _getOembed($url, $maxwidth = 500, $maxheight = 400) {
+        require_once INSTALLDIR.'/extlib/Services/oEmbed.php';
+        $parameters = array(
+            'maxwidth'=>$maxwidth,
+            'maxheight'=>$maxheight,
+        );
+        try{
+            $oEmbed = new Services_oEmbed($url);
+            $object = $oEmbed->getObject($parameters);
+            return $object;
+        }catch(Exception $e){
+            try{
+                $oEmbed = new Services_oEmbed($url, array(
+                    Services_oEmbed::OPTION_API => common_config('oohembed', 'endpoint')
+                ));
+                $object = $oEmbed->getObject($parameters);
+                return $object;
+            }catch(Exception $ex){
+                return false;
+            }
+        }
     }
 
     function saveNew($data, $file_id) {
         $file_oembed = new File_oembed;
         $file_oembed->file_id = $file_id;
-        $file_oembed->version = $data['version'];
-        $file_oembed->type = $data['type'];
-        if (!empty($data['provider_name'])) $file_oembed->provider = $data['provider_name'];
-        if (!isset($file_oembed->provider) && !empty($data['provide'])) $file_oembed->provider = $data['provider'];
-        if (!empty($data['provide_url'])) $file_oembed->provider_url = $data['provider_url'];
-        if (!empty($data['width'])) $file_oembed->width = intval($data['width']);
-        if (!empty($data['height'])) $file_oembed->height = intval($data['height']);
-        if (!empty($data['html'])) $file_oembed->html = $data['html'];
-        if (!empty($data['title'])) $file_oembed->title = $data['title'];
-        if (!empty($data['author_name'])) $file_oembed->author_name = $data['author_name'];
-        if (!empty($data['author_url'])) $file_oembed->author_url = $data['author_url'];
-        if (!empty($data['url'])) $file_oembed->url = $data['url'];
+        $file_oembed->version = $data->version;
+        $file_oembed->type = $data->type;
+        if (!empty($data->provider_name)) $file_oembed->provider = $data->provider_name;
+        if (!empty($data->provider)) $file_oembed->provider = $data->provider;
+        if (!empty($data->provide_url)) $file_oembed->provider_url = $data->provider_url;
+        if (!empty($data->width)) $file_oembed->width = intval($data->width);
+        if (!empty($data->height)) $file_oembed->height = intval($data->height);
+        if (!empty($data->html)) $file_oembed->html = $data->html;
+        if (!empty($data->title)) $file_oembed->title = $data->title;
+        if (!empty($data->author_name)) $file_oembed->author_name = $data->author_name;
+        if (!empty($data->author_url)) $file_oembed->author_url = $data->author_url;
+        if (!empty($data->url)) $file_oembed->url = $data->url;
         $file_oembed->insert();
-        if (!empty($data['thumbnail_url'])) {
+        if (!empty($data->thumbnail_url)) {
             File_thumbnail::saveNew($data, $file_id);
         }
     }
diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index 44b92a2fad..0b09c6af8c 100644
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -51,9 +51,9 @@ class File_thumbnail extends Memcached_DataObject
     function saveNew($data, $file_id) {
         $tn = new File_thumbnail;
         $tn->file_id = $file_id;
-        $tn->url = $data['thumbnail_url'];
-        $tn->width = intval($data['thumbnail_width']);
-        $tn->height = intval($data['thumbnail_height']);
+        $tn->url = $data->thumbnail_url;
+        $tn->width = intval($data->thumbnail_width);
+        $tn->height = intval($data->thumbnail_height);
         $tn->insert();
     }
 }
diff --git a/extlib/Services/oEmbed.php b/extlib/Services/oEmbed.php
index 5d38ed883d..7d507b6f62 100644
--- a/extlib/Services/oEmbed.php
+++ b/extlib/Services/oEmbed.php
@@ -162,7 +162,7 @@ class Services_oEmbed
         }
 
         if ($this->options[self::OPTION_API] === null) {
-            $this->options[self::OPTION_API] = $this->discover();
+            $this->options[self::OPTION_API] = $this->discover($url);
         } 
     }
 
@@ -319,7 +319,7 @@ class Services_oEmbed
             }
         } 
 
-        return (isset($ret['json']) ? $ret['json'] : array_pop($ret));
+        return (isset($ret['application/json']) ? $ret['application/json'] : array_pop($ret));
     }
 
     /**
diff --git a/lib/router.php b/lib/router.php
index e121386370..bf3895bf01 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -113,6 +113,11 @@ class Router
 
         $m->connect('main/tagother/:id', array('action' => 'tagother'));
 
+        $m->connect('main/:method',
+                    array('action' => 'api',
+                          'method' => 'oembed(.xml|.json)?',
+                          'apiaction' => 'oembed'));
+
         // these take a code
 
         foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
@@ -390,6 +395,10 @@ class Router
 
         // laconica
 
+        $m->connect('api/laconica/:method',
+                    array('action' => 'api',
+                          'apiaction' => 'laconica'));
+
         $m->connect('api/laconica/:method',
                     array('action' => 'api',
                           'apiaction' => 'laconica'));