diff --git a/client/response_handler.py b/client/response_handler.py
index a36c419..2b9f311 100644
--- a/client/response_handler.py
+++ b/client/response_handler.py
@@ -12,7 +12,7 @@ from httplib.httpsocket import FORMAT
 from httplib.message import ClientMessage as Message
 from httplib.retriever import Retriever
 
-BASE_REGEX = re.compile(r"<\s*base.*href\s*=\s*['\"](\S*)['\"][^>]*>", re.M | re.I)
+BASE_REGEX = re.compile(r"<\s*base[^>]*\shref\s*=\s*['\"]([^\"']+)['\"][^>]*>", re.M | re.I)
 IMG_REGEX = re.compile(r"<\s*img[^>]*\ssrc\s*=\s*['\"]([^\"']+)['\"][^>]*>", re.M | re.I)