diff --git a/src/httpVueLoader.js b/src/httpVueLoader.js
index e809aac..1f06b6c 100644
--- a/src/httpVueLoader.js
+++ b/src/httpVueLoader.js
@@ -362,7 +362,18 @@
 	function resolveURL(baseURL, url) {
 
 		if (url.substr(0, 2) === './' || url.substr(0, 3) === '../') {
-			return baseURL + url;
+			var stack = baseURL.split('/'),
+					parts = url.split('/');
+			stack.pop();
+			for (var i=0; i<parts.length; i++) {
+				if (parts[i] == ".")
+					continue;
+				if (parts[i] == "..")
+					stack.pop();
+				else
+					stack.push(parts[i]);
+			}
+			return stack.join('/');
 		}
 		return url;
 	}