diff --git a/api/current.txt b/api/current.txt
index de4e09b1d..e8a1f33fb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -178,7 +178,7 @@ package android.support.design.widget {
     field public static final android.os.Parcelable.Creator<android.support.design.widget.CoordinatorLayout.SavedState> CREATOR;
   }
 
-  public class FloatingActionButton extends android.widget.ImageView {
+  public class FloatingActionButton extends android.widget.ImageButton {
     ctor public FloatingActionButton(android.content.Context);
     ctor public FloatingActionButton(android.content.Context, android.util.AttributeSet);
     ctor public FloatingActionButton(android.content.Context, android.util.AttributeSet, int);
diff --git a/src/android/support/design/widget/FloatingActionButton.java b/src/android/support/design/widget/FloatingActionButton.java
index 9240f1223..fda99852c 100644
--- a/src/android/support/design/widget/FloatingActionButton.java
+++ b/src/android/support/design/widget/FloatingActionButton.java
@@ -31,6 +31,7 @@ import android.support.design.R;
 import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 
 import java.util.List;
@@ -53,7 +54,7 @@ import java.util.List;
  * @attr ref android.support.design.R.styleable#FloatingActionButton_fabSize
  */
 @CoordinatorLayout.DefaultBehavior(FloatingActionButton.Behavior.class)
-public class FloatingActionButton extends ImageView {
+public class FloatingActionButton extends ImageButton {
 
     // These values must match those in the attrs declaration
     private static final int SIZE_MINI = 1;