diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS
index 0ed068ed1..2e6e2e936 100644
--- a/configure/os/CONFIG.Common.RTEMS
+++ b/configure/os/CONFIG.Common.RTEMS
@@ -27,10 +27,10 @@ VALID_BUILDS = Ioc
 # Pick up the RTEMS tool/path definitions from the RTEMS BSP directory.
 #
 ifneq "$(T_A)" ""
-RTEMS_MAKEFILE_PATH := $(dir $(RTEMS_MAKEFILE_PATH))/$(subst RTEMS-,,$(T_A))
--include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
--include $(RTEMS_CUSTOM)
--include $(CONFIG.CC)
+RTEMS_BASE=/usr/local/RTEMS
+include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)/$(subst RTEMS-,,$(T_A))/Makefile.inc
+include $(RTEMS_CUSTOM)
+include $(CONFIG.CC)
 endif
 
 #
@@ -74,7 +74,7 @@ CPPSNCFLAGS += -x c
 
 #--------------------------------------------------
 # c++ exceptions,  YES or NO
-CXX_EXCEPTIONS = NO
+CXX_EXCEPTIONS = YES
 
 #--------------------------------------------------
 # osithead use default stack, YES or NO
diff --git a/configure/os/CONFIG.Common.RTEMS-gen68360 b/configure/os/CONFIG.Common.RTEMS-gen68360
index ced91b439..5db459b27 100644
--- a/configure/os/CONFIG.Common.RTEMS-gen68360
+++ b/configure/os/CONFIG.Common.RTEMS-gen68360
@@ -6,4 +6,5 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
+RTEMS_TARGET_CPU=m68k
 include $(CONFIG)/os/CONFIG.Common.RTEMS
diff --git a/configure/os/CONFIG.Common.RTEMS-mvme167 b/configure/os/CONFIG.Common.RTEMS-mvme167
index ced91b439..5db459b27 100644
--- a/configure/os/CONFIG.Common.RTEMS-mvme167
+++ b/configure/os/CONFIG.Common.RTEMS-mvme167
@@ -6,4 +6,5 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
+RTEMS_TARGET_CPU=m68k
 include $(CONFIG)/os/CONFIG.Common.RTEMS
diff --git a/configure/os/CONFIG.Common.RTEMS-pc386 b/configure/os/CONFIG.Common.RTEMS-pc386
new file mode 100644
index 000000000..5f32721b4
--- /dev/null
+++ b/configure/os/CONFIG.Common.RTEMS-pc386
@@ -0,0 +1,10 @@
+#
+# $Id$
+# Author: W. Eric Norum
+#         Canadian Light Source
+#         eric@cls.usask.ca
+#
+# All RTEMS targets use the same Makefile fragment
+#
+RTEMS_TARGET_CPU=i386
+include $(CONFIG)/os/CONFIG.Common.RTEMS