diff --git a/java/com/android/vcard/VCardEntry.java b/java/com/android/vcard/VCardEntry.java
index 255697b..44a71d8 100644
--- a/java/com/android/vcard/VCardEntry.java
+++ b/java/com/android/vcard/VCardEntry.java
@@ -42,6 +42,7 @@
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.Pair;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1552,6 +1553,7 @@
     private List<AndroidCustomData> mAndroidCustomDataList;
     private BirthdayData mBirthday;
     private AnniversaryData mAnniversary;
+    private List<Pair<String, String>> mUnknownXData;
 
     /**
      * Inner iterator interface.
@@ -2403,6 +2405,12 @@
             final List<String> customPropertyList = VCardUtils.constructListFromValue(propValue,
                     mVCardType);
             handleAndroidCustomProperty(customPropertyList);
+        } else if (propertyName.toUpperCase().startsWith("X-")) {
+            // Catch all for X- properties. The caller can decide what to do with these.
+            if (mUnknownXData == null) {
+                mUnknownXData = new ArrayList<Pair<String, String>>();
+            }
+            mUnknownXData.add(new Pair<String, String>(propertyName, propValue));
         } else {
         }
         // Be careful when adding some logic here, as some blocks above may use "return".
@@ -2647,4 +2655,8 @@
         }
         return mNameData.displayName;
     }
+
+    public List<Pair<String, String>> getUnknownXData() {
+        return mUnknownXData;
+    }
 }