diff --git a/ChangeLog b/ChangeLog
index e9019e88e..7b567d5b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreTypes.m (NSObjectFromSPropValue): added
+	support for "PT_BINARY".
+
 	* OpenChange/NSData+MAPIStore.m (+dataWithBinary:): new
 	constructor for generating an NSData instance from a struct
 	Binary_r *.
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index 4dfd9997d..1e5161746 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -32,6 +32,7 @@
 #import <Foundation/NSNull.h>
 #import <Foundation/NSString.h>
 
+#import "NSData+MAPIStore.h"
 #import "NSCalendarDate+MAPIStore.h"
 
 #import "MAPIStoreTypes.h"
@@ -102,6 +103,13 @@ NSObjectFromSPropValue (const struct SPropValue *value)
     case PT_SYSTIME:
       result = [NSCalendarDate dateFromFileTime: &(value->value.ft)];
       break;
+    case PT_BINARY:
+		// lpProps->value.bin = *((const struct Binary_r *)data);
+
+      result
+        = [NSData dataWithBinary:
+                    (const struct Binary_r *) &(value->value.bin)];
+      break;
     default:
 // #define	PT_UNSPECIFIED		0x0
 // #define	PT_I2			0x2
@@ -116,7 +124,7 @@ NSObjectFromSPropValue (const struct SPropValue *value)
 // #define	PT_ACTIONS		0xFE
 // #define	PT_BINARY		0x102
       result = [NSNull null];
-      NSLog (@"object type not handled: %d", valueType);
+      NSLog (@"object type not handled: %d (0x.4x)", valueType, valueType);
     }
 
   return result;