diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
index 4711c93bb5..78f846626e 100644
--- a/Library/Contributions/brew_bash_completion.sh
+++ b/Library/Contributions/brew_bash_completion.sh
@@ -13,7 +13,7 @@ _brew_to_completion()
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     
     # We only complete unabbreviated commands...
-    actions="edit homepage info install list link make uninstall"
+    actions="edit generate homepage info install list link uninstall"
     
     # Subcommand list
     if [[ ( ${COMP_CWORD} -eq 1 ) && ( ${COMP_WORDS[0]} == brew )  ]] ; then
diff --git a/Library/Homebrew/ARGV+yeast.rb b/Library/Homebrew/ARGV+yeast.rb
index 5dc5ec3ad2..e602d7901a 100644
--- a/Library/Homebrew/ARGV+yeast.rb
+++ b/Library/Homebrew/ARGV+yeast.rb
@@ -90,7 +90,7 @@ Commands:
   link formula ...
   home formula ...
   info [formula] [--github]
-  make url
+  gen url
   prune
 
 To visit the Homebrew homepage type:
diff --git a/README b/README
index fd6b3591c4..c1b11d03be 100644
--- a/README
+++ b/README
@@ -247,7 +247,7 @@ Contributing New Formulae
 =========================
 Formulae are simple Ruby scripts. Generate a formula with most bits filled-in:
 
-    brew mk http://foo.org/foobar-1.2.1.tar.bz2
+    brew create http://foo.org/foobar-1.2.1.tar.bz2
 
 Check it over and try to install it:
 
@@ -275,5 +275,8 @@ FAQ
 2. Was Homebrew devised under the influence of alcohol?  
    Yes.
 
+3. Can Homebrew replace MacPorts?  
+   Maybe. But remember, Homebrew is still incomplete. Be forgiving in your
+   approach and be willing to fork and contribute fixes. Thanks!
 
 [wiki]: http://wiki.github.com/mxcl/homebrew
diff --git a/bin/brew b/bin/brew
index 9876c9a996..a9a372398b 100755
--- a/bin/brew
+++ b/bin/brew
@@ -181,7 +181,14 @@ begin
     when 'prune'
       prune
 
+    # 'make' supported until 0.7 for historic reasons
     when 'mk', 'make'
+      opoo "`brew make' has changed to `brew create'"
+      puts "This is because make can be confused with the `make' tool."
+      puts "brew make will continue working until Homebrew 0.7"
+      exec __FILE__, "create", *ARGV
+
+    when 'create'
       if ARGV.include? '--macports'
         exec "open", "http://www.macports.org/ports.php?by=name&substr=#{ARGV.next}"
       else