diff --git a/collects/meta/drdr/README-PORTS b/collects/meta/drdr/README-PORTS
new file mode 100644
index 0000000000..6b6a9953c6
--- /dev/null
+++ b/collects/meta/drdr/README-PORTS
@@ -0,0 +1,11 @@
+Please register which TCP ports your tests are using in this file so others don't accidentally conflict.
+
+6000 - DrDr X11 server
+....
+6100 - DrDr X11 server
+8887 - tests/racket/benchmarks/shootout/echo
+8888 - tests/racket/benchmarks/shootout/typed/echo (non-optimized)
+8889 - tests/racket/benchmarks/shootout/typed/echo (optimized)
+9000 - DrDr Web server
+9001 - tests/net
+9999 - tests/web-server
\ No newline at end of file
diff --git a/collects/tests/racket/benchmarks/shootout/echo.rkt b/collects/tests/racket/benchmarks/shootout/echo.rkt
index 71025c506a..751f023870 100644
--- a/collects/tests/racket/benchmarks/shootout/echo.rkt
+++ b/collects/tests/racket/benchmarks/shootout/echo.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/tcp)
 
-(define PORT 8888)
+(define PORT 8887)
 (define DATA "Hello there sailor\n")
 (define n 10)
 
diff --git a/collects/tests/racket/benchmarks/shootout/typed/echo.rktl b/collects/tests/racket/benchmarks/shootout/typed/echo.rktl
index 95cd314943..7430f6dab2 100644
--- a/collects/tests/racket/benchmarks/shootout/typed/echo.rktl
+++ b/collects/tests/racket/benchmarks/shootout/typed/echo.rktl
@@ -1,6 +1,6 @@
 (require racket/tcp)
 
-(define PORT 8888)
+(define PORT (+ 8888 (if OPTIMIZED? 1 0)))
 (define DATA "Hello there sailor\n")
 (: n Integer)
 (define n 10)
diff --git a/collects/tests/racket/benchmarks/shootout/typed/wrapper.rkt b/collects/tests/racket/benchmarks/shootout/typed/wrapper.rkt
index 90c6a014a6..3ced8ad089 100644
--- a/collects/tests/racket/benchmarks/shootout/typed/wrapper.rkt
+++ b/collects/tests/racket/benchmarks/shootout/typed/wrapper.rkt
@@ -15,4 +15,6 @@
 				      name)))]
 	 [option (if opt? (list #'#:optimize) '())]
 	 [fname (format "~a.rktl" base-name)])
-    #`(ts:#%module-begin #,@option (include/reader #,fname r:read-syntax))))
+    #`(ts:#%module-begin #,@option 
+                         (define OPTIMIZED? #,opt?)
+                         (include/reader #,fname r:read-syntax))))