diff --git a/TODO.txt b/TODO.txt
index ce972fe..364b734 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -12,9 +12,6 @@ TODO
 
 - Gallery preview (multiple element hashid)
 
-- Option to trust X-Forwarded-For addresses
-  (+ including display them in the error log)
-
 - Ctrl+V support
 
 - Prevent selecting around the toggle buttons (firefox for android)
diff --git a/_dist/README.txt b/_dist/README.txt
index 5fd8d92..efe47ce 100644
--- a/_dist/README.txt
+++ b/_dist/README.txt
@@ -33,6 +33,8 @@ You can use contented as a standalone upload server, or you can use the SDK to e
         Maximum upload speed in bytes/sec (set zero for unlimited)
   -title string
         Title used in web interface (default "contented")
+  -trustXForwardedFor
+        Trust X-Forwarded-For reverse proxy headers
 `
 
 If you are hosting behind a reverse proxy, remember to set its post body size parameter appropriately (e.g. `client_max_body_size` for nginx).
@@ -57,6 +59,7 @@ contented.init("#target", function(/* String[] */ items) {});
 
 ????: 
 - Feature: Drawing mode
+- Feature: Add `trustXForwardedFor` option
 - Feature: Add `getDownloadURL`, `getInfoJSONURL`, `getPreviewURL` SDK methods
 - Enhancement: Automatically load library dependencies
 - Enhancement: Display homepage widget using the full screen size