diff --git a/ionic/components/segment/segment.ts b/ionic/components/segment/segment.ts
index e61ab34bfa..0af9a8cc99 100644
--- a/ionic/components/segment/segment.ts
+++ b/ionic/components/segment/segment.ts
@@ -55,7 +55,7 @@ import {isDefined} from '../../util/util';
 })
 export class SegmentButton {
   @Input() value: string;
-  @Output() select: EventEmitter<any> = new EventEmitter();
+  @Output() select: EventEmitter<SegmentButton> = new EventEmitter();
 
   constructor(private _renderer: Renderer, private _elementRef: ElementRef) {}
 
@@ -131,8 +131,8 @@ export class SegmentButton {
   selector: 'ion-segment'
 })
 export class Segment {
-  @Output() change: EventEmitter<any> = new EventEmitter();
   @ContentChildren(SegmentButton) _buttons;
+  @Output() change: EventEmitter<SegmentButton> = new EventEmitter();
   value: any;
 
   constructor(
@@ -169,7 +169,7 @@ export class Segment {
      button.select.subscribe((selectedButton) => {
        this.writeValue(selectedButton.value);
        this.onChange(selectedButton.value);
-       this.change.emit(selectedButton.value);
+       this.change.emit(selectedButton);
      });
 
      if (isDefined(this.value)) {
diff --git a/ionic/components/segment/test/basic/index.ts b/ionic/components/segment/test/basic/index.ts
index 166217b2b1..3b77594c40 100644
--- a/ionic/components/segment/test/basic/index.ts
+++ b/ionic/components/segment/test/basic/index.ts
@@ -20,12 +20,12 @@ class MyApp {
     this.appType = 'free';
   }
 
-  onSegmentChanged(value) {
-    console.log("Segment changed to", value);
+  onSegmentChanged(segmentButton) {
+    console.log("Segment changed to", segmentButton.value);
   }
 
-  onSegmentClicked(value) {
-    console.log("Segment clicked", value);
+  onSegmentSelected(segmentButton) {
+    console.log("Segment selected", segmentButton.value);
   }
 
   doSubmit(event) {
diff --git a/ionic/components/segment/test/basic/main.html b/ionic/components/segment/test/basic/main.html
index 5e8442bfbc..2a43dff194 100644
--- a/ionic/components/segment/test/basic/main.html
+++ b/ionic/components/segment/test/basic/main.html
@@ -1,9 +1,9 @@
 <ion-toolbar>
   <ion-segment id="segment" [(ngModel)]="relationship" (change)="onSegmentChanged($event)">
-    <ion-segment-button value="friends" (click)="onSegmentClicked('friends')" class="e2eSegmentFriends">
+    <ion-segment-button value="friends" (select)="onSegmentSelected($event)" class="e2eSegmentFriends">
       Friends
     </ion-segment-button>
-    <ion-segment-button value="enemies" (click)="onSegmentClicked('enemies')">
+    <ion-segment-button value="enemies" (select)="onSegmentSelected($event)">
       Enemies
     </ion-segment-button>
   </ion-segment>