diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 65622b5d70..c0628be83f 100644
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -37,7 +37,8 @@
 - bignums
 - >lower, >upper for strings
 - read1
-- telnetd and httpd should use multitasking
+- telnetd should use multitasking
+- telnetd error handling
 - sbuf-hashcode
 - vector-hashcode
 - irc: stack underflow?
diff --git a/library/httpd/httpd.factor b/library/httpd/httpd.factor
index 6e57dc3a2f..f31da9fdec 100644
--- a/library/httpd/httpd.factor
+++ b/library/httpd/httpd.factor
@@ -103,6 +103,9 @@ USE: url-encoding
         ] in-thread drop
     ] ifte ;
 
+: quit-flag ( -- ? )
+    global [ "httpd-quit" get ] bind ;
+
 : clear-quit-flag ( -- )
     global [ "httpd-quit" off ] bind ;