diff --git a/ChangeLog b/ChangeLog
index 387a35ca8..a5e9838bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/gen-property-selectors.py: "bannedProps" is now a
+	set, for faster lookups.
+
 	* UI/WebServerResources/UIxContactsUserFolders.js: folder ids are
 	in the form "user:module/folder", therefore we must remove the
 	first char, which is a slash.
diff --git a/OpenChange/gen-property-selectors.py b/OpenChange/gen-property-selectors.py
index 0a496db39..57e25defd 100755
--- a/OpenChange/gen-property-selectors.py
+++ b/OpenChange/gen-property-selectors.py
@@ -106,32 +106,32 @@ extern const enum MAPITAGS MAPIStoreSupportedProperties[];
 
 # hack: some properties have multiple and incompatible types. Sometimes those
 # props are not related at all...
-bannedProps = [ "PidTagBodyHtml", "PidTagFavAutosubfolders",
-                "PidTagAttachDataObj", "PidTagAclTable", "PidTagAclData",
-                "PidTagRulesTable", "PidTagRulesData", "PidTagDisableWinsock",
-                "PidTagHierarchyServer", "PidTagOfflineAddrbookEntryid",
-                "PidTagShorttermEntryidFromObject",
-                "PidTagNormalMessageSizeExtended",
-                "PidTagAssocMessageSizeExtended", "PidTagMessageSizeExtended",
-                "PidTagOabContainerGuid",
-                "PidTagOfflineAddressBookMessageClass", "PidTagScriptData",
-                "PidTagOfflineAddressBookTruncatedProperties",
-                "PidTagOfflineAddressBookContainerGuid",
-                "PidTagOfflineAddressBookDistinguishedName",
-                "PidTagOfflineAddressBookShaHash",
-                "PidTagSenderTelephoneNumber", "PidTagGatewayNeedsToRefresh",
-                "PidTagWlinkType", "PidTagWlinkFlags",
-                "PidTagWlinkGroupClsid", "PidTagWlinkGroupName",
-                "PidTagWlinkGroupHeaderID",
-                "PidTagScheduleInfoDelegatorWantsCopy", "PidTagWlinkOrdinal",
-                "PidTagWlinkSection", "PidTagWlinkCalendarColor",
-                "PidTagWlinkAddressBookEID", "PidTagWlinkFolderType",
-                "PidTagScheduleInfoDelegateNames",
-                "PidTagScheduleInfoDelegateEntryIds", 
-                "PidTagBusiness2TelephoneNumbers",
-                "PidTagHome2TelephoneNumbers",
-                "PidTagAttachDataObject", "PidTagShorttermEntryIdFromObject",
-                ]
+bannedProps = {"PidTagBodyHtml", "PidTagFavAutosubfolders",
+               "PidTagAttachDataObj", "PidTagAclTable", "PidTagAclData",
+               "PidTagRulesTable", "PidTagRulesData", "PidTagDisableWinsock",
+               "PidTagHierarchyServer", "PidTagOfflineAddrbookEntryid",
+               "PidTagShorttermEntryidFromObject",
+               "PidTagNormalMessageSizeExtended",
+               "PidTagAssocMessageSizeExtended", "PidTagMessageSizeExtended",
+               "PidTagOabContainerGuid",
+               "PidTagOfflineAddressBookMessageClass", "PidTagScriptData",
+               "PidTagOfflineAddressBookTruncatedProperties",
+               "PidTagOfflineAddressBookContainerGuid",
+               "PidTagOfflineAddressBookDistinguishedName",
+               "PidTagOfflineAddressBookShaHash",
+               "PidTagSenderTelephoneNumber", "PidTagGatewayNeedsToRefresh",
+               "PidTagWlinkType", "PidTagWlinkFlags",
+               "PidTagWlinkGroupClsid", "PidTagWlinkGroupName",
+               "PidTagWlinkGroupHeaderID",
+               "PidTagScheduleInfoDelegatorWantsCopy", "PidTagWlinkOrdinal",
+               "PidTagWlinkSection", "PidTagWlinkCalendarColor",
+               "PidTagWlinkAddressBookEID", "PidTagWlinkFolderType",
+               "PidTagScheduleInfoDelegateNames",
+               "PidTagScheduleInfoDelegateEntryIds", 
+               "PidTagBusiness2TelephoneNumbers",
+               "PidTagHome2TelephoneNumbers",
+               "PidTagAttachDataObject", "PidTagShorttermEntryIdFromObject",
+               }
 
 def ParseExchangeH(names, lines):
     state = 0