diff --git a/sites/all/modules/video_filter/video_filter.codecs.inc b/sites/all/modules/video_filter/video_filter.codecs.inc
index 1554d2c..6819f83 100644
--- a/sites/all/modules/video_filter/video_filter.codecs.inc
+++ b/sites/all/modules/video_filter/video_filter.codecs.inc
@@ -171,6 +171,14 @@ function video_filter_codec_info() {
     'regexp' => '/teachertube\.com\/viewVideo.php\?video_id\=([0-9]+)/i',
     'ratio' => 16 / 9,
   );
+	
+	$codecs['ustream'] = array(
+    'name' => t('UStream'),
+    'sample_url' => 'http://www.ustream.tv/embed/VIDEOID',
+    'callback' => 'video_filter_ustream',
+    'regexp' => '/ustream\.tv\/embed\/([0-9]+)/i',
+    'ratio' => 608 / 368,
+  );	
 
   return $codecs;
 }
@@ -387,3 +395,11 @@ function video_filter_teachertube($video) {
 
   return video_filter_flash($video, $params);
 }
+
+function video_filter_ustream($video) {	
+	$url = $video['codec']['matches'][1];
+	
+	$html = '<iframe src="http://www.ustream.tv/embed/'.$url.'" width="'.$video['width'].'" height="'.$video['height'].'" scrolling="no" frameborder="0" style="border: 0px none transparent;"></iframe>';
+
+  return $html;
+}