diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index ce782ad2d..8a9219906 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* iCalPerson.m, iCalWeeklyRecurrenceCalculator.m: adapted classes
+	to use "NSInteger" and "NSUInteger" instead of "int" and "unsigned
+	int" for compatibility with versions of GNUstep base >= 1.20.
+
 2010-08-24  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* CardElement.m (-setNamedValue:to:): don't add the value if nil
diff --git a/SOPE/NGCards/iCalPerson.m b/SOPE/NGCards/iCalPerson.m
index 449c1b012..9fc728e02 100644
--- a/SOPE/NGCards/iCalPerson.m
+++ b/SOPE/NGCards/iCalPerson.m
@@ -247,8 +247,8 @@
 
 /* comparison */
 
-- (unsigned)hash {
-  if([self email])
+- (NSUInteger) hash {
+  if ([self email])
     return [[self email] hash];
   return [super hash];
 }
diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
index 969990ee3..052d93065 100644
--- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
@@ -151,7 +151,7 @@
 	     [currentStartDate compare: endDate] == NSOrderedSame)
 	{
 	  BOOL isRecurrence = NO;
-	  int days, week;
+	  NSInteger days, week;
 
 	  if (repeatCount > 0 ||
 	      [startDate compare: currentStartDate] == NSOrderedAscending ||
@@ -166,7 +166,7 @@
 		}
 	      else 
 		{
-		  [currentStartDate years:NULL months:NULL days:(int *)&days hours:NULL
+		  [currentStartDate years:NULL months:NULL days:&days hours:NULL
 				  minutes:NULL seconds:NULL sinceDate: firStart];
 
 		  // The following adjustment always set the first day of the