diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
index 348842ae752..876e039fcca 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
@@ -16,6 +16,7 @@
 
 package org.springframework.http.server.reactive;
 
+import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -64,7 +65,16 @@ public class ReactorServerHttpRequest extends AbstractServerHttpRequest {
 
 	@Override
 	protected URI initUri() throws URISyntaxException {
-		return new URI(this.channel.uri());
+		URI uri = new URI(this.channel.uri());
+		InetSocketAddress remoteAddress = this.channel.remoteAddress();
+		return new URI(
+				uri.getScheme(),
+				uri.getUserInfo(),
+				(remoteAddress != null ? remoteAddress.getHostString() : null),
+				(remoteAddress != null ? remoteAddress.getPort() : -1),
+				uri.getPath(),
+				uri.getQuery(),
+				uri.getFragment());
 	}
 
 	@Override
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java
index e78d7decbe1..660033f1e81 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java
@@ -16,6 +16,7 @@
 
 package org.springframework.http.server.reactive;
 
+import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -68,7 +69,17 @@ public class RxNettyServerHttpRequest extends AbstractServerHttpRequest {
 
 	@Override
 	protected URI initUri() throws URISyntaxException {
-		return new URI(this.request.getUri());
+		URI uri = new URI(this.request.getUri());
+		InetSocketAddress remoteAddress = this.getHeaders().getHost();
+		return new URI(
+				uri.getScheme(),
+				uri.getUserInfo(),
+				(remoteAddress != null ? remoteAddress.getHostString() : null),
+				(remoteAddress != null ? remoteAddress.getPort() : -1),
+				uri.getPath(),
+				uri.getQuery(),
+				uri.getFragment());
+
 	}
 
 	@Override
diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestIntegrationTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestIntegrationTests.java
new file mode 100644
index 00000000000..3b2569d92b5
--- /dev/null
+++ b/spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestIntegrationTests.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.http.server.reactive;
+
+import java.net.URI;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import reactor.core.publisher.Mono;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+public class ServerHttpRequestIntegrationTests extends AbstractHttpHandlerIntegrationTests {
+
+	@Override
+	protected CheckRequestHandler createHttpHandler() {
+		return new CheckRequestHandler();
+	}
+
+	@Test
+	public void checkUri() throws Exception {
+		RestTemplate restTemplate = new RestTemplate();
+		RequestEntity<Void> request = RequestEntity.post(new URI("http://localhost:" + port + "/foo?param=bar")).build();
+		ResponseEntity<Void> response = restTemplate.exchange(request, Void.class);
+		assertEquals(HttpStatus.OK, response.getStatusCode());
+	}
+
+
+	public static class CheckRequestHandler implements HttpHandler {
+
+		@Override
+		public Mono<Void> handle(ServerHttpRequest request, ServerHttpResponse response) {
+			URI uri = request.getURI();
+			assertNotNull("Request URI host must not be null", uri.getHost());
+			assertNotEquals("Request URI port must not be undefined", -1, uri.getPort());
+			assertEquals("Request URI path is not valid", "/foo", uri.getPath());
+			assertEquals("Request URI query is not valid", "param=bar", uri.getQuery());
+			return Mono.empty();
+		}
+	}
+}