Index: core/src/main/java/com/xpn/xwiki/web/XWikiServletRequest.java
===================================================================
--- core/src/main/java/com/xpn/xwiki/web/XWikiServletRequest.java	(revision 2511)
+++ core/src/main/java/com/xpn/xwiki/web/XWikiServletRequest.java	(working copy)
@@ -226,10 +226,14 @@
     }
 
     public String getRemoteAddr() {
+	if (request.getHeader("x-forwarded-for") != null)
+	    return request.getHeader("x-forwarded-for");
         return request.getRemoteAddr();
     }
 
     public String getRemoteHost() {
+	if (request.getHeader("x-forwarded-for") != null)
+	    return request.getHeader("x-forwarded-for");
         return request.getRemoteHost();
     }