diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog
index ad89b52b06..f4681d24e1 100644
--- a/c/src/lib/libbsp/shared/ChangeLog
+++ b/c/src/lib/libbsp/shared/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-15	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* umon/umonrtemsglue.c: Add flag to ensure that it umon connection is
+	initialized twice, it is safe.
+
 2009-06-15	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* umon/monlib.h: Add umon.h to be installed as <rtems/umon.h> so umon
diff --git a/c/src/lib/libbsp/shared/umon/umonrtemsglue.c b/c/src/lib/libbsp/shared/umon/umonrtemsglue.c
index 0e1e5dc78b..0d38f4dbf8 100644
--- a/c/src/lib/libbsp/shared/umon/umonrtemsglue.c
+++ b/c/src/lib/libbsp/shared/umon/umonrtemsglue.c
@@ -13,10 +13,17 @@
 
 /* XXX eventually add lock/unlock methods */
 
+static int rtems_umon_connected = 0;
+
 void rtems_umon_connect(void)
 {
   void *moncomptr;
 
+  if ( rtems_umon_connected )
+    return;
+
+  rtems_umon_connected = 1;
+
   moncomptr = rtems_bsp_get_umon_monptr();
   monConnect(
     (int(*)())(*(unsigned long *)moncomptr),      /* monitor base */