diff --git a/command/commands.go b/command/commands.go
index 004c8d9d7a..b71e4187f4 100644
--- a/command/commands.go
+++ b/command/commands.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/hashicorp/consul/command/event"
 	"github.com/hashicorp/consul/command/join"
 	"github.com/hashicorp/consul/command/validate"
 	"github.com/hashicorp/consul/version"
@@ -72,12 +73,7 @@ func init() {
 		},
 
 		"event": func() (cli.Command, error) {
-			return &EventCommand{
-				BaseCommand: BaseCommand{
-					Flags: FlagSetHTTP,
-					UI:    ui,
-				},
-			}, nil
+			return event.New(ui), nil
 		},
 
 		"exec": func() (cli.Command, error) {
diff --git a/command/event.go b/command/event/event.go
similarity index 70%
rename from command/event.go
rename to command/event/event.go
index 1225ad023e..b368b4d218 100644
--- a/command/event.go
+++ b/command/event/event.go
@@ -1,39 +1,48 @@
-package command
+package event
 
 import (
+	"flag"
 	"fmt"
 	"regexp"
 
-	consulapi "github.com/hashicorp/consul/api"
+	"github.com/hashicorp/consul/api"
+	"github.com/hashicorp/consul/command/flags"
+	"github.com/mitchellh/cli"
 )
 
-// EventCommand is a Command implementation that is used to
-// fire new events
-type EventCommand struct {
-	BaseCommand
+func New(ui cli.Ui) *cmd {
+	c := &cmd{UI: ui}
+	c.initFlags()
+	return c
+}
 
-	// flags
+type cmd struct {
+	UI      cli.Ui
+	flags   *flag.FlagSet
+	http    *flags.HTTPFlags
 	name    string
 	node    string
 	service string
 	tag     string
 }
 
-func (c *EventCommand) initFlags() {
-	c.InitFlagSet()
-	c.FlagSet.StringVar(&c.name, "name", "",
+func (c *cmd) initFlags() {
+	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
+	c.flags.StringVar(&c.name, "name", "",
 		"Name of the event.")
-	c.FlagSet.StringVar(&c.node, "node", "",
+	c.flags.StringVar(&c.node, "node", "",
 		"Regular expression to filter on node names.")
-	c.FlagSet.StringVar(&c.service, "service", "",
+	c.flags.StringVar(&c.service, "service", "",
 		"Regular expression to filter on service instances.")
-	c.FlagSet.StringVar(&c.tag, "tag", "",
+	c.flags.StringVar(&c.tag, "tag", "",
 		"Regular expression to filter on service tags. Must be used with -service.")
+
+	c.http = &flags.HTTPFlags{}
+	flags.Merge(c.flags, c.http.ClientFlags())
 }
 
-func (c *EventCommand) Run(args []string) int {
-	c.initFlags()
-	if err := c.FlagSet.Parse(args); err != nil {
+func (c *cmd) Run(args []string) int {
+	if err := c.flags.Parse(args); err != nil {
 		return 1
 	}
 
@@ -71,7 +80,7 @@ func (c *EventCommand) Run(args []string) int {
 
 	// Check for a payload
 	var payload []byte
-	args = c.FlagSet.Args()
+	args = c.flags.Args()
 	switch len(args) {
 	case 0:
 	case 1:
@@ -84,7 +93,7 @@ func (c *EventCommand) Run(args []string) int {
 	}
 
 	// Create and test the HTTP client
-	client, err := c.HTTPClient()
+	client, err := c.http.APIClient()
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err))
 		return 1
@@ -97,7 +106,7 @@ func (c *EventCommand) Run(args []string) int {
 
 	// Prepare the request
 	event := client.Event()
-	params := &consulapi.UserEvent{
+	params := &api.UserEvent{
 		Name:          c.name,
 		Payload:       payload,
 		NodeFilter:    c.node,
@@ -117,18 +126,16 @@ func (c *EventCommand) Run(args []string) int {
 	return 0
 }
 
-func (c *EventCommand) Help() string {
-	c.initFlags()
-	return c.HelpCommand(`
-Usage: consul event [options] [payload]
+func (c *cmd) Synopsis() string {
+	return "Fire a new event"
+}
+
+func (c *cmd) Help() string {
+	s := `Usage: consul event [options] [payload]
 
   Dispatches a custom user event across a datacenter. An event must provide
   a name, but a payload is optional. Events support filtering using
-  regular expressions on node name, service, and tag definitions.
+  regular expressions on node name, service, and tag definitions.`
 
-`)
-}
-
-func (c *EventCommand) Synopsis() string {
-	return "Fire a new event"
+	return flags.Usage(s, c.flags, c.http.ClientFlags(), nil)
 }
diff --git a/command/event_test.go b/command/event/event_test.go
similarity index 68%
rename from command/event_test.go
rename to command/event/event_test.go
index 892bf5457d..d707caf827 100644
--- a/command/event_test.go
+++ b/command/event/event_test.go
@@ -1,4 +1,4 @@
-package command
+package event
 
 import (
 	"strings"
@@ -8,9 +8,10 @@ import (
 	"github.com/mitchellh/cli"
 )
 
-func TestEventCommand_implements(t *testing.T) {
-	t.Parallel()
-	var _ cli.Command = &EventCommand{}
+func TestEventCommand_noTabs(t *testing.T) {
+	if strings.ContainsRune(New(nil).Help(), '\t') {
+		t.Fatal("usage has tabs")
+	}
 }
 
 func TestEventCommandRun(t *testing.T) {
@@ -19,15 +20,10 @@ func TestEventCommandRun(t *testing.T) {
 	defer a1.Shutdown()
 
 	ui := cli.NewMockUi()
-	c := &EventCommand{
-		BaseCommand: BaseCommand{
-			UI:    ui,
-			Flags: FlagSetClientHTTP,
-		},
-	}
+	cmd := New(ui)
 	args := []string{"-http-addr=" + a1.HTTPAddr(), "-name=cmd"}
 
-	code := c.Run(args)
+	code := cmd.Run(args)
 	if code != 0 {
 		t.Fatalf("bad: %d. %#v", code, ui.ErrorWriter.String())
 	}