diff --git a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
index fc9fa53b..1a926248 100755
--- a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
+++ b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
@@ -168,8 +168,23 @@ public class ControllerLinkBuilder extends LinkBuilderSupport<ControllerLinkBuil
 		ServletUriComponentsBuilder builder = ServletUriComponentsBuilder.fromServletMapping(request);
 
 		String header = request.getHeader("X-Forwarded-Host");
-		if (StringUtils.hasText(header)) {
-			builder.host(header);
+
+		if (!StringUtils.hasText(header)) {
+			return builder;
+		}
+
+		String[] hosts = StringUtils.commaDelimitedListToStringArray(header);
+		String hostToUse = hosts[0];
+
+		if (hostToUse.contains(":")) {
+
+			String[] hostAndPort = StringUtils.split(hostToUse, ":");
+
+			builder.host(hostAndPort[0]);
+			builder.port(Integer.parseInt(hostAndPort[1]));
+
+		} else {
+			builder.host(hostToUse);
 		}
 
 		return builder;
diff --git a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
index 595881a9..cbac99b7 100644
--- a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
@@ -208,6 +208,30 @@ public class ControllerLinkBuilderUnitTest extends TestUtils {
 		assertThat(components.getQuery(), is("foo=bar"));
 	}
 
+	/**
+	 * @see #90
+	 */
+	@Test
+	public void usesForwardedHostAndPortFromHeader() {
+
+		request.addHeader("X-Forwarded-Host", "foobar:8088");
+
+		Link link = linkTo(PersonControllerImpl.class).withSelfRel();
+		assertThat(link.getHref(), startsWith("http://foobar:8088"));
+	}
+
+	/**
+	 * @see #90
+	 */
+	@Test
+	public void usesFirstHostOfXForwardedHost() {
+
+		request.addHeader("X-Forwarded-Host", "barfoo:8888, localhost:8088");
+
+		Link link = linkTo(PersonControllerImpl.class).withSelfRel();
+		assertThat(link.getHref(), startsWith("http://barfoo:8888"));
+	}
+
 	private static UriComponents toComponents(Link link) {
 		return UriComponentsBuilder.fromUriString(link.getHref()).build();
 	}