diff --git a/icu4c/source/i18n/upropset.cpp b/icu4c/source/i18n/upropset.cpp
index 37470473e1..ad1c1552af 100644
--- a/icu4c/source/i18n/upropset.cpp
+++ b/icu4c/source/i18n/upropset.cpp
@@ -4,8 +4,8 @@
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 * $Source: /xsrl/Nsvn/icu/icu/source/i18n/Attic/upropset.cpp,v $
-* $Date: 2001/11/20 03:37:00 $
-* $Revision: 1.8 $
+* $Date: 2001/11/21 21:29:23 $
+* $Revision: 1.9 $
 **********************************************************************
 */
 #include "upropset.h"
@@ -72,7 +72,7 @@ static const int32_t ANY = -1; // general category: all code points
 // E0080..EFFFF  ; Cn # [65408]
 
 /**
- * A set of all characters _except_ the first characters of
+ * A set of all characters _except_ the second through last characters of
  * certain ranges.  These ranges are ranges of characters whose
  * properties are all exactly alike, e.g. CJK Ideographs from
  * U+4E00 to U+9FA5.
@@ -94,6 +94,11 @@ static const UChar UPPER_P    = 0x0050; /*P*/
 static const UChar LEFT_BRACE = 0x007B; /*{*/
 static const UChar EQUALS     = 0x003D; /*=*/
 
+// TODO: The Inclusion List should be generated from the UCD for each
+// version, and thus should be accessed from the properties data file
+// (Even better: move the logic into UCharacter for building these
+// properties, since that is where it belongs!)
+
 // See INCLUSIONS above
 static const UChar INCLUSIONS_PATTERN[] =
 {91,94,92,117,51,52,48,49,45,92,117,52,68,66,53,32,
diff --git a/icu4j/src/com/ibm/icu/text/UnicodePropertySet.java b/icu4j/src/com/ibm/icu/text/UnicodePropertySet.java
index ac39e152cd..6d2ddd7308 100755
--- a/icu4j/src/com/ibm/icu/text/UnicodePropertySet.java
+++ b/icu4j/src/com/ibm/icu/text/UnicodePropertySet.java
@@ -4,8 +4,8 @@
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/Attic/UnicodePropertySet.java,v $
-* $Date: 2001/11/14 02:49:15 $
-* $Revision: 1.6 $
+* $Date: 2001/11/21 21:29:37 $
+* $Revision: 1.7 $
 **********************************************************************
 */
 package com.ibm.text;
@@ -52,7 +52,7 @@ import com.ibm.util.Utility;
  * '+' indicates a supported property.
  *
  * @author Alan Liu
- * @version $RCSfile: UnicodePropertySet.java,v $ $Revision: 1.6 $ $Date: 2001/11/14 02:49:15 $
+ * @version $RCSfile: UnicodePropertySet.java,v $ $Revision: 1.7 $ $Date: 2001/11/21 21:29:37 $
  */
 class UnicodePropertySet {
 
@@ -108,8 +108,13 @@ class UnicodePropertySet {
     // 2FA1E..E0000  ; Cn # [722403]
     // E0080..EFFFF  ; Cn # [65408]
 
+    // TODO: The Inclusion List should be generated from the UCD for each
+    // version, and thus should be accessed from the properties data file
+    // (Even better: move the logic into UCharacter for building these
+    // properties, since that is where it belongs!)
+
     /**
-     * A set of all characters _except_ the first characters of
+     * A set of all characters _except_ the second through last characters of
      * certain ranges.  These ranges are ranges of characters whose
      * properties are all exactly alike, e.g. CJK Ideographs from
      * U+4E00 to U+9FA5.
diff --git a/icu4j/src/com/ibm/text/UnicodePropertySet.java b/icu4j/src/com/ibm/text/UnicodePropertySet.java
index c12627adb8..bcd00ac11b 100755
--- a/icu4j/src/com/ibm/text/UnicodePropertySet.java
+++ b/icu4j/src/com/ibm/text/UnicodePropertySet.java
@@ -4,8 +4,8 @@
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/text/Attic/UnicodePropertySet.java,v $
-* $Date: 2001/11/14 02:49:15 $
-* $Revision: 1.6 $
+* $Date: 2001/11/21 21:29:37 $
+* $Revision: 1.7 $
 **********************************************************************
 */
 package com.ibm.text;
@@ -52,7 +52,7 @@ import com.ibm.util.Utility;
  * '+' indicates a supported property.
  *
  * @author Alan Liu
- * @version $RCSfile: UnicodePropertySet.java,v $ $Revision: 1.6 $ $Date: 2001/11/14 02:49:15 $
+ * @version $RCSfile: UnicodePropertySet.java,v $ $Revision: 1.7 $ $Date: 2001/11/21 21:29:37 $
  */
 class UnicodePropertySet {
 
@@ -108,8 +108,13 @@ class UnicodePropertySet {
     // 2FA1E..E0000  ; Cn # [722403]
     // E0080..EFFFF  ; Cn # [65408]
 
+    // TODO: The Inclusion List should be generated from the UCD for each
+    // version, and thus should be accessed from the properties data file
+    // (Even better: move the logic into UCharacter for building these
+    // properties, since that is where it belongs!)
+
     /**
-     * A set of all characters _except_ the first characters of
+     * A set of all characters _except_ the second through last characters of
      * certain ranges.  These ranges are ranges of characters whose
      * properties are all exactly alike, e.g. CJK Ideographs from
      * U+4E00 to U+9FA5.