diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS
index 86a037295..4b1701892 100644
--- a/configure/os/CONFIG.Common.RTEMS
+++ b/configure/os/CONFIG.Common.RTEMS
@@ -94,29 +94,15 @@ MODEXT=.obj
 # operating system class (include/os/<os_class>)
 OS_CLASS = RTEMS
 
-#--------------------------------------------------
-#print warning
-ifeq ($(RTEMS_HAS_POSIX_API),no)
-ifeq ($(EPICS_VERSION),7)
-        $(error Warning: Epics Version $(EPICS_VERSION) must not be used without POSIX enabled on RTEMS !!!)
-endif
-endif
-# operating system API (src/os/<os_class>-<os-api>)
-ifeq ($(RTEMS_HAS_POSIX_API),yes)
-OS_API = posix
-else
-OS_API = kernel
-endif
-
 #--------------------------------------------------
 # Operating system flags
 #OP_SYS_LDLIBS += -lrtemsCom -lc -lrtemscpu -lCom -lnfs -lm
-ifeq ($(RTEMS_API),5)
+ifeq ($(OS_API),posix)
 OP_SYS_CFLAGS += -D__LINUX_ERRNO_EXTENSIONS__
 #OP_SYS_LDLIBS += -lrtemsCom -lrtemscpu -lrtemsbsp -ltftpfs -ltelnetd -lbsd -lz -lm
 OP_SYS_LDLIBS += -lrtemsCom -lc -lrtemscpu  -ltftpfs -lbsd -lz -lm
 else
-OP_SYS_LDLIBS += -lrtemsCom -lrtemscpu -lrtemsbsp
+OP_SYS_LDLIBS += -lrtemsCom -lc -lrtemscpu -lCom -lnfs -lm
 endif
 
 ifeq ($(RTEMS_HAS_NETWORKING),yes)
diff --git a/configure/os/CONFIG.Common.RTEMS-pc386 b/configure/os/CONFIG.Common.RTEMS-pc386
index 8dfa7d2ba..bb4f3e7c7 100644
--- a/configure/os/CONFIG.Common.RTEMS-pc386
+++ b/configure/os/CONFIG.Common.RTEMS-pc386
@@ -7,6 +7,7 @@
 #
 RTEMS_BSP = pc386
 RTEMS_TARGET_CPU = i386
+GNU_TARGET = i386-rtems
 
 MUNCH_SUFFIX = .boot
 define MUNCH_CMD
diff --git a/modules/libcom/RTEMS/Makefile b/modules/libcom/RTEMS/Makefile
index 5865ff8e8..87bf43db3 100644
--- a/modules/libcom/RTEMS/Makefile
+++ b/modules/libcom/RTEMS/Makefile
@@ -37,7 +37,7 @@ rtemsCom_SRCS += epicsRtemsInitHookPost.c
 rtemsCom_SRCS += epicsMemFs.c
 rtemsCom_SRCS += epicsNtp.c
 
-ifeq ($(RTEMS_BSP),pc386)
+ifeq ($(RTEMS_TARGET_CPU),i386)
 rtemsCom_SRCS += ne2kpci.c
 endif