diff --git a/src/ecmascript/spidermonkey/location.c b/src/ecmascript/spidermonkey/location.c
index 87c2ab5c..bd286119 100644
--- a/src/ecmascript/spidermonkey/location.c
+++ b/src/ecmascript/spidermonkey/location.c
@@ -154,6 +154,8 @@ history_go(JSContext *ctx, unsigned int argc, JS::Value *rval)
 	return 2;
 }
 
+static bool location_get_property_host(JSContext *ctx, unsigned int argc, JS::Value *vp);
+static bool location_set_property_host(JSContext *ctx, unsigned int argc, JS::Value *vp);
 static bool location_get_property_hostname(JSContext *ctx, unsigned int argc, JS::Value *vp);
 static bool location_set_property_hostname(JSContext *ctx, unsigned int argc, JS::Value *vp);
 static bool location_get_property_href(JSContext *ctx, unsigned int argc, JS::Value *vp);
@@ -188,6 +190,7 @@ enum location_prop {
 	JSP_LOC_HREF = -1,
 };
 JSPropertySpec location_props[] = {
+	JS_PSGS("host",	location_get_property_host, location_set_property_host, JSPROP_ENUMERATE),
 	JS_PSGS("hostname",	location_get_property_hostname, location_set_property_hostname, JSPROP_ENUMERATE),
 	JS_PSGS("href",	location_get_property_href, location_set_property_href, JSPROP_ENUMERATE),
 	JS_PSG("origin",	location_get_property_origin, JSPROP_ENUMERATE),
@@ -198,6 +201,44 @@ JSPropertySpec location_props[] = {
 	JS_PS_END
 };
 
+static bool
+location_get_property_host(JSContext *ctx, unsigned int argc, JS::Value *vp)
+{
+	JS::CallArgs args = CallArgsFromVp(argc, vp);
+	JS::RootedObject hobj(ctx, &args.thisv().toObject());
+
+	struct view_state *vs;
+	JSCompartment *comp = js::GetContextCompartment(ctx);
+
+	if (!comp) {
+		return false;
+	}
+
+	struct ecmascript_interpreter *interpreter = JS_GetCompartmentPrivate(comp);
+
+	/* This can be called if @obj if not itself an instance of the
+	 * appropriate class but has one in its prototype chain.  Fail
+	 * such calls.  */
+	if (!JS_InstanceOf(ctx, hobj, &location_class, NULL))
+		return false;
+
+	vs = interpreter->vs;
+	if (!vs) {
+		return false;
+	}
+
+	char *str = get_uri_string(vs->uri, URI_HOST | URI_PORT);
+
+	if (!str) {
+		return false;
+	}
+
+	args.rval().setString(JS_NewStringCopyZ(ctx, str));
+	mem_free(str);
+
+	return true;
+}
+
 static bool
 location_get_property_hostname(JSContext *ctx, unsigned int argc, JS::Value *vp)
 {
@@ -236,7 +277,6 @@ location_get_property_hostname(JSContext *ctx, unsigned int argc, JS::Value *vp)
 	return true;
 }
 
-
 static bool
 location_get_property_href(JSContext *ctx, unsigned int argc, JS::Value *vp)
 {
@@ -474,7 +514,7 @@ location_get_property_search(JSContext *ctx, unsigned int argc, JS::Value *vp)
 }
 
 static bool
-location_set_property_hostname(JSContext *ctx, unsigned int argc, JS::Value *vp)
+location_set_property_host(JSContext *ctx, unsigned int argc, JS::Value *vp)
 {
 	JS::CallArgs args = CallArgsFromVp(argc, vp);
 	JS::RootedObject hobj(ctx, &args.thisv().toObject());
@@ -505,6 +545,37 @@ location_set_property_hostname(JSContext *ctx, unsigned int argc, JS::Value *vp)
 	return true;
 }
 
+static bool
+location_set_property_hostname(JSContext *ctx, unsigned int argc, JS::Value *vp)
+{
+	JS::CallArgs args = CallArgsFromVp(argc, vp);
+	JS::RootedObject hobj(ctx, &args.thisv().toObject());
+
+	struct view_state *vs;
+	struct document_view *doc_view;
+	JSCompartment *comp = js::GetContextCompartment(ctx);
+
+	if (!comp) {
+		return false;
+	}
+
+	struct ecmascript_interpreter *interpreter = JS_GetCompartmentPrivate(comp);
+
+	/* This can be called if @obj if not itself an instance of the
+	 * appropriate class but has one in its prototype chain.  Fail
+	 * such calls.  */
+	if (!JS_InstanceOf(ctx, hobj, &location_class, NULL))
+		return false;
+
+	vs = interpreter->vs;
+	if (!vs) {
+		return false;
+	}
+	doc_view = vs->doc_view;
+//	location_goto(doc_view, JS_EncodeString(ctx, args[0].toString()));
+
+	return true;
+}
 
 static bool
 location_set_property_href(JSContext *ctx, unsigned int argc, JS::Value *vp)
diff --git a/test/ecmascript/location.html b/test/ecmascript/location.html
index 5059869d..73f6d442 100644
--- a/test/ecmascript/location.html
+++ b/test/ecmascript/location.html
@@ -1,3 +1,4 @@
+<p><button onclick="javascript:{ alert(location.host); }">Display location.host.</button></p>
 <p><button onclick="javascript:{ alert(location.hostname); }">Display location.hostname.</button></p>
 <p><button onclick="javascript:{ alert(location.origin); }">Display location.origin.</button></p>
 <p><button onclick="javascript:{ alert(location.pathname); }">Display location.pathname.</button></p>