diff --git a/plugins/youtube.lua b/plugins/youtube.lua
index 0baa6e3..7c310d5 100644
--- a/plugins/youtube.lua
+++ b/plugins/youtube.lua
@@ -1,20 +1,40 @@
+do
 
-function send_youtube_thumbnail(msg, yt_code)
-    yt_thumbnail = "http://img.youtube.com/vi/".. yt_code .."/hqdefault.jpg"
-    file = download_to_file(yt_thumbnail)
-    send_photo(get_receiver(msg), file, ok_cb, false)
+local BASE_URL = 'http://gdata.youtube.com/feeds/api/'
+
+function get_yt_data (yt_code)
+  local url = BASE_URL..'/videos/'..yt_code..'?v=2&alt=jsonc'
+  local res,code  = http.request(url)
+  if code ~= 200 then return "HTTP ERROR" end
+  local data = json:decode(res).data
+  return data
+end
+
+function send_youtube_data(data, receiver)
+  local title = data.title
+  local description = data.description
+  local uploader = data.uploader
+  local text = title..' ('..uploader..')\n'..description
+  local image_url = data.thumbnail.hqDefault
+  local cb_extra = {receiver=receiver, url=image_url}
+  send_msg(receiver, text, send_photo_from_url_callback, cb_extra)
 end
 
 function run(msg, matches)
-	send_youtube_thumbnail(msg, matches[1])
+  local yt_code = matches[1]
+  local data = get_yt_data(yt_code)
+  local receiver = get_receiver(msg)
+  send_youtube_data(data, receiver)
 end
 
 return {
-    description = "sends YouTube image", 
-    usage = "",
-    patterns = {
-    	"youtu.be/([A-Za-z0-9-]+)",
-    	"youtube.com/watch%?v=([A-Za-z0-9-]+)",
-    }, 
-    run = run 
-}
\ No newline at end of file
+  description = "Sends YouTube info and image.", 
+  usage = "",
+  patterns = {
+    "youtu.be/([A-Za-z0-9-]+)",
+    "youtube.com/watch%?v=([A-Za-z0-9-]+)",
+  },
+  run = run 
+}
+
+end
\ No newline at end of file