diff -Nru BTreeFolder2.orig/CHANGES.txt BTreeFolder2/CHANGES.txt
--- BTreeFolder2.orig/CHANGES.txt	2004-06-16 18:45:30.000000000 -0500
+++ BTreeFolder2/CHANGES.txt	2005-06-20 13:10:08.000000000 -0500
@@ -1,3 +1,7 @@
+Version 1.0.2
+
+  - Made CMFBTreeFolder compatible with CMF 1.5+
+
 Version 1.0.1
 
   - ConflictError was swallowed by _delObject. This could break code
diff -Nru BTreeFolder2.orig/CMFBTreeFolder.py BTreeFolder2/CMFBTreeFolder.py
--- BTreeFolder2.orig/CMFBTreeFolder.py	2002-10-30 08:54:18.000000000 -0600
+++ BTreeFolder2/CMFBTreeFolder.py	2005-06-20 13:10:08.000000000 -0500
@@ -13,12 +13,15 @@
 ##############################################################################
 """CMFBTreeFolder
 
-$Id: CMFBTreeFolder.py,v 1.2 2002/10/30 14:54:18 shane Exp $
+$Id: CMFBTreeFolder.py,v 1.3 2005/06/20 18:10:08 tiran Exp $
 """
 
 import Globals
 from BTreeFolder2 import BTreeFolder2Base
-from Products.CMFCore.PortalFolder import PortalFolder
+try:
+    from Products.CMFCore.PortalFolder import PortalFolderBase as PortalFolder
+except ImportError:
+    from Products.CMFCore.PortalFolder import PortalFolder
 import Products.CMFCore.PortalFolder
 
 
diff -Nru BTreeFolder2.orig/version.txt BTreeFolder2/version.txt
--- BTreeFolder2.orig/version.txt	2004-06-16 18:45:39.000000000 -0500
+++ BTreeFolder2/version.txt	2005-06-20 13:10:08.000000000 -0500
@@ -1 +1 @@
-BTreeFolder2-1.0.1
+BTreeFolder2-1.0.2