diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a66939cbf6..be2e4e2824 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2002-12-02 15:30 UTC-0500 David G. Holm <dholm@jsd-llc.com>
+  * config/linux/global.cf
+    ! Add to PRG_USR instead of replacing it.
+  * source/rtl/set.c
+    ! When adding a new listener, set the next pointer to NULL.
+
 2002-12-03 22:40 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
   * makefile.bc
   * makefile.nt
diff --git a/harbour/config/linux/global.cf b/harbour/config/linux/global.cf
index b94b1b1436..661b2e217e 100644
--- a/harbour/config/linux/global.cf
+++ b/harbour/config/linux/global.cf
@@ -15,11 +15,10 @@ ifeq ($(HB_GT_LIB),)
    HB_GT_LIB = gtstd
 endif
 
+PRG_USR = $(PRG_USR) -DHB_LINUX
+
 ARCH_DIR = $(ARCH)/
 MK = $(MAKE)
-
-PRG_USR = -DHB_LINUX
-
 RM = rm -f
 RD = rm -f -r
 CP = cp -f
diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c
index 14a0864d75..0cbda74779 100644
--- a/harbour/source/rtl/set.c
+++ b/harbour/source/rtl/set.c
@@ -988,6 +988,7 @@ int hb_setListenerAdd( HB_SET_LISTENER_CALLBACK * callback )
    PHB_SET_LISTENER p_sl = (PHB_SET_LISTENER) hb_xgrab( sizeof( HB_SET_LISTENER ) );
    p_sl->callback = callback;
    p_sl->listener = s_next_listener++;
+   p_sl->next = NULL;
    if( sp_sl_last ) sp_sl_last->next = p_sl;
    else if( ! sp_sl_first ) sp_sl_first = p_sl;
    sp_sl_last = p_sl;