diff --git a/api/events.go b/api/events.go
index b0b382834a..c1bd92e8f6 100644
--- a/api/events.go
+++ b/api/events.go
@@ -39,12 +39,12 @@ func (eh *eventsHandler) Handle(e *cluster.Event) error {
 	str := fmt.Sprintf("{%q:%q,%q:%q,%q:%q,%q:%d,%q:%q,%q:%q,%q:%q,%q:%q}",
 		"status", e.Status,
 		"id", e.Id,
-		"from", e.From+" node:"+e.NodeName,
+		"from", e.From+" node:"+e.Node.Name,
 		"time", e.Time,
-		"node_name", e.NodeName,
-		"node_id", e.NodeID,
-		"node_addr", e.NodeAddr,
-		"node_ip", e.NodeIP)
+		"node_name", e.Node.Name,
+		"node_id", e.Node.ID,
+		"node_addr", e.Node.Addr,
+		"node_ip", e.Node.IP)
 
 	for key, w := range eh.ws {
 		if _, err := fmt.Fprintf(w, str); err != nil {
diff --git a/api/events_test.go b/api/events_test.go
index 15e0749648..3716e14c1f 100644
--- a/api/events_test.go
+++ b/api/events_test.go
@@ -27,10 +27,12 @@ func TestHandle(t *testing.T) {
 	assert.Equal(t, eh.Size(), 1)
 
 	event := &cluster.Event{
-		NodeName: "node_name",
-		NodeID:   "node_id",
-		NodeAddr: "node_addr",
-		NodeIP:   "node_ip",
+		Node: &cluster.Node{
+			Name: "node_name",
+			ID:   "node_id",
+			Addr: "node_addr",
+			IP:   "node_ip",
+		},
 	}
 	event.Event.Status = "status"
 	event.Event.Id = "id"
diff --git a/cluster/event.go b/cluster/event.go
index 1d989236b2..a422a5cfde 100644
--- a/cluster/event.go
+++ b/cluster/event.go
@@ -4,11 +4,7 @@ import "github.com/samalba/dockerclient"
 
 type Event struct {
 	dockerclient.Event
-
-	NodeName string
-	NodeID   string
-	NodeAddr string
-	NodeIP   string
+	Node *Node
 }
 
 type EventHandler interface {
diff --git a/cluster/node.go b/cluster/node.go
index 96b5720296..358e3b715a 100644
--- a/cluster/node.go
+++ b/cluster/node.go
@@ -359,10 +359,7 @@ func (n *Node) handler(ev *dockerclient.Event, args ...interface{}) {
 	}
 
 	event := &Event{
-		NodeName: n.Name,
-		NodeID:   n.ID,
-		NodeAddr: n.Addr,
-		NodeIP:   n.IP,
+		Node: n,
 	}
 	event.Event = *ev
 
diff --git a/manage.go b/manage.go
index d44010ce09..143eb63fdf 100644
--- a/manage.go
+++ b/manage.go
@@ -20,7 +20,7 @@ type logHandler struct {
 }
 
 func (h *logHandler) Handle(e *cluster.Event) error {
-	log.Printf("event -> status: %q from: %q id: %q node: %q", e.Status, e.From, e.Id, e.NodeName)
+	log.Printf("event -> status: %q from: %q id: %q node: %q", e.Status, e.From, e.Id, e.Node.Name)
 	return nil
 }