Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

272 files changed, 6528 insertions, 11688 deletions

diff --git a/lib/erl_interface/Makefile b/lib/erl_interface/Makefile
index 256b0309cd..9471b0df18 100644
--- a/lib/erl_interface/Makefile
+++ b/lib/erl_interface/Makefile
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/aclocal.m4 b/lib/erl_interface/aclocal.m4
deleted file mode 100644
index 25f40944e7..0000000000
--- a/lib/erl_interface/aclocal.m4
+++ /dev/null
@@ -1,1905 +0,0 @@
-dnl
-dnl %CopyrightBegin%
-dnl
-dnl Copyright Ericsson AB 1998-2013. All Rights Reserved.
-dnl
-dnl The contents of this file are subject to the Erlang Public License,
-dnl Version 1.1, (the "License"); you may not use this file except in
-dnl compliance with the License. You should have received a copy of the
-dnl Erlang Public License along with this software. If not, it can be
-dnl retrieved online at http://www.erlang.org/.
-dnl
-dnl Software distributed under the License is distributed on an "AS IS"
-dnl basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-dnl the License for the specific language governing rights and limitations
-dnl under the License.
-dnl
-dnl %CopyrightEnd%
-dnl
-
-dnl
-dnl aclocal.m4
-dnl
-dnl Local macros used in configure.in. The Local Macros which
-dnl could/should be part of autoconf are prefixed LM_, macros specific
-dnl to the Erlang system are prefixed ERL_.
-dnl
-
-AC_DEFUN(LM_PRECIOUS_VARS,
-[
-
-dnl ERL_TOP
-AC_ARG_VAR(ERL_TOP, [Erlang/OTP top source directory])
-
-dnl Tools
-AC_ARG_VAR(CC, [C compiler])
-AC_ARG_VAR(CFLAGS, [C compiler flags])
-AC_ARG_VAR(STATIC_CFLAGS, [C compiler static flags])
-AC_ARG_VAR(CFLAG_RUNTIME_LIBRARY_PATH, [runtime library path linker flag passed via C compiler])
-AC_ARG_VAR(CPP, [C/C++ preprocessor])
-AC_ARG_VAR(CPPFLAGS, [C/C++ preprocessor flags])
-AC_ARG_VAR(CXX, [C++ compiler])
-AC_ARG_VAR(CXXFLAGS, [C++ compiler flags])
-AC_ARG_VAR(LD, [linker (is often overridden by configure)])
-AC_ARG_VAR(LDFLAGS, [linker flags (can be risky to set since LD may be overriden by configure)])
-AC_ARG_VAR(LIBS, [libraries])
-AC_ARG_VAR(DED_LD, [linker for Dynamic Erlang Drivers (set all DED_LD* variables or none)])
-AC_ARG_VAR(DED_LDFLAGS, [linker flags for Dynamic Erlang Drivers (set all DED_LD* variables or none)])
-AC_ARG_VAR(DED_LD_FLAG_RUNTIME_LIBRARY_PATH, [runtime library path linker flag for Dynamic Erlang Drivers (set all DED_LD* variables or none)])
-AC_ARG_VAR(LFS_CFLAGS, [large file support C compiler flags (set all LFS_* variables or none)])
-AC_ARG_VAR(LFS_LDFLAGS, [large file support linker flags (set all LFS_* variables or none)])
-AC_ARG_VAR(LFS_LIBS, [large file support libraries (set all LFS_* variables or none)])
-AC_ARG_VAR(RANLIB, [ranlib])
-AC_ARG_VAR(AR, [ar])
-AC_ARG_VAR(GETCONF, [getconf])
-
-dnl Cross system root
-AC_ARG_VAR(erl_xcomp_sysroot, [Absolute cross system root path (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_isysroot, [Absolute cross system root include path (only used when cross compiling)])
-
-dnl Cross compilation variables
-AC_ARG_VAR(erl_xcomp_bigendian, [big endian system: yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_double_middle_endian, [double-middle-endian system: yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_linux_clock_gettime_correction, [clock_gettime() can be used for time correction: yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_linux_nptl, [have Native POSIX Thread Library: yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_linux_usable_sigusrx, [SIGUSR1 and SIGUSR2 can be used: yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_linux_usable_sigaltstack, [have working sigaltstack(): yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_poll, [have working poll(): yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_kqueue, [have working kqueue(): yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_putenv_copy, [putenv() stores key-value copy: yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_reliable_fpe, [have reliable floating point exceptions: yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_getaddrinfo, [have working getaddrinfo() for both IPv4 and IPv6: yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_gethrvtime_procfs_ioctl, [have working gethrvtime() which can be used with procfs ioctl(): yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_clock_gettime_cpu_time, [clock_gettime() can be used for retrieving process CPU time: yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_after_morecore_hook, [__after_morecore_hook can track malloc()s core memory usage: yes|no (only used when cross compiling)])
-AC_ARG_VAR(erl_xcomp_dlsym_brk_wrappers, [dlsym(RTLD_NEXT, _) brk wrappers can track malloc()s core memory usage: yes|no (only used when cross compiling)])
-
-])
-
-AC_DEFUN(ERL_XCOMP_SYSROOT_INIT,
-[
-erl_xcomp_without_sysroot=no
-if test "$cross_compiling" = "yes"; then
-    test "$erl_xcomp_sysroot" != "" || erl_xcomp_without_sysroot=yes
-    test "$erl_xcomp_isysroot" != "" || erl_xcomp_isysroot="$erl_xcomp_sysroot"
-else
-    erl_xcomp_sysroot=
-    erl_xcomp_isysroot=
-fi
-])
-
-AC_DEFUN(LM_CHECK_GETCONF,
-[
-if test "$cross_compiling" != "yes"; then
-    AC_CHECK_PROG([GETCONF], [getconf], [getconf], [false])
-else
-    dnl First check if we got a `<HOST>-getconf' in $PATH
-    host_getconf="$host_alias-getconf"
-    AC_CHECK_PROG([GETCONF], [$host_getconf], [$host_getconf], [false])
-    if test "$GETCONF" = "false" && test "$erl_xcomp_sysroot" != ""; then
-	dnl We should perhaps give up if we have'nt found it by now, but at
-	dnl least in one Tilera MDE `getconf' under sysroot is a bourne
-	dnl shell script which we can use. We try to find `<HOST>-getconf'
-    	dnl or `getconf' under sysconf, but only under sysconf since
-	dnl `getconf' in $PATH is almost guaranteed to be for the build
-	dnl machine.
-	GETCONF=
-	prfx="$erl_xcomp_sysroot"
-        AC_PATH_TOOL([GETCONF], [getconf], [false],
-	             ["$prfx/usr/bin:$prfx/bin:$prfx/usr/local/bin"])
-    fi
-fi
-])
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_WINDOWS_ENVIRONMENT
-dnl
-dnl
-dnl Tries to determine thw windows build environment, i.e. 
-dnl MIXED_CYGWIN_VC or MIXED_MSYS_VC 
-dnl
-
-AC_DEFUN(LM_WINDOWS_ENVIRONMENT,
-[
-MIXED_CYGWIN=no
-MIXED_MSYS=no
-
-AC_MSG_CHECKING(for mixed cygwin or msys and native VC++ environment)
-if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then
-	if test -x /usr/bin/cygpath; then
-		CFLAGS="-O2"
-		MIXED_CYGWIN=yes
-		AC_MSG_RESULT([Cygwin and VC])
-		MIXED_CYGWIN_VC=yes
-		CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC"
-	elif test -x /usr/bin/msysinfo; then
-	        CFLAGS="-O2"
-		MIXED_MSYS=yes
-		AC_MSG_RESULT([MSYS and VC])
-		MIXED_MSYS_VC=yes
-		CPPFLAGS="$CPPFLAGS -DERTS_MIXED_MSYS_VC"
-	else		    
-		AC_MSG_RESULT([undeterminable])
-		AC_MSG_ERROR(Seems to be mixed windows but not with cygwin, cannot handle this!)
-	fi
-else
-	AC_MSG_RESULT([no])
-	MIXED_CYGWIN_VC=no
-	MIXED_MSYS_VC=no
-fi
-AC_SUBST(MIXED_CYGWIN_VC)
-AC_SUBST(MIXED_MSYS_VC)
-
-MIXED_VC=no
-if test "x$MIXED_MSYS_VC" = "xyes" -o  "x$MIXED_CYGWIN_VC" = "xyes" ; then
-   MIXED_VC=yes
-fi
-
-AC_SUBST(MIXED_VC)
-
-if test "x$MIXED_MSYS" != "xyes"; then
-   AC_MSG_CHECKING(for mixed cygwin and native MinGW environment)
-   if test "X$host" = "Xwin32" -a "x$GCC" = x"yes"; then
-	if test -x /usr/bin/cygpath; then
-		CFLAGS="-O2"
-		MIXED_CYGWIN=yes
-		AC_MSG_RESULT([yes])
-		MIXED_CYGWIN_MINGW=yes
-		CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_MINGW"
-	else
-		AC_MSG_RESULT([undeterminable])
-		AC_MSG_ERROR(Seems to be mixed windows but not with cygwin, cannot handle this!)
-	fi
-    else
-	AC_MSG_RESULT([no])
-	MIXED_CYGWIN_MINGW=no
-    fi
-else
-	MIXED_CYGWIN_MINGW=no
-fi	
-AC_SUBST(MIXED_CYGWIN_MINGW)
-
-AC_MSG_CHECKING(if we mix cygwin with any native compiler)
-if test "X$MIXED_CYGWIN" = "Xyes"; then
-	AC_MSG_RESULT([yes])	
-else
-	AC_MSG_RESULT([no])
-fi
-
-AC_SUBST(MIXED_CYGWIN)
-	
-AC_MSG_CHECKING(if we mix msys with another native compiler)
-if test "X$MIXED_MSYS" = "Xyes" ; then
-	AC_MSG_RESULT([yes])	
-else
-	AC_MSG_RESULT([no])
-fi
-
-AC_SUBST(MIXED_MSYS)
-])		
-	
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_FIND_EMU_CC
-dnl
-dnl
-dnl Tries fairly hard to find a C compiler that can handle jump tables.
-dnl Defines the @EMU_CC@ variable for the makefiles and 
-dnl inserts NO_JUMP_TABLE in the header if one cannot be found...
-dnl
-
-AC_DEFUN(LM_FIND_EMU_CC,
-	[AC_CACHE_CHECK(for a compiler that handles jumptables,
-			ac_cv_prog_emu_cc,
-			[
-AC_TRY_COMPILE([],[
-#if defined(__clang_major__) && __clang_major__ >= 3
-    /* clang 3.x or later is fine */
-#elif defined(__llvm__)
-#error "this version of llvm is unable to correctly compile beam_emu.c"
-#endif
-    __label__ lbl1;
-    __label__ lbl2;
-    int x = magic();
-    static void *jtab[2];
-
-    jtab[0] = &&lbl1;
-    jtab[1] = &&lbl2;
-    goto *jtab[x];
-lbl1:
-    return 1;
-lbl2:
-    return 2;
-],ac_cv_prog_emu_cc=$CC,ac_cv_prog_emu_cc=no)
-
-if test $ac_cv_prog_emu_cc = no; then
-	for ac_progname in emu_cc.sh gcc-4.2 gcc; do
-  		IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  		ac_dummy="$PATH"
-  		for ac_dir in $ac_dummy; do
-    			test -z "$ac_dir" && ac_dir=.
-    			if test -f $ac_dir/$ac_progname; then
-      				ac_cv_prog_emu_cc=$ac_dir/$ac_progname
-      				break
-    			fi
-  		done
-  		IFS="$ac_save_ifs"
-		if test $ac_cv_prog_emu_cc != no; then
-			break
-		fi
-	done
-fi
-
-if test $ac_cv_prog_emu_cc != no; then
-	save_CC=$CC
-	save_CFLAGS=$CFLAGS
-	save_CPPFLAGS=$CPPFLAGS
-	CC=$ac_cv_prog_emu_cc
-	CFLAGS=""
-	CPPFLAGS=""
-	AC_TRY_COMPILE([],[
-#if defined(__clang_major__) && __clang_major__ >= 3
-    /* clang 3.x or later is fine */
-#elif defined(__llvm__)
-#error "this version of llvm is unable to correctly compile beam_emu.c"
-#endif
-    	__label__ lbl1;
-    	__label__ lbl2;
-    	int x = magic();
-    	static void *jtab[2];
-
-    	jtab[0] = &&lbl1;
-    	jtab[1] = &&lbl2;
-    	goto *jtab[x];
-	lbl1:
-    	return 1;
-	lbl2:
-    	return 2;
-	],ac_cv_prog_emu_cc=$CC,ac_cv_prog_emu_cc=no)
-	CC=$save_CC
-	CFLAGS=$save_CFLAGS
-	CPPFLAGS=$save_CPPFLAGS
-fi
-])
-if test $ac_cv_prog_emu_cc = no; then
-	AC_DEFINE(NO_JUMP_TABLE,[],[Defined if no found C compiler can handle jump tables])
-	EMU_CC=$CC
-else
-	EMU_CC=$ac_cv_prog_emu_cc
-fi
-AC_SUBST(EMU_CC)
-])		
-			
-
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_PROG_INSTALL_DIR
-dnl
-dnl This macro may be used by any OTP application.
-dnl
-dnl Figure out how to create directories with parents.
-dnl (In my opinion INSTALL_DIR is a bad name, MKSUBDIRS or something is better)
-dnl
-dnl We prefer 'install -d', but use 'mkdir -p' if it exists.
-dnl If none of these methods works, we give up.
-dnl
-
-
-AC_DEFUN(LM_PROG_INSTALL_DIR,
-[AC_CACHE_CHECK(how to create a directory including parents,
-ac_cv_prog_mkdir_p,
-[
-temp_name_base=config.$$
-temp_name=$temp_name_base/x/y/z
-$INSTALL -d $temp_name >/dev/null 2>&1
-ac_cv_prog_mkdir_p=none
-if test -d $temp_name; then
-        ac_cv_prog_mkdir_p="$INSTALL -d"
-else
-        mkdir -p $temp_name >/dev/null 2>&1
-        if test -d $temp_name; then
-                ac_cv_prog_mkdir_p="mkdir -p"
-        fi
-fi
-rm -fr $temp_name_base           
-])
-
-case "${ac_cv_prog_mkdir_p}" in
-  none) AC_MSG_ERROR(don't know how create directories with parents) ;;
-  *)    INSTALL_DIR="$ac_cv_prog_mkdir_p" AC_SUBST(INSTALL_DIR)     ;;
-esac
-])
-
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_PROG_PERL5
-dnl
-dnl Try to find perl version 5. If found set PERL to the absolute path
-dnl of the program, if not found set PERL to false.
-dnl
-dnl On some systems /usr/bin/perl is perl 4 and e.g.
-dnl /usr/local/bin/perl is perl 5. We try to handle this case by
-dnl putting a couple of 
-dnl Tries to handle the case that there are two programs called perl
-dnl in the path and one of them is perl 5 and the other isn't. 
-dnl
-AC_DEFUN(LM_PROG_PERL5,
-[AC_PATH_PROGS(PERL, perl5 perl, false,
-   /usr/local/bin:/opt/local/bin:/usr/local/gnu/bin:${PATH})
-changequote(, )dnl
-dnl[ That bracket is needed to balance the right bracket below
-if test "$PERL" = "false" || $PERL -e 'exit ($] >= 5)'; then
-changequote([, ])dnl
-  ac_cv_path_PERL=false
-  PERL=false
-dnl  AC_MSG_WARN(perl version 5 not found)
-fi
-])dnl
-
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_DECL_SO_BSDCOMPAT
-dnl
-dnl Check if the system has the SO_BSDCOMPAT flag on sockets (linux) 
-dnl
-AC_DEFUN(LM_DECL_SO_BSDCOMPAT,
-[AC_CACHE_CHECK([for SO_BSDCOMPAT declaration], ac_cv_decl_so_bsdcompat,
-AC_TRY_COMPILE([#include <sys/socket.h>], [int i = SO_BSDCOMPAT;],
-               ac_cv_decl_so_bsdcompat=yes,
-               ac_cv_decl_so_bsdcompat=no))
-
-case "${ac_cv_decl_so_bsdcompat}" in
-  "yes" ) AC_DEFINE(HAVE_SO_BSDCOMPAT,[],
-		[Define if you have SO_BSDCOMPAT flag on sockets]) ;;
-  * ) ;;
-esac
-])
-
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_DECL_INADDR_LOOPBACK
-dnl
-dnl Try to find declaration of INADDR_LOOPBACK, if nowhere provide a default
-dnl
-
-AC_DEFUN(LM_DECL_INADDR_LOOPBACK,
-[AC_CACHE_CHECK([for INADDR_LOOPBACK in netinet/in.h],
- ac_cv_decl_inaddr_loopback,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <netinet/in.h>], [int i = INADDR_LOOPBACK;],
-ac_cv_decl_inaddr_loopback=yes, ac_cv_decl_inaddr_loopback=no)
-])
-
-if test ${ac_cv_decl_inaddr_loopback} = no; then
-  AC_CACHE_CHECK([for INADDR_LOOPBACK in rpc/types.h],
-                   ac_cv_decl_inaddr_loopback_rpc,
-                   AC_TRY_COMPILE([#include <rpc/types.h>],
-                                   [int i = INADDR_LOOPBACK;],
-                                   ac_cv_decl_inaddr_loopback_rpc=yes,
-                                   ac_cv_decl_inaddr_loopback_rpc=no))
-
-   case "${ac_cv_decl_inaddr_loopback_rpc}" in
-     "yes" )
-        AC_DEFINE(DEF_INADDR_LOOPBACK_IN_RPC_TYPES_H,[],
-		[Define if you need to include rpc/types.h to get INADDR_LOOPBACK defined]) ;;
-      * )
-  	AC_CACHE_CHECK([for INADDR_LOOPBACK in winsock2.h],
-                   ac_cv_decl_inaddr_loopback_winsock2,
-                   AC_TRY_COMPILE([#define WIN32_LEAN_AND_MEAN
-				   #include <winsock2.h>],
-                                   [int i = INADDR_LOOPBACK;],
-                                   ac_cv_decl_inaddr_loopback_winsock2=yes,
-                                   ac_cv_decl_inaddr_loopback_winsock2=no))
-	case "${ac_cv_decl_inaddr_loopback_winsock2}" in
-     		"yes" )
-			AC_DEFINE(DEF_INADDR_LOOPBACK_IN_WINSOCK2_H,[],
-				[Define if you need to include winsock2.h to get INADDR_LOOPBACK defined]) ;;
-		* )
-			# couldn't find it anywhere
-        		AC_DEFINE(HAVE_NO_INADDR_LOOPBACK,[],
-				[Define if you don't have a definition of INADDR_LOOPBACK]) ;;
-	esac;;
-   esac
-fi
-])
-
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_STRUCT_SOCKADDR_SA_LEN
-dnl
-dnl Check if the sockaddr structure has the field sa_len
-dnl
-
-AC_DEFUN(LM_STRUCT_SOCKADDR_SA_LEN,
-[AC_CACHE_CHECK([whether struct sockaddr has sa_len field],
-                ac_cv_struct_sockaddr_sa_len,
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>], [struct sockaddr s; s.sa_len = 10;],
-  ac_cv_struct_sockaddr_sa_len=yes, ac_cv_struct_sockaddr_sa_len=no))
-
-dnl FIXME convbreak
-case ${ac_cv_struct_sockaddr_sa_len} in
-  "no" ) AC_DEFINE(NO_SA_LEN,[1],[Define if you dont have salen]) ;;
-  *) ;;
-esac
-])
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_STRUCT_EXCEPTION
-dnl
-dnl Check to see whether the system supports the matherr function
-dnl and its associated type "struct exception".
-dnl
-
-AC_DEFUN(LM_STRUCT_EXCEPTION,
-[AC_CACHE_CHECK([for struct exception (and matherr function)],
- ac_cv_struct_exception,
-AC_TRY_COMPILE([#include <math.h>],
-  [struct exception x; x.type = DOMAIN; x.type = SING;],
-  ac_cv_struct_exception=yes, ac_cv_struct_exception=no))
-
-case "${ac_cv_struct_exception}" in
-  "yes" ) AC_DEFINE(USE_MATHERR,[1],[Define if you have matherr() function and struct exception type]) ;;
-  *  ) ;;
-esac
-])
-
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_SYS_IPV6
-dnl
-dnl Check for ipv6 support and what the in6_addr structure is called.
-dnl (early linux used in_addr6 insted of in6_addr)
-dnl
-
-AC_DEFUN(LM_SYS_IPV6,
-[AC_MSG_CHECKING(for IP version 6 support)
-AC_CACHE_VAL(ac_cv_sys_ipv6_support,
-[ok_so_far=yes
- AC_TRY_COMPILE([#include <sys/types.h>
-#ifdef __WIN32__
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <netinet/in.h>
-#endif],
-   [struct in6_addr a6; struct sockaddr_in6 s6;], ok_so_far=yes, ok_so_far=no)
-
-if test $ok_so_far = yes; then
-  ac_cv_sys_ipv6_support=yes
-else
-  AC_TRY_COMPILE([#include <sys/types.h>
-#ifdef __WIN32__
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <netinet/in.h>
-#endif],
-    [struct in_addr6 a6; struct sockaddr_in6 s6;],
-    ac_cv_sys_ipv6_support=in_addr6, ac_cv_sys_ipv6_support=no)
-fi
-])dnl
-
-dnl
-dnl Have to use old style AC_DEFINE due to BC with old autoconf.
-dnl
-
-case ${ac_cv_sys_ipv6_support} in
-  yes)
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_IN6,[1],[Define if ipv6 is present])
-    ;;
-  in_addr6)
-    AC_MSG_RESULT([yes (but I am redefining in_addr6 to in6_addr)])
-    AC_DEFINE(HAVE_IN6,[1],[Define if ipv6 is present])
-    AC_DEFINE(HAVE_IN_ADDR6_STRUCT,[],[Early linux used in_addr6 instead of in6_addr, define if you have this])
-    ;;
-  *)
-    AC_MSG_RESULT(no)
-    ;;
-esac
-])
-
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_SYS_MULTICAST
-dnl
-dnl Check for multicast support. Only checks for multicast options in
-dnl setsockopt(), no check is performed that multicasting actually works.
-dnl If options are found defines HAVE_MULTICAST_SUPPORT
-dnl
-
-AC_DEFUN(LM_SYS_MULTICAST,
-[AC_CACHE_CHECK([for multicast support], ac_cv_sys_multicast_support,
-[AC_EGREP_CPP(yes,
-[#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#if defined(IP_MULTICAST_TTL) && defined(IP_MULTICAST_LOOP) && defined(IP_MULTICAST_IF) && defined(IP_ADD_MEMBERSHIP) && defined(IP_DROP_MEMBERSHIP)
-yes
-#endif
-], ac_cv_sys_multicast_support=yes, ac_cv_sys_multicast_support=no)])
-if test $ac_cv_sys_multicast_support = yes; then
-  AC_DEFINE(HAVE_MULTICAST_SUPPORT,[1],
-	[Define if setsockopt() accepts multicast options])
-fi
-])dnl
-
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_DECL_SYS_ERRLIST
-dnl
-dnl Define SYS_ERRLIST_DECLARED if the variable sys_errlist is declared
-dnl in a system header file, stdio.h or errno.h.
-dnl
-
-AC_DEFUN(LM_DECL_SYS_ERRLIST,
-[AC_CACHE_CHECK([for sys_errlist declaration in stdio.h or errno.h],
-  ac_cv_decl_sys_errlist,
-[AC_TRY_COMPILE([#include <stdio.h>
-#include <errno.h>], [char *msg = *(sys_errlist + 1);],
-  ac_cv_decl_sys_errlist=yes, ac_cv_decl_sys_errlist=no)])
-if test $ac_cv_decl_sys_errlist = yes; then
-  AC_DEFINE(SYS_ERRLIST_DECLARED,[],
-	[define if the variable sys_errlist is declared in a system header file])
-fi
-])
-
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_CHECK_FUNC_DECL( funname, declaration [, extra includes 
-dnl                     [, action-if-found [, action-if-not-found]]] )
-dnl
-dnl Checks if the declaration "declaration" of "funname" conflicts
-dnl with the header files idea of how the function should be
-dnl declared. It is useful on systems which lack prototypes and you
-dnl need to provide your own (e.g. when you want to take the address
-dnl of a function). The 4'th argument is expanded if conflicting, 
-dnl the 5'th argument otherwise
-dnl
-dnl
-
-AC_DEFUN(LM_CHECK_FUNC_DECL,
-[AC_MSG_CHECKING([for conflicting declaration of $1])
-AC_CACHE_VAL(ac_cv_func_decl_$1,
-[AC_TRY_COMPILE([#include <stdio.h>
-$3],[$2
-char *c = (char *)$1;
-], eval "ac_cv_func_decl_$1=no", eval "ac_cv_func_decl_$1=yes")])
-if eval "test \"`echo '$ac_cv_func_decl_'$1`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  ifelse([$4], , :, [$4])
-else
-  AC_MSG_RESULT(no)
-ifelse([$5], , , [$5
-])dnl
-fi
-])
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl AC_DOUBLE_MIDDLE_ENDIAN
-dnl
-dnl Checks whether doubles are represented in "middle-endian" format.
-dnl Sets ac_cv_double_middle_endian={no,yes,unknown} accordingly,
-dnl as well as DOUBLE_MIDDLE_ENDIAN.
-dnl
-dnl
-
-AC_DEFUN([AC_C_DOUBLE_MIDDLE_ENDIAN],
-[AC_CACHE_CHECK(whether double word ordering is middle-endian, ac_cv_c_double_middle_endian,
-[# It does not; compile a test program.
-AC_RUN_IFELSE(
-[AC_LANG_SOURCE([[#include <stdlib.h>
-
-int
-main(void)
-{
-  int i = 0;
-  int zero = 0;
-  int bigendian;
-  int zero_index = 0;
-
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-
-  /* we'll use the one with 32-bit words */
-  union
-  {
-    double d;
-    unsigned int c[2];
-  } vint;
-
-  union
-  {
-    double d;
-    unsigned long c[2];
-  } vlong;
-
-  union
-  {
-    double d;
-    unsigned short c[2];
-  } vshort;
-
-
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  u.l = 1;
-  bigendian = (u.c[sizeof (long int) - 1] == 1);
-
-  zero_index = bigendian ? 1 : 0;
-
-  vint.d = 1.0;
-  vlong.d = 1.0;
-  vshort.d = 1.0;
-
-  if (sizeof(unsigned int) == 4)
-    {
-      if (vint.c[zero_index] != 0)
-	zero = 1;
-    }
-  else if (sizeof(unsigned long) == 4)
-    {
-      if (vlong.c[zero_index] != 0)
-	zero = 1;
-    }
-  else if (sizeof(unsigned short) == 4)
-    {
-      if (vshort.c[zero_index] != 0)
-	zero = 1;
-    }
-
-  exit (zero);
-}
-]])],
-	      [ac_cv_c_double_middle_endian=no],
-	      [ac_cv_c_double_middle_endian=yes],
-	      [ac_cv_c_double_middle=unknown])])
-case $ac_cv_c_double_middle_endian in
-  yes)
-    m4_default([$1],
-      [AC_DEFINE([DOUBLE_MIDDLE_ENDIAN], 1,
-	[Define to 1 if your processor stores the words in a double in
-	 middle-endian format (like some ARMs).])]) ;;
-  no)
-    $2 ;;
-  *)
-    m4_default([$3],
-      [AC_MSG_WARN([unknown double endianness
-presetting ac_cv_c_double_middle_endian=no (or yes) will help])]) ;;
-esac
-])# AC_C_DOUBLE_MIDDLE_ENDIAN
-
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_CHECK_THR_LIB
-dnl
-dnl This macro may be used by any OTP application.
-dnl
-dnl LM_CHECK_THR_LIB sets THR_LIBS, THR_DEFS, and THR_LIB_NAME. It also
-dnl checks for some pthread headers which will appear in DEFS or config.h.
-dnl
-
-AC_DEFUN(LM_CHECK_THR_LIB,
-[
-
-NEED_NPTL_PTHREAD_H=no
-
-dnl win32?
-AC_MSG_CHECKING([for native win32 threads])
-if test "X$host_os" = "Xwin32"; then
-    AC_MSG_RESULT(yes)
-    THR_DEFS="-DWIN32_THREADS"
-    THR_LIBS=
-    THR_LIB_NAME=win32_threads
-    THR_LIB_TYPE=win32_threads
-else
-    AC_MSG_RESULT(no)
-    THR_DEFS=
-    THR_LIBS=
-    THR_LIB_NAME=
-    THR_LIB_TYPE=posix_unknown
-
-dnl Try to find POSIX threads
-
-dnl The usual pthread lib...
-    AC_CHECK_LIB(pthread, pthread_create, THR_LIBS="-lpthread")
-
-dnl Very old versions of FreeBSD have pthreads in special c library, c_r...
-    if test "x$THR_LIBS" = "x"; then
-	AC_CHECK_LIB(c_r, pthread_create, THR_LIBS="-lc_r")
-    fi
-
-dnl QNX has pthreads in standard C library
-    if test "x$THR_LIBS" = "x"; then
-	AC_CHECK_FUNC(pthread_create, THR_LIBS="none_needed")
-    fi
-
-dnl On ofs1 the '-pthread' switch should be used
-    if test "x$THR_LIBS" = "x"; then
-	AC_MSG_CHECKING([if the '-pthread' switch can be used])
-	saved_cflags=$CFLAGS
-	CFLAGS="$CFLAGS -pthread"
-	AC_TRY_LINK([#include <pthread.h>],
-		    pthread_create((void*)0,(void*)0,(void*)0,(void*)0);,
-		    [THR_DEFS="-pthread"
-		     THR_LIBS="-pthread"])
-	CFLAGS=$saved_cflags
-	if test "x$THR_LIBS" != "x"; then
-	    AC_MSG_RESULT(yes)
-	else
-	    AC_MSG_RESULT(no)
-	fi
-    fi
-
-    if test "x$THR_LIBS" != "x"; then
-	THR_DEFS="$THR_DEFS -D_THREAD_SAFE -D_REENTRANT -DPOSIX_THREADS"
-	THR_LIB_NAME=pthread
-	if test "x$THR_LIBS" = "xnone_needed"; then
-	    THR_LIBS=
-	fi
-	case $host_os in
-	    solaris*)
-		THR_DEFS="$THR_DEFS -D_POSIX_PTHREAD_SEMANTICS" ;;
-	    linux*)
-		THR_DEFS="$THR_DEFS -D_POSIX_THREAD_SAFE_FUNCTIONS"
-
-		LM_CHECK_GETCONF
-		AC_MSG_CHECKING(for Native POSIX Thread Library)
-		libpthr_vsn=`$GETCONF GNU_LIBPTHREAD_VERSION 2>/dev/null`
-		if test $? -eq 0; then
-		    case "$libpthr_vsn" in
-			*nptl*|*NPTL*) nptl=yes;;
-			*) nptl=no;;
-		    esac
-		elif test "$cross_compiling" = "yes"; then
-		    case "$erl_xcomp_linux_nptl" in
-			"") nptl=cross;;
-			yes|no) nptl=$erl_xcomp_linux_nptl;;
-			*) AC_MSG_ERROR([Bad erl_xcomp_linux_nptl value: $erl_xcomp_linux_nptl]);;
-		    esac
-		else
-		    nptl=no
-		fi
-		AC_MSG_RESULT($nptl)
-		if test $nptl = cross; then
-		    nptl=yes
-		    AC_MSG_WARN([result yes guessed because of cross compilation])
-		fi
-		if test $nptl = yes; then
-		    THR_LIB_TYPE=posix_nptl
-		    need_nptl_incldir=no
-		    AC_CHECK_HEADER(nptl/pthread.h,
-				    [need_nptl_incldir=yes
-				     NEED_NPTL_PTHREAD_H=yes])
-		    if test $need_nptl_incldir = yes; then
-			# Ahh...
-			nptl_path="$C_INCLUDE_PATH:$CPATH"
-			if test X$cross_compiling != Xyes; then
-			    nptl_path="$nptl_path:/usr/local/include:/usr/include"
-			else
-			    IROOT="$erl_xcomp_isysroot"
-			    test "$IROOT" != "" || IROOT="$erl_xcomp_sysroot"
-			    test "$IROOT" != "" || AC_MSG_ERROR([Don't know where to search for includes! Please set erl_xcomp_isysroot])
-			    nptl_path="$nptl_path:$IROOT/usr/local/include:$IROOT/usr/include"
-			fi
-			nptl_ws_path=
-			save_ifs="$IFS"; IFS=":"
-			for dir in $nptl_path; do
-			    if test "x$dir" != "x"; then
-				nptl_ws_path="$nptl_ws_path $dir"
-			    fi
-			done
-			IFS=$save_ifs
-			nptl_incldir=
-			for dir in $nptl_ws_path; do
-		            AC_CHECK_HEADER($dir/nptl/pthread.h,
-					    nptl_incldir=$dir/nptl)
-			    if test "x$nptl_incldir" != "x"; then
-				THR_DEFS="$THR_DEFS -isystem $nptl_incldir"
-				break
-			    fi
-			done
-			if test "x$nptl_incldir" = "x"; then
-			    AC_MSG_ERROR(Failed to locate nptl system include directory)
-			fi
-		    fi
-		fi
-		;;
-	    *) ;;
-	esac
-
-	dnl We sometimes need THR_DEFS in order to find certain headers
-	dnl (at least for pthread.h on osf1).
-	saved_cppflags=$CPPFLAGS
-	CPPFLAGS="$CPPFLAGS $THR_DEFS"
-
-	dnl
-	dnl Check for headers
-	dnl
-
-	AC_CHECK_HEADER(pthread.h,
-			AC_DEFINE(HAVE_PTHREAD_H, 1, \
-[Define if you have the <pthread.h> header file.]))
-
-	dnl Some Linuxes have <pthread/mit/pthread.h> instead of <pthread.h>
-	AC_CHECK_HEADER(pthread/mit/pthread.h, \
-			AC_DEFINE(HAVE_MIT_PTHREAD_H, 1, \
-[Define if the pthread.h header file is in pthread/mit directory.]))
-
-	dnl restore CPPFLAGS
-	CPPFLAGS=$saved_cppflags
-
-    fi
-fi
-
-])
-
-AC_DEFUN(ERL_INTERNAL_LIBS,
-[
-
-ERTS_INTERNAL_X_LIBS=
-
-AC_CHECK_LIB(kstat, kstat_open,
-[AC_DEFINE(HAVE_KSTAT, 1, [Define if you have kstat])
-ERTS_INTERNAL_X_LIBS="$ERTS_INTERNAL_X_LIBS -lkstat"])
-
-AC_SUBST(ERTS_INTERNAL_X_LIBS)
-
-])
-
-AC_DEFUN(ETHR_CHK_SYNC_OP,
-[
-    AC_MSG_CHECKING([for $3-bit $1()])
-    case "$2" in
-	"1") sync_call="$1(&var);";;
-	"2") sync_call="$1(&var, ($4) 0);";;
-	"3") sync_call="$1(&var, ($4) 0, ($4) 0);";;
-    esac
-    have_sync_op=no
-    AC_TRY_LINK([],
-	[
-	    $4 res;
-	    volatile $4 var;
-	    res = $sync_call
-	],
-	[have_sync_op=yes])
-    test $have_sync_op = yes && $5
-    AC_MSG_RESULT([$have_sync_op])
-])
-
-AC_DEFUN(ETHR_CHK_INTERLOCKED,
-[
-    ilckd="$1"
-    AC_MSG_CHECKING([for ${ilckd}()])
-    case "$2" in
-	"1") ilckd_call="${ilckd}(var);";;
-	"2") ilckd_call="${ilckd}(var, ($3) 0);";;
-	"3") ilckd_call="${ilckd}(var, ($3) 0, ($3) 0);";;
-	"4") ilckd_call="${ilckd}(var, ($3) 0, ($3) 0, arr);";;
-    esac
-    have_interlocked_op=no
-    AC_TRY_LINK(
-	[
-	#define WIN32_LEAN_AND_MEAN
-	#include <windows.h>
-	#include <intrin.h>
-	],
-	[
-	    volatile $3 *var;
-	    volatile $3 arr[2];
-
-	    $ilckd_call
-	    return 0;
-	],
-	[have_interlocked_op=yes])
-    test $have_interlocked_op = yes && $4
-    AC_MSG_RESULT([$have_interlocked_op])
-])
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl ERL_FIND_ETHR_LIB
-dnl
-dnl NOTE! This macro may be changed at any time! Should *only* be used by
-dnl       ERTS!
-dnl
-dnl Find a thread library to use. Sets ETHR_LIBS to libraries to link
-dnl with, ETHR_X_LIBS to extra libraries to link with (same as ETHR_LIBS
-dnl except that the ethread lib itself is not included), ETHR_DEFS to
-dnl defines to compile with, ETHR_THR_LIB_BASE to the name of the
-dnl thread library which the ethread library is based on, and ETHR_LIB_NAME
-dnl to the name of the library where the ethread implementation is located.
-dnl  ERL_FIND_ETHR_LIB currently searches for 'pthreads', and
-dnl 'win32_threads'. If no thread library was found ETHR_LIBS, ETHR_X_LIBS,
-dnl ETHR_DEFS, ETHR_THR_LIB_BASE, and ETHR_LIB_NAME are all set to the
-dnl empty string.
-dnl
-
-AC_DEFUN(ERL_FIND_ETHR_LIB,
-[
-
-LM_CHECK_THR_LIB
-ERL_INTERNAL_LIBS
-
-ethr_have_native_atomics=no
-ethr_have_native_spinlock=no
-ETHR_THR_LIB_BASE="$THR_LIB_NAME"
-ETHR_THR_LIB_BASE_TYPE="$THR_LIB_TYPE"
-ETHR_DEFS="$THR_DEFS"
-ETHR_X_LIBS="$THR_LIBS $ERTS_INTERNAL_X_LIBS"
-ETHR_LIBS=
-ETHR_LIB_NAME=
-
-ethr_modified_default_stack_size=
-
-dnl Name of lib where ethread implementation is located
-ethr_lib_name=ethread
-
-case "$THR_LIB_NAME" in
-
-    win32_threads)
-	ETHR_THR_LIB_BASE_DIR=win
-	# * _WIN32_WINNT >= 0x0400 is needed for
-	#   TryEnterCriticalSection
-	# * _WIN32_WINNT >= 0x0403 is needed for
-	#   InitializeCriticalSectionAndSpinCount
-	# The ethread lib will refuse to build if _WIN32_WINNT < 0x0403.
-	#
-	# -D_WIN32_WINNT should have been defined in $CPPFLAGS; fetch it
-	# and save it in ETHR_DEFS.
-	found_win32_winnt=no
-	for cppflag in $CPPFLAGS; do
-	    case $cppflag in
-		-DWINVER*)
-		    ETHR_DEFS="$ETHR_DEFS $cppflag"
-		    ;;
-		-D_WIN32_WINNT*)
-		    ETHR_DEFS="$ETHR_DEFS $cppflag"
-		    found_win32_winnt=yes
-		    ;;
-		*)
-		    ;;
-	    esac
-        done
-        if test $found_win32_winnt = no; then
-	    AC_MSG_ERROR([-D_WIN32_WINNT missing in CPPFLAGS])
-        fi
-
-	AC_DEFINE(ETHR_WIN32_THREADS, 1, [Define if you have win32 threads])
-
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT, 1, [Define if you have _InterlockedDecrement()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement_rel], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT_REL, 1, [Define if you have _InterlockedDecrement_rel()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT, 1, [Define if you have _InterlockedIncrement()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement_acq], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT_ACQ, 1, [Define if you have _InterlockedIncrement_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD, 1, [Define if you have _InterlockedExchangeAdd()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd_acq], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD_ACQ, 1, [Define if you have _InterlockedExchangeAdd_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedAnd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND, 1, [Define if you have _InterlockedAnd()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedOr], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR, 1, [Define if you have _InterlockedOr()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchange], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE, 1, [Define if you have _InterlockedExchange()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE, 1, [Define if you have _InterlockedCompareExchange()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_acq], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_ACQ, 1, [Define if you have _InterlockedCompareExchange_acq()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_rel], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_REL, 1, [Define if you have _InterlockedCompareExchange_rel()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64, 1, [Define if you have _InterlockedDecrement64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64_rel], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64_REL, 1, [Define if you have _InterlockedDecrement64_rel()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64, 1, [Define if you have _InterlockedIncrement64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64_acq], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64_ACQ, 1, [Define if you have _InterlockedIncrement64_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64, 1, [Define if you have _InterlockedExchangeAdd64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64_acq], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64_ACQ, 1, [Define if you have _InterlockedExchangeAdd64_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedAnd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND64, 1, [Define if you have _InterlockedAnd64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedOr64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR64, 1, [Define if you have _InterlockedOr64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchange64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE64, 1, [Define if you have _InterlockedExchange64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64, 1, [Define if you have _InterlockedCompareExchange64()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_acq], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_ACQ, 1, [Define if you have _InterlockedCompareExchange64_acq()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_rel], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL, 1, [Define if you have _InterlockedCompareExchange64_rel()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange128], [4], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE128, 1, [Define if you have _InterlockedCompareExchange128()]))
-
-	test "$ethr_have_native_atomics" = "yes" && ethr_have_native_spinlock=yes
-	;;
-
-    pthread)
-	ETHR_THR_LIB_BASE_DIR=pthread
-    	AC_DEFINE(ETHR_PTHREADS, 1, [Define if you have pthreads])
-	case $host_os in
-	    openbsd*)
-		# The default stack size is insufficient for our needs
-		# on OpenBSD. We increase it to 256 kilo words.
-		ethr_modified_default_stack_size=256;;
-	    linux*)
-		ETHR_DEFS="$ETHR_DEFS -D_GNU_SOURCE"
-
-		if test	X$cross_compiling = Xyes; then
-		    case X$erl_xcomp_linux_usable_sigusrx in
-			X) usable_sigusrx=cross;;
-			Xyes|Xno) usable_sigusrx=$erl_xcomp_linux_usable_sigusrx;;
-			*) AC_MSG_ERROR([Bad erl_xcomp_linux_usable_sigusrx value: $erl_xcomp_linux_usable_sigusrx]);;
-		    esac
-		    case X$erl_xcomp_linux_usable_sigaltstack in
-			X) usable_sigaltstack=cross;;
-			Xyes|Xno) usable_sigaltstack=$erl_xcomp_linux_usable_sigaltstack;;
-			*) AC_MSG_ERROR([Bad erl_xcomp_linux_usable_sigaltstack value: $erl_xcomp_linux_usable_sigaltstack]);;
-		    esac
-		else
-		    # FIXME: Test for actual problems instead of kernel versions
-		    linux_kernel_vsn_=`uname -r`
-		    case $linux_kernel_vsn_ in
-			[[0-1]].*|2.[[0-1]]|2.[[0-1]].*)
-			    usable_sigusrx=no
-			    usable_sigaltstack=no;;
-			2.[[2-3]]|2.[[2-3]].*)
-			    usable_sigusrx=yes
-			    usable_sigaltstack=no;;
-		    	*)
-			    usable_sigusrx=yes
-			    usable_sigaltstack=yes;;
-		    esac
-		fi
-
-		AC_MSG_CHECKING(if SIGUSR1 and SIGUSR2 can be used)
-		AC_MSG_RESULT($usable_sigusrx)
-		if test $usable_sigusrx = cross; then
-		    usable_sigusrx=yes
-		    AC_MSG_WARN([result yes guessed because of cross compilation])
-		fi
-		if test $usable_sigusrx = no; then
-		    ETHR_DEFS="$ETHR_DEFS -DETHR_UNUSABLE_SIGUSRX"
-		fi
-
-		AC_MSG_CHECKING(if sigaltstack can be used)
-		AC_MSG_RESULT($usable_sigaltstack)
-		if test $usable_sigaltstack = cross; then
-		    usable_sigaltstack=yes
-		    AC_MSG_WARN([result yes guessed because of cross compilation])
-		fi
-		if test $usable_sigaltstack = no; then
-		    ETHR_DEFS="$ETHR_DEFS -DETHR_UNUSABLE_SIGALTSTACK"
-		fi
-		;;
-	    *) ;;
-	esac
-
-	dnl We sometimes need ETHR_DEFS in order to find certain headers
-	dnl (at least for pthread.h on osf1).
-	saved_cppflags="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $ETHR_DEFS"
-
-	dnl We need the thread library in order to find some functions
-	saved_libs="$LIBS"
-	LIBS="$LIBS $ETHR_X_LIBS"
-
-	dnl
-	dnl Check for headers
-	dnl
-
-	AC_CHECK_HEADER(pthread.h, \
-			AC_DEFINE(ETHR_HAVE_PTHREAD_H, 1, \
-[Define if you have the <pthread.h> header file.]))
-
-	dnl Some Linuxes have <pthread/mit/pthread.h> instead of <pthread.h>
-	AC_CHECK_HEADER(pthread/mit/pthread.h, \
-			AC_DEFINE(ETHR_HAVE_MIT_PTHREAD_H, 1, \
-[Define if the pthread.h header file is in pthread/mit directory.]))
-
-	if test $NEED_NPTL_PTHREAD_H = yes; then
-	    AC_DEFINE(ETHR_NEED_NPTL_PTHREAD_H, 1, \
-[Define if you need the <nptl/pthread.h> header file.])
-	fi
-
-	AC_CHECK_HEADER(sched.h, \
-			AC_DEFINE(ETHR_HAVE_SCHED_H, 1, \
-[Define if you have the <sched.h> header file.]))
-
-	AC_CHECK_HEADER(sys/time.h, \
-			AC_DEFINE(ETHR_HAVE_SYS_TIME_H, 1, \
-[Define if you have the <sys/time.h> header file.]))
-
-	AC_TRY_COMPILE([#include <time.h>
-			#include <sys/time.h>], 
-			[struct timeval *tv; return 0;],
-			AC_DEFINE(ETHR_TIME_WITH_SYS_TIME, 1, \
-[Define if you can safely include both <sys/time.h> and <time.h>.]))
-
-
-	dnl
-	dnl Check for functions
-	dnl
-
-	AC_CHECK_FUNC(pthread_spin_lock, \
-			[ethr_have_native_spinlock=yes \
-			 AC_DEFINE(ETHR_HAVE_PTHREAD_SPIN_LOCK, 1, \
-[Define if you have the pthread_spin_lock function.])])
-
-	have_sched_yield=no
-	have_librt_sched_yield=no
-	AC_CHECK_FUNC(sched_yield, [have_sched_yield=yes])
-	if test $have_sched_yield = no; then
-	    AC_CHECK_LIB(rt, sched_yield,
-			 [have_librt_sched_yield=yes
-			  ETHR_X_LIBS="$ETHR_X_LIBS -lrt"])
-	fi
-	if test $have_sched_yield = yes || test $have_librt_sched_yield = yes; then
-	    AC_DEFINE(ETHR_HAVE_SCHED_YIELD, 1, [Define if you have the sched_yield() function.])
-	    AC_MSG_CHECKING([whether sched_yield() returns an int])
-	    sched_yield_ret_int=no
-	    AC_TRY_COMPILE([
-				#ifdef ETHR_HAVE_SCHED_H
-				#include <sched.h>
-				#endif
-			   ],
-			   [int sched_yield();],
-			   [sched_yield_ret_int=yes])
-	    AC_MSG_RESULT([$sched_yield_ret_int])
-	    if test $sched_yield_ret_int = yes; then
-		AC_DEFINE(ETHR_SCHED_YIELD_RET_INT, 1, [Define if sched_yield() returns an int.])
-	    fi
-	fi
-
-	have_pthread_yield=no
-	AC_CHECK_FUNC(pthread_yield, [have_pthread_yield=yes])
-	if test $have_pthread_yield = yes; then
-	    AC_DEFINE(ETHR_HAVE_PTHREAD_YIELD, 1, [Define if you have the pthread_yield() function.])
-	    AC_MSG_CHECKING([whether pthread_yield() returns an int])
-	    pthread_yield_ret_int=no
-	    AC_TRY_COMPILE([
-				#if defined(ETHR_NEED_NPTL_PTHREAD_H)
-				#include <nptl/pthread.h>
-				#elif defined(ETHR_HAVE_MIT_PTHREAD_H)
-				#include <pthread/mit/pthread.h>
-				#elif defined(ETHR_HAVE_PTHREAD_H)
-				#include <pthread.h>
-				#endif
-			   ],
-			   [int pthread_yield();],
-			   [pthread_yield_ret_int=yes])
-	    AC_MSG_RESULT([$pthread_yield_ret_int])
-	    if test $pthread_yield_ret_int = yes; then
-		AC_DEFINE(ETHR_PTHREAD_YIELD_RET_INT, 1, [Define if pthread_yield() returns an int.])
-	    fi
-	fi
-
-	have_pthread_rwlock_init=no
-	AC_CHECK_FUNC(pthread_rwlock_init, [have_pthread_rwlock_init=yes])
-	if test $have_pthread_rwlock_init = yes; then
-
-	    ethr_have_pthread_rwlockattr_setkind_np=no
-	    AC_CHECK_FUNC(pthread_rwlockattr_setkind_np,
-			  [ethr_have_pthread_rwlockattr_setkind_np=yes])
-
-	    if test $ethr_have_pthread_rwlockattr_setkind_np = yes; then
-		AC_DEFINE(ETHR_HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP, 1, \
-[Define if you have the pthread_rwlockattr_setkind_np() function.])
-
-		AC_MSG_CHECKING([for PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP])
-		ethr_pthread_rwlock_writer_nonrecursive_initializer_np=no
-		AC_TRY_LINK([
-				#if defined(ETHR_NEED_NPTL_PTHREAD_H)
-				#include <nptl/pthread.h>
-				#elif defined(ETHR_HAVE_MIT_PTHREAD_H)
-				#include <pthread/mit/pthread.h>
-				#elif defined(ETHR_HAVE_PTHREAD_H)
-				#include <pthread.h>
-				#endif
-			    ],
-			    [
-				pthread_rwlockattr_t *attr;
-				return pthread_rwlockattr_setkind_np(attr,
-				    PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
-			    ],
-			    [ethr_pthread_rwlock_writer_nonrecursive_initializer_np=yes])
-		AC_MSG_RESULT([$ethr_pthread_rwlock_writer_nonrecursive_initializer_np])
-		if test $ethr_pthread_rwlock_writer_nonrecursive_initializer_np = yes; then
-		    AC_DEFINE(ETHR_HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, 1, \
-[Define if you have the PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP rwlock attribute.])
-		fi
-	    fi
-	fi
-
-	if test "$force_pthread_rwlocks" = "yes"; then
-
-	    AC_DEFINE(ETHR_FORCE_PTHREAD_RWLOCK, 1, \
-[Define if you want to force usage of pthread rwlocks])
-
-	    if test $have_pthread_rwlock_init = yes; then
-		AC_MSG_WARN([Forced usage of pthread rwlocks. Note that this implementation may suffer from starvation issues.])
-	    else
-		AC_MSG_ERROR([User forced usage of pthread rwlock, but no such implementation was found])
-	    fi
-	fi
-
-	AC_CHECK_FUNC(pthread_attr_setguardsize, \
-			AC_DEFINE(ETHR_HAVE_PTHREAD_ATTR_SETGUARDSIZE, 1, \
-[Define if you have the pthread_attr_setguardsize function.]))
-
-	linux_futex=no
-	AC_MSG_CHECKING([for Linux futexes])
-	AC_TRY_LINK([
-			#include <sys/syscall.h>
-			#include <unistd.h>
-			#include <linux/futex.h>
-			#include <sys/time.h>
-		    ],
-		    [
-			int i = 1;
-			syscall(__NR_futex, (void *) &i, FUTEX_WAKE, 1,
-				(void*)0,(void*)0, 0);
-			syscall(__NR_futex, (void *) &i, FUTEX_WAIT, 0,
-				(void*)0,(void*)0, 0);
-			return 0;
-		    ],
-		    linux_futex=yes)
-	AC_MSG_RESULT([$linux_futex])
-	test $linux_futex = yes && AC_DEFINE(ETHR_HAVE_LINUX_FUTEX, 1, [Define if you have a linux futex implementation.])
-
-	AC_CHECK_SIZEOF(int)
-	AC_CHECK_SIZEOF(long)
-	AC_CHECK_SIZEOF(long long)
-	AC_CHECK_SIZEOF(__int128_t)
-
-	if test "$ac_cv_sizeof_int" = "4"; then
-	    int32="int"
-	elif test "$ac_cv_sizeof_long" = "4"; then
-	    int32="long"
-	elif test "$ac_cv_sizeof_long_long" = "4"; then
-	    int32="long long"
-	else
-	    AC_MSG_ERROR([No 32-bit type found])
-	fi
-
-	if test "$ac_cv_sizeof_int" = "8"; then
-	    int64="int"
-	elif test "$ac_cv_sizeof_long" = "8"; then
-	    int64="long"
-	elif test "$ac_cv_sizeof_long_long" = "8"; then
-	    int64="long long"
-	else
-	    AC_MSG_ERROR([No 64-bit type found])
-	fi
-
-	int128=no
-	if test "$ac_cv_sizeof___int128_t" = "16"; then
-	    int128="__int128_t"
-	fi
-
-	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32, 1, [Define if you have __sync_val_compare_and_swap() for 32-bit integers]))
-	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH32, 1, [Define if you have __sync_add_and_fetch() for 32-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND32, 1, [Define if you have __sync_fetch_and_and() for 32-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR32, 1, [Define if you have __sync_fetch_and_or() for 32-bit integers]))
-
-	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64, 1, [Define if you have __sync_val_compare_and_swap() for 64-bit integers]))
-	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH64, 1, [Define if you have __sync_add_and_fetch() for 64-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND64, 1, [Define if you have __sync_fetch_and_and() for 64-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR64, 1, [Define if you have __sync_fetch_and_or() for 64-bit integers]))
-
-	if test $int128 != no; then
-	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [128], [$int128], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP128, 1, [Define if you have __sync_val_compare_and_swap() for 128-bit integers]))
-	fi
-
-	AC_MSG_CHECKING([for a usable libatomic_ops implementation])
-	case "x$with_libatomic_ops" in
-	    xno | xyes | x)
-		libatomic_ops_include=
-		;;
-	    *)
-		if test -d "${with_libatomic_ops}/include"; then
-		    libatomic_ops_include="-I$with_libatomic_ops/include"
-		    CPPFLAGS="$CPPFLAGS $libatomic_ops_include"
-		else
-		    AC_MSG_ERROR([libatomic_ops include directory $with_libatomic_ops/include not found])
-		fi;;
-	esac
-	ethr_have_libatomic_ops=no
-	AC_TRY_LINK([#include "atomic_ops.h"],
-		    [
-			volatile AO_t x;
-			AO_t y;
-			int z;
-
-			AO_nop_full();
-			AO_store(&x, (AO_t) 0);
-			z = AO_load(&x);
-			z = AO_compare_and_swap_full(&x, (AO_t) 0, (AO_t) 1);
-		    ],
-		    [ethr_have_native_atomics=yes
-		     ethr_have_libatomic_ops=yes])
-	AC_MSG_RESULT([$ethr_have_libatomic_ops])
-	if test $ethr_have_libatomic_ops = yes; then
-	    AC_CHECK_SIZEOF(AO_t, ,
-			    [
-				#include <stdio.h>
-				#include "atomic_ops.h"
-			    ])
-	    AC_DEFINE_UNQUOTED(ETHR_SIZEOF_AO_T, $ac_cv_sizeof_AO_t, [Define to the size of AO_t if libatomic_ops is used])
-
-	    AC_DEFINE(ETHR_HAVE_LIBATOMIC_OPS, 1, [Define if you have libatomic_ops atomic operations])
-	    if test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
-		AC_DEFINE(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS, 1, [Define if you prefer libatomic_ops native ethread implementations])
-	    fi
-	    ETHR_DEFS="$ETHR_DEFS $libatomic_ops_include"
-	elif test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
-	    AC_MSG_ERROR([No usable libatomic_ops implementation found])
-	fi
-
-	case "$host_cpu" in
-	  sparc | sun4u | sparc64 | sun4v)
-		case "$with_sparc_memory_order" in
-		    "TSO")
-			AC_DEFINE(ETHR_SPARC_TSO, 1, [Define if only run in Sparc TSO mode]);;
-		    "PSO")
-			AC_DEFINE(ETHR_SPARC_PSO, 1, [Define if only run in Sparc PSO, or TSO mode]);;
-		    "RMO"|"")
-			AC_DEFINE(ETHR_SPARC_RMO, 1, [Define if run in Sparc RMO, PSO, or TSO mode]);;
-		    *)
-			AC_MSG_ERROR([Unsupported Sparc memory order: $with_sparc_memory_order]);;
-		esac
-		ethr_have_native_atomics=yes;; 
-	  i86pc | i*86 | x86_64 | amd64)
-		if test "$enable_x86_out_of_order" = "yes"; then
-			AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized])
-		fi
-		ethr_have_native_atomics=yes;;
-	  macppc | ppc | "Power Macintosh")
-		ethr_have_native_atomics=yes;;
-	  tile)
-		ethr_have_native_atomics=yes;;
-	  *)
-		;;
-	esac
-
-	test ethr_have_native_atomics = "yes" && ethr_have_native_spinlock=yes
-
-	dnl Restore LIBS
-	LIBS=$saved_libs
-	dnl restore CPPFLAGS
-	CPPFLAGS=$saved_cppflags
-
-	;;
-    *)
-	;;
-esac
-
-AC_MSG_CHECKING([whether default stack size should be modified])
-if test "x$ethr_modified_default_stack_size" != "x"; then
-	AC_DEFINE_UNQUOTED(ETHR_MODIFIED_DEFAULT_STACK_SIZE, $ethr_modified_default_stack_size, [Define if you want to modify the default stack size])
-	AC_MSG_RESULT([yes; to $ethr_modified_default_stack_size kilo words])
-else
-	AC_MSG_RESULT([no])
-fi
-
-if test "x$ETHR_THR_LIB_BASE" != "x"; then
-	ETHR_DEFS="-DUSE_THREADS $ETHR_DEFS"
-	ETHR_LIBS="-l$ethr_lib_name -lerts_internal_r $ETHR_X_LIBS"
-	ETHR_LIB_NAME=$ethr_lib_name
-fi
-
-AC_CHECK_SIZEOF(void *)
-AC_DEFINE_UNQUOTED(ETHR_SIZEOF_PTR, $ac_cv_sizeof_void_p, [Define to the size of pointers])
-
-AC_CHECK_SIZEOF(int)
-AC_DEFINE_UNQUOTED(ETHR_SIZEOF_INT, $ac_cv_sizeof_int, [Define to the size of int])
-AC_CHECK_SIZEOF(long)
-AC_DEFINE_UNQUOTED(ETHR_SIZEOF_LONG, $ac_cv_sizeof_long, [Define to the size of long])
-AC_CHECK_SIZEOF(long long)
-AC_DEFINE_UNQUOTED(ETHR_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long, [Define to the size of long long])
-AC_CHECK_SIZEOF(__int64)
-AC_DEFINE_UNQUOTED(ETHR_SIZEOF___INT64, $ac_cv_sizeof___int64, [Define to the size of __int64])
-AC_CHECK_SIZEOF(__int128_t)
-AC_DEFINE_UNQUOTED(ETHR_SIZEOF___INT128_T, $ac_cv_sizeof___int128_t, [Define to the size of __int128_t])
-
-
-case X$erl_xcomp_bigendian in
-    X) ;;
-    Xyes|Xno) ac_cv_c_bigendian=$erl_xcomp_bigendian;;
-    *) AC_MSG_ERROR([Bad erl_xcomp_bigendian value: $erl_xcomp_bigendian]);;
-esac
-
-AC_C_BIGENDIAN
-
-if test "$ac_cv_c_bigendian" = "yes"; then
-    AC_DEFINE(ETHR_BIGENDIAN, 1, [Define if bigendian])
-fi
-
-case X$erl_xcomp_double_middle_endian in
-    X) ;;
-    Xyes|Xno|Xunknown) ac_cv_c_double_middle_endian=$erl_xcomp_double_middle_endian;;
-    *) AC_MSG_ERROR([Bad erl_xcomp_double_middle_endian value: $erl_xcomp_double_middle_endian]);;
-esac
-
-AC_C_DOUBLE_MIDDLE_ENDIAN
-
-AC_ARG_ENABLE(native-ethr-impls,
-	      AS_HELP_STRING([--disable-native-ethr-impls],
-                             [disable native ethread implementations]),
-[ case "$enableval" in
-    no) disable_native_ethr_impls=yes ;;
-    *)  disable_native_ethr_impls=no ;;
-  esac ], disable_native_ethr_impls=no)
-
-AC_ARG_ENABLE(x86-out-of-order,
-	      AS_HELP_STRING([--enable-x86-out-of-order],
-                             [enable x86/x84_64 out of order support (default disabled)]))
-
-test "X$disable_native_ethr_impls" = "Xyes" &&
-  AC_DEFINE(ETHR_DISABLE_NATIVE_IMPLS, 1, [Define if you want to disable native ethread implementations])
-
-AC_ARG_ENABLE(prefer-gcc-native-ethr-impls,
-	      AS_HELP_STRING([--enable-prefer-gcc-native-ethr-impls],
-			     [prefer gcc native ethread implementations]),
-[ case "$enableval" in
-    yes) enable_prefer_gcc_native_ethr_impls=yes ;;
-    *)  enable_prefer_gcc_native_ethr_impls=no ;;
-  esac ], enable_prefer_gcc_native_ethr_impls=no)
-
-test $enable_prefer_gcc_native_ethr_impls = yes &&
-  AC_DEFINE(ETHR_PREFER_GCC_NATIVE_IMPLS, 1, [Define if you prefer gcc native ethread implementations])
-
-AC_ARG_WITH(libatomic_ops,
-	    AS_HELP_STRING([--with-libatomic_ops=PATH],
-			   [specify and prefer usage of libatomic_ops in the ethread library]))
-
-AC_ARG_WITH(with_sparc_memory_order,
-	    AS_HELP_STRING([--with-sparc-memory-order=TSO|PSO|RMO],
-			   [specify sparc memory order (defaults to RMO)]))
-
-ETHR_X86_SSE2_ASM=no
-case "$GCC-$ac_cv_sizeof_void_p-$host_cpu" in
-  yes-4-i86pc | yes-4-i*86 | yes-4-x86_64 | yes-4-amd64)
-    AC_MSG_CHECKING([for gcc sse2 asm support])
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -msse2"
-    gcc_sse2_asm=no
-    AC_TRY_COMPILE([],
-	[
-		long long x, *y;
-		__asm__ __volatile__("movq %1, %0\n\t" : "=x"(x) : "m"(*y) : "memory");
-	],
-	[gcc_sse2_asm=yes])
-    CFLAGS="$save_CFLAGS"
-    AC_MSG_RESULT([$gcc_sse2_asm])
-    if test "$gcc_sse2_asm" = "yes"; then
-      AC_DEFINE(ETHR_GCC_HAVE_SSE2_ASM_SUPPORT, 1, [Define if you use a gcc that supports -msse2 and understand sse2 specific asm statements])
-      ETHR_X86_SSE2_ASM=yes
-    fi
-    ;;
-  *)
-    ;;
-esac
-
-case "$GCC-$host_cpu" in
-  yes-i86pc | yes-i*86 | yes-x86_64 | yes-amd64)
-    gcc_dw_cmpxchg_asm=no
-    AC_MSG_CHECKING([for gcc double word cmpxchg asm support])    
-    AC_TRY_COMPILE([],
-	[
-    char xchgd;
-    long new[2], xchg[2], *p;		  
-    __asm__ __volatile__(
-#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
-	"pushl %%ebx\n\t"
-	"movl %8, %%ebx\n\t"
-#endif
-#if ETHR_SIZEOF_PTR == 4
-	"lock; cmpxchg8b %0\n\t"
-#else
-	"lock; cmpxchg16b %0\n\t"
-#endif
-	"setz %3\n\t"
-#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
-	"popl %%ebx\n\t"
-#endif
-	: "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd)
-	: "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "3"(new[1]),
-#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
-	  "r"(new[0])
-#else
-	  "b"(new[0])
-#endif
-	: "cc", "memory");
-
-	],
-	[gcc_dw_cmpxchg_asm=yes])
-    if test $gcc_dw_cmpxchg_asm = no && test $ac_cv_sizeof_void_p = 4; then
-      AC_TRY_COMPILE([],
-	  [
-      char xchgd;
-      long new[2], xchg[2], *p;
-#if !defined(__PIC__) || !__PIC__
-#  error nope
-#endif
-      __asm__ __volatile__(
-    	  "pushl %%ebx\n\t"
-	  "movl (%7), %%ebx\n\t"
-	  "movl 4(%7), %%ecx\n\t"
-	  "lock; cmpxchg8b %0\n\t"
-  	  "setz %3\n\t"
-	  "popl %%ebx\n\t"
-	  : "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd)
-	  : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "3"(new)
-	: "cc", "memory");
-
-	],
-	[gcc_dw_cmpxchg_asm=yes])
-      if test "$gcc_dw_cmpxchg_asm" = "yes"; then
-        AC_DEFINE(ETHR_CMPXCHG8B_REGISTER_SHORTAGE, 1, [Define if you get a register shortage with cmpxchg8b and position independent code])
-      fi
-    fi
-    AC_MSG_RESULT([$gcc_dw_cmpxchg_asm])
-    if test "$gcc_dw_cmpxchg_asm" = "yes"; then
-      AC_DEFINE(ETHR_GCC_HAVE_DW_CMPXCHG_ASM_SUPPORT, 1, [Define if you use a gcc that supports the double word cmpxchg instruction])
-    fi;;
-  *)
-    ;;
-esac
-
-AC_DEFINE(ETHR_HAVE_ETHREAD_DEFINES, 1, \
-[Define if you have all ethread defines])
-
-AC_SUBST(ETHR_X_LIBS)
-AC_SUBST(ETHR_LIBS)
-AC_SUBST(ETHR_LIB_NAME)
-AC_SUBST(ETHR_DEFS)
-AC_SUBST(ETHR_THR_LIB_BASE)
-AC_SUBST(ETHR_THR_LIB_BASE_DIR)
-AC_SUBST(ETHR_X86_SSE2_ASM)
-
-])
-
-
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl ERL_TIME_CORRECTION
-dnl
-dnl In the presence of a high resolution realtime timer Erlang can adapt
-dnl its view of time relative to this timer. On solaris such a timer is
-dnl available with the syscall gethrtime(). On other OS's a fallback
-dnl solution using times() is implemented. (However on e.g. FreeBSD times()
-dnl is implemented using gettimeofday so it doesn't make much sense to
-dnl use it there...) On second thought, it seems to be safer to do it the
-dnl other way around. I.e. only use times() on OS's where we know it will
-dnl work...
-dnl
-
-AC_DEFUN(ERL_TIME_CORRECTION,
-[if test x$ac_cv_func_gethrtime = x; then
-  AC_CHECK_FUNC(gethrtime)
-fi
-if test x$clock_gettime_correction = xunknown; then
-	AC_TRY_COMPILE([#include <time.h>],
-			[struct timespec ts;
-     			 long long result;
-			 clock_gettime(CLOCK_MONOTONIC,&ts);
-                         result = ((long long) ts.tv_sec) * 1000000000LL + 
-			 ((long long) ts.tv_nsec);],
-			clock_gettime_compiles=yes,
-			clock_gettime_compiles=no)
-else
-	clock_gettime_compiles=no
-fi
-			
-
-AC_CACHE_CHECK([how to correct for time adjustments], erl_cv_time_correction,
-[
-case $clock_gettime_correction in
-    yes)
-	erl_cv_time_correction=clock_gettime;;	
-    no|unknown)
-	case $ac_cv_func_gethrtime in
-  	    yes)
-    		erl_cv_time_correction=hrtime ;;
-  	    no)
-    		case $host_os in
-        	    linux*)
-			case $clock_gettime_correction in
-			    unknown)
-				if test x$clock_gettime_compiles = xyes; then
-				    if test X$cross_compiling != Xyes; then
-				    	linux_kernel_vsn_=`uname -r`
-				    	case $linux_kernel_vsn_ in
-					    [[0-1]].*|2.[[0-5]]|2.[[0-5]].*)
-					    	erl_cv_time_correction=times ;;
-					    *)
-					    	erl_cv_time_correction=clock_gettime;;
-				    	esac
-				    else
-					case X$erl_xcomp_linux_clock_gettime_correction in
-					    X)
-						erl_cv_time_correction=cross;;
-					    Xyes|Xno)
-						if test $erl_xcomp_linux_clock_gettime_correction = yes; then
-						    erl_cv_time_correction=clock_gettime
-						else
-					    	    erl_cv_time_correction=times
-						fi;;
-					    *)
-						AC_MSG_ERROR([Bad erl_xcomp_linux_clock_gettime_correction value: $erl_xcomp_linux_clock_gettime_correction]);;
-					esac
-				    fi
-				else
-				    erl_cv_time_correction=times
-				fi
-				;;
-			     *)				
-        			erl_cv_time_correction=times ;;
-			esac
-			;;
-            	    *)
-        		erl_cv_time_correction=none ;;
-    		esac
-    		;;
-	esac
-	;;
-esac
-])
-
-xrtlib=""
-case $erl_cv_time_correction in
-  times)
-    AC_DEFINE(CORRECT_USING_TIMES,[],
-	[Define if you do not have a high-res. timer & want to use times() instead])
-    ;;
-  clock_gettime|cross)
-    if test $erl_cv_time_correction = cross; then
-	erl_cv_time_correction=clock_gettime
-	AC_MSG_WARN([result clock_gettime guessed because of cross compilation])
-    fi
-    xrtlib="-lrt"
-    AC_DEFINE(GETHRTIME_WITH_CLOCK_GETTIME,[1],
-	[Define if you want to use clock_gettime to simulate gethrtime])
-    ;;
-esac
-dnl
-dnl Check if gethrvtime is working, and if to use procfs ioctl
-dnl or (yet to be written) write to the procfs ctl file.
-dnl
-
-AC_MSG_CHECKING([if gethrvtime works and how to use it])
-AC_TRY_RUN([
-/* gethrvtime procfs ioctl test */
-/* These need to be undef:ed to not break activation of
- * micro level process accounting on /proc/self 
- */
-#ifdef _LARGEFILE_SOURCE
-#  undef _LARGEFILE_SOURCE
-#endif
-#ifdef _FILE_OFFSET_BITS
-#  undef _FILE_OFFSET_BITS
-#endif
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/signal.h>
-#include <sys/fault.h>
-#include <sys/syscall.h>
-#include <sys/procfs.h>
-#include <fcntl.h>
-
-int main() {
-    long msacct = PR_MSACCT;
-    int fd;
-    long long start, stop;
-    int i;
-    pid_t pid = getpid();
-    char proc_self[30] = "/proc/";
-
-    sprintf(proc_self+strlen(proc_self), "%lu", (unsigned long) pid);
-    if ( (fd = open(proc_self, O_WRONLY)) == -1)
-	exit(1);
-    if (ioctl(fd, PIOCSET, &msacct) < 0)
-	exit(2);
-    if (close(fd) < 0)
-	exit(3);
-    start = gethrvtime();
-    for (i = 0; i < 100; i++)
-	stop = gethrvtime();
-    if (start == 0)
-	exit(4);
-    if (start == stop)
-	exit(5);
-    exit(0); return 0;
-}
-],
-erl_gethrvtime=procfs_ioctl,
-erl_gethrvtime=false,
-[
-case X$erl_xcomp_gethrvtime_procfs_ioctl in
-    X)
-	erl_gethrvtime=cross;;
-    Xyes|Xno)
-	if test $erl_xcomp_gethrvtime_procfs_ioctl = yes; then
-	    erl_gethrvtime=procfs_ioctl
-	else
-	    erl_gethrvtime=false
-	fi;;
-    *)
-	AC_MSG_ERROR([Bad erl_xcomp_gethrvtime_procfs_ioctl value: $erl_xcomp_gethrvtime_procfs_ioctl]);;
-esac
-])
-
-case $erl_gethrvtime in
-  procfs_ioctl)
-	AC_DEFINE(HAVE_GETHRVTIME_PROCFS_IOCTL,[1],
-		[define if gethrvtime() works and uses ioctl() to /proc/self])
-	AC_MSG_RESULT(uses ioctl to procfs)
-	;;
-  *)
-	if test $erl_gethrvtime = cross; then
-	    erl_gethrvtime=false
-	    AC_MSG_RESULT(cross)
-	    AC_MSG_WARN([result 'not working' guessed because of cross compilation])
-	else
-	    AC_MSG_RESULT(not working)
-	fi
-
-	dnl
-	dnl Check if clock_gettime (linux) is working
-	dnl
-
-	AC_MSG_CHECKING([if clock_gettime can be used to get process CPU time])
-	save_libs=$LIBS
-	LIBS="-lrt"
-	AC_TRY_RUN([
-	#include <stdlib.h>
-	#include <unistd.h>
-	#include <string.h>
-	#include <stdio.h>
-	#include <time.h>
-	int main() {
-	    long long start, stop;
-	    int i;
-	    struct timespec tp;
-
-	    if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &tp) < 0)
-	      exit(1);
-	    start = ((long long)tp.tv_sec * 1000000000LL) + (long long)tp.tv_nsec;
-	    for (i = 0; i < 100; i++)
-	      clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &tp);
-	    stop = ((long long)tp.tv_sec * 1000000000LL) + (long long)tp.tv_nsec;
-	    if (start == 0)
-	      exit(4);
-	    if (start == stop)
-	      exit(5);
-	    exit(0); return 0;
-	  }
-	],
-	erl_clock_gettime=yes,
-	erl_clock_gettime=no,
-	[
-	case X$erl_xcomp_clock_gettime_cpu_time in
-	    X) erl_clock_gettime=cross;;
-	    Xyes|Xno) erl_clock_gettime=$erl_xcomp_clock_gettime_cpu_time;;
-	    *) AC_MSG_ERROR([Bad erl_xcomp_clock_gettime_cpu_time value: $erl_xcomp_clock_gettime_cpu_time]);;
-	esac
-	])
-	LIBS=$save_libs
-	case $host_os in
-		linux*)
-			AC_MSG_RESULT([no; not stable])
-			LIBRT=$xrtlib
-			;;
-		*)
-			AC_MSG_RESULT($erl_clock_gettime)
-			case $erl_clock_gettime in
-	  			yes)
-					AC_DEFINE(HAVE_CLOCK_GETTIME,[],
-						  [define if clock_gettime() works for getting process time])
-					LIBRT=-lrt
-					;;
-	  			cross)
-					erl_clock_gettime=no
-					AC_MSG_WARN([result no guessed because of cross compilation])
-					LIBRT=$xrtlib
-					;;
-	  			*)
-					LIBRT=$xrtlib
-					;;
-			esac
-			;;
-	esac
-	AC_SUBST(LIBRT)
-	;;
-esac
-])dnl
-
-dnl ----------------------------------------------------------------------
-dnl
-dnl LM_TRY_ENABLE_CFLAG
-dnl
-dnl
-dnl Tries a CFLAG and sees if it can be enabled without compiler errors
-dnl $1: textual cflag to add
-dnl $2: variable to store the modified CFLAG in
-dnl Usage example LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
-dnl
-dnl
-AC_DEFUN([LM_TRY_ENABLE_CFLAG], [
-    AC_MSG_CHECKING([if we can add $1 to $2 (via CFLAGS)])
-    saved_CFLAGS=$CFLAGS;
-    CFLAGS="$1 $$2";
-    AC_TRY_COMPILE([],[return 0;],can_enable_flag=true,can_enable_flag=false)
-    CFLAGS=$saved_CFLAGS;
-    if test "X$can_enable_flag" = "Xtrue"; then
-        AC_MSG_RESULT([yes])
-        AS_VAR_SET($2, "$1 $$2")
-    else
-        AC_MSG_RESULT([no])
-    fi
-])
-
-dnl ERL_TRY_LINK_JAVA(CLASSES, FUNCTION-BODY
-dnl                   [ACTION_IF_FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Freely inspired by AC_TRY_LINK. (Maybe better to create a 
-dnl AC_LANG_JAVA instead...)
-AC_DEFUN(ERL_TRY_LINK_JAVA,
-[java_link='$JAVAC conftest.java 1>&AC_FD_CC'
-changequote(, )dnl
-cat > conftest.java <<EOF
-$1
-class conftest { public static void main(String[] args) {
-   $2
-   ; return; }}
-EOF
-changequote([, ])dnl
-if AC_TRY_EVAL(java_link) && test -s conftest.class; then
-   ifelse([$3], , :, [rm -rf conftest*
-   $3])
-else
-   echo "configure: failed program was:" 1>&AC_FD_CC
-   cat conftest.java 1>&AC_FD_CC
-   echo "configure: PATH was $PATH" 1>&AC_FD_CC
-ifelse([$4], , , [  rm -rf conftest*
-  $4
-])dnl
-fi
-rm -f conftest*])
-#define UNSAFE_MASK  0xc0000000 /* Mask for bits that must be constant */
-
-
diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in
index d511f2e240..0a8fbf513c 100644
--- a/lib/erl_interface/configure.in
+++ b/lib/erl_interface/configure.in
@@ -1,18 +1,19 @@
 #                                               -*- Autoconf -*-
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2000-2012. All Rights Reserved.
+# Copyright Ericsson AB 2000-2016. All Rights Reserved.
 #
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # %CopyrightEnd%
 #
@@ -99,7 +100,9 @@ AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(void *)
 AC_CHECK_SIZEOF(long long)
 
-if test $ac_cv_sizeof_void_p = 8; then
+dnl We set EI_64BIT mode when long is 8 bytes, this makes things
+dnl work on windows and unix correctly
+if test $ac_cv_sizeof_long = 8; then
   CFLAGS="$CFLAGS -DEI_64BIT"
 fi
 
@@ -250,7 +253,7 @@ case "$threads_disabled" in
 	        ;;
 	    win32_threads)
 		EI_THREADS="true"	
-		THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0500 -DWINVER=0x0500"
+		THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600"
 		;;
 	    pthread)	
 		EI_THREADS="true"
@@ -311,6 +314,26 @@ else
   fi
 fi
 
+dnl ----------------------------------------------------------------------
+dnl Enable -fsanitize= flags.
+dnl ----------------------------------------------------------------------
+
+m4_define(DEFAULT_SANITIZERS, [address,undefined])
+AC_ARG_ENABLE(
+    sanitizers,
+    AS_HELP_STRING(
+        [--enable-sanitizers@<:@=comma-separated list of sanitizers@:>@],
+	    [Default=DEFAULT_SANITIZERS]),
+[
+case "$enableval" in
+    no) sanitizers= ;;
+    yes) sanitizers="-fsanitize=DEFAULT_SANITIZERS" ;;
+    *) sanitizers="-fsanitize=$enableval" ;;
+esac
+CFLAGS="$CFLAGS $sanitizers"
+LDFLAGS="$LDFLAGS $sanitizers"
+])
+
 # ---------------------------------------------------------------------------
 # XXX
 # ---------------------------------------------------------------------------
diff --git a/lib/erl_interface/doc/src/Makefile b/lib/erl_interface/doc/src/Makefile
index b8e638ed24..204a6051b2 100644
--- a/lib/erl_interface/doc/src/Makefile
+++ b/lib/erl_interface/doc/src/Makefile
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1998-2012. All Rights Reserved.
+# Copyright Ericsson AB 1998-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/doc/src/book.xml b/lib/erl_interface/doc/src/book.xml
index e911b6aa2b..c9194d96ff 100644
--- a/lib/erl_interface/doc/src/book.xml
+++ b/lib/erl_interface/doc/src/book.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml
index 6c340378d4..1177954eb9 100644
--- a/lib/erl_interface/doc/src/ei.xml
+++ b/lib/erl_interface/doc/src/ei.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>2001</year><year>2013</year>
+      <year>2001</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
 
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
@@ -202,6 +203,9 @@ typedef enum {
       <desc>
         <p>Encodes a double-precision (64 bit) floating point number in
           the binary format.</p>
+      <p>
+          The function returns <c><![CDATA[-1]]></c> if the floating point number is not finite.
+      </p>
       </desc>
     </func>
     <func>
@@ -260,9 +264,9 @@ typedef enum {
       <fsummary>Encode an atom</fsummary>
       <desc>
         <p>Encodes an atom in the binary format with character encoding
-	<c><seealso marker="#erlang_char_encoding">to_enc</seealso></c> (latin1 or utf8).
+	<seealso marker="#erlang_char_encoding"><c>to_enc</c></seealso> (latin1 or utf8).
 	The <c>p</c> parameter is the name of the atom with character encoding
-	<c><seealso marker="#erlang_char_encoding">from_enc</seealso></c>  (ascii, latin1 or utf8).
+	<seealso marker="#erlang_char_encoding"><c>from_enc</c></seealso>  (ascii, latin1 or utf8).
 	The name must either be zero-terminated or a function variant with a <c>len</c>
 	parameter must be used. If <c>to_enc</c> is set to the bitwise-or'd combination
 	<c>(ERLANG_LATIN1|ERLANG_UTF8)</c>, utf8 encoding is only used if the atom string
@@ -417,6 +421,26 @@ ei_x_encode_empty_list(&amp;x);
       </desc>
     </func>
     <func>
+      <name><ret>int</ret><nametext>ei_encode_map_header(char *buf, int *index, int arity)</nametext></name>
+      <name><ret>int</ret><nametext>ei_x_encode_map_header(ei_x_buff* x, int arity)</nametext></name>
+      <fsummary>Encode a map</fsummary>
+      <desc>
+        <p>This function encodes a map header, with a specified arity. The next
+	   <c>arity*2</c> terms encoded will be the keys and values of the map
+	   encoded in the following order: <c>K1, V1, K2, V2, ..., Kn, Vn</c>.
+	</p>
+        <p>E.g. to encode the map <c>#{a => "Apple", b => "Banana"}</c>:</p>
+        <pre>
+ei_x_encode_map_header(&amp;x, 2);
+ei_x_encode_atom(&amp;x, "a");
+ei_x_encode_string(&amp;x, "Apple");
+ei_x_encode_atom(&amp;x, "b");
+ei_x_encode_string(&amp;x, "Banana");
+        </pre>
+	<p>A correctly encoded map can not have duplicate keys.</p>
+      </desc>
+    </func>
+    <func>
       <name><ret>int</ret><nametext>ei_get_type(const char *buf, const int *index, int *type, int *size)</nametext></name>
       <fsummary>Fetch the type and size of an encoded term</fsummary>
       <desc>
@@ -545,8 +569,8 @@ ei_x_encode_empty_list(&amp;x);
         <p>This function decodes an atom from the binary format. The
 	null terminated name of the atom is placed in buffer at <c>p</c> of length
 	<c>plen</c> bytes.</p>
-	<p>The wanted string encoding is specified by <c><seealso marker="#erlang_char_encoding">
-	want</seealso></c>. The original encoding used in the
+	<p>The wanted string encoding is specified by <seealso marker="#erlang_char_encoding">
+	<c>want</c></seealso>. The original encoding used in the
 	binary format (latin1 or utf8) can be obtained from <c>*was</c>. The actual encoding of the resulting string
 	(7-bit ascii, latin1 or utf8) can be obtained from <c>*result</c>. Both <c>was</c> and <c>result</c> can be <c>NULL</c>.
 	
@@ -638,6 +662,18 @@ ei_x_encode_empty_list(&amp;x);
       </desc>
     </func>
     <func>
+      <name><ret>int</ret><nametext>ei_decode_map_header(const char *buf, int *index, int *arity)</nametext></name>
+      <fsummary>Decode a map</fsummary>
+      <desc>
+        <p>This function decodes a map header from the binary
+          format. The number of key-value pairs is returned in
+          <c>*arity</c>. Keys and values follow in the following order:
+	  <c>K1, V1, K2, V2, ..., Kn, Vn</c>. This makes a total of
+	  <c>arity*2</c> terms. If <c>arity</c> is zero, it's an empty map.
+	  A correctly encoded map does not have duplicate keys.</p>
+      </desc>
+    </func>
+    <func>
       <name><ret>int</ret><nametext>ei_decode_ei_term(const char* buf, int* index, ei_term* term)</nametext></name>
       <fsummary>Decode a term, without prior knowledge of type</fsummary>
       <desc>
diff --git a/lib/erl_interface/doc/src/ei_connect.xml b/lib/erl_interface/doc/src/ei_connect.xml
index f562615ddd..516357b6a3 100644
--- a/lib/erl_interface/doc/src/ei_connect.xml
+++ b/lib/erl_interface/doc/src/ei_connect.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>2001</year><year>2010</year>
+      <year>2001</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/ei_users_guide.xml b/lib/erl_interface/doc/src/ei_users_guide.xml
index 5d18e356cb..4b9809aee4 100644
--- a/lib/erl_interface/doc/src/ei_users_guide.xml
+++ b/lib/erl_interface/doc/src/ei_users_guide.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/erl_call.xml b/lib/erl_interface/doc/src/erl_call.xml
index c597e11481..46015621ac 100644
--- a/lib/erl_interface/doc/src/erl_call.xml
+++ b/lib/erl_interface/doc/src/erl_call.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE comref SYSTEM "comref.dtd">
 
 <comref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
 
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
@@ -177,7 +178,7 @@ erl_call -s -a 'erlang halt' -n madonna
     <code type="none"><![CDATA[
 erl_call -s -a 'lists map [{math,sqrt},[1,4,9,16,25]]' -n madonna
     ]]></code>
-    <p>Evaluates a couple of expressions. <b>The input ends with EOF (Control-D)</b>.</p>
+    <p>Evaluates a couple of expressions. <em>The input ends with EOF (Control-D)</em>.</p>
     <code type="none"><![CDATA[
 erl_call -s -e -n madonna
 statistics(runtime),
@@ -188,7 +189,7 @@ Y=2,
 ^D
 {ok,{3,0}}
     ]]></code>
-    <p>Compiles a module and runs it. <b>Again, the input ends with EOF (Control-D)</b>. (In the example shown, the output has been formatted afterwards).</p>
+    <p>Compiles a module and runs it. <em>Again, the input ends with EOF (Control-D)</em>. (In the example shown, the output has been formatted afterwards).</p>
     <code type="none"><![CDATA[
 erl_call -s -m -a lolita -n madonna
 -module(lolita).
diff --git a/lib/erl_interface/doc/src/erl_connect.xml b/lib/erl_interface/doc/src/erl_connect.xml
index bd5e637244..0fad98cd17 100644
--- a/lib/erl_interface/doc/src/erl_connect.xml
+++ b/lib/erl_interface/doc/src/erl_connect.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/erl_error.xml b/lib/erl_interface/doc/src/erl_error.xml
index 4a3f34fac7..abe84780e1 100644
--- a/lib/erl_interface/doc/src/erl_error.xml
+++ b/lib/erl_interface/doc/src/erl_error.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/erl_eterm.xml b/lib/erl_interface/doc/src/erl_eterm.xml
index a7921ea9d2..800f8a3207 100644
--- a/lib/erl_interface/doc/src/erl_eterm.xml
+++ b/lib/erl_interface/doc/src/erl_eterm.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2013</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
@@ -77,10 +78,12 @@
       </p>
     <taglist>
       <tag><c><![CDATA[char *ERL_ATOM_PTR(t)]]></c></tag>
+      <item/>
       <tag><c><![CDATA[char *ERL_ATOM_PTR_UTF8(t)]]></c></tag>
       <item>A string representing atom <c><![CDATA[t]]></c>.
       </item>
       <tag><c><![CDATA[int ERL_ATOM_SIZE(t)]]></c></tag>
+      <item/>
       <tag><c><![CDATA[int ERL_ATOM_SIZE_UTF8(t)]]></c></tag>
       <item>The length (in bytes) of atom t.</item>
       <tag><c><![CDATA[void *ERL_BIN_PTR(t)]]></c></tag>
@@ -94,6 +97,7 @@
       <tag><c><![CDATA[double ERL_FLOAT_VALUE(t)]]></c></tag>
       <item>The floating point value of <c><![CDATA[t]]></c>.</item>
       <tag><c><![CDATA[ETERM *ERL_PID_NODE(t)]]></c></tag>
+      <item/>
       <tag><c><![CDATA[ETERM *ERL_PID_NODE_UTF8(t)]]></c></tag>
       <item>The Node in pid <c><![CDATA[t]]></c>.</item>
       <tag><c><![CDATA[int ERL_PID_NUMBER(t)]]></c></tag>
@@ -107,6 +111,7 @@
       <tag><c><![CDATA[int ERL_PORT_CREATION(t)]]></c></tag>
       <item>The creation number in port <c><![CDATA[t]]></c>.</item>
       <tag><c><![CDATA[ETERM *ERL_PORT_NODE(t)]]></c></tag>
+      <item/>
       <tag><c><![CDATA[ETERM *ERL_PORT_NODE_UTF8(t)]]></c></tag>
       <item>The node in port <c><![CDATA[t]]></c>.</item>
       <tag><c><![CDATA[int ERL_REF_NUMBER(t)]]></c></tag>
@@ -371,9 +376,11 @@ iohead ::= Binary
         <p><c><![CDATA[f]]></c> is a value to be converted to an Erlang float.</p>
         <p></p>
         <p>The function returns an Erlang float object with the value
-          specified in <c><![CDATA[f]]></c>.</p>
+            specified in <c><![CDATA[f]]></c> or <c><![CDATA[NULL]]></c> if
+            <c><![CDATA[f]]></c> is not finite.
+        </p>
         <p><c><![CDATA[ERL_FLOAT_VALUE(t)]]></c> can be used to retrieve the
-          value from an Erlang float.</p>
+            value from an Erlang float.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/erl_interface/doc/src/erl_format.xml b/lib/erl_interface/doc/src/erl_format.xml
index f036b12879..6e3ac4f0c9 100644
--- a/lib/erl_interface/doc/src/erl_format.xml
+++ b/lib/erl_interface/doc/src/erl_format.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/erl_global.xml b/lib/erl_interface/doc/src/erl_global.xml
index 8f9a354b4f..d6bfffc69d 100644
--- a/lib/erl_interface/doc/src/erl_global.xml
+++ b/lib/erl_interface/doc/src/erl_global.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/erl_interface.xml b/lib/erl_interface/doc/src/erl_interface.xml
index 850a4127f4..a9d421bbeb 100644
--- a/lib/erl_interface/doc/src/erl_interface.xml
+++ b/lib/erl_interface/doc/src/erl_interface.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/erl_malloc.xml b/lib/erl_interface/doc/src/erl_malloc.xml
index 8c8750d62a..799c903b1a 100644
--- a/lib/erl_interface/doc/src/erl_malloc.xml
+++ b/lib/erl_interface/doc/src/erl_malloc.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/erl_marshal.xml b/lib/erl_interface/doc/src/erl_marshal.xml
index a7eaf78f35..7c56089016 100644
--- a/lib/erl_interface/doc/src/erl_marshal.xml
+++ b/lib/erl_interface/doc/src/erl_marshal.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/fascicules.xml b/lib/erl_interface/doc/src/fascicules.xml
index 3d6219a2bd..f7edd8a973 100644
--- a/lib/erl_interface/doc/src/fascicules.xml
+++ b/lib/erl_interface/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 2fdc839c7b..a69c5aac11 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2013</year>
+      <year>2004</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     </legalnotice>
 
@@ -30,6 +31,260 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix decoding of LLONG_MIN in erl_decode</p>
+          <p>
+	    Own Id: OTP-13666 Aux Id: ERL-158 </p>
+        </item>
+        <item>
+          <p>
+	    On windows <c>ei_decode_ulong</c> and
+	    <c>ei_decode_long</c> now correctly returns an error when
+	    trying to decode a number that does not fit in a long.
+	    Fixed a bug on windows where enabling ei tracing would
+	    cause a segmentation fault.</p>
+          <p>
+	    Own Id: OTP-13673</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Handle terms (pids,ports and refs) from nodes with a
+	    'creation' value larger than 3. This is a preparation of
+	    the distribution protocol to allow OTP 19 nodes to
+	    correctly communicate with future nodes (20 or higher).
+	    The 'creation' value differentiates different
+	    incarnations of the same node (name).</p>
+          <p>
+	    Own Id: OTP-13488</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.8.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix Erl_Interface build error on Debian/Hurd and
+	    Debian/kFreeBSD. (Thanks to Sergei Golovan)</p>
+          <p>
+	    Own Id: OTP-13328</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    EPMD supports both IPv4 and IPv6</p>
+          <p>
+	    Also affects oldest supported windows version.</p>
+          <p>
+	    Own Id: OTP-13364</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.8.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fix the conditional selection of gethostbyname_r and
+	    gethostbyaddr_r.</p>
+          <p>
+	    Own Id: OTP-13188</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Do not accept Nan and Infinity values</p>
+          <p>
+	    Erlang does not accept these values, so we return an
+	    error in the C interface rather than letting them through
+	    to the Erlang VM, which rejects the message with a
+	    somewhat cryptic "bad external term".</p>
+          <p>
+	    Own Id: OTP-12801</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.7.20</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Use C99 function isfinite() instead of finite() when
+	    available on non GCC compilers.</p>
+          <p>
+	    Own Id: OTP-12268</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Distribute <c>autoconf</c> helpers to applications at
+	    build time instead of having multiple identical copies
+	    committed in the repository.</p>
+          <p>
+	    Own Id: OTP-12348</p>
+        </item>
+        <item>
+          <p>
+	    Added an .appup file for the application.</p>
+          <p>
+	    Own Id: OTP-12358 Aux Id: OTP-12178 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.7.19</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Added a <c>.app</c> file for the application.</p>
+          <p>
+	    Own Id: OTP-12178</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.7.18</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Implement --enable-sanitizers[=sanitizers]. Similar to
+	    debugging with Valgrind, it's very useful to enable
+	    -fsanitize= switches to catch bugs at runtime.</p>
+          <p>
+	    Own Id: OTP-12153</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.7.17</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Now works with Visual Studio.</p>
+          <p>
+	    Own Id: OTP-11984</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.7.16</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix memcheck warning in gen_challange (Thanks to Olivier
+	    Girondel)</p>
+          <p>
+	    Own Id: OTP-11608</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.7.15</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Silence warnings (Thanks to Anthony Ramine)</p>
+          <p>
+	    Own Id: OTP-11517</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.7.14</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Introduced functionality for inspection of system and
+	    build configuration.</p>
+          <p>
+	    Own Id: OTP-11196</p>
+        </item>
+        <item>
+          <p>
+	    Header and library files from ic and erl_interface are
+	    now installed into usr/{include,lib}. Note that these
+	    directories are unversioned, so the latest installed
+	    version will be the one in the directory.</p>
+          <p>
+	    Own Id: OTP-11284</p>
+        </item>
+        <item>
+          <p>
+	    Fix location of true binary under Mac OSX. Thanks to
+	    Simon Cornish.</p>
+          <p>
+	    Own Id: OTP-11289</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.7.13</title>
 
     <section><title>Improvements and New Features</title>
@@ -262,7 +517,7 @@
         <item>
           <p>
 	    Initialize <c>to</c> and <c>to_name</c> in
-	    <c>erl_receive_msg</c>. (Thanks to G�ran Larsson)</p>
+	    <c>erl_receive_msg</c>. (Thanks to Göran Larsson)</p>
           <p>
 	    Own Id: OTP-9241</p>
         </item>
diff --git a/lib/erl_interface/doc/src/notes_history.xml b/lib/erl_interface/doc/src/notes_history.xml
index f484f3c04e..c8cdc8832d 100644
--- a/lib/erl_interface/doc/src/notes_history.xml
+++ b/lib/erl_interface/doc/src/notes_history.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/part.xml b/lib/erl_interface/doc/src/part.xml
index e38b9164b8..d044e2b981 100644
--- a/lib/erl_interface/doc/src/part.xml
+++ b/lib/erl_interface/doc/src/part.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/part_erl_interface.xml b/lib/erl_interface/doc/src/part_erl_interface.xml
index c69cc85c63..2abe7ecd60 100644
--- a/lib/erl_interface/doc/src/part_erl_interface.xml
+++ b/lib/erl_interface/doc/src/part_erl_interface.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/part_notes.xml b/lib/erl_interface/doc/src/part_notes.xml
index 14c1de1d6e..facdf821ee 100644
--- a/lib/erl_interface/doc/src/part_notes.xml
+++ b/lib/erl_interface/doc/src/part_notes.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/part_notes_history.xml b/lib/erl_interface/doc/src/part_notes_history.xml
index 612b4a9e1e..401fea4dd4 100644
--- a/lib/erl_interface/doc/src/part_notes_history.xml
+++ b/lib/erl_interface/doc/src/part_notes_history.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/ref_man.xml b/lib/erl_interface/doc/src/ref_man.xml
index 9ae4cf27f5..0cf060829b 100644
--- a/lib/erl_interface/doc/src/ref_man.xml
+++ b/lib/erl_interface/doc/src/ref_man.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
     <title>Erl_Interface Command Reference</title>
diff --git a/lib/erl_interface/doc/src/ref_man_ei.xml b/lib/erl_interface/doc/src/ref_man_ei.xml
index ff161f9e7f..d24828c394 100644
--- a/lib/erl_interface/doc/src/ref_man_ei.xml
+++ b/lib/erl_interface/doc/src/ref_man_ei.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/ref_man_erl_interface.xml b/lib/erl_interface/doc/src/ref_man_erl_interface.xml
index 7ffa0cfb23..fb39c5a7e4 100644
--- a/lib/erl_interface/doc/src/ref_man_erl_interface.xml
+++ b/lib/erl_interface/doc/src/ref_man_erl_interface.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/doc/src/registry.xml b/lib/erl_interface/doc/src/registry.xml
index 8aeb378d95..285a2402b8 100644
--- a/lib/erl_interface/doc/src/registry.xml
+++ b/lib/erl_interface/doc/src/registry.xml
@@ -1,23 +1,24 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-      The contents of this file are subject to the Erlang Public License,
-      Version 1.1, (the "License"); you may not use this file except in
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     </legalnotice>
 
diff --git a/lib/erl_interface/ebin/.gitignore b/lib/erl_interface/ebin/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/lib/erl_interface/ebin/.gitignore
diff --git a/lib/erl_interface/include/ei.h b/lib/erl_interface/include/ei.h
index 9b83385a46..948f89be85 100644
--- a/lib/erl_interface/include/ei.h
+++ b/lib/erl_interface/include/ei.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
@@ -39,7 +40,7 @@
 #include <stdio.h>		/* Need type FILE */
 #include <errno.h>		/* Need EHOSTUNREACH, ENOMEM, ... */
 
-#if !defined(__WIN32__) && !defined(VXWORKS) || (defined(VXWORKS) && defined(HAVE_SENS))
+#if !(defined(__WIN32__) || defined(_WIN32)) && !defined(VXWORKS) || (defined(VXWORKS) && defined(HAVE_SENS))
 # include <netdb.h>
 #endif
 
@@ -120,8 +121,11 @@
 #define ERL_SMALL_ATOM_UTF8_EXT 'w'
 #define ERL_REFERENCE_EXT     'e'
 #define ERL_NEW_REFERENCE_EXT 'r'
+#define ERL_NEWER_REFERENCE_EXT 'Z'
 #define ERL_PORT_EXT          'f'
+#define ERL_NEW_PORT_EXT      'Y'
 #define ERL_PID_EXT           'g'
+#define ERL_NEW_PID_EXT       'X'
 #define ERL_SMALL_TUPLE_EXT   'h'
 #define ERL_LARGE_TUPLE_EXT   'i'
 #define ERL_NIL_EXT           'j'
@@ -131,6 +135,7 @@
 #define ERL_SMALL_BIG_EXT     'n'
 #define ERL_LARGE_BIG_EXT     'o'
 #define ERL_NEW_FUN_EXT	      'p'
+#define ERL_MAP_EXT           't'
 #define ERL_FUN_EXT	      'u'
  
 #define ERL_NEW_CACHE         'N' /* c nodes don't know these two */
@@ -467,6 +472,8 @@ int ei_encode_list_header(char *buf, int *index, int arity);
 int ei_x_encode_list_header(ei_x_buff* x, long n);
 #define ei_encode_empty_list(buf,i) ei_encode_list_header(buf,i,0)
 int ei_x_encode_empty_list(ei_x_buff* x);
+int ei_encode_map_header(char *buf, int *index, int arity);
+int ei_x_encode_map_header(ei_x_buff* x, long n);
 
 /* 
  * ei_get_type() returns the type and "size" of the item at
@@ -507,6 +514,7 @@ int ei_decode_term(const char *buf, int *index, void *t); /* ETERM** actually */
 int ei_decode_trace(const char *buf, int *index, erlang_trace *p);
 int ei_decode_tuple_header(const char *buf, int *index, int *arity);
 int ei_decode_list_header(const char *buf, int *index, int *arity);
+int ei_decode_map_header(const char *buf, int *index, int *arity);
 
 /* 
  * ei_decode_ei_term() returns 1 if term is decoded, 0 if term is OK,
diff --git a/lib/erl_interface/include/ei_connect.h b/lib/erl_interface/include/ei_connect.h
index 02880e197c..825fee0165 100644
--- a/lib/erl_interface/include/ei_connect.h
+++ b/lib/erl_interface/include/ei_connect.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2003-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2003-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/include/eicode.h b/lib/erl_interface/include/eicode.h
index c35489e890..efba630d13 100644
--- a/lib/erl_interface/include/eicode.h
+++ b/lib/erl_interface/include/eicode.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2003-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2003-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/include/erl_interface.h b/lib/erl_interface/include/erl_interface.h
index 7f44cb83bd..c22f21af2b 100644
--- a/lib/erl_interface/include/erl_interface.h
+++ b/lib/erl_interface/include/erl_interface.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -210,14 +211,14 @@ typedef struct {
   Erl_Atom_data node;
   unsigned int number;
   unsigned int serial;
-  unsigned char creation;
+  unsigned int creation;
 } Erl_Pid;
 
 typedef struct {    
   Erl_Header h;
   Erl_Atom_data node;
   unsigned int number;
-  unsigned char creation;
+  unsigned int creation;
 } Erl_Port;
 
 typedef struct {
@@ -225,7 +226,7 @@ typedef struct {
   Erl_Atom_data node;
   int len;
   unsigned int n[3];
-  unsigned char creation;
+  unsigned int creation;
 } Erl_Ref;
 
 typedef struct {
diff --git a/lib/erl_interface/src/Makefile b/lib/erl_interface/src/Makefile
index a069aa07ab..31f34d4bba 100644
--- a/lib/erl_interface/src/Makefile
+++ b/lib/erl_interface/src/Makefile
@@ -1,18 +1,19 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2013. All Rights Reserved.
+# Copyright Ericsson AB 1996-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 # 
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
index ebacc1cee0..4f393e952c 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2012. All Rights Reserved.
+# Copyright Ericsson AB 1997-2016. All Rights Reserved.
 #
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # %CopyrightEnd%
 #
@@ -40,6 +41,16 @@ include $(TARGET)/eidefs.mk
 
 include $(ERL_TOP)/make/output.mk
 
+EBINDIR=../ebin
+
+APP_FILE= erl_interface.app
+APP_SRC= $(APP_FILE).src
+APP_TARGET= $(EBINDIR)/$(APP_FILE)
+
+APPUP_FILE= erl_interface.appup
+APPUP_SRC= $(APPUP_FILE).src
+APPUP_TARGET= $(EBINDIR)/$(APPUP_FILE)
+
 USING_MINGW=@MIXED_CYGWIN_MINGW@
 USING_MSYS_VC==@MIXED_MSYS_VC@
 USING_CYGWIN_VC==@MIXED_MSYS_VC@
@@ -115,11 +126,7 @@ else
 WARNFLAGS = @WFLAGS@
 endif
 
-ifneq ($(findstring ose,$(TARGET)),ose)
 CFLAGS = @LIB_CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS)
-else
-CFLAGS = @CFLAGS@ $(INCFLAGS)
-endif
 PROG_CFLAGS = @CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS) -Ilegacy
 
 ifeq ($(findstring vxworks,$(TARGET)),vxworks)
@@ -199,12 +206,8 @@ MDD_ERLLIB = $(OBJDIR)/$(LIBPRE)erl_interface_mdd$(LIBEXT)
 #  Specify targets to build
 ###########################################################################
 
-ifneq ($(findstring ose,$(TARGET)),ose)
 EXE_TARGETS = \
 	$(ERL_CALL)
-else
-EXE_TARGETS = 
-endif
 
 ifeq ($(USING_VC),yes)
 
@@ -212,7 +215,9 @@ ifeq ($(USING_VC),yes)
 
 TARGETS = \
 	$(OBJ_TARGETS) \
-	$(EXE_TARGETS)
+	$(EXE_TARGETS) \
+	$(APP_TARGET)  \
+	$(APPUP_TARGET)
 
 OBJ_TARGETS = \
 	$(MT_EILIB) \
@@ -241,7 +246,9 @@ else
 ifeq ($USING_MINGW,yes)
 TARGETS = \
 	$(OBJ_TARGETS) \
-	$(EXE_TARGETS)
+	$(EXE_TARGETS) \
+	$(APP_TARGET)  \
+	$(APPUP_TARGET)
 
 OBJ_TARGETS = \
 	$(MD_EILIB) \
@@ -259,7 +266,9 @@ ifdef THR_DEFS
 
 TARGETS = \
 	$(OBJ_TARGETS) \
-	$(EXE_TARGETS)
+	$(EXE_TARGETS) \
+	$(APP_TARGET)  \
+	$(APPUP_TARGET)
 
 OBJ_TARGETS = \
 	$(ST_EILIB) \
@@ -281,7 +290,9 @@ else
 
 TARGETS = \
 	$(OBJ_TARGETS) \
-	$(EXE_TARGETS)
+	$(EXE_TARGETS) \
+	$(APP_TARGET)  \
+	$(APPUP_TARGET)
 
 OBJ_TARGETS = \
 	$(ST_EILIB) \
@@ -461,44 +472,6 @@ ERLSOURCES = \
 
 SOURCES = $(EISOURCES) $(ERLSOURCES)
 
-OSE_EISOURCES =  \
-	$(DECODESRC) \
-	$(ENCODESRC) \
-	misc/ei_decode_term.c \
-	misc/ei_format.c \
-	misc/ei_locking.c \
-	misc/ei_malloc.c \
-	misc/ei_printterm.c \
-	misc/ei_pthreads.c \
-	misc/ei_trace.c \
-	misc/ei_x_encode.c \
-	misc/eimd5.c \
-	misc/get_type.c \
-	misc/show_msg.c \
-	misc/ei_compat.c \
-	registry/hash_dohash.c \
-	registry/hash_foreach.c \
-	registry/hash_freetab.c \
-	registry/hash_insert.c \
-	registry/hash_isprime.c \
-	registry/hash_lookup.c \
-	registry/hash_newtab.c \
-	registry/hash_remove.c \
-	registry/hash_resize.c \
-	registry/hash_rlookup.c
-
-OSE_ERLSOURCES = \
-	legacy/decode_term.c \
-	legacy/encode_term.c \
-	legacy/erl_error.c \
-	legacy/erl_eterm.c \
-	legacy/erl_fix_alloc.c \
-	legacy/erl_format.c \
-	legacy/erl_malloc.c \
-	legacy/erl_marshal.c
-
-OSE_SOURCES = $(OSE_EISOURCES) $(OSE_ERLSOURCES)
-
 NEVERUSED = \
 	whereis.c \
 	ei_send.c \
@@ -513,13 +486,8 @@ ERLCALL = \
 # Note that encode/decode_term.c defines ei functions that is
 # located in the erl_interface library, not ei library.
 
-ifneq ($(findstring ose,$(TARGET)),ose)
 ST_EIOBJECTS  = $(addprefix $(ST_OBJDIR)/,$(notdir $(EISOURCES:.c=.o)))
 ST_ERLOBJECTS = $(addprefix $(ST_OBJDIR)/,$(notdir $(ERLSOURCES:.c=.o)))
-else
-ST_EIOBJECTS  = $(addprefix $(ST_OBJDIR)/,$(notdir $(OSE_EISOURCES:.c=.o)))
-ST_ERLOBJECTS = $(addprefix $(ST_OBJDIR)/,$(notdir $(OSE_ERLSOURCES:.c=.o)))
-endif
 MT_EIOBJECTS  = $(addprefix $(MT_OBJDIR)/,$(notdir $(EISOURCES:.c=.o)))
 MT_ERLOBJECTS = $(addprefix $(MT_OBJDIR)/,$(notdir $(ERLSOURCES:.c=.o)))
 MD_EIOBJECTS  = $(addprefix $(MD_OBJDIR)/,$(notdir $(EISOURCES:.c=.o)))
@@ -547,6 +515,8 @@ clean:
 	rm -f $(MDD_EIOBJECTS) $(MDD_ERLOBJECTS) $(MDD_EILIB) $(MDD_ERLLIB)
 	rm -f $(ERL_CALL)
 	rm -f $(FAKE_TARGETS)
+	rm -f $(APP_TARGET)
+	rm -f $(APPUP_TARGET)
 
 distclean: clean
 	rm -f config.h config.log config.status configure
@@ -566,14 +536,6 @@ $(TARGET)/config.h:
 	$(V_at)echo "#define HAVE_SOCKLEN_T 1" >> $@
 endif
 
-ifeq ($(findstring ose,$(TARGET)),ose)
-$(TARGET)/config.h:
-	$(gen_verbose)
-	$(V_at)echo "/* Generated by Makefile */" > $@
-	$(V_at)echo "#define HAVE_STRERROR 1" >> $@
-	$(V_at)echo "#define HAVE_SOCKLEN_T 1" >> $@
-endif
-
 ###########################################################################
 #  Default rules, normal and threaded
 ###########################################################################
@@ -597,12 +559,17 @@ $(MDD_OBJDIR)/%.o: %.c
 #  Create directories
 ###########################################################################
 
-_create_dirs := $(shell mkdir -p $(BINDIR) $(OBJDIR) $(ST_OBJDIR) $(MT_OBJDIR) $(MD_OBJDIR) $(MDD_OBJDIR))
+_create_dirs := $(shell mkdir -p $(EBINDIR) $(BINDIR) $(OBJDIR) $(ST_OBJDIR) $(MT_OBJDIR) $(MD_OBJDIR) $(MDD_OBJDIR))
 
 ###########################################################################
 #  Special rules
 ###########################################################################
 
+$(APP_TARGET): $(APP_SRC) ../vsn.mk
+	$(vsn_verbose)sed -e 's;%VSN%;$(ERL_INTERFACE_VSN);' $< > $@
+$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+	$(vsn_verbose)sed -e 's;%VSN%;$(ERL_INTERFACE_VSN);' $< > $@
+
 ifeq ($(TARGET),win32)
 
 # Windows archive creation
@@ -693,9 +660,6 @@ $(ST_OBJDIR)/erl_start.o: prog/erl_start.c
 	$(V_CC) $(CFLAGS) -c $< -o $@
 
 else
-ifeq ($(findstring ose,$(TARGET)),ose)
-$(ERL_CALL):
-else
 ifdef THR_DEFS
 $(ERL_CALL): $(ERLCALL) ../include/ei.h $(MT_EILIB)
 	$(ld_verbose)$(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) $(LDFLAGS) -o $@ $(ERLCALL) \
@@ -707,7 +671,6 @@ $(ERL_CALL): $(ERLCALL) ../include/ei.h $(ST_EILIB)
 endif
 endif
 endif
-endif
 
 ###########################################################################
 #  Fake application targets used to test header files and linking
@@ -857,6 +820,7 @@ release: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR) "$(RELSYSDIR)/lib"
 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/auxdir"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/connect"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/decode"
@@ -866,8 +830,14 @@ release: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/prog"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/registry"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/include"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib"
+	$(INSTALL_DATA) $(APP_TARGET)  "$(RELSYSDIR)/ebin/$(APP_FILE)"
+	$(INSTALL_DATA) $(APPUP_TARGET)  "$(RELSYSDIR)/ebin/$(APPUP_FILE)"
 	$(INSTALL_DATA) $(HEADERS)     "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HEADERS)     "$(RELEASE_PATH)/usr/include"
 	$(INSTALL_DATA) $(OBJ_TARGETS) "$(RELSYSDIR)/lib"
+	$(INSTALL_DATA) $(OBJ_TARGETS) "$(RELEASE_PATH)/usr/lib"
 ifneq ($(EXE_TARGETS),)
 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
 endif
diff --git a/lib/erl_interface/src/auxdir/config.guess b/lib/erl_interface/src/auxdir/config.guess
deleted file mode 100755
index f475ceb413..0000000000
--- a/lib/erl_interface/src/auxdir/config.guess
+++ /dev/null
@@ -1,1534 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
-
-timestamp='2013-02-12'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-#
-# Please send patches with a ChangeLog entry to [email protected].
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <[email protected]>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# ([email protected] 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# [email protected] (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <[email protected]>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <[email protected]>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From [email protected].
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From [email protected].
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From [email protected].
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
-	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
-esac
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <[email protected]> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/lib/erl_interface/src/auxdir/config.sub b/lib/erl_interface/src/auxdir/config.sub
deleted file mode 100755
index bb6edbdb47..0000000000
--- a/lib/erl_interface/src/auxdir/config.sub
+++ /dev/null
@@ -1,1789 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
-
-timestamp='2013-02-12'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-
-
-# Please send patches with a ChangeLog entry to [email protected].
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <[email protected]>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright 1992-2013 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| be32 | be64 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pyramid \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i386-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or1k-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
-
diff --git a/lib/erl_interface/src/auxdir/install-sh b/lib/erl_interface/src/auxdir/install-sh
deleted file mode 100755
index a5897de6ea..0000000000
--- a/lib/erl_interface/src/auxdir/install-sh
+++ /dev/null
@@ -1,519 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2006-12-25.00
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index 8f1f231b82..6dc51adee1 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2000-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2000-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
@@ -761,7 +762,7 @@ int ei_close_connection(int fd)
 #endif
 
   /*
-  * Accept and initiate a connection from an other
+  * Accept and initiate a connection from another
   * Erlang node. Return a file descriptor at success,
   * otherwise -1;
 */
@@ -1161,11 +1162,16 @@ static unsigned int gen_challenge(void)
 	struct utsname name;
     } s;
 
+    memset(&s, 0, sizeof(s));
     gettimeofday(&s.tv, 0);
     uname(&s.name);
     s.cpu  = clock();
     s.pid  = getpid();
+#ifndef __ANDROID__
     s.hid  = gethostid();
+#else
+    s.hid  = 0;
+#endif
     s.uid  = getuid();
     s.gid  = getgid();
 
@@ -1335,7 +1341,9 @@ static int send_name_or_challenge(int fd, char *nodename,
 		| DFLAG_NEW_FUN_TAGS
                 | DFLAG_NEW_FLOATS
 		| DFLAG_SMALL_ATOM_TAGS
-		| DFLAG_UTF8_ATOMS));
+		| DFLAG_UTF8_ATOMS
+		| DFLAG_MAP_TAG
+		| DFLAG_BIG_CREATION));
     if (f_chall)
 	put32be(s, challenge);
     memcpy(s, nodename, strlen(nodename));
diff --git a/lib/erl_interface/src/connect/ei_connect_int.h b/lib/erl_interface/src/connect/ei_connect_int.h
index 42ab9b58d7..0bcccaa84b 100644
--- a/lib/erl_interface/src/connect/ei_connect_int.h
+++ b/lib/erl_interface/src/connect/ei_connect_int.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2001-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
@@ -104,6 +105,8 @@ extern int h_errno;
 #define DFLAG_NEW_FLOATS          0x800
 #define DFLAG_SMALL_ATOM_TAGS     0x4000
 #define DFLAG_UTF8_ATOMS          0x10000
+#define DFLAG_MAP_TAG             0x20000
+#define DFLAG_BIG_CREATION        0x40000
 
 ei_cnode   *ei_fd_to_cnode(int fd);
 int         ei_distversion(int fd);
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c
index 2545c5f3de..fd0c659373 100644
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -173,6 +174,8 @@ static int verify_dns_configuration(void)
 
 #endif    
 
+#if defined(VXWORKS) || _REENTRANT
+
 /* 
  * Copy the contents of one struct hostent to another, i.e. don't just
  * copy the pointers, copy all the data and create new pointers, etc.
@@ -226,7 +229,7 @@ static int copy_hostent(struct hostent *dest, const struct hostent *src, char *b
   
   while(*(src_aliases)) {
     if (buflen < sizeof(*pptr)) return -1;
-    *pptr = src_aliases;
+    *pptr = (char *)src_aliases;
     advance_buf(buffer,buflen,sizeof(*pptr));
     src_aliases++;
     pptr++;
@@ -357,6 +360,10 @@ static struct hostent *my_gethostbyname_r(const char *name,
   return rval;
 }
 
+#endif /* defined(VXWORKS) || _REENTRANT */
+
+#if defined(VXWORKS) || EI_THREADS != false
+
 static struct hostent *my_gethostbyaddr_r(const char *addr,
 					  int length, 
 					  int type, 
@@ -418,6 +425,7 @@ static struct hostent *my_gethostbyaddr_r(const char *addr,
   return rval;
 }
 
+#endif /* defined(VXWORKS) || EI_THREADS != false */
 
 #endif /* !HAVE_GETHOSTBYNAME_R */
 
@@ -608,7 +616,7 @@ struct hostent *ei_gethostbyaddr_r(const char *addr,
 #ifndef HAVE_GETHOSTBYNAME_R
   return my_gethostbyaddr_r(addr,length,type,hostp,buffer,buflen,h_errnop);
 #else
-#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__))
+#if (defined(__GLIBC__) || defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__))
   struct hostent *result;
 
   gethostbyaddr_r(addr, length, type, hostp, buffer, buflen, &result,
@@ -635,7 +643,7 @@ struct hostent *ei_gethostbyname_r(const char *name,
 #ifndef HAVE_GETHOSTBYNAME_R
   return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
 #else
-#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__))
+#if (defined(__GLIBC__) || defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__))
   struct hostent *result;
 
   gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);
diff --git a/lib/erl_interface/src/connect/ei_resolve.h b/lib/erl_interface/src/connect/ei_resolve.h
index 4cb8aff338..10a49ffbc6 100644
--- a/lib/erl_interface/src/connect/ei_resolve.h
+++ b/lib/erl_interface/src/connect/ei_resolve.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/connect/eirecv.c b/lib/erl_interface/src/connect/eirecv.c
index 1821de3844..7b9dbfc387 100644
--- a/lib/erl_interface/src/connect/eirecv.c
+++ b/lib/erl_interface/src/connect/eirecv.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/connect/eirecv.h b/lib/erl_interface/src/connect/eirecv.h
index b66eaeeb56..bd40061c07 100644
--- a/lib/erl_interface/src/connect/eirecv.h
+++ b/lib/erl_interface/src/connect/eirecv.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/connect/eisend.h b/lib/erl_interface/src/connect/eisend.h
index d83caf1352..d555208ed0 100644
--- a/lib/erl_interface/src/connect/eisend.h
+++ b/lib/erl_interface/src/connect/eisend.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/connect/send.c b/lib/erl_interface/src/connect/send.c
index 2fb487d7e8..37d7db6d68 100644
--- a/lib/erl_interface/src/connect/send.c
+++ b/lib/erl_interface/src/connect/send.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/connect/send_exit.c b/lib/erl_interface/src/connect/send_exit.c
index c5beb358b0..2e298e3221 100644
--- a/lib/erl_interface/src/connect/send_exit.c
+++ b/lib/erl_interface/src/connect/send_exit.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/connect/send_reg.c b/lib/erl_interface/src/connect/send_reg.c
index b011142e76..62478f042d 100644
--- a/lib/erl_interface/src/connect/send_reg.c
+++ b/lib/erl_interface/src/connect/send_reg.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_atom.c b/lib/erl_interface/src/decode/decode_atom.c
index 44fd4df12c..b3bba82434 100644
--- a/lib/erl_interface/src/decode/decode_atom.c
+++ b/lib/erl_interface/src/decode/decode_atom.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_big.c b/lib/erl_interface/src/decode/decode_big.c
index b54ac85be2..cbbbd3f0b7 100644
--- a/lib/erl_interface/src/decode/decode_big.c
+++ b/lib/erl_interface/src/decode/decode_big.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2011. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -150,14 +151,9 @@ int ei_big_comp(erlang_big *x, erlang_big *y)
 #define INLINED_FP_CONVERSION 1
 #endif
 
-#ifdef USE_ISINF_ISNAN		/* simulate finite() */
-#  define finite(f) (!isinf(f) && !isnan(f))
-#  define HAVE_FINITE
-#endif
-
 #ifdef NO_FPE_SIGNALS
 #  define ERTS_FP_CHECK_INIT() do {} while (0)
-#  define ERTS_FP_ERROR(f, Action) if (!finite(f)) { Action; } else {}
+#  define ERTS_FP_ERROR(f, Action) if (!isfinite(f)) { Action; } else {}
 #  define ERTS_SAVE_FP_EXCEPTION()
 #  define ERTS_RESTORE_FP_EXCEPTION()
 #else
diff --git a/lib/erl_interface/src/decode/decode_bignum.c b/lib/erl_interface/src/decode/decode_bignum.c
index f10052f9fe..70a86e29c9 100644
--- a/lib/erl_interface/src/decode/decode_bignum.c
+++ b/lib/erl_interface/src/decode/decode_bignum.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_binary.c b/lib/erl_interface/src/decode/decode_binary.c
index 713e621e60..5b8d234984 100644
--- a/lib/erl_interface/src/decode/decode_binary.c
+++ b/lib/erl_interface/src/decode/decode_binary.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_boolean.c b/lib/erl_interface/src/decode/decode_boolean.c
index 8c44a1ccfc..23cfd16f77 100644
--- a/lib/erl_interface/src/decode/decode_boolean.c
+++ b/lib/erl_interface/src/decode/decode_boolean.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_char.c b/lib/erl_interface/src/decode/decode_char.c
index 0f9b3f6cff..babf34c90c 100644
--- a/lib/erl_interface/src/decode/decode_char.c
+++ b/lib/erl_interface/src/decode/decode_char.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_double.c b/lib/erl_interface/src/decode/decode_double.c
index ed6e39655e..1ce8b2a417 100644
--- a/lib/erl_interface/src/decode/decode_double.c
+++ b/lib/erl_interface/src/decode/decode_double.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_fun.c b/lib/erl_interface/src/decode/decode_fun.c
index 0857874c89..f944c028af 100644
--- a/lib/erl_interface/src/decode/decode_fun.c
+++ b/lib/erl_interface/src/decode/decode_fun.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_intlist.c b/lib/erl_interface/src/decode/decode_intlist.c
index 65552a4ed4..494371d778 100644
--- a/lib/erl_interface/src/decode/decode_intlist.c
+++ b/lib/erl_interface/src/decode/decode_intlist.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_list_header.c b/lib/erl_interface/src/decode/decode_list_header.c
index dda711f9fd..4c6ce3859e 100644
--- a/lib/erl_interface/src/decode/decode_list_header.c
+++ b/lib/erl_interface/src/decode/decode_list_header.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_long.c b/lib/erl_interface/src/decode/decode_long.c
index b4138247e0..b5f36adbb6 100644
--- a/lib/erl_interface/src/decode/decode_long.c
+++ b/lib/erl_interface/src/decode/decode_long.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_longlong.c b/lib/erl_interface/src/decode/decode_longlong.c
index 8ec9f76995..e052cb7164 100644
--- a/lib/erl_interface/src/decode/decode_longlong.c
+++ b/lib/erl_interface/src/decode/decode_longlong.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_pid.c b/lib/erl_interface/src/decode/decode_pid.c
index cd5ae2ab20..e1055aa5c9 100644
--- a/lib/erl_interface/src/decode/decode_pid.c
+++ b/lib/erl_interface/src/decode/decode_pid.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -26,18 +27,22 @@ int ei_decode_pid(const char *buf, int *index, erlang_pid *p)
 {
   const char *s = buf + *index;
   const char *s0 = s;
+  const char tag = get8(s);
   
-  if (get8(s) != ERL_PID_EXT) return -1;
+  if (tag != ERL_PID_EXT && tag != ERL_NEW_PID_EXT) return -1;
 
   if (p) {
     if (get_atom(&s, p->node, NULL) < 0) return -1;
     p->num = get32be(s) & 0x7fff; /* 15 bits */
     p->serial = get32be(s) & 0x1fff; /* 13 bits */
-    p->creation = get8(s) & 0x03; /* 2 bits */
+    if (tag == ERL_PID_EXT)
+        p->creation = get8(s) & 0x03; /* 2 bits */
+    else
+        p->creation = get32be(s); /* 32 bits */
   }
   else {
       if (get_atom(&s, NULL, NULL) < 0) return -1;
-      s+= 9;
+      s+= (tag == ERL_PID_EXT ? 9 : 12);
   }
   
   *index += s-s0;
diff --git a/lib/erl_interface/src/decode/decode_port.c b/lib/erl_interface/src/decode/decode_port.c
index 8fbdc5f3d3..337648d803 100644
--- a/lib/erl_interface/src/decode/decode_port.c
+++ b/lib/erl_interface/src/decode/decode_port.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -25,17 +26,21 @@ int ei_decode_port(const char *buf, int *index, erlang_port *p)
 {
   const char *s = buf + *index;
   const char *s0 = s;
+  const char tag = get8(s);
   
-  if (get8(s) != ERL_PORT_EXT) return -1;
+  if (tag != ERL_PORT_EXT && tag != ERL_NEW_PORT_EXT) return -1;
 
   if (p) {
     if (get_atom(&s, p->node, NULL) < 0) return -1;
     p->id = get32be(s) & 0x0fffffff /* 28 bits */;
-    p->creation = get8(s) & 0x03;
+    if (tag == ERL_PORT_EXT)
+        p->creation = get8(s) & 0x03;
+    else
+        p->creation = get32be(s);
   }
   else {
       if (get_atom(&s, NULL, NULL) < 0) return -1;
-      s += 5;
+      s += (tag == ERL_PORT_EXT ? 5 : 8);
   }
   
   *index += s-s0;
diff --git a/lib/erl_interface/src/decode/decode_ref.c b/lib/erl_interface/src/decode/decode_ref.c
index 78db118172..c9b38c1c3b 100644
--- a/lib/erl_interface/src/decode/decode_ref.c
+++ b/lib/erl_interface/src/decode/decode_ref.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -27,8 +28,9 @@ int ei_decode_ref(const char *buf, int *index, erlang_ref *p)
   const char *s = buf + *index;
   const char *s0 = s;
   int count, i;
+  const char tag = get8(s);
   
-  switch (get8(s)) {
+  switch (tag) {
     case ERL_REFERENCE_EXT:
       if (p) {
 	  if (get_atom(&s, p->node, NULL) < 0) return -1;
@@ -46,18 +48,23 @@ int ei_decode_ref(const char *buf, int *index, erlang_ref *p)
       return 0;
       break;
       
-    case ERL_NEW_REFERENCE_EXT:
+  case ERL_NEW_REFERENCE_EXT:
+  case ERL_NEWER_REFERENCE_EXT:
+
       /* first the integer count */
       count = get16be(s);
 
       if (p) {
 	  p->len = count;
 	  if (get_atom(&s, p->node, NULL) < 0) return -1;
-	  p->creation = get8(s) & 0x03;
+          if (tag == ERL_NEW_REFERENCE_EXT)
+              p->creation = get8(s) & 0x03;
+          else
+              p->creation = get32be(s);
       }
       else {
 	  if (get_atom(&s, NULL, NULL) < 0) return -1;
-	  s += 1;
+	  s += (tag == ERL_NEW_REFERENCE_EXT ? 1 : 4);
       }
 
       /* finally the id integers */
diff --git a/lib/erl_interface/src/decode/decode_skip.c b/lib/erl_interface/src/decode/decode_skip.c
index 553266471c..0db315f09b 100644
--- a/lib/erl_interface/src/decode/decode_skip.c
+++ b/lib/erl_interface/src/decode/decode_skip.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2002-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
@@ -34,12 +35,15 @@ int ei_skip_term(const char* buf, int* index)
 			      NULL, NULL) < 0) return -1;
 	break;
     case ERL_PID_EXT:
+    case ERL_NEW_PID_EXT:
 	if (ei_decode_pid(buf, index, NULL) < 0) return -1;
 	break;
     case ERL_PORT_EXT:
+    case ERL_NEW_PORT_EXT:
 	if (ei_decode_port(buf, index, NULL) < 0) return -1;
 	break;
     case ERL_NEW_REFERENCE_EXT:
+    case ERL_NEWER_REFERENCE_EXT:
     case ERL_REFERENCE_EXT:
 	if (ei_decode_ref(buf, index, NULL) < 0) return -1;
 	break;
@@ -61,7 +65,13 @@ int ei_skip_term(const char* buf, int* index)
 	break;
     case ERL_SMALL_TUPLE_EXT:
     case ERL_LARGE_TUPLE_EXT:
-	if (ei_decode_tuple_header(buf, index, &n) < 0) return -1;	
+	if (ei_decode_tuple_header(buf, index, &n) < 0) return -1;
+	for (i = 0; i < n; ++i)
+	    ei_skip_term(buf, index);
+	break;
+    case ERL_MAP_EXT:
+	if (ei_decode_map_header(buf, index, &n) < 0) return -1;
+	n *= 2;
 	for (i = 0; i < n; ++i)
 	    ei_skip_term(buf, index);
 	break;
diff --git a/lib/erl_interface/src/decode/decode_skip.h b/lib/erl_interface/src/decode/decode_skip.h
index b6c7b09fe4..be497e8601 100644
--- a/lib/erl_interface/src/decode/decode_skip.h
+++ b/lib/erl_interface/src/decode/decode_skip.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_string.c b/lib/erl_interface/src/decode/decode_string.c
index bcbdca0438..3fe4fdd02d 100644
--- a/lib/erl_interface/src/decode/decode_string.c
+++ b/lib/erl_interface/src/decode/decode_string.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_trace.c b/lib/erl_interface/src/decode/decode_trace.c
index d192c7f8b1..738d6f0885 100644
--- a/lib/erl_interface/src/decode/decode_trace.c
+++ b/lib/erl_interface/src/decode/decode_trace.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_tuple_header.c b/lib/erl_interface/src/decode/decode_tuple_header.c
index c0ba14ea47..4507edbc8e 100644
--- a/lib/erl_interface/src/decode/decode_tuple_header.c
+++ b/lib/erl_interface/src/decode/decode_tuple_header.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -45,3 +46,24 @@ int ei_decode_tuple_header(const char *buf, int *index, int *arity)
 
   return 0;
 }
+
+int ei_decode_map_header(const char *buf, int *index, int *arity)
+{
+  const char *s = buf + *index;
+  const char *s0 = s;
+  int i;
+
+  switch ((i=get8(s))) {
+  case ERL_MAP_EXT:
+    if (arity) *arity = get32be(s);
+    else s += 4;
+    break;
+
+  default:
+    return -1;
+  }
+
+  *index += s-s0;
+
+  return 0;
+}
diff --git a/lib/erl_interface/src/decode/decode_ulong.c b/lib/erl_interface/src/decode/decode_ulong.c
index dcf3703be7..8675ae257f 100644
--- a/lib/erl_interface/src/decode/decode_ulong.c
+++ b/lib/erl_interface/src/decode/decode_ulong.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_ulonglong.c b/lib/erl_interface/src/decode/decode_ulonglong.c
index 17ecea848d..0f0eaeb5da 100644
--- a/lib/erl_interface/src/decode/decode_ulonglong.c
+++ b/lib/erl_interface/src/decode/decode_ulonglong.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/decode/decode_version.c b/lib/erl_interface/src/decode/decode_version.c
index 124d7272f4..00a85bea35 100644
--- a/lib/erl_interface/src/decode/decode_version.c
+++ b/lib/erl_interface/src/decode/decode_version.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/eidefs.mk.in b/lib/erl_interface/src/eidefs.mk.in
index 05f61236c3..dc34ad478a 100644
--- a/lib/erl_interface/src/eidefs.mk.in
+++ b/lib/erl_interface/src/eidefs.mk.in
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2009. All Rights Reserved.
+# Copyright Ericsson AB 2004-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/src/encode/eicode.h b/lib/erl_interface/src/encode/eicode.h
index cf008b7fa9..1db9a0b65a 100644
--- a/lib/erl_interface/src/encode/eicode.h
+++ b/lib/erl_interface/src/encode/eicode.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_atom.c b/lib/erl_interface/src/encode/encode_atom.c
index 46d34c3bf0..c1817628e5 100644
--- a/lib/erl_interface/src/encode/encode_atom.c
+++ b/lib/erl_interface/src/encode/encode_atom.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_big.c b/lib/erl_interface/src/encode/encode_big.c
index 25abf424b7..cf542a5557 100644
--- a/lib/erl_interface/src/encode/encode_big.c
+++ b/lib/erl_interface/src/encode/encode_big.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2009. All Rights Reserved.
+ * Copyright Ericsson AB 2009-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_bignum.c b/lib/erl_interface/src/encode/encode_bignum.c
index 6850cb86a6..6e418df0c7 100644
--- a/lib/erl_interface/src/encode/encode_bignum.c
+++ b/lib/erl_interface/src/encode/encode_bignum.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_binary.c b/lib/erl_interface/src/encode/encode_binary.c
index 67a4dc1219..4471c51769 100644
--- a/lib/erl_interface/src/encode/encode_binary.c
+++ b/lib/erl_interface/src/encode/encode_binary.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_boolean.c b/lib/erl_interface/src/encode/encode_boolean.c
index 51a166bea5..61e7e5e6e7 100644
--- a/lib/erl_interface/src/encode/encode_boolean.c
+++ b/lib/erl_interface/src/encode/encode_boolean.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_char.c b/lib/erl_interface/src/encode/encode_char.c
index a7d27c5261..fab56469aa 100644
--- a/lib/erl_interface/src/encode/encode_char.c
+++ b/lib/erl_interface/src/encode/encode_char.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_double.c b/lib/erl_interface/src/encode/encode_double.c
index 148a49f73a..cff220639a 100644
--- a/lib/erl_interface/src/encode/encode_double.c
+++ b/lib/erl_interface/src/encode/encode_double.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
@@ -21,12 +22,24 @@
 #include "eidef.h"
 #include "eiext.h"
 #include "putget.h"
+#if defined(HAVE_ISFINITE)
+#include <math.h>
+#endif
 
 int ei_encode_double(char *buf, int *index, double p)
 {
   char *s = buf + *index;
   char *s0 = s;
 
+  /* Erlang does not handle Inf and NaN, so we return an error rather
+   * than letting the Erlang VM complain about a bad external
+   * term. */
+#if defined(HAVE_ISFINITE)
+  if(!isfinite(p)) {
+      return -1;
+  }
+#endif
+
   if (!buf)
     s += 9;
   else {
diff --git a/lib/erl_interface/src/encode/encode_fun.c b/lib/erl_interface/src/encode/encode_fun.c
index 455d8a5a94..3bfc7530d1 100644
--- a/lib/erl_interface/src/encode/encode_fun.c
+++ b/lib/erl_interface/src/encode/encode_fun.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_list_header.c b/lib/erl_interface/src/encode/encode_list_header.c
index 27da70ae15..409bd98ea0 100644
--- a/lib/erl_interface/src/encode/encode_list_header.c
+++ b/lib/erl_interface/src/encode/encode_list_header.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_long.c b/lib/erl_interface/src/encode/encode_long.c
index d616bb6e47..ef3b92cd9e 100644
--- a/lib/erl_interface/src/encode/encode_long.c
+++ b/lib/erl_interface/src/encode/encode_long.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_longlong.c b/lib/erl_interface/src/encode/encode_longlong.c
index aff24e2478..2a1cbedce1 100644
--- a/lib/erl_interface/src/encode/encode_longlong.c
+++ b/lib/erl_interface/src/encode/encode_longlong.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_pid.c b/lib/erl_interface/src/encode/encode_pid.c
index 86d0f393e5..d14746b40f 100644
--- a/lib/erl_interface/src/encode/encode_pid.c
+++ b/lib/erl_interface/src/encode/encode_pid.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -23,7 +24,8 @@
 
 int ei_encode_pid(char *buf, int *index, const erlang_pid *p)
 {
-  char *s = buf + *index;
+  char* s = buf + *index;
+  const char tag = (p->creation > 3) ? ERL_NEW_PID_EXT : ERL_PID_EXT;
 
   ++(*index); /* skip ERL_PID_EXT */
   if (ei_encode_atom_len_as(buf, index, p->node, strlen(p->node),
@@ -31,17 +33,21 @@ int ei_encode_pid(char *buf, int *index, const erlang_pid *p)
       return -1;
 
   if (buf) {
-    put8(s,ERL_PID_EXT);
+    put8(s, tag);
 
     s = buf + *index;
 
     /* now the integers */
     put32be(s,p->num & 0x7fff); /* 15 bits */
     put32be(s,p->serial & 0x1fff); /* 13 bits */
-    put8(s,(p->creation & 0x03)); /* 2 bits */
+    if (tag == ERL_PID_EXT) {
+        put8(s,(p->creation & 0x03)); /* 2 bits */
+    } else {
+        put32be(s, p->creation); /* 32 bits */
+    }
   }
 
-  *index += 4 + 4 + 1;  
+  *index += 4 + 4 + (tag == ERL_PID_EXT ? 1 : 4);
   return 0;
 }
 
diff --git a/lib/erl_interface/src/encode/encode_port.c b/lib/erl_interface/src/encode/encode_port.c
index a206de56c7..eb464380c0 100644
--- a/lib/erl_interface/src/encode/encode_port.c
+++ b/lib/erl_interface/src/encode/encode_port.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -24,6 +25,7 @@
 int ei_encode_port(char *buf, int *index, const erlang_port *p)
 {
   char *s = buf + *index;
+  const char tag = p->creation > 3 ? ERL_NEW_PORT_EXT : ERL_PORT_EXT;
 
   ++(*index); /* skip ERL_PORT_EXT */
   if (ei_encode_atom_len_as(buf, index, p->node, strlen(p->node), ERLANG_UTF8,
@@ -31,16 +33,19 @@ int ei_encode_port(char *buf, int *index, const erlang_port *p)
       return -1;
   }
   if (buf) {
-    put8(s,ERL_PORT_EXT);
+    put8(s, tag);
 
     s = buf + *index;
 
     /* now the integers */
     put32be(s,p->id & 0x0fffffff /* 28 bits */);
-    put8(s,(p->creation & 0x03));
+    if (tag == ERL_PORT_EXT) {
+        put8(s,(p->creation & 0x03));
+    } else {
+        put32be(s, p->creation);
+    }
   }
-  
-  *index += 4 + 1;
+  *index += 4 + (tag == ERL_PORT_EXT ? 1 : 4);
   return 0;
 }
 
diff --git a/lib/erl_interface/src/encode/encode_ref.c b/lib/erl_interface/src/encode/encode_ref.c
index 9855231848..5ccfc32c6d 100644
--- a/lib/erl_interface/src/encode/encode_ref.c
+++ b/lib/erl_interface/src/encode/encode_ref.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -23,6 +24,7 @@
 
 int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
 {
+  const char tag = (p->creation > 3) ? ERL_NEWER_REFERENCE_EXT : ERL_NEW_REFERENCE_EXT;
   char *s = buf + *index;
   int i;
 
@@ -35,7 +37,7 @@ int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
   /* Always encode as an extended reference; all participating parties
      are now expected to be able to decode extended references. */
   if (buf) {
-	  put8(s,ERL_NEW_REFERENCE_EXT);
+	  put8(s, tag);
 
 	  /* first, number of integers */
 	  put16be(s, p->len);
@@ -44,12 +46,15 @@ int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
 	  s = buf + *index;
 
 	  /* now the integers */
-	  put8(s,(p->creation & 0x03));
+          if (tag == ERL_NEW_REFERENCE_EXT)
+              put8(s,(p->creation & 0x03));
+          else
+              put32be(s, p->creation);
 	  for (i = 0; i < p->len; i++)
 	      put32be(s,p->n[i]);
   }
   
-  *index += p->len*4 + 1;  
+  *index += p->len*4 + (tag == ERL_NEW_REFERENCE_EXT ? 1 : 4);
   return 0;
 }
 
diff --git a/lib/erl_interface/src/encode/encode_string.c b/lib/erl_interface/src/encode/encode_string.c
index d00d2f3e81..a45eae934d 100644
--- a/lib/erl_interface/src/encode/encode_string.c
+++ b/lib/erl_interface/src/encode/encode_string.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_trace.c b/lib/erl_interface/src/encode/encode_trace.c
index de46f7fae8..d0e6aec474 100644
--- a/lib/erl_interface/src/encode/encode_trace.c
+++ b/lib/erl_interface/src/encode/encode_trace.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_tuple_header.c b/lib/erl_interface/src/encode/encode_tuple_header.c
index 97a3d1f808..e75df57bed 100644
--- a/lib/erl_interface/src/encode/encode_tuple_header.c
+++ b/lib/erl_interface/src/encode/encode_tuple_header.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -47,3 +48,20 @@ int ei_encode_tuple_header(char *buf, int *index, int arity)
   return 0;
 }
 
+int ei_encode_map_header(char *buf, int *index, int arity)
+{
+  char *s = buf + *index;
+  char *s0 = s;
+
+  if (arity < 0) return -1;
+
+  if (!buf) s += 5;
+  else {
+      put8(s,ERL_MAP_EXT);
+      put32be(s,arity);
+  }
+
+  *index += s-s0;
+
+  return 0;
+}
diff --git a/lib/erl_interface/src/encode/encode_ulong.c b/lib/erl_interface/src/encode/encode_ulong.c
index c4ff34e493..94b45b2dd4 100644
--- a/lib/erl_interface/src/encode/encode_ulong.c
+++ b/lib/erl_interface/src/encode/encode_ulong.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/encode/encode_ulonglong.c b/lib/erl_interface/src/encode/encode_ulonglong.c
index 0f21af2a91..e16acc10ef 100644
--- a/lib/erl_interface/src/encode/encode_ulonglong.c
+++ b/lib/erl_interface/src/encode/encode_ulonglong.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -52,7 +53,7 @@ int ei_encode_ulonglong(char *buf, int *index, EI_ULONGLONG p)
     char *s = buf + *index;
     char *s0 = s;
 
-    if ((p < 256) && (p >= 0)) {
+    if (p < 256) {
 	if (!buf) s += 2;
 	else {
 	    put8(s,ERL_SMALL_INTEGER_EXT);
diff --git a/lib/erl_interface/src/encode/encode_version.c b/lib/erl_interface/src/encode/encode_version.c
index 3fd9fdabd4..41a2deda12 100644
--- a/lib/erl_interface/src/encode/encode_version.c
+++ b/lib/erl_interface/src/encode/encode_version.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/epmd/ei_epmd.h b/lib/erl_interface/src/epmd/ei_epmd.h
index ccacfed244..ac153b6e66 100644
--- a/lib/erl_interface/src/epmd/ei_epmd.h
+++ b/lib/erl_interface/src/epmd/ei_epmd.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/epmd/epmd_port.c b/lib/erl_interface/src/epmd/epmd_port.c
index a433815eb7..2ec418b24a 100644
--- a/lib/erl_interface/src/epmd/epmd_port.c
+++ b/lib/erl_interface/src/epmd/epmd_port.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/epmd/epmd_publish.c b/lib/erl_interface/src/epmd/epmd_publish.c
index d45fe644c0..47d68a6db0 100644
--- a/lib/erl_interface/src/epmd/epmd_publish.c
+++ b/lib/erl_interface/src/epmd/epmd_publish.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/epmd/epmd_unpublish.c b/lib/erl_interface/src/epmd/epmd_unpublish.c
index 3afa89ab1d..255d0ffb59 100644
--- a/lib/erl_interface/src/epmd/epmd_unpublish.c
+++ b/lib/erl_interface/src/epmd/epmd_unpublish.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/erl_interface.app.src b/lib/erl_interface/src/erl_interface.app.src
new file mode 100644
index 0000000000..f00cdfba88
--- /dev/null
+++ b/lib/erl_interface/src/erl_interface.app.src
@@ -0,0 +1,33 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2014-2016. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%% This is an -*- erlang -*- file.
+%%
+
+{application, erl_interface,
+ [
+  {description, "Erl Interface"},
+  {vsn, "%VSN%"},
+  {modules, []},
+  {registered, []},
+  {applications, []},
+  {env, []},
+  {runtime_dependencies, []}
+ ]
+}.
diff --git a/lib/erl_interface/src/erl_interface.appup.src b/lib/erl_interface/src/erl_interface.appup.src
new file mode 100644
index 0000000000..eb9854d22d
--- /dev/null
+++ b/lib/erl_interface/src/erl_interface.appup.src
@@ -0,0 +1,19 @@
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2014-2016. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+{"%VSN%", [], []}.
diff --git a/lib/erl_interface/src/legacy/decode_term.c b/lib/erl_interface/src/legacy/decode_term.c
index 796cebdfef..72bacc3123 100644
--- a/lib/erl_interface/src/legacy/decode_term.c
+++ b/lib/erl_interface/src/legacy/decode_term.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/encode_term.c b/lib/erl_interface/src/legacy/encode_term.c
index c377d7b699..df740ab487 100644
--- a/lib/erl_interface/src/legacy/encode_term.c
+++ b/lib/erl_interface/src/legacy/encode_term.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_config.h b/lib/erl_interface/src/legacy/erl_config.h
index 166aa7013c..fb72169f23 100644
--- a/lib/erl_interface/src/legacy/erl_config.h
+++ b/lib/erl_interface/src/legacy/erl_config.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_connect.c b/lib/erl_interface/src/legacy/erl_connect.c
index ae0265a388..7ffd545d3e 100644
--- a/lib/erl_interface/src/legacy/erl_connect.c
+++ b/lib/erl_interface/src/legacy/erl_connect.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -190,7 +191,7 @@ int erl_close_connection(int fd)
 }
 
 /*
- * Accept and initiate a connection from an other
+ * Accept and initiate a connection from another
  * Erlang node. Return a file descriptor at success,
  * otherwise -1;
  */
diff --git a/lib/erl_interface/src/legacy/erl_connect.h b/lib/erl_interface/src/legacy/erl_connect.h
index d9d6c4e453..6cb5d5cd1b 100644
--- a/lib/erl_interface/src/legacy/erl_connect.h
+++ b/lib/erl_interface/src/legacy/erl_connect.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_error.c b/lib/erl_interface/src/legacy/erl_error.c
index 18dc2423bf..a3bbfbc58f 100644
--- a/lib/erl_interface/src/legacy/erl_error.c
+++ b/lib/erl_interface/src/legacy/erl_error.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_error.h b/lib/erl_interface/src/legacy/erl_error.h
index 931c639c30..0cce083ae7 100644
--- a/lib/erl_interface/src/legacy/erl_error.h
+++ b/lib/erl_interface/src/legacy/erl_error.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_eterm.c b/lib/erl_interface/src/legacy/erl_eterm.c
index 7ca4f430de..e4b3b49c7d 100644
--- a/lib/erl_interface/src/legacy/erl_eterm.c
+++ b/lib/erl_interface/src/legacy/erl_eterm.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
@@ -26,6 +27,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#if defined(HAVE_ISFINITE)
+#include <math.h>
+#endif
 
 #include "ei_locking.h"
 #include "ei_resolve.h"
@@ -125,6 +129,15 @@ ETERM *erl_mk_float (double d)
 {
     ETERM *ep;
 
+#if defined(HAVE_ISFINITE)
+    /* Erlang does not handle Inf and NaN, so we return an error
+     * rather than letting the Erlang VM complain about a bad external
+     * term. */
+    if(!isfinite(d)) {
+        return NULL;
+    }
+#endif
+
     ep = erl_alloc_eterm(ERL_FLOAT);
     ERL_COUNT(ep) = 1;
     ERL_FLOAT_VALUE(ep) = d;
@@ -272,12 +285,12 @@ ETERM *erl_mk_pid(const char *node,
 	erl_errno = ENOMEM;
 	return NULL;
     }
-    erl_mk_pid_helper(ep, number, serial, creation);
+    erl_mk_pid_helper(ep, number, serial, creation & 0x03);
     return ep;
 }
 
 void erl_mk_pid_helper(ETERM *ep, unsigned int number, 
-		       unsigned int serial, unsigned char creation)
+		       unsigned int serial, unsigned int creation)
 {
     ERL_PID_NUMBER(ep)   = number & 0x7fff; /* 15 bits */
     if (ei_internal_use_r9_pids_ports()) {
@@ -286,7 +299,7 @@ void erl_mk_pid_helper(ETERM *ep, unsigned int number,
     else {
 	ERL_PID_SERIAL(ep)   = serial & 0x1fff;  /* 13 bits */
     }
-    ERL_PID_CREATION(ep) = creation & 0x03; /* 2 bits */
+    ERL_PID_CREATION(ep) = creation; /* 32 bits */
 }
 
 /*
@@ -313,7 +326,7 @@ ETERM *erl_mk_port(const char *node,
     return ep;
 }
 
-void erl_mk_port_helper(ETERM* ep, unsigned number, unsigned char creation)
+void erl_mk_port_helper(ETERM* ep, unsigned number, unsigned int creation)
 {
     if (ei_internal_use_r9_pids_ports()) {
 	ERL_PORT_NUMBER(ep)   = number & 0x3ffff; /* 18 bits */
@@ -321,7 +334,7 @@ void erl_mk_port_helper(ETERM* ep, unsigned number, unsigned char creation)
     else {
 	ERL_PORT_NUMBER(ep)   = number & 0x0fffffff; /* 18 bits */
     }
-    ERL_PORT_CREATION(ep) = creation & 0x03; /* 2 bits */
+    ERL_PORT_CREATION(ep) = creation; /* 32 bits */
 }
 
 /*
@@ -331,7 +344,7 @@ ETERM *__erl_mk_reference (ETERM* t,
 			   const char *node,
 			   size_t len,
 			   unsigned int n[],
-			   unsigned char creation)
+			   unsigned int creation)
 {
     if (t == NULL) {
 	if (node == NULL) return NULL;
@@ -350,7 +363,7 @@ ETERM *__erl_mk_reference (ETERM* t,
     ERL_REF_NUMBERS(t)[0]   = n[0] & 0x3ffff; /* 18 bits */
     ERL_REF_NUMBERS(t)[1]   = n[1];
     ERL_REF_NUMBERS(t)[2]   = n[2];
-    ERL_REF_CREATION(t) = creation & 0x03; /* 2 bits */
+    ERL_REF_CREATION(t) = creation; /* 32 bits */
 
     return t;
 }
@@ -686,7 +699,7 @@ int erl_length(const ETERM *ep)
     return n;
 }
 
-
+
 /***********************************************************************
  * I o l i s t   f u n c t i o n s
  *
diff --git a/lib/erl_interface/src/legacy/erl_eterm.h b/lib/erl_interface/src/legacy/erl_eterm.h
index ca4ec7925a..e2f3a90531 100644
--- a/lib/erl_interface/src/legacy/erl_eterm.h
+++ b/lib/erl_interface/src/legacy/erl_eterm.h
@@ -1,18 +1,19 @@
 /* 
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -55,9 +56,9 @@ typedef struct _heapmark {
 } Erl_HeapMark;
 
 
-void erl_mk_port_helper(ETERM* ep, unsigned number, unsigned char creation);
-void erl_mk_pid_helper(ETERM*, unsigned,unsigned, unsigned char);
-ETERM * __erl_mk_reference(ETERM*, const char *, size_t, unsigned int n[], unsigned char);
+void erl_mk_port_helper(ETERM* ep, unsigned number, unsigned int creation);
+void erl_mk_pid_helper(ETERM*, unsigned,unsigned, unsigned int);
+ETERM * __erl_mk_reference(ETERM*, const char *, size_t, unsigned int n[], unsigned int);
 int erl_current_fix_desc(void);
 
 #endif /* _ERL_ETERM_H */
diff --git a/lib/erl_interface/src/legacy/erl_fix_alloc.c b/lib/erl_interface/src/legacy/erl_fix_alloc.c
index 2ed0dd1470..890a9ce291 100644
--- a/lib/erl_interface/src/legacy/erl_fix_alloc.c
+++ b/lib/erl_interface/src/legacy/erl_fix_alloc.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_fix_alloc.h b/lib/erl_interface/src/legacy/erl_fix_alloc.h
index 16d2f4217a..50d1368e34 100644
--- a/lib/erl_interface/src/legacy/erl_fix_alloc.h
+++ b/lib/erl_interface/src/legacy/erl_fix_alloc.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_format.c b/lib/erl_interface/src/legacy/erl_format.c
index fda05cbdb8..45f5489e54 100644
--- a/lib/erl_interface/src/legacy/erl_format.c
+++ b/lib/erl_interface/src/legacy/erl_format.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_format.h b/lib/erl_interface/src/legacy/erl_format.h
index 90801e4892..92fa068206 100644
--- a/lib/erl_interface/src/legacy/erl_format.h
+++ b/lib/erl_interface/src/legacy/erl_format.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_global.h b/lib/erl_interface/src/legacy/erl_global.h
index ef09eab0b0..d2eec08b35 100644
--- a/lib/erl_interface/src/legacy/erl_global.h
+++ b/lib/erl_interface/src/legacy/erl_global.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_internal.h b/lib/erl_interface/src/legacy/erl_internal.h
index e79c815946..25cf3e4f42 100644
--- a/lib/erl_interface/src/legacy/erl_internal.h
+++ b/lib/erl_interface/src/legacy/erl_internal.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_malloc.c b/lib/erl_interface/src/legacy/erl_malloc.c
index c320a00bfe..27ef8c4b32 100644
--- a/lib/erl_interface/src/legacy/erl_malloc.c
+++ b/lib/erl_interface/src/legacy/erl_malloc.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_malloc.h b/lib/erl_interface/src/legacy/erl_malloc.h
index 787d3bb98f..6cbc01faba 100644
--- a/lib/erl_interface/src/legacy/erl_malloc.h
+++ b/lib/erl_interface/src/legacy/erl_malloc.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_marshal.c b/lib/erl_interface/src/legacy/erl_marshal.c
index e207b5f0f1..2bdf5f2134 100644
--- a/lib/erl_interface/src/legacy/erl_marshal.c
+++ b/lib/erl_interface/src/legacy/erl_marshal.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
@@ -119,10 +120,13 @@ void erl_init_marshal(void)
     cmp_array[ERL_SMALL_ATOM_UTF8_EXT] = ERL_ATOM_CMP;
     cmp_array[ERL_REFERENCE_EXT]     = ERL_REF_CMP;
     cmp_array[ERL_NEW_REFERENCE_EXT] = ERL_REF_CMP;
+    cmp_array[ERL_NEWER_REFERENCE_EXT]=ERL_REF_CMP;
     cmp_array[ERL_FUN_EXT]           = ERL_FUN_CMP;
     cmp_array[ERL_NEW_FUN_EXT]       = ERL_FUN_CMP;
     cmp_array[ERL_PORT_EXT]          = ERL_PORT_CMP;
+    cmp_array[ERL_NEW_PORT_EXT]      = ERL_PORT_CMP;
     cmp_array[ERL_PID_EXT]           = ERL_PID_CMP;
+    cmp_array[ERL_NEW_PID_EXT]       = ERL_PID_CMP;
     cmp_array[ERL_SMALL_TUPLE_EXT]   = ERL_TUPLE_CMP;
     cmp_array[ERL_LARGE_TUPLE_EXT]   = ERL_TUPLE_CMP;
     cmp_array[ERL_NIL_EXT]           = ERL_NIL_CMP;
@@ -290,7 +294,7 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
 	    return 0;
 	}
 	/* SMALL_INTEGER */
-	if ((ul < 256) && (ul >= 0)) {
+	if (ul < 256) {
 	    *(*ext)++ = ERL_SMALL_INTEGER_EXT;
 	    *(*ext)++ = ul & 0xff;
 	    return 0;
@@ -303,8 +307,8 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
 	*(*ext)++ =  ul        & 0xff;
 	return 0;
 
-    case ERL_PID:
-	*(*ext)++ = ERL_PID_EXT;    
+    case ERL_PID: {
+        unsigned char* tagp = (*ext)++;
 	/* First poke in node as an atom */    
 	encode_atom(&ep->uval.pidval.node, ext);
 	/* And then fill in the integer fields */
@@ -318,17 +322,29 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
 	*(*ext)++ = (i >> 16) &0xff;
 	*(*ext)++ = (i >>  8) &0xff;
 	*(*ext)++ = i &0xff;
-	*(*ext)++ = ERL_PID_CREATION(ep);
+
+        i = ERL_PID_CREATION(ep);
+        if ((unsigned int)i <= 3) {
+            *tagp = ERL_PID_EXT;
+            *(*ext)++ = i;
+        } else {
+            *tagp = ERL_NEW_PID_EXT;
+            *(*ext)++ = (i >> 24) &0xff;
+            *(*ext)++ = (i >> 16) &0xff;
+            *(*ext)++ = (i >>  8) &0xff;
+            *(*ext)++ = i &0xff;
+        }
 	return 0;
+    }
     case ERL_REF: {
+            unsigned char* tagp = (*ext)++;
+
 	    int len, j;
 
 	    /* Always encode as an extended reference; all
 	       participating parties are now expected to be
 	       able to decode extended references. */
 
-	    *(*ext)++ = ERL_NEW_REFERENCE_EXT;
-
 	    i = strlen((char *)ERL_REF_NODE(ep));
 	    len = ERL_REF_LEN(ep);
 	    *(*ext)++ = (len >> 8) &0xff;
@@ -336,7 +352,18 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
 
 	    encode_atom(&ep->uval.refval.node, ext);
 
-	    *(*ext)++ = ERL_REF_CREATION(ep);
+            i = ERL_REF_CREATION(ep);
+            if ((unsigned int)i <= 3) {
+                *tagp = ERL_NEW_REFERENCE_EXT;
+                *(*ext)++ = i;
+            } else {
+                *tagp = ERL_NEWER_REFERENCE_EXT;
+                *(*ext)++ = (i >> 24) &0xff;
+                *(*ext)++ = (i >> 16) &0xff;
+                *(*ext)++ = (i >>  8) &0xff;
+                *(*ext)++ = i &0xff;
+            }
+
 	    /* Then the integer fields */
 	    for (j = 0; j < ERL_REF_LEN(ep); j++) {
 		i = ERL_REF_NUMBERS(ep)[j];
@@ -347,8 +374,8 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
 	    }
 	}
 	return 0;
-    case ERL_PORT:
-	*(*ext)++ = ERL_PORT_EXT;
+    case ERL_PORT: {
+	unsigned char* tagp = (*ext)++;
 	/* First poke in node as an atom */
 	encode_atom(&ep->uval.portval.node, ext);
 	/* Then the integer fields */
@@ -357,8 +384,20 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
 	*(*ext)++ = (i >> 16) &0xff;
 	*(*ext)++ = (i >>  8) &0xff;
 	*(*ext)++ = i &0xff;
-	*(*ext)++ = ERL_PORT_CREATION(ep);
+
+        i = ERL_PORT_CREATION(ep);
+        if ((unsigned int)i <= 3) {
+            *tagp = ERL_PORT_EXT;
+            *(*ext)++ = i;
+        } else {
+            *tagp = ERL_NEW_PORT_EXT;
+            *(*ext)++ = (i >> 24) &0xff;
+            *(*ext)++ = (i >> 16) &0xff;
+            *(*ext)++ = (i >>  8) &0xff;
+            *(*ext)++ = i &0xff;
+        }
 	return 0;
+    }
     case ERL_EMPTY_LIST:
 	*(*ext)++ = ERL_NIL_EXT;
 	break;
@@ -697,12 +736,14 @@ static ETERM *erl_decode_it(unsigned char **ext)
     unsigned int u,sign;
     int i,j,arity;
     double ff;
+    unsigned char tag;
     
     /* Assume we are going to decode an integer */
     ep = erl_alloc_eterm(ERL_INTEGER);
     ERL_COUNT(ep) = 1;
 
-    switch (*(*ext)++) 
+    tag = *(*ext)++;
+    switch (tag)
     {
     case ERL_INTEGER_EXT:
 	i = (int) (**ext << 24) | ((*ext)[1] << 16) |
@@ -726,6 +767,13 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	    ((*ext)[2]) << 8 |((*ext)[3]); 
 	*ext += 4;
     big_cont:
+
+#ifdef _MSC_VER
+#define MAX_TO_NEGATE 0x8000000000000000Ui64
+#else
+#define MAX_TO_NEGATE 0x8000000000000000ULL
+#endif
+
 	sign = *(*ext)++; 
 	if (arity > 8)             
 	    goto big_truncate;
@@ -762,23 +810,28 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	    *ext += arity;
 	    return ep;
 	} else {
-	    /* Fits in a long long */
-	    int x;
-	    long long l = 0LL;
-
-	    for(x = 0 ; x < arity ; x++) {
-		l |= ((long long)(*ext)[x]) << ((long long)(8*x));
-	    }
-	    if (sign) {
-		l = -l;
-		if (l > 0) goto big_truncate;
-	    }
-
-	    ERL_TYPE(ep) = ERL_LONGLONG;
-	    ep->uval.llval.i = l;
-	    *ext += arity;
-	    return ep;
+            /* Fits in a signed long long */
+            int x;
+            unsigned long long l = 0LL;
+            long long sl;
+
+            for(x = 0 ; x < arity ; x++) {
+                l |= ((unsigned long long)(*ext)[x]) << ((unsigned long long)(8*x));
+            }
+
+            sl = (long long)l;
+
+            if (sign && l != MAX_TO_NEGATE) {
+                sl = -sl;
+                if (sl > 0) goto big_truncate;
+            }
+
+            ERL_TYPE(ep) = ERL_LONGLONG;
+            ep->uval.llval.i = sl;
+            *ext += arity;
+            return ep;
 	}
+#undef MAX_TO_NEGATE
     big_truncate: 
 	/* truncate to: (+/-) 1 */
 #ifdef DEBUG
@@ -800,9 +853,10 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	return ep;
       
     case ERL_PID_EXT:
+    case ERL_NEW_PID_EXT:
 	{
 	    unsigned int number, serial;
-	    unsigned char creation;
+	    unsigned int creation;
 
 	    ERL_TYPE(ep) = ERL_PID;
 	    if (read_atom(ext, &ep->uval.pidval.node) < 0) return NULL;
@@ -814,7 +868,13 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	    serial = ((*ext)[0] << 24) | ((*ext)[1]) << 16 | 
 		((*ext)[2]) << 8 | ((*ext)[3]);	
 	    *ext += 4;
-	    creation =  *(*ext)++; 
+            if (tag == ERL_PID_EXT)
+                creation =  *(*ext)++;
+            else {
+                creation = ((*ext)[0] << 24) | ((*ext)[1]) << 16 |
+                    ((*ext)[2]) << 8 | ((*ext)[3]);
+                *ext += 4;
+            }
 	    erl_mk_pid_helper(ep, number, serial, creation);
 	    return ep;
 	}
@@ -835,11 +895,12 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	    return ep;
 	}
 
-    case ERL_NEW_REFERENCE_EXT: 
+    case ERL_NEW_REFERENCE_EXT:
+    case ERL_NEWER_REFERENCE_EXT:
 	{
 	    size_t cnt, i;
 	    unsigned int n[3];
-	    unsigned char creation;
+	    unsigned int creation;
 
 	    ERL_TYPE(ep) = ERL_REF;
 	    cnt = ((*ext)[0] << 8) | (*ext)[1];
@@ -848,7 +909,13 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	    if (read_atom(ext, &ep->uval.refval.node) < 0) return NULL;
 
 	    /* get the integers */
-	    creation =  *(*ext)++; 
+            if (tag == ERL_NEW_REFERENCE_EXT)
+                creation =  *(*ext)++;
+            else {
+                creation = ((*ext)[0] << 24) | ((*ext)[1]) << 16 |
+                    ((*ext)[2]) << 8 | ((*ext)[3]);
+                *ext += 4;
+            }
 	    for(i = 0; i < cnt; i++)
 	    {
 		n[i] = ((*ext)[0] << 24) | ((*ext)[1]) << 16 | 
@@ -860,9 +927,10 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	}
 
     case ERL_PORT_EXT:
+    case ERL_NEW_PORT_EXT:
 	{
 	    unsigned int number;
-	    unsigned char creation;
+	    unsigned int creation;
 
 	    ERL_TYPE(ep) = ERL_PORT;
 	    if (read_atom(ext, &ep->uval.portval.node) < 0) return NULL;
@@ -871,7 +939,13 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	    number = ((*ext)[0] << 24) | ((*ext)[1]) << 16 | 
 		((*ext)[2]) << 8 | ((*ext)[3]);	
 	    *ext += 4;
-	    creation =  *(*ext)++; 
+            if (tag == ERL_PORT_EXT)
+                creation =  *(*ext)++;
+            else {
+                creation = (((*ext)[0] << 24) | ((*ext)[1]) << 16 |
+                            ((*ext)[2]) << 8  | ((*ext)[3]));
+                *ext += 4;
+            }
 	    erl_mk_port_helper(ep, number, creation);
 	    return ep;
 	}
@@ -1113,11 +1187,14 @@ unsigned char erl_ext_type(unsigned char *ext)
     case ERL_SMALL_ATOM_UTF8_EXT:
 	return ERL_ATOM;
     case ERL_PID_EXT:
+    case ERL_NEW_PID_EXT:
 	return ERL_PID;
     case ERL_PORT_EXT:
+    case ERL_NEW_PORT_EXT:
 	return ERL_PORT;
     case ERL_REFERENCE_EXT:
     case ERL_NEW_REFERENCE_EXT:
+    case ERL_NEWER_REFERENCE_EXT:
 	return ERL_REF;
     case ERL_NIL_EXT: 
 	return ERL_EMPTY_LIST;
@@ -1166,9 +1243,12 @@ int erl_ext_size(unsigned char *t)
     case ERL_SMALL_ATOM_EXT:
     case ERL_SMALL_ATOM_UTF8_EXT:
     case ERL_PID_EXT:
+    case ERL_NEW_PID_EXT:
     case ERL_PORT_EXT:
+    case ERL_NEW_PORT_EXT:
     case ERL_REFERENCE_EXT:
     case ERL_NEW_REFERENCE_EXT:
+    case ERL_NEWER_REFERENCE_EXT:
     case ERL_NIL_EXT: 
     case ERL_BINARY_EXT:
     case ERL_STRING_EXT:
@@ -1239,8 +1319,9 @@ static int jump(unsigned char **ext)
 {
     int j,k,i=0;
     int n;
+    const int tag = *(*ext)++;
     
-    switch (*(*ext)++) {
+    switch (tag) {
     case ERL_VERSION_MAGIC:
 	return jump(ext);
     case ERL_INTEGER_EXT:
@@ -1256,22 +1337,29 @@ static int jump(unsigned char **ext)
 	jump_atom(ext);
 	break;
     case ERL_PID_EXT:
-	/* eat first atom */
 	if (!jump_atom(ext)) return 0;
-	*ext += 9;		/* Two int's and the creation field */
+	*ext += 4 + 4 + 1;
 	break;
+    case ERL_NEW_PID_EXT:
+        if (!jump_atom(ext)) return 0;
+        *ext += 4 + 4 + 4;
+        break;
     case ERL_REFERENCE_EXT:
     case ERL_PORT_EXT:
-	/* first field is an atom */
 	if (!jump_atom(ext)) return 0;
-	*ext += 5;		/* One int and the creation field */
+	*ext += 4 + 1;
 	break;
+    case ERL_NEW_PORT_EXT:
+        if (!jump_atom(ext)) return 0;
+        *ext += 4 + 4;
+        break;
     case ERL_NEW_REFERENCE_EXT:
+    case ERL_NEWER_REFERENCE_EXT:
 	n = (**ext << 8) | (*ext)[1];
 	*ext += 2;
 	/* first field is an atom */
 	if (!jump_atom(ext)) return 0;
-	*ext += 4*n+1;
+	*ext += 4*n + (tag == ERL_NEW_REFERENCE_EXT ? 1 : 4);
 	break;
     case ERL_NIL_EXT:
 	/* We just passed it... */
@@ -1604,7 +1692,6 @@ static int cmp_exe2(unsigned char **e1, unsigned char **e2)
 {
   int min,  ret,i,j,k;
   double ff1, ff2;
-  unsigned char *tmp1, *tmp2;
   unsigned char tag1, tag2;
 
   if ( ((*e1)[0] == ERL_STRING_EXT) && ((*e2)[0] == ERL_LIST_EXT) ) {
@@ -1648,47 +1735,68 @@ static int cmp_exe2(unsigned char **e1, unsigned char **e2)
       *e1 += i;
       *e2 += j;
       return ret;
-    case ERL_PID_EXT: {
-      unsigned char *n1 = *e1;
-      unsigned char *n2 = *e2;
-      CMP_EXT_SKIP_ATOM(*e1); CMP_EXT_SKIP_ATOM(*e2);
-      *e1 += 9; *e2 += 9;
+    case ERL_PID_EXT:
+    case ERL_NEW_PID_EXT: {
+      erlang_pid pid1, pid2;
+      unsigned char* buf1 = *e1 - 1;
+      unsigned char* buf2 = *e2 - 1;
+      int ix1 = 0, ix2 = 0;
+
+      if (ei_decode_pid((char*)buf1, &ix1, &pid1) ||
+          ei_decode_pid((char*)buf2, &ix2, &pid2))
+          return CMP_EXT_ERROR_CODE;
+
+      *e1 = buf1 + ix1;
+      *e2 = buf2 + ix2;
 
       /* First compare serials ... */
-      tmp1 = *e1 - 5; tmp2 = *e2 - 5;
-      CMP_EXT_INT32_BE(tmp1, tmp2);
+      if      (pid1.serial < pid2.serial) return -1;
+      else if (pid1.serial > pid2.serial) return 1;
 
       /* ... then ids ... */
-      tmp1 -= 4; tmp2 -= 4;
-      CMP_EXT_INT32_BE(tmp1, tmp2);
+      if      (pid1.num < pid2.num) return -1;
+      else if (pid1.num > pid2.num) return 1;
 
       /* ... then node names ... */
-      ret = cmp_exe2(&n1, &n2);
-      if (ret != 0)
-	  return ret;
+      j = strcmp(pid1.node, pid2.node);
+      if      (j < 0) return -1;
+      else if (j > 0) return 1;
 
       /* ... and then finaly creations. */
-      tmp1 += 8; tmp2 += 8;
-      if (*tmp1 != *tmp2)
-	  return *tmp1 < *tmp2 ? -1 : 1;
+      if      (pid1.creation < pid2.creation) return -1;
+      else if (pid1.creation > pid2.creation) return 1;
+
       return 0;
     }
     case ERL_PORT_EXT:
-      /* First compare node names ... */
-      if (!IS_ERL_ATOM(**e1) || !IS_ERL_ATOM(**e2))
-	  return CMP_EXT_ERROR_CODE;
-      ret = cmp_exe2(e1, e2);
-      *e1 += 5; *e2 += 5;
-      if (ret != 0)
-	  return ret;
+    case ERL_NEW_PORT_EXT: {
+        erlang_port port1, port2;
+        unsigned char* buf1 = *e1 - 1;
+        unsigned char* buf2 = *e2 - 1;
+        int ix1 = 0, ix2 = 0;
+
+        if (ei_decode_port((char*)buf1, &ix1, &port1) ||
+            ei_decode_port((char*)buf2, &ix2, &port2))
+            return CMP_EXT_ERROR_CODE;
+
+        *e1 = buf1 + ix1;
+        *e2 = buf2 + ix2;
+
+        /* First compare node names ... */
+        j = strcmp(port1.node, port2.node);
+        if      (j < 0) return -1;
+        else if (j > 0) return 1;
+
       /* ... then creations ... */
-      tmp1 = *e1 - 1; tmp2 = *e2 - 1;
-      if (*tmp1 != *tmp2)
-	  return *tmp1 < *tmp2 ? -1 : 1;
+        if      (port1.creation < port2.creation) return -1;
+        else if (port1.creation > port2.creation) return 1;
+
       /* ... and then finaly ids. */
-      tmp1 -= 4; tmp2 -= 4;
-      CMP_EXT_INT32_BE(tmp1, tmp2);
-      return 0;
+        if      (port1.id < port2.id) return -1;
+        else if (port1.id > port2.id) return 1;
+
+        return 0;
+    }
     case ERL_NIL_EXT: return 0;
     case ERL_LIST_EXT:
       i = (**e1 << 24) | ((*e1)[1] << 16) |((*e1)[2] << 8) | (*e1)[3];
diff --git a/lib/erl_interface/src/legacy/erl_marshal.h b/lib/erl_interface/src/legacy/erl_marshal.h
index 8b3c3b6fa1..c1963b832d 100644
--- a/lib/erl_interface/src/legacy/erl_marshal.h
+++ b/lib/erl_interface/src/legacy/erl_marshal.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_resolve.c b/lib/erl_interface/src/legacy/erl_resolve.c
index 7dfebb78ed..bb09caec85 100644
--- a/lib/erl_interface/src/legacy/erl_resolve.c
+++ b/lib/erl_interface/src/legacy/erl_resolve.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2003-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2003-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_timeout.c b/lib/erl_interface/src/legacy/erl_timeout.c
index 146a106e7c..e36ea0e250 100644
--- a/lib/erl_interface/src/legacy/erl_timeout.c
+++ b/lib/erl_interface/src/legacy/erl_timeout.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/erl_timeout.h b/lib/erl_interface/src/legacy/erl_timeout.h
index 4ef6d21a72..6bcfa5ecbb 100644
--- a/lib/erl_interface/src/legacy/erl_timeout.h
+++ b/lib/erl_interface/src/legacy/erl_timeout.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/global_names.c b/lib/erl_interface/src/legacy/global_names.c
index 3a437df3a3..ee808620fb 100644
--- a/lib/erl_interface/src/legacy/global_names.c
+++ b/lib/erl_interface/src/legacy/global_names.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/global_register.c b/lib/erl_interface/src/legacy/global_register.c
index cce60f25da..4cb6d8071f 100644
--- a/lib/erl_interface/src/legacy/global_register.c
+++ b/lib/erl_interface/src/legacy/global_register.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/global_unregister.c b/lib/erl_interface/src/legacy/global_unregister.c
index 593a8a7860..27f68670ca 100644
--- a/lib/erl_interface/src/legacy/global_unregister.c
+++ b/lib/erl_interface/src/legacy/global_unregister.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/global_whereis.c b/lib/erl_interface/src/legacy/global_whereis.c
index 589c9d17de..13c4c93ca7 100644
--- a/lib/erl_interface/src/legacy/global_whereis.c
+++ b/lib/erl_interface/src/legacy/global_whereis.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/legacy/portability.h b/lib/erl_interface/src/legacy/portability.h
index 5f984b08e1..42a78662d5 100644
--- a/lib/erl_interface/src/legacy/portability.h
+++ b/lib/erl_interface/src/legacy/portability.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2000-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2000-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/misc/ei_compat.c b/lib/erl_interface/src/misc/ei_compat.c
index 45ea6e3a72..93d7dbfb83 100644
--- a/lib/erl_interface/src/misc/ei_compat.c
+++ b/lib/erl_interface/src/misc/ei_compat.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2004-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2004-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_decode_term.c b/lib/erl_interface/src/misc/ei_decode_term.c
index ce5ae5b19d..63a7034508 100644
--- a/lib/erl_interface/src/misc/ei_decode_term.c
+++ b/lib/erl_interface/src/misc/ei_decode_term.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2001-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  *
@@ -32,7 +33,7 @@
 int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 {
     const char* s = buf + *index, * s0 = s;
-    int i, n, sign;
+    int n, sign;
     char c;
 
     if (term == NULL) return -1;
@@ -46,47 +47,27 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 	break;
     case ERL_FLOAT_EXT:
     case NEW_FLOAT_EXT:
-        return ei_decode_double(buf, index, &term->value.d_val);
+        return (ei_decode_double(buf, index, &term->value.d_val) < 0
+                ? -1 : 1);
     case ERL_ATOM_EXT:
     case ERL_ATOM_UTF8_EXT:
     case ERL_SMALL_ATOM_EXT:
     case ERL_SMALL_ATOM_UTF8_EXT:
-	return ei_decode_atom(buf, index, term->value.atom_name);
+	return (ei_decode_atom(buf, index, term->value.atom_name) < 0
+                ? -1 : 1);
     case ERL_REFERENCE_EXT:
-	/* first the nodename */
-	if (get_atom(&s, term->value.ref.node, NULL) < 0) return -1;
-        /* now the numbers: num (4), creation (1) */
-	term->value.ref.n[0] = get32be(s);
-	term->value.ref.len = 1;
-	term->value.ref.creation = get8(s) & 0x03;
-	break;
     case ERL_NEW_REFERENCE_EXT:
-	/* first the integer count */
-	term->value.ref.len = get16be(s);
-	/* then the nodename */
-	if (get_atom(&s, term->value.ref.node, NULL) < 0) return -1;
-	/* creation */
-	term->value.ref.creation = get8(s) & 0x03;
-	/* finally the id integers */
-	for (i = 0; (i<term->value.ref.len) && (i<3); i++) {
-	    term->value.ref.n[i] = get32be(s);
-	}
-	if (term->value.ref.len > 3) {
-	    s += 4 * (term->value.ref.len - 3);
-	}
-	break;
+    case ERL_NEWER_REFERENCE_EXT:
+        return (ei_decode_ref(buf, index, &term->value.ref) < 0
+                ? -1 : 1);
     case ERL_PORT_EXT:
-	if (get_atom(&s, term->value.port.node, NULL) < 0) return -1;
-	term->value.port.id = get32be(s) & 0x0fffffff; /* 28 bits */;
-	term->value.port.creation = get8(s) & 0x03;
-	break;
+    case ERL_NEW_PORT_EXT:
+        return (ei_decode_port(buf, index, &term->value.port) < 0
+                ? -1 : 1);
     case ERL_PID_EXT:
-	if (get_atom(&s, term->value.pid.node, NULL) < 0) return -1;
-	/* now the numbers: num (4), serial (4), creation (1) */
-	term->value.pid.num = get32be(s) & 0x7fff; /* 15 bits */
-	term->value.pid.serial = get32be(s) & 0x1fff; /* 13 bits */
-	term->value.pid.creation = get8(s) & 0x03; /* 2 bits */
-	break;
+    case ERL_NEW_PID_EXT:
+        return (ei_decode_pid(buf, index, &term->value.pid) < 0
+                ? -1 : 1);
     case ERL_SMALL_TUPLE_EXT:
 	term->arity = get8(s);
 	break;
@@ -100,6 +81,7 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 	term->size = get16be(s);
 	return 0;
     case ERL_LIST_EXT:
+    case ERL_MAP_EXT:
 	term->arity = get32be(s);
 	break;
     case ERL_BINARY_EXT:
diff --git a/lib/erl_interface/src/misc/ei_decode_term.h b/lib/erl_interface/src/misc/ei_decode_term.h
index 76a71ae0a6..cf2b8f7e86 100644
--- a/lib/erl_interface/src/misc/ei_decode_term.h
+++ b/lib/erl_interface/src/misc/ei_decode_term.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_format.c b/lib/erl_interface/src/misc/ei_format.c
index 07499213cd..a188171f40 100644
--- a/lib/erl_interface/src/misc/ei_format.c
+++ b/lib/erl_interface/src/misc/ei_format.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_format.h b/lib/erl_interface/src/misc/ei_format.h
index e94d0531f5..7a418008a1 100644
--- a/lib/erl_interface/src/misc/ei_format.h
+++ b/lib/erl_interface/src/misc/ei_format.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_internal.h b/lib/erl_interface/src/misc/ei_internal.h
index f7805efebf..aa6aacd703 100644
--- a/lib/erl_interface/src/misc/ei_internal.h
+++ b/lib/erl_interface/src/misc/ei_internal.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_locking.c b/lib/erl_interface/src/misc/ei_locking.c
index e3f57d5ba2..85b2a5fd8b 100644
--- a/lib/erl_interface/src/misc/ei_locking.c
+++ b/lib/erl_interface/src/misc/ei_locking.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_locking.h b/lib/erl_interface/src/misc/ei_locking.h
index f97683e40d..1bbee2d499 100644
--- a/lib/erl_interface/src/misc/ei_locking.h
+++ b/lib/erl_interface/src/misc/ei_locking.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_malloc.c b/lib/erl_interface/src/misc/ei_malloc.c
index b122c0f7b8..a8921bc5b5 100644
--- a/lib/erl_interface/src/misc/ei_malloc.c
+++ b/lib/erl_interface/src/misc/ei_malloc.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_malloc.h b/lib/erl_interface/src/misc/ei_malloc.h
index ef8efaf9ea..b62a3cf4d7 100644
--- a/lib/erl_interface/src/misc/ei_malloc.h
+++ b/lib/erl_interface/src/misc/ei_malloc.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_portio.c b/lib/erl_interface/src/misc/ei_portio.c
index f879c4e2f9..8cd35bf2e5 100644
--- a/lib/erl_interface/src/misc/ei_portio.c
+++ b/lib/erl_interface/src/misc/ei_portio.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_portio.h b/lib/erl_interface/src/misc/ei_portio.h
index f2c92278db..fbb61b0ccf 100644
--- a/lib/erl_interface/src/misc/ei_portio.h
+++ b/lib/erl_interface/src/misc/ei_portio.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
@@ -20,6 +21,12 @@
  */
 #ifndef _EI_PORTIO_H
 #define _EI_PORTIO_H
+#if !defined(__WIN32__) || !defined(VXWORKS)
+#ifdef HAVE_WRITEV
+/* Declaration of struct iovec *iov should be visible in this scope. */
+#include <sys/uio.h>
+#endif
+#endif
 
 int ei_accept_t(int fd, void   *addr,   void  *addrlen, unsigned ms);
 int ei_connect_t(int fd, void *sinp, int sin_siz, unsigned ms);
@@ -28,8 +35,7 @@ int ei_write_fill(int fd, const char *buf, int len);
 int ei_read_fill_t(int fd, char* buf, int len, unsigned ms);
 int ei_write_fill_t(int fd, const char *buf, int len, unsigned ms);
 #ifdef HAVE_WRITEV
-int ei_writev_fill_t(int fd,  const  struct  iovec  *iov,  int iovcnt,
-		      unsigned ms);
+int ei_writev_fill_t(int fd,  const  struct  iovec  *iov,  int iovcnt, unsigned ms);
 #endif
 
 #endif /* _EI_PORTIO_H */
diff --git a/lib/erl_interface/src/misc/ei_printterm.c b/lib/erl_interface/src/misc/ei_printterm.c
index 95369db15a..058de00de5 100644
--- a/lib/erl_interface/src/misc/ei_printterm.c
+++ b/lib/erl_interface/src/misc/ei_printterm.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2001-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  *
@@ -150,15 +151,18 @@ static int print_term(FILE* fp, ei_x_buff* x,
 	}
 	break;
     case ERL_PID_EXT:
+    case ERL_NEW_PID_EXT:
 	if (ei_decode_pid(buf, index, &pid) < 0) goto err;
 	ch_written += xprintf(fp, x, "<%s.%d.%d>", pid.node,
 			      pid.num, pid.serial);
 	break;
     case ERL_PORT_EXT:
+    case ERL_NEW_PORT_EXT:
 	if (ei_decode_port(buf, index, &port) < 0) goto err;
 	ch_written += xprintf(fp, x, "#Port<%d.%d>", port.id, port.creation);
 	break;
     case ERL_NEW_REFERENCE_EXT:
+    case ERL_NEWER_REFERENCE_EXT:
     case ERL_REFERENCE_EXT:
 	if (ei_decode_ref(buf, index, &ref) < 0) goto err;
 	ch_written += xprintf(fp, x, "#Ref<");
diff --git a/lib/erl_interface/src/misc/ei_printterm.h b/lib/erl_interface/src/misc/ei_printterm.h
index 13350e3ecd..953ea00744 100644
--- a/lib/erl_interface/src/misc/ei_printterm.h
+++ b/lib/erl_interface/src/misc/ei_printterm.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_pthreads.c b/lib/erl_interface/src/misc/ei_pthreads.c
index a741dfd5c2..25608edeec 100644
--- a/lib/erl_interface/src/misc/ei_pthreads.c
+++ b/lib/erl_interface/src/misc/ei_pthreads.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_trace.c b/lib/erl_interface/src/misc/ei_trace.c
index fb183c8be4..53d90a9c51 100644
--- a/lib/erl_interface/src/misc/ei_trace.c
+++ b/lib/erl_interface/src/misc/ei_trace.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_trace.h b/lib/erl_interface/src/misc/ei_trace.h
index d3513c9353..a0988ca8ae 100644
--- a/lib/erl_interface/src/misc/ei_trace.h
+++ b/lib/erl_interface/src/misc/ei_trace.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/ei_x_encode.c b/lib/erl_interface/src/misc/ei_x_encode.c
index 14d0b56b8f..4ff5974663 100644
--- a/lib/erl_interface/src/misc/ei_x_encode.c
+++ b/lib/erl_interface/src/misc/ei_x_encode.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
@@ -206,6 +207,16 @@ int ei_x_encode_tuple_header(ei_x_buff* x, long n)
     return ei_encode_tuple_header(x->buff, &x->index, n);
 }
 
+int ei_x_encode_map_header(ei_x_buff* x, long n)
+{
+    int i = x->index;
+    if (ei_encode_map_header(NULL, &i, n) == -1)
+      return -1;
+    if (!x_fix_buff(x, i))
+	return -1;
+    return ei_encode_map_header(x->buff, &x->index, n);
+}
+
 int ei_x_encode_atom(ei_x_buff* x, const char* s)
 {
     return ei_x_encode_atom_len_as(x, s, strlen(s), ERLANG_LATIN1, ERLANG_LATIN1);
diff --git a/lib/erl_interface/src/misc/ei_x_encode.h b/lib/erl_interface/src/misc/ei_x_encode.h
index 3eab23ce0a..2c8e362caa 100644
--- a/lib/erl_interface/src/misc/ei_x_encode.h
+++ b/lib/erl_interface/src/misc/ei_x_encode.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/eidef.h b/lib/erl_interface/src/misc/eidef.h
index bd3d0bf631..f38824d826 100644
--- a/lib/erl_interface/src/misc/eidef.h
+++ b/lib/erl_interface/src/misc/eidef.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
@@ -41,6 +42,27 @@
 typedef int socklen_t;
 #endif
 
+#ifdef USE_ISINF_ISNAN		/* simulate finite() */
+#  define isfinite(f) (!isinf(f) && !isnan(f))
+#  define HAVE_ISFINITE
+#elif defined(__GNUC__) && defined(HAVE_FINITE)
+/* We use finite in gcc as it emits assembler instead of
+   the function call that isfinite emits. The assembler is
+   significantly faster. */
+#  ifdef isfinite
+#     undef isfinite
+#  endif
+#  define isfinite finite
+#  ifndef HAVE_ISFINITE
+#    define HAVE_ISFINITE
+#  endif
+#elif defined(isfinite) && !defined(HAVE_ISFINITE)
+#  define HAVE_ISFINITE
+#elif !defined(HAVE_ISFINITE) && defined(HAVE_FINITE)
+#  define isfinite finite
+#  define HAVE_ISFINITE
+#endif
+
 typedef unsigned char  uint8;	/* FIXME use configure */
 typedef unsigned short uint16;
 typedef unsigned int   uint32;
diff --git a/lib/erl_interface/src/misc/eiext.h b/lib/erl_interface/src/misc/eiext.h
index 85ed9e0d50..ac60d73821 100644
--- a/lib/erl_interface/src/misc/eiext.h
+++ b/lib/erl_interface/src/misc/eiext.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/get_type.c b/lib/erl_interface/src/misc/get_type.c
index 2bd992bd56..aa69cd4d60 100644
--- a/lib/erl_interface/src/misc/get_type.c
+++ b/lib/erl_interface/src/misc/get_type.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  *
@@ -75,6 +76,15 @@ int ei_get_type_internal(const char *buf, const int *index,
     *len = get32be(s); /* #digit_bytes */
     break;
 
+  case ERL_NEW_PID_EXT:
+      *type = ERL_PID_EXT;
+      break;
+  case ERL_NEW_PORT_EXT:
+      *type = ERL_PORT_EXT;
+      break;
+  case ERL_NEWER_REFERENCE_EXT:
+      *type = ERL_NEW_REFERENCE_EXT;
+      break;
   default:
     *len = 0;
     break;
diff --git a/lib/erl_interface/src/misc/putget.h b/lib/erl_interface/src/misc/putget.h
index c751e03093..afc04e32f9 100644
--- a/lib/erl_interface/src/misc/putget.h
+++ b/lib/erl_interface/src/misc/putget.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/misc/show_msg.c b/lib/erl_interface/src/misc/show_msg.c
index 935a9a3287..5868cccba6 100644
--- a/lib/erl_interface/src/misc/show_msg.c
+++ b/lib/erl_interface/src/misc/show_msg.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  *
@@ -39,6 +40,8 @@
 #       include <time.h>
 #    endif
 #  endif
+#else
+#  include <time.h>
 #endif
 
 #include "eiext.h"
@@ -397,6 +400,7 @@ static void show_term(const char *termbuf, int *index, FILE *stream)
 	break;
 
     case ERL_PID_EXT:
+    case ERL_NEW_PID_EXT:
 	ei_decode_pid(termbuf,index,&pid);
 	show_pid(stream,&pid);
 	break;
@@ -431,6 +435,7 @@ static void show_term(const char *termbuf, int *index, FILE *stream)
     
     case ERL_REFERENCE_EXT:
     case ERL_NEW_REFERENCE_EXT:
+    case ERL_NEWER_REFERENCE_EXT:
 	ei_decode_ref(termbuf,index,&ref);
 	fprintf(stream,"#Ref<%s",ref.node);
 	for (i = 0; i < ref.len; i++) {
@@ -440,6 +445,7 @@ static void show_term(const char *termbuf, int *index, FILE *stream)
 	break;
 
     case ERL_PORT_EXT:
+    case ERL_NEW_PORT_EXT:
 	ei_decode_port(termbuf,index,&port);
 	fprintf(stream,"#Port<%s.%u.%u>",port.node,port.id,port.creation);
 	break;
diff --git a/lib/erl_interface/src/misc/show_msg.h b/lib/erl_interface/src/misc/show_msg.h
index fac51f3278..de0f8fcdcd 100644
--- a/lib/erl_interface/src/misc/show_msg.h
+++ b/lib/erl_interface/src/misc/show_msg.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/not_used/ei_send.c b/lib/erl_interface/src/not_used/ei_send.c
index 2701b4404c..8071876677 100644
--- a/lib/erl_interface/src/not_used/ei_send.c
+++ b/lib/erl_interface/src/not_used/ei_send.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/not_used/ei_send_reg.c b/lib/erl_interface/src/not_used/ei_send_reg.c
index af68549c6d..ba9c7348f9 100644
--- a/lib/erl_interface/src/not_used/ei_send_reg.c
+++ b/lib/erl_interface/src/not_used/ei_send_reg.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/not_used/send_link.c b/lib/erl_interface/src/not_used/send_link.c
index 4b43b2f0cc..7be476fd93 100644
--- a/lib/erl_interface/src/not_used/send_link.c
+++ b/lib/erl_interface/src/not_used/send_link.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/not_used/whereis.c b/lib/erl_interface/src/not_used/whereis.c
index a4dd73e952..4072fa7b33 100644
--- a/lib/erl_interface/src/not_used/whereis.c
+++ b/lib/erl_interface/src/not_used/whereis.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/prog/ei_fake_prog.c b/lib/erl_interface/src/prog/ei_fake_prog.c
index 56d4eb7db4..c7a16dc7c4 100644
--- a/lib/erl_interface/src/prog/ei_fake_prog.c
+++ b/lib/erl_interface/src/prog/ei_fake_prog.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/prog/erl_call.c b/lib/erl_interface/src/prog/erl_call.c
index 4182ab2d5e..d233ed26a2 100644
--- a/lib/erl_interface/src/prog/erl_call.c
+++ b/lib/erl_interface/src/prog/erl_call.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/prog/erl_fake_prog.c b/lib/erl_interface/src/prog/erl_fake_prog.c
index a2b49a0ed9..093bad8d7c 100644
--- a/lib/erl_interface/src/prog/erl_fake_prog.c
+++ b/lib/erl_interface/src/prog/erl_fake_prog.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/src/prog/erl_start.c b/lib/erl_interface/src/prog/erl_start.c
index a53aab9ac7..d8f0632341 100644
--- a/lib/erl_interface/src/prog/erl_start.c
+++ b/lib/erl_interface/src/prog/erl_start.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/prog/erl_start.h b/lib/erl_interface/src/prog/erl_start.h
index 05f34864a7..1d0d584c45 100644
--- a/lib/erl_interface/src/prog/erl_start.h
+++ b/lib/erl_interface/src/prog/erl_start.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/hash.h b/lib/erl_interface/src/registry/hash.h
index 3886e8664b..7fcaced319 100644
--- a/lib/erl_interface/src/registry/hash.h
+++ b/lib/erl_interface/src/registry/hash.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/hash_dohash.c b/lib/erl_interface/src/registry/hash_dohash.c
index f672dce9b3..6f859cef2e 100644
--- a/lib/erl_interface/src/registry/hash_dohash.c
+++ b/lib/erl_interface/src/registry/hash_dohash.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/hash_foreach.c b/lib/erl_interface/src/registry/hash_foreach.c
index 77afc7ade1..b58df27e8e 100644
--- a/lib/erl_interface/src/registry/hash_foreach.c
+++ b/lib/erl_interface/src/registry/hash_foreach.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/hash_freetab.c b/lib/erl_interface/src/registry/hash_freetab.c
index cd428e55cf..0a2c0dcfe6 100644
--- a/lib/erl_interface/src/registry/hash_freetab.c
+++ b/lib/erl_interface/src/registry/hash_freetab.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/hash_insert.c b/lib/erl_interface/src/registry/hash_insert.c
index dbe76282ae..0002cb64df 100644
--- a/lib/erl_interface/src/registry/hash_insert.c
+++ b/lib/erl_interface/src/registry/hash_insert.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/hash_isprime.c b/lib/erl_interface/src/registry/hash_isprime.c
index cdef2591ab..58166c6957 100644
--- a/lib/erl_interface/src/registry/hash_isprime.c
+++ b/lib/erl_interface/src/registry/hash_isprime.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/hash_lookup.c b/lib/erl_interface/src/registry/hash_lookup.c
index 0a466cc519..31c30179df 100644
--- a/lib/erl_interface/src/registry/hash_lookup.c
+++ b/lib/erl_interface/src/registry/hash_lookup.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/hash_newtab.c b/lib/erl_interface/src/registry/hash_newtab.c
index b900de1f69..4baa5a7b41 100644
--- a/lib/erl_interface/src/registry/hash_newtab.c
+++ b/lib/erl_interface/src/registry/hash_newtab.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/hash_remove.c b/lib/erl_interface/src/registry/hash_remove.c
index cebe00da1c..080f15889e 100644
--- a/lib/erl_interface/src/registry/hash_remove.c
+++ b/lib/erl_interface/src/registry/hash_remove.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/hash_resize.c b/lib/erl_interface/src/registry/hash_resize.c
index 9c34a0d41c..031d8bfbf6 100644
--- a/lib/erl_interface/src/registry/hash_resize.c
+++ b/lib/erl_interface/src/registry/hash_resize.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/hash_rlookup.c b/lib/erl_interface/src/registry/hash_rlookup.c
index 5d401555d8..b0a948673a 100644
--- a/lib/erl_interface/src/registry/hash_rlookup.c
+++ b/lib/erl_interface/src/registry/hash_rlookup.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg.h b/lib/erl_interface/src/registry/reg.h
index cb7685506c..261e36ac06 100644
--- a/lib/erl_interface/src/registry/reg.h
+++ b/lib/erl_interface/src/registry/reg.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_close.c b/lib/erl_interface/src/registry/reg_close.c
index b699e59ac8..c1475383e1 100644
--- a/lib/erl_interface/src/registry/reg_close.c
+++ b/lib/erl_interface/src/registry/reg_close.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_delete.c b/lib/erl_interface/src/registry/reg_delete.c
index 8e84e205ee..8882f611bc 100644
--- a/lib/erl_interface/src/registry/reg_delete.c
+++ b/lib/erl_interface/src/registry/reg_delete.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_dirty.c b/lib/erl_interface/src/registry/reg_dirty.c
index 730b4445c6..00f19482c2 100644
--- a/lib/erl_interface/src/registry/reg_dirty.c
+++ b/lib/erl_interface/src/registry/reg_dirty.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_dump.c b/lib/erl_interface/src/registry/reg_dump.c
index d2854c10b5..43c9824433 100644
--- a/lib/erl_interface/src/registry/reg_dump.c
+++ b/lib/erl_interface/src/registry/reg_dump.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_free.c b/lib/erl_interface/src/registry/reg_free.c
index e3245577a5..d835520e76 100644
--- a/lib/erl_interface/src/registry/reg_free.c
+++ b/lib/erl_interface/src/registry/reg_free.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_get.c b/lib/erl_interface/src/registry/reg_get.c
index d1909b3fed..67d99e231e 100644
--- a/lib/erl_interface/src/registry/reg_get.c
+++ b/lib/erl_interface/src/registry/reg_get.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_getf.c b/lib/erl_interface/src/registry/reg_getf.c
index faed2f2df9..35956c3d79 100644
--- a/lib/erl_interface/src/registry/reg_getf.c
+++ b/lib/erl_interface/src/registry/reg_getf.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_geti.c b/lib/erl_interface/src/registry/reg_geti.c
index b746a4a92b..09709fdf3d 100644
--- a/lib/erl_interface/src/registry/reg_geti.c
+++ b/lib/erl_interface/src/registry/reg_geti.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_getp.c b/lib/erl_interface/src/registry/reg_getp.c
index bacfdc05c4..faff00bcb0 100644
--- a/lib/erl_interface/src/registry/reg_getp.c
+++ b/lib/erl_interface/src/registry/reg_getp.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_gets.c b/lib/erl_interface/src/registry/reg_gets.c
index d6e6d67ebe..27fd83ac03 100644
--- a/lib/erl_interface/src/registry/reg_gets.c
+++ b/lib/erl_interface/src/registry/reg_gets.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_make.c b/lib/erl_interface/src/registry/reg_make.c
index 179cb8bf47..ed77a740b6 100644
--- a/lib/erl_interface/src/registry/reg_make.c
+++ b/lib/erl_interface/src/registry/reg_make.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_open.c b/lib/erl_interface/src/registry/reg_open.c
index 0c2031707d..73c2140145 100644
--- a/lib/erl_interface/src/registry/reg_open.c
+++ b/lib/erl_interface/src/registry/reg_open.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_purge.c b/lib/erl_interface/src/registry/reg_purge.c
index 329fd32f23..08483e32f5 100644
--- a/lib/erl_interface/src/registry/reg_purge.c
+++ b/lib/erl_interface/src/registry/reg_purge.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_resize.c b/lib/erl_interface/src/registry/reg_resize.c
index 8e4794ccf7..b451a28348 100644
--- a/lib/erl_interface/src/registry/reg_resize.c
+++ b/lib/erl_interface/src/registry/reg_resize.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_restore.c b/lib/erl_interface/src/registry/reg_restore.c
index 7bc1c758af..75d073303f 100644
--- a/lib/erl_interface/src/registry/reg_restore.c
+++ b/lib/erl_interface/src/registry/reg_restore.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_set.c b/lib/erl_interface/src/registry/reg_set.c
index 70ade09ffa..95b90adb87 100644
--- a/lib/erl_interface/src/registry/reg_set.c
+++ b/lib/erl_interface/src/registry/reg_set.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_setf.c b/lib/erl_interface/src/registry/reg_setf.c
index 1021174074..e0879cb3d5 100644
--- a/lib/erl_interface/src/registry/reg_setf.c
+++ b/lib/erl_interface/src/registry/reg_setf.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_seti.c b/lib/erl_interface/src/registry/reg_seti.c
index 430a3b6d47..507ed9907e 100644
--- a/lib/erl_interface/src/registry/reg_seti.c
+++ b/lib/erl_interface/src/registry/reg_seti.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_setp.c b/lib/erl_interface/src/registry/reg_setp.c
index a994c14c78..1dd158778a 100644
--- a/lib/erl_interface/src/registry/reg_setp.c
+++ b/lib/erl_interface/src/registry/reg_setp.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_sets.c b/lib/erl_interface/src/registry/reg_sets.c
index 14bdb2699d..d281d732b7 100644
--- a/lib/erl_interface/src/registry/reg_sets.c
+++ b/lib/erl_interface/src/registry/reg_sets.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_stat.c b/lib/erl_interface/src/registry/reg_stat.c
index c3f669fd4f..e946199f4a 100644
--- a/lib/erl_interface/src/registry/reg_stat.c
+++ b/lib/erl_interface/src/registry/reg_stat.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/src/registry/reg_tabstat.c b/lib/erl_interface/src/registry/reg_tabstat.c
index edfb19fa00..1a3e654090 100644
--- a/lib/erl_interface/src/registry/reg_tabstat.c
+++ b/lib/erl_interface/src/registry/reg_tabstat.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/test/Makefile b/lib/erl_interface/test/Makefile
index 2b85dfc571..94f4b422d6 100644
--- a/lib/erl_interface/test/Makefile
+++ b/lib/erl_interface/test/Makefile
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2012. All Rights Reserved.
+# Copyright Ericsson AB 1997-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
@@ -42,7 +43,7 @@ MODULES= \
 	runner
 
 SPEC_FILES = \
-	erl_interface.spec
+	erl_interface.spec erl_interface_smoke.spec
 
 COVER_FILE = erl_interface.cover
 
diff --git a/lib/erl_interface/test/Makefile.src b/lib/erl_interface/test/Makefile.src
index 9c620bb8d9..8cf2ea0933 100644
--- a/lib/erl_interface/test/Makefile.src
+++ b/lib/erl_interface/test/Makefile.src
@@ -1,23 +1,24 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
diff --git a/lib/erl_interface/test/all_SUITE_data/Makefile.first b/lib/erl_interface/test/all_SUITE_data/Makefile.first
index b9ce689057..b83fa6ff5c 100644
--- a/lib/erl_interface/test/all_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/all_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
+# Copyright Ericsson AB 2003-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/all_SUITE_data/Makefile.src b/lib/erl_interface/test/all_SUITE_data/Makefile.src
index d2f57c8149..4f27b097c8 100644
--- a/lib/erl_interface/test/all_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/all_SUITE_data/Makefile.src
@@ -1,22 +1,23 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2012. All Rights Reserved.
+# Copyright Ericsson AB 2003-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = .@DS@gccifier@exe@ -CC"$(CC0)"
diff --git a/lib/erl_interface/test/all_SUITE_data/ei_runner.c b/lib/erl_interface/test/all_SUITE_data/ei_runner.c
index 205f911e38..cd7a67c57c 100644
--- a/lib/erl_interface/test/all_SUITE_data/ei_runner.c
+++ b/lib/erl_interface/test/all_SUITE_data/ei_runner.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -77,7 +78,7 @@ run_tests(char* argv0, TestCase test_cases[], unsigned number)
     }
 }
 
-
+
 /***********************************************************************
  *
  * R e a d i n g   p a c k e t s
@@ -182,7 +183,11 @@ char *read_packet(int *len)
     return io_buf;
 }
 
-
+void free_packet(char* packet)
+{
+    free(packet);
+}
+
 /***********************************************************************
  * S e n d i n g   r e p l i e s
  *
@@ -193,8 +198,8 @@ char *read_packet(int *len)
  * -----		----------------------------
  * [$b|Bytes]		{bytes, Bytes}
  * [$e]			eot
- * [$f]			test_server:fail()
- * [$f|Reason]		test_server:fail(Reason)
+ * [$f]			ct:fail()
+ * [$f|Reason]		ct:fail(Reason)
  * [$t|EncodedTerm]	{term, Term}
  * [$N]			'NULL'
  * [$m|Message]		io:format("~s", [Message])   (otherwise ignored)
@@ -206,7 +211,7 @@ char *read_packet(int *len)
  * you implement a test case entirely in C code.
  *
  * If the ok argument is zero, a [$f] reply will be sent to the
- * Erlang side (causing test_server:fail() to be called); otherwise,
+ * Erlang side (causing ct:fail() to be called); otherwise,
  * the atom 'eot' will be sent to Erlang.
  *
  * If you need to provide more details on a failure, use the fail() function.
@@ -246,16 +251,21 @@ do_report(file, line, ok)
 
 
 /*
- * This function causes a call to test_server:fail(Reason) on the
+ * This function causes a call to ct:fail(Reason) on the
  * Erlang side.
  */
 
-void do_fail(char* file, int line, char* reason)
+void do_fail(const char* file, int line, const char* reason, ...)
 {
+    va_list ap;
     char sbuf[2048];
+    char* sp = sbuf;
 
-    sbuf[0] = 'f';
-    sprintf(sbuf+1, "%s, line %d: %s", file, line, reason);
+    *sp++ = 'f';
+    sp += sprintf(sp, "%s, line %d: ", file, line);
+    va_start(ap, reason);
+    sp += vsprintf(sp, reason, ap);
+    va_end(ap);
     reply(sbuf, 1+strlen(sbuf+1));
 }
 
diff --git a/lib/erl_interface/test/all_SUITE_data/ei_runner.h b/lib/erl_interface/test/all_SUITE_data/ei_runner.h
index 96d6a1cbf7..2608661303 100644
--- a/lib/erl_interface/test/all_SUITE_data/ei_runner.h
+++ b/lib/erl_interface/test/all_SUITE_data/ei_runner.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -44,16 +45,18 @@ void run_tests(char* argv0, TestCase cases[], unsigned number);
 
 int get_bin_term(ei_x_buff* x, ei_term* term);
 char *read_packet(int *len);
+void free_packet(char*);
 
 /*
  * Sending replies.
  */
 
 #define fail(reason) do_fail(__FILE__, __LINE__, reason)
+#define fail1(reason, a1) do_fail(__FILE__, __LINE__, reason, a1)
 #define report(ok) do_report(__FILE__, __LINE__, ok)
 
 void do_report(char* file, int line, int ok);
-void do_fail(char* file, int line, char* reason);
+void do_fail(const char* file, int line, const char* reason, ...);
 void send_buffer(char* buf, int size);
 void message(char* format, ...);
 
diff --git a/lib/erl_interface/test/all_SUITE_data/gccifier.c b/lib/erl_interface/test/all_SUITE_data/gccifier.c
index 7e4ffc7281..0c3ef915fb 100644
--- a/lib/erl_interface/test/all_SUITE_data/gccifier.c
+++ b/lib/erl_interface/test/all_SUITE_data/gccifier.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2004-2012. All Rights Reserved.
+ * Copyright Ericsson AB 2004-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/test/all_SUITE_data/gccifier.sh b/lib/erl_interface/test/all_SUITE_data/gccifier.sh
index 42253213b1..179394bb4e 100755
--- a/lib/erl_interface/test/all_SUITE_data/gccifier.sh
+++ b/lib/erl_interface/test/all_SUITE_data/gccifier.sh
@@ -2,18 +2,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2005-2009. All Rights Reserved.
+# Copyright Ericsson AB 2005-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/all_SUITE_data/init_tc.erl b/lib/erl_interface/test/all_SUITE_data/init_tc.erl
index 5245173260..d9ad291f3d 100644
--- a/lib/erl_interface/test/all_SUITE_data/init_tc.erl
+++ b/lib/erl_interface/test/all_SUITE_data/init_tc.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
diff --git a/lib/erl_interface/test/all_SUITE_data/reclaim.h b/lib/erl_interface/test/all_SUITE_data/reclaim.h
index 00fdfc38dc..fe99bb0afc 100644
--- a/lib/erl_interface/test/all_SUITE_data/reclaim.h
+++ b/lib/erl_interface/test/all_SUITE_data/reclaim.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/test/all_SUITE_data/runner.c b/lib/erl_interface/test/all_SUITE_data/runner.c
index a474c17722..42e8bb03e5 100644
--- a/lib/erl_interface/test/all_SUITE_data/runner.c
+++ b/lib/erl_interface/test/all_SUITE_data/runner.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -78,7 +79,7 @@ run_tests(char* argv0, TestCase test_cases[], unsigned number)
     }
 }
 
-
+
 /***********************************************************************
  *
  * R e a d i n g   p a c k e t s
@@ -188,7 +189,7 @@ char *read_packet(int *len)
   return io_buf;
 }
 
-
+
 /***********************************************************************
  * S e n d i n g   r e p l i e s
  *
@@ -199,8 +200,8 @@ char *read_packet(int *len)
  * -----		----------------------------
  * [$b|Bytes]		{bytes, Bytes}
  * [$e]			eot
- * [$f]			test_server:fail()
- * [$f|Reason]		test_server:fail(Reason)
+ * [$f]			ct:fail()
+ * [$f|Reason]		ct:fail(Reason)
  * [$t|EncodedTerm]	{term, Term}
  * [$N]			'NULL'
  * [$m|Message]		io:format("~s", [Message])   (otherwise ignored)
@@ -212,7 +213,7 @@ char *read_packet(int *len)
  * you implement a test case entirely in C code.
  *
  * If the ok argument is zero, a [$f] reply will be sent to the
- * Erlang side (causing test_server:fail() to be called); otherwise,
+ * Erlang side (causing ct:fail() to be called); otherwise,
  * the atom 'eot' will be sent to Erlang.
  *
  * If you need to provide more details on a failure, use the fail() function.
@@ -252,7 +253,7 @@ do_report(file, line, ok)
 
 
 /*
- * This function causes a call to test_server:fail(Reason) on the
+ * This function causes a call to ct:fail(Reason) on the
  * Erlang side.
  */
 
diff --git a/lib/erl_interface/test/all_SUITE_data/runner.h b/lib/erl_interface/test/all_SUITE_data/runner.h
index fb29d5166d..493602869f 100644
--- a/lib/erl_interface/test/all_SUITE_data/runner.h
+++ b/lib/erl_interface/test/all_SUITE_data/runner.h
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl
index 48469e68dc..e06ee762d7 100644
--- a/lib/erl_interface/test/ei_accept_SUITE.erl
+++ b/lib/erl_interface/test/ei_accept_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -20,97 +21,70 @@
 %%
 -module(ei_accept_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_accept_SUITE_data/ei_accept_test_cases.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
-	 init_per_group/2,end_per_group/2, 
-	 init_per_testcase/2, end_per_testcase/2,
-	 ei_accept/1, ei_threaded_accept/1]).
+-export([all/0, suite/0,
+         ei_accept/1, ei_threaded_accept/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
 
 all() -> 
     [ei_accept, ei_threaded_accept].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:seconds(30)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
 ei_accept(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-
-    ?line Myname= hd(tl(string:tokens(atom_to_list(node()), "@"))),
-    ?line io:format("Myname ~p ~n",  [Myname]),
-    ?line EINode= list_to_atom("c42@"++Myname),
-    ?line io:format("EINode ~p ~n",  [EINode]),
-    ?line Self= self(),
-    ?line TermToSend= {call, Self, "Test"},
-    ?line F= fun() ->
-		     case waitfornode("c42",20) of
-			 true ->
-			     {any, EINode} ! TermToSend,
-			     Self ! sent_ok;
-			 false ->
-			     Self ! never_published
-		     end,
-		     ok
-	     end,
-
-    ?line spawn(F),
-    ?line Port  = 6543,
-    ?line {ok, Fd, _Node} = ei_accept(P, Port),
-    ?line TermReceived= ei_receive(P, Fd),
-    ?line io:format("Sent ~p received ~p ~n", [TermToSend, TermReceived]),
-    ?line TermToSend= TermReceived,
-    ?line receive
-	      sent_ok ->
-		  ok;
-	      Unknown ->
-		  io:format("~p ~n", [Unknown])
-	  after 1000 ->
-		  io:format("timeout ~n")
-	  end,
-    ?line runner:finish(P),
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+
+    Myname = hd(tl(string:tokens(atom_to_list(node()), "@"))),
+    io:format("Myname ~p ~n",  [Myname]),
+    EINode = list_to_atom("c42@"++Myname),
+    io:format("EINode ~p ~n",  [EINode]),
+    Self = self(),
+    TermToSend= {call, Self, "Test"},
+    F= fun() ->
+               case waitfornode("c42",20) of
+                   true ->
+                       {any, EINode} ! TermToSend,
+                       Self ! sent_ok;
+                   false ->
+                       Self ! never_published
+               end,
+               ok
+       end,
+
+    spawn(F),
+    Port = 6543,
+    {ok, Fd, _Node} = ei_accept(P, Port),
+    TermReceived= ei_receive(P, Fd),
+    io:format("Sent ~p received ~p ~n", [TermToSend, TermReceived]),
+    TermToSend= TermReceived,
+    receive
+        sent_ok ->
+            ok;
+        Unknown ->
+            io:format("~p ~n", [Unknown])
+    after 1000 ->
+              io:format("timeout ~n")
+    end,
+    runner:finish(P),
     ok.
 
 ei_threaded_accept(Config) when is_list(Config) ->
-    ?line Einode = filename:join(?config(data_dir, Config), "eiaccnode"),
-    ?line N = 1, % 3,
-    ?line Host = atom_to_list(node()),
-    ?line Port = 6767,
-    ?line start_einode(Einode, N, Host, Port),
-    ?line io:format("started eiaccnode"),
-    %%?line spawn_link(fun() -> start_einode(Einode, N, Host, Port) end),
-    ?line TestServerPid = self(),
-    ?line [ spawn_link(fun() -> send_rec_einode(I, TestServerPid) end)
-	    || I <- lists:seq(0, N-1) ],
-    ?line [ receive I -> ok end
-	    || I <- lists:seq(0, N-1) ],
+    Einode = filename:join(proplists:get_value(data_dir, Config), "eiaccnode"),
+    N = 1, % 3,
+    Host = atom_to_list(node()),
+    Port = 6767,
+    start_einode(Einode, N, Host, Port),
+    io:format("started eiaccnode"),
+    %%spawn_link(fun() -> start_einode(Einode, N, Host, Port) end),
+    TestServerPid = self(),
+    [spawn_link(fun() -> send_rec_einode(I, TestServerPid) end) || I <- lists:seq(0, N-1)],
+    [receive I -> ok end || I <- lists:seq(0, N-1) ],
     ok.
 
 waitfornode(String,0) ->
@@ -119,66 +93,61 @@ waitfornode(String,0) ->
 waitfornode(String,N) ->
     Registered = [X || {X,_} <- element(2,erl_epmd:names())],
     case lists:member(String,Registered) of
-	true ->
-	    true;
-	false ->
-	    timer:sleep(1000),
-	    waitfornode(String,N-1)
+        true ->
+            true;
+        false ->
+            timer:sleep(1000),
+            waitfornode(String,N-1)
     end.
 
 send_rec_einode(N, TestServerPid) ->
-    ?line Myname= hd(tl(string:tokens(atom_to_list(node()), "@"))),
-    ?line FirstPart = "eiacc" ++ integer_to_list(N),
-    ?line EINode= list_to_atom(FirstPart ++ "@" ++ Myname),
-    ?line io:format("EINode ~p ~n",  [EINode]),
-    ?line Self= self(),
-    ?line case waitfornode(FirstPart,20) of
-	      true -> ok;
-	      false -> test_server:fail({never_published,EINode})
-	  end,
-    ?line {any, EINode} ! Self,
-    ?line receive
-	      {N,_}=X ->
-		  ?line io:format("Received by ~s ~p~n", [EINode, X]),
-		  ?line TestServerPid ! N,
-		  ?line X
-	  after 10000 ->
-		  ?line test_server:fail(EINode)
-	  end.
+    Myname= hd(tl(string:tokens(atom_to_list(node()), "@"))),
+    FirstPart = "eiacc" ++ integer_to_list(N),
+    EINode= list_to_atom(FirstPart ++ "@" ++ Myname),
+    io:format("EINode ~p ~n",  [EINode]),
+    Self= self(),
+    case waitfornode(FirstPart,20) of
+        true -> ok;
+        false -> ct:fail({never_published,EINode})
+    end,
+    {any, EINode} ! Self,
+    receive
+        {N,_}=X ->
+            io:format("Received by ~s ~p~n", [EINode, X]),
+            TestServerPid ! N,
+            X
+    after 10000 ->
+              ct:fail(EINode)
+    end.
 
 start_einode(Einode, N, Host, Port) ->
     Einodecmd = Einode ++ " " ++ atom_to_list(erlang:get_cookie())
-	++ " " ++ integer_to_list(N) ++ " " ++ Host ++ " "
-	++ integer_to_list(Port) ++ " nothreads",
+    ++ " " ++ integer_to_list(N) ++ " " ++ Host ++ " "
+    ++ integer_to_list(Port) ++ " nothreads",
     io:format("Einodecmd  ~p ~n", [Einodecmd]),      
-    ?line open_port({spawn, Einodecmd}, []),
+    open_port({spawn, Einodecmd}, []),
     ok.
 
 
-
 %%% Interface functions for ei (erl_interface) functions.
 
 ei_connect_init(P, Num, Cookie, Creation) ->
     send_command(P, ei_connect_init, [Num,Cookie,Creation]),
     case get_term(P) of
-	{term,Int} when is_integer(Int) -> Int
+        {term,Int} when is_integer(Int) -> Int
     end.
 
 ei_accept(P, PortNo) ->
     send_command(P, ei_accept, [PortNo]),
     case get_term(P) of
-	{term,{Fd, _, Node}} when Fd >= 0 -> {ok, Fd, Node};
-	{term,{_Fd, Errno, _Node}} -> {error,Errno}
+        {term,{Fd, _, Node}} when Fd >= 0 -> {ok, Fd, Node};
+        {term,{_Fd, Errno, _Node}} -> {error,Errno}
     end.
 
 ei_receive(P, Fd) ->
     send_command(P, ei_receive, [Fd]),
-    {term, T}= get_term(P),
+    {term, T} = get_term(P),
     T.
 
 send_command(P, Name, Args) ->
     runner:send_term(P, {Name,list_to_tuple(Args)}).
-
-    
-
-
diff --git a/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.first b/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.first
index d7ec976cd0..6e89cc5a78 100644
--- a/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src
index 9b751d8f65..10ef437f8b 100644
--- a/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src
@@ -1,29 +1,29 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c b/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
index 5f898b5944..7b81ee5491 100644
--- a/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
+++ b/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/ei_accept_SUITE_data/eiaccnode.c b/lib/erl_interface/test/ei_accept_SUITE_data/eiaccnode.c
index af58f75963..308f843530 100644
--- a/lib/erl_interface/test/ei_accept_SUITE_data/eiaccnode.c
+++ b/lib/erl_interface/test/ei_accept_SUITE_data/eiaccnode.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/ei_connect_SUITE.erl b/lib/erl_interface/test/ei_connect_SUITE.erl
index 432437d3b8..66498deadc 100644
--- a/lib/erl_interface/test/ei_connect_SUITE.erl
+++ b/lib/erl_interface/test/ei_connect_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -20,176 +21,148 @@
 %%
 -module(ei_connect_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_connect_SUITE_data/ei_connect_test_cases.hrl").
 
--export([
-	 all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 init_per_testcase/2, 
-	 end_per_testcase/2,
-	 
-	 ei_send/1, 
-	 ei_reg_send/1, 
-	 ei_format_pid/1,
-	 ei_rpc/1, 
-	 rpc_test/1, 
-	 ei_send_funs/1,
-	 ei_threaded_send/1,
-	 ei_set_get_tracelevel/1
-	]).
+-export([all/0, suite/0,
+         ei_send/1,
+         ei_reg_send/1,
+         ei_format_pid/1,
+         ei_rpc/1,
+         rpc_test/1,
+         ei_send_funs/1,
+         ei_threaded_send/1,
+         ei_set_get_tracelevel/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
 
 all() -> 
     [ei_send, ei_reg_send, ei_rpc, ei_format_pid, ei_send_funs,
      ei_threaded_send, ei_set_get_tracelevel].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(0.25)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
 ei_send(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
 
-    ?line ok = ei_send(P, Fd, self(), AMsg={a,message}),
-    ?line receive AMsg -> ok end,
+    ok = ei_send(P, Fd, self(), AMsg={a,message}),
+    receive AMsg -> ok end,
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 ei_format_pid(Config) when is_list(Config) ->
-    ?line S = self(),
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
+    S = self(),
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
 
-    ?line ok = ei_format_pid(P, Fd, S),
-    ?line receive S -> ok end,
+    ok = ei_format_pid(P, Fd, S),
+    receive S -> ok end,
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 ei_send_funs(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
-    
-    ?line Fun1 = fun ei_send/1,
-    ?line Fun2 = fun(X) -> P, X, Fd, Fun1 end,
-
-    ?line AMsg={Fun1,Fun2},
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
+
+    Fun1 = fun ei_send/1,
+    Fun2 = fun(X) -> P, X, Fd, Fun1 end,
+
+    AMsg={Fun1,Fun2},
     %%AMsg={wait_with_funs, new_dist_format},
-    ?line ok = ei_send_funs(P, Fd, self(), AMsg),
-    ?line EIMsg = receive M -> M end,
-    ?line EIMsg = AMsg,
+    ok = ei_send_funs(P, Fd, self(), AMsg),
+    EIMsg = receive M -> M end,
+    EIMsg = AMsg,
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 ei_reg_send(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
 
     ARegName = a_strange_registred_name,
-    ?line register(ARegName, self()),
-    ?line ok = ei_reg_send(P, Fd, ARegName, AMsg={another,[strange],message}),
-    ?line receive AMsg -> ok end,
+    register(ARegName, self()),
+    ok = ei_reg_send(P, Fd, ARegName, AMsg={another,[strange],message}),
+    receive AMsg -> ok end,
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 ei_threaded_send(Config) when is_list(Config) ->
-    ?line Einode = filename:join(?config(data_dir, Config), "einode"),
-    ?line N = 15,
-    ?line Host = atom_to_list(node()),
-    ?line TestServerPid = self(),
-    ?line [ spawn_link(fun() -> rec_einode(I, TestServerPid) end)
-	    || I <- lists:seq(0, N-1) ],
-    ?line [ receive {I,registered} -> ok end
-	    || I <- lists:seq(0, N-1) ],
-    ?line spawn_link(fun() -> start_einode(Einode, N, Host) end),
-    ?line [ receive I -> ok end
-	    || I <- lists:seq(0, N-1) ],
+    Einode = filename:join(proplists:get_value(data_dir, Config), "einode"),
+    N = 15,
+    Host = atom_to_list(node()),
+    TestServerPid = self(),
+    [ spawn_link(fun() -> rec_einode(I, TestServerPid) end)
+      || I <- lists:seq(0, N-1) ],
+    [ receive {I,registered} -> ok end
+      || I <- lists:seq(0, N-1) ],
+    spawn_link(fun() -> start_einode(Einode, N, Host) end),
+    [ receive I -> ok end
+      || I <- lists:seq(0, N-1) ],
     ok.
 
 rec_einode(N, TestServerPid) ->
-    ?line Regname = list_to_atom("mth"++integer_to_list(N)),
-    ?line register(Regname, self()),
-    ?line TestServerPid ! {N, registered},
-    ?line io:format("~p waiting~n", [Regname]),
-    ?line receive
-	      X ->
-		  ?line io:format("Received by ~s ~p~n", [Regname, X]),
-		  ?line TestServerPid ! N,
-		  ?line X
-	  after 10000 ->
-		  ?line test_server:fail(Regname)
-	  end.
+    Regname = list_to_atom("mth"++integer_to_list(N)),
+    register(Regname, self()),
+    TestServerPid ! {N, registered},
+    io:format("~p waiting~n", [Regname]),
+    receive
+        X ->
+            io:format("Received by ~s ~p~n", [Regname, X]),
+            TestServerPid ! N,
+            X
+    after 10000 ->
+              ct:fail(Regname)
+    end.
 
 start_einode(Einode, N, Host) ->
     Einodecmd = Einode ++ " " ++ atom_to_list(erlang:get_cookie())
-	++ " " ++ integer_to_list(N) ++ " " ++ Host,
+    ++ " " ++ integer_to_list(N) ++ " " ++ Host,
     io:format("Einodecmd  ~p ~n", [Einodecmd]),      
-    ?line open_port({spawn, Einodecmd}, []),
+    open_port({spawn, Einodecmd}, []),
     ok.
 
 ei_rpc(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
 
-    ?line S= "Hej du glade!", SRev = lists:reverse(S),
-    ?line X = ei_rpc(P, Fd, self(), {?MODULE, rpc_test}, [SRev]),
-    ?line {term, S}= X,
+    S= "Hej du glade!", SRev = lists:reverse(S),
+    X = ei_rpc(P, Fd, self(), {?MODULE, rpc_test}, [SRev]),
+    {term, S}= X,
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 ei_set_get_tracelevel(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 5 = ei_set_get_tracelevel(P, 5),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
+    P = runner:start(?interpret),
+    5 = ei_set_get_tracelevel(P, 5),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
 
-    ?line S= "Hej du glade!", SRev = lists:reverse(S),
-    ?line X = ei_rpc(P, Fd, self(), {?MODULE, rpc_test}, [SRev]),
-    ?line {term, S}= X,
+    S= "Hej du glade!", SRev = lists:reverse(S),
+    X = ei_rpc(P, Fd, self(), {?MODULE, rpc_test}, [SRev]),
+    {term, S}= X,
 
-    ?line 0 = ei_set_get_tracelevel(P, 0),
+    0 = ei_set_get_tracelevel(P, 0),
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -198,20 +171,20 @@ ei_set_get_tracelevel(Config) when is_list(Config) ->
 ei_connect_init(P, Num, Cookie, Creation) ->
     send_command(P, ei_connect_init, [Num,Cookie,Creation]),
     case get_term(P) of
-	{term,Int} when is_integer(Int) -> Int
+        {term,Int} when is_integer(Int) -> Int
     end.
 
 ei_connect(P, Node) ->
     send_command(P, ei_connect, [Node]),
     case get_term(P) of
-	{term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
-	{term,{-1,Errno}} -> {error,Errno}
+        {term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
+        {term,{-1,Errno}} -> {error,Errno}
     end.
 
 ei_set_get_tracelevel(P, Tracelevel) ->
     send_command(P, ei_set_get_tracelevel, [Tracelevel]),
     case get_term(P) of
-	{term,{tracelevel, Level}} when is_integer(Level) -> Level
+        {term,{tracelevel, Level}} when is_integer(Level) -> Level
     end.
 
 ei_send(P, Fd, To, Msg) ->
@@ -237,12 +210,12 @@ ei_rpc(P, Fd, To, Func, Msg) ->
 
 get_send_result(P) ->
     case get_term(P) of
-	{term,{0,_}} -> ok;
-	{term,{1,_}} -> ok;
-	{term,{-1,Errno}} -> {error,Errno};
-	{term,{Res,Errno}}->
-	    io:format("Return value: ~p\nerl_errno: ~p", [Res,Errno]),
-	    ?t:fail(bad_return_value)
+        {term,{0,_}} -> ok;
+        {term,{1,_}} -> ok;
+        {term,{-1,Errno}} -> {error,Errno};
+        {term,{Res,Errno}}->
+            io:format("Return value: ~p\nerl_errno: ~p", [Res,Errno]),
+            ct:fail(bad_return_value)
     end.
 
 send_command(P, Name, Args) ->
diff --git a/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.first b/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.first
index 8bf22e366e..1a9b4dbcea 100644
--- a/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src
index a6525a9138..c2d8261dd8 100644
--- a/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src
@@ -1,31 +1,32 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
-	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
+	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
 CFLAGS = @EI_CFLAGS@ $(THR_DEFS) -I@erl_interface_include@ -I../all_SUITE_data
 EI_CONNECT_OBJS = ei_connect_test@obj@ ei_connect_test_decl@obj@
diff --git a/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c b/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c
index 88a9950994..6a3796dd24 100644
--- a/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c
+++ b/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2011. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/ei_connect_SUITE_data/einode.c b/lib/erl_interface/test/ei_connect_SUITE_data/einode.c
index bafe8bd5bd..bb71575740 100644
--- a/lib/erl_interface/test/ei_connect_SUITE_data/einode.c
+++ b/lib/erl_interface/test/ei_connect_SUITE_data/einode.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -34,6 +35,7 @@
 #endif
 
 #include "ei.h"
+#include "erl_interface.h"
 
 #ifdef VXWORKS
 #define MAIN cnode
@@ -114,6 +116,8 @@ MAIN(int argc, char *argv[])
     if (argc < 3)
 	exit(1);
 
+    erl_init(NULL, 0);
+
     cookie = argv[1];
     n = atoi(argv[2]);
     if (n > 100)
diff --git a/lib/erl_interface/test/ei_decode_SUITE.erl b/lib/erl_interface/test/ei_decode_SUITE.erl
index d7df63cc88..1495a0d5d9 100644
--- a/lib/erl_interface/test/ei_decode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_SUITE.erl
@@ -1,19 +1,19 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -21,23 +21,18 @@
 %%
 -module(ei_decode_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_decode_SUITE_data/ei_decode_test_cases.hrl").
 
--export(
-   [
-    all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-    init_per_group/2,end_per_group/2, init_per_testcase/2,
-    end_per_testcase/2,
-    test_ei_decode_long/1,
-    test_ei_decode_ulong/1,
-    test_ei_decode_longlong/1,
-    test_ei_decode_ulonglong/1,
-    test_ei_decode_char/1,
-    test_ei_decode_nonoptimal/1,
-    test_ei_decode_misc/1,
-    test_ei_decode_utf8_atom/1
-   ]).
+-export([all/0, suite/0,
+         test_ei_decode_long/1,
+         test_ei_decode_ulong/1,
+         test_ei_decode_longlong/1,
+         test_ei_decode_ulonglong/1,
+         test_ei_decode_char/1,
+         test_ei_decode_nonoptimal/1,
+         test_ei_decode_misc/1,
+         test_ei_decode_utf8_atom/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -47,27 +42,6 @@ all() ->
      test_ei_decode_char, test_ei_decode_nonoptimal,
      test_ei_decode_misc, test_ei_decode_utf8_atom].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-init_per_testcase(_TC, Config) ->
-    Config.
-
-end_per_testcase(_RC, Config) ->
-    Config.
-
 %% ---------------------------------------------------------------------------
 
 % NOTE: for historical reasons we don't pach as tight as we can,
@@ -76,55 +50,51 @@ end_per_testcase(_RC, Config) ->
 
 %% ######################################################################## %%
 
-test_ei_decode_long(suite) -> [];
 test_ei_decode_long(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_long),
+    P = runner:start(?test_ei_decode_long),
     send_integers(P),
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_decode_ulong(suite) -> [];
 test_ei_decode_ulong(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_ulong),
+    P = runner:start(?test_ei_decode_ulong),
     send_integers(P),
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 % (*) In practical terms, other values may fit into the ext format
 % i32 is signed 32 bit on C side
 % u32 is unsigned 32 bit on C side
- 
+
 %% ######################################################################## %%
 
-test_ei_decode_longlong(suite) -> [];
 test_ei_decode_longlong(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?test_ei_decode_longlong),
-	    send_integers2(P),
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?test_ei_decode_longlong),
+            send_integers2(P),
+            runner:recv_eot(P),
+            ok
     end.
 
 
 %% ######################################################################## %%
 
-test_ei_decode_ulonglong(suite) -> [];
 test_ei_decode_ulonglong(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?test_ei_decode_ulonglong),
-	    send_integers2(P),
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?test_ei_decode_ulonglong),
+            send_integers2(P),
+            runner:recv_eot(P),
+            ok
     end.
 
 
@@ -133,38 +103,36 @@ test_ei_decode_ulonglong(Config) when is_list(Config) ->
 %% it is unsigned.
 %% FIXME maybe the API should change to use "unsigned char" to be clear?!
 
-test_ei_decode_char(suite) -> [];
 test_ei_decode_char(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_char),
+    P = runner:start(?test_ei_decode_char),
 
-    ?line send_term_as_binary(P,0),
-    ?line send_term_as_binary(P,16#7f),
-    ?line send_term_as_binary(P,16#ff),
+    send_term_as_binary(P,0),
+    send_term_as_binary(P,16#7f),
+    send_term_as_binary(P,16#ff),
 
-    ?line send_term_as_binary(P, []), % illegal type
+    send_term_as_binary(P, []), % illegal type
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_decode_nonoptimal(suite) -> [];
 test_ei_decode_nonoptimal(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_nonoptimal),
+    P = runner:start(?test_ei_decode_nonoptimal),
 
     send_non_optimal_pos(P),			% decode_char
     send_non_optimal(P),			% decode_long
     send_non_optimal_pos(P),			% decode_ulong
     case os:type() of
-	vxworks ->
-	    ok;
-	_ ->
-	    send_non_optimal(P),			% decode_longlong
-	    send_non_optimal_pos(P)			% decode_ulonglong
+        vxworks ->
+            ok;
+        _ ->
+            send_non_optimal(P),			% decode_longlong
+            send_non_optimal_pos(P)			% decode_ulonglong
     end,
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -173,82 +141,81 @@ send_non_optimal(P) ->
     send_non_optimal_neg(P).
 
 send_non_optimal_pos(P) ->
-    ?line send_raw(P, <<131,97,42>>),
-    ?line send_raw(P, <<131,98,42:32>>),
-    ?line send_raw(P, <<131,110,1,0,42>>),
-    ?line send_raw(P, <<131,110,2,0,42,0>>),
-    ?line send_raw(P, <<131,110,4,0,42,0,0,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,1,0,42>>),
-    ?line send_raw(P, <<131,111,0,0,0,2,0,42,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,3,0,42,0,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,6,0,42,0,0,0,0,0>>),
+    send_raw(P, <<131,97,42>>),
+    send_raw(P, <<131,98,42:32>>),
+    send_raw(P, <<131,110,1,0,42>>),
+    send_raw(P, <<131,110,2,0,42,0>>),
+    send_raw(P, <<131,110,4,0,42,0,0,0>>),
+    send_raw(P, <<131,111,0,0,0,1,0,42>>),
+    send_raw(P, <<131,111,0,0,0,2,0,42,0>>),
+    send_raw(P, <<131,111,0,0,0,3,0,42,0,0>>),
+    send_raw(P, <<131,111,0,0,0,6,0,42,0,0,0,0,0>>),
     ok.
 
 send_non_optimal_neg(P) ->
-%   ?line send_raw(P, <<131,97,-42>>),
-    ?line send_raw(P, <<131,98,-42:32>>),
-    ?line send_raw(P, <<131,110,1,1,42>>),
-    ?line send_raw(P, <<131,110,2,1,42,0>>),
-    ?line send_raw(P, <<131,110,4,1,42,0,0,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,1,1,42>>),
-    ?line send_raw(P, <<131,111,0,0,0,2,1,42,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,3,1,42,0,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,6,1,42,0,0,0,0,0>>),
+    %   send_raw(P, <<131,97,-42>>),
+    send_raw(P, <<131,98,-42:32>>),
+    send_raw(P, <<131,110,1,1,42>>),
+    send_raw(P, <<131,110,2,1,42,0>>),
+    send_raw(P, <<131,110,4,1,42,0,0,0>>),
+    send_raw(P, <<131,111,0,0,0,1,1,42>>),
+    send_raw(P, <<131,111,0,0,0,2,1,42,0>>),
+    send_raw(P, <<131,111,0,0,0,3,1,42,0,0>>),
+    send_raw(P, <<131,111,0,0,0,6,1,42,0,0,0,0,0>>),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_decode_misc(suite) -> [];
 test_ei_decode_misc(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_misc),
+    P = runner:start(?test_ei_decode_misc),
 
-    ?line send_term_as_binary(P,0.0),
-    ?line send_term_as_binary(P,-1.0),
-    ?line send_term_as_binary(P,1.0),
+    send_term_as_binary(P,0.0),
+    send_term_as_binary(P,-1.0),
+    send_term_as_binary(P,1.0),
 
-    ?line send_term_as_binary(P,false),
-    ?line send_term_as_binary(P,true),
+    send_term_as_binary(P,false),
+    send_term_as_binary(P,true),
 
-    ?line send_term_as_binary(P,foo),
-    ?line send_term_as_binary(P,''),
-    ?line send_term_as_binary(P,'ÅÄÖåäö'),
+    send_term_as_binary(P,foo),
+    send_term_as_binary(P,''),
+    send_term_as_binary(P,'ÅÄÖåäö'),
 
-    ?line send_term_as_binary(P,"foo"),
-    ?line send_term_as_binary(P,""),
-    ?line send_term_as_binary(P,"ÅÄÖåäö"),
+    send_term_as_binary(P,"foo"),
+    send_term_as_binary(P,""),
+    send_term_as_binary(P,"ÅÄÖåäö"),
 
-    ?line send_term_as_binary(P,<<"foo">>),
-    ?line send_term_as_binary(P,<<>>),
-    ?line send_term_as_binary(P,<<"ÅÄÖåäö">>),
+    send_term_as_binary(P,<<"foo">>),
+    send_term_as_binary(P,<<>>),
+    send_term_as_binary(P,<<"ÅÄÖåäö">>),
 
-%    ?line send_term_as_binary(P,{}),
-%    ?line send_term_as_binary(P,[]),
+    %    send_term_as_binary(P,{}),
+    %    send_term_as_binary(P,[]),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 %% ######################################################################## %%
 
 test_ei_decode_utf8_atom(Config) ->
-    ?line P = runner:start(?test_ei_decode_utf8_atom),
+    P = runner:start(?test_ei_decode_utf8_atom),
 
     send_utf8_atom_as_binary(P,"å"),
     send_utf8_atom_as_binary(P,"ä"),
     send_term_as_binary(P,'ö'),
     send_term_as_binary(P,'õ'),
-    
-    ?line send_utf8_atom_as_binary(P,[1758]),
-    ?line send_utf8_atom_as_binary(P,[1758,1758]),
-    ?line send_utf8_atom_as_binary(P,[1758,1758,1758]),
-    ?line send_utf8_atom_as_binary(P,[1758,1758,1758,1758]),
+
+    send_utf8_atom_as_binary(P,[1758]),
+    send_utf8_atom_as_binary(P,[1758,1758]),
+    send_utf8_atom_as_binary(P,[1758,1758,1758]),
+    send_utf8_atom_as_binary(P,[1758,1758,1758,1758]),
 
     send_utf8_atom_as_binary(P,"a"),
     send_utf8_atom_as_binary(P,"b"),
     send_term_as_binary(P,'c'),
     send_term_as_binary(P,'d'),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -264,77 +231,77 @@ send_utf8_atom_as_binary(Port, String) ->
     Port ! {self(), {command, term_to_binary(uc_atup(String))}}.
 
 send_integers(P) ->
-    ?line send_term_as_binary(P,0),		% SMALL_INTEGER_EXT smallest
-    ?line send_term_as_binary(P,255),		% SMALL_INTEGER_EXT largest
-    ?line send_term_as_binary(P,256),		% INTEGER_EXT smallest pos (*)
-    ?line send_term_as_binary(P,-1),		% INTEGER_EXT largest  neg 
-
-    ?line send_term_as_binary(P, 16#07ffffff),	% INTEGER_EXT old largest (28 bits)
-    ?line send_term_as_binary(P,-16#08000000),	% INTEGER_EXT old smallest
-    ?line send_term_as_binary(P, 16#08000000),  % SMALL_BIG_EXT old smallest pos(*)
-    ?line send_term_as_binary(P,-16#08000001),	% SMALL_BIG_EXT old largest neg (*)
-
-    ?line send_term_as_binary(P, 16#7fffffff),	% INTEGER_EXT new largest (32 bits)
-    ?line send_term_as_binary(P,-16#80000000),	% INTEGER_EXT new smallest (32 bis)
-    ?line send_term_as_binary(P, 16#80000000),  % SMALL_BIG_EXT new smallest pos(*)
-    ?line send_term_as_binary(P,-16#80000001),	% SMALL_BIG_EXT new largest neg (*)
- 
+    send_term_as_binary(P,0),		% SMALL_INTEGER_EXT smallest
+    send_term_as_binary(P,255),		% SMALL_INTEGER_EXT largest
+    send_term_as_binary(P,256),		% INTEGER_EXT smallest pos (*)
+    send_term_as_binary(P,-1),		% INTEGER_EXT largest  neg
+
+    send_term_as_binary(P, 16#07ffffff),	% INTEGER_EXT old largest (28 bits)
+    send_term_as_binary(P,-16#08000000),	% INTEGER_EXT old smallest
+    send_term_as_binary(P, 16#08000000),  % SMALL_BIG_EXT old smallest pos(*)
+    send_term_as_binary(P,-16#08000001),	% SMALL_BIG_EXT old largest neg (*)
+
+    send_term_as_binary(P, 16#7fffffff),	% INTEGER_EXT new largest (32 bits)
+    send_term_as_binary(P,-16#80000000),	% INTEGER_EXT new smallest (32 bis)
+    send_term_as_binary(P, 16#80000000),  % SMALL_BIG_EXT new smallest pos(*)
+    send_term_as_binary(P,-16#80000001),	% SMALL_BIG_EXT new largest neg (*)
+
     case erlang:system_info({wordsize,external}) of
-	4 ->	 
-          ?line send_term_as_binary(P, 16#80000000),% SMALL_BIG_EXT u32
-          ?line send_term_as_binary(P, 16#ffffffff),% SMALL_BIG_EXT largest u32
-
-          ?line send_term_as_binary(P, 16#7fffffffffff), % largest  i48
-          ?line send_term_as_binary(P,-16#800000000000), % smallest i48
-          ?line send_term_as_binary(P, 16#ffffffffffff), % largest  u48
-          ?line send_term_as_binary(P, 16#7fffffffffffffff), % largest  i64
-          ?line send_term_as_binary(P,-16#8000000000000000), % smallest i64
-          ?line send_term_as_binary(P, 16#ffffffffffffffff); % largest  u64
-	8 ->
-          ?line send_term_as_binary(P, 16#8000000000000000),% SMALL_BIG_EXT u64
-	  % SMALL_BIG_EXT largest u64
-          ?line send_term_as_binary(P, 16#ffffffffffffffff),
-	  % largest  i96
-          ?line send_term_as_binary(P, 16#7fffffffffffffffffffffff), 
-	  % smallest i96
-          ?line send_term_as_binary(P,-16#800000000000000000000000), 
-	  % largest  u96
-          ?line send_term_as_binary(P, 16#ffffffffffffffffffffffff), 
-	  % largest  i128
-          ?line send_term_as_binary(P, 16#7fffffffffffffffffffffffffffffff), 
-	  % smallest i128
-          ?line send_term_as_binary(P,-16#80000000000000000000000000000000),
-	  % largest  u128 
-          ?line send_term_as_binary(P, 16#ffffffffffffffffffffffffffffffff) 
+        4 ->
+            send_term_as_binary(P, 16#80000000),% SMALL_BIG_EXT u32
+            send_term_as_binary(P, 16#ffffffff),% SMALL_BIG_EXT largest u32
+
+            send_term_as_binary(P, 16#7fffffffffff), % largest  i48
+            send_term_as_binary(P,-16#800000000000), % smallest i48
+            send_term_as_binary(P, 16#ffffffffffff), % largest  u48
+            send_term_as_binary(P, 16#7fffffffffffffff), % largest  i64
+            send_term_as_binary(P,-16#8000000000000000), % smallest i64
+            send_term_as_binary(P, 16#ffffffffffffffff); % largest  u64
+        8 ->
+            send_term_as_binary(P, 16#8000000000000000),% SMALL_BIG_EXT u64
+            % SMALL_BIG_EXT largest u64
+            send_term_as_binary(P, 16#ffffffffffffffff),
+            % largest  i96
+            send_term_as_binary(P, 16#7fffffffffffffffffffffff),
+            % smallest i96
+            send_term_as_binary(P,-16#800000000000000000000000),
+            % largest  u96
+            send_term_as_binary(P, 16#ffffffffffffffffffffffff),
+            % largest  i128
+            send_term_as_binary(P, 16#7fffffffffffffffffffffffffffffff),
+            % smallest i128
+            send_term_as_binary(P,-16#80000000000000000000000000000000),
+            % largest  u128
+            send_term_as_binary(P, 16#ffffffffffffffffffffffffffffffff)
     end,
-    ?line send_term_as_binary(P, []), % illegal type
+    send_term_as_binary(P, []), % illegal type
     ok.
 
 send_integers2(P) ->
-    ?line send_term_as_binary(P,0),		% SMALL_INTEGER_EXT smallest
-    ?line send_term_as_binary(P,255),		% SMALL_INTEGER_EXT largest
-    ?line send_term_as_binary(P,256),		% INTEGER_EXT smallest pos (*)
-    ?line send_term_as_binary(P,-1),		% INTEGER_EXT largest  neg 
-    
-    ?line send_term_as_binary(P, 16#07ffffff),	% INTEGER_EXT old largest (28 bits)
-    ?line send_term_as_binary(P,-16#08000000),	% INTEGER_EXT old smallest 
-    ?line send_term_as_binary(P, 16#08000000),  % SMALL_BIG_EXT old smallest pos(*)
-    ?line send_term_as_binary(P,-16#08000001),	% SMALL_BIG_EXT old largest neg (*)
-
-    ?line send_term_as_binary(P, 16#7fffffff),	% INTEGER_EXT new largest (32 bits)
-    ?line send_term_as_binary(P,-16#80000000),	% INTEGER_EXT new smallest
-    ?line send_term_as_binary(P, 16#80000000),  % SMALL_BIG_EXT new smallest pos(*)
-    ?line send_term_as_binary(P,-16#80000001),	% SMALL_BIG_EXT new largest neg (*)
-
-    ?line send_term_as_binary(P, 16#ffffffff),% SMALL_BIG_EXT largest u32
-
-    ?line send_term_as_binary(P, 16#7fffffffffff), % largest  i48
-    ?line send_term_as_binary(P,-16#800000000000), % smallest i48
-    ?line send_term_as_binary(P, 16#ffffffffffff), % largest  u48
-    ?line send_term_as_binary(P, 16#7fffffffffffffff), % largest  i64
-    ?line send_term_as_binary(P,-16#8000000000000000), % smallest i64
-    ?line send_term_as_binary(P, 16#ffffffffffffffff), % largest  u64
-    ?line send_term_as_binary(P, []), % illegal type
+    send_term_as_binary(P,0),           % SMALL_INTEGER_EXT smallest
+    send_term_as_binary(P,255),	        % SMALL_INTEGER_EXT largest
+    send_term_as_binary(P,256),	        % INTEGER_EXT smallest pos (*)
+    send_term_as_binary(P,-1),          % INTEGER_EXT largest  neg
+
+    send_term_as_binary(P, 16#07ffffff),     % INTEGER_EXT old largest (28 bits)
+    send_term_as_binary(P,-16#08000000),     % INTEGER_EXT old smallest
+    send_term_as_binary(P, 16#08000000),     % SMALL_BIG_EXT old smallest pos(*)
+    send_term_as_binary(P,-16#08000001),     % SMALL_BIG_EXT old largest neg (*)
+
+    send_term_as_binary(P, 16#7fffffff),     % INTEGER_EXT new largest (32 bits)
+    send_term_as_binary(P,-16#80000000),     % INTEGER_EXT new smallest
+    send_term_as_binary(P, 16#80000000),     % SMALL_BIG_EXT new smallest pos(*)
+    send_term_as_binary(P,-16#80000001),     % SMALL_BIG_EXT new largest neg (*)
+
+    send_term_as_binary(P, 16#ffffffff),     % SMALL_BIG_EXT largest u32
+
+    send_term_as_binary(P, 16#7fffffffffff),     % largest  i48
+    send_term_as_binary(P,-16#800000000000),     % smallest i48
+    send_term_as_binary(P, 16#ffffffffffff),     % largest  u48
+    send_term_as_binary(P, 16#7fffffffffffffff), % largest  i64
+    send_term_as_binary(P,-16#8000000000000000), % smallest i64
+    send_term_as_binary(P, 16#ffffffffffffffff), % largest  u64
+    send_term_as_binary(P, []), % illegal type
     ok.
 
 uc_atup(ATxt) ->
@@ -344,35 +311,32 @@ string_to_atom(String) ->
     Utf8List = string_to_utf8_list(String),
     Len = length(Utf8List),
     TagLen = case Len < 256 of
-		 true -> [119, Len];
-		 false -> [118, Len bsr 8, Len band 16#ff]
-	     end,
+                 true -> [119, Len];
+                 false -> [118, Len bsr 8, Len band 16#ff]
+             end,
     binary_to_term(list_to_binary([131, TagLen, Utf8List])).
 
 string_to_utf8_list([]) ->
     [];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   0 =< CP,
-				   CP =< 16#7F ->
+                                   0 =< CP,
+                                   CP =< 16#7F ->
     [CP | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#80 =< CP,
-				   CP =< 16#7FF ->
+                                   16#80 =< CP,
+                                   CP =< 16#7FF ->
     [16#C0 bor (CP bsr 6),
-     16#80 bor (16#3F band CP)
-     | string_to_utf8_list(CPs)];
+     16#80 bor (16#3F band CP) | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#800 =< CP,
-				   CP =< 16#FFFF ->
+                                   16#800 =< CP,
+                                   CP =< 16#FFFF ->
     [16#E0 bor (CP bsr 12),
      16#80 bor (16#3F band (CP bsr 6)),
-     16#80 bor (16#3F band CP)
-     | string_to_utf8_list(CPs)];
+     16#80 bor (16#3F band CP) | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#10000 =< CP,
-				   CP =< 16#10FFFF ->
+                                   16#10000 =< CP,
+                                   CP =< 16#10FFFF ->
     [16#F0 bor (CP bsr 18),
      16#80 bor (16#3F band (CP bsr 12)),
      16#80 bor (16#3F band (CP bsr 6)),
-     16#80 bor (16#3F band CP)
-     | string_to_utf8_list(CPs)].
+     16#80 bor (16#3F band CP) | string_to_utf8_list(CPs)].
diff --git a/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.first b/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.first
index 0791b54109..6e4f0bc37e 100644
--- a/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2009. All Rights Reserved.
+# Copyright Ericsson AB 2004-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src
index 76e55750c3..e678914a40 100644
--- a/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src
@@ -1,29 +1,29 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2009. All Rights Reserved.
+# Copyright Ericsson AB 2004-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c b/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c
index a676e59470..cfe9083065 100644
--- a/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c
+++ b/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2004-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2004-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
@@ -376,8 +377,14 @@ TESTCASE(test_ei_decode_ulong)
       EI_DECODE_2     (decode_ulong,  11, unsigned long,  ll(0x8000000000000000));
       EI_DECODE_2     (decode_ulong,  11, unsigned long,  ll(0xffffffffffffffff));
     } else {
-      EI_DECODE_2     (decode_ulong,  7, unsigned long,  0x80000000);
-      EI_DECODE_2     (decode_ulong,  7, unsigned long,  0xffffffff);
+        if (sizeof(void*) > 4) {
+            /* Windows */
+            EI_DECODE_2_FAIL(decode_ulong,  11, unsigned long,  ll(0x8000000000000000));
+            EI_DECODE_2_FAIL(decode_ulong,  11, unsigned long,  ll(0xffffffffffffffff));
+        } else {
+            EI_DECODE_2     (decode_ulong,  7, unsigned long,  0x80000000);
+            EI_DECODE_2     (decode_ulong,  7, unsigned long,  0xffffffff);
+        }
     }
 
     EI_DECODE_2_FAIL(decode_ulong,  9, unsigned long,  ll(0x7fffffffffff));
@@ -603,9 +610,9 @@ TESTCASE(test_ei_decode_misc)
 /*
     EI_DECODE_0(decode_version);
 */
-    EI_DECODE_2(decode_double, 32, double, 0.0);
-    EI_DECODE_2(decode_double, 32, double, -1.0);
-    EI_DECODE_2(decode_double, 32, double, 1.0);
+    EI_DECODE_2(decode_double, 9, double, 0.0);
+    EI_DECODE_2(decode_double, 9, double, -1.0);
+    EI_DECODE_2(decode_double, 9, double, 1.0);
 
     EI_DECODE_2(decode_boolean, 8, int, 0);
     EI_DECODE_2(decode_boolean, 7, int, 1);
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE.erl b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
index 2271278291..570a91e2da 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -20,37 +21,18 @@
 %%
 -module(ei_decode_encode_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_decode_encode_SUITE_data/ei_decode_encode_test_cases.hrl").
 
--export(
-   [
-    all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-    init_per_group/2,end_per_group/2,
-    test_ei_decode_encode/1
-   ]).
+-export([all/0, suite/0,
+         test_ei_decode_encode/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [test_ei_decode_encode].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %% ---------------------------------------------------------------------------
 
 % NOTE: these types have no meaning on the C side so we pass them
@@ -59,18 +41,19 @@ end_per_group(_GroupName, Config) ->
 
 %% ######################################################################## %%
 
-test_ei_decode_encode(suite) -> [];
 test_ei_decode_encode(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_encode),
+    P = runner:start(?test_ei_decode_encode),
 
     Fun   = fun (X) -> {X,true} end,
     Pid   = self(),
     Port  = case os:type() of
-		{win32,_} ->
-		    open_port({spawn,"sort"},[]);
-		_ ->
-		    open_port({spawn,"/bin/true"},[])
-	    end,
+                {win32,_} ->
+                    open_port({spawn,"sort"},[]);
+                {unix, darwin} ->
+                    open_port({spawn,"/usr/bin/true"},[]);
+                _ ->
+                    open_port({spawn,"/bin/true"},[])
+            end,
     Ref   = make_ref(),
     Trace = {1,2,3,self(),4},			% FIXME how to construct?!
 
@@ -83,49 +66,57 @@ test_ei_decode_encode(Config) when is_list(Config) ->
     BigLargeB = 1 bsl 11112 + BigSmallB,
     BigLargeC = BigSmallA * BigSmallB * BigSmallC * BigSmallA,
 
-    ?line send_rec(P, Fun),
-    ?line send_rec(P, Pid),
-    ?line send_rec(P, Port),
-    ?line send_rec(P, Ref),
-    ?line send_rec(P, Trace),
+    send_rec(P, Fun),
+    send_rec(P, Pid),
+    send_rec(P, Port),
+    send_rec(P, Ref),
+    send_rec(P, Trace),
 
     % bigs
 
-    ?line send_rec(P, BigSmallA),
-    ?line send_rec(P, BigSmallB),
-    ?line send_rec(P, BigSmallC),
-    
-    ?line send_rec(P, BigLargeA),
-    ?line send_rec(P, BigLargeB),
-    ?line send_rec(P, BigLargeC),
+    send_rec(P, BigSmallA),
+    send_rec(P, BigSmallB),
+    send_rec(P, BigSmallC),
+
+    send_rec(P, BigLargeA),
+    send_rec(P, BigLargeB),
+    send_rec(P, BigLargeC),
 
     %% Test large node containers...
 
-    ?line ThisNode = {node(), erlang:system_info(creation)},
-    ?line TXPid = mk_pid(ThisNode, 32767, 8191),
-    ?line TXPort = mk_port(ThisNode, 268435455),
-    ?line TXRef = mk_ref(ThisNode, [262143, 4294967295, 4294967295]),
+    ThisNode = {node(), erlang:system_info(creation)},
+    TXPid = mk_pid(ThisNode, 32767, 8191),
+    TXPort = mk_port(ThisNode, 268435455),
+    TXRef = mk_ref(ThisNode, [262143, 4294967295, 4294967295]),
 
-    ?line OtherNode = {gurka@sallad, 2},
-    ?line OXPid = mk_pid(OtherNode, 32767, 8191),
-    ?line OXPort = mk_port(OtherNode, 268435455),
-    ?line OXRef = mk_ref(OtherNode, [262143, 4294967295, 4294967295]),
+    send_rec(P, TXPid),
+    send_rec(P, TXPort),
+    send_rec(P, TXRef),
 
-    ?line send_rec(P, TXPid),
-    ?line send_rec(P, TXPort),
-    ?line send_rec(P, TXRef),
-    ?line send_rec(P, OXPid),
-    ?line send_rec(P, OXPort),
-    ?line send_rec(P, OXRef),
+    [begin OtherNode = {gurka@sallad, Creation},
+	   send_rec(P, mk_pid(OtherNode, 32767, 8191)),
+	   send_rec(P, mk_port(OtherNode, 268435455)),
+	   send_rec(P, mk_ref(OtherNode, [262143, 4294967295, 4294967295])),
+	   void
+     end || Creation <- [1, 2, 3, 4, 16#adec0ded]],
 
     %% Unicode atoms
     [begin send_rec(P, Atom),
-	   send_rec(P, mk_pid({Atom,1}, 23434, 3434)),
-	   send_rec(P, mk_port({Atom,1}, 2343434)),
-	   send_rec(P, mk_ref({Atom,1}, [262143, 8723648, 24097245])),
-	   void
+           send_rec(P, mk_pid({Atom,1}, 23434, 3434)),
+           send_rec(P, mk_port({Atom,1}, 2343434)),
+           send_rec(P, mk_ref({Atom,1}, [262143, 8723648, 24097245])),
+           void
      end || Atom <- unicode_atom_data()],
-    ?line runner:recv_eot(P),
+
+    send_rec(P, {}),
+    send_rec(P, {atom, Pid, Port, Ref}),
+    send_rec(P, [atom, Pid, Port, Ref]),
+    send_rec(P, [atom | Fun]),
+    send_rec(P, #{}),
+    send_rec(P, #{key => value}),
+    send_rec(P, maps:put(Port, Ref, #{key => value, key2 => Pid})),
+
+    runner:recv_eot(P),
     ok.
 
 
@@ -134,29 +125,27 @@ test_ei_decode_encode(Config) when is_list(Config) ->
 % We read two packets for each test, the ei_decode_encode and ei_x_decode_encode  version....
 
 send_rec(P, Term) when is_port(P) ->
-    %%?t:format("Testing: ~p~n", [Term]),
     P ! {self(), {command, term_to_binary(Term)}},
     {_B,Term} = get_buf_and_term(P).
-    
 
 
 get_buf_and_term(P) ->
     B = get_binaries(P),
     case B of
-	<<131>> ->
-	    io:format("(got single magic, no content)\n",[]),
-	    {B,'$$magic$$'};
-	<<131,_>> ->
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got magic)\n",[B,T]),
-	    {B,T};
-	_ ->
-	    B1 = list_to_binary([131,B]),	% No magic, add
-	    T = binary_to_term(B1),
-	    %io:format("~w\n~w\n(got no magic)\n",[B,T]),
-	    {B,T}
+        <<131>> ->
+            io:format("(got single magic, no content)\n",[]),
+            {B,'$$magic$$'};
+        <<131,_>> ->
+            T = binary_to_term(B),
+            io:format("~w\n~w\n(got magic)\n",[B,T]),
+            {B,T};
+        _ ->
+            B1 = list_to_binary([131,B]),	% No magic, add
+            T = binary_to_term(B1),
+            %io:format("~w\n~w\n(got no magic)\n",[B,T]),
+            {B,T}
     end.
-    
+
 
 get_binaries(P) ->
     B1 = get_binary(P),
@@ -165,40 +154,17 @@ get_binaries(P) ->
 
 get_binary(P) ->
     case runner:get_term(P) of
-	{bytes,L} ->
-	    B = list_to_binary(L),
-	    %%io:format("~w\n",[L]),
-% For strange reasons <<131>> show up as <>....
-%	    io:format("~w\n",[B]),
-	    B;
-	Other ->
-	    Other
+        {bytes,L} ->
+            B = list_to_binary(L),
+            %%io:format("~w\n",[L]),
+            % For strange reasons <<131>> show up as <>....
+            %	    io:format("~w\n",[B]),
+            B;
+        Other ->
+            Other
     end.
 
 %%
-
-% We use our own get_term()
-
-get_term(P) ->
-    case runner:get_term(P) of
-	{bytes,[131]} ->
-	    io:format("(got single magic, no content)\n",[]),
-	    '$$magic$$';
-	{bytes,[131,L]} ->
-	    B = list_to_binary(L),
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got magic)\n",[L,T]),
-	    T;
-	{bytes,L} ->
-	    B = list_to_binary([131,L]),
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got no magic)\n",[L,T]),
-	    T;
-	Other ->
-	    Other
-    end.
-    
-%%
 %% Node container constructor functions
 %%
 
@@ -209,6 +175,9 @@ get_term(P) ->
 -define(PORT_EXT,            102).
 -define(PID_EXT,             103).
 -define(NEW_REFERENCE_EXT,   114).
+-define(NEW_PID_EXT,         $X).
+-define(NEW_PORT_EXT,        $Y).
+-define(NEWER_REFERENCE_EXT, $Z).
 
 uint32_be(Uint) when is_integer(Uint), 0 =< Uint, Uint < 1 bsl 32 ->
     [(Uint bsr 24) band 16#ff,
@@ -230,18 +199,22 @@ uint8(Uint) when is_integer(Uint), 0 =< Uint, Uint < 1 bsl 8 ->
 uint8(Uint) ->
     exit({badarg, uint8, [Uint]}).
 
+pid_tag(Creation) when Creation =< 3 -> ?PID_EXT;
+pid_tag(_Creation) -> ?NEW_PID_EXT.
 
+enc_creation(Creation) when Creation =< 3 -> uint8(Creation);
+enc_creation(Creation) -> uint32_be(Creation).
 
 mk_pid({NodeName, Creation}, Number, Serial) when is_atom(NodeName) ->
     <<?VERSION_MAGIC, NodeNameExt/binary>> = term_to_binary(NodeName),
     mk_pid({NodeNameExt, Creation}, Number, Serial);
 mk_pid({NodeNameExt, Creation}, Number, Serial) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					?PID_EXT,
-					NodeNameExt,
-					uint32_be(Number),
-					uint32_be(Serial),
-					uint8(Creation)])) of
+					      pid_tag(Creation),
+					      NodeNameExt,
+					      uint32_be(Number),
+					      uint32_be(Serial),
+					      enc_creation(Creation)])) of
 	Pid when is_pid(Pid) ->
 	    Pid;
 	{'EXIT', {badarg, _}} ->
@@ -250,15 +223,18 @@ mk_pid({NodeNameExt, Creation}, Number, Serial) ->
 	    exit({unexpected_binary_to_term_result, Other})
     end.
 
+port_tag(Creation) when Creation =< 3 -> ?PORT_EXT;
+port_tag(_Creation) -> ?NEW_PORT_EXT.
+
 mk_port({NodeName, Creation}, Number) when is_atom(NodeName) ->
     <<?VERSION_MAGIC, NodeNameExt/binary>> = term_to_binary(NodeName),
     mk_port({NodeNameExt, Creation}, Number);
 mk_port({NodeNameExt, Creation}, Number) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?PORT_EXT,
+					      port_tag(Creation),
 					      NodeNameExt,
 					      uint32_be(Number),
-					      uint8(Creation)])) of
+					      enc_creation(Creation)])) of
 	Port when is_port(Port) ->
 	    Port;
 	{'EXIT', {badarg, _}} ->
@@ -267,34 +243,38 @@ mk_port({NodeNameExt, Creation}, Number) ->
 	    exit({unexpected_binary_to_term_result, Other})
     end.
 
+ref_tag(Creation) when Creation =< 3 -> ?NEW_REFERENCE_EXT;
+ref_tag(_Creation) -> ?NEWER_REFERENCE_EXT.
+
 mk_ref({NodeName, Creation}, Numbers) when is_atom(NodeName),
-					   is_integer(Creation),
-					   is_list(Numbers) ->
+                                           is_integer(Creation),
+                                           is_list(Numbers) ->
     <<?VERSION_MAGIC, NodeNameExt/binary>> = term_to_binary(NodeName),
     mk_ref({NodeNameExt, Creation}, Numbers);
 mk_ref({NodeNameExt, Creation}, [Number]) when is_binary(NodeNameExt),
 					       is_integer(Creation),
+					       Creation =< 3,
 					       is_integer(Number) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?REFERENCE_EXT,
-					      NodeNameExt,
-					      uint32_be(Number),
-					      uint8(Creation)])) of
-	Ref when is_reference(Ref) ->
-	    Ref;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_ref, [{NodeNameExt, Creation}, [Number]]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?REFERENCE_EXT,
+                                              NodeNameExt,
+                                              uint32_be(Number),
+                                              uint8(Creation)])) of
+        Ref when is_reference(Ref) ->
+            Ref;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_ref, [{NodeNameExt, Creation}, [Number]]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end;
 mk_ref({NodeNameExt, Creation}, Numbers) when is_binary(NodeNameExt),
-					      is_integer(Creation),
-					      is_list(Numbers) ->
+                                              is_integer(Creation),
+                                              is_list(Numbers) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?NEW_REFERENCE_EXT,
+					      ref_tag(Creation),
 					      uint16_be(length(Numbers)),
 					      NodeNameExt,
-					      uint8(Creation),
+					      enc_creation(Creation),
 					      lists:map(fun (N) ->
 								uint32_be(N)
 							end,
@@ -321,10 +301,10 @@ unicode_atom_data() ->
      uc_atup(lists:seq(65500, 65754)),
      uc_atup(lists:seq(65500, 65563))
      | lists:map(fun (N) ->
-			 Pow2 = (1 bsl N),
-			 uc_atup(lists:seq(Pow2 - 127, Pow2 + 127))
-		 end,
-		 lists:seq(7, 20))
+                         Pow2 = (1 bsl N),
+                         uc_atup(lists:seq(Pow2 - 127, Pow2 + 127))
+                 end,
+                 lists:seq(7, 20))
     ].
 
 uc_atup(ATxt) ->
@@ -334,33 +314,33 @@ string_to_atom(String) ->
     Utf8List = string_to_utf8_list(String),
     Len = length(Utf8List),
     TagLen = case Len < 256 of
-		 true -> [119, Len];
-		 false -> [118, Len bsr 8, Len band 16#ff]
-	     end,
+                 true -> [119, Len];
+                 false -> [118, Len bsr 8, Len band 16#ff]
+             end,
     binary_to_term(list_to_binary([131, TagLen, Utf8List])).
 
 string_to_utf8_list([]) ->
     [];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   0 =< CP,
-				   CP =< 16#7F ->
+                                   0 =< CP,
+                                   CP =< 16#7F ->
     [CP | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#80 =< CP,
-				   CP =< 16#7FF ->
+                                   16#80 =< CP,
+                                   CP =< 16#7FF ->
     [16#C0 bor (CP bsr 6),
      16#80 bor (16#3F band CP)
      | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#800 =< CP,
-				   CP =< 16#FFFF ->
+                                   16#800 =< CP,
+                                   CP =< 16#FFFF ->
     [16#E0 bor (CP bsr 12),
      16#80 bor (16#3F band (CP bsr 6)),
      16#80 bor (16#3F band CP)
      | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#10000 =< CP,
-				   CP =< 16#10FFFF ->
+                                   16#10000 =< CP,
+                                   CP =< 16#10FFFF ->
     [16#F0 bor (CP bsr 18),
      16#80 bor (16#3F band (CP bsr 12)),
      16#80 bor (16#3F band (CP bsr 6)),
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.first b/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.first
index 168a21b10e..ee9e25adbc 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2009. All Rights Reserved.
+# Copyright Ericsson AB 2004-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src
index d43e834558..853fe9ddeb 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src
@@ -1,29 +1,29 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2009. All Rights Reserved.
+# Copyright Ericsson AB 2004-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
index 317e5edecd..467f789fdb 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2004-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2004-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -32,9 +33,33 @@
 /*#define MESSAGE(FMT,A1,A2) message(FMT,A1,A2)*/
 #define MESSAGE(FMT,A1,A2)
 
-typedef int decodeFT(const char *buf, int *index, void*);
-typedef int encodeFT(char *buf, int *index, void*);
-typedef int x_encodeFT(ei_x_buff*, void*);
+
+typedef struct
+{
+    char name[MAXATOMLEN_UTF8];
+    erlang_char_encoding enc;
+}my_atom;
+
+struct my_obj {
+    union {
+	erlang_fun fun;
+	erlang_pid pid;
+	erlang_port port;
+	erlang_ref ref;
+	erlang_trace trace;
+	erlang_big big;
+	my_atom atom;
+
+	int arity;
+    }u;
+
+    int nterms; /* 0 for non-containers */
+    char* startp; /* container start position in decode buffer */
+};
+
+typedef int decodeFT(const char *buf, int *index, struct my_obj*);
+typedef int encodeFT(char *buf, int *index, struct my_obj*);
+typedef int x_encodeFT(ei_x_buff*, struct my_obj*);
 
 struct Type {
     char* name;
@@ -44,11 +69,36 @@ struct Type {
     x_encodeFT* ei_x_encode_fp;
 };
 
-typedef struct
-{
-    char name[MAXATOMLEN_UTF8];
-    erlang_char_encoding enc;
-}my_atom;
+
+struct Type fun_type = {
+    "fun", "erlang_fun", (decodeFT*)ei_decode_fun,
+    (encodeFT*)ei_encode_fun, (x_encodeFT*)ei_x_encode_fun
+};
+
+struct Type pid_type = {
+    "pid", "erlang_pid", (decodeFT*)ei_decode_pid,
+    (encodeFT*)ei_encode_pid, (x_encodeFT*)ei_x_encode_pid
+};
+
+struct Type port_type = {
+    "port", "erlang_port", (decodeFT*)ei_decode_port,
+    (encodeFT*)ei_encode_port, (x_encodeFT*)ei_x_encode_port
+};
+
+struct Type ref_type = {
+    "ref", "erlang_ref", (decodeFT*)ei_decode_ref,
+    (encodeFT*)ei_encode_ref, (x_encodeFT*)ei_x_encode_ref
+};
+
+struct Type trace_type = {
+    "trace", "erlang_trace", (decodeFT*)ei_decode_trace,
+    (encodeFT*)ei_encode_trace, (x_encodeFT*)ei_x_encode_trace
+};
+
+struct Type big_type = {
+    "big", "erlang_big", (decodeFT*)ei_decode_big,
+    (encodeFT*)ei_encode_big, (x_encodeFT*)ei_x_encode_big
+};
 
 int ei_decode_my_atom(const char *buf, int *index, my_atom* a)
 {
@@ -64,130 +114,274 @@ int ei_x_encode_my_atom(ei_x_buff* x, my_atom* a)
     return ei_x_encode_atom_as(x, a->name, ERLANG_UTF8, a->enc);
 }
 
+struct Type my_atom_type = {
+    "atom", "my_atom", (decodeFT*)ei_decode_my_atom,
+    (encodeFT*)ei_encode_my_atom, (x_encodeFT*)ei_x_encode_my_atom
+};
+
+
+int my_decode_tuple_header(const char *buf, int *index, struct my_obj* obj)
+{
+    int ret = ei_decode_tuple_header(buf, index, &obj->u.arity);
+    if (ret == 0 && obj)
+	obj->nterms = obj->u.arity;
+    return ret;
+}
+
+int my_encode_tuple_header(char *buf, int *index, struct my_obj* obj)
+{
+    return ei_encode_tuple_header(buf, index, obj->u.arity);
+}
+int my_x_encode_tuple_header(ei_x_buff* x, struct my_obj* obj)
+{
+    return ei_x_encode_tuple_header(x, (long)obj->u.arity);
+}
+
+struct Type tuple_type = {
+    "tuple_header", "arity", my_decode_tuple_header,
+    my_encode_tuple_header, my_x_encode_tuple_header
+};
+
+
+int my_decode_list_header(const char *buf, int *index, struct my_obj* obj)
+{
+    int ret = ei_decode_list_header(buf, index, &obj->u.arity);
+    if (ret == 0 && obj) {
+	obj->nterms = obj->u.arity + 1;
+    }
+    return ret;
+}
+int my_encode_list_header(char *buf, int *index, struct my_obj* obj)
+{
+    return ei_encode_list_header(buf, index, obj->u.arity);
+}
+int my_x_encode_list_header(ei_x_buff* x, struct my_obj* obj)
+{
+    return ei_x_encode_list_header(x, (long)obj->u.arity);
+}
+
+struct Type list_type = {
+    "list_header", "arity", my_decode_list_header,
+    my_encode_list_header, my_x_encode_list_header
+};
+
+
+int my_decode_nil(const char *buf, int *index, struct my_obj* dummy)
+{
+    int type, size, ret;
+    ret = ei_get_type(buf, index, &type, &size);
+    (*index)++;
+    return ret ?  ret : !(type == ERL_NIL_EXT);
+
+}
+int my_encode_nil(char *buf, int *index, struct my_obj* dummy)
+{
+    return ei_encode_empty_list(buf, index);
+}
+
+int my_x_encode_nil(ei_x_buff* x, struct my_obj* dummy)
+{
+    return ei_x_encode_empty_list(x);
+}
+
+struct Type nil_type = {
+    "empty_list", "nil", my_decode_nil,
+    my_encode_nil, my_x_encode_nil
+};
+
+int my_decode_map_header(const char *buf, int *index, struct my_obj* obj)
+{
+    int ret = ei_decode_map_header(buf, index, &obj->u.arity);
+    if (ret == 0 && obj)
+	obj->nterms = obj->u.arity * 2;
+    return ret;
+}
+int my_encode_map_header(char *buf, int *index, struct my_obj* obj)
+{
+    return ei_encode_map_header(buf, index, obj->u.arity);
+}
+int my_x_encode_map_header(ei_x_buff* x, struct my_obj* obj)
+{
+    return ei_x_encode_map_header(x, (long)obj->u.arity);
+}
+
+struct Type map_type = {
+    "map_header", "arity", my_decode_map_header,
+    my_encode_map_header, my_x_encode_map_header
+};
+
+
 #define BUFSZ 2000
 
-void decode_encode(struct Type* t, void* obj)
+void decode_encode(struct Type** tv, int nobj)
 {
-    char *buf;
-    char buf2[BUFSZ];
-    int size1 = 0;
-    int size2 = 0;
-    int size3 = 0;
-    int err;
+    struct my_obj objv[10];
+    int oix = 0;
+    char* packet;
+    char* inp;
+    char* outp;
+    char out_buf[BUFSZ];
+    int size1, size2, size3;
+    int err, i;
     ei_x_buff arg;
     
-    MESSAGE("ei_decode_%s, arg is type %s", t->name, t->type);
-    buf = read_packet(NULL);
-    err = t->ei_decode_fp(buf+1, &size1, NULL);
-    if (err != 0) {
-	if (err != -1) {
-	    fail("decode returned non zero but not -1");
-	} else {
-	    fail("decode returned non zero");
+    packet = read_packet(NULL);
+    inp = packet+1;
+    outp = out_buf;
+    ei_x_new(&arg);
+    for (i=0; i<nobj; i++) {
+	struct Type* t = tv[i];
+
+	MESSAGE("ei_decode_%s, arg is type %s", t->name, t->type);
+
+	size1 = 0;
+	err = t->ei_decode_fp(inp, &size1, NULL);
+	if (err != 0) {
+	    if (err != -1) {
+		fail("decode returned non zero but not -1");
+	    } else {
+		fail1("decode '%s' returned non zero", t->name);
+	    }
+	    return;
+	}
+	if (size1 < 1) {
+	    fail("size is < 1");
+	    return;
 	}
-	return;
-    }
-    if (size1 < 1) {
-	fail("size is < 1");
-	return;
-    }
 
-    if (size1 > BUFSZ) {
-	fail("size is > BUFSZ");
-	return;
-    }
+	if (size1 > BUFSZ) {
+	    fail("size is > BUFSZ");
+	    return;
+	}
 
-    err = t->ei_decode_fp(buf+1, &size2, obj);
-    if (err != 0) {
-	if (err != -1) {
-	    fail("decode returned non zero but not -1");
-	} else {
-	    fail("decode returned non zero");
+	size2 = 0;
+	objv[oix].nterms = 0;
+	objv[oix].startp = inp;
+	err = t->ei_decode_fp(inp, &size2, &objv[oix]);
+	if (err != 0) {
+	    if (err != -1) {
+		fail("decode returned non zero but not -1");
+	    } else {
+		fail("decode returned non zero");
+	    }
+	    return;
+	}
+	if (size1 != size2) {
+	    MESSAGE("size1 = %d, size2 = %d\n",size1,size2);
+	    fail("decode sizes differs");
+	    return;
 	}
-	return;
-    }
-    if (size1 != size2) {
-	MESSAGE("size1 = %d, size2 = %d\n",size1,size2);
-	fail("decode sizes differs");
-	return;
-    }
 
-    size2 = 0;
-    err = ei_skip_term(buf+1, &size2);
-    if (err != 0) {
-	fail("ei_skip_term returned non zero");
-	return;
-    }
-    if (size1 != size2) {
-	MESSAGE("size1 = %d, size2 = %d\n",size1,size2);
-	fail("skip size differs");
-	return;
-    }
+	if (!objv[oix].nterms) {
+	    size2 = 0;
+	    err = ei_skip_term(inp, &size2);
+	    if (err != 0) {
+		fail("ei_skip_term returned non zero");
+		return;
+	    }
+	    if (size1 != size2) {
+		MESSAGE("size1 = %d, size2 = %d\n",size1,size2);
+		fail("skip size differs");
+		return;
+	    }
+	}
 
-    MESSAGE("ei_encode_%s buf is NULL, arg is type %s", t->name, t->type);
-    size2 = 0;
-    err = t->ei_encode_fp(NULL, &size2, obj);
-    if (err != 0) {
-	if (err != -1) {
-	    fail("size calculation returned non zero but not -1");
+	MESSAGE("ei_encode_%s buf is NULL, arg is type %s", t->name, t->type);
+	size2 = 0;
+	err = t->ei_encode_fp(NULL, &size2, &objv[oix]);
+	if (err != 0) {
+	    if (err != -1) {
+		fail("size calculation returned non zero but not -1");
+		return;
+	    } else {
+		fail("size calculation returned non zero");
+		return;
+	    }
+	}
+	if (size1 != size2) {
+	    MESSAGE("size1 = %d, size2 = %d\n",size1,size2);
+	    fail("decode and encode size differs when buf is NULL");
 	    return;
-	} else {
-	    fail("size calculation returned non zero");
+	}
+	MESSAGE("ei_encode_%s, arg is type %s", t->name, t->type);
+	size3 = 0;
+	err = t->ei_encode_fp(outp, &size3, &objv[oix]);
+	if (err != 0) {
+	    if (err != -1) {
+		fail("returned non zero but not -1");
+	    } else {
+		fail("returned non zero");
+	    }
 	    return;
 	}
-    }
-    if (size1 != size2) {
-	MESSAGE("size1 = %d, size2 = %d\n",size1,size2);
-	fail("decode and encode size differs when buf is NULL");
-	return;
-    }
-    MESSAGE("ei_encode_%s, arg is type %s", t->name, t->type);
-    err = t->ei_encode_fp(buf2, &size3, obj);
-    if (err != 0) {
-	if (err != -1) {
-	    fail("returned non zero but not -1");
-	} else {
-	    fail("returned non zero");
+	if (size1 != size3) {
+	    MESSAGE("size1 = %d, size2 = %d\n",size1,size3);
+	    fail("decode and encode size differs");
+	    return;
 	}
-	return;
-    }
-    if (size1 != size3) {
-	MESSAGE("size1 = %d, size2 = %d\n",size1,size3);
-	fail("decode and encode size differs");
-	return;
-    }
-    send_buffer(buf2, size1);
 
-    MESSAGE("ei_x_encode_%s, arg is type %s", t->name, t->type);
-    ei_x_new(&arg);
-    err = t->ei_x_encode_fp(&arg, obj);
-    if (err != 0) {
-	if (err != -1) {
-	    fail("returned non zero but not -1");
-	} else {
-	    fail("returned non zero");
+	MESSAGE("ei_x_encode_%s, arg is type %s", t->name, t->type);
+	err = t->ei_x_encode_fp(&arg, &objv[oix]);
+	if (err != 0) {
+	    if (err != -1) {
+		fail("returned non zero but not -1");
+	    } else {
+		fail("returned non zero");
+	    }
+	    ei_x_free(&arg);
+	    return;
 	}
-	ei_x_free(&arg);
-	return;
+	if (arg.index < 1) {
+	    fail("size is < 1");
+	    ei_x_free(&arg);
+	    return;
+	}
+
+	inp += size1;
+	outp += size1;
+
+	if (objv[oix].nterms) { /* container term */
+	    if (++oix >= sizeof(objv)/sizeof(*objv))
+		fail("Term too deep");
+	}
+	else { /* "leaf" term */
+	    while (oix > 0) {
+		if (--(objv[oix - 1].nterms) == 0) {
+		    /* last element in container */
+		    --oix;
+
+		    size2 = 0;
+		    err = ei_skip_term(objv[oix].startp, &size2);
+		    if (err != 0) {
+			fail("ei_skip_term returned non zero");
+			return;
+		    }
+		    if (objv[oix].startp + size2 != inp) {
+			MESSAGE("size1 = %d, size2 = %d\n", size1, size2);
+			fail("container skip size differs");
+			return;
+		    }
+		}
+		else
+		    break; /* more elements in container */
+	    }
+	}
+
     }
-    if (arg.index < 1) {
-	fail("size is < 1");
-	ei_x_free(&arg);
-	return;
+    if (oix > 0) {
+	fail("Container not complete");
     }
+    send_buffer(out_buf, outp - out_buf);
     send_buffer(arg.buff, arg.index);
     ei_x_free(&arg);
+    free_packet(packet);
 }
 
+void decode_encode_one(struct Type* t)
+{
+    decode_encode(&t, 1);
+}
 
-#define EI_DECODE_ENCODE(TYPE, ERLANG_TYPE) {			\
-	struct Type type_struct = {#TYPE, #ERLANG_TYPE,		\
-				   (decodeFT*)ei_decode_##TYPE,		\
-				   (encodeFT*)ei_encode_##TYPE,		\
-				   (x_encodeFT*)ei_x_encode_##TYPE };	\
-	ERLANG_TYPE type_obj;						\
-	decode_encode(&type_struct, &type_obj);				\
-    }
 
 
 void decode_encode_big(struct Type* t)
@@ -274,14 +468,6 @@ void decode_encode_big(struct Type* t)
     ei_free_big(p);
 }
 
-#define EI_DECODE_ENCODE_BIG(TYPE, ERLANG_TYPE) {					\
-	struct Type type_struct = {#TYPE, #ERLANG_TYPE,		\
-				   (decodeFT*)ei_decode_##TYPE,	\
-				   (encodeFT*)ei_encode_##TYPE,		\
-				   (x_encodeFT*)ei_x_encode_##TYPE };	\
-	decode_encode_big(&type_struct);				\
-    }
-
 
 
 /* ******************************************************************** */
@@ -290,34 +476,62 @@ TESTCASE(test_ei_decode_encode)
 {
     int i;
 
-    EI_DECODE_ENCODE(fun  , erlang_fun);
-    EI_DECODE_ENCODE(pid  , erlang_pid);
-    EI_DECODE_ENCODE(port , erlang_port);
-    EI_DECODE_ENCODE(ref  , erlang_ref);
-    EI_DECODE_ENCODE(trace, erlang_trace);
+    decode_encode_one(&fun_type);
+    decode_encode_one(&pid_type);
+    decode_encode_one(&port_type);
+    decode_encode_one(&ref_type);
+    decode_encode_one(&trace_type);
 
-    EI_DECODE_ENCODE_BIG(big  , erlang_big);
-    EI_DECODE_ENCODE_BIG(big  , erlang_big);
-    EI_DECODE_ENCODE_BIG(big  , erlang_big);
+    decode_encode_big(&big_type);
+    decode_encode_big(&big_type);
+    decode_encode_big(&big_type);
 
-    EI_DECODE_ENCODE_BIG(big  , erlang_big);
-    EI_DECODE_ENCODE_BIG(big  , erlang_big);
-    EI_DECODE_ENCODE_BIG(big  , erlang_big);
+    decode_encode_big(&big_type);
+    decode_encode_big(&big_type);
+    decode_encode_big(&big_type);
 
     /* Test large node containers... */
-    EI_DECODE_ENCODE(pid  , erlang_pid);
-    EI_DECODE_ENCODE(port , erlang_port);
-    EI_DECODE_ENCODE(ref  , erlang_ref);
-    EI_DECODE_ENCODE(pid  , erlang_pid);
-    EI_DECODE_ENCODE(port , erlang_port);
-    EI_DECODE_ENCODE(ref  , erlang_ref);
+    for (i=0; i<6; i++) {
+        decode_encode_one(&pid_type);
+        decode_encode_one(&port_type);
+        decode_encode_one(&ref_type);
+    }
 
     /* Unicode atoms */
     for (i=0; i<24; i++) {
-	EI_DECODE_ENCODE(my_atom, my_atom);
-	EI_DECODE_ENCODE(pid, erlang_pid);
-	EI_DECODE_ENCODE(port, erlang_port);
-	EI_DECODE_ENCODE(ref, erlang_ref);
+	decode_encode_one(&my_atom_type);
+	decode_encode_one(&pid_type);
+	decode_encode_one(&port_type);
+	decode_encode_one(&ref_type);
+    }
+
+    decode_encode_one(&tuple_type);  /* {} */
+    {
+	struct Type* tpl[] = { &tuple_type, &my_atom_type, &pid_type, &port_type, &ref_type };
+	decode_encode(tpl, 5);
+    }
+
+    {
+	struct Type* list[] = { &list_type, &my_atom_type, &pid_type, &port_type, &ref_type, &nil_type };
+	decode_encode(list, 6);
+    }
+    {
+	struct Type* list[] = { &list_type, &my_atom_type, &fun_type };
+	decode_encode(list, 3);
+    }
+    decode_encode_one(&map_type);  /* #{} */
+    { /* #{atom => atom}*/
+	struct Type* map[] = { &map_type, &my_atom_type, &my_atom_type };
+	decode_encode(map, 3);
+    }
+
+    { /* #{atom => atom, atom => pid, port => ref }*/
+	struct Type* map[] = { &map_type,
+	    &my_atom_type, &my_atom_type,
+	    &my_atom_type, &pid_type,
+	    &port_type, &ref_type
+	};
+	decode_encode(map, 7);
     }
 
     report(1);
diff --git a/lib/erl_interface/test/ei_encode_SUITE.erl b/lib/erl_interface/test/ei_encode_SUITE.erl
index 8d622a9e65..ac6ec9cf4e 100644
--- a/lib/erl_interface/test/ei_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_encode_SUITE.erl
@@ -1,19 +1,19 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -21,25 +21,22 @@
 %%
 -module(ei_encode_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_encode_SUITE_data/ei_encode_test_cases.hrl").
 
--export(
-   [
-    all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-    init_per_group/2,end_per_group/2,
-    test_ei_encode_long/1,
-    test_ei_encode_ulong/1,
-    test_ei_encode_longlong/1,
-    test_ei_encode_ulonglong/1,
-    test_ei_encode_char/1,
-    test_ei_encode_misc/1,
-    test_ei_encode_fails/1,
-    test_ei_encode_utf8_atom/1,
-    test_ei_encode_utf8_atom_len/1
-   ]).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+-export([all/0, suite/0,
+         test_ei_encode_long/1,
+         test_ei_encode_ulong/1,
+         test_ei_encode_longlong/1,
+         test_ei_encode_ulonglong/1,
+         test_ei_encode_char/1,
+         test_ei_encode_misc/1,
+         test_ei_encode_fails/1,
+         test_ei_encode_utf8_atom/1,
+         test_ei_encode_utf8_atom_len/1]).
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [test_ei_encode_long, test_ei_encode_ulong,
@@ -48,21 +45,6 @@ all() ->
      test_ei_encode_fails, test_ei_encode_utf8_atom,
      test_ei_encode_utf8_atom_len].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 %% ---------------------------------------------------------------------------
 
@@ -72,222 +54,215 @@ end_per_group(_GroupName, Config) ->
 
 %% ######################################################################## %%
 
-test_ei_encode_long(suite) -> [];
 test_ei_encode_long(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_long),
+    P = runner:start(?test_ei_encode_long),
 
-    ?line {<<97,0>>                        ,0}   = get_buf_and_term(P),
-    ?line {<<97,255>>                      ,255} = get_buf_and_term(P),
-    ?line {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
-    ?line {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
+    {<<97,0>>                        ,0}   = get_buf_and_term(P),
+    {<<97,255>>                      ,255} = get_buf_and_term(P),
+    {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
+    {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
 
-    ?line {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
-    ?line {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
-    ?line {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
-    ?line {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
+    {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
+    {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
+    {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
+    {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
 
-    ?line {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
-    ?line {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
+    {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
+    {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_encode_ulong(suite) -> [];
 test_ei_encode_ulong(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_ulong),
+    P = runner:start(?test_ei_encode_ulong),
 
-    ?line {<<97,0>>                          ,0}   = get_buf_and_term(P),
-    ?line {<<97,255>>                        ,255} = get_buf_and_term(P),
-    ?line {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
+    {<<97,0>>                          ,0}   = get_buf_and_term(P),
+    {<<97,255>>                        ,255} = get_buf_and_term(P),
+    {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
 
-    ?line {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
-    ?line {<<110,4,0, 0,0,0,8>>                     ,16#08000000} = get_buf_and_term(P),
+    {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
+    {<<110,4,0, 0,0,0,8>>                     ,16#08000000} = get_buf_and_term(P),
 
-    ?line {<<110,4,0, 255,255,255,127>>             ,16#7fffffff} = get_buf_and_term(P),
-    ?line {<<110,4,0, 0,0,0,128>>                   ,16#80000000} = get_buf_and_term(P),
-    ?line {<<110,4,0, 255,255,255,255>>             ,16#ffffffff} = get_buf_and_term(P),
+    {<<110,4,0, 255,255,255,127>>             ,16#7fffffff} = get_buf_and_term(P),
+    {<<110,4,0, 0,0,0,128>>                   ,16#80000000} = get_buf_and_term(P),
+    {<<110,4,0, 255,255,255,255>>             ,16#ffffffff} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_encode_longlong(suite) -> [];
 test_ei_encode_longlong(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?test_ei_encode_longlong),
-
-	    ?line {<<97,0>>                        ,0}   = get_buf_and_term(P),
-	    ?line {<<97,255>>                      ,255} = get_buf_and_term(P),
-	    ?line {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
-	    ?line {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
-	    
-	    ?line {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
-	    ?line {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
-	    ?line {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
-
-	    ?line {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
-	    ?line {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
-	    ?line {<<110,6,0, 255,255,255,255,255,127>>     , 16#7fffffffffff} = get_buf_and_term(P),
-	    ?line {<<110,6,1, 0,0,0,0,0,128>>               ,-16#800000000000} = get_buf_and_term(P),
-	    ?line {<<110,8,0, 255,255,255,255,255,255,255,127>>,16#7fffffffffffffff} = get_buf_and_term(P),
-	    ?line {<<110,8,1, 0,0,0,0,0,0,0,128>>           ,-16#8000000000000000} = get_buf_and_term(P),
-
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?test_ei_encode_longlong),
+
+            {<<97,0>>                        ,0}   = get_buf_and_term(P),
+            {<<97,255>>                      ,255} = get_buf_and_term(P),
+            {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
+            {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
+
+            {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
+            {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
+            {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
+            {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
+
+            {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
+            {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
+            {<<110,6,0, 255,255,255,255,255,127>>     , 16#7fffffffffff} = get_buf_and_term(P),
+            {<<110,6,1, 0,0,0,0,0,128>>               ,-16#800000000000} = get_buf_and_term(P),
+            {<<110,8,0, 255,255,255,255,255,255,255,127>>,16#7fffffffffffffff} = get_buf_and_term(P),
+            {<<110,8,1, 0,0,0,0,0,0,0,128>>           ,-16#8000000000000000} = get_buf_and_term(P),
+
+            runner:recv_eot(P),
+            ok
     end.
 
 
 %% ######################################################################## %%
 
-test_ei_encode_ulonglong(suite) -> [];
 test_ei_encode_ulonglong(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?test_ei_encode_ulonglong),
-
-	    ?line {<<97,0>>                          ,0} = get_buf_and_term(P),
-	    ?line {<<97,255>>                        ,255} = get_buf_and_term(P),
-	    ?line {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
-
-	    ?line {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 0,0,0,8>>              ,16#08000000} = get_buf_and_term(P),
-
-	    ?line {<<110,4,0, 255,255,255,127>>      ,16#7fffffff} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 0,0,0,128>>            ,16#80000000} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 255,255,255,255>>      ,16#ffffffff} = get_buf_and_term(P),
-	    ?line {<<110,6,0, 255,255,255,255,255,255>>,16#ffffffffffff} = get_buf_and_term(P),
-	    ?line {<<110,8,0, 255,255,255,255,255,255,255,255>>,16#ffffffffffffffff} = get_buf_and_term(P),
-
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?test_ei_encode_ulonglong),
+
+            {<<97,0>>                          ,0} = get_buf_and_term(P),
+            {<<97,255>>                        ,255} = get_buf_and_term(P),
+            {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
+
+            {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
+            {<<110,4,0, 0,0,0,8>>              ,16#08000000} = get_buf_and_term(P),
+
+            {<<110,4,0, 255,255,255,127>>      ,16#7fffffff} = get_buf_and_term(P),
+            {<<110,4,0, 0,0,0,128>>            ,16#80000000} = get_buf_and_term(P),
+            {<<110,4,0, 255,255,255,255>>      ,16#ffffffff} = get_buf_and_term(P),
+            {<<110,6,0, 255,255,255,255,255,255>>,16#ffffffffffff} = get_buf_and_term(P),
+            {<<110,8,0, 255,255,255,255,255,255,255,255>>,16#ffffffffffffffff} = get_buf_and_term(P),
+
+            runner:recv_eot(P),
+            ok
     end.
 
 
 %% ######################################################################## %%
-%% A "character" for us is an 8 bit integer, alwasy positive, i.e.
+%% A "character" for us is an 8 bit integer, always positive, i.e.
 %% it is unsigned.
 %% FIXME maybe the API should change to use "unsigned char" to be clear?!
 
-test_ei_encode_char(suite) -> [];
 test_ei_encode_char(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_char),
+    P = runner:start(?test_ei_encode_char),
 
-    ?line {<<97,  0>>,0} = get_buf_and_term(P),
-    ?line {<<97,127>>,16#7f} = get_buf_and_term(P),
-    ?line {<<97,255>>,16#ff} = get_buf_and_term(P),
+    {<<97,  0>>,0} = get_buf_and_term(P),
+    {<<97,127>>,16#7f} = get_buf_and_term(P),
+    {<<97,255>>,16#ff} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_encode_misc(suite) -> [];
 test_ei_encode_misc(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_misc),
+    P = runner:start(?test_ei_encode_misc),
 
-    ?line <<131>>  = get_binaries(P),
+    <<131>>  = get_binaries(P),
 
-    ?line {<<70,_:8/binary>>,F0} = get_buf_and_term(P),
-    ?line true = match_float(F0, 0.0),
+    {<<70,_:8/binary>>,F0} = get_buf_and_term(P),
+    true = match_float(F0, 0.0),
 
-    ?line {<<70,_:8/binary>>,Fn1} = get_buf_and_term(P),
-    ?line true = match_float(Fn1, -1.0),
+    {<<70,_:8/binary>>,Fn1} = get_buf_and_term(P),
+    true = match_float(Fn1, -1.0),
 
-    ?line {<<70,_:8/binary>>,Fp1} = get_buf_and_term(P),
-    ?line true = match_float(Fp1, 1.0),
+    {<<70,_:8/binary>>,Fp1} = get_buf_and_term(P),
+    true = match_float(Fp1, 1.0),
 
-    ?line {<<100,0,5,"false">>,false}  = get_buf_and_term(P),
-    ?line {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
-    ?line {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
-    ?line {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
+    {<<100,0,5,"false">>,false}  = get_buf_and_term(P),
+    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
+    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
+    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
 
-    ?line {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
-    ?line {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
-    ?line {<<100,0,0,"">>,''}             = get_buf_and_term(P),
-    ?line {<<100,0,0,"">>,''}             = get_buf_and_term(P),
-    ?line {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
-    ?line {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
+    {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
+    {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
+    {<<100,0,0,"">>,''}             = get_buf_and_term(P),
+    {<<100,0,0,"">>,''}             = get_buf_and_term(P),
+    {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
+    {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
 
-    ?line {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
-    ?line {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
-    ?line {<<106>>,""}                    = get_buf_and_term(P),
-    ?line {<<106>>,""}                    = get_buf_and_term(P),
-    ?line {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
-    ?line {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
+    {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
+    {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
+    {<<106>>,""}                    = get_buf_and_term(P),
+    {<<106>>,""}                    = get_buf_and_term(P),
+    {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
+    {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
 
-    ?line {<<109,0,0,0,3,"foo">>,<<"foo">>}       = get_buf_and_term(P),
-    ?line {<<109,0,0,0,0,"">>,<<>>}               = get_buf_and_term(P),
-    ?line {<<109,0,0,0,6,"ÅÄÖåäö">>,<<"ÅÄÖåäö">>} = get_buf_and_term(P),
+    {<<109,0,0,0,3,"foo">>,<<"foo">>}       = get_buf_and_term(P),
+    {<<109,0,0,0,0,"">>,<<>>}               = get_buf_and_term(P),
+    {<<109,0,0,0,6,"ÅÄÖåäö">>,<<"ÅÄÖåäö">>} = get_buf_and_term(P),
 
-    ?line {<<104,0>>,{}}       = get_buf_and_term(P),	% Tuple header for {}
-    ?line {<<106>>,[]}         = get_buf_and_term(P),	% Empty list []
+    {<<104,0>>,{}}       = get_buf_and_term(P),	% Tuple header for {}
+    {<<106>>,[]}         = get_buf_and_term(P),	% Empty list []
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_encode_fails(suite) -> [];
 test_ei_encode_fails(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_fails),
+    P = runner:start(?test_ei_encode_fails),
 
-    ?line XAtom = list_to_atom(lists:duplicate(255, $x)),
-    ?line YAtom = list_to_atom(lists:duplicate(255, $y)),
+    XAtom = list_to_atom(lists:duplicate(255, $x)),
+    YAtom = list_to_atom(lists:duplicate(255, $y)),
 
-    ?line XAtom = get_term(P),
-    ?line XAtom = get_term(P),
-    ?line YAtom = get_term(P),
-    ?line YAtom = get_term(P),
+    XAtom = get_term(P),
+    XAtom = get_term(P),
+    YAtom = get_term(P),
+    YAtom = get_term(P),
 
-    ?line {{{{}}}} = get_term(P),
+    {{{{}}}} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
 test_ei_encode_utf8_atom(Config) ->
-    ?line P = runner:start(?test_ei_encode_utf8_atom),
-    
-    ?line {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
-    ?line {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
-    ?line {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
-    ?line {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
+    P = runner:start(?test_ei_encode_utf8_atom),
+
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
+    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
+    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
 
-    ?line {<<119,1,$A>>,'A'} = get_buf_and_term(P),
-    ?line {<<100,0,1,$A>>,'A'} = get_buf_and_term(P),
+    {<<119,1,$A>>,'A'} = get_buf_and_term(P),
+    {<<100,0,1,$A>>,'A'} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 %% ######################################################################## %%
 test_ei_encode_utf8_atom_len(Config) ->
-    ?line P = runner:start(?test_ei_encode_utf8_atom_len),
-    
-    ?line {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
-    ?line {<<100,0,2,197,196>>,'ÅÄ'} = get_buf_and_term(P),
-    ?line {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
-    ?line {<<119,4,195,133,195,132>>,'ÅÄ'} = get_buf_and_term(P),
-
-    ?line {<<119,1,$A>>,'A'} = get_buf_and_term(P),
-    ?line {<<100,0,2,$A,$B>>,'AB'} = get_buf_and_term(P),
-    ?line {<<100,0,255,_:(255*8)>>,_} = get_buf_and_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?test_ei_encode_utf8_atom_len),
+
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
+    {<<100,0,2,197,196>>,'ÅÄ'} = get_buf_and_term(P),
+    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
+    {<<119,4,195,133,195,132>>,'ÅÄ'} = get_buf_and_term(P),
+
+    {<<119,1,$A>>,'A'} = get_buf_and_term(P),
+    {<<100,0,2,$A,$B>>,'AB'} = get_buf_and_term(P),
+    {<<100,0,255,_:(255*8)>>,_} = get_buf_and_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 %% ######################################################################## %%
@@ -297,20 +272,20 @@ test_ei_encode_utf8_atom_len(Config) ->
 get_buf_and_term(P) ->
     B = get_binaries(P),
     case B of
-	<<131>> ->
-	    io:format("(got single magic, no content)\n",[]),
-	    {B,'$$magic$$'};
-	<<131,_>> ->
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got magic)\n",[B,T]),
-	    {B,T};
-	_ ->
-	    B1 = list_to_binary([131,B]),	% No magic, add
-	    T = binary_to_term(B1),
-	    io:format("~w\n~w\n(got no magic)\n",[B,T]),
-	    {B,T}
+        <<131>> ->
+            io:format("(got single magic, no content)\n",[]),
+            {B,'$$magic$$'};
+        <<131,_>> ->
+            T = binary_to_term(B),
+            io:format("~w\n~w\n(got magic)\n",[B,T]),
+            {B,T};
+        _ ->
+            B1 = list_to_binary([131,B]),	% No magic, add
+            T = binary_to_term(B1),
+            io:format("~w\n~w\n(got no magic)\n",[B,T]),
+            {B,T}
     end.
-    
+
 
 get_binaries(P) ->
     B1 = get_binary(P),
@@ -319,14 +294,14 @@ get_binaries(P) ->
 
 get_binary(P) ->
     case runner:get_term(P) of
-	{bytes,L} ->
-	    B = list_to_binary(L),
-	    io:format("~w\n",[L]),
-% For strange reasons <<131>> show up as <>....
-%	    io:format("~w\n",[B]),
-	    B;
-	Other ->
-	    Other
+        {bytes,L} ->
+            B = list_to_binary(L),
+            io:format("~w\n",[L]),
+            % For strange reasons <<131>> show up as <>....
+            %	    io:format("~w\n",[B]),
+            B;
+        Other ->
+            Other
     end.
 
 %%
@@ -335,27 +310,26 @@ get_binary(P) ->
 
 get_term(P) ->
     case runner:get_term(P) of
-	{bytes,[131]} ->
-	    io:format("(got single magic, no content)\n",[]),
-	    '$$magic$$';
-	{bytes,[131,L]} ->
-	    B = list_to_binary(L),
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got magic)\n",[L,T]),
-	    T;
-	{bytes,L} ->
-	    B = list_to_binary([131,L]),
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got no magic)\n",[L,T]),
-	    T;
-	Other ->
-	    Other
+        {bytes,[131]} ->
+            io:format("(got single magic, no content)\n",[]),
+            '$$magic$$';
+        {bytes,[131,L]} ->
+            B = list_to_binary(L),
+            T = binary_to_term(B),
+            io:format("~w\n~w\n(got magic)\n",[L,T]),
+            T;
+        {bytes,L} ->
+            B = list_to_binary([131,L]),
+            T = binary_to_term(B),
+            io:format("~w\n~w\n(got no magic)\n",[L,T]),
+            T;
+        Other ->
+            Other
     end.
- 
+
 %%
 
 match_float(F, Match) when is_float(F), is_float(Match), F == Match ->
     true;
 match_float(F, Match) when is_float(F), F > Match*0.99, F < Match*1.01 ->
     true.
-    
diff --git a/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.first b/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.first
index 19a6f4c0aa..0d2d3510a7 100644
--- a/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2009. All Rights Reserved.
+# Copyright Ericsson AB 2004-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src
index f2a2c40615..3b2cab7af4 100644
--- a/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src
@@ -1,29 +1,29 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2009. All Rights Reserved.
+# Copyright Ericsson AB 2004-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_encode_SUITE_data/ei_encode_test.c b/lib/erl_interface/test/ei_encode_SUITE_data/ei_encode_test.c
index 50fcaace8d..32811fdf22 100644
--- a/lib/erl_interface/test/ei_encode_SUITE_data/ei_encode_test.c
+++ b/lib/erl_interface/test/ei_encode_SUITE_data/ei_encode_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2004-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2004-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/ei_format_SUITE.erl b/lib/erl_interface/test/ei_format_SUITE.erl
index 2a26ed142b..07ee479b1f 100644
--- a/lib/erl_interface/test/ei_format_SUITE.erl
+++ b/lib/erl_interface/test/ei_format_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -20,158 +21,134 @@
 %%
 -module(ei_format_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_format_SUITE_data/ei_format_test_cases.hrl").
 
--export([
-	 format_wo_ver/1,
-	 all/0, suite/0,groups/0,
-	 init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 atoms/1, 
-	 tuples/1, 
-	 lists/1
-	]).
+-export([format_wo_ver/1,
+         all/0, suite/0,
+         atoms/1,
+         tuples/1,
+         lists/1]).
 
 -import(runner, [get_term/1]).
 
 %% This test suite test the erl_format() function.
 %% It uses the port program "ei_format_test".
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [format_wo_ver, atoms, tuples, lists].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %% Tests formatting various atoms.
 
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
-    ?line P = runner:start(?atoms),
-
-    ?line {term, ''} = get_term(P),
-    ?line {term, 'a'} = get_term(P),
-    ?line {term, 'A'} = get_term(P),
-    ?line {term, 'abc'} = get_term(P),
-    ?line {term, 'Abc'} = get_term(P),
-    ?line {term, 'ab@c'} = get_term(P),
-    ?line {term, 'The rain in Spain stays mainly in the plains'} =
-	get_term(P),
-
-    ?line {term, a} = get_term(P),
-    ?line {term, ab} = get_term(P),
-    ?line {term, abc} = get_term(P),
-    ?line {term, ab@c} = get_term(P),
-    ?line {term, abcdefghijklmnopq} = get_term(P),
-
-    ?line {term, ''} = get_term(P),
-    ?line {term, 'a'} = get_term(P),
-    ?line {term, 'A'} = get_term(P),
-    ?line {term, 'abc'} = get_term(P),
-    ?line {term, 'Abc'} = get_term(P),
-    ?line {term, 'ab@c'} = get_term(P),
-    ?line {term, 'The rain in Spain stays mainly in the plains'} =
-	get_term(P),
-
-    ?line {term, a} = get_term(P),
-    ?line {term, ab} = get_term(P),
-    ?line {term, abc} = get_term(P),
-    ?line {term, ab@c} = get_term(P),
-    ?line {term, '   abcdefghijklmnopq   '} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?atoms),
+
+    {term, ''} = get_term(P),
+    {term, 'a'} = get_term(P),
+    {term, 'A'} = get_term(P),
+    {term, 'abc'} = get_term(P),
+    {term, 'Abc'} = get_term(P),
+    {term, 'ab@c'} = get_term(P),
+    {term, 'The rain in Spain stays mainly in the plains'} =
+    get_term(P),
+
+    {term, a} = get_term(P),
+    {term, ab} = get_term(P),
+    {term, abc} = get_term(P),
+    {term, ab@c} = get_term(P),
+    {term, abcdefghijklmnopq} = get_term(P),
+
+    {term, ''} = get_term(P),
+    {term, 'a'} = get_term(P),
+    {term, 'A'} = get_term(P),
+    {term, 'abc'} = get_term(P),
+    {term, 'Abc'} = get_term(P),
+    {term, 'ab@c'} = get_term(P),
+    {term, 'The rain in Spain stays mainly in the plains'} =
+    get_term(P),
+
+    {term, a} = get_term(P),
+    {term, ab} = get_term(P),
+    {term, abc} = get_term(P),
+    {term, ab@c} = get_term(P),
+    {term, '   abcdefghijklmnopq   '} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various tuples
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
-    ?line P = runner:start(?tuples),
-
-    ?line {term, {}} = get_term(P),
-    ?line {term, {a}} = get_term(P),
-    ?line {term, {a, b}} = get_term(P),
-    ?line {term, {a, b, c}} = get_term(P),
-    ?line {term, {1}} = get_term(P),
-    ?line {term, {[]}} = get_term(P),
-    ?line {term, {[], []}} = get_term(P),
-    ?line {term, {[], a, b, c}} = get_term(P),
-    ?line {term, {[], a, [], b, c}} = get_term(P),
-    ?line {term, {[], a, '', b, c}} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?tuples),
+
+    {term, {}} = get_term(P),
+    {term, {a}} = get_term(P),
+    {term, {a, b}} = get_term(P),
+    {term, {a, b, c}} = get_term(P),
+    {term, {1}} = get_term(P),
+    {term, {[]}} = get_term(P),
+    {term, {[], []}} = get_term(P),
+    {term, {[], a, b, c}} = get_term(P),
+    {term, {[], a, [], b, c}} = get_term(P),
+    {term, {[], a, '', b, c}} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various lists
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
-    ?line P = runner:start(?lists),
-
-    ?line {term, []} = get_term(P),
-    ?line {term, [a]} = get_term(P),
-    ?line {term, [a, b]} = get_term(P),
-    ?line {term, [a, b, c]} = get_term(P),
-    ?line {term, [1]} = get_term(P),
-    ?line {term, [[]]} = get_term(P),
-    ?line {term, [[], []]} = get_term(P),
-    ?line {term, [[], a, b, c]} = get_term(P),
-    ?line {term, [[], a, [], b, c]} = get_term(P),
-    ?line {term, [[], a, '', b, c]} = get_term(P),
-    ?line {term, [[x, 2], [y, 3], [z, 4]]}= get_term(P),
-    ?line {term, [{a,b},{c,d}]}= get_term(P),
-%%    ?line {term, [{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]} = 
-%%	get_term(P),
-    
-    ?line {term, [{pi, F1}, {'cos(70)', F2}]} = get_term(P),
+    P = runner:start(?lists),
+
+    {term, []} = get_term(P),
+    {term, [a]} = get_term(P),
+    {term, [a, b]} = get_term(P),
+    {term, [a, b, c]} = get_term(P),
+    {term, [1]} = get_term(P),
+    {term, [[]]} = get_term(P),
+    {term, [[], []]} = get_term(P),
+    {term, [[], a, b, c]} = get_term(P),
+    {term, [[], a, [], b, c]} = get_term(P),
+    {term, [[], a, '', b, c]} = get_term(P),
+    {term, [[x, 2], [y, 3], [z, 4]]}= get_term(P),
+    {term, [{a,b},{c,d}]} = get_term(P),
+    %% {term, [{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]} = get_term(P),
+
+    {term, [{pi, F1}, {'cos(70)', F2}]} = get_term(P),
     %% don't match floats directly
     true= abs(3.1415-F1) < 0.01,
     true= abs(0.34202-F2) < 0.01,
 
-    ?line {term, [[pi, F3], ['cos(70)', F4]]} = get_term(P),
+    {term, [[pi, F3], ['cos(70)', F4]]} = get_term(P),
     true= abs(3.1415-F3) < 0.01,
     true= abs(0.34202-F4) < 0.01,
 
 
-%%    ?line {term, [[pi, 3.1415], [], ["cos(70)", 0.34202]]} = get_term(P),
-    ?line {term, [-1]} = get_term(P),
-    ?line {term, "hejsan"} = get_term(P),
+    %%    {term, [[pi, 3.1415], [], ["cos(70)", 0.34202]]} = get_term(P),
+    {term, [-1]} = get_term(P),
+    {term, "hejsan"} = get_term(P),
 
 
-    ?line Str1 = lists:duplicate(65535,$A),
-    ?line Str2 = lists:duplicate(65536,$A),
-    ?line {term,Str1} = get_term(P),
-    ?line {term,Str2} = get_term(P),
+    Str1 = lists:duplicate(65535,$A),
+    Str2 = lists:duplicate(65536,$A),
+    {term,Str1} = get_term(P),
+    {term,Str2} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
-format_wo_ver(suite) -> [];
 format_wo_ver(Config) when is_list(Config) ->
-    ?line P = runner:start(?format_wo_ver),
+    P = runner:start(?format_wo_ver),
 
-    ?line {term, [-1, 2, $c, {a, "b"}, {c, 10}]} = get_term(P),
+    {term, [-1, 2, $c, {a, "b"}, {c, 10}]} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
diff --git a/lib/erl_interface/test/ei_format_SUITE_data/Makefile.first b/lib/erl_interface/test/ei_format_SUITE_data/Makefile.first
index 1247ce08c7..7bf2d761ac 100644
--- a/lib/erl_interface/test/ei_format_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/ei_format_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src
index 73d51794e9..b89dcae45a 100644
--- a/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src
@@ -1,29 +1,29 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_format_SUITE_data/ei_format_test.c b/lib/erl_interface/test/ei_format_SUITE_data/ei_format_test.c
index 2f53effd78..8450332b28 100644
--- a/lib/erl_interface/test/ei_format_SUITE_data/ei_format_test.c
+++ b/lib/erl_interface/test/ei_format_SUITE_data/ei_format_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/ei_print_SUITE.erl b/lib/erl_interface/test/ei_print_SUITE.erl
index 6305302e28..6d5c341eae 100644
--- a/lib/erl_interface/test/ei_print_SUITE.erl
+++ b/lib/erl_interface/test/ei_print_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -20,144 +21,120 @@
 %%
 -module(ei_print_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_print_SUITE_data/ei_print_test_cases.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 atoms/1, tuples/1, lists/1, strings/1]).
+-export([all/0, suite/0,
+         atoms/1, tuples/1, lists/1, strings/1]).
 
 -import(runner, [get_term/1]).
 
 %% This test suite test the ei_print() function.
 %% It uses the port program "ei_format_test".
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [atoms, tuples, lists, strings].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %% Tests formatting various atoms.
 
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
-    ?line P = runner:start(?atoms),
-
-    ?line {term, "''"} = get_term(P),
-    ?line {term, "a"} = get_term(P),
-    ?line {term, "'A'"} = get_term(P),
-    ?line {term, "abc"} = get_term(P),
-    ?line {term, "'Abc'"} = get_term(P),
-    ?line {term, "ab@c"} = get_term(P),
-    ?line {term, "'The rain in Spain stays mainly in the plains'"} =
-	get_term(P),
-
-    ?line {term, "a"} = get_term(P),
-    ?line {term, "ab"} = get_term(P),
-    ?line {term, "abc"} = get_term(P),
-    ?line {term, "ab@c"} = get_term(P),
-    ?line {term, "abcdefghijklmnopq"} = get_term(P),
-
-    ?line {term, "''"} = get_term(P),
-    ?line {term, "a"} = get_term(P),
-    ?line {term, "'A'"} = get_term(P),
-    ?line {term, "abc"} = get_term(P),
-    ?line {term, "'Abc'"} = get_term(P),
-    ?line {term, "ab@c"} = get_term(P),
-    ?line {term, "'The rain in Spain stays mainly in the plains'"} =
-	get_term(P),
-
-    ?line {term, "a"} = get_term(P),
-    ?line {term, "ab"} = get_term(P),
-    ?line {term, "abc"} = get_term(P),
-    ?line {term, "ab@c"} = get_term(P),
-    ?line {term, "'   abcdefghijklmnopq   '"} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?atoms),
+
+    {term, "''"} = get_term(P),
+    {term, "a"} = get_term(P),
+    {term, "'A'"} = get_term(P),
+    {term, "abc"} = get_term(P),
+    {term, "'Abc'"} = get_term(P),
+    {term, "ab@c"} = get_term(P),
+    {term, "'The rain in Spain stays mainly in the plains'"} = get_term(P),
+
+    {term, "a"} = get_term(P),
+    {term, "ab"} = get_term(P),
+    {term, "abc"} = get_term(P),
+    {term, "ab@c"} = get_term(P),
+    {term, "abcdefghijklmnopq"} = get_term(P),
+
+    {term, "''"} = get_term(P),
+    {term, "a"} = get_term(P),
+    {term, "'A'"} = get_term(P),
+    {term, "abc"} = get_term(P),
+    {term, "'Abc'"} = get_term(P),
+    {term, "ab@c"} = get_term(P),
+    {term, "'The rain in Spain stays mainly in the plains'"} = get_term(P),
+
+    {term, "a"} = get_term(P),
+    {term, "ab"} = get_term(P),
+    {term, "abc"} = get_term(P),
+    {term, "ab@c"} = get_term(P),
+    {term, "'   abcdefghijklmnopq   '"} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various tuples
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
-    ?line P = runner:start(?tuples),
-
-    ?line {term, "{}"} = get_term(P),
-    ?line {term, "{a}"} = get_term(P),
-    ?line {term, "{a, b}"} = get_term(P),
-    ?line {term, "{a, b, c}"} = get_term(P),
-    ?line {term, "{1}"} = get_term(P),
-    ?line {term, "{[]}"} = get_term(P),
-    ?line {term, "{[], []}"} = get_term(P),
-    ?line {term, "{[], a, b, c}"} = get_term(P),
-    ?line {term, "{[], a, [], b, c}"} = get_term(P),
-    ?line {term, "{[], a, '', b, c}"} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?tuples),
+
+    {term, "{}"} = get_term(P),
+    {term, "{a}"} = get_term(P),
+    {term, "{a, b}"} = get_term(P),
+    {term, "{a, b, c}"} = get_term(P),
+    {term, "{1}"} = get_term(P),
+    {term, "{[]}"} = get_term(P),
+    {term, "{[], []}"} = get_term(P),
+    {term, "{[], a, b, c}"} = get_term(P),
+    {term, "{[], a, [], b, c}"} = get_term(P),
+    {term, "{[], a, '', b, c}"} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various lists
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
-    ?line P = runner:start(?lists),
-
-    ?line {term, "[]"} = get_term(P),
-    ?line {term, "[a]"} = get_term(P),
-    ?line {term, "[a, b]"} = get_term(P),
-    ?line {term, "[a, b, c]"} = get_term(P),
-    ?line {term, "[1]"} = get_term(P),
-    ?line {term, "[[]]"} = get_term(P),
-    ?line {term, "[[], []]"} = get_term(P),
-    ?line {term, "[[], a, b, c]"} = get_term(P),
-    ?line {term, "[[], a, [], b, c]"} = get_term(P),
-    ?line {term, "[[], a, '', b, c]"} = get_term(P),
-    ?line {term, "[[x, 2], [y, 3], [z, 4]]"}= get_term(P),
-
-%%    ?line {term, "[{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]"} = 
-%%	get_term(P),
+    P = runner:start(?lists),
+
+    {term, "[]"} = get_term(P),
+    {term, "[a]"} = get_term(P),
+    {term, "[a, b]"} = get_term(P),
+    {term, "[a, b, c]"} = get_term(P),
+    {term, "[1]"} = get_term(P),
+    {term, "[[]]"} = get_term(P),
+    {term, "[[], []]"} = get_term(P),
+    {term, "[[], a, b, c]"} = get_term(P),
+    {term, "[[], a, [], b, c]"} = get_term(P),
+    {term, "[[], a, '', b, c]"} = get_term(P),
+    {term, "[[x, 2], [y, 3], [z, 4]]"}= get_term(P),
+
+    %% {term, "[{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]"} = get_term(P),
     %% maybe regexp instead?
-    ?line {term, "[{pi, 3.141500}, {'cos(70)', 0.342020}]"} = get_term(P),
-    ?line {term, "[[pi, 3.141500], ['cos(70)', 0.342020]]"} = get_term(P),
+    {term, "[{pi, 3.141500}, {'cos(70)', 0.342020}]"} = get_term(P),
+    {term, "[[pi, 3.141500], ['cos(70)', 0.342020]]"} = get_term(P),
 
-    ?line {term, "[-1]"} = get_term(P),
+    {term, "[-1]"} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
-strings(suite) -> [];
 strings(Config) when is_list(Config) ->
-    ?line P = runner:start(?strings),
-
-    ?line {term, "\"\\n\""} = get_term(P),
-    ?line {term, "\"\\r\\n\""} = get_term(P),
-    ?line {term, "\"a\""} = get_term(P),
-    ?line {term, "\"A\""} = get_term(P),
-    ?line {term, "\"0\""} = get_term(P),
-    ?line {term, "\"9\""} = get_term(P),
-    ?line {term, "\"The rain in Spain stays mainly in the plains\""} = get_term(P),
-    ?line {term, "\"   abcdefghijklmnopq   \""} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?strings),
+
+    {term, "\"\\n\""} = get_term(P),
+    {term, "\"\\r\\n\""} = get_term(P),
+    {term, "\"a\""} = get_term(P),
+    {term, "\"A\""} = get_term(P),
+    {term, "\"0\""} = get_term(P),
+    {term, "\"9\""} = get_term(P),
+    {term, "\"The rain in Spain stays mainly in the plains\""} = get_term(P),
+    {term, "\"   abcdefghijklmnopq   \""} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
-    
diff --git a/lib/erl_interface/test/ei_print_SUITE_data/Makefile.first b/lib/erl_interface/test/ei_print_SUITE_data/Makefile.first
index e36d4364dc..3d2395a2c2 100644
--- a/lib/erl_interface/test/ei_print_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/ei_print_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src
index 6eec4b1990..150c11b99c 100644
--- a/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src
@@ -1,29 +1,29 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c b/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
index 8ce89e237a..15cfbcae34 100644
--- a/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
+++ b/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/ei_tmo_SUITE.erl b/lib/erl_interface/test/ei_tmo_SUITE.erl
index c33beecbe9..003fe20594 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE.erl
+++ b/lib/erl_interface/test/ei_tmo_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -20,337 +21,304 @@
 %%
 -module(ei_tmo_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/inet.hrl").
 -include("ei_tmo_SUITE_data/ei_tmo_test_cases.hrl").
 
--define(dummy_host,test01).
-
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 init_per_testcase/2, end_per_testcase/2,
-	 framework_check/1, ei_accept_tmo/1, ei_connect_tmo/1, ei_send_tmo/1,
-	 ei_recv_tmo/1]).
+-export([all/0, suite/0,
+         init_per_testcase/2, end_per_testcase/2,
+         framework_check/1, ei_accept_tmo/1, ei_connect_tmo/1, ei_send_tmo/1,
+	 ei_connect_tmo/0,
+         ei_recv_tmo/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     [framework_check, ei_accept_tmo, ei_connect_tmo,
      ei_send_tmo, ei_recv_tmo].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(1)),
     % test if platform is vxworks_simso
-    ?line {_,Host} = split(node()),
+    {_,Host} = split(node()),
     Bool = case atom_to_list(Host) of
-		[$v,$x,$s,$i,$m | _] -> true;
-		_ -> false
-	    end,
-    [{vxsim,Bool},{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+               [$v,$x,$s,$i,$m | _] -> true;
+               _ -> false
+           end,
+    [{vxsim,Bool}|Config].
+
+end_per_testcase(_Case, _Config) ->
     ok.
 
-framework_check(doc) ->
-    ["Check the framework."];
-framework_check(suite) ->
-    [];
+%% Check the framework.
 framework_check(Config) when is_list(Config) ->
     %%dbg:tracer(),
     %%dbg:p(self()),
-    ?line P = runner:start(?framework_check),
-    ?line runner:send_term(P,{hello,world}),
-    ?line {term, {hello,world}} = runner:get_term(P),
-    ?line runner:recv_eot(P),
+    P = runner:start(?framework_check),
+    runner:send_term(P,{hello,world}),
+    {term, {hello,world}} = runner:get_term(P),
+    runner:recv_eot(P),
     ok.
 
 
-ei_recv_tmo(doc) ->
-    ["Check recv with timeouts."];
-ei_recv_tmo(suite) ->
-    [];
+%% Check recv with timeouts.
 ei_recv_tmo(Config) when is_list(Config) ->
-    ?line do_one_recv(Config,c_node_recv_tmo_1),
-    ?line do_one_recv_failure(Config,c_node_recv_tmo_2),
+    do_one_recv(Config,c_node_recv_tmo_1),
+    do_one_recv_failure(Config,c_node_recv_tmo_2),
     ok.
 
 
 do_one_recv(Config,CNode) ->
-    ?line {_,Host} = split(node()),
-    ?line P1 = runner:start(?recv_tmo),
-    ?line runner:send_term(P1,{CNode,
-			       erlang:get_cookie(),
-			       node()}),
-    ?line {term, X} = runner:get_term(P1, 10000),
-    ?line true = is_integer(X),
-    ?line CNode1 = join(CNode,Host),
-    ?line Term1 = {hej,[hopp,{i,[lingon,"skogen"]}]},
-    ?line {test,CNode1} ! Term1,
-    ?line {term, Term1} = runner:get_term(P1, 10000),
-    ?line runner:recv_eot(P1).
-    
+    {_,Host} = split(node()),
+    P1 = runner:start(?recv_tmo),
+    runner:send_term(P1,{CNode,
+                         erlang:get_cookie(),
+                         node()}),
+    {term, X} = runner:get_term(P1, 10000),
+    true = is_integer(X),
+    CNode1 = join(CNode,Host),
+    Term1 = {hej,[hopp,{i,[lingon,"skogen"]}]},
+    {test,CNode1} ! Term1,
+    {term, Term1} = runner:get_term(P1, 10000),
+    runner:recv_eot(P1).
+
 do_one_recv_failure(Config,CNode) ->
-    ?line P1 = runner:start(?recv_tmo),
-    ?line runner:send_term(P1,{CNode,
-			       erlang:get_cookie(),
-			       node()}),
-    ?line {term, X} = runner:get_term(P1, 10000),
-    ?line true = is_integer(X),
-    ?line {term, {Ret,ETimedout,ETimedout}} = runner:get_term(P1, 10000),
-    ?line true = (Ret < 0),
-    ?line runner:recv_eot(P1).
-    
-
-ei_send_tmo(doc) ->
-    ["Check send with timeouts."];
-ei_send_tmo(suite) ->
-    [];
+    P1 = runner:start(?recv_tmo),
+    runner:send_term(P1,{CNode,
+                         erlang:get_cookie(),
+                         node()}),
+    {term, X} = runner:get_term(P1, 10000),
+    true = is_integer(X),
+    {term, {Ret,ETimedout,ETimedout}} = runner:get_term(P1, 10000),
+    true = (Ret < 0),
+    runner:recv_eot(P1).
+
+
+%% Check send with timeouts.
 ei_send_tmo(Config) when is_list(Config) ->
     %dbg:tracer(),
     %dbg:p(self()),
-    VxSim = ?config(vxsim, Config),
-    ?line register(ei_send_tmo_1,self()),
-    ?line do_one_send(Config,self(),c_node_send_tmo_1),
-    ?line do_one_send(Config,ei_send_tmo_1,c_node_send_tmo_2),
-    ?line do_one_send_failure(Config,self(),cccc1,c_nod_send_tmo_3,VxSim),
-    ?line do_one_send_failure(Config,ei_send_tmo_1,cccc2,c_nod_send_tmo_4,VxSim),
+    VxSim = proplists:get_value(vxsim, Config),
+    register(ei_send_tmo_1,self()),
+    do_one_send(Config,self(),c_node_send_tmo_1),
+    do_one_send(Config,ei_send_tmo_1,c_node_send_tmo_2),
+    do_one_send_failure(Config,self(),cccc1,c_nod_send_tmo_3,VxSim),
+    do_one_send_failure(Config,ei_send_tmo_1,cccc2,c_nod_send_tmo_4,VxSim),
     ok.
-    
+
 
 do_one_send(Config,From,CNode) ->
-    ?line {_,Host} = split(node()),
-    ?line P1 = runner:start(?send_tmo),
-    ?line runner:send_term(P1,{CNode,
-			      erlang:get_cookie(),
-			      node()}),
-    ?line {term, X} = runner:get_term(P1, 10000),
-    ?line true = is_integer(X),
-    ?line CNode1 = join(CNode,Host),
-    ?line Term1 = {hej,[hopp,{i,[lingon,"skogen"]}]},
-    ?line {test,CNode1} ! {From,1,Term1},
-    ?line ok = receive
-		   Term1 ->
-		       ok
-	       after 2000 ->
-		       error
-	       end,
-    ?line {term, 0} = runner:get_term(P1, 10000),
-    ?line runner:recv_eot(P1).
+    {_,Host} = split(node()),
+    P1 = runner:start(?send_tmo),
+    runner:send_term(P1,{CNode,
+                         erlang:get_cookie(),
+                         node()}),
+    {term, X} = runner:get_term(P1, 10000),
+    true = is_integer(X),
+    CNode1 = join(CNode,Host),
+    Term1 = {hej,[hopp,{i,[lingon,"skogen"]}]},
+    {test,CNode1} ! {From,1,Term1},
+    ok = receive
+             Term1 ->
+                 ok
+         after 2000 ->
+                   error
+         end,
+    {term, 0} = runner:get_term(P1, 10000),
+    runner:recv_eot(P1).
 
 do_one_send_failure(Config,From,FakeName,CName,VxSim) ->
-    ?line {_,Host} = split(node()),
-    ?line OurName = join(FakeName,Host),
-    ?line Node = join(CName,Host),
-    ?line LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
-			{ok, Socket} ->
-			    ?line Socket;
-			Else ->
-			    ?line exit(Else)
-		    end,
-    ?line EpmdSocket = register(OurName, LSocket, 1, 5),
-    ?line P3 = runner:start(?send_tmo),
-    ?line Cookie = kaksmula_som_ingen_bryr_sig_om,
-    ?line runner:send_term(P3,{CName,
-			      Cookie,
-			      OurName}),
-    ?line SocketB = case gen_tcp:accept(LSocket) of
-		  {ok, Socket1} ->
-		      ?line Socket1;
-		  Else2 ->
-		      ?line exit(Else2)
-	      end,
-    ?line {hidden,Node,5} = recv_name(SocketB),  % See 1)
-    ?line send_status(SocketB, ok),
-    ?line MyChallengeB = gen_challenge(),
-    ?line send_challenge(SocketB, OurName, MyChallengeB, 5),
-    ?line HisChallengeB = recv_challenge_reply(
-			    SocketB, 
-			    MyChallengeB, 
-			    Cookie),
-    ?line DigestB = gen_digest(HisChallengeB,Cookie),
-    ?line send_challenge_ack(SocketB, DigestB),
-    ?line inet:setopts(SocketB, [{active, false},
-			  {packet, 4}]),   
-    ?line {term, X} = runner:get_term(P3, 10000),
-    ?line true = is_integer(X),
-    ?line Message = [112,term_to_binary({6,self(),'',test}),
-		     term_to_binary({From,10000,
-				     {app,["lapp",{sa,["att",du,{slapp,
-								 sitta}]}]}})],
-    ?line gen_tcp:send(SocketB,Message),
-
-    %% At this point the test program starts sending messages (max 10000). Since 
+    {_,Host} = split(node()),
+    OurName = join(FakeName,Host),
+    Node = join(CName,Host),
+    LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
+                  {ok, Socket} ->
+                      Socket;
+                  Else ->
+                      exit(Else)
+              end,
+    EpmdSocket = register(OurName, LSocket, 1, 5),
+    P3 = runner:start(?send_tmo),
+    Cookie = kaksmula_som_ingen_bryr_sig_om,
+    runner:send_term(P3,{CName,
+                         Cookie,
+                         OurName}),
+    SocketB = case gen_tcp:accept(LSocket) of
+                  {ok, Socket1} ->
+                      Socket1;
+                  Else2 ->
+                      exit(Else2)
+              end,
+    {hidden,Node,5} = recv_name(SocketB),  % See 1)
+    send_status(SocketB, ok),
+    MyChallengeB = gen_challenge(),
+    send_challenge(SocketB, OurName, MyChallengeB, 5),
+    HisChallengeB = recv_challenge_reply(SocketB,
+                                         MyChallengeB,
+                                         Cookie),
+    DigestB = gen_digest(HisChallengeB,Cookie),
+    send_challenge_ack(SocketB, DigestB),
+    inet:setopts(SocketB, [{active, false},
+                           {packet, 4}]),
+    {term, X} = runner:get_term(P3, 10000),
+    true = is_integer(X),
+    Message = [112,term_to_binary({6,self(),'',test}),
+               term_to_binary({From,50000,
+                               {app,["lapp",{sa,["att",du,{slapp,
+                                                           sitta}]}]}})],
+    gen_tcp:send(SocketB,Message),
+
+    %% At this point the test program starts sending messages (max 50000). Since
     %% we're not receiving, eventually the send buffer fills up. Then no more 
     %% sending is possible and select() times out. The number of messages sent
     %% before this happens is returned in Iters. The timeout value for get_term/2
     %% must be large enough so there's time for the select() to time out and
     %% the test program to return the error tuple (below).
-    Res0 =
-	if VxSim == false ->
-		?line {term,{Res,ETO,Iters,ETO}} = runner:get_term(P3, 20000),
-		Res;	   
-	   true ->				% relax the test for vxsim
-		?line case runner:get_term(P3, 20000) of
-			  {term,{Res,ETO,Iters,ETO}} -> 
-			      Res;
-			  {term,{Res,_,Iters,ETO}} -> % EIO?
-			      Res
-		      end
-	end,
-    ?line runner:recv_eot(P3),
-    ?line true = ((Res0 < 0) and (Iters > 0)),
-    ?line gen_tcp:close(SocketB),
-    ?line gen_tcp:close(EpmdSocket),
+
+    Res0 = if VxSim == false ->
+                  {term,{Res,ETO,Iters,ETO}} = runner:get_term(P3, 20000),
+                  Res;
+              true ->   % relax the test for vxsim
+                  case runner:get_term(P3, 20000) of
+                      {term,{Res,ETO,Iters,ETO}} ->
+                          Res;
+                      {term,{Res,_,Iters,_ETO}} -> % EIO?
+                          Res
+                  end
+           end,
+    runner:recv_eot(P3),
+    true = ((Res0 < 0) and (Iters > 0)),
+    gen_tcp:close(SocketB),
+    gen_tcp:close(EpmdSocket),
     ok.
-    
 
-ei_connect_tmo(doc) ->
-    ["Check accept with timeouts."];
-ei_connect_tmo(suite) ->
-    [];
+
+%% Check accept with timeouts.
+ei_connect_tmo() -> [{require, test_host_not_reachable}].
+
 ei_connect_tmo(Config) when is_list(Config) ->
     %dbg:tracer(),
     %dbg:p(self()),
-    VxSim = ?config(vxsim, Config),
+    VxSim = proplists:get_value(vxsim, Config),
     DummyNode = make_and_check_dummy(),
-    ?line P = runner:start(?connect_tmo),
-    ?line runner:send_term(P,{c_nod_connect_tmo_1,
-			      kaksmula_som_ingen_bryr_sig_om,
-			      DummyNode}),
+    P = runner:start(?connect_tmo),
+    runner:send_term(P,{c_nod_connect_tmo_1,
+                        kaksmula_som_ingen_bryr_sig_om,
+                        DummyNode}),
     ETimedout =
-	if VxSim == false ->
-		?line {term,{-3,ETO,ETO}} = runner:get_term(P, 10000),
-		?line ETO;
-	   true ->				% relax the test for vxsim
-		?line case runner:get_term(P, 10000) of
-			  {term,{-3,ETO,ETO}} -> 
-			      ?line ETO;
-			  {term,{-1,_,ETO}} ->	% EHOSTUNREACH = ok
-			      ?line ETO
-		      end
-	end,
-    ?line runner:recv_eot(P),
-    ?line P2 = runner:start(?connect_tmo),
-    ?line runner:send_term(P2,{c_nod_connect_tmo_2,
-			       erlang:get_cookie(),
-			       node()}),
-    ?line {term, X} = runner:get_term(P2, 10000),
-    ?line runner:recv_eot(P2),
-    ?line true = is_integer(X),
+    if VxSim == false ->
+           {term,{-3,ETO,ETO}} = runner:get_term(P, 10000),
+           ETO;
+       true ->				% relax the test for vxsim
+           case runner:get_term(P, 10000) of
+               {term,{-3,ETO,ETO}} ->
+                   ETO;
+               {term,{-1,_,ETO}} ->	% EHOSTUNREACH = ok
+                   ETO
+           end
+    end,
+    runner:recv_eot(P),
+    P2 = runner:start(?connect_tmo),
+    runner:send_term(P2,{c_nod_connect_tmo_2,
+                         erlang:get_cookie(),
+                         node()}),
+    {term, X} = runner:get_term(P2, 10000),
+    runner:recv_eot(P2),
+    true = is_integer(X),
     %% Aborted handshake test...
-    ?line {_,Host} = split(node()),
-    ?line OurName = join(cccc,Host),
-    ?line Node = join(c_nod_connect_tmo_3,Host),
-    ?line LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
-			{ok, Socket} ->
-			    ?line Socket;
-			Else ->
-			    ?line exit(Else)
-		    end,
-    ?line EpmdSocket = register(OurName, LSocket, 1, 5),
-    ?line P3 = runner:start(?connect_tmo),
-    ?line Cookie = kaksmula_som_ingen_bryr_sig_om,
-    ?line runner:send_term(P3,{c_nod_connect_tmo_3,
-			      Cookie,
-			      OurName}),
-    ?line SocketB = case gen_tcp:accept(LSocket) of
-		  {ok, Socket1} ->
-		      ?line Socket1;
-		  Else2 ->
-		      ?line exit(Else2)
-	      end,
-    ?line {hidden,Node,5} = recv_name(SocketB),  % See 1)
-    ?line send_status(SocketB, ok),
-    ?line MyChallengeB = gen_challenge(),
-    ?line send_challenge(SocketB, OurName, MyChallengeB, 5),
-    ?line HisChallengeB = recv_challenge_reply(
-			    SocketB, 
-			    MyChallengeB, 
-			    Cookie),
-    ?line {term,{-1,ETimedout,ETimedout}} = runner:get_term(P3, 10000),
-    ?line runner:recv_eot(P3),
-    ?line gen_tcp:close(SocketB),
-    ?line gen_tcp:close(EpmdSocket),
+    {_,Host} = split(node()),
+    OurName = join(cccc,Host),
+    Node = join(c_nod_connect_tmo_3,Host),
+    LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
+                  {ok, Socket} ->
+                      Socket;
+                  Else ->
+                      exit(Else)
+              end,
+    EpmdSocket = register(OurName, LSocket, 1, 5),
+    P3 = runner:start(?connect_tmo),
+    Cookie = kaksmula_som_ingen_bryr_sig_om,
+    runner:send_term(P3,{c_nod_connect_tmo_3,
+                         Cookie,
+                         OurName}),
+    SocketB = case gen_tcp:accept(LSocket) of
+                  {ok, Socket1} ->
+                      Socket1;
+                  Else2 ->
+                      exit(Else2)
+              end,
+    {hidden,Node,5} = recv_name(SocketB),  % See 1)
+    send_status(SocketB, ok),
+    MyChallengeB = gen_challenge(),
+    send_challenge(SocketB, OurName, MyChallengeB, 5),
+    _HisChallengeB = recv_challenge_reply(SocketB,
+                                          MyChallengeB,
+                                          Cookie),
+    {term,{-1,ETimedout,ETimedout}} = runner:get_term(P3, 10000),
+    runner:recv_eot(P3),
+    gen_tcp:close(SocketB),
+    gen_tcp:close(EpmdSocket),
     ok.
-    
 
-ei_accept_tmo(doc) ->
-    ["Check accept with timeouts."];
-ei_accept_tmo(suite) ->
-    [];
+
+%% Check accept with timeouts.
 ei_accept_tmo(Config) when is_list(Config) ->
     %%dbg:tracer(),
     %%dbg:p(self()),
-    ?line P = runner:start(?accept_tmo),
-    ?line runner:send_term(P,{c_nod_som_ingen_kontaktar_1,
-			      kaksmula_som_ingen_bryr_sig_om}),
-    ?line {term,{-1,ETimedout,ETimedout}} = runner:get_term(P, 10000),
-    ?line runner:recv_eot(P),
-    ?line P2 = runner:start(?accept_tmo),
-    ?line runner:send_term(P2,{c_nod_som_vi_kontaktar_1,
-			      erlang:get_cookie()}),
-    ?line receive after 1000 -> ok end,
-    ?line CNode1 = make_node(c_nod_som_vi_kontaktar_1),
-    ?line {ignored,CNode1} ! tjenare,
-    ?line {term, X} = runner:get_term(P2, 10000),
-    ?line runner:recv_eot(P2),
-    ?line true = is_integer(X),
-    ?line P3 = runner:start(?accept_tmo),
-    ?line runner:send_term(P3,{c_nod_som_vi_kontaktar_2,
-			      erlang:get_cookie()}),
-    ?line receive after 1000 -> ok end,
-    ?line CNode2 = make_node(c_nod_som_vi_kontaktar_2),
-    ?line {NA,NB} = split(CNode2),
-    ?line {_,Host} = split(node()),
-    ?line OurName = join(ccc,Host),
-    ?line {port,PortNo,_} = erl_epmd:port_please(NA,NB),
-    ?line {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
-					  [{active,false},
-					   {packet,2}]),
-    ?line send_name(SocketA,OurName,5),
-    ?line ok = recv_status(SocketA),
-    ?line {hidden,Node,5,HisChallengeA} = recv_challenge(SocketA), % See 1)
-    ?line OurChallengeA = gen_challenge(),
-    ?line OurDigestA = gen_digest(HisChallengeA, erlang:get_cookie()),
+    P = runner:start(?accept_tmo),
+    runner:send_term(P,{c_nod_som_ingen_kontaktar_1,
+                        kaksmula_som_ingen_bryr_sig_om}),
+    {term,{-1,ETimedout,ETimedout}} = runner:get_term(P, 10000),
+    runner:recv_eot(P),
+    P2 = runner:start(?accept_tmo),
+    runner:send_term(P2,{c_nod_som_vi_kontaktar_1,
+                         erlang:get_cookie()}),
+    receive after 1000 -> ok end,
+    CNode1 = make_node(c_nod_som_vi_kontaktar_1),
+    {ignored,CNode1} ! tjenare,
+    {term, X} = runner:get_term(P2, 10000),
+    runner:recv_eot(P2),
+    true = is_integer(X),
+    P3 = runner:start(?accept_tmo),
+    runner:send_term(P3,{c_nod_som_vi_kontaktar_2,
+                         erlang:get_cookie()}),
+    receive after 1000 -> ok end,
+    CNode2 = make_node(c_nod_som_vi_kontaktar_2),
+    {NA,NB} = split(CNode2),
+    {_,Host} = split(node()),
+    OurName = join(ccc,Host),
+    {port,PortNo,_} = erl_epmd:port_please(NA,NB),
+    {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
+                                    [{active,false},
+                                     {packet,2}]),
+    send_name(SocketA,OurName,5),
+    ok = recv_status(SocketA),
+    {hidden,_Node,5,HisChallengeA} = recv_challenge(SocketA), % See 1)
+    _OurChallengeA = gen_challenge(),
+    _OurDigestA = gen_digest(HisChallengeA, erlang:get_cookie()),
     %% Dont do the last two steps of the connection setup...
     %% send_challenge_reply(SocketA, OurChallengeA, OurDigestA),
     %% ok = recv_challenge_ack(SocketA, OurChallengeA, erlang:get_cookie()),
-    ?line {term, {-1,ETimedout,ETimedout}} = runner:get_term(P3, 10000),
-    ?line runner:recv_eot(P3),
-    ?line gen_tcp:close(SocketA),
+    {term, {-1,ETimedout,ETimedout}} = runner:get_term(P3, 10000),
+    runner:recv_eot(P3),
+    gen_tcp:close(SocketA),
     ok.
 
 make_node(X) ->
     list_to_atom(atom_to_list(X) ++ "@" ++ 
-		 hd(tl(string:tokens(atom_to_list(node()),"@")))).
+                 hd(tl(string:tokens(atom_to_list(node()),"@")))).
 
 
 make_and_check_dummy() ->
     % First check that the host has an ip and is *not* reachable
-    ?line case gen_tcp:connect(?dummy_host,23,[{active,false}],5000) of
-	      {error,timeout} -> ok;
-	      {error,ehostunreach} -> ok
-	  end,
+    HostNotReachable = ct:get_config(test_host_not_reachable),
+    case gen_tcp:connect(HostNotReachable, 23, [{active,false}],5000) of
+        {error,timeout} -> ok;
+        {error,ehostunreach} -> ok
+    end,
 
-    list_to_atom("dummy@"++atom_to_list(?dummy_host)).
+    list_to_atom("dummy@"++HostNotReachable).
 
 %%
 %% Stolen from the erl_distribution_wb_test in kernel
@@ -358,12 +326,12 @@ make_and_check_dummy() ->
 %%
 
 -define(to_port(Socket, Data),
-	case inet_tcp:send(Socket, Data) of
-	    {error, closed} ->
-		self() ! {tcp_closed, Socket},
-	        {error, closed};
-	    R ->
-	        R
+        case inet_tcp:send(Socket, Data) of
+            {error, closed} ->
+                self() ! {tcp_closed, Socket},
+                {error, closed};
+            R ->
+                R
         end).
 
 -define(DFLAG_PUBLISHED,1).
@@ -381,8 +349,8 @@ make_and_check_dummy() ->
 -define(int16(X), [((X) bsr 8) band 16#ff, (X) band 16#ff]).
 
 -define(int32(X), 
-	[((X) bsr 24) band 16#ff, ((X) bsr 16) band 16#ff,
-	 ((X) bsr 8) band 16#ff, (X) band 16#ff]).
+        [((X) bsr 24) band 16#ff, ((X) bsr 16) band 16#ff,
+         ((X) bsr 8) band 16#ff, (X) band 16#ff]).
 
 -define(i16(X1,X0),
         (?u16(X1,X0) - 
@@ -405,9 +373,9 @@ make_and_check_dummy() ->
 %% This is no proper random number, but that is not really important in 
 %% this test
 gen_challenge() ->
-    {_,_,N} = erlang:now(), 
+    {_,_,N} = os:timestamp(),
     N.
-    
+
 %% Generate a message digest from Challenge number and Cookie	
 gen_digest(Challenge, Cookie) when is_integer(Challenge), is_atom(Cookie) ->
     C0 = erlang:md5_init(),
@@ -422,95 +390,93 @@ gen_digest(Challenge, Cookie) when is_integer(Challenge), is_atom(Cookie) ->
 
 send_status(Socket, Stat) ->
     case gen_tcp:send(Socket, [$s | atom_to_list(Stat)]) of
-	{error, _} ->
-	    ?shutdown(could_not_send_status);
-	_ -> 
-	    true
+        {error, _} -> ?shutdown(could_not_send_status);
+        _ -> true
     end.
 
 
 recv_status(Socket) ->
     case gen_tcp:recv(Socket, 0) of
-	{ok, [$s|StrStat]} ->
-	    list_to_atom(StrStat);
-	Bad ->
-	    exit(Bad)
+        {ok, [$s|StrStat]} ->
+            list_to_atom(StrStat);
+        Bad ->
+            exit(Bad)
     end.
 
 send_challenge(Socket, Node, Challenge, Version) ->
     send_challenge(Socket, Node, Challenge, Version, ?COMPULSORY_DFLAGS).
 send_challenge(Socket, Node, Challenge, Version, Flags) ->
-    {ok, {{Ip1,Ip2,Ip3,Ip4}, _}} = inet:sockname(Socket),
+    {ok, {{_Ip1,_Ip2,_Ip3,_Ip4}, _}} = inet:sockname(Socket),
     ?to_port(Socket, [$n,?int16(Version),?int32(Flags),
-		      ?int32(Challenge), atom_to_list(Node)]).
+                      ?int32(Challenge), atom_to_list(Node)]).
 
 recv_challenge(Socket) ->
     case gen_tcp:recv(Socket, 0) of
-	{ok,[$n,V1,V0,Fl1,Fl2,Fl3,Fl4,CA3,CA2,CA1,CA0 | Ns]} ->
-	    Flags = ?u32(Fl1,Fl2,Fl3,Fl4),
-	    Type = case Flags band ?DFLAG_PUBLISHED of
-		       0 ->
-			   hidden;
-		       _ ->
-			   normal
-		   end,
-	    Node =list_to_atom(Ns),
-	    Version = ?u16(V1,V0),
-	    Challenge = ?u32(CA3,CA2,CA1,CA0),
-	    {Type,Node,Version,Challenge};
-	_ ->
-	    ?shutdown(no_node)	    
+        {ok,[$n,V1,V0,Fl1,Fl2,Fl3,Fl4,CA3,CA2,CA1,CA0 | Ns]} ->
+            Flags = ?u32(Fl1,Fl2,Fl3,Fl4),
+            Type = case Flags band ?DFLAG_PUBLISHED of
+                       0 ->
+                           hidden;
+                       _ ->
+                           normal
+                   end,
+            Node =list_to_atom(Ns),
+            Version = ?u16(V1,V0),
+            Challenge = ?u32(CA3,CA2,CA1,CA0),
+            {Type,Node,Version,Challenge};
+        _ ->
+            ?shutdown(no_node)
     end.
 
-send_challenge_reply(Socket, Challenge, Digest) ->
-    ?to_port(Socket, [$r,?int32(Challenge),Digest]).
+%send_challenge_reply(Socket, Challenge, Digest) ->
+%    ?to_port(Socket, [$r,?int32(Challenge),Digest]).
 
 recv_challenge_reply(Socket, ChallengeA, Cookie) ->
     case gen_tcp:recv(Socket, 0) of
-	{ok,[$r,CB3,CB2,CB1,CB0 | SumB]} when length(SumB) == 16 ->
-	    SumA = gen_digest(ChallengeA, Cookie),
-	    ChallengeB = ?u32(CB3,CB2,CB1,CB0),
-	    if SumB == SumA ->
-		    ChallengeB;
-	       true ->
-		    ?shutdown(bad_challenge_reply)
-	    end;
-	_ ->
-	    ?shutdown(no_node)
+        {ok,[$r,CB3,CB2,CB1,CB0 | SumB]} when length(SumB) == 16 ->
+            SumA = gen_digest(ChallengeA, Cookie),
+            ChallengeB = ?u32(CB3,CB2,CB1,CB0),
+            if SumB == SumA ->
+                   ChallengeB;
+               true ->
+                   ?shutdown(bad_challenge_reply)
+            end;
+        _ ->
+            ?shutdown(no_node)
     end.
 
 send_challenge_ack(Socket, Digest) ->
     ?to_port(Socket, [$a,Digest]).
 
-recv_challenge_ack(Socket, ChallengeB, CookieA) ->
-    case gen_tcp:recv(Socket, 0) of
-	{ok,[$a | SumB]} when length(SumB) == 16 ->
-	    SumA = gen_digest(ChallengeB, CookieA),
-	    if SumB == SumA ->
-		    ok;
-	       true ->
-		    ?shutdown(bad_challenge_ack)
-	    end;
-	_ ->
-	    ?shutdown(bad_challenge_ack)
-    end.
+%recv_challenge_ack(Socket, ChallengeB, CookieA) ->
+%    case gen_tcp:recv(Socket, 0) of
+%        {ok,[$a | SumB]} when length(SumB) == 16 ->
+%            SumA = gen_digest(ChallengeB, CookieA),
+%            if SumB == SumA ->
+%                   ok;
+%               true ->
+%                   ?shutdown(bad_challenge_ack)
+%            end;
+%        _ ->
+%            ?shutdown(bad_challenge_ack)
+%    end.
 
 send_name(Socket, MyNode0, Version) ->
     send_name(Socket, MyNode0, Version, ?COMPULSORY_DFLAGS).
 send_name(Socket, MyNode0, Version, Flags) ->
     MyNode = atom_to_list(MyNode0),
     ?to_port(Socket, [$n,?int16(Version),?int32(Flags)] ++ 
-	     MyNode).
+             MyNode).
 
 %%
 %% recv_name is common for both old and new handshake.
 %%
 recv_name(Socket) ->
     case gen_tcp:recv(Socket, 0) of
-	{ok,Data} ->
-	    get_name(Data);
-	Res ->
-	    ?shutdown({no_node,Res})
+        {ok,Data} ->
+            get_name(Data);
+        Res ->
+            ?shutdown({no_node,Res})
     end.
 
 get_name([$m,VersionA,VersionB,_Ip1,_Ip2,_Ip3,_Ip4|OtherNode]) ->
@@ -519,11 +485,9 @@ get_name([$h,VersionA,VersionB,_Ip1,_Ip2,_Ip3,_Ip4|OtherNode]) ->
     {hidden, list_to_atom(OtherNode), ?u16(VersionA,VersionB)};
 get_name([$n,VersionA, VersionB, Flag1, Flag2, Flag3, Flag4 | OtherNode]) ->
     Type = case ?u32(Flag1, Flag2, Flag3, Flag4) band ?DFLAG_PUBLISHED of
-	       0 ->
-		   hidden;
-	       _ -> 
-		   normal
-	   end,
+               0 -> hidden;
+               _ -> normal
+           end,
     {Type, list_to_atom(OtherNode), 
      ?u16(VersionA,VersionB)};
 get_name(Data) ->
@@ -532,74 +496,73 @@ get_name(Data) ->
 %%
 %% tell_name is for old handshake
 %%
-tell_name(Socket, MyNode0, Version) ->
-    MyNode = atom_to_list(MyNode0),
-    {ok, {{Ip1,Ip2,Ip3,Ip4}, _}} = inet:sockname(Socket),
-    ?to_port(Socket, [$h,?int16(Version),Ip1,Ip2,Ip3,Ip4] ++ 
-             MyNode).
+%tell_name(Socket, MyNode0, Version) ->
+%    MyNode = atom_to_list(MyNode0),
+%    {ok, {{Ip1,Ip2,Ip3,Ip4}, _}} = inet:sockname(Socket),
+%    ?to_port(Socket, [$h,?int16(Version),Ip1,Ip2,Ip3,Ip4] ++ MyNode).
 
 %%
 %% The communication with EPMD follows
 %%
 do_register_node(NodeName, TcpPort, VLow, VHigh) ->
     case gen_tcp:connect({127,0,0,1}, get_epmd_port(), []) of
-	{ok, Socket} ->
-	    {N0,_} = split(NodeName),
-	    Name = atom_to_list(N0),
-	    Extra = "",
-	    Elen = length(Extra),
-	    Len = 1+2+1+1+2+2+2+length(Name)+2+Elen,
-	    gen_tcp:send(Socket, [?int16(Len), $x,
-				   ?int16(TcpPort),
-				   $M,
-				   0,
-				   ?int16(VHigh),
-				   ?int16(VLow),
-				   ?int16(length(Name)),
-				   Name,
-				   ?int16(Elen),
-				   Extra]),
-	    case wait_for_reg_reply(Socket, []) of
-		{error, epmd_close} ->
-		    exit(epmd_broken);
-		Other ->
-		    Other
-	    end;
-	Error ->
-	    Error
+        {ok, Socket} ->
+            {N0,_} = split(NodeName),
+            Name = atom_to_list(N0),
+            Extra = "",
+            Elen = length(Extra),
+            Len = 1+2+1+1+2+2+2+length(Name)+2+Elen,
+            gen_tcp:send(Socket, [?int16(Len), $x,
+                                  ?int16(TcpPort),
+                                  $M,
+                                  0,
+                                  ?int16(VHigh),
+                                  ?int16(VLow),
+                                  ?int16(length(Name)),
+                                  Name,
+                                  ?int16(Elen),
+                                  Extra]),
+            case wait_for_reg_reply(Socket, []) of
+                {error, epmd_close} ->
+                    exit(epmd_broken);
+                Other ->
+                    Other
+            end;
+        Error ->
+            Error
     end.
 
 wait_for_reg_reply(Socket, SoFar) ->
     receive
-	{tcp, Socket, Data0} ->
-	    case SoFar ++ Data0 of
-		[$y, Result, A, B] ->
-		    case Result of
-			0 ->
-			    {alive, Socket, ?u16(A, B)};
-			_ ->
-			    {error, duplicate_name}
-		    end;
-		Data when length(Data) < 4 ->
-		    wait_for_reg_reply(Socket, Data);
-		Garbage ->
-		    {error, {garbage_from_epmd, Garbage}}
-	    end;
-	{tcp_closed, Socket} ->
-	    {error, epmd_close}
+        {tcp, Socket, Data0} ->
+            case SoFar ++ Data0 of
+                [$y, Result, A, B] ->
+                    case Result of
+                        0 ->
+                            {alive, Socket, ?u16(A, B)};
+                        _ ->
+                            {error, duplicate_name}
+                    end;
+                Data when length(Data) < 4 ->
+                    wait_for_reg_reply(Socket, Data);
+                Garbage ->
+                    {error, {garbage_from_epmd, Garbage}}
+            end;
+        {tcp_closed, Socket} ->
+            {error, epmd_close}
     after 10000 ->
-	    gen_tcp:close(Socket),
-	    {error, no_reg_reply_from_epmd}
+              gen_tcp:close(Socket),
+              {error, no_reg_reply_from_epmd}
     end.
 
 
 register(NodeName, ListenSocket, VLow, VHigh) ->
     {ok,{_,TcpPort}} = inet:sockname(ListenSocket),
     case do_register_node(NodeName, TcpPort, VLow, VHigh) of
-	{alive, Socket, Creation} ->
-	    Socket;
-	Other ->
-	    exit(Other)
+        {alive, Socket, _Creation} ->
+            Socket;
+        Other ->
+            exit(Other)
     end.
 
 
@@ -617,69 +580,10 @@ split(Atom) ->
     {A,B} = split(atom_to_list(Atom),[]),
     {list_to_atom(A),list_to_atom(B)}.
 
-%% Build a simple distribution message
-build_message(Cookie) ->
-    [$?,term_to_binary({6,self(),Cookie,rex}),term_to_binary(plupp)].
-
-%% Build a distribution message that will make rex answer
-build_rex_message(Cookie,OurName) ->
-    [$?,term_to_binary({6,self(),Cookie,rex}),
-     term_to_binary({'$gen_cast',
-		    {cast,
-		     rpc,
-		     cast,
-		     [OurName, hello, world, []],
-		     self()} })].
-
-%% Receive a distribution message    
-recv_message(Socket) ->
-    case gen_tcp:recv(Socket, 0) of
-	{ok,Data} ->
-	    B0 = list_to_binary(Data),
-	    {_,B1} = erlang:split_binary(B0,1),
-	    Header = erlang:binary_to_term(B1),
-	    Siz = size(term_to_binary(Header)),
-	    {_,B2} = erlang:split_binary(B1,Siz),
-	    Message = case (catch erlang:binary_to_term(B2)) of
-			  {'EXIT', _} ->
-			      could_not_digest_message;
-			  Other ->
-			      Other
-		      end,
-	    {Header, Message};
-	Res ->
-	    exit({no_message,Res})
-    end. 
-
 %% Build a nodename
 join(Name,Host) ->
     list_to_atom(atom_to_list(Name) ++ "@" ++ atom_to_list(Host)).
 
-%% start/stop slave.
-start_node(Name, Param) ->
-    ?t:start_node(Name, slave, [{args, Param}]).
-
-stop_node(Node) ->
-    ?t:stop_node(Node).
-
-
-get_nodenames(N, T) ->
-    get_nodenames(N, T, []).
-
-get_nodenames(0, _, Acc) ->
-    Acc;
-get_nodenames(N, T, Acc) ->
-    {A, B, C} = now(),
-    get_nodenames(N-1, T, [list_to_atom(atom_to_list(?MODULE)
-					++ "-"
-					++ atom_to_list(T)
-					++ "-"
-					++ integer_to_list(A)
-					++ "-"
-					++ integer_to_list(B)
-					++ "-"
-					++ integer_to_list(C)) | Acc]).
-
 get_epmd_port() ->
     case init:get_argument(epmd_port) of
         {ok, [[PortStr|_]|_]} when is_list(PortStr) ->
diff --git a/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.first b/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.first
index 6eb9f2ce71..884221d9d7 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
+# Copyright Ericsson AB 2003-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src
index a49eeccc02..b4ee361939 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src
@@ -1,29 +1,29 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
+# Copyright Ericsson AB 2003-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c b/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c
index db90b1810e..0079ef8c86 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c
+++ b/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2003-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2003-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
@@ -511,18 +512,21 @@ TESTCASE(send_tmo)
 	    for (i=0;i < iterations; ++i) {
 		res = ei_send_tmo(com_sock, &pid, send_buffer.buff, 
 				  send_buffer.index, 5000);
-		DEBUGF(("Sent bindata (%d):\n",res));
+		if (res < 0) {
+		    DEBUGF(("Sent bindata failed (%d) after %d iterations:\n", res, i));
+		    break;
+		}
 #ifdef DEBUG
+		if (i < 10 || (i % 100 == 0))  /* don't flood the log */
 		{
 		    int ndx = 0;
 		    int v;
+		    DEBUGF(("%d: Sent bindata (%d): ", i, res));
 		    ei_decode_version(send_buffer.buff,&ndx,&v);
 		    ei_print_term(debugfile, send_buffer.buff, &ndx);
+		    DEBUGF(("\n"));
 		}
 #endif
-		DEBUGF(("\n"));
-		if (res < 0) 
-		    break;
 	    }
 	    if (res < 0) {
 		DEBUGF(("ei_send_tmo failure at line %d\n",__LINE__));
diff --git a/lib/erl_interface/test/erl_connect_SUITE.erl b/lib/erl_interface/test/erl_connect_SUITE.erl
index bd54013402..cd73f07b8f 100644
--- a/lib/erl_interface/test/erl_connect_SUITE.erl
+++ b/lib/erl_interface/test/erl_connect_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -20,112 +21,89 @@
 %%
 -module(erl_connect_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_connect_SUITE_data/erl_connect_test_cases.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,
-	 init_per_testcase/2,end_per_testcase/2,
-	 erl_send/1,erl_reg_send/1, erl_send_cookie_file/1]).
+-export([all/0, suite/0,
+         erl_send/1, erl_reg_send/1,
+         erl_send_cookie_file/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
 
 all() -> 
     [erl_send, erl_reg_send, erl_send_cookie_file].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(0.25)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
 
 erl_send(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 1 = erl_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = erl_connect(P, node()),
+    P = runner:start(?interpret),
+    1 = erl_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = erl_connect(P, node()),
 
-    ?line ok = erl_send(P, Fd, self(), AMsg={a,message}),
-    ?line receive AMsg -> ok end,
+    ok = erl_send(P, Fd, self(), AMsg={a,message}),
+    receive AMsg -> ok end,
 
-    ?line 0 = erl_close_connection(P,Fd),
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    0 = erl_close_connection(P,Fd),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 erl_send_cookie_file(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?interpret),
-	    ?line 1 = erl_connect_init(P, 42, '', 0),
-	    ?line {ok,Fd} = erl_connect(P, node()),
-	    
-	    ?line ok = erl_send(P, Fd, self(), AMsg={a,message}),
-	    ?line receive AMsg -> ok end,
-	    
-	    ?line 0 = erl_close_connection(P,Fd),
-	    ?line runner:send_eot(P),
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?interpret),
+            1 = erl_connect_init(P, 42, '', 0),
+            {ok,Fd} = erl_connect(P, node()),
+
+            ok = erl_send(P, Fd, self(), AMsg={a,message}),
+            receive AMsg -> ok end,
+
+            0 = erl_close_connection(P,Fd),
+            runner:send_eot(P),
+            runner:recv_eot(P),
+            ok
     end.
 
 erl_reg_send(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 1 = erl_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = erl_connect(P, node()),
+    P = runner:start(?interpret),
+    1 = erl_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = erl_connect(P, node()),
 
     ARegName = a_strange_registred_name,
-    ?line register(ARegName, self()),
-    ?line ok = erl_reg_send(P, Fd, ARegName, AMsg={another,[strange],message}),
-    ?line receive AMsg -> ok end,
+    register(ARegName, self()),
+    ok = erl_reg_send(P, Fd, ARegName, AMsg={another,[strange],message}),
+    receive AMsg -> ok end,
 
-    ?line 0 = erl_close_connection(P,Fd),
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    0 = erl_close_connection(P,Fd),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
-
+
 %%% Interface functions for erl_interface functions.
 
 erl_connect_init(P, Num, Cookie, Creation) ->
     send_command(P, erl_connect_init, [Num,Cookie,Creation]),
     case get_term(P) of
-	{term,Int} when is_integer(Int) -> Int
+        {term,Int} when is_integer(Int) -> Int
     end.
 
 erl_connect(P, Node) ->
     send_command(P, erl_connect, [Node]),
     case get_term(P) of
-	{term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
-	{term,{-1,Errno}} -> {error,Errno}
+        {term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
+        {term,{-1,Errno}} -> {error,Errno}
     end.
 
 erl_close_connection(P, FD) ->
     send_command(P, erl_close_connection, [FD]),
     case get_term(P) of
-	{term,Int} when is_integer(Int) -> Int
+        {term,Int} when is_integer(Int) -> Int
     end.
 
 erl_send(P, Fd, To, Msg) ->
@@ -138,17 +116,12 @@ erl_reg_send(P, Fd, To, Msg) ->
 
 get_send_result(P) ->
     case get_term(P) of
-	{term,{1,_}} -> ok;
-	{term,{-1,Errno}} -> {error,Errno};
-	{term,{Res,Errno}}->
-	    io:format("Return value: ~p\nerl_errno: ~p", [Res,Errno]),
-	    ?t:fail(bad_return_value)
+        {term,{1,_}} -> ok;
+        {term,{-1,Errno}} -> {error,Errno};
+        {term,{Res,Errno}}->
+            io:format("Return value: ~p\nerl_errno: ~p", [Res,Errno]),
+            ct:fail(bad_return_value)
     end.
 
 send_command(P, Name, Args) ->
     runner:send_term(P, {Name,list_to_tuple(Args)}).
-
-    
-    
-
-
diff --git a/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.first b/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.first
index 09c00e7b8c..21a7aac0b0 100644
--- a/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.src
index 047a734ecb..ff4c382c97 100644
--- a/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.src
@@ -1,30 +1,30 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2009. All Rights Reserved.
+# Copyright Ericsson AB 2000-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_connect_SUITE_data/erl_connect_test.c b/lib/erl_interface/test/erl_connect_SUITE_data/erl_connect_test.c
index 02304260b8..0adaa79a33 100644
--- a/lib/erl_interface/test/erl_connect_SUITE_data/erl_connect_test.c
+++ b/lib/erl_interface/test/erl_connect_SUITE_data/erl_connect_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2000-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2000-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/erl_eterm_SUITE.erl b/lib/erl_interface/test/erl_eterm_SUITE.erl
index 10a27e48e3..0e51a50c19 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE.erl
+++ b/lib/erl_interface/test/erl_eterm_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -20,7 +21,7 @@
 %%
 -module(erl_eterm_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_eterm_SUITE_data/eterm_test_cases.hrl").
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -33,40 +34,39 @@
 %%% 5. Miscellanous functions.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 build_terms/1, round_trip_conversion/1,
-	 decode_terms/1, decode_float/1,
-	 t_erl_mk_int/1, t_erl_mk_list/1,
-	 basic_copy/1,
-	 t_erl_cons/1,
-	 t_erl_mk_atom/1,
-	 t_erl_mk_binary/1,
-	 t_erl_mk_empty_list/1,
-	 t_erl_mk_float/1,
-	 t_erl_mk_pid/1,
-	 t_erl_mk_xpid/1,
-	 t_erl_mk_port/1,
-	 t_erl_mk_xport/1,
-	 t_erl_mk_ref/1,
-	 t_erl_mk_long_ref/1,
-	 t_erl_mk_string/1,
-	 t_erl_mk_estring/1,
-	 t_erl_mk_tuple/1,
-	 t_erl_mk_uint/1,
-	 t_erl_mk_var/1,
-	 t_erl_size/1,
-	 t_erl_var_content/1,
-	 t_erl_element/1,
-	 t_erl_length/1, t_erl_hd/1, t_erl_tl/1,
-	 type_checks/1, extractor_macros/1,
-	 t_erl_iolist_length/1, t_erl_iolist_to_binary/1,
-	 t_erl_iolist_to_string/1,
-	 erl_print_term/1, print_string/1,
-	 t_erl_free_compound/1,
-	 high_chaparal/1,
-	 broken_data/1,
-	 cnode_1/1]).
+-export([all/0, suite/0,
+         build_terms/1, round_trip_conversion/1,
+         decode_terms/1, decode_float/1,
+         t_erl_mk_int/1, t_erl_mk_list/1,
+         basic_copy/1,
+         t_erl_cons/1,
+         t_erl_mk_atom/1,
+         t_erl_mk_binary/1,
+         t_erl_mk_empty_list/1,
+         t_erl_mk_float/1,
+         t_erl_mk_pid/1,
+         t_erl_mk_xpid/1,
+         t_erl_mk_port/1,
+         t_erl_mk_xport/1,
+         t_erl_mk_ref/1,
+         t_erl_mk_long_ref/1,
+         t_erl_mk_string/1,
+         t_erl_mk_estring/1,
+         t_erl_mk_tuple/1,
+         t_erl_mk_uint/1,
+         t_erl_mk_var/1,
+         t_erl_size/1,
+         t_erl_var_content/1,
+         t_erl_element/1,
+         t_erl_length/1, t_erl_hd/1, t_erl_tl/1,
+         type_checks/1, extractor_macros/1,
+         t_erl_iolist_length/1, t_erl_iolist_to_binary/1,
+         t_erl_iolist_to_string/1,
+         erl_print_term/1, print_string/1,
+         t_erl_free_compound/1,
+         high_chaparal/1,
+         broken_data/1,
+         cnode_1/1]).
 
 -export([start_cnode/1]).
 
@@ -75,7 +75,8 @@
 %% This test suite controls the running of the C language functions
 %% in eterm_test.c and print_term.c.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [build_terms, round_trip_conversion, decode_terms,
@@ -92,23 +93,7 @@ all() ->
      erl_print_term, print_string, t_erl_free_compound,
      high_chaparal, broken_data, cnode_1].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%%	1.   B a s i c    t e s t s
@@ -118,85 +103,80 @@ end_per_group(_GroupName, Config) ->
 %% This test asks the C function to construct all data types in
 %% a list and verifies that the result is as expected.
 
-build_terms(suite) -> [];
 build_terms(Config) when is_list(Config) ->
-    ?line P = runner:start(?build_terms),
-    ?line {term, Term} = get_term(P),
-    ?line io:format("Received: ~p", [Term]),
-    ?line [ARefLN, ARef, APortLN, APort, APidLN, APid,
-	   {element1, 42, 767}, "A string",
-	   1, -1, 0, 3.0, ABin, 'I am an atom'] = Term,
-    ?line "A binary" = binary_to_list(ABin),
-    ?line case ARef of
-	      R when is_reference(R), node(R) == kalle@localhost -> ok
-	  end,
-    ?line case ARefLN of
-	      R1 when is_reference(R1), node(R1) == abcdefghijabcdefghij@localhost -> ok
-	  end,
-    ?line case APort of
-	      Port when is_port(Port), node(Port) == kalle@localhost -> ok
-	  end,
-    ?line case APortLN of
-	      Port1 when is_port(Port1), node(Port1) == abcdefghijabcdefghij@localhost -> ok
-	  end,
-    ?line case APid of
-	      Pid when is_pid(Pid), node(Pid) == kalle@localhost -> ok
-	  end,
-    ?line case APidLN of
-	      Pid1 when is_pid(Pid1), node(Pid1) == abcdefghijabcdefghij@localhost -> ok
-	  end,
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?build_terms),
+    {term, Term} = get_term(P),
+    io:format("Received: ~p", [Term]),
+    [ARefLN, ARef, APortLN, APort, APidLN, APid,
+     {element1, 42, 767}, "A string",
+     1, -1, 0, 3.0, ABin, 'I am an atom'] = Term,
+    "A binary" = binary_to_list(ABin),
+    case ARef of
+        R when is_reference(R), node(R) == kalle@localhost -> ok
+    end,
+    case ARefLN of
+        R1 when is_reference(R1), node(R1) == abcdefghijabcdefghij@localhost -> ok
+    end,
+    case APort of
+        Port when is_port(Port), node(Port) == kalle@localhost -> ok
+    end,
+    case APortLN of
+        Port1 when is_port(Port1), node(Port1) == abcdefghijabcdefghij@localhost -> ok
+    end,
+    case APid of
+        Pid when is_pid(Pid), node(Pid) == kalle@localhost -> ok
+    end,
+    case APidLN of
+        Pid1 when is_pid(Pid1), node(Pid1) == abcdefghijabcdefghij@localhost -> ok
+    end,
+
+    runner:recv_eot(P),
     ok.
 
 %% This test is run entirely in C code.
 
-round_trip_conversion(suite) -> [];
 round_trip_conversion(Config) when is_list(Config) ->
-    ?line runner:test(?round_trip_conversion),
+    runner:test(?round_trip_conversion),
     ok.
 
 %% This test sends a list of all data types to the C code function,
 %% which decodes it and verifies it.
 
-decode_terms(suite) -> [];
 decode_terms(Config) when is_list(Config) ->
-    ?line Dummy1 = list_to_atom(filename:join(?config(priv_dir, Config),
-					      dummy_file1)),
-    ?line Dummy2 = list_to_atom(filename:join(?config(priv_dir, Config),
-					      dummy_file2)),
-    ?line Port1 = open_port(Dummy1, [out]),
-    ?line Port2 = open_port(Dummy2, [out]),
-    ?line ABinary = list_to_binary("A binary"),
-    ?line Terms = [make_ref(), make_ref(),
-		   Port1, Port2,
-		   self(), self(),
-		   {element1, 42, 767}, "A string",
-		   1, -1, 0, 3.0, ABinary, 'I am an atom'],
-
-    ?line P = runner:start(?decode_terms),
-    ?line runner:send_term(P, Terms),
-    ?line runner:recv_eot(P),
+    Dummy1 = list_to_atom(filename:join(proplists:get_value(priv_dir, Config),
+                                        dummy_file1)),
+    Dummy2 = list_to_atom(filename:join(proplists:get_value(priv_dir, Config),
+                                        dummy_file2)),
+    Port1 = open_port(Dummy1, [out]),
+    Port2 = open_port(Dummy2, [out]),
+    ABinary = list_to_binary("A binary"),
+    Terms = [make_ref(), make_ref(),
+             Port1, Port2,
+             self(), self(),
+             {element1, 42, 767}, "A string",
+             1, -1, 0, 3.0, ABinary, 'I am an atom'],
+
+    P = runner:start(?decode_terms),
+    runner:send_term(P, Terms),
+    runner:recv_eot(P),
 
     ok.
 
 %% Decodes the floating point number 3.1415.
 
-decode_float(suite) -> [];
 decode_float(Config) when is_list(Config) ->
-    ?line P = runner:start(?decode_float),
-    ?line runner:send_term(P, 3.1415),
-    ?line runner:recv_eot(P),
+    P = runner:start(?decode_float),
+    runner:send_term(P, 3.1415),
+    runner:recv_eot(P),
     ok.
 
 %% Tests the erl_free_compound() function.
 
-t_erl_free_compound(suite) -> [];
 t_erl_free_compound(Config) when is_list(Config) ->
-    ?line runner:test(?t_erl_free_compound),
+    runner:test(?t_erl_free_compound),
     ok.
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%%	2.   C o n s t r u c t i n g   t e r m s
@@ -205,323 +185,302 @@ t_erl_free_compound(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_list() function.
 
-t_erl_mk_list(suite) -> [];
 t_erl_mk_list(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_list),
+    P = runner:start(?t_erl_mk_list),
 
-    ?line {term, []} = get_term(P),
-    ?line {term, [abc]} = get_term(P),
-    ?line {term, [abcdef, 42]} = get_term(P),
-    ?line {term, [0.0, 23, [], 3.1415]} = get_term(P),
+    {term, []} = get_term(P),
+    {term, [abc]} = get_term(P),
+    {term, [abcdef, 42]} = get_term(P),
+    {term, [0.0, 23, [], 3.1415]} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_int() function.
 
-t_erl_mk_int(suite) -> [];
 t_erl_mk_int(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_int),
-    
-    ?line {term, 0} = get_term(P),
-    ?line {term, 127} = get_term(P),
-    ?line {term, 128} = get_term(P),
-    ?line {term, 255} = get_term(P),
-    ?line {term, 256} = get_term(P),
-
-    ?line {term, 16#FFFF} = get_term(P),
-    ?line {term, 16#10000} = get_term(P),
-
-    ?line {term, 16#07FFFFFF} = get_term(P),
-    ?line {term, 16#0FFFFFFF} = get_term(P),
-    ?line {term, 16#1FFFFFFF} = get_term(P),
-    ?line {term, 16#3FFFFFFF} = get_term(P),
-    ?line {term, 16#7FFFFFFF} = get_term(P),
-
-    ?line {term, 16#08000000} = get_term(P),
-    ?line {term, 16#10000000} = get_term(P),
-    ?line {term, 16#20000000} = get_term(P),
-    ?line {term, 16#40000000} = get_term(P),
-
-
-    ?line {term, -16#07FFFFFF} = get_term(P),
-    ?line {term, -16#0FFFFFFF} = get_term(P),
-    ?line {term, -16#1FFFFFFF} = get_term(P),
-    ?line {term, -16#3FFFFFFF} = get_term(P),
-    ?line {term, -16#7FFFFFFF} = get_term(P),
-
-    ?line {term, -16#08000000} = get_term(P),
-    ?line {term, -16#10000000} = get_term(P),
-    ?line {term, -16#20000000} = get_term(P),
-    ?line {term, -16#40000000} = get_term(P),
-
-    ?line {term, -16#08000001} = get_term(P),
-    ?line {term, -16#10000001} = get_term(P),
-    ?line {term, -16#20000001} = get_term(P),
-    ?line {term, -16#40000001} = get_term(P),
-
-    ?line {term, -16#08000002} = get_term(P),
-    ?line {term, -16#10000002} = get_term(P),
-    ?line {term, -16#20000002} = get_term(P),
-    ?line {term, -16#40000002} = get_term(P),
-
-    ?line {term, -1999999999} = get_term(P),
-    ?line {term, -2000000000} = get_term(P),
-    ?line {term, -2000000001} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?t_erl_mk_int),
+
+    {term, 0} = get_term(P),
+    {term, 127} = get_term(P),
+    {term, 128} = get_term(P),
+    {term, 255} = get_term(P),
+    {term, 256} = get_term(P),
+
+    {term, 16#FFFF} = get_term(P),
+    {term, 16#10000} = get_term(P),
+
+    {term, 16#07FFFFFF} = get_term(P),
+    {term, 16#0FFFFFFF} = get_term(P),
+    {term, 16#1FFFFFFF} = get_term(P),
+    {term, 16#3FFFFFFF} = get_term(P),
+    {term, 16#7FFFFFFF} = get_term(P),
+
+    {term, 16#08000000} = get_term(P),
+    {term, 16#10000000} = get_term(P),
+    {term, 16#20000000} = get_term(P),
+    {term, 16#40000000} = get_term(P),
+
+
+    {term, -16#07FFFFFF} = get_term(P),
+    {term, -16#0FFFFFFF} = get_term(P),
+    {term, -16#1FFFFFFF} = get_term(P),
+    {term, -16#3FFFFFFF} = get_term(P),
+    {term, -16#7FFFFFFF} = get_term(P),
+
+    {term, -16#08000000} = get_term(P),
+    {term, -16#10000000} = get_term(P),
+    {term, -16#20000000} = get_term(P),
+    {term, -16#40000000} = get_term(P),
+
+    {term, -16#08000001} = get_term(P),
+    {term, -16#10000001} = get_term(P),
+    {term, -16#20000001} = get_term(P),
+    {term, -16#40000001} = get_term(P),
+
+    {term, -16#08000002} = get_term(P),
+    {term, -16#10000002} = get_term(P),
+    {term, -16#20000002} = get_term(P),
+    {term, -16#40000002} = get_term(P),
+
+    {term, -1999999999} = get_term(P),
+    {term, -2000000000} = get_term(P),
+    {term, -2000000001} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 %% Basic test of erl_copy_term().
 
-basic_copy(suite) -> [];
 basic_copy(Config) when is_list(Config) ->
-    ?line runner:test(?basic_copy),
+    runner:test(?basic_copy),
     ok.
 
 
 %% This tests the erl_mk_tuple() function.
 
-t_erl_mk_tuple(suite) -> [];
 t_erl_mk_tuple(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_tuple),
+    P = runner:start(?t_erl_mk_tuple),
 
-    ?line {term, {madonna, 21, 'mad donna', 12}} = get_term(P),
-    ?line {term, {'Madonna',21,{children,{"Isabella",2}},
-		  {'home page',"http://www.madonna.com/"}}} = get_term(P),
+    {term, {madonna, 21, 'mad donna', 12}} = get_term(P),
+    {term, {'Madonna',21,{children,{"Isabella",2}},
+            {'home page',"http://www.madonna.com/"}}} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_atom() function.
 
-t_erl_mk_atom(suite) -> [];
 t_erl_mk_atom(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_atom),
-
-    ?line {term, madonna} = (get_term(P)),
-    ?line {term, 'Madonna'} = (get_term(P)),
-    ?line {term, 'mad donna'} = (get_term(P)),
-    ?line {term, '_madonna_'} = (get_term(P)),
-    ?line {term, '/home/madonna/tour_plan'} = (get_term(P)),
-    ?line {term, 'http://www.madonna.com/tour_plan'} = (get_term(P)),
-    ?line {term, '\'madonna\''} = (get_term(P)),
-    ?line {term, '\"madonna\"'} = (get_term(P)),
-    ?line {term, '\\madonna\\'} = (get_term(P)),
-    ?line {term, '{madonna,21,\'mad donna\',12}'} = (get_term(P)),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?t_erl_mk_atom),
+
+    {term, madonna} = (get_term(P)),
+    {term, 'Madonna'} = (get_term(P)),
+    {term, 'mad donna'} = (get_term(P)),
+    {term, '_madonna_'} = (get_term(P)),
+    {term, '/home/madonna/tour_plan'} = (get_term(P)),
+    {term, 'http://www.madonna.com/tour_plan'} = (get_term(P)),
+    {term, '\'madonna\''} = (get_term(P)),
+    {term, '\"madonna\"'} = (get_term(P)),
+    {term, '\\madonna\\'} = (get_term(P)),
+    {term, '{madonna,21,\'mad donna\',12}'} = (get_term(P)),
+
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_binary() function.
 
-t_erl_mk_binary(suite) -> [];
 t_erl_mk_binary(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_binary),
+    P = runner:start(?t_erl_mk_binary),
 
-    ?line {term, Bin} = (get_term(P)),
-    ?line "{madonna,21,'mad donna',1234.567.890, !#$%&/()=?+-@, \" \\}" = 
-	binary_to_list(Bin),
+    {term, Bin} = (get_term(P)),
+    "{madonna,21,'mad donna',1234.567.890, !#$%&/()=?+-@, \" \\}" = binary_to_list(Bin),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_empty_list() function.
 
-t_erl_mk_empty_list(suite) -> [];
 t_erl_mk_empty_list(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_empty_list),
+    P = runner:start(?t_erl_mk_empty_list),
 
-    ?line {term, []} = get_term(P),
+    {term, []} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_float() function.
 
-t_erl_mk_float(suite) -> [];
 t_erl_mk_float(Config) when is_list(Config) ->
     case os:type() of 
-	vxworks ->
-	    {skipped, "Floating point numbers never compare equal on PPC"};
-	_ ->
-	    ?line P = runner:start(?t_erl_mk_float),
-	    ?line {term, {3.1415, 1.999999, 2.000000, 2.000001, 
-			  2.000002, 12345.67890}} = 
-		get_term(P),
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skipped, "Floating point numbers never compare equal on PPC"};
+        _ ->
+            P = runner:start(?t_erl_mk_float),
+            {term, {3.1415, 1.999999, 2.000000, 2.000001,
+                    2.000002, 12345.67890}} = get_term(P),
+            runner:recv_eot(P),
+            ok
     end.
 
 
 %% This tests the erl_mk_pid() function.
 
-t_erl_mk_pid(suite) -> [];
 t_erl_mk_pid(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_pid),
+    P = runner:start(?t_erl_mk_pid),
 
-    ?line {term, A_pid} = (get_term(P)),
-    ?line {pid, kalle@localhost, 3, 2} = nc2vinfo(A_pid),
+    {term, A_pid} = (get_term(P)),
+    {pid, kalle@localhost, 3, 2} = nc2vinfo(A_pid),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
-t_erl_mk_xpid(suite) -> [];
 t_erl_mk_xpid(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_xpid),
+    P = runner:start(?t_erl_mk_xpid),
 
-    ?line {term, A_pid} = (get_term(P)),
-    ?line {pid, kalle@localhost, 32767, 8191} = nc2vinfo(A_pid),
+    {term, A_pid} = (get_term(P)),
+    {pid, kalle@localhost, 32767, 8191} = nc2vinfo(A_pid),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_port() function.
 
-t_erl_mk_port(suite) -> [];
 t_erl_mk_port(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_port),
+    P = runner:start(?t_erl_mk_port),
 
-    ?line {term, A_port} = (get_term(P)),
-    ?line {port, kalle@localhost, 4} = nc2vinfo(A_port),
+    {term, A_port} = (get_term(P)),
+    {port, kalle@localhost, 4} = nc2vinfo(A_port),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
-t_erl_mk_xport(suite) -> [];
 t_erl_mk_xport(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_xport),
+    P = runner:start(?t_erl_mk_xport),
 
-    ?line {term, A_port} = (get_term(P)),
-    ?line {port, kalle@localhost, 268435455} = nc2vinfo(A_port),
+    {term, A_port} = (get_term(P)),
+    {port, kalle@localhost, 268435455} = nc2vinfo(A_port),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_ref() function.
 
-t_erl_mk_ref(suite) -> [];
 t_erl_mk_ref(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_ref),
+    P = runner:start(?t_erl_mk_ref),
 
-    ?line {term, A_ref} = (get_term(P)),
-    ?line {ref, kalle@localhost, _Length, [6]} = nc2vinfo(A_ref),
+    {term, A_ref} = (get_term(P)),
+    {ref, kalle@localhost, _Length, [6]} = nc2vinfo(A_ref),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
-t_erl_mk_long_ref(suite) -> [];
 t_erl_mk_long_ref(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_long_ref),
+    P = runner:start(?t_erl_mk_long_ref),
 
-    ?line {term, A_ref} = (get_term(P)),
-    ?line {ref, kalle@localhost, _Length, [4294967295,4294967295,262143]}
-	= nc2vinfo(A_ref),
+    {term, A_ref} = (get_term(P)),
+    {ref, kalle@localhost, _Length, [4294967295,4294967295,262143]}
+    = nc2vinfo(A_ref),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_string() function.
 
-t_erl_mk_string(suite) -> [];
 t_erl_mk_string(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_string),
-
-    ?line {term, "madonna"} = (get_term(P)),
-    ?line {term, "Madonna"} = (get_term(P)),
-    ?line {term, "mad donna"} = (get_term(P)),
-    ?line {term, "_madonna_"} = (get_term(P)),
-    ?line {term, "/home/madonna/tour_plan"} = (get_term(P)),
-    ?line {term, "http://www.madonna.com/tour_plan"} = (get_term(P)),
-    ?line {term, "\'madonna\'"} = (get_term(P)),
-    ?line {term, "\"madonna\""} = (get_term(P)),
-    ?line {term, "\\madonna\\"} = (get_term(P)),
-    ?line {term, "{madonna,21,'mad donna',12}"} = (get_term(P)),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?t_erl_mk_string),
+
+    {term, "madonna"} = (get_term(P)),
+    {term, "Madonna"} = (get_term(P)),
+    {term, "mad donna"} = (get_term(P)),
+    {term, "_madonna_"} = (get_term(P)),
+    {term, "/home/madonna/tour_plan"} = (get_term(P)),
+    {term, "http://www.madonna.com/tour_plan"} = (get_term(P)),
+    {term, "\'madonna\'"} = (get_term(P)),
+    {term, "\"madonna\""} = (get_term(P)),
+    {term, "\\madonna\\"} = (get_term(P)),
+    {term, "{madonna,21,'mad donna',12}"} = (get_term(P)),
+
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_estring() function.
 
-t_erl_mk_estring(suite) -> [];
 t_erl_mk_estring(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_estring),
-
-    ?line {term, "madonna"} = (get_term(P)),
-    ?line {term, "Madonna"} = (get_term(P)),
-    ?line {term, "mad donna"} = (get_term(P)),
-    ?line {term, "_madonna_"} = (get_term(P)),
-    ?line {term, "/home/madonna/tour_plan"} = (get_term(P)),
-    ?line {term, "http://www.madonna.com/tour_plan"} = (get_term(P)),
-    ?line {term, "\'madonna\'"} = (get_term(P)),
-    ?line {term, "\"madonna\""} = (get_term(P)),
-    ?line {term, "\\madonna\\"} = (get_term(P)),
-    ?line {term, "{madonna,21,'mad donna',12}"} = (get_term(P)),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?t_erl_mk_estring),
+
+    {term, "madonna"} = (get_term(P)),
+    {term, "Madonna"} = (get_term(P)),
+    {term, "mad donna"} = (get_term(P)),
+    {term, "_madonna_"} = (get_term(P)),
+    {term, "/home/madonna/tour_plan"} = (get_term(P)),
+    {term, "http://www.madonna.com/tour_plan"} = (get_term(P)),
+    {term, "\'madonna\'"} = (get_term(P)),
+    {term, "\"madonna\""} = (get_term(P)),
+    {term, "\\madonna\\"} = (get_term(P)),
+    {term, "{madonna,21,'mad donna',12}"} = (get_term(P)),
+
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_uint() function.
 
-t_erl_mk_uint(suite) -> [];
 t_erl_mk_uint(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_uint),
+    P = runner:start(?t_erl_mk_uint),
 
-    ?line {term, 54321} = (get_term(P)),
-    ?line {term, 2147483647} = (get_term(P)),
-    ?line {term, 2147483648} = (get_term(P)),
-    ?line {term, 2147483649} = (get_term(P)),
-    ?line {term, 2147483650} = (get_term(P)),
-    ?line {term, 4294967295} = (get_term(P)),
+    {term, 54321} = (get_term(P)),
+    {term, 2147483647} = (get_term(P)),
+    {term, 2147483648} = (get_term(P)),
+    {term, 2147483649} = (get_term(P)),
+    {term, 2147483650} = (get_term(P)),
+    {term, 4294967295} = (get_term(P)),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_var() function.
 
-t_erl_mk_var(suite) -> [];
 t_erl_mk_var(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_var),
+    P = runner:start(?t_erl_mk_var),
 
-    ?line {term, 1} = (get_term(P)),
-    ?line {term, 0} = (get_term(P)),
-    ?line {term, 1} = (get_term(P)),
-    ?line {term, 0} = (get_term(P)),
-    ?line {term, 1} = (get_term(P)),
-    ?line {term, 0} = (get_term(P)),
-    ?line {term, 1} = (get_term(P)),
+    {term, 1} = (get_term(P)),
+    {term, 0} = (get_term(P)),
+    {term, 1} = (get_term(P)),
+    {term, 0} = (get_term(P)),
+    {term, 1} = (get_term(P)),
+    {term, 0} = (get_term(P)),
+    {term, 1} = (get_term(P)),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_cons() function.
 
-t_erl_cons(suite) -> [];
 t_erl_cons(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_cons),
+    P = runner:start(?t_erl_cons),
 
-    ?line {term, [madonna, 21]} = get_term(P),
+    {term, [madonna, 21]} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%%	3.   E x t r a c t i n g  &   i n f o    f u n c t i o n s
@@ -530,21 +489,20 @@ t_erl_cons(Config) when is_list(Config) ->
 
 %% Tests the erl_length() function.
 
-t_erl_length(suite) -> [];
 t_erl_length(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_length),
+    P = runner:start(?t_erl_length),
 
-    ?line 0 = erl_length(P, []),
-    ?line 1 = erl_length(P, [a]),
-    ?line 2 = erl_length(P, [a, b]),
-    ?line 3 = erl_length(P, [a, b, c]),
+    0 = erl_length(P, []),
+    1 = erl_length(P, [a]),
+    2 = erl_length(P, [a, b]),
+    3 = erl_length(P, [a, b, c]),
 
-    ?line 4 = erl_length(P, [a, [x, y], c, []]),
+    4 = erl_length(P, [a, [x, y], c, []]),
 
-    ?line -1 = erl_length(P, [a|b]),
-    ?line -1 = erl_length(P, a),
+    -1 = erl_length(P, [a|b]),
+    -1 = erl_length(P, a),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
 %% Invokes the erl_length() function.
@@ -554,22 +512,21 @@ erl_length(Port, List) ->
 
 %% Tests the erl_hd() function.
 
-t_erl_hd(suite) -> [];
 t_erl_hd(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_hd),
-    
-    ?line 'NULL' = erl_hd(P, 42),
-    ?line 'NULL' = erl_hd(P, abc),
-    ?line 'NULL' = erl_hd(P, []),
-
-    ?line [] = erl_hd(P, [[], a]),
-    ?line a = erl_hd(P, [a]),
-    ?line a = erl_hd(P, [a, b]),
-    ?line a = erl_hd(P, [a, b, c]),
-    ?line a = erl_hd(P, [a|b]),
-
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    P = runner:start(?t_erl_hd),
+
+    'NULL' = erl_hd(P, 42),
+    'NULL' = erl_hd(P, abc),
+    'NULL' = erl_hd(P, []),
+
+    [] = erl_hd(P, [[], a]),
+    a = erl_hd(P, [a]),
+    a = erl_hd(P, [a, b]),
+    a = erl_hd(P, [a, b, c]),
+    a = erl_hd(P, [a|b]),
+
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 %% Invokes the erl_hd() function.
@@ -579,22 +536,21 @@ erl_hd(Port, List) ->
 
 %% Tests the erl_tail() function.
 
-t_erl_tl(suite) -> [];
 t_erl_tl(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_tl),
+    P = runner:start(?t_erl_tl),
 
-    ?line 'NULL' = erl_tl(P, 42),
-    ?line 'NULL' = erl_tl(P, abc),
-    ?line 'NULL' = erl_tl(P, []),
+    'NULL' = erl_tl(P, 42),
+    'NULL' = erl_tl(P, abc),
+    'NULL' = erl_tl(P, []),
 
-    ?line [] = erl_tl(P, [a]),
-    ?line [b] = erl_tl(P, [a, b]),
-    ?line [b, c] = erl_tl(P, [a, b, c]),
+    [] = erl_tl(P, [a]),
+    [b] = erl_tl(P, [a, b]),
+    [b, c] = erl_tl(P, [a, b, c]),
 
-    ?line b = erl_tl(P, [a|b]),
+    b = erl_tl(P, [a|b]),
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 %% Invokes the erl_tail() function in erl_interface.
@@ -604,72 +560,67 @@ erl_tl(Port, List) ->
 
 %% Tests the type checking macros (done in the C program).
 
-type_checks(suite) -> [];
 type_checks(Config) when is_list(Config) ->
-    ?line runner:test(?type_checks),
+    runner:test(?type_checks),
     ok.
 
 %% Tests the extractor macros (done in the C program).
 
-extractor_macros(suite) -> [];
 extractor_macros(Config) when is_list(Config) ->
-    ?line runner:test(?extractor_macros),
+    runner:test(?extractor_macros),
     ok.
 
 
 %% This tests the erl_size() function.
 
-t_erl_size(suite) -> [];
 t_erl_size(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_size),
+    P = runner:start(?t_erl_size),
 
-    ?line {term, 0} = (get_term(P)),
-    ?line {term, 4} = (get_term(P)),
+    {term, 0} = (get_term(P)),
+    {term, 4} = (get_term(P)),
 
-    ?line {term, 0} = (get_term(P)),
-    ?line {term, 27} = (get_term(P)),
+    {term, 0} = (get_term(P)),
+    {term, 27} = (get_term(P)),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_var_content() function.
 
-t_erl_var_content(suite) -> [];
 t_erl_var_content(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_var_content),
+    P = runner:start(?t_erl_var_content),
 
-    ?line {term, 17} = (get_term(P)),
-    ?line {term, "http://www.madonna.com"} = (get_term(P)),
-    ?line {term, 2} = (get_term(P)),
-    ?line {term, "http://www.madonna.com"} = (get_term(P)),
-    ?line {term, 2} = (get_term(P)),
+    {term, 17} = (get_term(P)),
+    {term, "http://www.madonna.com"} = (get_term(P)),
+    {term, 2} = (get_term(P)),
+    {term, "http://www.madonna.com"} = (get_term(P)),
+    {term, 2} = (get_term(P)),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_element() function.
 
-t_erl_element(suite) -> [];
 t_erl_element(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_element),
+    P = runner:start(?t_erl_element),
 
-    ?line {term, madonna} = get_term(P),
-    ?line {term, 21} = get_term(P),
-    ?line {term, 'mad donna'} = get_term(P),
-    ?line {term, 12} = get_term(P),
+    {term, madonna} = get_term(P),
+    {term, 21} = get_term(P),
+    {term, 'mad donna'} = get_term(P),
+    {term, 12} = get_term(P),
 
-    ?line {term, 'Madonna'} = get_term(P),
-    ?line {term, 21} = get_term(P),
-    ?line {term, {children,{"Isabella",2}}} = get_term(P),
-    ?line {term, {'home page',"http://www.madonna.com/"}} = get_term(P),
+    {term, 'Madonna'} = get_term(P),
+    {term, 21} = get_term(P),
+    {term, {children,{"Isabella",2}}} = get_term(P),
+    {term, {'home page',"http://www.madonna.com/"}} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%%	4.   I / O   l i s t   f u n c t i o n s
@@ -678,65 +629,64 @@ t_erl_element(Config) when is_list(Config) ->
 
 %% Tests the erl_iolist_length() function.
 
-t_erl_iolist_length(suite) -> [];
 t_erl_iolist_length(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_iolist_length),
+    P = runner:start(?t_erl_iolist_length),
 
     %% Flat lists.
 
-    ?line 0 = erl_iolist_length(P, []),
-    ?line 1 = erl_iolist_length(P, [10]),
-    ?line 2 = erl_iolist_length(P, [10, 20]),
-    ?line 3 = erl_iolist_length(P, [10, 20, 30]),
-    ?line 256 = erl_iolist_length(P, lists:seq(0, 255)),
+    0 = erl_iolist_length(P, []),
+    1 = erl_iolist_length(P, [10]),
+    2 = erl_iolist_length(P, [10, 20]),
+    3 = erl_iolist_length(P, [10, 20, 30]),
+    256 = erl_iolist_length(P, lists:seq(0, 255)),
 
     %% Deep lists.
 
-    ?line 0 = erl_iolist_length(P, [[]]),
-    ?line 1 = erl_iolist_length(P, [[], 42]),
-    ?line 1 = erl_iolist_length(P, [42, []]),
-    ?line 2 = erl_iolist_length(P, [42, [], 45]),
+    0 = erl_iolist_length(P, [[]]),
+    1 = erl_iolist_length(P, [[], 42]),
+    1 = erl_iolist_length(P, [42, []]),
+    2 = erl_iolist_length(P, [42, [], 45]),
 
-    ?line 3 = erl_iolist_length(P, [42, [90], 45]),
-    ?line 3 = erl_iolist_length(P, [[42, [90]], 45]),
-    ?line 3 = erl_iolist_length(P, [[42, [90]], 45]),
+    3 = erl_iolist_length(P, [42, [90], 45]),
+    3 = erl_iolist_length(P, [[42, [90]], 45]),
+    3 = erl_iolist_length(P, [[42, [90]], 45]),
 
     %% List with binaries.
 
-    ?line 0 = erl_iolist_length(P, [list_to_binary([])]),
-    ?line 0 = erl_iolist_length(P, [[], list_to_binary([])]),
-    ?line 1 = erl_iolist_length(P, [[1], list_to_binary([])]),
-    ?line 1 = erl_iolist_length(P, [[], list_to_binary([2])]),
-    ?line 2 = erl_iolist_length(P, [[42], list_to_binary([2])]),
-    ?line 4 = erl_iolist_length(P, [[42], list_to_binary([2, 3, 4])]),
+    0 = erl_iolist_length(P, [list_to_binary([])]),
+    0 = erl_iolist_length(P, [[], list_to_binary([])]),
+    1 = erl_iolist_length(P, [[1], list_to_binary([])]),
+    1 = erl_iolist_length(P, [[], list_to_binary([2])]),
+    2 = erl_iolist_length(P, [[42], list_to_binary([2])]),
+    4 = erl_iolist_length(P, [[42], list_to_binary([2, 3, 4])]),
 
     %% Binaries as tail.
 
-    ?line 0 = erl_iolist_length(P, [[]| list_to_binary([])]),
-    ?line 1 = erl_iolist_length(P, [[1]| list_to_binary([])]),
-    ?line 1 = erl_iolist_length(P, [[]| list_to_binary([2])]),
-    ?line 2 = erl_iolist_length(P, [[42]| list_to_binary([2])]),
+    0 = erl_iolist_length(P, [[]| list_to_binary([])]),
+    1 = erl_iolist_length(P, [[1]| list_to_binary([])]),
+    1 = erl_iolist_length(P, [[]| list_to_binary([2])]),
+    2 = erl_iolist_length(P, [[42]| list_to_binary([2])]),
 
     %% Binaries only.
 
-    ?line 0 = erl_iolist_length(P, list_to_binary("")),
-    ?line 1 = erl_iolist_length(P, list_to_binary([1])),
-    ?line 2 = erl_iolist_length(P, list_to_binary([1, 2])),
+    0 = erl_iolist_length(P, list_to_binary("")),
+    1 = erl_iolist_length(P, list_to_binary([1])),
+    2 = erl_iolist_length(P, list_to_binary([1, 2])),
 
     %% Illegal cases.
 
-    ?line -1 = erl_iolist_length(P, [42|43]),
-    ?line -1 = erl_iolist_length(P, a),
+    -1 = erl_iolist_length(P, [42|43]),
+    -1 = erl_iolist_length(P, a),
 
-    ?line -1 = erl_iolist_length(P, [a]),
-    ?line -1 = erl_iolist_length(P, [256]),
-    ?line -1 = erl_iolist_length(P, [257]),
-    ?line -1 = erl_iolist_length(P, [-1]),
-    ?line -1 = erl_iolist_length(P, [-2]),
-    ?line -1 = erl_iolist_length(P, [-127]),
-    ?line -1 = erl_iolist_length(P, [-128]),
+    -1 = erl_iolist_length(P, [a]),
+    -1 = erl_iolist_length(P, [256]),
+    -1 = erl_iolist_length(P, [257]),
+    -1 = erl_iolist_length(P, [-1]),
+    -1 = erl_iolist_length(P, [-2]),
+    -1 = erl_iolist_length(P, [-127]),
+    -1 = erl_iolist_length(P, [-128]),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
 %% Invokes the erl_iolist_length() function.
@@ -746,143 +696,141 @@ erl_iolist_length(Port, List) ->
 
 %% Tests the erl_iolist_to_binary() function.
 
-t_erl_iolist_to_binary(suite) -> [];
 t_erl_iolist_to_binary(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_iolist_to_binary),
+    P = runner:start(?t_erl_iolist_to_binary),
 
     %% Flat lists.
 
-    ?line [] = iolist_to_list(P, []),
-    ?line [10] = iolist_to_list(P, [10]),
-    ?line [10, 20] = iolist_to_list(P, [10, 20]),
-    ?line [10, 20, 30] = iolist_to_list(P, [10, 20, 30]),
-    ?line AllBytes = lists:seq(0, 255),
-    ?line AllBytes = iolist_to_list(P, AllBytes),
+    [] = iolist_to_list(P, []),
+    [10] = iolist_to_list(P, [10]),
+    [10, 20] = iolist_to_list(P, [10, 20]),
+    [10, 20, 30] = iolist_to_list(P, [10, 20, 30]),
+    AllBytes = lists:seq(0, 255),
+    AllBytes = iolist_to_list(P, AllBytes),
 
     %% Deep lists.
 
-    ?line [] = iolist_to_list(P, [[]]),
-    ?line [42] = iolist_to_list(P, [[], 42]),
-    ?line [42] = iolist_to_list(P, [42, []]),
-    ?line [42, 45] = iolist_to_list(P, [42, [], 45]),
+    [] = iolist_to_list(P, [[]]),
+    [42] = iolist_to_list(P, [[], 42]),
+    [42] = iolist_to_list(P, [42, []]),
+    [42, 45] = iolist_to_list(P, [42, [], 45]),
 
-    ?line [42, 90, 45] = iolist_to_list(P, [42, [90], 45]),
-    ?line [42, 90, 45] = iolist_to_list(P, [[42, [90]], 45]),
-    ?line [42, 90, 45] = iolist_to_list(P, [[42, [90]], 45]),
+    [42, 90, 45] = iolist_to_list(P, [42, [90], 45]),
+    [42, 90, 45] = iolist_to_list(P, [[42, [90]], 45]),
+    [42, 90, 45] = iolist_to_list(P, [[42, [90]], 45]),
 
     %% List with binaries.
 
-    ?line [] = iolist_to_list(P, [list_to_binary([])]),
-    ?line [] = iolist_to_list(P, [[], list_to_binary([])]),
-    ?line [1] = iolist_to_list(P, [[1], list_to_binary([])]),
-    ?line [2] = iolist_to_list(P, [[], list_to_binary([2])]),
-    ?line [42, 2] = iolist_to_list(P, [[42], list_to_binary([2])]),
-    ?line [42, 2, 3, 4] = iolist_to_list(P, [[42], list_to_binary([2, 3, 4])]),
+    [] = iolist_to_list(P, [list_to_binary([])]),
+    [] = iolist_to_list(P, [[], list_to_binary([])]),
+    [1] = iolist_to_list(P, [[1], list_to_binary([])]),
+    [2] = iolist_to_list(P, [[], list_to_binary([2])]),
+    [42, 2] = iolist_to_list(P, [[42], list_to_binary([2])]),
+    [42, 2, 3, 4] = iolist_to_list(P, [[42], list_to_binary([2, 3, 4])]),
 
     %% Binaries as tail.
 
-    ?line [] = iolist_to_list(P, [[]| list_to_binary([])]),
-    ?line [1] = iolist_to_list(P, [[1]| list_to_binary([])]),
-    ?line [2] = iolist_to_list(P, [[]| list_to_binary([2])]),
-    ?line [42, 2] = iolist_to_list(P, [[42]| list_to_binary([2])]),
+    [] = iolist_to_list(P, [[]| list_to_binary([])]),
+    [1] = iolist_to_list(P, [[1]| list_to_binary([])]),
+    [2] = iolist_to_list(P, [[]| list_to_binary([2])]),
+    [42, 2] = iolist_to_list(P, [[42]| list_to_binary([2])]),
 
     %% Binaries only.
 
-    ?line [] = iolist_to_list(P, list_to_binary("")),
-    ?line [1] = iolist_to_list(P, list_to_binary([1])),
-    ?line [1, 2] = iolist_to_list(P, list_to_binary([1, 2])),
+    [] = iolist_to_list(P, list_to_binary("")),
+    [1] = iolist_to_list(P, list_to_binary([1])),
+    [1, 2] = iolist_to_list(P, list_to_binary([1, 2])),
 
     %% Illegal cases.
 
-    ?line 'NULL' = iolist_to_list(P, [42|43]),
-    ?line 'NULL' = iolist_to_list(P, a),
+    'NULL' = iolist_to_list(P, [42|43]),
+    'NULL' = iolist_to_list(P, a),
 
-    ?line 'NULL' = iolist_to_list(P, [a]),
-    ?line 'NULL' = iolist_to_list(P, [256]),
-    ?line 'NULL' = iolist_to_list(P, [257]),
-    ?line 'NULL' = iolist_to_list(P, [-1]),
-    ?line 'NULL' = iolist_to_list(P, [-2]),
-    ?line 'NULL' = iolist_to_list(P, [-127]),
-    ?line 'NULL' = iolist_to_list(P, [-128]),
+    'NULL' = iolist_to_list(P, [a]),
+    'NULL' = iolist_to_list(P, [256]),
+    'NULL' = iolist_to_list(P, [257]),
+    'NULL' = iolist_to_list(P, [-1]),
+    'NULL' = iolist_to_list(P, [-2]),
+    'NULL' = iolist_to_list(P, [-127]),
+    'NULL' = iolist_to_list(P, [-128]),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
 iolist_to_list(Port, Term) ->
     case call_erl_function(Port, Term) of
-	'NULL' ->
-	    'NULL';
-	Bin when is_binary(Bin) ->
-	    binary_to_list(Bin)
+        'NULL' ->
+            'NULL';
+        Bin when is_binary(Bin) ->
+            binary_to_list(Bin)
     end.
 
 %% Tests the erl_iolist_to_string() function.
 
-t_erl_iolist_to_string(suite) -> [];
 t_erl_iolist_to_string(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_iolist_to_string),
+    P = runner:start(?t_erl_iolist_to_string),
 
     %% Flat lists.
 
-    ?line [0] = iolist_to_string(P, []),
-    ?line [10, 0] = iolist_to_string(P, [10]),
-    ?line [10, 20, 0] = iolist_to_string(P, [10, 20]),
-    ?line [10, 20, 30, 0] = iolist_to_string(P, [10, 20, 30]),
-    ?line AllBytes = lists:seq(1, 255)++[0],
-    ?line AllBytes = iolist_to_string(P, lists:seq(1, 255)),
+    [0] = iolist_to_string(P, []),
+    [10, 0] = iolist_to_string(P, [10]),
+    [10, 20, 0] = iolist_to_string(P, [10, 20]),
+    [10, 20, 30, 0] = iolist_to_string(P, [10, 20, 30]),
+    AllBytes = lists:seq(1, 255)++[0],
+    AllBytes = iolist_to_string(P, lists:seq(1, 255)),
 
     %% Deep lists.
 
-    ?line [0] = iolist_to_string(P, [[]]),
-    ?line [42, 0] = iolist_to_string(P, [[], 42]),
-    ?line [42, 0] = iolist_to_string(P, [42, []]),
-    ?line [42, 45, 0] = iolist_to_string(P, [42, [], 45]),
+    [0] = iolist_to_string(P, [[]]),
+    [42, 0] = iolist_to_string(P, [[], 42]),
+    [42, 0] = iolist_to_string(P, [42, []]),
+    [42, 45, 0] = iolist_to_string(P, [42, [], 45]),
 
-    ?line [42, 90, 45, 0] = iolist_to_string(P, [42, [90], 45]),
-    ?line [42, 90, 45, 0] = iolist_to_string(P, [[42, [90]], 45]),
-    ?line [42, 90, 45, 0] = iolist_to_string(P, [[42, [90]], 45]),
+    [42, 90, 45, 0] = iolist_to_string(P, [42, [90], 45]),
+    [42, 90, 45, 0] = iolist_to_string(P, [[42, [90]], 45]),
+    [42, 90, 45, 0] = iolist_to_string(P, [[42, [90]], 45]),
 
     %% List with binaries.
 
-    ?line [0] = iolist_to_string(P, [list_to_binary([])]),
-    ?line [0] = iolist_to_string(P, [[], list_to_binary([])]),
-    ?line [1, 0] = iolist_to_string(P, [[1], list_to_binary([])]),
-    ?line [2, 0] = iolist_to_string(P, [[], list_to_binary([2])]),
-    ?line [42, 2, 0] = iolist_to_string(P, [[42], list_to_binary([2])]),
-    ?line [42, 2, 3, 4, 0] = iolist_to_string(P, [[42],
-						  list_to_binary([2, 3, 4])]),
+    [0] = iolist_to_string(P, [list_to_binary([])]),
+    [0] = iolist_to_string(P, [[], list_to_binary([])]),
+    [1, 0] = iolist_to_string(P, [[1], list_to_binary([])]),
+    [2, 0] = iolist_to_string(P, [[], list_to_binary([2])]),
+    [42, 2, 0] = iolist_to_string(P, [[42], list_to_binary([2])]),
+    [42, 2, 3, 4, 0] = iolist_to_string(P, [[42],
+                                            list_to_binary([2, 3, 4])]),
 
     %% Binaries as tail.
 
-    ?line [0] = iolist_to_string(P, [[]| list_to_binary([])]),
-    ?line [1, 0] = iolist_to_string(P, [[1]| list_to_binary([])]),
-    ?line [2, 0] = iolist_to_string(P, [[]| list_to_binary([2])]),
-    ?line [42, 2, 0] = iolist_to_string(P, [[42]| list_to_binary([2])]),
+    [0] = iolist_to_string(P, [[]| list_to_binary([])]),
+    [1, 0] = iolist_to_string(P, [[1]| list_to_binary([])]),
+    [2, 0] = iolist_to_string(P, [[]| list_to_binary([2])]),
+    [42, 2, 0] = iolist_to_string(P, [[42]| list_to_binary([2])]),
 
     %% Binaries only.
 
-    ?line [0] = iolist_to_string(P, list_to_binary("")),
-    ?line [1, 0] = iolist_to_string(P, list_to_binary([1])),
-    ?line [1, 2, 0] = iolist_to_string(P, list_to_binary([1, 2])),
+    [0] = iolist_to_string(P, list_to_binary("")),
+    [1, 0] = iolist_to_string(P, list_to_binary([1])),
+    [1, 2, 0] = iolist_to_string(P, list_to_binary([1, 2])),
 
     %% Illegal cases.
 
-    ?line 'NULL' = iolist_to_string(P, [0]),
-    ?line 'NULL' = iolist_to_string(P, [65, 0, 66]),
-    ?line 'NULL' = iolist_to_string(P, [65, 66, 67, 0]),
+    'NULL' = iolist_to_string(P, [0]),
+    'NULL' = iolist_to_string(P, [65, 0, 66]),
+    'NULL' = iolist_to_string(P, [65, 66, 67, 0]),
 
-    ?line 'NULL' = iolist_to_string(P, [42|43]),
-    ?line 'NULL' = iolist_to_string(P, a),
+    'NULL' = iolist_to_string(P, [42|43]),
+    'NULL' = iolist_to_string(P, a),
 
-    ?line 'NULL' = iolist_to_string(P, [a]),
-    ?line 'NULL' = iolist_to_string(P, [256]),
-    ?line 'NULL' = iolist_to_string(P, [257]),
-    ?line 'NULL' = iolist_to_string(P, [-1]),
-    ?line 'NULL' = iolist_to_string(P, [-2]),
-    ?line 'NULL' = iolist_to_string(P, [-127]),
-    ?line 'NULL' = iolist_to_string(P, [-128]),
+    'NULL' = iolist_to_string(P, [a]),
+    'NULL' = iolist_to_string(P, [256]),
+    'NULL' = iolist_to_string(P, [257]),
+    'NULL' = iolist_to_string(P, [-1]),
+    'NULL' = iolist_to_string(P, [-2]),
+    'NULL' = iolist_to_string(P, [-127]),
+    'NULL' = iolist_to_string(P, [-128]),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
 %% Invokes the erl_iolist_to_string() function.
@@ -890,49 +838,48 @@ t_erl_iolist_to_string(Config) when is_list(Config) ->
 iolist_to_string(Port, Term) ->
     runner:send_term(Port, Term),
     case get_term(Port) of
-	{bytes, Result} -> Result;
-	'NULL'       -> 'NULL'
+        {bytes, Result} -> Result;
+        'NULL'       -> 'NULL'
     end.
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%%	5.   M i s c e l l a n o u s   T e s t s
 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-erl_print_term(suite) -> [];
-erl_print_term(doc) -> "Tests the erl_print_term() function";
+%% Tests the erl_print_term() function
 erl_print_term(Config) when is_list(Config) ->
-    ?line PrintTerm = print_term(Config),
-    ?line P = open_port({spawn, PrintTerm}, [stream]),
+    PrintTerm = print_term(Config),
+    P = open_port({spawn, PrintTerm}, [stream]),
 
     %% Lists.
 
-    ?line print(P, "[]", []),
-    ?line print(P, "[a]", [a]),
-    ?line print(P, "[[a]]", [[a]]),
-    ?line print(P, "[[]]", [[]]),
-    ?line print(P, "[a,b,c]", [a,b,c]),
-    ?line print(P, "[a,b|c]", [a,b|c]),
-    ?line print(P, "[a,[],c]", [a,[],c]),
-    ?line print(P, "[a,[1000,1],c]", [a,[1000,1],c]),
+    print(P, "[]", []),
+    print(P, "[a]", [a]),
+    print(P, "[[a]]", [[a]]),
+    print(P, "[[]]", [[]]),
+    print(P, "[a,b,c]", [a,b,c]),
+    print(P, "[a,b|c]", [a,b|c]),
+    print(P, "[a,[],c]", [a,[],c]),
+    print(P, "[a,[1000,1],c]", [a,[1000,1],c]),
 
     %% Tuples.
 
-    ?line print(P, "{}", {}),
-    ?line print(P, "{ok}", {ok}),
-    ?line print(P, "{1,2,3}", {1, 2, 3}),
+    print(P, "{}", {}),
+    print(P, "{ok}", {ok}),
+    print(P, "{1,2,3}", {1, 2, 3}),
 
     %% Pids.
 
-    ?line {_X, Y, Z} = split_pid(self()),
-    ?line PidString = lists:flatten(io_lib:format("<~s.~w.~w>",
-						  [node(), Y, Z])),
-    ?line print(P, PidString, self()),
+    {_X, Y, Z} = split_pid(self()),
+    PidString = lists:flatten(io_lib:format("<~s.~w.~w>",
+                                            [node(), Y, Z])),
+    print(P, PidString, self()),
 
-    ?line unlink(P),
-    ?line exit(P, die),
+    unlink(P),
+    exit(P, die),
     ok.
 
 split_pid(Pid) when is_pid(Pid) ->
@@ -947,23 +894,22 @@ split_pid([$.|Rest], Cur, Result) ->
 split_pid([$>], Cur, Result) ->
     list_to_tuple(Result++[Cur]).
 
-print_string(suite) -> [];
-print_string(doc) -> "Test printing a string with erl_print_term()";
+%% Test printing a string with erl_print_term()
 print_string(Config) when is_list(Config) ->
-    ?line PrintTerm = print_term(Config),
-    ?line P = open_port({spawn, PrintTerm}, [stream]),
+    PrintTerm = print_term(Config),
+    P = open_port({spawn, PrintTerm}, [stream]),
 
     %% Strings.
 
-    ?line print(P, "\"ABC\"", "ABC"),
-    ?line {11, "\"\\tABC\\r\\n\""} = print(P, "\tABC\r\n"),
+    print(P, "\"ABC\"", "ABC"),
+    {11, "\"\\tABC\\r\\n\""} = print(P, "\tABC\r\n"),
 
     %% Not strings.
 
-    ?line print(P, "[65,66,67,0]", "ABC\000"),
+    print(P, "[65,66,67,0]", "ABC\000"),
 
-    ?line unlink(P),
-    ?line exit(P, die),
+    unlink(P),
+    exit(P, die),
     ok.
 
 print(Port, TermString, Term) ->
@@ -982,15 +928,15 @@ print(Port, Term) ->
 
 collect_line(Port, Result) ->
     receive
-	{Port, {data, Data}} ->
-	    case lists:reverse(Data) of
-		[$\n|Rest] ->
-		    collect_line1(Rest++Result, []);
-		Chars ->
-		    collect_line(Port, Chars++Result)
-	    end
-    after test_server:seconds(5) ->
-	    test_server:fail("No response from C program")
+        {Port, {data, Data}} ->
+            case lists:reverse(Data) of
+                [$\n|Rest] ->
+                    collect_line1(Rest++Result, []);
+                Chars ->
+                    collect_line(Port, Chars++Result)
+            end
+    after 5000 ->
+              ct:fail("No response from C program")
     end.
 
 collect_line1([$\r|Rest], Result) ->
@@ -1000,18 +946,16 @@ collect_line1([C|Rest], Result) ->
 
 %% Test case submitted by Per Lundgren, ERV.
 
-high_chaparal(suite) -> [];
 high_chaparal(Config) when is_list(Config) ->
-    ?line P = runner:start(?high_chaparal),
-    ?line {term, [hello, world]} = get_term(P),
-    ?line runner:recv_eot(P),
+    P = runner:start(?high_chaparal),
+    {term, [hello, world]} = get_term(P),
+    runner:recv_eot(P),
     ok.
 
 %% OTP-7448
-broken_data(suite) -> [];
 broken_data(Config) when is_list(Config) ->
-    ?line P = runner:start(?broken_data),
-    ?line runner:recv_eot(P),
+    P = runner:start(?broken_data),
+    runner:recv_eot(P),
     ok.
 
 %% This calls a C function with one parameter and returns the result.
@@ -1019,12 +963,12 @@ broken_data(Config) when is_list(Config) ->
 call_erl_function(Port, Term) ->
     runner:send_term(Port, Term),
     case get_term(Port) of
-	{term, Result} -> Result;
-	'NULL'       -> 'NULL'
+        {term, Result} -> Result;
+        'NULL'       -> 'NULL'
     end.
 
 print_term(Config) when is_list(Config) ->
-    filename:join(?config(data_dir, Config), "print_term").
+    filename:join(proplists:get_value(data_dir, Config), "print_term").
 
 
 
@@ -1033,57 +977,57 @@ print_term(Config) when is_list(Config) ->
 %%% back, without having been mutated into short form. We must take
 %%% care then to check the actual returned ref, and not the original
 %%% one, which is equal to it.
-cnode_1(suite) -> [];
-cnode_1(doc) -> "Tests involving cnode: sends a long ref from a cnode to us";
+
+%% Tests involving cnode: sends a long ref from a cnode to us
 cnode_1(Config) when is_list(Config) ->
-    ?line Cnode = filename:join(?config(data_dir, Config), "cnode"),
-    ?line register(mip, self()),
-    ?line spawn_link(?MODULE, start_cnode, [Cnode]),
-    ?line Ref1 = get_ref(),
+    Cnode = filename:join(proplists:get_value(data_dir, Config), "cnode"),
+    register(mip, self()),
+    spawn_link(?MODULE, start_cnode, [Cnode]),
+    Ref1 = get_ref(),
     io:format("Ref1 ~p~n", [Ref1]),
-    ?line check_ref(Ref1),
-    ?line Ref2 = make_ref(),
-    ?line receive
-	      Pid -> Pid
-	  end,
-    ?line Fun1 = fun(X) -> {Pid, X} end,	% sneak in a fun test here
-    %?line Fun1 = {wait_with_funs, new_dist_format},
-    ?line Term = {Ref2, Fun1, {1,2,3,4,5,6,7,8,9,10}},
+    check_ref(Ref1),
+    Ref2 = make_ref(),
+    Pid = receive
+              Msg -> Msg %% pid
+          end,
+    Fun1 = fun(X) -> {Pid, X} end,	% sneak in a fun test here
+    %Fun1 = {wait_with_funs, new_dist_format},
+    Term = {Ref2, Fun1, {1,2,3,4,5,6,7,8,9,10}},
     %% A term which will overflow the original buffer used in 'cnode'.
-    ?line Pid ! Term,
-    ?line receive
-	      Term2 ->
-		  io:format("received ~p~n", [Term2]),
-		  case Term2 of
-		      Term ->
-			  {Ref22,_,_} = Term2,
-			  ?line check_ref(Ref22);
-		      X ->
-		      test_server:fail({receive1,X})
-		  end
-	  after 5000 ->
-		  test_server:fail(receive1)
-	  end,
-    ?line receive
-	      Pid ->
-		  ok;
-	      Y ->
-		  test_server:fail({receive1,Y})
-	  after 5000 ->
-		  test_server:fail(receive2)
-	  end,
-    ?line io:format("ref = ~p~n", [Ref1]),
-    ?line check_ref(Ref1),
+    Pid ! Term,
+    receive
+        Term2 ->
+            io:format("received ~p~n", [Term2]),
+            case Term2 of
+                Term ->
+                    {Ref22,_,_} = Term2,
+                    check_ref(Ref22);
+                X ->
+                    ct:fail({receive1,X})
+            end
+    after 5000 ->
+              ct:fail(receive1)
+    end,
+    receive
+        Pid ->
+            ok;
+        Y ->
+            ct:fail({receive1,Y})
+    after 5000 ->
+              ct:fail(receive2)
+    end,
+    io:format("ref = ~p~n", [Ref1]),
+    check_ref(Ref1),
     ok.
 
 check_ref(Ref) ->
     case bin_ext_type(Ref) of
-	101 ->
-	    test_server:fail(oldref);
-	114 ->
-	    ok;
-	Type ->
-	    test_server:fail({type, Type})
+        101 ->
+            ct:fail(oldref);
+        114 ->
+            ok;
+        Type ->
+            ct:fail({type, Type})
     end.
 
 bin_ext_type(T) ->
@@ -1092,10 +1036,10 @@ bin_ext_type(T) ->
 
 get_ref() ->
     receive
-	X when is_reference(X) ->
-	    X
+        X when is_reference(X) ->
+            X
     after 5000 ->
-	    test_server:fail({cnode, timeout})
+              ct:fail({cnode, timeout})
     end.
 
 start_cnode(Cnode) ->
@@ -1104,35 +1048,33 @@ start_cnode(Cnode) ->
 
 rec_cnode() ->
     receive
-	X ->
-	    io:format("from cnode: ~p~n", [X]),
-	    rec_cnode()
+        X ->
+            io:format("from cnode: ~p~n", [X]),
+            rec_cnode()
     end.
 
 nc2vinfo(Pid) when is_pid(Pid) ->
-    ?line [_NodeStr, NumberStr, SerialStr]
-	= string:tokens(pid_to_list(Pid), "<.>"),
-    ?line Number = list_to_integer(NumberStr),
-    ?line Serial = list_to_integer(SerialStr),
-    ?line {pid, node(Pid), Number, Serial};
+    [_NodeStr, NumberStr, SerialStr]
+    = string:tokens(pid_to_list(Pid), "<.>"),
+    Number = list_to_integer(NumberStr),
+    Serial = list_to_integer(SerialStr),
+    {pid, node(Pid), Number, Serial};
 nc2vinfo(Port) when is_port(Port) ->
-    ?line ["#Port", _NodeStr, NumberStr]
-	= string:tokens(erlang:port_to_list(Port), "<.>"),
-    ?line Number = list_to_integer(NumberStr),
-    ?line {port, node(Port), Number};    
+    ["#Port", _NodeStr, NumberStr]
+    = string:tokens(erlang:port_to_list(Port), "<.>"),
+    Number = list_to_integer(NumberStr),
+    {port, node(Port), Number};
 nc2vinfo(Ref) when is_reference(Ref) ->
-    ?line ["#Ref", _NodeStr | NumStrList]
-	= string:tokens(erlang:ref_to_list(Ref), "<.>"),
-    ?line {Len, RevNumList} = lists:foldl(fun ("0", {N, []}) ->
-						  {N+1, []};
-					      (IStr, {N, Is}) ->
-						  {N+1,
-						   [list_to_integer(IStr)|Is]}
-					  end,
-					  {0, []},
-					  NumStrList),
-    ?line {ref, node(Ref), Len, lists:reverse(RevNumList)};
+    ["#Ref", _NodeStr | NumStrList]
+    = string:tokens(erlang:ref_to_list(Ref), "<.>"),
+    {Len, RevNumList} = lists:foldl(fun ("0", {N, []}) ->
+                                            {N+1, []};
+                                        (IStr, {N, Is}) ->
+                                            {N+1,
+                                             [list_to_integer(IStr)|Is]}
+                                    end,
+                                    {0, []},
+                                    NumStrList),
+    {ref, node(Ref), Len, lists:reverse(RevNumList)};
 nc2vinfo(Other) ->
-    ?line {badarg, Other}.
-
-
+    {badarg, Other}.
diff --git a/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.first b/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.first
index 0f25fcc0a9..0ea872ef49 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2009. All Rights Reserved.
+# Copyright Ericsson AB 2000-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.src
index 89931c7701..4b1ddf77b6 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.src
@@ -1,30 +1,30 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @erl_interface_sock_libs@ @LIBS@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_eterm_SUITE_data/cnode.c b/lib/erl_interface/test/erl_eterm_SUITE_data/cnode.c
index 133f35f4bd..bead0f8413 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE_data/cnode.c
+++ b/lib/erl_interface/test/erl_eterm_SUITE_data/cnode.c
@@ -1,18 +1,19 @@
 /* 
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1999-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1999-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c b/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
index 80d7f69520..d97f218a26 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
+++ b/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -148,7 +149,7 @@ TESTCASE(round_trip_conversion)
 
     {
 	int v;
-	for (v = 8; v; v <<= 1) {
+	for (v = 8, n = 0; n < (sizeof(v)*8-4-1); v <<= 1, n++) {
 	    for (i=-4; i<4; i++) {
 		encode_decode(erl_mk_int(v+i), "INT");
 		encode_decode(erl_mk_int(-(v+i)), "NEG INT");
@@ -165,7 +166,7 @@ TESTCASE(round_trip_conversion)
     }
     {
 	long long v;
-	for (v = 8; v; v <<= 1) {
+	for (v = 8, n = 0; n < (sizeof(v)*8-4-1); v <<= 1, n++) {
 	    for (i=-4; i<4; i++) {
 		encode_decode(erl_mk_longlong(v+i), "LONGLONG");
 		encode_decode(erl_mk_longlong(-(v+i)), "NEG LONGLONG");
@@ -269,7 +270,7 @@ TESTCASE(t_erl_free_compound)
     report(1);
 }
 
-
+
 /***********************************************************************
  *
  *	2.   C o n s t r u c t i n g   t e r m s
@@ -1047,7 +1048,7 @@ TESTCASE(t_erl_cons)
 
 
 
-
+
 /***********************************************************************
  *
  *	3.   E x t r a c t i n g  &   i n f o    f u n c t i o n s
@@ -1296,7 +1297,7 @@ TESTCASE(extractor_macros)
 }
 
 
-
+
 /***********************************************************************
  *
  *	4.   I / O   l i s t   f u n c t i o n s
@@ -1393,7 +1394,7 @@ TESTCASE(t_erl_iolist_to_string)
     }
 }
 
-
+
 /***********************************************************************
  *
  *	5.   M i s c e l l a n o u s   T e s t s
diff --git a/lib/erl_interface/test/erl_eterm_SUITE_data/print_term.c b/lib/erl_interface/test/erl_eterm_SUITE_data/print_term.c
index fd91373c3e..5b7cb1aec8 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE_data/print_term.c
+++ b/lib/erl_interface/test/erl_eterm_SUITE_data/print_term.c
@@ -1,18 +1,19 @@
 /* 
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/erl_ext_SUITE.erl b/lib/erl_interface/test/erl_ext_SUITE.erl
index fc3e823d42..afaba1fd93 100644
--- a/lib/erl_interface/test/erl_ext_SUITE.erl
+++ b/lib/erl_interface/test/erl_ext_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -20,77 +21,47 @@
 %%
 -module(erl_ext_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_ext_SUITE_data/ext_test_cases.hrl").
 
--export([
-	 all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 compare_tuple/1,
-	 compare_list/1,
-	 compare_string/1,
-	 compare_list_string/1,
-	 compare_nc_ext/1
-	]).
+-export([all/0, suite/0,
+         compare_tuple/1,
+         compare_list/1,
+         compare_string/1,
+         compare_list_string/1,
+         compare_nc_ext/1]).
 
 -import(runner, [get_term/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [compare_tuple, compare_list, compare_string,
      compare_list_string, compare_nc_ext].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
-compare_tuple(suite) -> [];
-compare_tuple(doc) -> [];
 compare_tuple(Config) when is_list(Config) ->
-    ?line P = runner:start(?compare_tuple),
-    ?line runner:recv_eot(P),
+    P = runner:start(?compare_tuple),
+    runner:recv_eot(P),
     ok.
 
-compare_list(suite) -> [];
-compare_list(doc) -> [];
 compare_list(Config) when is_list(Config) ->
-    ?line P = runner:start(?compare_list),
-    ?line runner:recv_eot(P),
+    P = runner:start(?compare_list),
+    runner:recv_eot(P),
     ok.
 
-compare_string(suite) -> [];
-compare_string(doc) -> [];
 compare_string(Config) when is_list(Config) ->
-    ?line P = runner:start(?compare_string),
-    ?line runner:recv_eot(P),
+    P = runner:start(?compare_string),
+    runner:recv_eot(P),
     ok.
 
-compare_list_string(suite) -> [];
-compare_list_string(doc) -> [];
 compare_list_string(Config) when is_list(Config) ->
-    ?line P = runner:start(?compare_list_string),
-    ?line runner:recv_eot(P),
+    P = runner:start(?compare_list_string),
+    runner:recv_eot(P),
     ok.
 
-compare_nc_ext(suite) -> [];
-compare_nc_ext(doc) -> [];
 compare_nc_ext(Config) when is_list(Config) ->
-    ?line P = runner:start(?compare_nc_ext),
-    ?line runner:recv_eot(P),
+    P = runner:start(?compare_nc_ext),
+    runner:recv_eot(P),
     ok.
-
-
-
diff --git a/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.first b/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.first
index cb7b12cc79..9ca8f7f8a3 100644
--- a/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2009. All Rights Reserved.
+# Copyright Ericsson AB 2002-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.src
index 6f363ccd6f..fe8caebbd6 100644
--- a/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.src
@@ -1,30 +1,30 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2009. All Rights Reserved.
+# Copyright Ericsson AB 2002-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c b/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c
index a4a8da6347..36cf086ed2 100644
--- a/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c
+++ b/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2011. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  *
diff --git a/lib/erl_interface/test/erl_format_SUITE.erl b/lib/erl_interface/test/erl_format_SUITE.erl
index c722bd050f..c1a7d8377e 100644
--- a/lib/erl_interface/test/erl_format_SUITE.erl
+++ b/lib/erl_interface/test/erl_format_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -20,137 +21,111 @@
 %%
 -module(erl_format_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_format_SUITE_data/format_test_cases.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, atoms/1, tuples/1, lists/1]).
+-export([all/0, suite/0,
+         atoms/1, tuples/1, lists/1]).
 
 -import(runner, [get_term/1]).
 
 %% This test suite test the erl_format() function.
 %% It uses the port program "format_test".
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [atoms, tuples, lists].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %% Tests formatting various atoms.
 
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
-    ?line P = runner:start(?atoms),
-
-    ?line {term, ''} = get_term(P),
-    ?line {term, 'a'} = get_term(P),
-    ?line {term, 'A'} = get_term(P),
-    ?line {term, 'abc'} = get_term(P),
-    ?line {term, 'Abc'} = get_term(P),
-    ?line {term, 'ab@c'} = get_term(P),
-    ?line {term, 'The rain in Spain stays mainly in the plains'} =
-	get_term(P),
-
-    ?line {term, a} = get_term(P),
-    ?line {term, ab} = get_term(P),
-    ?line {term, abc} = get_term(P),
-    ?line {term, ab@c} = get_term(P),
-    ?line {term, abcdefghijklmnopq} = get_term(P),
-
-    ?line {term, ''} = get_term(P),
-    ?line {term, 'a'} = get_term(P),
-    ?line {term, 'A'} = get_term(P),
-    ?line {term, 'abc'} = get_term(P),
-    ?line {term, 'Abc'} = get_term(P),
-    ?line {term, 'ab@c'} = get_term(P),
-    ?line {term, 'The rain in Spain stays mainly in the plains'} =
-	get_term(P),
-
-    ?line {term, a} = get_term(P),
-    ?line {term, ab} = get_term(P),
-    ?line {term, abc} = get_term(P),
-    ?line {term, ab@c} = get_term(P),
-    ?line {term, '   abcdefghijklmnopq   '} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?atoms),
+
+    {term, ''} = get_term(P),
+    {term, 'a'} = get_term(P),
+    {term, 'A'} = get_term(P),
+    {term, 'abc'} = get_term(P),
+    {term, 'Abc'} = get_term(P),
+    {term, 'ab@c'} = get_term(P),
+    {term, 'The rain in Spain stays mainly in the plains'} = get_term(P),
+
+    {term, a} = get_term(P),
+    {term, ab} = get_term(P),
+    {term, abc} = get_term(P),
+    {term, ab@c} = get_term(P),
+    {term, abcdefghijklmnopq} = get_term(P),
+
+    {term, ''} = get_term(P),
+    {term, 'a'} = get_term(P),
+    {term, 'A'} = get_term(P),
+    {term, 'abc'} = get_term(P),
+    {term, 'Abc'} = get_term(P),
+    {term, 'ab@c'} = get_term(P),
+    {term, 'The rain in Spain stays mainly in the plains'} = get_term(P),
+
+    {term, a} = get_term(P),
+    {term, ab} = get_term(P),
+    {term, abc} = get_term(P),
+    {term, ab@c} = get_term(P),
+    {term, '   abcdefghijklmnopq   '} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various tuples
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
-    ?line P = runner:start(?tuples),
-
-    ?line {term, {}} = get_term(P),
-    ?line {term, {a}} = get_term(P),
-    ?line {term, {a, b}} = get_term(P),
-    ?line {term, {a, b, c}} = get_term(P),
-    ?line {term, {1}} = get_term(P),
-    ?line {term, {[]}} = get_term(P),
-    ?line {term, {[], []}} = get_term(P),
-    ?line {term, {[], a, b, c}} = get_term(P),
-    ?line {term, {[], a, [], b, c}} = get_term(P),
-    ?line {term, {[], a, '', b, c}} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?tuples),
+
+    {term, {}} = get_term(P),
+    {term, {a}} = get_term(P),
+    {term, {a, b}} = get_term(P),
+    {term, {a, b, c}} = get_term(P),
+    {term, {1}} = get_term(P),
+    {term, {[]}} = get_term(P),
+    {term, {[], []}} = get_term(P),
+    {term, {[], a, b, c}} = get_term(P),
+    {term, {[], a, [], b, c}} = get_term(P),
+    {term, {[], a, '', b, c}} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various lists
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
-    ?line P = runner:start(?lists),
-
-    ?line {term, []} = get_term(P),
-    ?line {term, [a]} = get_term(P),
-    ?line {term, [a, b]} = get_term(P),
-    ?line {term, [a, b, c]} = get_term(P),
-    ?line {term, [1]} = get_term(P),
-    ?line {term, [[]]} = get_term(P),
-    ?line {term, [[], []]} = get_term(P),
-    ?line {term, [[], a, b, c]} = get_term(P),
-    ?line {term, [[], a, [], b, c]} = get_term(P),
-    ?line {term, [[], a, '', b, c]} = get_term(P),
-
-    ?line {term, [{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]} = 
-	get_term(P),
+    P = runner:start(?lists),
+
+    {term, []} = get_term(P),
+    {term, [a]} = get_term(P),
+    {term, [a, b]} = get_term(P),
+    {term, [a, b, c]} = get_term(P),
+    {term, [1]} = get_term(P),
+    {term, [[]]} = get_term(P),
+    {term, [[], []]} = get_term(P),
+    {term, [[], a, b, c]} = get_term(P),
+    {term, [[], a, [], b, c]} = get_term(P),
+    {term, [[], a, '', b, c]} = get_term(P),
+
+    {term, [{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]} = get_term(P),
     case os:type() of
-	vxworks ->
-	    ?line {term, [{pi, _}, {'cos(70)', _}]} = get_term(P),
-	    ?line {term, [[pi, _], ['cos(70)', _]]} = get_term(P),
-	    ?line {term, [[pi, _], [], ["cos(70)", _]]} = 
-		get_term(P);
-	_ ->
-	    ?line {term, [{pi, 3.1415}, {'cos(70)', 0.34202}]} = get_term(P),
-	    ?line {term, [[pi, 3.1415], ['cos(70)', 0.34202]]} = get_term(P),
-	    ?line {term, [[pi, 3.1415], [], ["cos(70)", 0.34202]]} = 
-		get_term(P)
+        vxworks ->
+            {term, [{pi, _}, {'cos(70)', _}]} = get_term(P),
+            {term, [[pi, _], ['cos(70)', _]]} = get_term(P),
+            {term, [[pi, _], [], ["cos(70)", _]]} = get_term(P);
+        _ ->
+            {term, [{pi, 3.1415}, {'cos(70)', 0.34202}]} = get_term(P),
+            {term, [[pi, 3.1415], ['cos(70)', 0.34202]]} = get_term(P),
+            {term, [[pi, 3.1415], [], ["cos(70)", 0.34202]]} = get_term(P)
     end,
 
-    ?line {term, [-1]} = get_term(P),
+    {term, [-1]} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
-
-
-
diff --git a/lib/erl_interface/test/erl_format_SUITE_data/Makefile.first b/lib/erl_interface/test/erl_format_SUITE_data/Makefile.first
index 2cd313a324..acbb8c98bb 100644
--- a/lib/erl_interface/test/erl_format_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/erl_format_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2009. All Rights Reserved.
+# Copyright Ericsson AB 2000-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/erl_format_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_format_SUITE_data/Makefile.src
index 0cd1ab512d..2ba59ab651 100644
--- a/lib/erl_interface/test/erl_format_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_format_SUITE_data/Makefile.src
@@ -1,30 +1,30 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_format_SUITE_data/format_test.c b/lib/erl_interface/test/erl_format_SUITE_data/format_test.c
index 75e73b6df5..258ae92e0f 100644
--- a/lib/erl_interface/test/erl_format_SUITE_data/format_test.c
+++ b/lib/erl_interface/test/erl_format_SUITE_data/format_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/erl_global_SUITE.erl b/lib/erl_interface/test/erl_global_SUITE.erl
index a27cb0664c..ecc6753c7f 100644
--- a/lib/erl_interface/test/erl_global_SUITE.erl
+++ b/lib/erl_interface/test/erl_global_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -20,12 +21,12 @@
 %%
 -module(erl_global_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_global_SUITE_data/erl_global_test_cases.hrl").
 
--export([all/0,suite/0,init_per_suite/1,end_per_suite/1,
-	 init_per_testcase/2,end_per_testcase/2,
-	 erl_global_registration/1, erl_global_whereis/1, erl_global_names/1]).
+-export([all/0,suite/0,
+         erl_global_registration/1,
+         erl_global_whereis/1, erl_global_names/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
@@ -34,62 +35,50 @@
 all() ->
     [erl_global_registration, erl_global_whereis, erl_global_names].
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(0.25)),
-    [{watchdog, Dog}|Config].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
 
 erl_global_registration(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
+    P = runner:start(?interpret),
+    {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
 
-    ?line ok = erl_global_register(P, Fd, ?GLOBAL_NAME),
-    ?line ok = erl_global_unregister(P, Fd, ?GLOBAL_NAME),
+    ok = erl_global_register(P, Fd, ?GLOBAL_NAME),
+    ok = erl_global_unregister(P, Fd, ?GLOBAL_NAME),
 
-    ?line 0 = erl_close_connection(P,Fd),
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    0 = erl_close_connection(P,Fd),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 erl_global_whereis(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
-
-    ?line Self = self(),
-    ?line yes = global:register_name(?GLOBAL_NAME, Self),
-    ?line Self = erl_global_whereis(P, Fd, ?GLOBAL_NAME),
-    ?line global:unregister_name(?GLOBAL_NAME),
-    ?line 0 = erl_close_connection(P, Fd),
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    P = runner:start(?interpret),
+    {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
+
+    Self = self(),
+    yes = global:register_name(?GLOBAL_NAME, Self),
+    Self = erl_global_whereis(P, Fd, ?GLOBAL_NAME),
+    global:unregister_name(?GLOBAL_NAME),
+    0 = erl_close_connection(P, Fd),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 erl_global_names(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
-
-    ?line Self = self(),
-    ?line global:register_name(?GLOBAL_NAME, Self),
-    ?line {Names1, _N1} = erl_global_names(P, Fd),
-    ?line true = lists:member(atom_to_list(?GLOBAL_NAME), Names1),
-    ?line global:unregister_name(?GLOBAL_NAME),
-    ?line {Names2, _N2} = erl_global_names(P, Fd),
-    ?line false = lists:member(atom_to_list(?GLOBAL_NAME), Names2),
-    ?line 0 = erl_close_connection(P, Fd),
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    P = runner:start(?interpret),
+    {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
+
+    Self = self(),
+    global:register_name(?GLOBAL_NAME, Self),
+    {Names1, _N1} = erl_global_names(P, Fd),
+    true = lists:member(atom_to_list(?GLOBAL_NAME), Names1),
+    global:unregister_name(?GLOBAL_NAME),
+    {Names2, _N2} = erl_global_names(P, Fd),
+    false = lists:member(atom_to_list(?GLOBAL_NAME), Names2),
+    0 = erl_close_connection(P, Fd),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 %%% Interface functions for erl_interface functions.
@@ -97,14 +86,14 @@ erl_global_names(Config) when is_list(Config) ->
 erl_connect(P, Node, Num, Cookie, Creation) ->
     send_command(P, erl_connect, [Num, Node, Cookie, Creation]),
     case get_term(P) of
-	{term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
-	{term,{-1,Errno}} -> {error,Errno}
+        {term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
+        {term,{-1,Errno}} -> {error,Errno}
     end.
 
 erl_close_connection(P, FD) ->
     send_command(P, erl_close_connection, [FD]),
     case get_term(P) of
-	{term,Int} when is_integer(Int) -> Int
+        {term,Int} when is_integer(Int) -> Int
     end.
 
 erl_global_register(P, Fd, Name) ->
@@ -114,15 +103,15 @@ erl_global_register(P, Fd, Name) ->
 erl_global_whereis(P, Fd, Name) ->
     send_command(P, erl_global_whereis, [Fd,Name]),
     case get_term(P) of
-	{term, What} ->
-	    What
+        {term, What} ->
+            What
     end.
 
 erl_global_names(P, Fd) ->
     send_command(P, erl_global_names, [Fd]),
     case get_term(P) of
-	{term, What} ->
-	    What
+        {term, What} ->
+            What
     end.
 
 erl_global_unregister(P, Fd, Name) ->
@@ -131,11 +120,11 @@ erl_global_unregister(P, Fd, Name) ->
 
 get_send_result(P) ->
     case get_term(P) of
-	{term,{1,_}} -> ok;
-	{term,{0, 0}} -> ok;
-	{term,{-1, Errno}} -> {error,Errno};
-	{term,{_,_}}->
-	    ?t:fail(bad_return_value)
+        {term,{1,_}} -> ok;
+        {term,{0, 0}} -> ok;
+        {term,{-1, Errno}} -> {error,Errno};
+        {term,{_,_}}->
+            ct:fail(bad_return_value)
     end.
 
 send_command(P, Name, Args) ->
diff --git a/lib/erl_interface/test/erl_global_SUITE_data/Makefile.first b/lib/erl_interface/test/erl_global_SUITE_data/Makefile.first
index 8e3fcb924e..b2c62be1f2 100644
--- a/lib/erl_interface/test/erl_global_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/erl_global_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2001-2010. All Rights Reserved.
+# Copyright Ericsson AB 2001-2016. All Rights Reserved.
 #
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/erl_global_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_global_SUITE_data/Makefile.src
index ef846bc440..1c1530d1b6 100644
--- a/lib/erl_interface/test/erl_global_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_global_SUITE_data/Makefile.src
@@ -1,30 +1,30 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2000-2010. All Rights Reserved.
+# Copyright Ericsson AB 2000-2016. All Rights Reserved.
 #
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_global_SUITE_data/erl_global_test.c b/lib/erl_interface/test/erl_global_SUITE_data/erl_global_test.c
index dc0d8a0091..0f08727225 100644
--- a/lib/erl_interface/test/erl_global_SUITE_data/erl_global_test.c
+++ b/lib/erl_interface/test/erl_global_SUITE_data/erl_global_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2000-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2000-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/erl_interface_smoke.spec b/lib/erl_interface/test/erl_interface_smoke.spec
new file mode 100644
index 0000000000..bfaea2b279
--- /dev/null
+++ b/lib/erl_interface/test/erl_interface_smoke.spec
@@ -0,0 +1 @@
+{suites,"../erl_interface_test",[ei_decode_encode_SUITE]}.
diff --git a/lib/erl_interface/test/erl_match_SUITE.erl b/lib/erl_interface/test/erl_match_SUITE.erl
index 2cf4fafe82..5566714092 100644
--- a/lib/erl_interface/test/erl_match_SUITE.erl
+++ b/lib/erl_interface/test/erl_match_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -20,249 +21,221 @@
 %%
 -module(erl_match_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_match_SUITE_data/match_test_cases.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 atoms/1, lists/1, tuples/1, references/1, pids/1, ports/1,
-	 bind/1, integers/1, floats/1, binaries/1, strings/1]).
+-export([all/0, suite/0,
+         atoms/1, lists/1, tuples/1, references/1, pids/1, ports/1,
+         bind/1, integers/1, floats/1, binaries/1, strings/1]).
 
 %% For interactive running of matcher.
 -export([start_matcher/1, erl_match/3]).
 
 %% This test suite tests the erl_match() function.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [atoms, lists, tuples, references, pids, ports, bind,
      integers, floats, binaries, strings].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
 
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
+    P = start_matcher(Config),
 
-    ?line eq(P, '', ''),
-    ?line eq(P, a, a),
-    ?line ne(P, a, b),
-    ?line ne(P, a, aa),
-    ?line eq(P, kalle, kalle),
-    ?line ne(P, kalle, arne),
+    eq(P, '', ''),
+    eq(P, a, a),
+    ne(P, a, b),
+    ne(P, a, aa),
+    eq(P, kalle, kalle),
+    ne(P, kalle, arne),
 
-    ?line ne(P, kalle, 42),
-    ?line ne(P, 42, kalle),
+    ne(P, kalle, 42),
+    ne(P, 42, kalle),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line eq(P, [], []),
+    P = start_matcher(Config),
+    eq(P, [], []),
 
-    ?line ne(P, [], [a]),
-    ?line ne(P, [a], []),
+    ne(P, [], [a]),
+    ne(P, [a], []),
 
-    ?line eq(P, [a], [a]),
-    ?line ne(P, [a], [b]),
+    eq(P, [a], [a]),
+    ne(P, [a], [b]),
 
-    ?line eq(P, [a|b], [a|b]),
-    ?line ne(P, [a|b], [a|x]),
+    eq(P, [a|b], [a|b]),
+    ne(P, [a|b], [a|x]),
 
-    ?line eq(P, [a, b], [a, b]),
-    ?line ne(P, [a, b], [a, x]),
+    eq(P, [a, b], [a, b]),
+    ne(P, [a, b], [a, x]),
 
-    ?line eq(P, [a, b, c], [a, b, c]),
-    ?line ne(P, [a, b|c], [a, b|x]),
-    ?line ne(P, [a, b, c], [a, b, x]),
-    ?line ne(P, [a, b|c], [a, b|x]),
-    ?line ne(P, [a, x|c], [a, b|c]),
-    ?line ne(P, [a, b, c], [a, x, c]),
+    eq(P, [a, b, c], [a, b, c]),
+    ne(P, [a, b|c], [a, b|x]),
+    ne(P, [a, b, c], [a, b, x]),
+    ne(P, [a, b|c], [a, b|x]),
+    ne(P, [a, x|c], [a, b|c]),
+    ne(P, [a, b, c], [a, x, c]),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
+    P = start_matcher(Config),
 
-    ?line ne(P, {}, {a, b}),
-    ?line ne(P, {a, b}, {}),
-    ?line ne(P, {a}, {a, b}),
-    ?line ne(P, {a, b}, {a}),
+    ne(P, {}, {a, b}),
+    ne(P, {a, b}, {}),
+    ne(P, {a}, {a, b}),
+    ne(P, {a, b}, {a}),
 
-    ?line eq(P, {}, {}),
+    eq(P, {}, {}),
 
-    ?line eq(P, {a}, {a}),
-    ?line ne(P, {a}, {b}),
+    eq(P, {a}, {a}),
+    ne(P, {a}, {b}),
 
-    ?line eq(P, {1}, {1}),
-    ?line ne(P, {1}, {2}),
+    eq(P, {1}, {1}),
+    ne(P, {1}, {2}),
 
-    ?line eq(P, {a, b}, {a, b}),
-    ?line ne(P, {x, b}, {a, b}),
+    eq(P, {a, b}, {a, b}),
+    ne(P, {x, b}, {a, b}),
 
-    ?line ne(P, {error, x}, {error, y}),
-    ?line ne(P, {error, {undefined, {subscriber, last}}},
-	     {error, {undefined, {subscriber, name}}}),
+    ne(P, {error, x}, {error, y}),
+    ne(P, {error, {undefined, {subscriber, last}}},
+       {error, {undefined, {subscriber, name}}}),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
 
-references(suite) -> [];
 references(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line Ref1 = make_ref(),
-    ?line Ref2 = make_ref(),
-    
-    ?line eq(P, Ref1, Ref1),
-    ?line eq(P, Ref2, Ref2),
-    ?line ne(P, Ref1, Ref2),
-    ?line ne(P, Ref2, Ref1),
-
-    ?line runner:finish(P),
+    P = start_matcher(Config),
+    Ref1 = make_ref(),
+    Ref2 = make_ref(),
+
+    eq(P, Ref1, Ref1),
+    eq(P, Ref2, Ref2),
+    ne(P, Ref1, Ref2),
+    ne(P, Ref2, Ref1),
+
+    runner:finish(P),
     ok.
 
 
-pids(suite) -> [];
 pids(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line Pid1 = c:pid(0,1,2),
-    ?line Pid2 = c:pid(0,1,3),
-    
-    ?line eq(P, self(), self()),
-    ?line eq(P, Pid1, Pid1),
-    ?line ne(P, Pid1, self()),
-    ?line ne(P, Pid2, Pid1),
-
-    ?line runner:finish(P),
+    P = start_matcher(Config),
+    Pid1 = c:pid(0,1,2),
+    Pid2 = c:pid(0,1,3),
+
+    eq(P, self(), self()),
+    eq(P, Pid1, Pid1),
+    ne(P, Pid1, self()),
+    ne(P, Pid2, Pid1),
+
+    runner:finish(P),
     ok.
 
 
-ports(suite) -> [];
 ports(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skipped,"not on vxworks, pucko"};
-	_ ->
-	    ?line P = start_matcher(Config),
-	    ?line P2 = start_matcher(Config),
-    
-	    ?line eq(P, P, P),
-	    ?line ne(P, P, P2),
-
-	    ?line runner:finish(P),
-	    ?line runner:finish(P2),
-	    ok
+        vxworks ->
+            {skipped,"not on vxworks, pucko"};
+        _ ->
+            P = start_matcher(Config),
+            P2 = start_matcher(Config),
+
+            eq(P, P, P),
+            ne(P, P, P2),
+
+            runner:finish(P),
+            runner:finish(P2),
+            ok
     end.
 
-integers(suite) -> [];
 integers(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line I1 = 123,
-    ?line I2 = 12345,
-    ?line I3 = -123,
-    ?line I4 = 2234,
-    
-    ?line eq(P, I1, I1),
-    ?line eq(P, I2, I2),
-    ?line ne(P, I1, I2),
-    ?line ne(P, I1, I3),
-    ?line eq(P, I4, I4),
-
-    ?line runner:finish(P),
+    P = start_matcher(Config),
+    I1 = 123,
+    I2 = 12345,
+    I3 = -123,
+    I4 = 2234,
+
+    eq(P, I1, I1),
+    eq(P, I2, I2),
+    ne(P, I1, I2),
+    ne(P, I1, I3),
+    eq(P, I4, I4),
+
+    runner:finish(P),
     ok.
 
 
 
-floats(suite) -> [];
 floats(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line F1 = 3.1414,
-    ?line F2 = 3.1415,
-    ?line F3 = 3.1416,
-
-    ?line S1 = "string",
-    ?line S2 = "string2",
-    
-    ?line eq(P, F1, F1),
-    ?line eq(P, F2, F2),
-    ?line ne(P, F1, F2),
-    ?line ne(P, F3, F2),
-
-    ?line eq(P, S2, S2),
-    ?line ne(P, S1, S2),
-
-    ?line runner:finish(P),
+    P = start_matcher(Config),
+    F1 = 3.1414,
+    F2 = 3.1415,
+    F3 = 3.1416,
+
+    S1 = "string",
+    S2 = "string2",
+
+    eq(P, F1, F1),
+    eq(P, F2, F2),
+    ne(P, F1, F2),
+    ne(P, F3, F2),
+
+    eq(P, S2, S2),
+    ne(P, S1, S2),
+
+    runner:finish(P),
     ok.
 
 
 
-binaries(suite) -> [];
 binaries(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line Bin1 = term_to_binary({kalle, 146015, {kungsgatan, 23}}),
-    ?line Bin2 = term_to_binary(sune),
-    ?line Bin3 = list_to_binary("sune"),
-    
-    ?line eq(P, Bin1, Bin1),
-    ?line eq(P, Bin2, Bin2),
-    ?line eq(P, Bin3, Bin3),
-    ?line ne(P, Bin1, Bin2),
-    ?line ne(P, Bin1, Bin3),
-    ?line ne(P, Bin2, Bin3),
-
-    ?line runner:finish(P),
+    P = start_matcher(Config),
+    Bin1 = term_to_binary({kalle, 146015, {kungsgatan, 23}}),
+    Bin2 = term_to_binary(sune),
+    Bin3 = list_to_binary("sune"),
+
+    eq(P, Bin1, Bin1),
+    eq(P, Bin2, Bin2),
+    eq(P, Bin3, Bin3),
+    ne(P, Bin1, Bin2),
+    ne(P, Bin1, Bin3),
+    ne(P, Bin2, Bin3),
+
+    runner:finish(P),
     ok.
 
 
-
-strings(suite) -> [];
 strings(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
+    P = start_matcher(Config),
 
-    ?line S1 = "string",
-    ?line S2 = "streng",
-    ?line S3 = "String",
-    
-    ?line eq(P, S1, S1),
-    ?line ne(P, S1, S2),
-    ?line ne(P, S1, S3),
+    S1 = "string",
+    S2 = "streng",
+    S3 = "String",
 
-    ?line runner:finish(P),
-    ok.
+    eq(P, S1, S1),
+    ne(P, S1, S2),
+    ne(P, S1, S3),
 
+    runner:finish(P),
+    ok.
 
 
-bind(suite) -> [];
 bind(Config) when is_list(Config) ->
-    ?line P = start_bind(Config),
-    ?line S = "[X,Y,Z]",
-    ?line L1 = [301,302,302],
-    ?line L2 = [65,66,67],
-        
-    ?line bind_ok(P, S, L1),
-    ?line bind_ok(P, S, L2),
-
-    ?line runner:finish(P),
+    P = start_bind(Config),
+    S = "[X,Y,Z]",
+    L1 = [301,302,302],
+    L2 = [65,66,67],
+
+    bind_ok(P, S, L1),
+    bind_ok(P, S, L2),
+
+    runner:finish(P),
     ok.
 
 start_bind(Config) ->
@@ -278,15 +251,12 @@ erl_bind(Port, Pattern, Term) ->
     Port ! {self(), {command, [$b, Pattern, 0]}},
     runner:send_term(Port, Term),
     case runner:get_term(Port) of
-	{term, 0} -> false;
-	{term, 1} -> true
+        {term, 0} -> false;
+        {term, 1} -> true
     end.
 
 
 
-
-
-
 start_matcher(Config) ->
     runner:start(?erl_match_server).
 
@@ -302,8 +272,6 @@ erl_match(Port, Pattern, Term) ->
     runner:send_term(Port, Pattern),
     runner:send_term(Port, Term),
     case runner:get_term(Port) of
-	{term, 0} -> false;
-	{term, 1} -> true
+        {term, 0} -> false;
+        {term, 1} -> true
     end.
-
-
diff --git a/lib/erl_interface/test/erl_match_SUITE_data/Makefile.first b/lib/erl_interface/test/erl_match_SUITE_data/Makefile.first
index 12141d210c..459b5c14c2 100644
--- a/lib/erl_interface/test/erl_match_SUITE_data/Makefile.first
+++ b/lib/erl_interface/test/erl_match_SUITE_data/Makefile.first
@@ -1,18 +1,19 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2009. All Rights Reserved.
+# Copyright Ericsson AB 2000-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
diff --git a/lib/erl_interface/test/erl_match_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_match_SUITE_data/Makefile.src
index 8ce6c9c985..156214a269 100644
--- a/lib/erl_interface/test/erl_match_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_match_SUITE_data/Makefile.src
@@ -1,30 +1,30 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_match_SUITE_data/match_test.c b/lib/erl_interface/test/erl_match_SUITE_data/match_test.c
index 153a528b0b..d577417f5b 100644
--- a/lib/erl_interface/test/erl_match_SUITE_data/match_test.c
+++ b/lib/erl_interface/test/erl_match_SUITE_data/match_test.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/port_call_SUITE.erl b/lib/erl_interface/test/port_call_SUITE.erl
index 1ce5b0b748..fb10bd895f 100644
--- a/lib/erl_interface/test/port_call_SUITE.erl
+++ b/lib/erl_interface/test/port_call_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -31,96 +32,78 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, basic/1]).
-% Private exports
--include_lib("test_server/include/test_server.hrl").
+-export([all/0, suite/0, basic/1]).
 
+% Private exports
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 10}}].
 
 all() -> 
-[basic].
-
-groups() -> 
-    [].
+    [basic].
 
-init_per_suite(Config) ->
-    Config.
 
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-basic(suite) -> [];
 basic(Config) when is_list(Config) ->
     case os:type() of
-	{unix, linux} ->
-	    do_basic(Config);
-	{unix, sunos} ->
-	    do_basic(Config);
-	{win32,_} ->
-	    do_basic(Config);
-	_ ->
-	    {skipped, "Dynamic linking and erl_interface not fully examined"
-	     " on this platform..."}	    
+        {unix, linux} ->
+            do_basic(Config);
+        {unix, sunos} ->
+            do_basic(Config);
+        {win32,_} ->
+            do_basic(Config);
+        _ ->
+            {skipped, "Dynamic linking and erl_interface not fully examined"
+                      " on this platform..."}
     end.
 
 do_basic(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
 
-    ?line erl_ddll:start(),
+    erl_ddll:start(),
 
     %% Load the echo driver and verify that it was loaded.
     {ok,L1,L2}=load_port_call_driver(Path),
 
     %% Verify that the driver works.
 
-    ?line Port = open_port({spawn, port_call_drv}, [eof]),
-    ?line {hej, "hopp",4711,123445567436543653} = 
-	erlang:port_call(Port,{hej, "hopp",4711,123445567436543653}),
-    ?line {hej, "hopp",4711,123445567436543653} = 
-	erlang:port_call(Port,0,{hej, "hopp",4711,123445567436543653}),
-    ?line {[], a, [], b, c} = 
-	erlang:port_call(Port,1,{hej, "hopp",4711,123445567436543653}),
-    ?line {return, {[], a, [], b, c}} = 
-	erlang:port_call(Port,2,{[], a, [], b, c}),
-    ?line List = lists:duplicate(200,5),
-    ?line {return, List} = erlang:port_call(Port,2,List),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:port_call(Port,4711,[])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:port_call(sune,2,[])),
-    ?line register(gunnar,Port),
-    ?line {return, List} = erlang:port_call(gunnar,2,List),
-    ?line {return, a} = erlang:port_call(gunnar,2,a),
-    ?line erlang:port_close(Port),
+    Port = open_port({spawn, port_call_drv}, [eof]),
+    {hej, "hopp",4711,123445567436543653} =
+        erlang:port_call(Port,{hej, "hopp",4711,123445567436543653}),
+    {hej, "hopp",4711,123445567436543653} =
+        erlang:port_call(Port,0,{hej, "hopp",4711,123445567436543653}),
+    {[], a, [], b, c} =
+        erlang:port_call(Port,1,{hej, "hopp",4711,123445567436543653}),
+    {return, {[], a, [], b, c}} =
+        erlang:port_call(Port,2,{[], a, [], b, c}),
+    List = lists:duplicate(200,5),
+    {return, List} = erlang:port_call(Port,2,List),
+    {'EXIT',{badarg,_}} = (catch erlang:port_call(Port,4711,[])),
+    {'EXIT',{badarg,_}} = (catch erlang:port_call(sune,2,[])),
+    register(gunnar,Port),
+    {return, List} = erlang:port_call(gunnar,2,List),
+    {return, a} = erlang:port_call(gunnar,2,a),
+    erlang:port_close(Port),
     %% Unload the driver and verify that it was unloaded.
     ok=unload_port_call_driver(L1,L2),
 
-    ?line {error, {already_started, _}} = erl_ddll:start(),
-    ?line ok = erl_ddll:stop(),
-
-    ?line test_server:timetrap_cancel(Dog),
+    {error, {already_started, _}} = erl_ddll:start(),
+    ok = erl_ddll:stop(),
     ok.
 
 load_port_call_driver(Path) ->
-    ?line {ok, L1} = erl_ddll:loaded_drivers(),
-    ?line ok = erl_ddll:load_driver(Path, port_call_drv),
-    ?line {ok, L2} = erl_ddll:loaded_drivers(),
-    ?line ["port_call_drv"] = ordsets:to_list(ordsets:subtract(ordsets:from_list(L2), 
-							       ordsets:from_list(L1))),
+    {ok, L1} = erl_ddll:loaded_drivers(),
+    ok = erl_ddll:load_driver(Path, port_call_drv),
+    {ok, L2} = erl_ddll:loaded_drivers(),
+    ["port_call_drv"] = ordsets:to_list(ordsets:subtract(ordsets:from_list(L2),
+                                                         ordsets:from_list(L1))),
     {ok,L1,L2}.
 
 unload_port_call_driver(L1,L2) ->
-    ?line {ok, L2} = erl_ddll:loaded_drivers(),
-    ?line ok = erl_ddll:unload_driver(port_call_drv),
-    ?line {ok, L3} = erl_ddll:loaded_drivers(),
-    ?line [] = ordsets:to_list(ordsets:subtract(ordsets:from_list(L3),
-						ordsets:from_list(L1))),
+    {ok, L2} = erl_ddll:loaded_drivers(),
+    ok = erl_ddll:unload_driver(port_call_drv),
+    {ok, L3} = erl_ddll:loaded_drivers(),
+    [] = ordsets:to_list(ordsets:subtract(ordsets:from_list(L3),
+                                          ordsets:from_list(L1))),
     ok.
-
diff --git a/lib/erl_interface/test/port_call_SUITE_data/Makefile.src b/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
index a512494aa3..0f97ce9f70 100644
--- a/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
@@ -1,30 +1,30 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2011. All Rights Reserved.
+# Copyright Ericsson AB 2001-2016. All Rights Reserved.
 # 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 # 
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib_drv@
-LIBEI = $(LIBPATH)/@erl_interface_eilib_drv@
+LIBERL = @erl_interface_lib_drv@
+LIBEI = @erl_interface_eilib_drv@
 
 SHLIB_EXTRA_LDLIBS = $(LIBERL) $(LIBEI) @erl_interface_threadlib@
 SHLIB_EXTRA_CFLAGS = -I@erl_interface_include@ -I../all_SUITE_data
diff --git a/lib/erl_interface/test/port_call_SUITE_data/port_call_drv.c b/lib/erl_interface/test/port_call_SUITE_data/port_call_drv.c
index abc76085de..4617cb0316 100644
--- a/lib/erl_interface/test/port_call_SUITE_data/port_call_drv.c
+++ b/lib/erl_interface/test/port_call_SUITE_data/port_call_drv.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2011. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
diff --git a/lib/erl_interface/test/runner.erl b/lib/erl_interface/test/runner.erl
index e41440708a..1084eec2a3 100644
--- a/lib/erl_interface/test/runner.erl
+++ b/lib/erl_interface/test/runner.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -24,7 +25,7 @@
 	 start/1, send_term/2, finish/1, send_eot/1, recv_eot/1,
 	 get_term/1, get_term/2]).
 
--define(default_timeout, test_server:seconds(5)).
+-define(default_timeout, 5000).
 
 %% Executes a test case in a C program.
 %%
@@ -44,7 +45,7 @@ test(Tc, Timeout) ->
 	    io:format("In this test case, a success/failure result was"),
 	    io:format("expected from the C program.\n"),
 	    io:format("Received: ~p", [Other]),
-	    test_server:fail()
+	    ct:fail(badresult)
     end.
 
 %% Executes a test case in a C program.  Returns the port.
@@ -54,7 +55,7 @@ test(Tc, Timeout) ->
 %% Returns: {ok, Port}
 
 start({Prog, Tc}) when is_list(Prog), is_integer(Tc) ->
-    Port = open_port({spawn, Prog}, [{packet, 4}]),
+    Port = open_port({spawn, Prog}, [{packet, 4}, exit_status]),
     Command = [Tc div 256, Tc rem 256],
     Port ! {self(), {command, Command}},
     Port.
@@ -79,7 +80,7 @@ send_eot(Port) when is_port(Port) ->
     Port ! {self(), {command, [$e]}}.
 
 %% Waits for an 'eot' indication from the C program.
-%% Either returns 'ok' or invokes test_server:fail().
+%% Either returns 'ok' or invokes ct:fail(badresult).
 
 recv_eot(Port) when is_port(Port) ->    
     case get_term(Port) of
@@ -89,12 +90,12 @@ recv_eot(Port) when is_port(Port) ->
 	    io:format("Error finishing test case.  Expected eof from"),
 	    io:format("C program, but got:"),
 	    io:format("~p", [Other]),
-	    test_server:fail()
+	    ct:fail(badresult)
     end.
 
 %% Reads a term from the C program.
 %%
-%% Returns: {term, Term}|eot|'NULL' or calls test_server:fail/1,2.
+%% Returns: {term, Term}|eot|'NULL' or calls ct:fail/1,2.
 
 get_term(Port) ->
     get_term(Port, ?default_timeout).
@@ -104,9 +105,9 @@ get_term(Port, Timeout) ->
 	[$b|Bytes] ->
 	    {bytes, Bytes};
 	[$f] ->
-	    test_server:fail();
+	    ct:fail(failure);
 	[$f|Reason] ->
-	    test_server:fail(Reason);
+	    ct:fail(Reason);
 	[$t|Term] ->
 	    {term, binary_to_term(list_to_binary(Term))};
 	[$N] ->
@@ -118,13 +119,15 @@ get_term(Port, Timeout) ->
 	    get_term(Port, Timeout);
 	Other ->
 	    io:format("Garbage received from C program: ~p", [Other]),
-	    test_server:fail("Illegal response from C program")
+	    ct:fail("Illegal response from C program")
     end.
 
 get_reply(Port, Timeout) when is_port(Port) ->
     receive
 	{Port, {data, Reply}} ->
-	    Reply
+	    Reply;
+        Fail when element(1, Fail) == Port ->
+            ct:fail("Got unexpected message from port: ~p",[Fail])
     after Timeout ->
-	    test_server:fail("No response from C program")
+	    ct:fail("No response from C program")
     end.
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 6f08d380ca..33705d1e8b 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1 +1,2 @@
-EI_VSN = 3.7.13
+EI_VSN = 3.9
+ERL_INTERFACE_VSN = $(EI_VSN)