diff --git a/basis/editors/editpadpro/editpadpro.factor b/basis/editors/editpadpro/editpadpro.factor
index 9da57e16bf..09f59f0916 100755
--- a/basis/editors/editpadpro/editpadpro.factor
+++ b/basis/editors/editpadpro/editpadpro.factor
@@ -1,6 +1,6 @@
 USING: definitions kernel parser words sequences math.parser
 namespaces editors io.launcher windows.shell32 io.files
-io.paths strings unicode.case ;
+io.paths strings unicode.case make ;
 IN: editors.editpadpro
 
 : editpadpro-path
diff --git a/basis/editors/editplus/editplus.factor b/basis/editors/editplus/editplus.factor
index 363d202f6c..8af036f290 100755
--- a/basis/editors/editplus/editplus.factor
+++ b/basis/editors/editplus/editplus.factor
@@ -1,5 +1,5 @@
 USING: editors io.files io.launcher kernel math.parser
-namespaces sequences windows.shell32 ;
+namespaces sequences windows.shell32 make ;
 IN: editors.editplus
 
 : editplus-path ( -- path )
diff --git a/basis/editors/emacs/emacs.factor b/basis/editors/emacs/emacs.factor
index 966c4f368e..1d9f72f8c3 100755
--- a/basis/editors/emacs/emacs.factor
+++ b/basis/editors/emacs/emacs.factor
@@ -1,5 +1,5 @@
 USING: definitions io.launcher kernel parser words sequences math
-math.parser namespaces editors ;
+math.parser namespaces editors make ;
 IN: editors.emacs
 
 : emacsclient ( file line -- )
diff --git a/basis/editors/emeditor/emeditor.factor b/basis/editors/emeditor/emeditor.factor
index 8aecb49ae5..9aec22eed1 100755
--- a/basis/editors/emeditor/emeditor.factor
+++ b/basis/editors/emeditor/emeditor.factor
@@ -1,5 +1,6 @@
 USING: editors hardware-info.windows io.files io.launcher
-kernel math.parser namespaces sequences windows.shell32 ;
+kernel math.parser namespaces sequences windows.shell32
+make ;
 IN: editors.emeditor
 
 : emeditor-path ( -- path )
diff --git a/basis/editors/gvim/gvim.factor b/basis/editors/gvim/gvim.factor
index 4cc9de17a1..ad6fb65cfb 100755
--- a/basis/editors/gvim/gvim.factor
+++ b/basis/editors/gvim/gvim.factor
@@ -1,6 +1,6 @@
 USING: io.backend io.files kernel math math.parser
 namespaces sequences system combinators
-editors.vim vocabs.loader ;
+editors.vim vocabs.loader make ;
 IN: editors.gvim
 
 SINGLETON: gvim
diff --git a/basis/editors/notepadpp/notepadpp.factor b/basis/editors/notepadpp/notepadpp.factor
index 959e633cc3..540612aeec 100755
--- a/basis/editors/notepadpp/notepadpp.factor
+++ b/basis/editors/notepadpp/notepadpp.factor
@@ -1,5 +1,5 @@
 USING: editors io.files io.launcher kernel math.parser
-namespaces sequences windows.shell32 ;
+namespaces sequences windows.shell32 make ;
 IN: editors.notepadpp
 
 : notepadpp-path
diff --git a/basis/editors/scite/scite.factor b/basis/editors/scite/scite.factor
index a0bacaabba..aa5c5ef2a1 100755
--- a/basis/editors/scite/scite.factor
+++ b/basis/editors/scite/scite.factor
@@ -9,7 +9,7 @@
 ! if not on the path.
 !
 USING: io.files io.launcher kernel namespaces math
-math.parser editors sequences windows.shell32 ;
+math.parser editors sequences windows.shell32 make ;
 IN: editors.scite
 
 : scite-path ( -- path )
diff --git a/basis/editors/ted-notepad/ted-notepad.factor b/basis/editors/ted-notepad/ted-notepad.factor
index 9b341dd2a8..b4135c92a0 100755
--- a/basis/editors/ted-notepad/ted-notepad.factor
+++ b/basis/editors/ted-notepad/ted-notepad.factor
@@ -1,5 +1,5 @@
 USING: editors io.files io.launcher kernel math.parser
-namespaces sequences windows.shell32 ;
+namespaces sequences windows.shell32 make ;
 IN: editors.ted-notepad
 
 : ted-notepad-path
diff --git a/basis/editors/textmate/textmate.factor b/basis/editors/textmate/textmate.factor
index 12d45aa192..8bea085c7f 100755
--- a/basis/editors/textmate/textmate.factor
+++ b/basis/editors/textmate/textmate.factor
@@ -1,5 +1,5 @@
 USING: definitions io.launcher kernel math math.parser parser
-namespaces prettyprint editors ;
+namespaces prettyprint editors make ;
 
 IN: editors.textmate
 
diff --git a/basis/editors/textwrangler/textwrangler.factor b/basis/editors/textwrangler/textwrangler.factor
index e97dadcdcb..f5a33f044d 100644
--- a/basis/editors/textwrangler/textwrangler.factor
+++ b/basis/editors/textwrangler/textwrangler.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Ben Schlingelhof.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: definitions io.launcher kernel parser words sequences
-math math.parser namespaces editors ;
+math math.parser namespaces editors make ;
 IN: editors.textwrangler
 
 : tw ( file line -- )
diff --git a/basis/editors/ultraedit/ultraedit.factor b/basis/editors/ultraedit/ultraedit.factor
index d0bb789c1b..7c9c41df7a 100755
--- a/basis/editors/ultraedit/ultraedit.factor
+++ b/basis/editors/ultraedit/ultraedit.factor
@@ -1,5 +1,5 @@
 USING: editors io.files io.launcher kernel math.parser
-namespaces sequences windows.shell32 ;
+namespaces sequences windows.shell32 wne ;
 IN: editors.ultraedit
 
 : ultraedit-path ( -- path )
diff --git a/basis/editors/vim/vim.factor b/basis/editors/vim/vim.factor
index bfbb8f15a5..f07f257888 100755
--- a/basis/editors/vim/vim.factor
+++ b/basis/editors/vim/vim.factor
@@ -1,5 +1,6 @@
 USING: definitions io io.launcher kernel math math.parser
-namespaces parser prettyprint sequences editors accessors ;
+namespaces parser prettyprint sequences editors accessors
+make ;
 IN: editors.vim
 
 SYMBOL: vim-path
diff --git a/basis/smtp/smtp-docs.factor b/basis/smtp/smtp-docs.factor
index 435b04504d..e859e082ff 100644
--- a/basis/smtp/smtp-docs.factor
+++ b/basis/smtp/smtp-docs.factor
@@ -4,12 +4,18 @@ USING: accessors kernel quotations help.syntax help.markup
 io.sockets strings calendar ;
 IN: smtp
 
+HELP: smtp-domain
+{ $description "The name of the machine that is sending the email.  This variable will be filled in by the " { $link host-name } " word if not set by the user." } ;
+
 HELP: smtp-server
 { $description "Holds an " { $link inet } " object with the address of an SMTP server." } ;
 
 HELP: smtp-read-timeout
 { $description "Holds an " { $link duration } " object that specifies how long to wait for a response from the SMTP server." } ;
 
+HELP: esmtp?
+{ $description "Set true by default, determines whether the SMTP client is using the Extended SMTP protocol." } ;
+
 HELP: with-smtp-connection
 { $values { "quot" quotation } }
 { $description "Connects to an SMTP server stored in " { $link smtp-server } " and calls the quotation." } ;
@@ -36,5 +42,10 @@ HELP: send-email
 } ;
 
 ARTICLE: "smtp" "SMTP Client Library"
+"Configuring SMTP:"
+{ $subsection smtp-server }
+{ $subsection smtp-read-timeout }
+{ $subsection smtp-domain }
+{ $subsection esmtp? }
 "Sending an email:"
 { $subsection send-email } ;
diff --git a/basis/smtp/smtp.factor b/basis/smtp/smtp.factor
index f95ecddc1e..26bfea9a13 100755
--- a/basis/smtp/smtp.factor
+++ b/basis/smtp/smtp.factor
@@ -10,7 +10,7 @@ IN: smtp
 SYMBOL: smtp-domain
 SYMBOL: smtp-server     "localhost" "smtp" <inet> smtp-server set-global
 SYMBOL: smtp-read-timeout    1 minutes smtp-read-timeout set-global
-SYMBOL: esmtp           t esmtp set-global
+SYMBOL: esmtp?           t esmtp? set-global
 
 LOG: log-smtp-connection NOTICE ( addrspec -- )
 
@@ -39,7 +39,7 @@ TUPLE: email
 : command ( string -- ) write crlf flush ;
 
 : helo ( -- )
-    esmtp get "EHLO " "HELO " ? host-name append command ;
+    esmtp? get "EHLO " "HELO " ? host-name append command ;
 
 ERROR: bad-email-address email ;