diff --git a/__init__.py b/__init__.py
index 338f5d3..4fd702f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,6 +8,8 @@ def resolve(url):
 		return sockshare.resolve(url)
 	elif re.match("https?:\/\/(www\.)?1channel\.ch\/external\.php", url) is not None:
 		return onechannel.resolve(url)
+	elif re.match("https?:\/\/(www\.)?youtube\.com\/watch\?", url) is not None:
+		return youtube.resolve(url)
 	else:
 		return {}
 
diff --git a/resolvers/__init__.py b/resolvers/__init__.py
index 208f9cf..a966248 100644
--- a/resolvers/__init__.py
+++ b/resolvers/__init__.py
@@ -2,3 +2,4 @@ from dummy import *
 from putlocker import *
 from sockshare import *
 from onechannel import *
+from youtube import *
diff --git a/resolvers/youtube.py b/resolvers/youtube.py
new file mode 100644
index 0000000..effcbe0
--- /dev/null
+++ b/resolvers/youtube.py
@@ -0,0 +1,71 @@
+import re, urllib, urllib2
+from resolv.shared import ResolverError
+
+def resolve(url):
+	try:
+		contents = urllib2.urlopen(url).read()
+	except:
+		raise ResolverError("Could not retrieve the specified URL.")
+	
+	map_start = "url_encoded_fmt_stream_map="
+	map_end = "\\u0026amp;"
+	
+	try:
+		pos_start = contents.index(map_start) + len(map_start) + 6
+		snippet = contents[pos_start:]
+	except ValueError:
+		raise ResolverError("The starting position for the YouTube player configuration could not be found. Is the URL really a valid video page?")
+	
+	try:
+		pos_end = snippet.index(map_end)
+		stream_map = snippet[:pos_end]
+	except ValueError:
+		raise ResolverError("The ending position for the YouTube player configuration could not be found.")
+	
+	try:
+		stream_map = urllib.unquote(stream_map)
+		streams = stream_map.split(',url=')
+	except:
+		raise ResolverError("The YouTube player configuration is corrupted.")
+	
+	stream_pool = {}
+	
+	for stream in streams:
+		fields = stream.split('&')
+		
+		if len(fields) < 5:
+			raise ResolverError("The amount of fields in the YouTube player configuration is incorrect.")
+		
+		video_url = urllib.unquote(fields[0])
+		quality = fields[1].split("=")[1]
+		fallback_host = fields[2].split("=")[1]
+		mimetype = urllib.unquote(fields[3].split("=")[1])
+		itag = fields[4].split("=", 2)[1]
+		
+		if mimetype.startswith("video/mp4"):
+			video_format = "mp4"
+		elif mimetype.startswith("video/x-flv"):
+			video_format = "flv"
+		elif mimetype.startswith("video/3gpp"):
+			video_format = "3gp"
+		elif mimetype.startswith("video/webm"):
+			video_format = "webm"
+		else:
+			video_format = "unknown"
+		
+		if quality == "small":
+			video_quality = "240p"
+		elif quality == "medium":
+			video_quality = "360p"
+		elif quality == "large":
+			video_quality = "480p"
+		elif quality == "hd720":
+			video_quality = "720p"
+		elif quality == "hd1080":
+			video_quality = "1080p"
+		else:
+			video_quality = "unknown"
+		
+		stream_pool['video_%s_%s' % (video_quality, video_format)] = video_url
+	
+	return stream_pool