diff --git a/pom.xml b/pom.xml
index 9d5f061..1b22819 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
diff --git a/src/main/java/com/fool/servlet/PoweredByResponseHeaderFilter.java b/src/main/java/com/fool/servlet/PoweredByResponseHeaderFilter.java
index 12db864..e7182e7 100644
--- a/src/main/java/com/fool/servlet/PoweredByResponseHeaderFilter.java
+++ b/src/main/java/com/fool/servlet/PoweredByResponseHeaderFilter.java
@@ -19,7 +19,7 @@ public class PoweredByResponseHeaderFilter implements Filter
 	
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
 		HttpServletResponse httpResponse = (HttpServletResponse) response;
-		httpResponse.addHeader(headerName, host + ":" + request.getServerPort());
+		httpResponse.addHeader(headerName, host + ":" + request.getLocalPort());
 		
 		filterChain.doFilter(request, response);
 	}
diff --git a/src/test/java/com/fool/servlet/PoweredByResponseHeaderFilterTests.java b/src/test/java/com/fool/servlet/PoweredByResponseHeaderFilterTests.java
index 848955a..9f1f86f 100644
--- a/src/test/java/com/fool/servlet/PoweredByResponseHeaderFilterTests.java
+++ b/src/test/java/com/fool/servlet/PoweredByResponseHeaderFilterTests.java
@@ -32,7 +32,8 @@ protected void setUp() throws Exception {
 	
 	public void testSetsHeader() throws Exception {
 		Mockito.when(request.getServerName()).thenReturn("snorkle01.example.com");
-		Mockito.when(request.getServerPort()).thenReturn(8087);
+		Mockito.when(request.getServerPort()).thenReturn(80);
+		Mockito.when(request.getLocalPort()).thenReturn(8087);
 		
 		filter.doFilter(request, response, chain);