diff --git a/yamos/ChangeLog b/yamos/ChangeLog
index 1a9148dcb..df5a9c420 100644
--- a/yamos/ChangeLog
+++ b/yamos/ChangeLog
@@ -11,6 +11,10 @@ $Source$
       where YAM didn`t correctly undo a specific part and put the
       wrong filename string in previous moved parts. This caused
       that some multipart attachments weren`t accessable.
+    * YAM.c: replaced calloc()/free() calls for the TimerIO requests
+      with better conforming AllocMem()/FreeMem() calls, because
+      TimerIO requests need to be MEMF_PUBLIC allocated according to
+      Gunther.
 
 2003-04-22  Jens Langner <Jens.Langner@light-speed.de>
 
diff --git a/yamos/YAM.c b/yamos/YAM.c
index e9ce7ec30..eabcbcde7 100644
--- a/yamos/YAM.c
+++ b/yamos/YAM.c
@@ -187,7 +187,7 @@ static void TC_Exit(void)
       if((ioreq = &TCData.timerIO[i]->tr_node))
       {
         if(i==0) DeleteIORequest(ioreq);
-        else     free(ioreq);
+        else     FreeMem(ioreq, sizeof(struct timerequest));
 
         TCData.timerIO[i] = NULL;
       }
@@ -227,7 +227,7 @@ static BOOL TC_Init(void)
         // create our other TimerIOs now
         for(i=1; i < TIO_NUM; i++)
         {
-          if(!(TCData.timerIO[i] = calloc(1, sizeof(struct timerequest)))) return FALSE;
+          if(!(TCData.timerIO[i] = AllocMem(sizeof(struct timerequest), MEMF_PUBLIC|MEMF_CLEAR))) return FALSE;
 
           // then copy the data of our timerIO[0] to the other ones
           memcpy(TCData.timerIO[i], TCData.timerIO[0], sizeof(struct timerequest));