diff --git a/commands.go b/commands.go
index fd8b0c57a..dbffe9b7a 100644
--- a/commands.go
+++ b/commands.go
@@ -35,6 +35,12 @@ func init() {
 		Ui:          Ui,
 	}
 
+	// The command list is included in the terraform -help
+	// output, which is in turn included in the docs at
+	// website/source/docs/commands/index.html.markdown; if you
+	// add, remove or reclassify commands then consider updating
+	// that to match.
+
 	PlumbingCommands = map[string]struct{}{
 		"state": struct{}{}, // includes all subcommands
 		"debug": struct{}{}, // includes all subcommands
diff --git a/help.go b/help.go
index 0358942ec..cd4e6714b 100644
--- a/help.go
+++ b/help.go
@@ -28,6 +28,9 @@ func helpFunc(commands map[string]cli.CommandFactory) string {
 		}
 	}
 
+	// The output produced by this is included in the docs at
+	// website/source/docs/commands/index.html.markdown; if you
+	// change this then consider updating that to match.
 	helpText := fmt.Sprintf(`
 Usage: terraform [--version] [--help] <command> [args]