diff --git a/api/current.xml b/api/current.xml
index d18b5e660270c..afd9c7a1f2164 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -113230,37 +113230,6 @@
 >
 </field>
 </interface>
-<class name="ContactsContract.CommonDataKinds.Birthday"
- extends="java.lang.Object"
- abstract="false"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-<field name="BIRTHDAY"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;data1&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="CONTENT_ITEM_TYPE"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;vnd.android.cursor.item/birthday&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-</class>
 <class name="ContactsContract.CommonDataKinds.Email"
  extends="java.lang.Object"
  abstract="false"
@@ -113415,11 +113384,24 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<method name="getTypeResource"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="type" type="java.lang.Integer">
+</parameter>
+</method>
 <field name="CONTENT_ITEM_TYPE"
  type="java.lang.String"
  transient="false"
  volatile="false"
- value="&quot;vnd.android.cursor.item/event&quot;"
+ value="&quot;vnd.android.cursor.item/contact_event&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -113448,6 +113430,17 @@
  visibility="public"
 >
 </field>
+<field name="TYPE_BIRTHDAY"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="TYPE_OTHER"
  type="int"
  transient="false"
diff --git a/core/java/android/pim/vcard/ContactStruct.java b/core/java/android/pim/vcard/ContactStruct.java
index a078f15fe2f7f..b6a453af9e675 100644
--- a/core/java/android/pim/vcard/ContactStruct.java
+++ b/core/java/android/pim/vcard/ContactStruct.java
@@ -25,8 +25,8 @@ import android.provider.ContactsContract;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Groups;
 import android.provider.ContactsContract.RawContacts;
-import android.provider.ContactsContract.CommonDataKinds.Birthday;
 import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Event;
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
 import android.provider.ContactsContract.CommonDataKinds.Im;
 import android.provider.ContactsContract.CommonDataKinds.Nickname;
@@ -1317,9 +1317,10 @@ public class ContactStruct {
         
         if (!TextUtils.isEmpty(mBirthday)) {
             builder = ContentProviderOperation.newInsert(Data.CONTENT_URI);
-            builder.withValueBackReference(Birthday.RAW_CONTACT_ID, 0);
-            builder.withValue(Data.MIMETYPE, Birthday.CONTENT_ITEM_TYPE);
-            builder.withValue(Birthday.BIRTHDAY, mBirthday);
+            builder.withValueBackReference(Event.RAW_CONTACT_ID, 0);
+            builder.withValue(Data.MIMETYPE, Event.CONTENT_ITEM_TYPE);
+            builder.withValue(Event.START_DATE, mBirthday);
+            builder.withValue(Event.TYPE, Event.TYPE_BIRTHDAY);
             operationList.add(builder.build());
         }
 
diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java
index c943d859e8397..7b75f4a74b7fd 100644
--- a/core/java/android/pim/vcard/VCardComposer.java
+++ b/core/java/android/pim/vcard/VCardComposer.java
@@ -30,8 +30,8 @@ import android.provider.CallLog.Calls;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
-import android.provider.ContactsContract.CommonDataKinds.Birthday;
 import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Event;
 import android.provider.ContactsContract.CommonDataKinds.Im;
 import android.provider.ContactsContract.CommonDataKinds.Nickname;
 import android.provider.ContactsContract.CommonDataKinds.Note;
@@ -1301,12 +1301,16 @@ public class VCardComposer {
     private void appendBirthday(final StringBuilder builder,
             final Map<String, List<ContentValues>> contentValuesListMap) {
         final List<ContentValues> contentValuesList = contentValuesListMap
-                .get(Birthday.CONTENT_ITEM_TYPE);
+                .get(Event.CONTENT_ITEM_TYPE);
         if (contentValuesList != null && contentValuesList.size() > 0) {
+            Integer eventType = contentValuesList.get(0).getAsInteger(Event.TYPE);
+            if (eventType == null || !eventType.equals(Event.TYPE_BIRTHDAY)) {
+                return;
+            }
             // Theoretically, there must be only one birthday for each vCard data and
             // we are afraid of some parse error occuring in some devices, so
             // we emit only one birthday entry for now.
-            String birthday = contentValuesList.get(0).getAsString(Birthday.BIRTHDAY);
+            String birthday = contentValuesList.get(0).getAsString(Event.START_DATE);
             if (birthday != null) {
                 birthday = birthday.trim();
             }
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 166813643b533..40a3c4f706048 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -1691,26 +1691,6 @@ public final class ContactsContract {
             }
         }
 
-        /**
-         * Common data definition for birthdays.
-         */
-        public static final class Birthday implements DataColumnsWithJoins {
-            /**
-             * This utility class cannot be instantiated
-             */
-            private Birthday() {}
-
-            /** MIME type used when storing this in data table. */
-            public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/birthday";
-
-            /**
-             * The birthday. This must be of the form YYYY-MM-DD or YYYY-MM-DDThh:mm:ss
-             * These are xs:date and xs:dateTime
-             * <P>Type: TEXT</P>
-             */
-            public static final String BIRTHDAY = DATA1;
-        }
-
         /**
          * Common data definition for relations.
          */
@@ -1755,16 +1735,34 @@ public final class ContactsContract {
             private Event() {}
 
             /** MIME type used when storing this in data table. */
-            public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/event";
+            public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_event";
 
             public static final int TYPE_ANNIVERSARY = 1;
             public static final int TYPE_OTHER = 2;
+            public static final int TYPE_BIRTHDAY = 3;
 
             /**
              * The event start date as the user entered it.
              * <P>Type: TEXT</P>
              */
             public static final String START_DATE = DATA;
+
+            /**
+             * Return the string resource that best describes the given
+             * {@link #TYPE}. Will always return a valid resource.
+             */
+            public static int getTypeResource(Integer type) {
+                if (type == null) {
+                    return com.android.internal.R.string.eventTypeOther;
+                }
+                switch (type) {
+                    case TYPE_ANNIVERSARY:
+                        return com.android.internal.R.string.eventTypeAnniversary;
+                    case TYPE_BIRTHDAY: return com.android.internal.R.string.eventTypeBirthday;
+                    case TYPE_OTHER: return com.android.internal.R.string.eventTypeOther;
+                    default: return com.android.internal.R.string.eventTypeOther;
+                }
+            }
         }
 
         /**
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 7191a4669037f..7760db198f67e 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1243,6 +1243,13 @@
     <!-- MMS phone number type -->
     <string name="phoneTypeMms">MMS</string>
 
+    <!-- Label for a birthday event -->
+    <string name="eventTypeBirthday">Birthday</string>
+    <!-- Label for an anniversary event -->
+    <string name="eventTypeAnniversary">Anniversary</string>
+    <!-- Label for other events -->
+    <string name="eventTypeOther">Event</string>
+
     <!-- Custom email type -->
     <string name="emailTypeCustom">Custom</string>
     <!-- Home email type -->
@@ -1299,7 +1306,7 @@
     <string name="orgTypeOther">Other</string>
     <!-- Custom organization type -->
     <string name="orgTypeCustom">Custom</string>
-    
+
     <!-- Attbution of a contact status update, when the time of update is unknown -->
     <string name="contact_status_update_attribution">Via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>