diff --git a/ChangeLog b/ChangeLog
index c47395f2e9..5dd67ed4f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
 	* src/engine/gnc-filepath-utils.c:
 	  gstdio.h and g_mkdir are in glib-2.6 -- use old APIs with glib-2.4.
 
+	* lib/libqof/qof/qofevent.[ch]:
+	  Fix the definition of QOF_EVENT_BASE; use QOF_EVENT__LAST for tests.
+
 2006-03-08   Christian Stimming <stimming@tuhh.de>
 
 	* src/gnc-module/gnc-module.c, src/backend/file/sixtp-utils.c:
diff --git a/lib/libqof/qof/qofevent.c b/lib/libqof/qof/qofevent.c
index 76504c6f56..1190819465 100644
--- a/lib/libqof/qof/qofevent.c
+++ b/lib/libqof/qof/qofevent.c
@@ -205,7 +205,7 @@ qof_event_generate_internal (QofEntity *entity, QofEventId event_id,
 
   g_return_if_fail(entity);
 
-  if (event_id <= QOF_EVENT_BASE)
+  if (event_id <= QOF_EVENT__LAST)
   {
     use_old_handlers = TRUE;
   }
diff --git a/lib/libqof/qof/qofevent.h b/lib/libqof/qof/qofevent.h
index a5e148e44a..b65270f8fb 100644
--- a/lib/libqof/qof/qofevent.h
+++ b/lib/libqof/qof/qofevent.h
@@ -51,7 +51,11 @@ events added within QOF.
 #define APP_EVENT_B QOF_MAKE_EVENT(QOF_EVENT_BASE+1)
 /endverbatim
 */
-#define QOF_MAKE_EVENT(x)    (1<<x)
+#define QOF_MAKE_EVENT(x)    (1<<(x))
+
+/** Allow scope for more defaults in future. Additional
+event identifiers must be based on this when using QOF_MAKE_EVENT(). */
+#define QOF_EVENT_BASE 8
 
 /** \brief Default events for backwards compatibility.
 
@@ -64,12 +68,9 @@ any process can define their own events.
 #define QOF_EVENT_DESTROY  QOF_MAKE_EVENT(2)
 #define QOF_EVENT_ADD      QOF_MAKE_EVENT(3)
 #define QOF_EVENT_REMOVE   QOF_MAKE_EVENT(4)
-#define QOF_EVENT__LAST    QOF_EVENT_REMOVE 
+#define QOF_EVENT__LAST    QOF_MAKE_EVENT(QOF_EVENT_BASE-1)
 #define QOF_EVENT_ALL      (0xff)
-
-/** Allow scope for more defaults in future. Additional
-event identifiers must be larger than this. */
-#define QOF_EVENT_BASE  QOF_EVENT__LAST
+/* Note that events 5, 6, and 7 are "undefined" as of 2006-03-08 */
 
 /** \brief Handler invoked when an event is generated.
  *