diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index e247cbc03..5e647694e 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,5 +1,9 @@
 2015-12-17  DJ Delorie  <dj@redhat.com>
 
+	* configure.in: Don't build default libnosys for msp430
+	* configure: Regenerate.
+	* msp430/Makefile: Rename libcio to libnosys.
+
 	* msp430/cio.c: Remove, replace with...
 	* msp430/cio.S: New, this.
 
diff --git a/libgloss/configure b/libgloss/configure
index 4e8e5c671..90a05222a 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -2548,6 +2548,7 @@ case "${target}" in
   msp430*-*-elf)
 	subdirs="$subdirs msp430"
 
+	config_libnosys=false
 	;;
   rl78*-*-elf)
 	subdirs="$subdirs rl78"
diff --git a/libgloss/configure.in b/libgloss/configure.in
index c7bf259d8..d1b3b3469 100644
--- a/libgloss/configure.in
+++ b/libgloss/configure.in
@@ -147,6 +147,7 @@ case "${target}" in
 	;;
   msp430*-*-elf)
 	AC_CONFIG_SUBDIRS([msp430])
+	config_libnosys=false
 	;;
   rl78*-*-elf)
 	AC_CONFIG_SUBDIRS([rl78])
diff --git a/libgloss/msp430/Makefile.in b/libgloss/msp430/Makefile.in
index fdd151344..73079d65b 100644
--- a/libgloss/msp430/Makefile.in
+++ b/libgloss/msp430/Makefile.in
@@ -63,7 +63,7 @@ SCRIPTS += $(srcdir)/intr_vectors.ld
 
 CRT = gcrt0.o crt0.o crt0-minrt.o crtn.o crtn-minrt.o
 SIM_BSP = libsim.a
-LIB_CIO = libcio.a
+LIB_NOSYS = libnosys.a
 LIB_CRT = libcrt.a
 
 SIM_OBJS = syscalls.o \
@@ -71,7 +71,7 @@ SIM_OBJS = syscalls.o \
 	write.o \
 	sbrk.o
 
-CIO_OBJS = ciosyscalls.o \
+NOSYS_OBJS = ciosyscalls.o \
 	cio.o \
 	write.o \
 	unlink.o \
@@ -93,7 +93,7 @@ CRT_OBJS = \
 @host_makefile_frag@
 
 
-all: $(CRT) $(SIM_BSP) $(LIB_CIO) $(LIB_CRT) copy_scripts_to_objdir
+all: $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT) copy_scripts_to_objdir
 
 crt_%.o : crt0.S
 	$(CC) -DL$* -Wa,-gdwarf2 -Wa,-I$(srcdir) $(CFLAGS_FOR_TARGET) $(INCLUDES) $(CFLAGS) -c $< -o $@
@@ -112,7 +112,7 @@ $(SIM_BSP): $(SIM_OBJS)
 	$(AR) $(ARFLAGS) $@ $?
 	$(RANLIB) $@
 
-$(LIB_CIO): $(CIO_OBJS)
+$(LIB_NOSYS): $(NOSYS_OBJS)
 	$(AR) $(ARFLAGS) $@ $?
 	$(RANLIB) $@
 
@@ -153,9 +153,9 @@ unlink.o : $(SDEPS)
 utime.o : $(SDEPS)
 write.o : $(SDEPS)
 
-install: $(CRT) $(SIM_BSP) $(LIB_CIO) $(LIB_CRT) $(SCRIPTS)
+install: $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT) $(SCRIPTS)
 	mkdir -p $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	for c in $(CRT) $(SIM_BSP) $(LIB_CIO) $(LIB_CRT); do \
+	for c in $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT); do \
 	  $(INSTALL_DATA) $$c $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$c ;\
 	done
 	for c in $(SCRIPTS); do \