diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE
index cbbc2b07f..beed00bf3 100644
--- a/configure/CONFIG_BASE
+++ b/configure/CONFIG_BASE
@@ -28,7 +28,7 @@ EPICS_BASE_IOC_LIBS += dbIoc registryIoc dbStaticIoc ca Com
 #---------------------------------------------------------------
 # Epics base Host libraries 
 
-EPICS_BASE_HOST_LIBS += cas gdd asHost dbStaticHost
+EPICS_BASE_HOST_LIBS += cas gdd asHost dbStaticHost iocshHost
 EPICS_BASE_HOST_LIBS += ca Com
 
 #---------------------------------------------------------------
diff --git a/src/iocsh/Makefile b/src/iocsh/Makefile
index d6e8e0612..0e5168e4e 100644
--- a/src/iocsh/Makefile
+++ b/src/iocsh/Makefile
@@ -30,35 +30,34 @@ INC += registryCommon.h
 INC += registryRegister.h
 
 
-#       general contents of library on all platforms
-#
-#       system specific lines in RULES.Host figure out
-#       1) what object names (.o, .obj,...) to build
-#	2) where to find the sources: ., ./os/<ARCH_CLASS>, ./os/generic, ...
-#
+LIB_SRCS += iocsh.cpp
+LIB_SRCS += systemCommandRegister.c
 
-LIBSRCS += iocsh.cpp
-LIBSRCS += osiRegister.c
-LIBSRCS += dbStaticRegister.c
-LIBSRCS += dbTestRegister.c
-LIBSRCS += dbBkptRegister.c
-LIBSRCS += dbCaTestRegister.c
-LIBSRCS += caTestRegister.c
-LIBSRCS += dbAccessRegister.c
-LIBSRCS += iocshRegisterCommon.c
-LIBSRCS += asTestRegister.c
-LIBSRCS += envRegister.c
-LIBSRCS += iocUtil.c
-LIBSRCS += iocCoreLimitsRegister.c
-LIBSRCS += systemCommandRegister.c
-LIBSRCS += registryCommon.c
-LIBSRCS += registryRegister.c
+iocsh_SRCS += osiRegister.c
+iocsh_SRCS += dbStaticRegister.c
+iocsh_SRCS += dbTestRegister.c
+iocsh_SRCS += dbBkptRegister.c
+iocsh_SRCS += dbCaTestRegister.c
+iocsh_SRCS += caTestRegister.c
+iocsh_SRCS += dbAccessRegister.c
+iocsh_SRCS += iocshRegisterCommon.c
+iocsh_SRCS += asTestRegister.c
+iocsh_SRCS += envRegister.c
+iocsh_SRCS += iocUtil.c
+iocsh_SRCS += iocCoreLimitsRegister.c
+iocsh_SRCS += registryCommon.c
+iocsh_SRCS += registryRegister.c
 
 LIBRARY_IOC = iocsh
 
 iocsh_LIBS  = miscIoc rsrvIoc dbtoolsIoc asIoc dbIoc registryIoc dbStaticIoc Com
 iocsh_RCS_WIN32 = iocsh.rc
 
+LIBRARY_HOST = iocshHost
+
+iocshHost_LIBS = registryIoc Com
+iocshHost_RCS_WIN32 = iocshHost.rc
+
 # For R3.13 compatibility only
 ifeq ($(strip $(COMPAT_313)),YES)
 OBJLIB_vxWorks=iocsh