971 files changed, 36845 insertions, 41908 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 7f4c309da9..7e52d6e32e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -33,20 +33,6 @@ ifeq ($(findstring vxworks,$(TARGET)),vxworks)
 	cosFileTransfer cosEventDomain
   endif
 else
-  ifeq ($(findstring ose,$(TARGET)),ose)
-    ERTS_SUB_DIRECTORIES = stdlib sasl kernel compiler erl_interface
-    OTHER_SUB_DIRECTORIES =	\
-      snmp otp_mibs appmon tools
-#    OTHER_SUB_DIRECTORIES =	\
-#      appmon os_mon tools runtime_tools
-    ifdef BUILD_ALL
-      OTHER_SUB_DIRECTORIES += mnesia  \
-        inets pman tv observer
-#      OTHER_SUB_DIRECTORIES += mnesia ic asn1 debugger \
-#        inets orber pman tv observer cosTransactions cosEvent \
-#        cosTime cosNotification cosProperty cosFileTransfer cosEventDomain
-    endif
-  else
 #
 # unix and win32
 # --------------
@@ -59,10 +45,11 @@ else
           snmp otp_mibs appmon erl_interface asn1 jinterface gs wx inets ic \
           mnesia crypto orber os_mon parsetools syntax_tools pman \
           public_key ssl toolbar tv observer debugger reltool odbc \
-          runtime_tools diameter \
+          diameter \
           cosTransactions cosEvent cosTime cosNotification cosProperty \
           cosFileTransfer cosEventDomain et megaco webtool \
-	  xmerl edoc eunit ssh inviso typer docbuilder erl_docgen common_test percept
+	  xmerl edoc eunit ssh inviso typer docbuilder erl_docgen \
+	  common_test percept dialyzer
 # dialyzer
         OTHER_SUB_DIRECTORIES += hipe
       else # BUILD_ALL on unix
@@ -70,32 +57,28 @@ else
           snmp otp_mibs appmon erl_interface asn1 jinterface wx debugger reltool gs inets \
           ic mnesia crypto orber os_mon parsetools syntax_tools \
           pman public_key ssl toolbar tv observer odbc \
-          runtime_tools diameter \
+          diameter \
           cosTransactions cosEvent cosTime cosNotification \
           cosProperty cosFileTransfer cosEventDomain et megaco webtool \
-	  xmerl edoc eunit ssh inviso typer docbuilder erl_docgen common_test percept
+	  xmerl edoc eunit ssh inviso typer docbuilder erl_docgen \
+	  common_test percept dialyzer
 # dialyzer
         OTHER_SUB_DIRECTORIES += hipe $(TSP_APP)
       endif
     endif
-  endif
 endif
 
 ifdef BOOTSTRAP
   SUB_DIRECTORIES = \
-    kernel stdlib compiler orber/include
+    kernel stdlib compiler
 else
   ifdef SECONDARY_BOOTSTRAP
     SUB_DIRECTORIES = hipe parsetools asn1/src
   else
     ifdef TERTIARY_BOOTSTRAP
-      SUB_DIRECTORIES = snmp
-    else
-      ifdef FOURTH_BOOTSTRAP
-        SUB_DIRECTORIES = sasl jinterface ic syntax_tools
-      else # Not bootstrap build
-        SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) $(OTHER_SUB_DIRECTORIES)
-      endif
+      SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools
+    else # Not bootstrap build
+      SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) $(OTHER_SUB_DIRECTORIES)
     endif
   endif
 endif
diff --git a/lib/appmon/doc/src/make.dep b/lib/appmon/doc/src/make.dep
deleted file mode 100644
index ce0d7571a3..0000000000
--- a/lib/appmon/doc/src/make.dep
+++ /dev/null
@@ -1,26 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: appmon.tex appmon_chapter.tex book.tex part.tex \
-		ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: app_win.ps listbox_win.ps main_win.ps pinfo_win.ps
-
diff --git a/lib/appmon/src/appmon_web.erl b/lib/appmon/src/appmon_web.erl
index fb7144246c..7c0451c3c3 100644
--- a/lib/appmon/src/appmon_web.erl
+++ b/lib/appmon/src/appmon_web.erl
@@ -578,9 +578,9 @@ htmlify_pid([],New)->
 %% the HTTP protocol                                                  %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 urlify_pid(Pid) ->
-    case regexp:first_match(Pid,"[<].*[>]") of
-	{match,Start,Len}->
-	    "%3C"++string:substr(Pid,Start+1,Len-2)++"%3E";
+    case re:run(Pid,"[<](.*)[>]",[{capture,all_but_first,list}]) of
+	{match,[PidStr]}->
+	    "%3C"++PidStr++"%3E";
 	_->
 	    Pid
     end.
diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
index 9e9cb18524..8c06be56f8 100644
--- a/lib/asn1/c_src/Makefile
+++ b/lib/asn1/c_src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2002-2010. All Rights Reserved.
+# Copyright Ericsson AB 2002-2011. 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
@@ -51,33 +51,26 @@ EI_LIBDIR = $(ERL_TOP)/lib/erl_interface/obj$(TYPEMARKER)/$(TARGET)
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-EI_INCLUDES = -I$(ERL_TOP)/lib/erl_interface/include
 CFLAGS = $(DED_INCLUDES) $(EI_INCLUDES) $(DED_CFLAGS)
 LDFLAGS += $(DED_LDFLAGS)
 
-LD_INCL_EI = -L$(EI_LIBDIR)
-
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
 
-C_FILES = asn1_erl_driver.c
+NIF_OBJ_FILES = $(OBJDIR)/asn1_erl_nif.o
 
 
 ifeq ($(TARGET),win32)
-LD_EI = -lei_md 
-SHARED_OBJ_FILES = $(LIBDIR)/asn1_erl_drv.dll
-OBJ_FILES = $(OBJDIR)/asn1_erl_drv.o
+NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.dll
 CLIB_FLAGS =
 LN=cp
 else
-LD_EI = -lei 
-OBJ_FILES = $(OBJDIR)/asn1_erl_drv.o
 ifeq ($(findstring vxworks,$(TARGET)),vxworks)
-SHARED_OBJ_FILES = $(LIBDIR)/asn1_erl_drv.eld
+NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.eld
 CLIB_FLAGS =
 else
-SHARED_OBJ_FILES = $(LIBDIR)/asn1_erl_drv.so
+NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.so
 CLIB_FLAGS = -lc
 endif
 LN= ln -s
@@ -87,7 +80,9 @@ endif
 # Targets
 # ----------------------------------------------------
 
-opt: $(OBJDIR) $(LIBDIR) $(SHARED_OBJ_FILES)
+_create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
+
+opt: $(NIF_SHARED_OBJ_FILE)
 
 debug: opt
 
@@ -103,20 +98,12 @@ docs:
 # ----------------------------------------------------
 
 
-$(OBJ_FILES): $(C_FILES)
-	$(CC) -c $(CFLAGS) -o $(OBJ_FILES) $(C_FILES) 
-
-$(SHARED_OBJ_FILES): $(OBJ_FILES)
-	$(LD) $(LDFLAGS) $(LD_INCL_EI) -o $(SHARED_OBJ_FILES) $(OBJ_FILES) $(LD_EI) $(CLIB_FLAGS) $(LIBS) 
-
-$(LIBDIR):
-	-mkdir -p $(LIBDIR)
-
-$(OBJDIR):
-	-mkdir -p $(OBJDIR)
+$(OBJDIR)/%.o: %.c
+	$(CC) -c $(CFLAGS) -O3 -o $@ $<
 
+$(NIF_SHARED_OBJ_FILE): $(NIF_OBJ_FILES)
+	$(LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LIBS)
 
- 
 # ----------------------------------------------------
 # Release Target
 # ----------------------------------------------------
@@ -124,9 +111,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/priv/lib
-	$(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib
+	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) $(RELSYSDIR)/priv/lib
 	$(INSTALL_DIR) $(RELSYSDIR)/c_src
-	$(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src
+	$(INSTALL_DATA) *.c $(RELSYSDIR)/c_src
 
 release_docs_spec:
 
diff --git a/lib/asn1/c_src/asn1_erl_driver.c b/lib/asn1/c_src/asn1_erl_driver.c
deleted file mode 100644
index 18d4157941..0000000000
--- a/lib/asn1/c_src/asn1_erl_driver.c
+++ /dev/null
@@ -1,1677 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2002-2011. 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.
- *
- * %CopyrightEnd%
- *
- */
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "erl_driver.h"
-#include "ei.h"
-
-
-/* #define ASN1_DEBUG 1 */
-
-#define ASN1_OK 0
-#define ASN1_ERROR -1
-#define ASN1_COMPL_ERROR 1
-#define ASN1_MEMORY_ERROR 0
-#define ASN1_DECODE_ERROR 2
-#define ASN1_TAG_ERROR -3
-#define ASN1_LEN_ERROR -4
-#define ASN1_INDEF_LEN_ERROR -5
-#define ASN1_VALUE_ERROR -6
-
-
-#define ASN1_CLASS 0xc0
-#define ASN1_FORM 0x20
-#define ASN1_CLASSFORM (ASN1_CLASS | ASN1_FORM)
-#define ASN1_TAG 0x1f
-#define ASN1_LONG_TAG 0x7f
-
-#define ASN1_INDEFINITE_LENGTH 0x80
-#define ASN1_SHORT_DEFINITE_LENGTH 0
-
-#define ASN1_PRIMITIVE 0
-#define ASN1_CONSTRUCTED 0x20
-
-#define ASN1_COMPLETE 1
-#define ASN1_BER_TLV_DECODE 2
-#define ASN1_BER_TLV_PARTIAL_DECODE 3
-
-#define ASN1_NOVALUE 0
-
-#define ASN1_SKIPPED 0
-#define ASN1_OPTIONAL 1
-#define ASN1_CHOOSEN 2
-
-
-#define CEIL(X,Y) ((X-1) / Y + 1)
-
-#define INVMASK(X,M) (X & (M ^ 0xff))
-#define MASK(X,M) (X & M)
-
-typedef struct {
-  ErlDrvPort port;
-  int buffer_size;
-} asn1_data;
-
-/* int min_alloc_bytes; */
-
-
-static ErlDrvData asn1_drv_start(ErlDrvPort, char *);
-
-static void asn1_drv_stop(ErlDrvData);
-
-int asn1_drv_control(ErlDrvData, unsigned int, char *, int, char **, int);
-
-int complete(ErlDrvBinary **,unsigned char *,unsigned char *, int);
-
-int insert_octets(int, unsigned char **, unsigned char **, int *);
-
-int insert_octets_except_unused(int, unsigned char **, unsigned char **,
-				int *, int);
-
-int insert_octets_as_bits_exact_len(int, int, unsigned char **,
-				    unsigned char **, int *);
-
-int insert_octets_as_bits(int, unsigned char **, unsigned char **,int *);
-
-int pad_bits(int, unsigned char **, int *);
-
-int insert_least_sign_bits(int, unsigned char, unsigned char **, int *);
-
-int insert_most_sign_bits(int, unsigned char, unsigned char **, int *);
-
-int insert_bits_as_bits(int, int, unsigned char **, unsigned char **, int *);
-
-int insert_octets_unaligned(int, unsigned char **, unsigned char **, int);
-
-int realloc_decode_buf(ErlDrvBinary **,int);
-
-int realloc_memory(ErlDrvBinary **,int,unsigned char **,unsigned char **);
-
-int decode_begin(ErlDrvBinary **,unsigned char *, int, unsigned int *);
-
-int decode(ErlDrvBinary **,int *,unsigned char *,int *, int);
-
-int decode_tag(char *,int *,unsigned char *,int,int *);
-
-int decode_value(int *,unsigned char *,int *,ErlDrvBinary **,int ,int);
-
-
-/* declaration of functions used for partial decode of a BER encoded
-   message */
-
-int decode_partial(ErlDrvBinary **,unsigned char *, int);
-
-int skip_tag(unsigned char *,int *,int);
-
-int skip_length_and_value(unsigned char *,int *,int);
-
-int get_tag(unsigned char *,int *,int);
-
-int get_length(unsigned char *,int *,int *,int);
-
-int get_value(char *,unsigned char *,int *,int);
-
-static ErlDrvEntry asn1_drv_entry = {
-  NULL,              /* init, always NULL for dynamic drivers */
-  asn1_drv_start,    /* start, called when port is opened */
-  asn1_drv_stop,     /* stop, called when port is closed */
-  NULL,              /* output, called when erlang has sent */
-  NULL,              /* ready_input, called when input descriptor ready */
-  NULL,              /* ready_output, called when output descriptor ready */
-  "asn1_erl_drv",    /* char *driver_name, the argument to open_port */
-  NULL,              /* finish, called when unloaded */
-  NULL,              /* void * that is not used (BC) */
-  asn1_drv_control,  /* control, port_control callback */
-  NULL,              /* timeout, called on timeouts */
-  NULL,              /* outputv, vector output interface */
-  
-  NULL,              /* ready_async */
-  NULL,              /* flush */
-  NULL,              /* call */
-  NULL,              /* event */
-  ERL_DRV_EXTENDED_MARKER,
-  ERL_DRV_EXTENDED_MAJOR_VERSION,
-  ERL_DRV_EXTENDED_MINOR_VERSION,
-  ERL_DRV_FLAG_USE_PORT_LOCKING,
-  NULL,              /* handle2 */
-  NULL               /* process_exit */
-};    
-
-
-
-DRIVER_INIT(asn1_erl_drv) /* must match name in driver_entry */
-{
-  return &asn1_drv_entry;
-}
-
-static ErlDrvData asn1_drv_start(ErlDrvPort port, char *buff)
-{
-  /* extern int min_alloc_bytes; */
-  char  *ptr;
-  asn1_data* d;
-
-  d = (asn1_data*)driver_alloc(sizeof(asn1_data));
-  set_port_control_flags(port, PORT_CONTROL_FLAG_BINARY);
-  d->port = port;
-  
-  if ((ptr = getenv("ASN1_MIN_BUF_SIZE")) == NULL)
-    d->buffer_size = 1024;
-  else
-    d->buffer_size = atoi(ptr);
-  return (ErlDrvData)d;
-}
-
-
-static void asn1_drv_stop(ErlDrvData handle)
-{
-  driver_free((char*)handle);
-}
-
-
-
-int asn1_drv_control(ErlDrvData   handle, 
-		     unsigned int command, 
-		     char         *buf,
-		     int          buf_len,
-		     char       **res_buf,
-		     int          res_buf_len) 
-{
-  unsigned char *complete_buf;
-  int complete_len, decode_len;
-  ErlDrvBinary *drv_binary;
-  ErlDrvBinary **drv_bin_ptr;
-  asn1_data* a_data;
-  int min_alloc_bytes;
-  unsigned int err_pos = 0; /* in case of error, return last correct position */
-  int ret_err; /* return value in case of error in TLV decode, i.e. length of list in res_buf */
-
-  /* In case previous call to asn1_drv_control resulted in a change of
-     return value from binary to integer list */
-  a_data = (asn1_data *)handle;
-  min_alloc_bytes = a_data->buffer_size; 
-  set_port_control_flags(a_data->port, PORT_CONTROL_FLAG_BINARY);
-
-  if (command == ASN1_COMPLETE)
-    { 
-      if (buf_len==0) {
-	  return 0; /* Avoid binary buffer overwrite (OTP-8451) */
-      }
-      /* Do the PER complete encode step */
-      if ((drv_binary = driver_alloc_binary(buf_len))==NULL) {
-	/* error handling */
-	set_port_control_flags(a_data->port, 0);
-	return ASN1_MEMORY_ERROR;
-      }
-      complete_buf = (unsigned char*) drv_binary->orig_bytes;
-      if ((complete_len = complete(&drv_binary,complete_buf,(unsigned char*) buf,buf_len)) == ASN1_ERROR)
-	{
-	  /* error handling due to failure in complete */
-	  /*       printf("error when running complete\n\r"); */
-	  driver_free_binary(drv_binary);
-	  set_port_control_flags(a_data->port, 0);
-	  **res_buf = '1';
-	  return ASN1_COMPL_ERROR;
-	}
-      /* printf("complete_len=%dbuf_len=%d,orig_size=%d\n\r",complete_len,buf_len,drv_binary->orig_size); */
-      /* now the message is complete packed, return to Erlang */
-      /*      if (complete_len < buf_len) {*/
-      if (complete_len < drv_binary->orig_size) {	
-	ErlDrvBinary *tmp;
-	if ((tmp=driver_realloc_binary(drv_binary,complete_len)) == NULL){
-	  /*error handling due to memory allocation failure */
-	  driver_free_binary(drv_binary);
-	  set_port_control_flags(a_data->port, 0);
-	  return ASN1_MEMORY_ERROR;
-	}else
-	  drv_binary=tmp;
-      }
-      *res_buf = (char *)drv_binary;
-      return complete_len;
-    } else if (command == ASN1_BER_TLV_DECODE) { /* control == 2 */
-      /* Do the tlv decode,
-	 return the resulting term encoded on the Erlang 
-	 external format */
-/*       printf("driver: buffer_len = %d, min_alloc_bytes = %d\r\n",buf_len,min_alloc_bytes); */
-      if ((drv_binary = driver_alloc_binary((buf_len*5)+min_alloc_bytes))==NULL) {
-	/* error handling */
-	set_port_control_flags(a_data->port, 0);
-	return ASN1_MEMORY_ERROR;
-      }
-      drv_bin_ptr = &drv_binary;
-      if ((decode_len = decode_begin(drv_bin_ptr,(unsigned char*)buf,buf_len,&err_pos)) <= ASN1_ERROR)
-	{
-	  /* error handling due to failure in decode  */
- 	  char tmp_res_buf[5];
-	  driver_free_binary(*drv_bin_ptr);
-	  set_port_control_flags(a_data->port, 0);
-	  
-	  if(decode_len==ASN1_ERROR)
- 	    tmp_res_buf[0]='1';
-	  else if(decode_len==ASN1_TAG_ERROR)
- 	    tmp_res_buf[0]='2';
-	  else if(decode_len==ASN1_LEN_ERROR)
- 	    tmp_res_buf[0]='3';
-	  else if(decode_len==ASN1_INDEF_LEN_ERROR)
- 	    tmp_res_buf[0]='4';
-	  else if(decode_len==ASN1_VALUE_ERROR)
-	    tmp_res_buf[0]='5';
-/* 	  printf("err_pos=%d\r\n",err_pos); */
-/* 	  printf("decode_len:%d\r\n",decode_len); */
-	  ret_err = 1;
-	  while(err_pos>0){
-	    tmp_res_buf[ret_err] =(char)err_pos;/* c;*/
-	    err_pos = err_pos >> 8;
-	    ret_err++;
-	  }
- 	  strncpy(*res_buf,tmp_res_buf,ret_err);
-	  return ret_err;
-	}
-/*       printf("decode_len=%d\r\n",decode_len); */
-      if (decode_len < ((buf_len * 5) + min_alloc_bytes)) {
-	/* not all memory was used => we have to reallocate */
-	ErlDrvBinary *tmp;
-	if ((tmp=driver_realloc_binary(*drv_bin_ptr,decode_len)) == NULL){
-	  /*error handling due to memory allocation failure */
-	  driver_free_binary(*drv_bin_ptr);
-	  set_port_control_flags(a_data->port, 0);
-	  return ASN1_MEMORY_ERROR;
-	}else
-	  *drv_bin_ptr=tmp;
-      }
-      *res_buf = (char *)(*drv_bin_ptr);
-      return decode_len;
-    } else { /*command == ASN1_BER_TLV_PARTIAL_DECODE */
-      if ((drv_binary = driver_alloc_binary(buf_len))==NULL) {
-	/* error handling */
-	set_port_control_flags(a_data->port, 0);
-	return ASN1_MEMORY_ERROR;
-      }
-      drv_bin_ptr = &drv_binary;
-      if ((decode_len = decode_partial(drv_bin_ptr,(unsigned char*)buf,buf_len))
-	  <= ASN1_ERROR) {
-	/* error handling due to failure in decode  */
-	driver_free_binary(*drv_bin_ptr);
-	set_port_control_flags(a_data->port, 0);
-	
-/* 	printf("asn1_drv_control 1: decode_len=%d\r\n",decode_len); */
-	  
-	if(decode_len==ASN1_ERROR)
-	  **res_buf = '1';
-	return ASN1_DECODE_ERROR;
-      }
-      if (decode_len < buf_len) { 
-	/* not all memory was used => we have to reallocate */
-	ErlDrvBinary *tmp;
-/* 	printf("asn1_drv_control 2: decode_len=%d\r\n",decode_len); */
-	if ((tmp=driver_realloc_binary(*drv_bin_ptr,decode_len)) == NULL){
-	  /*error handling due to memory allocation failure */
-	  driver_free_binary(*drv_bin_ptr);
-	  set_port_control_flags(a_data->port, 0);
-	  return ASN1_MEMORY_ERROR;
-	}else
-	  *drv_bin_ptr=tmp;
-      }
-      *res_buf = (char *)(*drv_bin_ptr);
-      return decode_len;
-    }
-}
-
-
-
-/*
- * 
- * This section defines functionality for the complete encode of a
- * PER encoded message
- *
- */
-
-int complete(ErlDrvBinary **drv_binary,unsigned char *complete_buf,
-	     unsigned char *in_buf, int in_buf_len)
-{
-  int counter = in_buf_len;
-  /* counter keeps track of number of bytes left in the
-     input buffer */
-
-  int buf_space = in_buf_len;
-  /* This is the amount of allocated space left of the complete_buf. It
-     is possible when padding is applied that more space is needed than
-     was originally allocated. */
-
-  int buf_size = in_buf_len;
-  /* Size of the buffer. May become reallocated and thus other than 
-     in_buf_len */
-
-  unsigned char *in_ptr, *ptr;
-  /* in_ptr points at the next byte in in_buf to be moved to
-     complete_buf.
-     ptr points into the new completed buffer, complete_buf, at the
-     position of the next byte that will be set */
-  int unused =  8;
-  /* unused = [1,...,8] indicates how many of the rigthmost bits of 
-     the byte that ptr points at that are unassigned */
-
-  int no_bits,no_bytes,in_unused,desired_len,ret, saved_mem, needed, pad_bits;
-
-  unsigned char val;
-  
-  in_ptr = in_buf;
-  ptr = complete_buf;
-  *ptr = 0x00;
-  while(counter > 0) {
-    counter--;
-/*     printf("*in_ptr = %d\n\r",*in_ptr); */
-    switch (*in_ptr) {
-    case 0: 
-      /* just one zero-bit should be added to the buffer */
-      if(unused == 1){
-	unused = 8;
-	*++ptr = 0x00;
-	buf_space--;
-      } else 
-	unused--;
-      break;
-
-    case 1:
-      /* one one-bit should be added to the buffer */
-      if(unused == 1){
-	*ptr = *ptr | 1;
-	unused = 8;
-	*++ptr = 0x00;
-	buf_space--;
-      } else {
-	*ptr = *ptr | (1 << (unused - 1));
-	unused--;
-      }
-      break;
-
-    case 2:
-      /* align buffer to end of byte */
-      if (unused != 8) {
-	*++ptr = 0x00;
-	buf_space--;
-	unused = 8;
-      }
-      break;
-
-    case 10:
-      /* next byte in in_buf tells how many bits in the second next
-	 byte that will be used */
-      /* The leftmost unused bits in the value byte are supposed to be
-	 zero bits */
-      no_bits =  (int)*(++in_ptr);
-      val = *(++in_ptr);
-      counter -= 2;
-      if ((ret=insert_least_sign_bits(no_bits,val,&ptr,&unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-      buf_space -= ret;
-      break;
-
-    case 20:
-      /* in this case the next value in_ptr points at holds the number
-	 of following bytes that holds the value that will be inserted
-	 in the completed buffer */
-      no_bytes = (int)*(++in_ptr);
-      counter -= (no_bytes + 1);
-      if ((counter<0) || 
-	  (ret=insert_octets(no_bytes,&in_ptr,&ptr,&unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-      buf_space -= ret;
-      break;
-
-    case 21:
-      /* in this case the next two bytes in_ptr points at holds the number
-	 of following bytes that holds the value that will be inserted
-	 in the completed buffer */
-      no_bytes = (int)*(++in_ptr);
-      no_bytes = no_bytes << 8;
-      no_bytes = no_bytes | (int)*(++in_ptr);
-      counter -= (2 + no_bytes);
-      if ((counter<0) || 
-	  (ret=insert_octets(no_bytes,&in_ptr,&ptr,&unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-      buf_space -= ret;
-      break;
-
-    case 30:
-      /* If we call the following bytes, in the buffer in_ptr points at,
-	 By1,By2,Rest then Rest is the value that will be transfered to
-	 the completed buffer. By1 tells how many of the rightmost bits in 
-	 Rest that should not be used. By2 is the length of Rest in bytes.*/
-      in_unused = (int)*(++in_ptr);
-      no_bytes = (int)*(++in_ptr);
-      counter -= (2 + no_bytes);
-/*        printf("%d: case 30: in_unused=%d, no_bytes=%d,counter=%d\n\r",__LINE__,in_unused,no_bytes,counter); */
-      ret = -4711;
-      if ((counter<0) || 
-	  (ret=insert_octets_except_unused(no_bytes,&in_ptr,&ptr,&unused,in_unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-/*        printf("%d: ret=%d\n\r",__LINE__, ret); */
-      buf_space -= ret;
-      break;
-
-    case 31:
-      /* If we call the following bytes, in the buffer in_ptr points at,
-	 By1,By2,By3,Rest then Rest is the value that will be transfered to
-	 the completed buffer. By1 tells how many of the rightmost bits in 
-	 Rest that should not be used. By2 and By3 is the length of 
-	 Rest in bytes.*/
-      in_unused = (int)*(++in_ptr);
-      no_bytes = (int)*(++in_ptr);
-      no_bytes = no_bytes << 8;
-      no_bytes = no_bytes | (int)*(++in_ptr);
-      counter -= (3 + no_bytes);
-      if ((counter<0) || 
-	  (ret=insert_octets_except_unused(no_bytes,&in_ptr,&ptr,&unused,in_unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-      buf_space -= ret;
-      break;
-
-    case 40:
-      /* This case implies that next byte,By1,(..,By1,By2,Bin,...)
-	 is the desired length of the completed value, maybe needs 
-	 padding zero bits or removal of trailing zero bits from Bin.
-	 By2 is the length of Bin and Bin is the value that will be 
-	 put into the completed buffer. Each byte in Bin has the value
-	 1 or 0.*/
-      desired_len = (int)*(++in_ptr);
-      no_bytes=(int)*(++in_ptr);
- 
-      /* This is the algorithm for need of memory reallocation:
-	 Only when padding (cases 40 - 43,45 - 47) more memory may be
-	 used than allocated. Therefore one has to keep track of how
-	 much of the allocated memory that has been saved, i.e. the 
-	 difference between the number of parsed bytes of the input buffer
-	 and the number of used bytes of the output buffer. 
-	 If saved memory is less than needed for the padding then we
-	 need more memory. */
-      saved_mem = buf_space - counter;
-      pad_bits = desired_len - no_bytes - unused;
-      needed = (pad_bits > 0) ? CEIL(pad_bits,8) : 0;
-      if (saved_mem < needed) {
-	/* Have to allocate more memory */
-	buf_size += needed;
-	buf_space += needed;
-	if (realloc_memory(drv_binary,buf_size,&ptr,
-			   &complete_buf) == ASN1_ERROR)
-	  return ASN1_ERROR;
-      }
-
-      counter -= (2 + no_bytes);
-     if ((counter<0) || 
-	  (ret=insert_octets_as_bits_exact_len(desired_len,no_bytes,&in_ptr,
-					       &ptr,&unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-      buf_space -= ret;
-      break;
-      
-    case 41:
-      /* Same as case 40 apart from By2, the length of Bin, which is in 
-	 two bytes*/
-      desired_len = (int)*(++in_ptr);
-      no_bytes=(int)*(++in_ptr);
-      no_bytes = no_bytes << 8;
-      no_bytes = no_bytes | (int)*(++in_ptr);
-
-      saved_mem = buf_space - counter;
-      needed = CEIL((desired_len-unused),8) - no_bytes;
-      if (saved_mem < needed) {
-	/* Have to allocate more memory */
-	buf_size += needed;
-	buf_space += needed;
-	if (realloc_memory(drv_binary,buf_size,&ptr,
-			   &complete_buf) == ASN1_ERROR)
-	  return ASN1_ERROR;
-      }
-
-      counter -= (3 + no_bytes);
-      if ((counter<0) || 
-	  (ret=insert_octets_as_bits_exact_len(desired_len,no_bytes,&in_ptr,
-					       &ptr,&unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-      buf_space -= ret;
-      break;
-      
-    case 42:
-      /* Same as case 40 apart from By1, the desired length, which is in 
-	 two bytes*/
-      desired_len = (int)*(++in_ptr);
-      desired_len = desired_len << 8;
-      desired_len = desired_len | (int)*(++in_ptr);
-      no_bytes=(int)*(++in_ptr);
-
-      saved_mem = buf_space - counter;
-      needed = CEIL((desired_len-unused),8) - no_bytes;
-      if (saved_mem < needed) {
-	/* Have to allocate more memory */
-	buf_size += needed;
-	buf_space += needed;
-	if (realloc_memory(drv_binary,buf_size,&ptr,
-			   &complete_buf) == ASN1_ERROR)
-	  return ASN1_ERROR;
-      }
-
-      counter -= (3 + no_bytes);
-      if ((counter<0) || 
-	  (ret=insert_octets_as_bits_exact_len(desired_len,no_bytes,&in_ptr,
-					       &ptr,&unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-      buf_space -= ret;
-      break;
-      
-    case 43:
-      /* Same as case 40 apart from By1 and By2, the desired length and
-	 the length of Bin, which are in two bytes each. */
-      desired_len = (int)*(++in_ptr);
-      desired_len = desired_len << 8;
-      desired_len = desired_len | (int)*(++in_ptr);
-      no_bytes=(int)*(++in_ptr);
-      no_bytes = no_bytes << 8;
-      no_bytes = no_bytes | (int)*(++in_ptr);
-
-      saved_mem = buf_space - counter;
-      needed = CEIL((desired_len-unused),8) - no_bytes;
-      if (saved_mem < needed) {
-	/* Have to allocate more memory */
-	buf_size += needed;
-	buf_space += needed;
-	if (realloc_memory(drv_binary,buf_size,&ptr,
-			   &complete_buf) == ASN1_ERROR)
-	  return ASN1_ERROR;
-      }
-
-      counter -= (4 + no_bytes);
-      if ((counter<0) || 
-	  (ret=insert_octets_as_bits_exact_len(desired_len,no_bytes,&in_ptr,
-					       &ptr,&unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-      buf_space -= ret;
-      break;
-      
-    case 45:
-      /* This case assumes that the following bytes in the incoming buffer
-	 (called By1,By2,Bin) is By1, which is the number of bits (n) that 
-	 will be inserted in the completed buffer. By2 is the number of
-	 bytes in Bin. Each bit in the buffer Bin should be inserted from
-	 the leftmost until the nth.*/
-      desired_len = (int)*(++in_ptr);
-      no_bytes=(int)*(++in_ptr);
- 
-      saved_mem = buf_space - counter;
-      needed = CEIL((desired_len-unused),8) - no_bytes;
-/*       printf("buf_space=%d, counter=%d, needed=%d",buf_space,counter,needed);  */
-      if (saved_mem < needed) {
-	/* Have to allocate more memory */
-	buf_size += needed;
-	buf_space += needed;
-	if (realloc_memory(drv_binary,buf_size,&ptr,
-			   &complete_buf) == ASN1_ERROR)
-	  return ASN1_ERROR;
-      }
-
-      counter -= (2 + no_bytes);
-/*       printf("calling insert_bits_as_bits: desired_len=%d, no_bytes=%d\n\r",desired_len,no_bytes); */
-/*       printf("1in_ptr=%d\n\r",in_ptr); */
-
-      if((counter<0) || 
-	 (ret=insert_bits_as_bits(desired_len,no_bytes,&in_ptr,
-				  &ptr,&unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-/*       printf("2in_ptr=%d, ptr=%d, complete_buf=%d\n\r",in_ptr,ptr,complete_buf); */
-/*       printf("buf_space=%d, ret=%d, counter=%d\n\r",buf_space,ret,counter); */
-      buf_space -= ret;
-      break;
-      
-    case 46:
-      /* Same as case 45 apart from By1, the desired length, which is
-	 in two bytes. */
-      desired_len = (int)*(++in_ptr);
-      desired_len = desired_len << 8;
-      desired_len = desired_len | (int)*(++in_ptr);
-      no_bytes=(int)*(++in_ptr);
- 
-      saved_mem = buf_space - counter;
-      needed = CEIL((desired_len-unused),8) - no_bytes;
-      if (saved_mem < needed) {
-	/* Have to allocate more memory */
-	buf_size += needed;
-	buf_space += needed;
-	if (realloc_memory(drv_binary,buf_size,&ptr,
-			   &complete_buf) == ASN1_ERROR)
-	  return ASN1_ERROR;
-      }
-
-      counter -= (3 + no_bytes);
-      if((counter<0) || 
-	 (ret=insert_bits_as_bits(desired_len,no_bytes,&in_ptr,
-				  &ptr,&unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-      buf_space -= ret;
-      break;
-      
-    case 47:
-      /* Same as case 45 apart from By1 and By2, the desired length
-	 and the length of Bin, which are in two bytes each. */
-      desired_len = (int)*(++in_ptr);
-      desired_len = desired_len << 8;
-      desired_len = desired_len | (int)*(++in_ptr);
-      no_bytes=(int)*(++in_ptr);
-      no_bytes = no_bytes << 8;
-      no_bytes = no_bytes | (int)*(++in_ptr);
- 
-      saved_mem = buf_space - counter;
-      needed = CEIL((desired_len-unused),8) - no_bytes;
-      if (saved_mem < needed) {
-	/* Have to allocate more memory */
-	buf_size += needed;
-	buf_space += needed;
-	if (realloc_memory(drv_binary,buf_size,&ptr,
-			   &complete_buf) == ASN1_ERROR)
-	  return ASN1_ERROR;
-      }
-
-      counter -= (4 + no_bytes);
-      if((counter<0) || 
-	 (ret=insert_bits_as_bits(desired_len,no_bytes,&in_ptr,
-				  &ptr,&unused)) == ASN1_ERROR)
-	return ASN1_ERROR;
-      buf_space -= ret;
-      break;
-      
-    default:
-      return ASN1_ERROR;
-    }
-    in_ptr++;
-  }
-  /* The returned buffer must be at least one byte and
-     it must be octet aligned */
-  if ((unused == 8) && (ptr != complete_buf)) 
-    return (ptr - complete_buf);
-  else {
-    ptr++; /* octet align buffer */
-    return (ptr - complete_buf);
-  }
-}
-
-
-int realloc_memory(ErlDrvBinary **drv_binary,
-		   int amount,
-		   unsigned char **ptr,
-		   unsigned char **complete_buf) {
-
-  ErlDrvBinary *tmp_bin;
-  int i;
-
-/*   printf("realloc_momory: amount = %d\n",amount); */
-  if ((tmp_bin=driver_realloc_binary(*drv_binary,amount)) == NULL) {
-    /*error handling due to memory allocation failure */
-/*     printf("error when allocating memory\n"); */
-    return ASN1_ERROR;
-  }else {
-    i = *ptr - *complete_buf;
-    *drv_binary=tmp_bin;
-    *complete_buf = (unsigned char*)(*drv_binary)->orig_bytes;
-    *ptr = *complete_buf + i;
-  }
-  return ASN1_OK;
-}
-
-
-int insert_most_sign_bits(int no_bits,
-			  unsigned char val,
-			  unsigned char **output_ptr,
-			  int *unused) {
-  unsigned char *ptr = *output_ptr;
-  
-  if (no_bits < *unused){
-    *ptr = *ptr | (val >> (8 - *unused));
-    *unused -= no_bits;
-  } else if (no_bits == *unused) {
-    *ptr = *ptr | (val >> (8 - *unused));
-    *unused = 8;
-    *++ptr = 0x00;
-  } else {
-    *ptr = *ptr | (val >> (8 - *unused));
-    *++ptr = 0x00;
-    *ptr = *ptr | (val << *unused);
-    *unused = 8 - (no_bits - *unused);
-  }
-  *output_ptr = ptr;
-  return ASN1_OK;
-}
-
-
-int insert_least_sign_bits(int no_bits,
-			   unsigned char val,
-			   unsigned char **output_ptr,
-			   int *unused) {
-  unsigned char *ptr = *output_ptr;
-  int ret = 0;
-
-  if (no_bits < *unused){
-    *ptr = *ptr | (val << (*unused - no_bits));
-    *unused -= no_bits;
-  } else if (no_bits == *unused){
-    *ptr = *ptr | val;
-    *unused = 8;
-    *++ptr = 0x00;
-    ret++;
-  } else {
-    /* first in the begun byte in the completed buffer insert 
-       so many bits that fit, then insert the rest in next byte.*/
-    *ptr = *ptr | (val >> (no_bits - *unused));
-    *++ptr = 0x00;
-    ret++;
-    *ptr = *ptr | (val << (8 - (no_bits - *unused)));
-    *unused = 8 - (no_bits - *unused);
-  }
-  *output_ptr = ptr;
-  return ret;
-}
-
-/* pad_bits adds no_bits bits in the buffer that output_ptr 
-   points at.
- */
-int pad_bits(int no_bits, unsigned char **output_ptr, int *unused) 
-  {
-    unsigned char *ptr = *output_ptr;
-    int ret = 0;
-    
-    while (no_bits > 0) {
-      if(*unused == 1){
-	*unused = 8;
-	*++ptr = 0x00;
-	ret++;
-      } else 
-	(*unused)--;
-      no_bits--;
-    }
-    *output_ptr = ptr;
-    return ret;
-  }
-
-
-/* insert_bits_as_bits removes no_bytes bytes from the buffer that in_ptr
-   points at and takes the desired_no leftmost bits from those removed
-   bytes and inserts them in the buffer(output buffer) that ptr points at.
-   The unused parameter tells how many bits that are not set in the 
-   actual byte in the output buffer. If desired_no is more bits than the
-   input buffer has in no_bytes bytes, then zero bits is padded.*/
-int insert_bits_as_bits(int desired_no,
-			int no_bytes,
-			unsigned char **input_ptr,
-			unsigned char **output_ptr,
-			int *unused)
-{
-  unsigned char *in_ptr = *input_ptr;
-  unsigned char val;
-  int no_bits, ret, ret2;
-
-  if (desired_no == (no_bytes * 8)) {
-    if(insert_octets_unaligned(no_bytes,&in_ptr,output_ptr,*unused)
-       == ASN1_ERROR)
-      return ASN1_ERROR;
-    ret = no_bytes;
-  }
-  else if (desired_no < (no_bytes * 8)) {
-/*     printf("insert_bits_as_bits 1\n\r"); */
-    if(insert_octets_unaligned(desired_no/8,&in_ptr,output_ptr,*unused)
-       == ASN1_ERROR)
-      return ASN1_ERROR;
-/*     printf("insert_bits_as_bits 2\n\r"); */
-    val = *++in_ptr;
-/*     printf("val = %d\n\r",(int)val); */
-    no_bits = desired_no % 8;
-/*     printf("no_bits = %d\n\r",no_bits); */
-    insert_most_sign_bits(no_bits,val,output_ptr,unused);
-    ret = CEIL(desired_no,8);
-  }
-  else {
-    if(insert_octets_unaligned(no_bytes,&in_ptr,output_ptr,*unused) 
-       == ASN1_ERROR)
-      return ASN1_ERROR;
-    ret2 = pad_bits(desired_no - (no_bytes * 8),output_ptr,unused);
-/*     printf("ret2 = %d\n\r",ret2); */
-    ret = CEIL(desired_no,8);
-/*     printf("ret = %d\n\r",ret); */
-  }
-/*   printf("*unused = %d\n\r",*unused); */
-  *input_ptr = in_ptr;
-  return ret;
-}
-
-
-/* insert_octets_as_bits_exact_len */
-int
-insert_octets_as_bits_exact_len(int desired_len,
-				int in_buff_len,
-				unsigned char **in_ptr,
-				unsigned char **ptr,
-				int *unused)
-{
-  int ret = 0;
-  int ret2 = 0;
-
-  if (desired_len == in_buff_len) {
-    if ((ret = insert_octets_as_bits(in_buff_len,in_ptr,ptr,unused)) == ASN1_ERROR)
-      return ASN1_ERROR;
-  }
-  else if(desired_len > in_buff_len) {
-    if((ret = insert_octets_as_bits(in_buff_len,in_ptr,ptr,unused)) == ASN1_ERROR)
-      return ASN1_ERROR;
-    /* now pad with zero bits */
-/*     printf("~npad_bits: called with %d bits padding~n~n~r",desired_len - in_buff_len); */
-    if ((ret2=pad_bits(desired_len - in_buff_len,ptr,unused)) == ASN1_ERROR)
-      return ASN1_ERROR;
-  }
-  else {/* desired_len < no_bits */
-    if ((ret=insert_octets_as_bits(desired_len,in_ptr,ptr,unused)) == ASN1_ERROR)
-      return ASN1_ERROR;
-    /* now remove no_bits - desired_len bytes from in buffer */
-    *in_ptr += (in_buff_len - desired_len);
-  }
-  return (ret+ret2);
-}
-
-
-
-/* insert_octets_as_bits takes no_bytes bytes from the buffer that input_ptr
-   points at and inserts the least significant bit of it in the buffer that
-   output_ptr points at. Each byte in the input buffer must be 1 or 0
-   otherwise the function returns ASN1_ERROR. The output buffer is concatenated
-   without alignment.
- */
-int insert_octets_as_bits(int no_bytes,
-			  unsigned char **input_ptr,
-			  unsigned char **output_ptr,
-			  int *unused)
-{
-  unsigned char *in_ptr = *input_ptr;
-  unsigned char *ptr = *output_ptr;
-  int used_bits = 8 - *unused;
-
-  while (no_bytes > 0) {
-    switch (*++in_ptr) {
-    case 0:
-      if(*unused == 1){
-	*unused = 8;
-	*++ptr = 0x00;
-      } else 
-	(*unused)--;
-      break;
-    case 1:
-      if(*unused == 1){
-	*ptr = *ptr | 1;
-	*unused = 8;
-	*++ptr = 0x00;
-      } else {
-	*ptr = *ptr | (1 << (*unused - 1));
-	(*unused)--;
-      }
-      break;
-    default:
-      return ASN1_ERROR;
-    }
-    no_bytes--;
-  }
-  *input_ptr = in_ptr;
-  *output_ptr = ptr;
-  return ((used_bits+no_bytes) / 8); /*return number of new bytes
-				      in completed buffer */
-}
-
-/* insert_octets inserts bytes from the input buffer, *input_ptr,
-   into the output buffer, *output_ptr. Before the first byte is
-   inserted the input buffer is aligned.
- */
-int insert_octets(int no_bytes,
-		  unsigned char **input_ptr,
-		  unsigned char **output_ptr,
-		  int *unused)
-{
-    unsigned char *in_ptr = *input_ptr;
-    unsigned char *ptr = *output_ptr;
-    int ret = 0;
-      
-    if (*unused != 8) {/* must align before octets are added */
-      *++ptr = 0x00;
-      ret++;
-      *unused = 8;
-    }
-    while(no_bytes > 0) {
-      *ptr = *(++in_ptr);
-      *++ptr = 0x00;
-      /*      *unused = *unused - 1; */
-      no_bytes--;
-    }
-  *input_ptr = in_ptr;
-  *output_ptr = ptr;
-  return (ret + no_bytes);
-}
-
-/* insert_octets_unaligned inserts bytes from the input buffer, *input_ptr,
-   into the output buffer, *output_ptr.No alignment is done.
- */
-int insert_octets_unaligned(int no_bytes,
-			    unsigned char **input_ptr,
-			    unsigned char **output_ptr,
-			    int unused)
-{
-  unsigned char *in_ptr = *input_ptr;
-  unsigned char *ptr = *output_ptr;
-  int n = no_bytes;
-  unsigned char val;
-  
-  while (n > 0) {
-    if (unused == 8) {
-      *ptr = *++in_ptr;
-      *++ptr = 0x00;
-    }else {
-      val = *++in_ptr;
-      *ptr =  *ptr | val >> (8 - unused);
-      *++ptr = 0x00;
-      *ptr = val << unused;
-    }
-    n--;
-  }
-  *input_ptr = in_ptr;
-  *output_ptr = ptr;
-  return no_bytes;
-}
-
-
-int insert_octets_except_unused(int no_bytes,
-				unsigned char **input_ptr,
-				unsigned char **output_ptr,
-				int *unused,
-				int in_unused)
-{
-  unsigned char *in_ptr = *input_ptr;
-  unsigned char *ptr = *output_ptr;
-  int val, no_bits;
-  int ret = 0;
-  
-  if (in_unused == 0){
-/*      printf("%d: insert_octets_except_unused: if\n\r",__LINE__); */
-    if ((ret = insert_octets_unaligned(no_bytes,&in_ptr,&ptr,
-				       *unused)) == ASN1_ERROR)
-      return ASN1_ERROR;
-  }
-    else {
-/*        printf("%d: insert_octets_except_unused: else\n\r",__LINE__); */
-      if ((ret=insert_octets_unaligned(no_bytes - 1,&in_ptr,&ptr,*unused)) != ASN1_ERROR) {
-	val = (int) *(++in_ptr);
-	no_bits = 8 - in_unused;
-	/* no_bits is always less than *unused since the buffer is
-	   octet aligned after insert:octets call, so the following
-	   if clasuse is obsolete I think */
-	if(no_bits < *unused){
-	  *ptr = *ptr | (val >> (8 - *unused));
-	  *unused = *unused - no_bits;
-	} else if (no_bits == *unused) {
-	  *ptr = *ptr | (val >> (8 - *unused));
-	  *++ptr = 0x00;
-	  ret++;
-	  *unused = 8;
-	} else {
-	  *ptr = *ptr | (val >> (8 - *unused));
-	  *++ptr = 0x00;
-	  ret++;
-	  *ptr = *ptr | (val << *unused);
-	  *unused = 8 - (no_bits - *unused);
-	}
-      } else
-	return ASN1_ERROR;
-    }
-  *input_ptr = in_ptr;
-  *output_ptr = ptr;
-/*    printf("%d: insert_octets_except_unused: ret=%d\n\r",__LINE__,ret); */
-  return ret;
-}
-
-
-
-/*
- * 
- * This section defines functionality for the partial decode of a
- * BER encoded message
- *
- */
-
-/*
- * int decode(ErlDrvBinary **drv_binary,unsigned char *decode_buf,
- *            unsigned char *in_buf, int in_buf_len) 
- * drv_binary is a pointer to a pointer to an allocated driver binary.
- * in_buf is a pointer into the buffer of incoming bytes.
- * in_buf_len is the length of the incoming buffer.
- * The function reads the bytes in the incoming buffer and structures
- * it in a nested way as Erlang terms. The buffer contains data in the
- * order tag - length - value. Tag, length and value has the following
- * format:
- * A tag is normally one byte but may be of any length, if the tag number
- * is greater than 30. +----------+
- *		       |CL|C|NNNNN|
- * 		       +----------+
- * If NNNNN is 31 then will the 7 l.s.b of each of the following tag number
- * bytes contain the tag number. Each tag number byte that is not the last one
- * has the m.s.b. set to 1.
- * The length can be short definite length (sdl), long definite length (ldl)
- * or indefinite length (il).
- * sdl: +---------+ the L bits is the length
- *	|0|LLLLLLL|
- *	+---------+
- * ldl:	+---------+ +---------+ +---------+     +-----------+
- *	|1|lllllll| |first len| |	  |     |the Nth len|
- *	+---------+ +---------+ +---------+ ... +-----------+
- *    	The first byte tells how many len octets will follow, max 127
- * il:  +---------+ +----------------------+ +--------+ +--------+
- *	|1|0000000| |content octets (Value)| |00000000| |00000000|
- *	+---------+ +----------------------+ +--------+ +--------+
- *	The value octets are preceded by one octet and followed by two 
- *	exactly as above. The value must be some tag-length-value encoding.
- *
- * The function returns a value in Erlnag term format:
- * {{TagNo,Value},Rest}
- * TagNo is an integer ((CL bsl 16) + tag number) which limits the tag number 
- * to 65535.
- * Value is a binary if the C bit in tag was unset, otherwise (if tag was
- * constructed) Value is a list, List.
- * List is like: [{TagNo,Value},{TagNo,Value},...]
- * Rest is a binary, i.e. the undecoded part of the buffer. Most often Rest
- * is the empty binary.
- * If some error occured during the decoding of the in_buf an error is returned.
- */
-int decode_begin(ErlDrvBinary **drv_binary,unsigned char *in_buf, int in_buf_len, unsigned int *err_pos)
-{
-  int maybe_ret;
-  char *decode_buf = (*drv_binary)->orig_bytes;
-  int ei_index = 0;
-  int ib_index = 0;
-  /* ei_index is the index used by the ei functions to encode an
-     Erlang term into the buffer decode_buf */
-  /* ib_index is the index were to read the next byte from in_buf */
-
-
-#ifdef ASN1_DEBUG
-    printf("decode_begin1: ei_index=%d, ib_index=%d\n\r",ei_index,ib_index);
-#endif
-  /* the first byte must be a "version magic" */
-  if(ei_encode_version(decode_buf,&ei_index) == ASN1_ERROR)
-    return ASN1_ERROR;		/* 1 byte */
-#ifdef ASN1_DEBUG
-    printf("decode_begin2: ei_index=%d, ib_index=%d\n\r",ei_index,ib_index);
-#endif
-  if (ei_encode_tuple_header(decode_buf,&ei_index,2) == ASN1_ERROR)
-    return ASN1_ERROR;		/* 2 bytes */
-#ifdef ASN1_DEBUG
-    printf("decode_begin3: ei_index=%d, ib_index=%d\n\r",ei_index,ib_index);
-#endif
-  if((maybe_ret=decode(drv_binary,&ei_index,in_buf,&ib_index,in_buf_len)) <= ASN1_ERROR) 
-    {
-      *err_pos = ib_index;
-#ifdef ASN1_DEBUG
-       printf("err_pos=%d,ib_index=%d\r\n",*err_pos,ib_index);
-#endif
-      return maybe_ret;
-    };
-  
-  decode_buf = (*drv_binary)->orig_bytes; /* maybe a realloc during decode_value */
-#ifdef ASN1_DEBUG
-    printf("decode_begin4: in_buf_len=%d, ei_index=%d, ib_index=%d\n\r",
-  	 in_buf_len,ei_index,ib_index);
-#endif
-  /* "{{TagNo,Value},Rest}" */
-  if (ei_encode_binary(decode_buf,&ei_index,&(in_buf[ib_index]),in_buf_len-ib_index)
-      == ASN1_ERROR)		/* at least 5 bytes */
-    return ASN1_ERROR;
-#ifdef ASN1_DEBUG
-    printf("decode_begin5: ei_index=%d, ib_index=%d\n\r",ei_index,ib_index);
-#endif
-  return ei_index;
-}
-
-int decode(ErlDrvBinary **drv_binary,int *ei_index,unsigned char *in_buf,
-	   int *ib_index, int in_buf_len)
-{
-  int maybe_ret;
-  char *decode_buf = (*drv_binary)->orig_bytes;
-  int form;
-#ifdef ASN1_DEBUG
-    printf("decode 1\n\r");
-#endif
-  if (((*drv_binary)->orig_size - *ei_index) < 19) {/* minimum amount of bytes */
-    /* allocate more memory */
-    if (realloc_decode_buf(drv_binary,(*drv_binary)->orig_size * 2) == 
-	ASN1_ERROR)
-      return ASN1_ERROR;
-    decode_buf = (*drv_binary)->orig_bytes;
-  }
-/*    printf("decode 2\n\r"); */
-    /* "{" */
-    if (ei_encode_tuple_header(decode_buf,ei_index,2) == ASN1_ERROR)
-    return ASN1_ERROR;		/* 2 bytes */
-#ifdef ASN1_DEBUG
-    printf("decode 3:orig_size=%ld, ei_index=%d, ib_index=%d\n\r",(*drv_binary)->orig_size,*ei_index,*ib_index);
-#endif
-
-    /*buffer must hold at least two bytes*/	
-    if ((*ib_index +2) > in_buf_len)
-      return ASN1_VALUE_ERROR;
-    /* "{{TagNo," */
-    if ((form = decode_tag(decode_buf,ei_index,in_buf,in_buf_len,ib_index)) <= ASN1_ERROR)
-      return form;		/* 5 bytes */
-#ifdef ASN1_DEBUG
-    printf("i_i=%d,in_buf_len=%d\r\n",*ei_index,in_buf_len);
-#endif
-    if (*ib_index >= in_buf_len){
-      return ASN1_TAG_ERROR;
-    }
-#ifdef ASN1_DEBUG
-    printf("decode 5 ib_index=%d\n\r",*ib_index);
-#endif
-    /* buffer must hold at least one byte (0 as length and nothing as
-       value) */
-    /* "{{TagNo,Value}," */
-    if ((maybe_ret=decode_value(ei_index,in_buf,ib_index,drv_binary,form,
-				in_buf_len)) <= ASN1_ERROR)
-      return maybe_ret;		/* at least 5 bytes */
-#ifdef ASN1_DEBUG
-     printf("decode 7\n\r");
-#endif
-    return *ei_index;
-}
-
-/* 
- * decode_tag decodes the BER encoded tag in in_buf and puts it in the
- * decode_buf encoded by the Erlang extern format as an Erlang term.
- */
-int decode_tag(char *decode_buf,int *db_index,unsigned char *in_buf,
-	       int in_buf_len, int *ib_index)
-{
-  int tag_no, tmp_tag, form;
-  
-
-  /* first get the class of tag and bit shift left 16*/
-  tag_no = ((MASK(in_buf[*ib_index],ASN1_CLASS)) << 10);
-
-  form = (MASK(in_buf[*ib_index],ASN1_FORM));
-#ifdef ASN1_DEBUG
-     printf("decode_tag0:ii=%d, tag_no=%d, form=%d.\r\n",
-	    *ib_index,tag_no,form);
-#endif
-
-  /* then get the tag number */
-  if((tmp_tag = (int) INVMASK(in_buf[*ib_index],ASN1_CLASSFORM)) < 31) {
-    ei_encode_ulong(decode_buf,db_index,tag_no+tmp_tag); /* usual case */
-    (*ib_index)++;
-#ifdef ASN1_DEBUG
-     printf("decode_tag1:ii=%d.\r\n",*ib_index);
-#endif
-  }
-  else
-    {
-      int n = 0; /* n is used to check that the 64K limit is not
-		    exceeded*/
-#ifdef ASN1_DEBUG
-     printf("decode_tag1:ii=%d, in_buf_len=%d.\r\n",*ib_index,in_buf_len);
-#endif
-
-      /* should check that at least three bytes are left in
-	 in-buffer,at least two tag byte and at least one length byte */
-      if ((*ib_index +3) > in_buf_len)
-	return ASN1_VALUE_ERROR;
-      (*ib_index)++;
-#ifdef ASN1_DEBUG
-       printf("decode_tag2:ii=%d.\r\n",*ib_index);
-#endif
-      /* The tag is in the following bytes in in_buf as 
-	 1ttttttt 1ttttttt ... 0ttttttt, where the t-bits
-	 is the tag number*/
-      /* In practice is the tag size limited to 64K, i.e. 16 bits. If
-	 the tag is greater then 64K return an error */
-      while (((tmp_tag = (int)in_buf[*ib_index]) >= 128) && n < 2){
-	/* m.s.b. = 1 */
-	tag_no = tag_no + (MASK(tmp_tag,ASN1_LONG_TAG) << 7);
-	(*ib_index)++;
-#ifdef ASN1_DEBUG
- 	printf("decode_tag3:ii=%d.\r\n",*ib_index);
-#endif
-	n++;
-      };
-      if ((n==2) && in_buf[*ib_index] > 3)
-	return ASN1_TAG_ERROR; /* tag number > 64K */
-      tag_no = tag_no + in_buf[*ib_index];
-      (*ib_index)++;
-#ifdef ASN1_DEBUG
-       printf("decode_tag4:ii=%d.\r\n",*ib_index);
-#endif
-      ei_encode_ulong(decode_buf,db_index,tag_no);
-    }
-  return form;
-}
-
-
-/*
- * decode_value decodes the BER encoded length and value fields in the
- * in_buf and puts the value part in the decode_buf as an Erlang term
- * encoded by the Erlang extern format
- */
-int decode_value(int *ei_index,unsigned char *in_buf,
-		 int *ib_index,ErlDrvBinary **drv_binary,int form,
-		 int in_buf_len)
-{
-  int maybe_ret;
-  char *decode_buf = (*drv_binary)->orig_bytes;
-  unsigned int len = 0;
-  unsigned int lenoflen = 0;
-  int indef = 0;
-  
-#ifdef ASN1_DEBUG
-    printf("decode_value1:ib_index=%d\n\r",*ib_index);
-#endif
-  if (((in_buf[*ib_index]) & 0x80) == ASN1_SHORT_DEFINITE_LENGTH) {
-    len = in_buf[*ib_index];
-  }
-  else if (in_buf[*ib_index] == ASN1_INDEFINITE_LENGTH)
-    indef = 1;
-  else /* long definite length */ {
-    lenoflen = (in_buf[*ib_index] & 0x7f); /*length of length */
-#ifdef ASN1_DEBUG
-     printf("decode_value,lenoflen:%d\r\n",lenoflen);
-#endif
-     if (lenoflen > (in_buf_len - (*ib_index+1)))
-       return ASN1_LEN_ERROR;
-     len = 0;
-     while (lenoflen-- ) {
-       (*ib_index)++;
-#ifdef ASN1_DEBUG
-       printf("decode_value1:*ib_index=%d, byte = %d.\r\n",*ib_index,in_buf[*ib_index]);
-#endif
-       if (!(len < (1 << (sizeof(len)-1)*8))) 
-	 return ASN1_LEN_ERROR; /* length does not fit in 32 bits */
-       len = (len << 8) + in_buf[*ib_index];
-     }
-  }
-  if (len > (in_buf_len - (*ib_index + 1)))
-    return ASN1_VALUE_ERROR;
-  (*ib_index)++;
-#ifdef ASN1_DEBUG
-   printf("decode_value2:ii=%d.\r\n",*ib_index);
-#endif
-  if (indef == 1)
-    { /* in this case it is desireably to check that indefinite length
-	 end bytes exist in inbuffer */
-      while (!(in_buf[*ib_index]==0 && in_buf[*ib_index + 1]==0)) {
-#ifdef ASN1_DEBUG
-	printf("decode_value while:ib_index=%d in_buf_len=%d\n\r",
-	 *ib_index,in_buf_len);
-#endif
-	if(*ib_index >= in_buf_len)
-	  return ASN1_INDEF_LEN_ERROR;
-	ei_encode_list_header(decode_buf,ei_index,1); /* 5 bytes */
-	if((maybe_ret=decode(drv_binary,ei_index,in_buf,
-			     ib_index,in_buf_len)) <= ASN1_ERROR)
-	  return maybe_ret;
-	decode_buf = (*drv_binary)->orig_bytes;
-      }
-      (*ib_index) += 2; /* skip the indefinite length end bytes */
-#ifdef ASN1_DEBUG
-       printf("decode_value3:ii=%d.\r\n",*ib_index);
-#endif
-      ei_encode_empty_list(decode_buf,ei_index); /* 1 byte */
-    }
-  else if (form == ASN1_CONSTRUCTED)
-    {
-      int end_index = *ib_index + len;
-      if(end_index > in_buf_len)
-	return ASN1_LEN_ERROR;
-      while (*ib_index < end_index) {
-
-#ifdef ASN1_DEBUG
-  	printf("decode_value3:*ib_index=%d, end_index=%d\n\r",*ib_index,end_index);
-#endif
-	ei_encode_list_header(decode_buf,ei_index,1); /* 5 bytes */
-	if((maybe_ret=decode(drv_binary,ei_index,in_buf,
-			     ib_index,in_buf_len))<=ASN1_ERROR)
-	  return maybe_ret;
-	decode_buf = (*drv_binary)->orig_bytes;
-      }
-      ei_encode_empty_list(decode_buf,ei_index); /* 1 byte */
-    }
-  else
-    {
-      if (((*drv_binary)->orig_size - *ei_index) < 10+len) { /* 5+len for the  binary*/
-	if (realloc_decode_buf(drv_binary,(*drv_binary)->orig_size * 2) == 
-	    ASN1_ERROR)
-	  return ASN1_ERROR;
-	decode_buf = (*drv_binary)->orig_bytes;
-      }
-      if((*ib_index + len) > in_buf_len)
-	return ASN1_LEN_ERROR;
-      ei_encode_binary(decode_buf,ei_index,&in_buf[*ib_index],len);
-      *ib_index = *ib_index + len;
-#ifdef ASN1_DEBUG
-       printf("decode_value4:ii=%d.\r\n",*ib_index);
-#endif
-    }
-  return ASN1_OK;
-}
-
-int realloc_decode_buf(ErlDrvBinary **drv_binary,int amount) {
-  ErlDrvBinary *tmp_bin;
-
-  if ((tmp_bin=driver_realloc_binary(*drv_binary,amount)) == NULL)
-    return ASN1_ERROR;
-  *drv_binary = tmp_bin;
-  return ASN1_OK;
-}
-
-
-
-/*
- * int decode_partial(drv_binary,in_buf,in_buf_len) 
- */
-/*
- * The in_buf contains two parts: first information about which value
- * will be decoded, as a sequence of tags and tag codes, then the
- * encoded BER value. First of all comes a length field that tells how
- * many following bytes contains the sequence of tags. Then starts the
- * BER encoded message. The tag sequence length field is a single
- * byte. The sequence of tags/tag codes may be one of the codes
- * ASN1_SKIPPED, ASN1_CHOOSEN and a tag or ASN1_OPTIONAL and a
- * tag. ASN1_SKIPPED means that the following tag is mandatory and is
- * skipped. ASN1_CHOOSEN means that the value of this tag shall, if
- * this was the last tag in tag sequence, be returned or be searched
- * in for the next tag. ASN1_OPTIONAL means that this tag shall be
- * skipped but it may be missing. Each tag in the tag sequence
- * correspond to a tag in the BER encoded message. If the decode
- * arives to a position where there is no matching tag, an error is
- * returned (if it wasn't the last tag and it was OPTIONAL). After the
- * right value has been detected it is returned in the out_buf.
- *
- */
-int decode_partial(ErlDrvBinary **drv_binary,unsigned char *in_buf, int in_buf_len)
-{
-  char *out_buf = (*drv_binary)->orig_bytes;
-  int tag_index_val = 1;
-  int msg_index_val;
-  int *msg_index, *tag_index, tmp_index;
-  int tag_seq_length;
-  int wanted_tag, next_tag;
-  int buf_end_index = in_buf_len;
-  int ret = 0, length, old_index;
-  
-  tag_index = &tag_index_val;
-  tag_seq_length = in_buf[0];
-  msg_index = &msg_index_val;
-  *msg_index = tag_seq_length + 1;
-
-
-/*   printf("decode_partial 1: in_buf_len=%d, tag_index=%d, msg_index=%d\r\n,tag_seq_length=%d\r\n",in_buf_len,*tag_index,*msg_index,tag_seq_length); */
-  while(*tag_index < tag_seq_length) {
-    switch(in_buf[*tag_index]) {
-    case ASN1_SKIPPED:
-/*       printf("decode_partial ASN1_SKIPPED: in_buf[*msg_index]=%d\r\n",in_buf[*msg_index]); */
-      (*tag_index)++;
-/*       printf("decode_partial ASN1_SKIPPED 2: *msg_index=%d\r\n",*msg_index); */
-      skip_tag(in_buf,msg_index,buf_end_index);
-/*       printf("decode_partial ASN1_SKIPPED 3: *msg_index=%d\r\n",*msg_index); */
-      skip_length_and_value(in_buf,msg_index,buf_end_index);
-/*       printf("decode_partial ASN1_SKIPPED 4: *msg_index=%d\r\n",*msg_index); */
-      break;
-    case ASN1_OPTIONAL:
-      (*tag_index)++;
-/*       printf("decode_partial ASN1_OPTIONAL: in_buf[*tag_index]=%d\r\n",in_buf[*tag_index]); */
-      wanted_tag = in_buf[*tag_index];
-      (*tag_index)++;
-      tmp_index = *msg_index;
-      next_tag = get_tag(in_buf,msg_index,buf_end_index);
-      if (wanted_tag != next_tag) {
-	*msg_index = tmp_index;
-      } else 
-	skip_length_and_value(in_buf,msg_index,buf_end_index);
-      break;
-    case ASN1_CHOOSEN:
-/*       printf("decode_partial ASN1_CHOOSEN: in_buf[*msg_index]=%d, *msg_index=%d\r\n",in_buf[*msg_index],*msg_index); */
-      (*tag_index)++;
-      wanted_tag = in_buf[*tag_index];
-      (*tag_index)++;
-      old_index = *msg_index;
-/*       printf("decode_partial ASN1_CHOOSEN 2: *msg_index=%d\r\n",*msg_index); */
-      next_tag = get_tag(in_buf,msg_index,buf_end_index);
-/*       printf("decode_partial ASN1_CHOOSEN 3: *msg_index=%d\r\n,wanted_tag=%d, next_tag=%d\r\n",*msg_index,wanted_tag,next_tag); */
-      if (wanted_tag != next_tag)
-	return ASN1_NOVALUE; /* an empty binary will be returned to Erlang */
-      if (*tag_index == (tag_seq_length + 1)) { 
-	/* get the value and return*/
-	if((ret = get_value(out_buf,in_buf,msg_index,buf_end_index)) <= ASN1_ERROR)
-	  return ASN1_ERROR;
-	return ret;
-      } 
-      else { 
-	/* calculate the length of the sub buffer and let *msg_index
-	   be at the value part of this BER encoded type*/
-	int indef;
-	indef = 0;
-	length = get_length(in_buf,msg_index,&indef,buf_end_index);
-/* 	printf("decode_partial ASN1_CHOOSEN 4: length=%d, *msg_index=%d\r\n",length,*msg_index); */
-	if ((length == 0) && (indef == 1)) {
-	  /* indefinite length of value */
-	  old_index = *msg_index;
-	  length = skip_length_and_value(in_buf,msg_index,buf_end_index);
-	  *msg_index = old_index;
-	  buf_end_index = *msg_index + length - 2; 
-	  /* remove two bytes due to indefinete length end zeros */
-	} else 
-	  buf_end_index = (*msg_index + length);
-      }
-      break;
-    default:
-      return ASN1_ERROR;
-    }
-  }
-  return ASN1_ERROR;
-}
-
-
-/*
- * int skip_tag(unsigned char *in_buf,int *index,int buf_len)
- * steps past the BER encoded tag in in_buf and updates *index.
- * Returns the number of skipped bytes.
- */
-int skip_tag(unsigned char *in_buf,int *index,int buf_len)
-{
-  int start_index = *index;
-  if ((MASK(in_buf[*index],ASN1_TAG)) == 31){
-    do {
-      (*index)++;
-      if (*index >= buf_len)
-	return ASN1_ERROR;
-    }
-    while(in_buf[*index] >=128);
-  }
-  (*index)++;
-  return (*index - start_index);
-}
-
-
-/*
- * int skip_length_and_value(unsigned char *in_buf,int *index,int buf_len)
- * steps past the BER encoded length and value in in_buf and updates *index.
- * returns the length if the skipped "length value".
- * Returns the number of skipped bytes.
- */
-int skip_length_and_value(unsigned char *in_buf,int *index,int buf_len)
-{
-  long len;
-  int indef = 0, lenoflen;
-  int start_index = *index;
-
-  if ((MASK(in_buf[*index],0x80)) == ASN1_SHORT_DEFINITE_LENGTH){
-    len = in_buf[*index];
-    if (len > (buf_len - (*index + 1)))
-      return ASN1_LEN_ERROR;
-  } else if (in_buf[*index] == ASN1_INDEFINITE_LENGTH)
-    indef = 1;
-  else /* long definite length */ {
-    lenoflen = (in_buf[*index] & 0x7f); /*length of length */
-    len = 0;
-    while (lenoflen--) {
-      (*index)++;
-      len = (len << 8) + in_buf[*index];
-    }
-    if (len > (buf_len - (*index + 1)))
-      return ASN1_LEN_ERROR;
-  }
-  (*index)++;
-  if (indef == 1)
-    {
-      while(!(in_buf[*index]==0 && in_buf[*index + 1]==0)) {
-	skip_tag(in_buf,index,buf_len);
-	skip_length_and_value(in_buf,index,buf_len);
-      }
-      (*index) += 2;
-    }
-  else 
-    (*index) += len;
-  return (*index - start_index);
-}
-
-/* int get_tag(unsigned char *in_buf,int *index)
- *
- * assumes next byte/bytes in in_buf is an encoded BER tag. A tag
- * number has theoretically no upper limit in size. Here the tag
- * number is assumed to be less than 64K. Returns an integer value
- * on the format:
- * xxxxxxxx xxxxxxcc tttttttt tttttttt
- * the x-bits are 0 (insignificant)
- * the c-bits are the class of the tag
- * the t-bits are the tag number. This implies that the tag number
- * is limited to 64K-1
- * 
- */
-int get_tag(unsigned char *in_buf,int *index,int buf_len)
-{
-  int tag_no = 0,tmp_tag = 0;
-
-  tag_no = (MASK(in_buf[*index],ASN1_CLASSFORM));
-  if ((MASK(in_buf[*index],ASN1_TAG)) == ASN1_TAG) {
-    /* long form of tag */
-    do {
-      (*index)++;
-      if (*index >= buf_len)
-	return ASN1_TAG_ERROR;
-      tmp_tag = tmp_tag << 7;
-      tmp_tag += (MASK(in_buf[*index],ASN1_LONG_TAG));
-    } while (in_buf[*index] >= 128);
-    (*index)++;
-    tag_no = tag_no + tmp_tag;
-  } else {
-    tag_no += (MASK(in_buf[*index],ASN1_TAG));
-    (*index)++;
-  }
-  if (*index >= buf_len)
-    return ASN1_TAG_ERROR;
-  return tag_no;
-}
-
-
-/*
- * int get_value(char *out_buf,unsigned char *in_buf,
- *               int *msg_index,int in_buf_len)
- */
-/* assumes next byte/bytes in in_buf is an encoded BER value preceeded by a BER encoded length. Puts value in out_buf.
- */
-int get_value(char *out_buf,
-	      unsigned char *in_buf,
-	      int *msg_index,
-	      int in_buf_len)
-{
-  int len, lenoflen, indef=0, skip_len;
-  int ret=0;
-  int start_index;
-  
-/*   printf("get_value 1\n\r"); */
-  if (in_buf[*msg_index] < 0x80){ /* short definite length */
-    len = in_buf[*msg_index];
-/*     printf("short definite length\r\n"); */
-  } else if (in_buf[*msg_index] > 0x80) { /* long definite length */
-    lenoflen = (in_buf[*msg_index] & 0x7f); /*length of length */
-    len = 0;
-    while (lenoflen--) {
-      (*msg_index)++;
-      len = (len << 8) + in_buf[*msg_index];
-    }
-    if (len > (in_buf_len - (*msg_index + 1)))
-      return ASN1_LEN_ERROR;
-  } else 
-    indef = 1;
-  (*msg_index)++;
-/*   printf("get_value 2: len = %d, *msg_index = %d\r\n",len,*msg_index); */
-  if (indef == 1) {
-    while(!(in_buf[*msg_index]==0 && in_buf[*msg_index + 1]==0)) {
-      start_index = *msg_index;
-      skip_len = skip_tag(in_buf,msg_index,in_buf_len);
-/*       printf("get_value 3: skip_len=%d,start_index=%d,*msg_index=%d\n\r", */
-/* 	     skip_len,start_index,*msg_index); */
-      memcpy(&out_buf[ret],&in_buf[start_index],skip_len);
-      ret += skip_len;
-      start_index = *msg_index;
-      skip_len = skip_length_and_value(in_buf,msg_index,in_buf_len);
-/*       printf("get_value 4: skip_len=%d,start_index=%d,*msg_index=%d\n\r", */
-/* 	     skip_len,start_index,*msg_index); */
-      memcpy(&out_buf[ret],&in_buf[start_index],skip_len);
-      ret += skip_len;
-    }
-    return ret;
-  }
-  else
-    memcpy(&out_buf[ret],&in_buf[*msg_index],len);
-  return len;
-}
-
-
-/*
- * int get_length(unsigned char *in_buf,int *msg_index)
- * assumes next byte/bytes contain a BER encoded length field,
- * which is decoded. The value of the length is returned. If it
- * is an indefinite length the *indef is set to one.
- */
-int get_length(unsigned char *in_buf,int *msg_index,
-	       int *indef,int in_buf_len)
-{
-  int len=0, lenoflen;
-  
-  if (in_buf[*msg_index] < 0x80) /* short definite length */
-    len = in_buf[*msg_index];
-  else if (in_buf[*msg_index] > 0x80) { /* long definite length */
-    lenoflen = (in_buf[*msg_index] & 0x7f); /*length of length */
-    len = 0;
-    while (lenoflen--) {
-      (*msg_index)++;
-      len = (len << 8) + in_buf[*msg_index];
-    }
-    if (len > (in_buf_len - (*msg_index + 1)))
-      return ASN1_LEN_ERROR;
-  } else 
-    *indef = 1;
-  (*msg_index)++;
-  return len;
-}
diff --git a/lib/asn1/c_src/asn1_erl_nif.c b/lib/asn1/c_src/asn1_erl_nif.c
new file mode 100644
index 0000000000..9c9f83bc2a
--- /dev/null
+++ b/lib/asn1/c_src/asn1_erl_nif.c
@@ -0,0 +1,1305 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2002-2011. 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.
+ *
+ * %CopyrightEnd%
+ *
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "erl_nif.h"
+
+/* #define ASN1_DEBUG 1 */
+
+#define ASN1_OK 0
+#define ASN1_ERROR -1
+#define ASN1_COMPL_ERROR 1
+#define ASN1_MEMORY_ERROR 0
+#define ASN1_DECODE_ERROR 2
+#define ASN1_TAG_ERROR -3
+#define ASN1_LEN_ERROR -4
+#define ASN1_INDEF_LEN_ERROR -5
+#define ASN1_VALUE_ERROR -6
+
+#define ASN1_CLASS 0xc0
+#define ASN1_FORM 0x20
+#define ASN1_CLASSFORM (ASN1_CLASS | ASN1_FORM)
+#define ASN1_TAG 0x1f
+#define ASN1_LONG_TAG 0x7f
+
+#define ASN1_INDEFINITE_LENGTH 0x80
+#define ASN1_SHORT_DEFINITE_LENGTH 0
+
+#define ASN1_PRIMITIVE 0
+#define ASN1_CONSTRUCTED 0x20
+
+#define ASN1_NOVALUE 0
+
+#define ASN1_SKIPPED 0
+#define ASN1_OPTIONAL 1
+#define ASN1_CHOOSEN 2
+
+#define CEIL(X,Y) ((X-1) / Y + 1)
+
+#define INVMASK(X,M) (X & (M ^ 0xff))
+#define MASK(X,M) (X & M)
+
+/* PER COMPLETE */
+int per_complete(ErlNifBinary *, unsigned char *, int);
+
+int per_insert_octets(int, unsigned char **, unsigned char **, int *);
+
+int per_insert_octets_except_unused(int, unsigned char **, unsigned char **,
+	int *, int);
+
+int per_insert_octets_as_bits_exact_len(int, int, unsigned char **,
+	unsigned char **, int *);
+
+int per_insert_octets_as_bits(int, unsigned char **, unsigned char **, int *);
+
+int per_pad_bits(int, unsigned char **, int *);
+
+int per_insert_least_sign_bits(int, unsigned char, unsigned char **, int *);
+
+int per_insert_most_sign_bits(int, unsigned char, unsigned char **, int *);
+
+int per_insert_bits_as_bits(int, int, unsigned char **, unsigned char **, int *);
+
+int per_insert_octets_unaligned(int, unsigned char **, unsigned char **, int);
+
+int per_realloc_memory(ErlNifBinary *, int, unsigned char **);
+
+/* BER DECODE */
+int ber_decode_begin(ErlNifEnv *, ERL_NIF_TERM *, unsigned char *, int,
+	unsigned int *);
+
+int ber_decode(ErlNifEnv *, ERL_NIF_TERM *, unsigned char *, int *, int);
+
+int ber_decode_tag(ErlNifEnv *, ERL_NIF_TERM *, unsigned char *, int, int *);
+
+int ber_decode_value(ErlNifEnv*, ERL_NIF_TERM *, unsigned char *, int *, int,
+	int);
+
+/* BER ENCODE */
+typedef struct ber_encode_mem_chunk mem_chunk_t;
+
+int ber_encode(ErlNifEnv *, ERL_NIF_TERM , mem_chunk_t **, unsigned int *);
+
+void ber_free_chunks(mem_chunk_t *chunk);
+mem_chunk_t *ber_new_chunk(unsigned int length);
+int ber_check_memory(mem_chunk_t **curr, unsigned int needed);
+
+int ber_encode_tag(ErlNifEnv *, ERL_NIF_TERM , unsigned int ,
+	mem_chunk_t **, unsigned int *);
+
+int ber_encode_length(size_t , mem_chunk_t **, unsigned int *);
+
+/*
+ *
+ * This section defines functionality for the complete encode of a
+ * PER encoded message
+ *
+ */
+
+int per_complete(ErlNifBinary *out_binary, unsigned char *in_buf,
+	int in_buf_len) {
+    int counter = in_buf_len;
+    /* counter keeps track of number of bytes left in the
+     input buffer */
+
+    int buf_space = in_buf_len;
+    /* This is the amount of allocated space left of the out_binary. It
+     is possible when padding is applied that more space is needed than
+     was originally allocated. */
+
+    int buf_size = in_buf_len;
+    /* Size of the buffer. May become reallocated and thus other than
+     in_buf_len */
+
+    unsigned char *in_ptr, *ptr;
+    /* in_ptr points at the next byte in in_buf to be moved to
+     complete_buf.
+     ptr points into the new completed buffer, complete_buf, at the
+     position of the next byte that will be set */
+    int unused = 8;
+    /* unused = [1,...,8] indicates how many of the rigthmost bits of
+     the byte that ptr points at that are unassigned */
+
+    int no_bits, no_bytes, in_unused, desired_len, ret, saved_mem, needed,
+	    pad_bits;
+
+    unsigned char val;
+
+    in_ptr = in_buf;
+    ptr = out_binary->data;
+    *ptr = 0x00;
+    while (counter > 0) {
+	counter--;
+	switch (*in_ptr) {
+	case 0:
+	    /* just one zero-bit should be added to the buffer */
+	    if (unused == 1) {
+		unused = 8;
+		*++ptr = 0x00;
+		buf_space--;
+	    } else
+		unused--;
+	    break;
+
+	case 1:
+	    /* one one-bit should be added to the buffer */
+	    if (unused == 1) {
+		*ptr = *ptr | 1;
+		unused = 8;
+		*++ptr = 0x00;
+		buf_space--;
+	    } else {
+		*ptr = *ptr | (1 << (unused - 1));
+		unused--;
+	    }
+	    break;
+
+	case 2:
+	    /* align buffer to end of byte */
+	    if (unused != 8) {
+		*++ptr = 0x00;
+		buf_space--;
+		unused = 8;
+	    }
+	    break;
+
+	case 10:
+	    /* next byte in in_buf tells how many bits in the second next
+	     byte that will be used */
+	    /* The leftmost unused bits in the value byte are supposed to be
+	     zero bits */
+	    no_bits = (int) *(++in_ptr);
+	    val = *(++in_ptr);
+	    counter -= 2;
+	    if ((ret = per_insert_least_sign_bits(no_bits, val, &ptr, &unused))
+		    == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	case 20:
+	    /* in this case the next value in_ptr points at holds the number
+	     of following bytes that holds the value that will be inserted
+	     in the completed buffer */
+	    no_bytes = (int) *(++in_ptr);
+	    counter -= (no_bytes + 1);
+	    if ((counter < 0)
+		    || (ret = per_insert_octets(no_bytes, &in_ptr, &ptr,
+			    &unused)) == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	case 21:
+	    /* in this case the next two bytes in_ptr points at holds the number
+	     of following bytes that holds the value that will be inserted
+	     in the completed buffer */
+	    no_bytes = (int) *(++in_ptr);
+	    no_bytes = no_bytes << 8;
+	    no_bytes = no_bytes | (int) *(++in_ptr);
+	    counter -= (2 + no_bytes);
+	    if ((counter < 0)
+		    || (ret = per_insert_octets(no_bytes, &in_ptr, &ptr,
+			    &unused)) == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	case 30:
+	    /* If we call the following bytes, in the buffer in_ptr points at,
+	     By1,By2,Rest then Rest is the value that will be transfered to
+	     the completed buffer. By1 tells how many of the rightmost bits in
+	     Rest that should not be used. By2 is the length of Rest in bytes.*/
+	    in_unused = (int) *(++in_ptr);
+	    no_bytes = (int) *(++in_ptr);
+	    counter -= (2 + no_bytes);
+	    ret = -4711;
+	    if ((counter < 0)
+		    || (ret = per_insert_octets_except_unused(no_bytes, &in_ptr,
+			    &ptr, &unused, in_unused)) == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	case 31:
+	    /* If we call the following bytes, in the buffer in_ptr points at,
+	     By1,By2,By3,Rest then Rest is the value that will be transfered to
+	     the completed buffer. By1 tells how many of the rightmost bits in
+	     Rest that should not be used. By2 and By3 is the length of
+	     Rest in bytes.*/
+	    in_unused = (int) *(++in_ptr);
+	    no_bytes = (int) *(++in_ptr);
+	    no_bytes = no_bytes << 8;
+	    no_bytes = no_bytes | (int) *(++in_ptr);
+	    counter -= (3 + no_bytes);
+	    if ((counter < 0)
+		    || (ret = per_insert_octets_except_unused(no_bytes, &in_ptr,
+			    &ptr, &unused, in_unused)) == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	case 40:
+	    /* This case implies that next byte,By1,(..,By1,By2,Bin,...)
+	     is the desired length of the completed value, maybe needs
+	     padding zero bits or removal of trailing zero bits from Bin.
+	     By2 is the length of Bin and Bin is the value that will be
+	     put into the completed buffer. Each byte in Bin has the value
+	     1 or 0.*/
+	    desired_len = (int) *(++in_ptr);
+	    no_bytes = (int) *(++in_ptr);
+
+	    /* This is the algorithm for need of memory reallocation:
+	     Only when padding (cases 40 - 43,45 - 47) more memory may be
+	     used than allocated. Therefore one has to keep track of how
+	     much of the allocated memory that has been saved, i.e. the
+	     difference between the number of parsed bytes of the input buffer
+	     and the number of used bytes of the output buffer.
+	     If saved memory is less than needed for the padding then we
+	     need more memory. */
+	    saved_mem = buf_space - counter;
+	    pad_bits = desired_len - no_bytes - unused;
+	    needed = (pad_bits > 0) ? CEIL(pad_bits,8) : 0;
+	    if (saved_mem < needed) {
+		/* Have to allocate more memory */
+		buf_size += needed;
+		buf_space += needed;
+		if (per_realloc_memory(out_binary, buf_size, &ptr) == ASN1_ERROR
+		)
+		    return ASN1_ERROR;
+	    }
+
+	    counter -= (2 + no_bytes);
+	    if ((counter < 0)
+		    || (ret = per_insert_octets_as_bits_exact_len(desired_len,
+			    no_bytes, &in_ptr, &ptr, &unused)) == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	case 41:
+	    /* Same as case 40 apart from By2, the length of Bin, which is in
+	     two bytes*/
+	    desired_len = (int) *(++in_ptr);
+	    no_bytes = (int) *(++in_ptr);
+	    no_bytes = no_bytes << 8;
+	    no_bytes = no_bytes | (int) *(++in_ptr);
+
+	    saved_mem = buf_space - counter;
+	    needed = CEIL((desired_len-unused),8) - no_bytes;
+	    if (saved_mem < needed) {
+		/* Have to allocate more memory */
+		buf_size += needed;
+		buf_space += needed;
+		if (per_realloc_memory(out_binary, buf_size, &ptr) == ASN1_ERROR
+		)
+		    return ASN1_ERROR;
+	    }
+
+	    counter -= (3 + no_bytes);
+	    if ((counter < 0)
+		    || (ret = per_insert_octets_as_bits_exact_len(desired_len,
+			    no_bytes, &in_ptr, &ptr, &unused)) == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	case 42:
+	    /* Same as case 40 apart from By1, the desired length, which is in
+	     two bytes*/
+	    desired_len = (int) *(++in_ptr);
+	    desired_len = desired_len << 8;
+	    desired_len = desired_len | (int) *(++in_ptr);
+	    no_bytes = (int) *(++in_ptr);
+
+	    saved_mem = buf_space - counter;
+	    needed = CEIL((desired_len-unused),8) - no_bytes;
+	    if (saved_mem < needed) {
+		/* Have to allocate more memory */
+		buf_size += needed;
+		buf_space += needed;
+		if (per_realloc_memory(out_binary, buf_size, &ptr) == ASN1_ERROR
+		)
+		    return ASN1_ERROR;
+	    }
+
+	    counter -= (3 + no_bytes);
+	    if ((counter < 0)
+		    || (ret = per_insert_octets_as_bits_exact_len(desired_len,
+			    no_bytes, &in_ptr, &ptr, &unused)) == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	case 43:
+	    /* Same as case 40 apart from By1 and By2, the desired length and
+	     the length of Bin, which are in two bytes each. */
+	    desired_len = (int) *(++in_ptr);
+	    desired_len = desired_len << 8;
+	    desired_len = desired_len | (int) *(++in_ptr);
+	    no_bytes = (int) *(++in_ptr);
+	    no_bytes = no_bytes << 8;
+	    no_bytes = no_bytes | (int) *(++in_ptr);
+
+	    saved_mem = buf_space - counter;
+	    needed = CEIL((desired_len-unused),8) - no_bytes;
+	    if (saved_mem < needed) {
+		/* Have to allocate more memory */
+		buf_size += needed;
+		buf_space += needed;
+		if (per_realloc_memory(out_binary, buf_size, &ptr) == ASN1_ERROR
+		)
+		    return ASN1_ERROR;
+	    }
+
+	    counter -= (4 + no_bytes);
+	    if ((counter < 0)
+		    || (ret = per_insert_octets_as_bits_exact_len(desired_len,
+			    no_bytes, &in_ptr, &ptr, &unused)) == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	case 45:
+	    /* This case assumes that the following bytes in the incoming buffer
+	     (called By1,By2,Bin) is By1, which is the number of bits (n) that
+	     will be inserted in the completed buffer. By2 is the number of
+	     bytes in Bin. Each bit in the buffer Bin should be inserted from
+	     the leftmost until the nth.*/
+	    desired_len = (int) *(++in_ptr);
+	    no_bytes = (int) *(++in_ptr);
+
+	    saved_mem = buf_space - counter;
+	    needed = CEIL((desired_len-unused),8) - no_bytes;
+	    if (saved_mem < needed) {
+		/* Have to allocate more memory */
+		buf_size += needed;
+		buf_space += needed;
+		if (per_realloc_memory(out_binary, buf_size, &ptr) == ASN1_ERROR
+		)
+		    return ASN1_ERROR;
+	    }
+
+	    counter -= (2 + no_bytes);
+
+	    if ((counter < 0)
+		    || (ret = per_insert_bits_as_bits(desired_len, no_bytes,
+			    &in_ptr, &ptr, &unused)) == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	case 46:
+	    /* Same as case 45 apart from By1, the desired length, which is
+	     in two bytes. */
+	    desired_len = (int) *(++in_ptr);
+	    desired_len = desired_len << 8;
+	    desired_len = desired_len | (int) *(++in_ptr);
+	    no_bytes = (int) *(++in_ptr);
+
+	    saved_mem = buf_space - counter;
+	    needed = CEIL((desired_len-unused),8) - no_bytes;
+	    if (saved_mem < needed) {
+		/* Have to allocate more memory */
+		buf_size += needed;
+		buf_space += needed;
+		if (per_realloc_memory(out_binary, buf_size, &ptr) == ASN1_ERROR
+		)
+		    return ASN1_ERROR;
+	    }
+
+	    counter -= (3 + no_bytes);
+	    if ((counter < 0)
+		    || (ret = per_insert_bits_as_bits(desired_len, no_bytes,
+			    &in_ptr, &ptr, &unused)) == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	case 47:
+	    /* Same as case 45 apart from By1 and By2, the desired length
+	     and the length of Bin, which are in two bytes each. */
+	    desired_len = (int) *(++in_ptr);
+	    desired_len = desired_len << 8;
+	    desired_len = desired_len | (int) *(++in_ptr);
+	    no_bytes = (int) *(++in_ptr);
+	    no_bytes = no_bytes << 8;
+	    no_bytes = no_bytes | (int) *(++in_ptr);
+
+	    saved_mem = buf_space - counter;
+	    needed = CEIL((desired_len-unused),8) - no_bytes;
+	    if (saved_mem < needed) {
+		/* Have to allocate more memory */
+		buf_size += needed;
+		buf_space += needed;
+		if (per_realloc_memory(out_binary, buf_size, &ptr) == ASN1_ERROR
+		)
+		    return ASN1_ERROR;
+	    }
+
+	    counter -= (4 + no_bytes);
+	    if ((counter < 0)
+		    || (ret = per_insert_bits_as_bits(desired_len, no_bytes,
+			    &in_ptr, &ptr, &unused)) == ASN1_ERROR
+		    )
+		return ASN1_ERROR;
+	    buf_space -= ret;
+	    break;
+
+	default:
+	    return ASN1_ERROR;
+	}
+	in_ptr++;
+    }
+    /* The returned buffer must be at least one byte and
+     it must be octet aligned */
+    if ((unused == 8) && (ptr != out_binary->data))
+	return (ptr - out_binary->data);
+    else {
+	ptr++; /* octet align buffer */
+	return (ptr - out_binary->data);
+    }
+}
+
+int per_realloc_memory(ErlNifBinary *binary, int amount, unsigned char **ptr) {
+
+    int i = *ptr - binary->data;
+
+    if (!enif_realloc_binary(binary, amount)) {
+	/*error handling due to memory allocation failure */
+	return ASN1_ERROR;
+    } else {
+	*ptr = binary->data + i;
+    }
+    return ASN1_OK;
+}
+
+int per_insert_most_sign_bits(int no_bits, unsigned char val,
+	unsigned char **output_ptr, int *unused) {
+    unsigned char *ptr = *output_ptr;
+
+    if (no_bits < *unused) {
+	*ptr = *ptr | (val >> (8 - *unused));
+	*unused -= no_bits;
+    } else if (no_bits == *unused) {
+	*ptr = *ptr | (val >> (8 - *unused));
+	*unused = 8;
+	*++ptr = 0x00;
+    } else {
+	*ptr = *ptr | (val >> (8 - *unused));
+	*++ptr = 0x00;
+	*ptr = *ptr | (val << *unused);
+	*unused = 8 - (no_bits - *unused);
+    }
+    *output_ptr = ptr;
+    return ASN1_OK;
+}
+
+int per_insert_least_sign_bits(int no_bits, unsigned char val,
+	unsigned char **output_ptr, int *unused) {
+    unsigned char *ptr = *output_ptr;
+    int ret = 0;
+
+    if (no_bits < *unused) {
+	*ptr = *ptr | (val << (*unused - no_bits));
+	*unused -= no_bits;
+    } else if (no_bits == *unused) {
+	*ptr = *ptr | val;
+	*unused = 8;
+	*++ptr = 0x00;
+	ret++;
+    } else {
+	/* first in the begun byte in the completed buffer insert
+	 so many bits that fit, then insert the rest in next byte.*/
+	*ptr = *ptr | (val >> (no_bits - *unused));
+	*++ptr = 0x00;
+	ret++;
+	*ptr = *ptr | (val << (8 - (no_bits - *unused)));
+	*unused = 8 - (no_bits - *unused);
+    }
+    *output_ptr = ptr;
+    return ret;
+}
+
+/* per_pad_bits adds no_bits bits in the buffer that output_ptr
+ points at.
+ */
+int per_pad_bits(int no_bits, unsigned char **output_ptr, int *unused) {
+    unsigned char *ptr = *output_ptr;
+    int ret = 0;
+
+    while (no_bits > 0) {
+	if (*unused == 1) {
+	    *unused = 8;
+	    *++ptr = 0x00;
+	    ret++;
+	} else
+	    (*unused)--;
+	no_bits--;
+    }
+    *output_ptr = ptr;
+    return ret;
+}
+
+/* insert_bits_as_bits removes no_bytes bytes from the buffer that in_ptr
+ points at and takes the desired_no leftmost bits from those removed
+ bytes and inserts them in the buffer(output buffer) that ptr points at.
+ The unused parameter tells how many bits that are not set in the
+ actual byte in the output buffer. If desired_no is more bits than the
+ input buffer has in no_bytes bytes, then zero bits is padded.*/
+int per_insert_bits_as_bits(int desired_no, int no_bytes,
+	unsigned char **input_ptr, unsigned char **output_ptr, int *unused) {
+    unsigned char *in_ptr = *input_ptr;
+    unsigned char val;
+    int no_bits, ret, ret2;
+
+    if (desired_no == (no_bytes * 8)) {
+	if (per_insert_octets_unaligned(no_bytes, &in_ptr, output_ptr, *unused)
+		== ASN1_ERROR
+		)
+	    return ASN1_ERROR;
+	ret = no_bytes;
+    } else if (desired_no < (no_bytes * 8)) {
+	/*     printf("per_insert_bits_as_bits 1\n\r"); */
+	if (per_insert_octets_unaligned(desired_no / 8, &in_ptr, output_ptr,
+		*unused) == ASN1_ERROR
+	)
+	    return ASN1_ERROR;
+	/*     printf("per_insert_bits_as_bits 2\n\r"); */
+	val = *++in_ptr;
+	/*     printf("val = %d\n\r",(int)val); */
+	no_bits = desired_no % 8;
+	/*     printf("no_bits = %d\n\r",no_bits); */
+	per_insert_most_sign_bits(no_bits, val, output_ptr, unused);
+	ret = CEIL(desired_no,8);
+    } else {
+	if (per_insert_octets_unaligned(no_bytes, &in_ptr, output_ptr, *unused)
+		== ASN1_ERROR
+		)
+	    return ASN1_ERROR;
+	ret2 = per_pad_bits(desired_no - (no_bytes * 8), output_ptr, unused);
+	/*     printf("ret2 = %d\n\r",ret2); */
+	ret = CEIL(desired_no,8);
+	/*     printf("ret = %d\n\r",ret); */
+    }
+    /*   printf("*unused = %d\n\r",*unused); */
+    *input_ptr = in_ptr;
+    return ret;
+}
+
+/* per_insert_octets_as_bits_exact_len */
+int per_insert_octets_as_bits_exact_len(int desired_len, int in_buff_len,
+	unsigned char **in_ptr, unsigned char **ptr, int *unused) {
+    int ret = 0;
+    int ret2 = 0;
+
+    if (desired_len == in_buff_len) {
+	if ((ret = per_insert_octets_as_bits(in_buff_len, in_ptr, ptr, unused))
+		== ASN1_ERROR
+		)
+	    return ASN1_ERROR;
+    } else if (desired_len > in_buff_len) {
+	if ((ret = per_insert_octets_as_bits(in_buff_len, in_ptr, ptr, unused))
+		== ASN1_ERROR
+		)
+	    return ASN1_ERROR;
+	/* now pad with zero bits */
+	/*     printf("~npad_bits: called with %d bits padding~n~n~r",desired_len - in_buff_len); */
+	if ((ret2 = per_pad_bits(desired_len - in_buff_len, ptr, unused))
+		== ASN1_ERROR
+		)
+	    return ASN1_ERROR;
+    } else {/* desired_len < no_bits */
+	if ((ret = per_insert_octets_as_bits(desired_len, in_ptr, ptr, unused))
+		== ASN1_ERROR
+		)
+	    return ASN1_ERROR;
+	/* now remove no_bits - desired_len bytes from in buffer */
+	*in_ptr += (in_buff_len - desired_len);
+    }
+    return (ret + ret2);
+}
+
+/* insert_octets_as_bits takes no_bytes bytes from the buffer that input_ptr
+ points at and inserts the least significant bit of it in the buffer that
+ output_ptr points at. Each byte in the input buffer must be 1 or 0
+ otherwise the function returns ASN1_ERROR. The output buffer is concatenated
+ without alignment.
+ */
+int per_insert_octets_as_bits(int no_bytes, unsigned char **input_ptr,
+	unsigned char **output_ptr, int *unused) {
+    unsigned char *in_ptr = *input_ptr;
+    unsigned char *ptr = *output_ptr;
+    int used_bits = 8 - *unused;
+
+    while (no_bytes > 0) {
+	switch (*++in_ptr) {
+	case 0:
+	    if (*unused == 1) {
+		*unused = 8;
+		*++ptr = 0x00;
+	    } else
+		(*unused)--;
+	    break;
+	case 1:
+	    if (*unused == 1) {
+		*ptr = *ptr | 1;
+		*unused = 8;
+		*++ptr = 0x00;
+	    } else {
+		*ptr = *ptr | (1 << (*unused - 1));
+		(*unused)--;
+	    }
+	    break;
+	default:
+	    return ASN1_ERROR;
+	}
+	no_bytes--;
+    }
+    *input_ptr = in_ptr;
+    *output_ptr = ptr;
+    return ((used_bits + no_bytes) / 8); /*return number of new bytes
+     in completed buffer */
+}
+
+/* insert_octets inserts bytes from the input buffer, *input_ptr,
+ into the output buffer, *output_ptr. Before the first byte is
+ inserted the input buffer is aligned.
+ */
+int per_insert_octets(int no_bytes, unsigned char **input_ptr,
+	unsigned char **output_ptr, int *unused) {
+    unsigned char *in_ptr = *input_ptr;
+    unsigned char *ptr = *output_ptr;
+    int ret = 0;
+
+    if (*unused != 8) {/* must align before octets are added */
+	*++ptr = 0x00;
+	ret++;
+	*unused = 8;
+    }
+    while (no_bytes > 0) {
+	*ptr = *(++in_ptr);
+	*++ptr = 0x00;
+	/*      *unused = *unused - 1; */
+	no_bytes--;
+    }
+    *input_ptr = in_ptr;
+    *output_ptr = ptr;
+    return (ret + no_bytes);
+}
+
+/* per_insert_octets_unaligned inserts bytes from the input buffer, *input_ptr,
+ into the output buffer, *output_ptr.No alignment is done.
+ */
+int per_insert_octets_unaligned(int no_bytes, unsigned char **input_ptr,
+	unsigned char **output_ptr, int unused) {
+    unsigned char *in_ptr = *input_ptr;
+    unsigned char *ptr = *output_ptr;
+    int n = no_bytes;
+    unsigned char val;
+
+    while (n > 0) {
+	if (unused == 8) {
+	    *ptr = *++in_ptr;
+	    *++ptr = 0x00;
+	} else {
+	    val = *++in_ptr;
+	    *ptr = *ptr | val >> (8 - unused);
+	    *++ptr = 0x00;
+	    *ptr = val << unused;
+	}
+	n--;
+    }
+    *input_ptr = in_ptr;
+    *output_ptr = ptr;
+    return no_bytes;
+}
+
+int per_insert_octets_except_unused(int no_bytes, unsigned char **input_ptr,
+	unsigned char **output_ptr, int *unused, int in_unused) {
+    unsigned char *in_ptr = *input_ptr;
+    unsigned char *ptr = *output_ptr;
+    int val, no_bits;
+    int ret = 0;
+
+    if (in_unused == 0) {
+	if ((ret = per_insert_octets_unaligned(no_bytes, &in_ptr, &ptr, *unused))
+		== ASN1_ERROR
+		)
+	    return ASN1_ERROR;
+    } else {
+	if ((ret = per_insert_octets_unaligned(no_bytes - 1, &in_ptr, &ptr, *unused))
+		!= ASN1_ERROR) {
+	    val = (int) *(++in_ptr);
+	    no_bits = 8 - in_unused;
+	    /* no_bits is always less than *unused since the buffer is
+	     octet aligned after insert:octets call, so the following
+	     if clasuse is obsolete I think */
+	    if (no_bits < *unused) {
+		*ptr = *ptr | (val >> (8 - *unused));
+		*unused = *unused - no_bits;
+	    } else if (no_bits == *unused) {
+		*ptr = *ptr | (val >> (8 - *unused));
+		*++ptr = 0x00;
+		ret++;
+		*unused = 8;
+	    } else {
+		*ptr = *ptr | (val >> (8 - *unused));
+		*++ptr = 0x00;
+		ret++;
+		*ptr = *ptr | (val << *unused);
+		*unused = 8 - (no_bits - *unused);
+	    }
+	} else
+	    return ASN1_ERROR;
+    }
+    *input_ptr = in_ptr;
+    *output_ptr = ptr;
+    return ret;
+}
+
+/*
+ *
+ * This section defines functionality for the partial decode of a
+ * BER encoded message
+ *
+ */
+
+/*
+ * int decode(ErlNifEnv* env, ERL_NIF_TERM *term, unsigned char *in_buf,
+ int in_buf_len, unsigned int *err_pos)
+ * term is a pointer to the term which is to be returned to erlang
+ * in_buf is a pointer into the buffer of incoming bytes.
+ * in_buf_len is the length of the incoming buffer.
+ * The function reads the bytes in the incoming buffer and structures
+ * it in a nested way as Erlang terms. The buffer contains data in the
+ * order tag - length - value. Tag, length and value has the following
+ * format:
+ * A tag is normally one byte but may be of any length, if the tag number
+ * is greater than 30. +----------+
+ *		       |CL|C|NNNNN|
+ * 		       +----------+
+ * If NNNNN is 31 then will the 7 l.s.b of each of the following tag number
+ * bytes contain the tag number. Each tag number byte that is not the last one
+ * has the m.s.b. set to 1.
+ * The length can be short definite length (sdl), long definite length (ldl)
+ * or indefinite length (il).
+ * sdl: +---------+ the L bits is the length
+ *	|0|LLLLLLL|
+ *	+---------+
+ * ldl:	+---------+ +---------+ +---------+     +-----------+
+ *	|1|lllllll| |first len| |	  |     |the Nth len|
+ *	+---------+ +---------+ +---------+ ... +-----------+
+ *    	The first byte tells how many len octets will follow, max 127
+ * il:  +---------+ +----------------------+ +--------+ +--------+
+ *	|1|0000000| |content octets (Value)| |00000000| |00000000|
+ *	+---------+ +----------------------+ +--------+ +--------+
+ *	The value octets are preceded by one octet and followed by two
+ *	exactly as above. The value must be some tag-length-value encoding.
+ *
+ * The function returns a value in Erlang nif term format:
+ * {{TagNo,Value},Rest}
+ * TagNo is an integer ((CL bsl 16) + tag number) which limits the tag number
+ * to 65535.
+ * Value is a binary if the C bit in tag was unset, otherwise (if tag was
+ * constructed) Value is a list, List.
+ * List is like: [{TagNo,Value},{TagNo,Value},...]
+ * Rest is a binary, i.e. the undecoded part of the buffer. Most often Rest
+ * is the empty binary.
+ * If some error occured during the decoding of the in_buf an error is returned.
+ */
+int ber_decode_begin(ErlNifEnv* env, ERL_NIF_TERM *term, unsigned char *in_buf,
+	int in_buf_len, unsigned int *err_pos) {
+    int maybe_ret;
+    int ib_index = 0;
+    unsigned char *rest_data;
+    ERL_NIF_TERM decoded_term, rest;
+
+    if ((maybe_ret = ber_decode(env, &decoded_term, in_buf, &ib_index,
+	    in_buf_len)) <= ASN1_ERROR)
+    {
+	*err_pos = ib_index;
+	return maybe_ret;
+    };
+
+    // The remaining binary after one ASN1 segment has been decoded
+    if ((rest_data = enif_make_new_binary(env, in_buf_len - ib_index, &rest))
+	    == NULL) {
+	*term = enif_make_atom(env, "could_not_alloc_binary");
+	return ASN1_ERROR;
+    }
+
+    *term = enif_make_tuple2(env, decoded_term, rest);
+    return ASN1_OK;
+}
+
+int ber_decode(ErlNifEnv* env, ERL_NIF_TERM *term, unsigned char *in_buf,
+	int *ib_index, int in_buf_len) {
+    int maybe_ret;
+    int form;
+    ERL_NIF_TERM tag, value;
+
+    /*buffer must hold at least two bytes*/
+    if ((*ib_index + 2) > in_buf_len)
+	return ASN1_VALUE_ERROR;
+    /* "{{TagNo," */
+    if ((form = ber_decode_tag(env, &tag, in_buf, in_buf_len, ib_index))
+	    <= ASN1_ERROR
+	    )
+	return form; /* 5 bytes */
+    if (*ib_index >= in_buf_len) {
+	return ASN1_TAG_ERROR;
+    }
+    /* buffer must hold at least one byte (0 as length and nothing as
+     value) */
+    /* "{{TagNo,Value}," */
+    if ((maybe_ret = ber_decode_value(env, &value, in_buf, ib_index, form,
+	    in_buf_len)) <= ASN1_ERROR
+    )
+	return maybe_ret; /* at least 5 bytes */
+    *term = enif_make_tuple2(env, tag, value);
+    return ASN1_OK;
+}
+
+/*
+ * decode_tag decodes the BER encoded tag in in_buf and creates an
+ * nif term tag
+ */
+int ber_decode_tag(ErlNifEnv* env, ERL_NIF_TERM *tag, unsigned char *in_buf,
+	int in_buf_len, int *ib_index) {
+    int tag_no, tmp_tag, form;
+
+    /* first get the class of tag and bit shift left 16*/
+    tag_no = ((MASK(in_buf[*ib_index],ASN1_CLASS)) << 10);
+
+    form = (MASK(in_buf[*ib_index],ASN1_FORM));
+
+    /* then get the tag number */
+    if ((tmp_tag = (int) INVMASK(in_buf[*ib_index],ASN1_CLASSFORM)) < 31) {
+	*tag = enif_make_uint(env, tag_no + tmp_tag);
+	(*ib_index)++;
+    } else {
+	int n = 0; /* n is used to check that the 64K limit is not
+	 exceeded*/
+
+	/* should check that at least three bytes are left in
+	 in-buffer,at least two tag byte and at least one length byte */
+	if ((*ib_index + 3) > in_buf_len)
+	    return ASN1_VALUE_ERROR;
+	(*ib_index)++;
+	/* The tag is in the following bytes in in_buf as
+	 1ttttttt 1ttttttt ... 0ttttttt, where the t-bits
+	 is the tag number*/
+	/* In practice is the tag size limited to 64K, i.e. 16 bits. If
+	 the tag is greater then 64K return an error */
+	while (((tmp_tag = (int) in_buf[*ib_index]) >= 128) && n < 2) {
+	    /* m.s.b. = 1 */
+	    tag_no = tag_no + (MASK(tmp_tag,ASN1_LONG_TAG) << 7);
+	    (*ib_index)++;
+	    n++;
+	};
+	if ((n == 2) && in_buf[*ib_index] > 3)
+	    return ASN1_TAG_ERROR; /* tag number > 64K */
+	tag_no = tag_no + in_buf[*ib_index];
+	(*ib_index)++;
+	*tag = enif_make_uint(env, tag_no);
+    }
+    return form;
+}
+
+/*
+ * ber_decode_value decodes the BER encoded length and value fields in the
+ * in_buf and puts the value part in the decode_buf as an Erlang
+ * nif term into value
+ */
+int ber_decode_value(ErlNifEnv* env, ERL_NIF_TERM *value, unsigned char *in_buf,
+	int *ib_index, int form, int in_buf_len) {
+    int maybe_ret;
+    unsigned int len = 0;
+    unsigned int lenoflen = 0;
+    int indef = 0;
+    unsigned char *tmp_out_buff;
+    ERL_NIF_TERM term = 0, curr_head = 0;
+
+    if (((in_buf[*ib_index]) & 0x80) == ASN1_SHORT_DEFINITE_LENGTH) {
+	len = in_buf[*ib_index];
+    } else if (in_buf[*ib_index] == ASN1_INDEFINITE_LENGTH
+    )
+	indef = 1;
+    else /* long definite length */{
+	lenoflen = (in_buf[*ib_index] & 0x7f); /*length of length */
+	if (lenoflen > (in_buf_len - (*ib_index + 1)))
+	    return ASN1_LEN_ERROR;
+	len = 0;
+	while (lenoflen--) {
+	    (*ib_index)++;
+	    if (!(len < (1 << (sizeof(len) - 1) * 8)))
+		return ASN1_LEN_ERROR; /* length does not fit in 32 bits */
+	    len = (len << 8) + in_buf[*ib_index];
+	}
+    }
+    if (len > (in_buf_len - (*ib_index + 1)))
+	return ASN1_VALUE_ERROR;
+    (*ib_index)++;
+    if (indef == 1) { /* in this case it is desireably to check that indefinite length
+     end bytes exist in inbuffer */
+	curr_head = enif_make_list(env, 0);
+	while (!(in_buf[*ib_index] == 0 && in_buf[*ib_index + 1] == 0)) {
+	    if (*ib_index >= in_buf_len)
+		return ASN1_INDEF_LEN_ERROR;
+
+	    if ((maybe_ret = ber_decode(env, &term, in_buf, ib_index, in_buf_len))
+		    <= ASN1_ERROR
+		    )
+		return maybe_ret;
+	    curr_head = enif_make_list_cell(env, term, curr_head);
+	}
+	enif_make_reverse_list(env, curr_head, value);
+	(*ib_index) += 2; /* skip the indefinite length end bytes */
+    } else if (form == ASN1_CONSTRUCTED)
+    {
+	int end_index = *ib_index + len;
+	if (end_index > in_buf_len)
+	    return ASN1_LEN_ERROR;
+	curr_head = enif_make_list(env, 0);
+	while (*ib_index < end_index) {
+
+	    if ((maybe_ret = ber_decode(env, &term, in_buf, ib_index,
+		    in_buf_len)) <= ASN1_ERROR
+	    )
+		return maybe_ret;
+	    curr_head = enif_make_list_cell(env, term, curr_head);
+	}
+	enif_make_reverse_list(env, curr_head, value);
+    } else {
+	if ((*ib_index + len) > in_buf_len)
+	    return ASN1_LEN_ERROR;
+	tmp_out_buff = enif_make_new_binary(env, len, value);
+	memcpy(tmp_out_buff, in_buf + *ib_index, len);
+	*ib_index = *ib_index + len;
+    }
+    return ASN1_OK;
+}
+
+struct ber_encode_mem_chunk {
+    mem_chunk_t *next;
+    int length;
+    char *top;
+    char *curr;
+};
+
+int ber_encode(ErlNifEnv *env, ERL_NIF_TERM term, mem_chunk_t **curr, unsigned int *count) {
+
+    const ERL_NIF_TERM *tv;
+    unsigned int form;
+    int arity;
+
+    if (!enif_get_tuple(env, term, &arity, &tv))
+	return ASN1_ERROR;
+
+    form = enif_is_list(env, tv[1]) ? ASN1_CONSTRUCTED : ASN1_PRIMITIVE;
+
+    switch (form) {
+    case ASN1_PRIMITIVE: {
+	ErlNifBinary value;
+	if (!enif_inspect_binary(env, tv[1], &value))
+	    return ASN1_ERROR;
+
+	if (ber_check_memory(curr, value.size))
+	    return ASN1_ERROR;
+	memcpy((*curr)->curr - value.size + 1, value.data, value.size);
+	(*curr)->curr -= value.size;
+	*count += value.size;
+
+	if (ber_encode_length(value.size, curr, count))
+	    return ASN1_ERROR;
+
+	break;
+    }
+    case ASN1_CONSTRUCTED: {
+	ERL_NIF_TERM head, tail;
+	unsigned int tmp_cnt;
+
+	if(!enif_make_reverse_list(env, tv[1], &head))
+	    return ASN1_ERROR;
+
+	if (!enif_get_list_cell(env, head, &head, &tail)) {
+	    if (enif_is_empty_list(env, tv[1])) {
+		*((*curr)->curr) = 0;
+		(*curr)->curr -= 1;
+		(*count)++;
+		break;
+	    } else
+		return ASN1_ERROR;
+	}
+
+	do {
+	    tmp_cnt = 0;
+	    if (ber_encode(env, head, curr, &tmp_cnt)) {
+		return ASN1_ERROR;
+	    }
+	    *count += tmp_cnt;
+	} while (enif_get_list_cell(env, tail, &head, &tail));
+
+	if (ber_check_memory(curr, *count)) {
+	    return ASN1_ERROR;
+	}
+
+	if (ber_encode_length(*count, curr, count)) {
+	    return ASN1_ERROR;
+	}
+
+	break;
+    }
+    }
+
+    // We need atleast 5 bytes to encode the next tlv
+    if (ber_check_memory(curr, 3))
+	return ASN1_ERROR;
+
+    if (ber_encode_tag(env, tv[0], form, curr, count))
+	return ASN1_ERROR;
+
+    return ASN1_OK;
+}
+
+int ber_encode_tag(ErlNifEnv *env, ERL_NIF_TERM tag, unsigned int form,
+	mem_chunk_t **curr, unsigned int *count) {
+    unsigned int class_tag_no, head_tag;
+    if (!enif_get_uint(env, tag, &class_tag_no))
+	return ASN1_ERROR;
+
+    head_tag = form | ((class_tag_no & 0x30000) >> 10);
+    class_tag_no = class_tag_no & 0xFFFF;
+
+    if (class_tag_no <= 30) {
+	*(*curr)->curr = head_tag | class_tag_no;
+	(*curr)->curr -= 1;
+	(*count)++;
+	return ASN1_OK;
+    } else {
+	*(*curr)->curr = class_tag_no & 127;
+	class_tag_no = class_tag_no >> 7;
+	(*curr)->curr -= 1;
+	(*count)++;
+
+	while (class_tag_no > 0) {
+	    *(*curr)->curr = (class_tag_no & 127) | 0x80;
+	    class_tag_no >>= 7;
+	    (*curr)->curr -= 1;
+	    (*count)++;
+	}
+
+	*(*curr)->curr = head_tag | 0x1F;
+	(*curr)->curr -= 1;
+	(*count)++;
+
+	return ASN1_OK;
+    }
+}
+
+int ber_encode_length(size_t size, mem_chunk_t **curr, unsigned int *count) {
+    if (size < 128) {
+	if (ber_check_memory(curr, 1u))
+	    return ASN1_ERROR;
+	*(*curr)->curr = size;
+	(*curr)->curr -= 1;
+	(*count)++;
+    } else {
+	int chunks = size / 256 + 1;
+	if (ber_check_memory(curr, chunks + 1))
+	    return ASN1_ERROR;
+
+	while (size > 0)
+	{
+	    *(*curr)->curr = size & 0xFF;
+	    size >>= 8;
+	    (*curr)->curr -= 1;
+	    (*count)++;
+	}
+
+	*(*curr)->curr = chunks | 0x80;
+	(*curr)->curr -= 1;
+	(*count)++;
+    }
+    return ASN1_OK;
+}
+
+mem_chunk_t *ber_new_chunk(unsigned int length) {
+    mem_chunk_t *new = enif_alloc(sizeof(mem_chunk_t));
+    if (new == NULL)
+	return NULL;
+    new->next = NULL;
+    new->top = enif_alloc(sizeof(char) * length);
+    if (new->top == NULL) {
+	free(new);
+	return NULL;
+    }
+    new->curr = new->top + length - 1;
+    new->length = length;
+    return new;
+}
+
+void ber_free_chunks(mem_chunk_t *chunk) {
+    mem_chunk_t *curr, *next = chunk;
+    while (next != NULL) {
+	curr = next;
+	next = curr->next;
+	enif_free(curr->top);
+	enif_free(curr);
+    }
+}
+
+int ber_check_memory(mem_chunk_t **curr, unsigned int needed) {
+    mem_chunk_t *new;
+    if ((*curr)->curr-needed >= (*curr)->top)
+	return ASN1_OK;
+
+    if ((new = ber_new_chunk((*curr)->length > needed ? (*curr)->length * 2 : (*curr)->length + needed)) == NULL)
+	return ASN1_ERROR;
+    new->next = *curr;
+    *curr = new;
+    return ASN1_OK;
+}
+
+static ERL_NIF_TERM encode_per_complete(ErlNifEnv* env, int argc,
+	const ERL_NIF_TERM argv[]) {
+    ERL_NIF_TERM err_code;
+    ErlNifBinary in_binary;
+    ErlNifBinary out_binary;
+    int complete_len;
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &in_binary))
+	return enif_make_atom(env, "badarg");
+
+    if (!enif_alloc_binary(in_binary.size, &out_binary))
+	return enif_make_atom(env, "alloc_binary_failed");
+
+    if (in_binary.size == 0)
+	return enif_make_binary(env, &out_binary);
+
+    if ((complete_len = per_complete(&out_binary, in_binary.data,
+	    in_binary.size)) <= ASN1_ERROR) {
+	enif_release_binary(&out_binary);
+	if (complete_len == ASN1_ERROR
+	)
+	    err_code = enif_make_uint(env, '1');
+	else
+	    err_code = enif_make_uint(env, 0);
+	return enif_make_tuple2(env, enif_make_atom(env, "error"), err_code);
+    }
+    if (complete_len < out_binary.size)
+	enif_realloc_binary(&out_binary, complete_len);
+
+    return enif_make_binary(env, &out_binary);
+}
+
+static ERL_NIF_TERM decode_ber_tlv(ErlNifEnv* env, int argc,
+	const ERL_NIF_TERM argv[]) {
+    ErlNifBinary in_binary;
+    ERL_NIF_TERM return_term;
+    unsigned int err_pos = 0, return_code;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &in_binary))
+	return enif_make_badarg(env);
+
+    if ((return_code = ber_decode_begin(env, &return_term, in_binary.data,
+	    in_binary.size, &err_pos)) != ASN1_OK
+    )
+	return enif_make_tuple2(env, enif_make_atom(env,"error"), enif_make_tuple2(env,
+			enif_make_int(env, return_code),enif_make_int(env, err_pos)));
+    return return_term;
+}
+
+static ERL_NIF_TERM encode_ber_tlv(ErlNifEnv* env, int argc,
+	const ERL_NIF_TERM argv[]) {
+    ErlNifBinary out_binary;
+    unsigned int length = 0, pos = 0;
+    int encode_err;
+    mem_chunk_t *curr, *top;
+    ERL_NIF_TERM err_code;
+
+    curr = ber_new_chunk(40);
+
+    if ((encode_err = ber_encode(env, argv[0], &curr, &length))
+	    <= ASN1_ERROR) {
+	ber_free_chunks(curr);
+	err_code = enif_make_int(env, encode_err);
+	return enif_make_tuple2(env, enif_make_atom(env, "error"), err_code);
+    }
+
+    if (!enif_alloc_binary(length, &out_binary)) {
+	ber_free_chunks(curr);
+	return enif_make_tuple2(env, enif_make_atom(env, "error"), enif_make_atom(env,"oom"));
+    }
+
+    top = curr;
+
+    while (curr != NULL) {
+	length = curr->length - (curr->curr-curr->top) -1;
+	if (length > 0)
+	    memcpy(out_binary.data + pos, curr->curr+1, length);
+	pos += length;
+	curr = curr->next;
+    }
+
+    ber_free_chunks(top);
+
+    return enif_make_binary(env, &out_binary);
+}
+
+static int is_ok_load_info(ErlNifEnv* env, ERL_NIF_TERM load_info) {
+    int i;
+    return enif_get_int(env, load_info, &i) && i == 1;
+}
+
+static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info) {
+    if (!is_ok_load_info(env, load_info))
+	return -1;
+    return 0;
+}
+
+static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data,
+	ERL_NIF_TERM load_info) {
+    if (!is_ok_load_info(env, load_info))
+	return -1;
+    return 0;
+}
+
+static void unload(ErlNifEnv* env, void* priv_data) {
+
+}
+
+static ErlNifFunc nif_funcs[] = { { "encode_per_complete", 1,
+	encode_per_complete }, { "decode_ber_tlv", 1, decode_ber_tlv }, {
+	"encode_ber_tlv", 1, encode_ber_tlv } };
+
+ERL_NIF_INIT(asn1rt_nif, nif_funcs, load, NULL, upgrade, unload)
diff --git a/lib/asn1/doc/src/Makefile b/lib/asn1/doc/src/Makefile
index d29225f6c9..566173837c 100644
--- a/lib/asn1/doc/src/Makefile
+++ b/lib/asn1/doc/src/Makefile
@@ -27,15 +27,6 @@ include ../../vsn.mk
 VSN=$(ASN1_VSN)
 APPLICATION=asn1
 
-
-# ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -86,34 +77,10 @@ EXTRA_FILES = \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex) \
-	$(BOOK_FILES:%.xml=%.sgml) part.tex
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-TOP_PS_FILE  = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif
-
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -126,8 +93,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -142,32 +107,6 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f $(GEN_XML) errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ $(LATEX_CLEAN) 
-
-endif
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -179,8 +118,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -191,31 +128,4 @@ release_docs_spec: docs
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
 
-else 
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-	$(HTML_APPHISTORY) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-endif
-endif
-
-endif
-
 release_spec:
-
-
-
diff --git a/lib/asn1/doc/src/asn1_spec.xmlsrc b/lib/asn1/doc/src/asn1_spec.xmlsrc
index 8d61834da8..07cba17816 100644
--- a/lib/asn1/doc/src/asn1_spec.xmlsrc
+++ b/lib/asn1/doc/src/asn1_spec.xmlsrc
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -43,7 +43,7 @@
   <p>So far this functionality is only provided when using the
     optimized BER_BIN version, that is when compiling with the
     options <c>ber_bin</c> and <c>optimize</c>. It does also work
-    using the <c>driver</c> option. We have no intent to make this
+    using the <c>nif</c> option. We have no intent to make this
     available on the default BER version, but maybe in the PER_BIN
     version (<c>per_bin</c>).
     </p>
@@ -661,7 +661,9 @@ ValAction = {'Action',17,{'Button',4711,false}}.
       <p>The ASN.1 specs in the test are compiled with the options
         <c>ber_bin, optimize, driver</c> and <c>asn1config</c>. If the
         <c>driver</c> option had been omitted there should have been
-        higher values for <c>decode</c> and <c>decode_part</c>.
+        higher values for <c>decode</c> and <c>decode_part</c>. These tests have
+	not been re-run using nifs, but are expected to perform about 5% better
+	than the linked-in driver.
         </p>
       <p>The test program runs 10000 decodes on the value, resulting
         in a printout with the elapsed time in microseconds for the
diff --git a/lib/asn1/doc/src/asn1_ug.xml b/lib/asn1/doc/src/asn1_ug.xml
index 12d986308f..1b399fb641 100644
--- a/lib/asn1/doc/src/asn1_ug.xml
+++ b/lib/asn1/doc/src/asn1_ug.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -347,7 +347,7 @@ erlc -o ../asnfiles -I ../asnfiles -I /usr/local/standards/asn1 Person.asn
           <p>This flag has effect only when used together with one of
             <c>per_bin</c> or <c>ber_bin</c> flags. It gives time optimized
             code in the generated modules and it uses another runtime module.
-            In the <c>per_bin</c> case a linked-in driver is used. The
+            In the <c>per_bin</c> case a nif is used. The
             result from an encode is a binary.</p>
           <p><em>When this flag is used you cannot use the old format</em><c>{TypeName,Value}</c> when you encode values. Since it is
             an unnecessary construct it has been removed in favor of
@@ -362,9 +362,14 @@ erlc -o ../asnfiles -I ../asnfiles -I /usr/local/standards/asn1 Person.asn
         </item>
         <tag><c>+driver</c></tag>
         <item>
-          <p>Together with the flags <c>ber_bin</c> and <c>optimize</c>
-            you choose to use a linked in driver for considerable faster
-            decode.</p>
+           <p>As of R15B this means the same as the <c>nif</c> option. Kept for
+	    backwards compatability reasons.</p>
+        </item>
+	<tag><c>+nif</c></tag>
+        <item>
+          <p>Together with the flags <c>ber_bin</c>
+	  and <c>optimize</c> you choose to use a nif for considerable
+	  faster encode and decode. </p>
         </item>
         <tag><c>+asn1config</c></tag>
         <item>
@@ -492,7 +497,7 @@ asn1ct:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
       </row>
       <row>
         <cell align="left" valign="middle">BER</cell>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize, driver]</em></cell>
+        <cell align="left" valign="middle"><em>[ber_bin, optimize, nif]</em></cell>
         <cell align="left" valign="middle">EAVF</cell>
         <cell align="left" valign="middle">iolist</cell>
         <cell align="left" valign="middle">iolist / binary</cell>
@@ -557,7 +562,7 @@ asn1ct:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
       </row>
       <row>
         <cell align="left" valign="middle">DER</cell>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize, driver, der]</em></cell>
+        <cell align="left" valign="middle"><em>[ber_bin, optimize, nif, der]</em></cell>
         <cell align="left" valign="middle">EAVF</cell>
         <cell align="left" valign="middle">iolist</cell>
         <cell align="left" valign="middle">binary</cell>
@@ -626,23 +631,24 @@ asn1ct:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
     </table>
 
     <p>
-      The sole compile options <c>ber</c>, <c>ber_bin</c> and <c>per</c>
-      are kept for backwards compatibility and should not be used in
-      new code.
+      The compile options <c>ber</c>, <c>per</c> and
+      <c>driver</c> are kept for backwards compatibility and should not be 
+      used in new code. The nif implementation which replaces the linked-in
+      driver has been shown to be about 5-15% faster.
     </p>
     <p>
       You are strongly recommended to use the appropriate alternative
       of the bold typed options. The <c>optimize</c> and
-      <c>driver</c> options does not affect the encode or decode
+      <c>nif</c> options does not affect the encode or decode
       result, just the time spent in run-time. When <c>ber_bin</c> and
-      <c>driver</c> or <c>per_bin, optimize</c> and <c>driver</c> is
-      combined the C-code driver is used in chosen parts of encode /
+      <c>nif</c> or <c>per_bin</c> and <c>optimize</c> is
+      combined the C-code nif is used in chosen parts of encode /
       decode procedure.
     </p>
     <table>
       <row>
         <cell align="left" valign="middle"><em>Compile options, allowed combinations</em></cell>
-        <cell align="left" valign="middle"><em>use of linked-in driver</em></cell>
+        <cell align="left" valign="middle"><em>use of nif</em></cell>
       </row>
       <row>
         <cell align="left" valign="middle">[ber]</cell>
@@ -657,7 +663,7 @@ asn1ct:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
         <cell align="left" valign="middle">no</cell>
       </row>
       <row>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize, driver]</em></cell>
+        <cell align="left" valign="middle"><em>[ber_bin, optimize, nif]</em></cell>
         <cell align="left" valign="middle">yes</cell>
       </row>
       <row>
@@ -690,12 +696,12 @@ asn1ct:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
         <cell align="left" valign="middle">no</cell>
       </row>
       <row>
-        <cell align="left" valign="middle"><em>[ber_bin, optimize, driver, der]</em></cell>
+        <cell align="left" valign="middle"><em>[ber_bin, optimize, nif, der]</em></cell>
         <cell align="left" valign="middle">yes</cell>
       </row>
 
 
-      <tcaption>When the ASN1 linked-in driver is used.</tcaption>
+      <tcaption>When the ASN1 nif is used.</tcaption>
     </table>
 
     </section>
@@ -712,14 +718,14 @@ asn1rt:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
       <pre>
 'H323-MESSAGES':encode('SomeChoiceType',{call,"octetstring"}).
 'H323-MESSAGES':decode('SomeChoiceType',Bytes).      </pre>
-      <p>The asn1 linked-in driver is enabled in two occasions: encoding of
+      <p>The asn1 nif is enabled in two occasions: encoding of
         asn1 values when the asn1 spec is compiled with <c>per_bin</c> and
         <c>optimize</c> or decode of encoded asn1 values when the asn1 spec is
-        compiled with <c>ber_bin</c>, <c>optimize</c> and <c>driver</c>. In
-        those cases the driver will be loaded automatically at the first call
+        compiled with <c>ber_bin</c>, <c>optimize</c> and <c>nif</c>. In
+        those cases the nif will be loaded automatically at the first call
         to <c>encode</c>/<c>decode</c>. If one doesn't want the performance
-        overhead of the driver being loaded at the first call it is possible
-        to load the driver separately by <c>asn1rt:load_driver()</c>.  </p>
+        overhead of the nif being loaded at the first call it is possible
+        to load the nif separately by loading the <c>asn1rt_nif</c> module.</p>
       <p>By invoking the function <c>info/0</c> in a generated module, one
         gets information about which compiler options were used.</p>
     </section>
diff --git a/lib/asn1/doc/src/asn1ct.xml b/lib/asn1/doc/src/asn1ct.xml
index 265f8735c2..0b9ec3df7f 100644
--- a/lib/asn1/doc/src/asn1ct.xml
+++ b/lib/asn1/doc/src/asn1ct.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -52,8 +52,8 @@
         <v>Options = [Option| OldOption]</v>
         <v>Option = ber_bin | per_bin | uper_bin | der | compact_bit_string | 
 	noobj | {n2n,EnumTypeName} |{outdir,Dir} | {i,IncludeDir} | optimize | 
-	driver | asn1config | undec_rest | {inline,OutputName} | inline |
-	{macro_name_prefix, Prefix} | {record_name_prefix, Prefix} | verbose</v>
+	nif | asn1config | undec_rest | {inline,OutputName} | inline |
+	{macro_name_prefix, Prefix} | {record_name_prefix, Prefix} | verbose | warnings_as_errors</v>
         <v>OldOption = ber | per</v> 
         <v>Reason = term()</v>
         <v>Prefix = string()</v>
@@ -212,16 +212,21 @@ Binary = binary()
               <c>per_bin</c> 
               or <c>ber_bin</c> option. It gives time optimized code 
               generated and it uses another runtime module and 
-              in the <c>per_bin</c> case a linked-in driver. The result 
+              in the <c>per_bin</c> case a nif. The result 
               in the <c>per_bin</c> case from an encode when compiled
               with this option will be a binary.</p>
           </item>
           <tag><c>driver</c></tag>
           <item>
+            <p>As of R15B this means the same as the <c>nif</c> option. Kept for
+	    backwards compatability reasons.</p>
+          </item>
+	  <tag><c>nif</c></tag>
+          <item>
             <p>Option valid together with <c>ber_bin</c> and <c>optimize</c>
-              options. It enables the use of a linked-in driver that gives
-              considerable faster decode. In <c>ber_bin</c> the driver is
-              enabled only by explicit use of the option <c>driver</c>.</p>
+	      options. It enables the use of several nifs that gives faster 
+	      encode and decode. Nifs are only enabled by the explicit use of 
+	      the option <c>nif</c></p>
           </item>
           <tag><c>asn1config</c></tag>
           <item>
@@ -264,7 +269,11 @@ Binary = binary()
               <c>.set.asn</c> are exported, unless a
               <c>{export,[atom()]}</c> or <c>{export_all,true}</c> option
               are provided. The list of atoms are names of chosen asn1
-              specs from the <c>.set.asn</c> file.</p>
+              specs from the <c>.set.asn</c> file. </p>
+	      <p>When used together with <c>nif</c> for <c>ber_bin</c>, the
+	      asn1 nifs will be used if the <c>asn1rt_nif</c> module is 
+	      available. If it is not available, a slower erlang fallback
+	      will be used.</p>
           </item>
           <tag><c>inline</c></tag>
           <item>
@@ -289,6 +298,10 @@ Binary = binary()
             <p>Causes more verbose information from the compiler
               describing what it is doing.</p>
           </item>
+          <tag><c>warnings_as_errors</c></tag>
+          <item>
+            <p>Causes warnings to be treated as errors.</p>
+          </item>
         </taglist>
         <p>Any additional option that is applied will be passed to
           the final step when the generated .erl file is compiled.
@@ -343,18 +356,6 @@ Binary = binary()
       </desc>
     </func>
     <func>
-      <name>validate(Module,Type,Value) ->  ok | {error,Reason}</name>
-      <fsummary>Validate an ASN.1 value.</fsummary>
-      <type>
-        <v>Module = Type = atom()</v>
-        <v>Value = term()</v>
-      </type>
-      <desc>
-        <p>Validates that <c>Value</c> conforms  to <c>Type</c> 
-          from <c>Module</c>. <em>Not implemented in this version of the ASN.1 application.</em></p>
-      </desc>
-    </func>
-    <func>
       <name>value(Module ,Type) -> {ok,Value} | {error,Reason}</name>
       <fsummary>Create an ASN.1 value for test purposes.</fsummary>
       <type>
diff --git a/lib/asn1/doc/src/asn1rt.xml b/lib/asn1/doc/src/asn1rt.xml
index 1217a07e9b..0c3c257189 100644
--- a/lib/asn1/doc/src/asn1rt.xml
+++ b/lib/asn1/doc/src/asn1rt.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -42,36 +42,6 @@
   <funcs>
 
     <func>
-      <name>start() -> ok |{error,Reason}</name>
-      <fsummary>Starts the asn1 server.</fsummary>
-      <type>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-	<p>Starts the asn1 server that loads the drivers.</p> 
-	<p>The server schedules a driver that is not blocked by
-	another caller. The driver is used by the asn1 application if
-	specs are compiled with options <c>[per_bin, optimize]</c> or
-	<c>[ber_bin, optimize, driver]</c>. The server will be started
-	automatically at encode/decode if it isn't done explicitly. If
-	encode/decode with driver is used in test or industrial code
-	it is a performance gain to start it explicitly to avoid the
-	one time load in run-time.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>stop() -> ok |{error,Reason}</name>
-      <fsummary>Stops the asn1 server.</fsummary>
-      <type>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-	<p>Stops the asn1 server and unloads the drivers.</p>
-      </desc>
-    </func>
-
-    <func>
       <name>decode(Module,Type,Bytes) -> {ok,Value}|{error,Reason}</name>
       <fsummary>Decode from bytes into an ASN.1 value.</fsummary>
       <type>
@@ -126,35 +96,23 @@
 
     <func>
       <name>load_driver() ->  ok | {error,Reason}</name>
-      <fsummary>Loads the linked-in driver.</fsummary>
+      <fsummary>Loads the linked-in driver. (deprecated)</fsummary>
       <type>
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>This function loads the linked-in driver before the first call
-          to encode. If this function is not called the driver will be loaded
-          automatically at the first call to encode. If one doesn't want the
-          performance cost of a driver load when the application is running,
-          this function makes it possible to load the driver in an 
-          initialization.</p>
-        <p>The driver is only used when encoding/decoding ASN.1 files that
-          were compiled with the options <c>per_bin</c> and <c>optimize</c>.</p>
+	<p>This function is obsolete and will be removed in R16A</p>
       </desc>
     </func>
 
     <func>
       <name>unload_driver() ->  ok | {error,Reason}</name>
-      <fsummary>Unloads the linked-in driver.</fsummary>
+      <fsummary>Unloads the linked-in driver. (deprecated)</fsummary>
       <type>
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>This function unloads the linked-in driver.
-          When the driver has been loaded it remains in the environment until
-          it is unloaded. Normally the driver should remain loaded, it is
-          crucial for the performance of ASN.1 encoding. </p>
-        <p>The driver is only used when ASN.1 modules have been compiled
-          with the flags <c>per_bin</c> and <c>optimize</c>.</p>
+	<p>This function is obsolete and will be removed in R16A</p>
       </desc>
     </func>
 
@@ -188,19 +146,6 @@
           value, to a UTF8 encoded binary.</p>
       </desc>
     </func>
-  
-    <func>
-      <name>validate(Module,Type,Value) ->  ok | {error,Reason}</name>
-      <fsummary>Validate an ASN.1 value.</fsummary>
-      <type>
-        <v>Module = Type = atom()</v>
-        <v>Value = term()</v>
-      </type>
-      <desc>
-        <p>Validates that <c>Value</c> conforms  to <c>Type</c> 
-          from <c>Module</c>. <em>Not implemented in this version of the ASN.1 application.</em></p>
-      </desc>
-    </func>
 
   </funcs>
 
diff --git a/lib/asn1/doc/src/make.dep b/lib/asn1/doc/src/make.dep
deleted file mode 100644
index eb2c0e9a98..0000000000
--- a/lib/asn1/doc/src/make.dep
+++ /dev/null
@@ -1,31 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/gandalf/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: asn1_spec.tex asn1_ug.tex asn1ct.tex asn1rt.tex \
-		book.tex part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-asn1_spec.tex: Seq.asn Seq.asn1config
-
-book.tex: part.xml ref_man.xml
-
-asn1_ug.tex: ../../../../system/doc/definitions/cite.defs
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: exclusive_Win_But.ps selective_TypeList.ps \
-		selective_Window2.ps
-
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 5e221c03e9..52d770c9f6 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -31,6 +31,25 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 1.6.18</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Implement or fix -Werror option</p>
+          <p>
+	    If -Werror is enabled and there are warnings no output
+	    file is written. Also make sure that error/warning
+	    reporting is consistent. (Thanks to Tuncer Ayaz)</p>
+          <p>
+	    Own Id: OTP-9536</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 1.6.17</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
index 2733cde3f8..3a59773d93 100644
--- a/lib/asn1/src/Makefile
+++ b/lib/asn1/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+# Copyright Ericsson AB 1997-2011. 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
@@ -68,7 +68,7 @@ RT_MODULES= \
 	asn1rt_per_bin_rt2ct \
 	asn1rt_uper_bin \
 	asn1rt_check \
-	asn1rt_driver_handler
+	asn1rt_nif
 #	asn1_sup \
 #	asn1_app \
 #	asn1_server
diff --git a/lib/asn1/src/asn1.app.src b/lib/asn1/src/asn1.app.src
index abacb0a1e9..09144ba2f7 100644
--- a/lib/asn1/src/asn1.app.src
+++ b/lib/asn1/src/asn1.app.src
@@ -9,12 +9,11 @@
 	asn1rt_ber_bin,
 	asn1rt_ber_bin_v2,
 	asn1rt_check,
-	asn1rt_driver_handler
+        asn1rt_nif
              ]},
   {registered, [
 	asn1_ns,
-	asn1db,
-	asn1_driver_owner
+	asn1db
 		]},
   {env, []},
   {applications, [kernel, stdlib]}
diff --git a/lib/asn1/src/asn1_app.erl b/lib/asn1/src/asn1_app.erl
index 2d3eed1743..9fff96e0bf 100644
--- a/lib/asn1/src/asn1_app.erl
+++ b/lib/asn1/src/asn1_app.erl
@@ -28,7 +28,7 @@
 %%                             {error, Reason}
 %%
 start(_Type, _StartArgs) ->
-    asn1_sup:start_link().
+    {ok, self()}.
 
 %% stop(State)
 %%
diff --git a/lib/asn1/src/asn1_server.erl b/lib/asn1/src/asn1_server.erl
deleted file mode 100644
index aeb59d8b0c..0000000000
--- a/lib/asn1/src/asn1_server.erl
+++ /dev/null
@@ -1,107 +0,0 @@
-%% ``The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id$
-%%
-
-%% Purpose: Provide complete encode/and pre-decode of asn1.
--module(asn1_server).
-
-
-
--behaviour(gen_server).
-
--export([start_link/0,client_port/0]).
-
-%% Internal exports, call-back functions.
--export([init/1,handle_call/3,handle_cast/2,handle_info/2,code_change/3,
-	 terminate/2]).
-
-
-%% Macros
--define(port_names,
-	{ asn1_drv01, asn1_drv02, asn1_drv03, asn1_drv04,
-	  asn1_drv05, asn1_drv06, asn1_drv07, asn1_drv08,
-	  asn1_drv09, asn1_drv10, asn1_drv11, asn1_drv12,
-	  asn1_drv13, asn1_drv14, asn1_drv15, asn1_drv16 }).
-%%% --------------------------------------------------------
-%%% Interface Functions. 
-%%% --------------------------------------------------------
-
-start_link() ->
-    gen_server:start_link({local, asn1_server}, asn1_server, [], []).
-
-init([]) ->
-    process_flag(trap_exit, true),
-    erl_ddll:start(),
-    PrivDir = code:priv_dir(asn1),
-    LibDir1 = filename:join([PrivDir, "lib"]),
-    case erl_ddll:load_driver(LibDir1, asn1_erl_drv) of
-	ok -> ok;
-	{error,_} ->
-	    LibDir2 = 
-		filename:join(LibDir1, 
-			      erlang:system_info(system_architecture)),
-	    erl_ddll:load_driver(LibDir2, asn1_erl_drv)
-    end,
-    open_ports("asn1_erl_drv",size(?port_names)).
-
-open_ports(_,0) ->
-    {ok, []};
-open_ports(Cmd,N) ->   
-    Port = open_port({spawn, Cmd}, []),
-    %% check that driver is loaded, linked and working
-    case catch port_control(Port, 0, []) of
-	{'EXIT', _} ->
-	    {stop, nodriver};
-	_ ->
-	    register(element(N,?port_names), Port),
-	    open_ports(Cmd,N-1)
-    end.
-
-client_port() ->
-    element(erlang:system_info(scheduler_id) rem size(?port_names) + 1,
-	    ?port_names).
-
-
-%%% --------------------------------------------------------
-%%% The call-back functions.
-%%% --------------------------------------------------------
-
-handle_call(_, _, State) ->
-    {noreply, State}.
-
-handle_cast(_, State) ->
-    {noreply, State}.
-
-handle_info({'EXIT', Pid, _Reason}, State) when is_pid(Pid) ->
-    {noreply, State};
-
-handle_info({'EXIT', Port, Reason}, State) when is_port(Port) ->
-    {stop, {port_died, Reason}, State};
-handle_info(_, State) ->
-    {noreply, State}.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-terminate(_Reason, _State) ->
-    close_ports(size(?port_names)).
-
-close_ports(0) ->
-    ok;
-close_ports(N) ->   
-    element(N,?port_names) ! {self(), close}, %% almost same as port_close(Name)
-    close_ports(N-1).
diff --git a/lib/asn1/src/asn1_sup.erl b/lib/asn1/src/asn1_sup.erl
deleted file mode 100644
index a241dec6f4..0000000000
--- a/lib/asn1/src/asn1_sup.erl
+++ /dev/null
@@ -1,37 +0,0 @@
-%% ``The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved via the world wide web 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.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id$
-%%
-
-%% Purpose: Main supervisor in asn1 application.
-
--module(asn1_sup).
-
--behaviour(supervisor).
-
--export([start_link/0, init/1]).
-
-start_link() ->
-    supervisor:start_link({local, asn1_sup}, asn1_sup, []).
-
-
-%% init([])
-%% Returns: {ok,  {SupFlags,  [ChildSpec]}}
-%%
-init([]) ->
-    Child = {asn1_server, {asn1_server, start_link, []},
-	     permanent, 2000, worker, [asn1_server]},
-    {ok, {{one_for_all, 10, 3600}, [Child]}}.
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index a167d27f82..85bb5b2f28 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -39,7 +39,7 @@
 	 add_tobe_refed_func/1,add_generated_refed_func/1,
 	 maybe_rename_function/3,latest_sindex/0,current_sindex/0,
 	 set_current_sindex/1,next_sindex/0,maybe_saved_sindex/2,
-	 parse_and_save/2,verbose/3,warning/3,error/3]).
+	 parse_and_save/2,verbose/3,warning/3,warning/4,error/3]).
 
 -include("asn1_records.hrl").
 -include_lib("stdlib/include/erl_compile.hrl").
@@ -47,6 +47,10 @@
 
 -import(asn1ct_gen_ber_bin_v2,[encode_tag_val/3,decode_class/1]).
 
+-ifndef(vsn).
+-define(vsn,"0.0.1").
+-endif.
+
 -define(unique_names,0).
 -define(dupl_uniquedefs,1).
 -define(dupl_equaldefs,2).
@@ -81,6 +85,12 @@ compile(File) ->
     compile(File,[]).
 
 compile(File,Options) when is_list(Options) ->
+    case lists:member(driver, Options) of %% remove me in R16A!
+	true ->
+	    io:format("Warning: driver option is obsolete and will be removed in R16A, use nif instead!");
+	false ->
+	    ok
+    end,
     Options1 = optimize_ber_bin(Options),
     Options2 = includes(File,Options1),
     Includes=[I||{i,I}<-Options2],
@@ -825,10 +835,13 @@ generate({true,{M,_Module,GenTOrV}},OutFile,EncodingRule,Options) ->
     case catch specialized_decode_prepare(EncodingRule,M,GenTOrV,Options) of
 	{error, enoent} -> ok;
 	{error, Reason} -> warning("Error in configuration "
-				   "file: ~n~p~n",[Reason],Options);
+				   "file: ~n~p~n",[Reason],Options,
+				   "Error in configuration file");
 	{'EXIT',Reason} -> warning("Internal error when "
 				   "analyzing configuration "
-				   "file: ~n~p~n",[Reason],Options);
+				   "file: ~n~p~n",[Reason],Options,
+				   "Internal error when "
+				   "analyzing configuration");
 	_ -> ok
     end,
 
@@ -1082,7 +1095,7 @@ get_runtime_mod(Options) ->
 	    ber_bin_v2 -> ["asn1rt_ber_bin_v2.erl"];
 	    uper_bin -> ["asn1rt_uper_bin.erl"]
 	end,
-    RtMod1++["asn1rt_check.erl","asn1rt_driver_handler.erl","asn1rt.erl"].
+    RtMod1++["asn1rt_check.erl","asn1rt.erl"].
     
 
 erl_compile(OutFile,Options) ->
@@ -2524,14 +2537,14 @@ type_check(#'Externaltypereference'{}) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Report functions.
 %%
-%% Errors messages are controlled with the 'errors' compiler option
+%% Error messages are controlled with the 'errors' compiler option
 %% Warning messages are controlled with the 'warnings' compiler option
 %% Verbose messages are controlled with the 'verbose' compiler option
 
 error(Format, Args, S) ->
     case is_error(S) of
 	true ->
-	    io:format("Error: " ++ Format, Args);
+	    io:format(Format, Args);
 	false ->
 	    ok
     end.
@@ -2544,6 +2557,17 @@ warning(Format, Args, S) ->
 	    ok
     end.
 
+warning(Format, Args, S, Reason) ->
+    case {is_werr(S), is_error(S), is_warning(S)} of
+	{true, true, _} ->
+	    io:format(Format, Args),
+	    throw({error, Reason});
+	{false, _, true} ->
+	    io:format(Format, Args);
+	_ ->
+	    ok
+    end.
+
 verbose(Format, Args, S) ->
     case is_verbose(S) of
 	true ->
@@ -2566,3 +2590,8 @@ is_verbose(S) when is_record(S, state) ->
     is_verbose(S#state.options);
 is_verbose(O) ->
     lists:member(verbose, O).
+
+is_werr(S) when is_record(S, state) ->
+    is_werr(S#state.options);
+is_werr(O) ->
+    lists:member(warnings_as_errors, O).
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index efd731f052..e318477234 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -2031,7 +2031,7 @@ get_objectset_def2(_S,T = #typedef{typespec=#'ObjectSet'{}},_CField) ->
     T;
 get_objectset_def2(S,T,_CField) ->
     asn1ct:warning("get_objectset_def2: uncontrolled object set structure:~n~p~n",
-		   [T],S).
+		   [T],S,"get_objectset_def2: uncontrolled object set structure").
     
 type_name(S,#type{def=Def}) ->
     CurrMod = S#state.mname,
@@ -2705,7 +2705,7 @@ normalize_value(S,Type,{'DEFAULT',Value},NameList) ->
 	    normalize_objectclassfieldvalue(S,Value,NL);
 	Err ->
 	    asn1ct:warning("could not check default value ~p~nType:~n~p~nNameList:~n~p~n",
-			   [Value,Type,Err],S),
+			   [Value,Type,Err],S,"could not check default value"),
 	    Value
     end;
 normalize_value(S,Type,Val,NameList) ->
@@ -2791,22 +2791,27 @@ normalize_bitstring(S,Value,Type)->
 		    case catch lists:map(F,RecList) of
 			{error,Reason} ->
 			    asn1ct:warning("default value not "
-				      "compatible with type definition ~p~n",
-				      [Reason],S),
+					   "compatible with type definition ~p~n",
+					   [Reason],S,
+					   "default value not "
+					   "compatible with type definition"),
 			    Value;
 			NewList ->
 			    NewList
 		    end;
 		_ ->
 		    asn1ct:warning("default value not "
-			      "compatible with type definition ~p~n",
-			      [RecList],S),
+				   "compatible with type definition ~p~n",
+				   [RecList],S,
+				   "default value not "
+				   "compatible with type definition"),
 		    Value
 	    end;
 	{Name,String} when is_atom(Name) ->
 	    normalize_bitstring(S,String,Type);
 	Other ->
-	    asn1ct:warning("illegal default value ~p~n",[Other],S),
+	    asn1ct:warning("illegal default value ~p~n",[Other],S,
+			   "illegal default value"),
 	    Value
     end.
 
@@ -2846,12 +2851,14 @@ normalize_octetstring(S,Value,CType) ->
 	    lists:map(fun([])-> ok;
 			 (H)when H > 255->
 			      asn1ct:warning("not legal octet value ~p in OCTET STRING, ~p~n",
-					     [H,List],S);
+					     [H,List],S,
+					     "not legal octet value ~p in OCTET STRING");
 			 (_)-> ok
 		      end, List),
 	    List;
 	Other ->
-	    asn1ct:warning("unknown default value ~p~n",[Other],S),
+	    asn1ct:warning("unknown default value ~p~n",[Other],S,
+			   "unknown default value"),
 	    Value
     end.
 
@@ -2908,13 +2915,15 @@ normalize_enumerated(S,{Name,EnumV},CType) when is_atom(Name) ->
 normalize_enumerated(S,Value,{CType1,CType2}) when is_list(CType1), is_list(CType2)->
     normalize_enumerated(S,Value,CType1++CType2);
 normalize_enumerated(S,V,CType) ->
-    asn1ct:warning("Enumerated unknown type ~p~n",[CType],S),
+    asn1ct:warning("Enumerated unknown type ~p~n",[CType],S,
+		   "Enumerated unknown type"),
     V.
 normalize_enumerated2(S,V,Enum) ->
     case lists:keysearch(V,1,Enum) of
 	{value,{Val,_}} -> Val;
 	_ -> 
-	    asn1ct:warning("Enumerated value is not correct ~p~n",[V],S),
+	    asn1ct:warning("enumerated value is not correct ~p~n",[V],S,
+			   "enumerated value is not correct"),
 	    V
     end.
 
@@ -2925,7 +2934,8 @@ normalize_choice(S,{'CHOICE',{C,V}},CType,NameList) when is_atom(C) ->
 	    {C,normalize_value(S,CT,{'DEFAULT',V},
 			       [Name|NameList])};
 	Other ->
-	    asn1ct:warning("Wrong format of type/value ~p/~p~n",[Other,V],S),
+	    asn1ct:warning("Wrong format of type/value ~p/~p~n",[Other,V],S,
+			   "Wrong format of type/value"),
 	    {C,V}
     end;
 normalize_choice(S,{'DEFAULT',ValueList},CType,NameList) when is_list(ValueList) ->
@@ -3101,7 +3111,8 @@ normalize_s_of(SorS,S,Value,Type,NameList) when is_list(Value) ->
 	List when is_list(List) ->
 	    List;
 	_ ->
-	    asn1ct:warning("~p could not handle value ~p~n",[SorS,Value],S),
+	    asn1ct:warning("~p could not handle value ~p~n",[SorS,Value],S,
+			   "could not handle value"),
 	    Value
     end;
 normalize_s_of(SorS,S,Value,Type,NameList) 
@@ -3159,7 +3170,8 @@ get_normalized_value(S,Val,Type,Func,AddArg) ->
 	    V2 = sort_val_if_set(AddArg,NewVal,Type),
 	    call_Func(update_state(S,ExtM),V2,Type,Func,AddArg);
 	_ ->
-	    asn1ct:warning("default value not comparable ~p~n",[Val],S),
+	    asn1ct:warning("default value not comparable ~p~n",[Val],S,
+			   "default value not comparable"),
 	    Val
     end.
 
@@ -5756,7 +5768,8 @@ ascending_order_check1(S,TypeName,
 		       [C1 = #'ComponentType'{tags=[{_,T}|_]},
 			C2 = #'ComponentType'{tags=[{_,T}|_]}|Rest]) ->
     asn1ct:warning("Indistinct tag ~p in SET ~p, components ~p and ~p~n",
-	      [T,TypeName,C1#'ComponentType'.name,C2#'ComponentType'.name],S),
+		   [T,TypeName,C1#'ComponentType'.name,C2#'ComponentType'.name],S,
+		   "Indistinct tag in SET"),
     ascending_order_check1(S,TypeName,[C2|Rest]);
 ascending_order_check1(S,TypeName,
 		       [C1 = #'ComponentType'{tags=[{'UNIVERSAL',T1}|_]},
@@ -5764,9 +5777,10 @@ ascending_order_check1(S,TypeName,
     case (decode_type(T1) == decode_type(T2)) of
 	true ->
 	    asn1ct:warning("Indistinct tags ~p and ~p in"
-		      " SET ~p, components ~p and ~p~n",
-		      [T1,T2,TypeName,C1#'ComponentType'.name,
-		       C2#'ComponentType'.name],S),
+			   " SET ~p, components ~p and ~p~n",
+			   [T1,T2,TypeName,C1#'ComponentType'.name,
+			    C2#'ComponentType'.name],S,
+			   "Indistinct tags and in SET"),
 	    ascending_order_check1(S,TypeName,[C2|Rest]);
 	_ ->
 	    ascending_order_check1(S,TypeName,[C2|Rest])
diff --git a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
index e3be914af4..243ff234a7 100644
--- a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
@@ -877,13 +877,13 @@ gen_dec_choice(Erules,TopType, _ChTag, CompList, Ext) ->
 	    emit([indent(9),"exit({error,{asn1,{invalid_choice_tag,",
 		  {curr,else},"}}})",nl]);
 	_ ->
-	    emit([indent(9),"{asn1_ExtAlt, ?RT_BER:encode(",{curr,else},")}",nl])
+	    emit([indent(9),"{asn1_ExtAlt, ?RT_BER:encode(",{curr,else},
+		  asn1ct_gen:nif_parameter(),")}",nl])
     end,
     emit([indent(3),"end",nl]),
     asn1ct_name:new(tag),
     asn1ct_name:new(else).
 
-
 gen_dec_choice_cases(_Erules,_TopType, []) ->
     ok;
 gen_dec_choice_cases(Erules,TopType, [H|T]) ->
@@ -1227,7 +1227,7 @@ gen_dec_call({typefield,_},_,_,_Cname,Type,BytesVar,Tag,_,_,false,_) ->
     emit([nl,indent(6),"begin",nl]),
 %    emit([indent(9),{curr,opendec}," = ?RT_BER:decode_open_type(",
     emit([indent(9),{curr,tmptlv}," = ?RT_BER:decode_open_type(",
-	  BytesVar,",",{asis,Tag},"),",nl]),
+	  BytesVar,",",{asis,Tag},asn1ct_gen:nif_parameter(),"),",nl]),
 %     emit([indent(9),"{",{curr,tmptlv},",_} = ?RT_BER:decode(",
 % 	  {curr,opendec},"),",nl]),
 
@@ -1242,7 +1242,8 @@ gen_dec_call({typefield,_},_,_,_Cname,Type,BytesVar,Tag,_,_,false,_) ->
     emit([indent(9),"end",nl,indent(6),"end",nl]),
     [];
 gen_dec_call({typefield,_},_,_,Cname,Type,BytesVar,Tag,_,_,_DecObjInf,OptOrMandComp) ->
-    emit(["?RT_BER:decode_open_type(",BytesVar,",",{asis,Tag},")"]),
+    emit(["?RT_BER:decode_open_type(",BytesVar,",",{asis,Tag},
+	  asn1ct_gen:nif_parameter(),")"]),
     RefedFieldName = 
 % 	asn1ct_gen:get_constraint(Type#type.constraint,
 % 				  tableconstraint_info),
@@ -1250,7 +1251,8 @@ gen_dec_call({typefield,_},_,_,Cname,Type,BytesVar,Tag,_,_,_DecObjInf,OptOrMandC
     [{Cname,RefedFieldName,asn1ct_gen:mk_var(asn1ct_name:curr(term)),
       asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
 gen_dec_call({objectfield,PrimFieldName,PFNList},_,_,Cname,_,BytesVar,Tag,_,_,_,OptOrMandComp) ->
-    emit(["?RT_BER:decode_open_type(",BytesVar,",",{asis,Tag},")"]),
+    emit(["?RT_BER:decode_open_type(",BytesVar,",",{asis,Tag},
+	  asn1ct_gen:nif_parameter(),")"]),
     [{Cname,{PrimFieldName,PFNList},asn1ct_gen:mk_var(asn1ct_name:curr(term)),
       asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
 gen_dec_call(InnerType,Erules,TopType,Cname,Type,BytesVar,Tag,PrimOptOrMand,
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl
index c1b6aa5713..e07680f10b 100644
--- a/lib/asn1/src/asn1ct_constructed_per.erl
+++ b/lib/asn1/src/asn1ct_constructed_per.erl
@@ -73,16 +73,23 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
 	_ ->
 	    ok
     end,
-    case {Optionals = optionals(to_textual_order(CompList)),CompList} of
-	{[],EmptyCL} when EmptyCL == {[],[],[]};EmptyCL == {[],[]};EmptyCL == [] -> 
+    case {Optionals = optionals(to_textual_order(CompList)),CompList,
+	  is_optimized(Erule)} of
+	{[],EmptyCL,_} when EmptyCL == {[],[],[]};EmptyCL == {[],[]};EmptyCL == [] -> 
 	    emit(["%%Variable setting just to eliminate ",
 		  "compiler warning for unused vars!",nl,
 		  "_Val = ",{curr,val},",",nl]);
-	{[],_} ->
+	{[],_,_} ->
 	    emit([{next,val}," = ?RT_PER:list_to_record("]),
 	    emit(["'",asn1ct_gen:list2rname(Typename),"'"]),
 	    emit([", ",{curr,val},"),",nl]);
-	_ ->
+	{_,_,true} ->
+	    gen_fixoptionals(Optionals),
+	    FixOpts = param_map(fun(Var) ->
+					{var,Var}
+				end,asn1ct_name:all(fixopt)),
+	    emit({"{",{next,val},",Opt} = {",{curr,val},",[",FixOpts,"]},",nl});
+	{_,_,false} ->
 	    Fixoptcall = ",Opt} = ?RT_PER:fixoptionals(",
 	    emit({"{",{next,val},Fixoptcall,
 		  {asis,Optionals},",",length(Optionals),
@@ -439,9 +446,7 @@ gen_encode_sof(Erule,Typename,SeqOrSetOf,D) when is_record(D,type) ->
 	    _->
 		""
 	end,
-    emit({nl,indent(3),"?RT_PER:encode_length(",
-	  {asis,SizeConstraint},
-	  ",length(Val)),",nl}),
+    gen_encode_length(SizeConstraint, is_optimized(Erule)),
     emit({indent(3),"'enc_",asn1ct_gen:list2name(Typename),
 	      "_components'(Val",ObjFun,", [])"}),
     emit({nl,"].",nl}),
@@ -453,6 +458,42 @@ gen_encode_sof(Erule,Typename,SeqOrSetOf,D) when is_record(D,type) ->
 	end,
     gen_encode_sof_components(Erule,Typename,SeqOrSetOf,NewComponentType).
 
+
+%% Logic copied from asn1_per_bin_rt2ct:encode_constrained_number
+gen_encode_length({Lb,Ub},true) when Ub =< 65535, Lb >= 0 ->
+    Range = Ub - Lb + 1,
+    V2 = ["(length(Val) - ",Lb,")"],
+    Encode = if
+		 Range  == 1 ->
+		     "[]";
+		 Range  == 2 ->
+		     {"[",V2,"]"};
+		 Range  =< 4 ->
+		     {"[10,2,",V2,"]"};
+		 Range  =< 8 ->
+		     {"[10,3,",V2,"]"};
+		 Range  =< 16 ->
+		     {"[10,4,",V2,"]"};
+		 Range  =< 32 ->
+		     {"[10,5,",V2,"]"};
+		 Range  =< 64 ->
+		     {"[10,6,",V2,"]"};
+		 Range  =< 128 ->
+		     {"[10,7,",V2,"]"};
+		 Range  =< 255 ->
+		     {"[10,8,",V2,"]"};
+		 Range  =< 256 ->
+		     {"[20,1,",V2,"]"};
+		 Range  =< 65536 ->
+		     {"[20,2,<<",V2,":16>>]"};
+		 true ->
+		     {"?RT_PER:encode_length(",{asis,{Lb,Ub}},",length(Val))"}
+	     end,
+    emit({nl,Encode,",",nl});
+gen_encode_length(SizeConstraint,_) ->
+    emit({nl,indent(3),"?RT_PER:encode_length(",
+	  {asis,SizeConstraint},",length(Val)),",nl}).
+
 gen_decode_sof(Erules,Typename,SeqOrSetOf,D) when is_record(D,type) ->
     asn1ct_name:start(),
     {_SeqOrSetOf,ComponentType} = D#type.def,
@@ -469,7 +510,8 @@ gen_decode_sof(Erules,Typename,SeqOrSetOf,D) when is_record(D,type) ->
 	    _ ->
 		""
 	end,
-    emit({nl,"{Num,Bytes1} = ?RT_PER:decode_length(Bytes,",{asis,SizeConstraint},"),",nl}),
+    gen_decode_length(SizeConstraint,
+		      is_optimized(Erules)),
     emit({"'dec_",asn1ct_gen:list2name(Typename),
 	      "_components'(Num, Bytes1, telltype",ObjFun,", []).",nl}),
     NewComponentType =
@@ -480,6 +522,41 @@ gen_decode_sof(Erules,Typename,SeqOrSetOf,D) when is_record(D,type) ->
 	end,
     gen_decode_sof_components(Erules,Typename,SeqOrSetOf,NewComponentType).
 
+%% Logic copied from asn1_per_bin_rt2ct:decode_constrained_number
+gen_decode_length({Lb,Ub},true) when Ub =< 65535, Lb >= 0 ->
+    Range = Ub - Lb + 1,
+    Call = if
+	       Range  == 1 ->
+		   "{0,Bytes}";
+	       Range  == 2 ->
+		   "?RT_PER:getbits(Bytes,1)";
+	       Range  =< 4 ->
+		   "?RT_PER:getbits(Bytes,2)";
+	       Range  =< 8 ->
+		   "?RT_PER:getbits(Bytes,3)";
+	       Range  =< 16 ->
+		   "?RT_PER:getbits(Bytes,4)";
+	       Range  =< 32 ->
+		   "?RT_PER:getbits(Bytes,5)";
+	       Range  =< 64 ->
+		   "?RT_PER:getbits(Bytes,6)";
+	       Range  =< 128 ->
+		   "?RT_PER:getbits(Bytes,7)";
+	       Range  =< 255 ->
+		   "?RT_PER:getbits(Bytes,8)";
+	       Range  =< 256 ->
+		   "?RT_PER:getoctets(Bytes,1)";
+	       Range  =< 65536 ->
+		   "?RT_PER:getoctets(Bytes,2)";
+	       true ->
+		   ["exit({not_supported,{integer_range,",Range,"}}"]
+	   end,
+    emit({nl,"{Val,Remain} = ",Call,",",nl}),
+    emit({nl,"{Num,Bytes1} = {Val+",Lb,",Remain},",nl});
+gen_decode_length(SizeConstraint,_) ->
+    emit({nl,"{Num,Bytes1} = ?RT_PER:decode_length(Bytes,",
+	  {asis,SizeConstraint},"),",nl}).
+
 gen_encode_sof_components(Erule,Typename,SeqOrSetOf,Cont) ->
     {ObjFun,ObjFun_Var} =
 	case Cont#type.tablecinf of
@@ -636,6 +713,27 @@ gen_dec_extension_value(_) ->
     emit({"{Ext,",{next,bytes},"} = ?RT_PER:getext(",{curr,bytes},")"}),
     asn1ct_name:new(bytes).
 
+gen_fixoptionals([{Pos,Def}|R]) ->
+    asn1ct_name:new(fixopt),
+    emit({{curr,fixopt}," = case element(",{asis,Pos},",",{curr,val},") of",nl,
+	  "asn1_DEFAULT -> 0;",nl,
+	  {asis,Def}," -> 0;",nl,
+	  "_ -> 1",nl,
+	  "end,",nl}),
+    gen_fixoptionals(R);
+gen_fixoptionals([Pos|R]) ->
+    gen_fixoptionals([{Pos,asn1_NOVALUE}|R]);
+gen_fixoptionals([]) ->
+    ok.
+
+    
+param_map(Fun, [H]) ->
+    [Fun(H)];
+param_map(Fun, [H|T]) ->
+    [Fun(H),","|param_map(Fun,T)].
+
+    
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Produce a list with positions (in the Value record) where
 %% there are optional components, start with 2 because first element
@@ -922,7 +1020,7 @@ gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) ->
     end,
     case Ext of 
 	{ext,_Ep2,_} ->
-	    emit(["))"]);
+	    emit("))");
 	_ -> true
     end.
 gen_dec_components_call(Erule,TopType,{Root1,ExtList,Root2},MaybeComma,DecInfObj,Ext,NumberOfOptionals) ->
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index e49829d82f..0f8833f716 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -47,6 +47,7 @@
 	 un_hyphen_var/1]).
 -export([gen_encode_constructed/4,
 	 gen_decode_constructed/4]).
+-export([nif_parameter/0]).
 
 %% pgen(Outfile, Erules, Module, TypeOrVal, Options)
 %% Generate Erlang module (.erl) and (.hrl) file corresponding to an ASN.1 module
@@ -938,13 +939,13 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
     NoFinalPadding = lists:member(no_final_padding,get(encoding_options)),
     Call = case Erules of
 	       per -> "?RT_PER:complete(encode_disp(Type,Data))";
-	       per_bin -> "?RT_PER:complete(encode_disp(Type,Data))";
+	       per_bin -> ["?RT_PER:complete(encode_disp(Type,Data))"];
 	       ber -> "encode_disp(Type,Data)";
 	       ber_bin -> "encode_disp(Type,Data)";
 	       ber_bin_v2 -> "encode_disp(Type,Data)";
 	       uper_bin when NoFinalPadding == true -> 
 		   "?RT_PER:complete_NFP(encode_disp(Type,Data))";
-	       uper_bin -> "?RT_PER:complete(encode_disp(Type,Data))"
+	       uper_bin -> ["?RT_PER:complete(encode_disp(Type,Data))"]
 	   end,
     EncWrap = case Erules of
 	       ber -> "wrap_encode(Bytes)";
@@ -974,7 +975,7 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
 %     case Erules of
 % 	ber_bin_v2 ->
 % 	    emit(["decode(Type,Data0) ->",nl]),
-% 	    emit(["{Data,_RestBin} = ?RT_BER:decode(Data0",driver_parameter(),"),",nl]);
+% 	    emit(["{Data,_RestBin} = ?RT_BER:decode(Data0",nif_parameter(),"),",nl]);
 % 	_ ->
 % 	    emit(["decode(Type,Data) ->",nl])
 %     end,
@@ -991,10 +992,10 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
 	    {ber_bin_v2,false} ->
 		io_lib:format("~s~s~s~n",
 			      ["element(1,?RT_BER:decode(Data",
-			       driver_parameter(),"))"]);
+			       nif_parameter(),"))"]);
 	    {ber_bin_v2,true} ->
 		emit(["{Data,Rest} = ?RT_BER:decode(Data0",
-		      driver_parameter(),"),",nl]),
+		      nif_parameter(),"),",nl]),
 		"Data";
 	    _ ->
 		"Data"
@@ -1130,13 +1131,8 @@ gen_decode_partial_incomplete(Erule) when Erule == ber;Erule==ber_bin;
 			  "Data) of",nl]),
 		    EmitCaseClauses(),
 		    emit(["decode_part(Type,Data0) ->",nl]),
-		    Driver =
-			case lists:member(driver,get(encoding_options)) of
-			    true ->
-				",driver";
-			    _ -> ""
-			end,
-		    emit(["  case catch decode_inc_disp(Type,element(1,?RT_BER:decode(Data0",Driver,"))) of",nl]),
+		    emit(["  case catch decode_inc_disp(Type,element(1,"
+			  "?RT_BER:decode(Data0",nif_parameter(),"))) of",nl]),
 % 			  "  {Data,_RestBin} = ?RT_BER:decode(Data0),",nl,
 % 			  "  case catch decode_inc_disp(Type,Data) of",nl]),
 		    EmitCaseClauses();
@@ -1179,12 +1175,12 @@ gen_partial_inc_dispatcher([],_) ->
     emit(["decode_partial_inc_disp(Type,_Data) ->",nl,
 	  "  exit({error,{asn1,{undefined_type,Type}}}).",nl]).
 
-driver_parameter() ->
+nif_parameter() ->
     Options = get(encoding_options),
-    case lists:member(driver,Options) of
-	true ->
-	    ",driver";
-	_ -> ""
+    case {lists:member(driver,Options),lists:member(nif,Options)} of
+	{true,_} -> ",nif";
+	{_,true} -> ",nif";
+	_ ->  ""
     end.
 
 gen_wrapper() ->
@@ -1525,8 +1521,9 @@ gen_head(Erules,Mod,Hrl) ->
     emit({"-module('",Mod,"').",nl}),
     put(currmod,Mod),
     %emit({"-compile(export_all).",nl}),
-    case Hrl of
-	0 -> true;
+    case {Hrl,lists:member(inline,get(encoding_options))} of
+	{0,_} -> true;
+	{_,true} -> true;
 	_ -> 
 	    emit({"-include(\"",Mod,".hrl\").",nl})
     end,
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
index 9ec458e351..781271bae7 100644
--- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -416,7 +416,7 @@ gen_decode_selected(Erules,Type,FuncName) ->
 	end,
     emit(["  case ?RT_BER:decode_selective(",{asis,Pattern},",Bin) of",nl,
 	  "    {ok,Bin2} when is_binary(Bin2) ->",nl,
-	  "      {Tlv,_} = ?RT_BER:decode(Bin2),",nl]),
+	  "      {Tlv,_} = ?RT_BER:decode(Bin2",asn1ct_gen:nif_parameter(),"),",nl]),
     emit("{ok,"),
     gen_decode_selected_type(Erules,Type),
     emit(["};",nl,"    Err -> exit({error,{selctive_decode,Err}})",nl,
@@ -708,7 +708,7 @@ gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Form,OptOrMand) ->
 	'ASN1_OPEN_TYPE' ->
 	    emit(["?RT_BER:decode_open_type_as_binary(",
 		  BytesVar,","]),
-	    add_func({decode_open_type_as_binary,2});
+	    add_func({decode_open_type_as_binary,3});
 	#'ObjectClassFieldType'{} ->
 		case asn1ct_gen:get_inner(Att#type.def) of
 		    {fixedtypevaluefield,_,InnerType} -> 
@@ -716,7 +716,7 @@ gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Form,OptOrMand) ->
 		    'ASN1_OPEN_TYPE' ->
 			emit(["?RT_BER:decode_open_type_as_binary(",
 			      BytesVar,","]),
-			add_func({decode_open_type_as_binary,2});
+			add_func({decode_open_type_as_binary,3});
 		    Other ->
 			exit({'can not decode' ,Other})
 		end;
@@ -728,13 +728,13 @@ gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Form,OptOrMand) ->
 	{_,#'ObjectClassFieldType'{}} ->
 	    case asn1ct_gen:get_inner(Att#type.def) of
 		'ASN1_OPEN_TYPE' ->
-		    emit([{asis,DoTag},")"]);
+		    emit([{asis,DoTag},asn1ct_gen:nif_parameter(),")"]);
 		_ -> ok
 	    end;
 	{{string,TagStr},'ASN1_OPEN_TYPE'} ->
-	    emit([TagStr,")"]);
+	    emit([TagStr,asn1ct_gen:nif_parameter(),")"]);
 	{_,'ASN1_OPEN_TYPE'} ->
-	    emit([{asis,DoTag},")"]);
+	    emit([{asis,DoTag},asn1ct_gen:nif_parameter(),")"]);
 	{{string,TagStr},_} ->
 	    emit([TagStr,")"]);
 	_ when is_list(DoTag) ->
@@ -1064,7 +1064,7 @@ emit_tlv_format_function() ->
     end.
 emit_tlv_format_function1() ->
     emit(["tlv_format(Bytes) when is_binary(Bytes) ->",nl,
-	  "  {Tlv,_}=?RT_BER:decode(Bytes),",nl,
+	  "  {Tlv,_}=?RT_BER:decode(Bytes",asn1ct_gen:nif_parameter(),"),",nl,
 	  "  Tlv;",nl,
 	  "tlv_format(Bytes) ->",nl,
 	  "  Bytes.",nl]).
@@ -1502,13 +1502,14 @@ gen_objset_dec(Erules,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
 	       _ClFields,_NthObj) ->
     emit(["'getdec_",ObjSetName,"'(_, _) ->",nl]),
     emit([indent(2),"fun(_,Bytes, _RestPrimFieldName) ->",nl]),
+    
     case Erules of
 	ber_bin_v2 ->
 	    emit([indent(4),"case Bytes of",nl,
 		  indent(6),"Bin when is_binary(Bin) -> ",nl,
 		  indent(8),"Bin;",nl,
 		  indent(6),"_ ->",nl,
-		  indent(8),"?RT_BER:encode(Bytes)",nl,
+		  indent(8),"?RT_BER:encode(Bytes",driver_parameter(),")",nl,
 		  indent(4),"end",nl]);
 	_ ->
 	    emit([indent(6),"Len = case Bytes of",nl,indent(9),
@@ -1521,6 +1522,14 @@ gen_objset_dec(Erules,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
 gen_objset_dec(_,_,_,[],_,_,_) ->
     ok.
 
+driver_parameter() ->
+    Options = get(encoding_options),
+    case {lists:member(driver,Options),lists:member(nif,Options)} of
+	{true,_} -> ",nif";
+	{_,true} -> ",nif";
+	_ ->  ",erlang"
+    end.
+
 emit_default_getdec(ObjSetName,UniqueName) ->
     emit(["'getdec_",ObjSetName,"'(",{asis,UniqueName},", ErrV) ->",nl]),
     emit([indent(2), "fun(C,V,_) -> exit({{component,C},{value,V},{unique_name_and_value,",{asis,UniqueName},", ErrV}}) end"]).
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 8313cf1b60..b90a0adf81 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -238,7 +238,8 @@ gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) ->
 			       "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
 			   [#type{def=#'Externaltypereference'{type=Tname}}] ->
 			       io_lib:format(
-				 "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
+				 "?RT_PER:complete(enc_~s(~s))",
+				 [Tname,Value]);
 			 _ -> Value
 		     end,
 	    emit(["?RT_PER:encode_open_type(", {asis,Constraint}, ",", 
diff --git a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
index 4f4fcfafc3..1a0a0e211d 100644
--- a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
+++ b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. 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
@@ -230,7 +230,8 @@ gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) ->
 			       "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
 			   [#type{def=#'Externaltypereference'{type=Tname}}] ->
 			       io_lib:format(
-				 "?RT_PER:complete(enc_~s(~s))",[Tname,Value]);
+				 "?RT_PER:complete(enc_~s(~s))",
+				 [Tname,Value]);
 			 _ -> Value
 		     end,
 	    emit(["?RT_PER:encode_open_type(", {asis,Constraint}, ",", 
diff --git a/lib/asn1/src/asn1ct_value.erl b/lib/asn1/src/asn1ct_value.erl
index 693e039a13..d099376b1b 100644
--- a/lib/asn1/src/asn1ct_value.erl
+++ b/lib/asn1/src/asn1ct_value.erl
@@ -435,11 +435,11 @@ get_encoding_rule(M) ->
 open_type_value(ber) ->
     [4,9,111,112,101,110,95,116,121,112,101];
 open_type_value(ber_bin) ->
-    [4,9,111,112,101,110,95,116,121,112,101];
-%    <<4,9,111,112,101,110,95,116,121,112,101>>;
+%    [4,9,111,112,101,110,95,116,121,112,101];
+    <<4,9,111,112,101,110,95,116,121,112,101>>;
 open_type_value(ber_bin_v2) ->
-    [4,9,111,112,101,110,95,116,121,112,101];
-%    <<4,9,111,112,101,110,95,116,121,112,101>>;
+%    [4,9,111,112,101,110,95,116,121,112,101];
+    <<4,9,111,112,101,110,95,116,121,112,101>>;
 open_type_value(per) ->
     "\n\topen_type"; %octet string value "open_type"
 open_type_value(per_bin) ->
diff --git a/lib/asn1/src/asn1rt.erl b/lib/asn1/src/asn1rt.erl
index 9ef68efab5..d18f81346a 100644
--- a/lib/asn1/src/asn1rt.erl
+++ b/lib/asn1/src/asn1rt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -21,12 +21,12 @@
 
 %% Runtime functions for ASN.1 (i.e encode, decode)
 
--include("asn1_records.hrl").
-
 -export([encode/2,encode/3,decode/3,load_driver/0,unload_driver/0,info/1]).
 
 -export([utf8_binary_to_list/1,utf8_list_to_binary/1]).
     
+-deprecated([load_driver/0,unload_driver/0]).
+
 encode(Module,{Type,Term}) ->
     encode(Module,Type,Term).
 
@@ -46,38 +46,12 @@ decode(Module,Type,Bytes) ->
 	    Result
     end.
 
-%% asn1-1.6.8.1	
-%% load_driver() ->
-%%     asn1rt_driver_handler:load_driver(),
-%%     receive
-%% 	driver_ready ->
-%% 	    ok;
-%% 	Err={error,_Reason} ->
-%% 	    Err;
-%% 	Error ->
-%% 	    {error,Error}
-%%     end.
-
-%% asn1-1.6.9
- load_driver() ->
-     case catch asn1rt_driver_handler:load_driver() of
- 	ok ->
- 	    ok;
- 	{error,{already_started,asn1}} ->
- 	    ok;
- 	Err ->
- 	    {error,Err}
-     end.
-
+%% Remove in R16A
+load_driver() ->
+    ok.
 
 unload_driver() ->
-    case catch asn1rt_driver_handler:unload_driver() of
-	ok ->
-	    ok;
-	Error ->
-	    {error,Error}
-    end.
-
+    ok.
 
 info(Module) ->
     case catch apply(Module,info,[]) of
diff --git a/lib/asn1/src/asn1rt_ber_bin_v2.erl b/lib/asn1/src/asn1rt_ber_bin_v2.erl
index a3bb570282..17e66f77c9 100644
--- a/lib/asn1/src/asn1rt_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1rt_ber_bin_v2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. 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
@@ -21,7 +21,7 @@
  
 %% encoding / decoding of BER  
 
--export([decode/1, decode/2, match_tags/2, encode/1]). 
+-export([decode/1, decode/2, match_tags/2, encode/1, encode/2]). 
 -export([fixoptionals/2, cindex/3,
 	 list_to_record/2,
 	 encode_tag_val/1,
@@ -49,11 +49,13 @@
 	 decode_tag_and_length/1]).
 
 -export([encode_open_type/1,encode_open_type/2, 
-	 decode_open_type/2,decode_open_type_as_binary/2]).
+	 decode_open_type/2,decode_open_type/3,
+	 decode_open_type_as_binary/2,
+	 decode_open_type_as_binary/3]).
 
 -export([decode_primitive_incomplete/2,decode_selective/2]).
- 
--include("asn1_records.hrl"). 
+
+-export([is_nif_loadable/0]).
  
 % the encoding of class of tag bits 8 and 7 
 -define(UNIVERSAL,   0). 
@@ -125,15 +127,28 @@
 % encode(Tlv) ->
 %     encode_constructed(Tlv).
 
-encode([Tlv]) ->
-    encode(Tlv);
-encode({TlvTag,TlvVal}) when is_list(TlvVal) ->
+encode(Tlv) ->
+    encode(Tlv,erlang).
+
+encode(Tlv,_) when is_binary(Tlv) ->
+    Tlv;
+encode([Tlv],Method) ->
+    encode(Tlv,Method);
+encode(Tlv, nif) ->
+    case is_nif_loadable() of
+	true ->
+	    asn1rt_nif:encode_ber_tlv(Tlv);
+	false ->
+	    encode_erl(Tlv)
+    end;
+encode(Tlv, _) ->
+    encode_erl(Tlv).
+
+encode_erl({TlvTag,TlvVal}) when is_list(TlvVal) ->
     %% constructed form of value
     encode_tlv(TlvTag,TlvVal,?CONSTRUCTED);
-encode({TlvTag,TlvVal}) ->
-    encode_tlv(TlvTag,TlvVal,?PRIMITIVE);
-encode(Bin) when is_binary(Bin) ->
-    Bin.
+encode_erl({TlvTag,TlvVal}) ->
+    encode_tlv(TlvTag,TlvVal,?PRIMITIVE).
 
 encode_tlv(TlvTag,TlvVal,Form) ->
     Tag = encode_tlv_tag(TlvTag,Form),
@@ -152,70 +167,61 @@ encode_tlv_val(Bin) ->
     {Bin,size(Bin)}.
 
 encode_tlv_list([Tlv|Tlvs],Acc) ->
-    EncTlv = encode(Tlv),
+    EncTlv = encode_erl(Tlv),
     encode_tlv_list(Tlvs,[EncTlv|Acc]);
 encode_tlv_list([],Acc) ->
     Bin=list_to_binary(lists:reverse(Acc)),
     {Bin,size(Bin)}.
 
-%% asn1-1.6.8.1
-%% decode(B,driver) ->
-%%     case catch port_control(asn1_driver_port,2,B) of
-%% 	Bin when is_binary(Bin) ->
-%% 	    binary_to_term(Bin);
-%% 	List when is_list(List) -> handle_error(List,B);
-%% 	{'EXIT',{badarg,Reason}} ->
-%% 	    asn1rt_driver_handler:load_driver(),
-%% 	    receive
-%% 		driver_ready ->
-%% 		    case catch port_control(asn1_driver_port,2,B) of
-%% 			Bin2 when is_binary(Bin2) -> binary_to_term(Bin2);
-%% 			List when is_list(List) -> handle_error(List,B);
-%% 			Error -> exit(Error)
-%% 		    end;
-%% 		{error,Error} -> % error when loading driver
-%% 		    %% the driver could not be loaded
-%% 		    exit(Error);
-%% 		Error={port_error,Reason} ->
-%% 		    exit(Error)
-%% 	    end;
-%% 	{'EXIT',Reason} ->
-%% 	    exit(Reason)
-%%     end.
-
-%% asn1-1.6.9
-decode(B,driver) ->
-    case catch control(?TLV_DECODE,B) of
- 	Bin when is_binary(Bin) ->
- 	    binary_to_term(Bin);
- 	List when is_list(List) -> handle_error(List,B);
- 	{'EXIT',{badarg,_Reason}} ->
- 	    case asn1rt:load_driver() of
- 		ok ->
- 		    case control(?TLV_DECODE,B) of
- 			Bin when is_binary(Bin) -> binary_to_term(Bin);
- 			List when is_list(List) -> handle_error(List,B)
- 		    end;
- 		Err ->
- 		    Err
- 	    end
-    end.
+decode(B) ->
+    decode(B, erlang).
 
+%% asn1-1.7
+decode(B, nif) ->
+    case is_nif_loadable() of
+	true ->
+	    case asn1rt_nif:decode_ber_tlv(B) of
+		{error, Reason} -> handle_error(Reason, B);
+		Else -> Else
+	    end;
+	false ->
+	    decode(B)
+    end;
+decode(B,erlang) when is_binary(B) ->
+    decode_primitive(B);
+decode(Tlv,erlang) ->
+    {Tlv,<<>>}.
+
+%% Have to check this since asn1 is not guaranteed to be available
+is_nif_loadable() ->
+    case application:get_env(asn1, nif_loadable) of
+	{ok,R} ->
+	    R;
+	undefined ->
+	    case catch code:load_file(asn1rt_nif) of
+		{module, asn1rt_nif} ->
+		    application:set_env(asn1, nif_loadable, true),
+		    true;
+		_Else ->
+		    application:set_env(asn1, nif_loadable, false),
+		    false
+	    end
+    end.
 
 handle_error([],_)->
     exit({error,{asn1,{"memory allocation problem"}}});
-handle_error([$1|_],L) -> % error in driver
+handle_error({$1,_},L) -> % error in nif
     exit({error,{asn1,L}});
-handle_error([$2|T],L) -> % error in driver due to wrong tag
+handle_error({$2,T},L) -> % error in nif due to wrong tag
     exit({error,{asn1,{"bad tag after byte:",error_pos(T),L}}});
-handle_error([$3|T],L) -> % error in driver due to length error
+handle_error({$3,T},L) -> % error in driver due to length error
     exit({error,{asn1,{"bad length field after byte:",
 			     error_pos(T),L}}});
-handle_error([$4|T],L) -> % error in driver due to indefinite length error
+handle_error({$4,T},L) -> % error in driver due to indefinite length error
     exit({error,{asn1,
 		 {"indefinite length without end bytes after byte:",
 		  error_pos(T),L}}});
-handle_error([$5|T],L) -> % error in driver due to indefinite length error
+handle_error({$5,T},L) -> % error in driver due to indefinite length error
     exit({error,{asn1,{"bad encoded value after byte:",
 			     error_pos(T),L}}});
 handle_error(ErrL,L) ->
@@ -228,16 +234,6 @@ error_pos([B])->
 error_pos([B|Bs]) ->
     BS = 8 * length(Bs),
     B bsl BS + error_pos(Bs).
-%% asn1-1.6.9
-control(Cmd, Data) ->
-    Port = asn1rt_driver_handler:client_port(),
-    erlang:port_control(Port, Cmd, Data).
-
-decode(Bin) when is_binary(Bin) ->
-    decode_primitive(Bin);
-decode(Tlv) -> % assume it is a tlv
-    {Tlv,<<>>}.
-
 
 decode_primitive(Bin) ->
     {Form,TagNo,V,Rest} = decode_tag_and_length(Bin),
@@ -796,20 +792,24 @@ encode_open_type(Val,Tag) ->
 %% Value = binary with decoded data (which must be decoded again as some type)
 %%
 decode_open_type(Tlv, TagIn) ->
+    decode_open_type(Tlv, TagIn, erlang).
+decode_open_type(Tlv, TagIn, Method) ->
     case match_tags(Tlv,TagIn) of
 	Bin when is_binary(Bin) ->
-	    {InnerTlv,_} = decode(Bin),
+	    {InnerTlv,_} = decode(Bin,Method),
 	    InnerTlv;
 	TlvBytes -> TlvBytes
     end.
 
  
-decode_open_type_as_binary(Tlv,TagIn)->
+decode_open_type_as_binary(Tlv, TagIn) ->
+    decode_open_type_as_binary(Tlv, TagIn, erlang).
+decode_open_type_as_binary(Tlv,TagIn, Method)->
     case match_tags(Tlv,TagIn) of
 	V when is_binary(V) ->
 	    V;
-	[Tlv2] -> encode(Tlv2);
-	Tlv2 -> encode(Tlv2)
+	[Tlv2] -> encode(Tlv2, Method);
+	Tlv2 -> encode(Tlv2, Method)
     end.
  
 %%=============================================================================== 
@@ -1056,7 +1056,7 @@ encode_real(C,Val, TagIn) when is_tuple(Val); is_list(Val) ->
 
 
 encode_real(C,Val) ->
-    ?RT_COMMON:encode_real(C,Val). 
+    asn1rt_ber_bin:encode_real(C,Val). 
  
  
 %%============================================================================ 
@@ -1081,7 +1081,7 @@ decode_real_notag(Buffer) ->
 	    {_T,_V} ->
 		exit({error,{asn1,{real_not_in_primitive_form,Buffer}}})
 	end,
-    {Val,_Rest,Len} = ?RT_COMMON:decode_real(Buffer,Len),
+    {Val,_Rest,Len} = asn1rt_ber_bin:decode_real(Buffer,Len),
     Val.
 %%    exit({error,{asn1, {unimplemented,real}}}).
 %%  decode_real2(Buffer, Form, size(Buffer)).
@@ -1577,14 +1577,12 @@ e_object_identifier(V) when is_tuple(V) ->
 e_object_identifier([E1, E2 | Tail]) -> 
     Head = 40*E1 + E2,  % wow! 
     {H,Lh} = mk_object_val(Head),
-    {R,Lr} = enc_obj_id_tail(Tail, [], 0),
+    {R,Lr} = lists:mapfoldl(fun enc_obj_id_tail/2,0,Tail),
     {[H|R], Lh+Lr}.
 
-enc_obj_id_tail([], Ack, Len) ->
-    {lists:reverse(Ack), Len};
-enc_obj_id_tail([H|T], Ack, Len) ->
+enc_obj_id_tail(H, Len) ->
     {B, L} = mk_object_val(H),
-    enc_obj_id_tail(T, [B|Ack], Len+L).
+    {B,Len+L}.
 
 
 %%%%%%%%%%% 
diff --git a/lib/asn1/src/asn1rt_check.erl b/lib/asn1/src/asn1rt_check.erl
index 24a2a3802d..d9856901b8 100644
--- a/lib/asn1/src/asn1rt_check.erl
+++ b/lib/asn1/src/asn1rt_check.erl
@@ -19,8 +19,6 @@
 %%
 -module(asn1rt_check).
 
--include("asn1_records.hrl").
-
 -export([check_bool/2,
 	 check_int/3,
 	 check_bitstring/3,
diff --git a/lib/asn1/src/asn1rt_driver_handler.erl b/lib/asn1/src/asn1rt_driver_handler.erl
deleted file mode 100644
index 146d0043f9..0000000000
--- a/lib/asn1/src/asn1rt_driver_handler.erl
+++ /dev/null
@@ -1,144 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2011. 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.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(asn1rt_driver_handler).
-
--include("asn1_records.hrl").
-
--export([load_driver/0,unload_driver/0,client_port/0]).
-
-%% Internal exports
--export([init/2]).
-
-%% Macros
--define(port_names,
-	{ asn1_drv01, asn1_drv02, asn1_drv03, asn1_drv04,
-	  asn1_drv05, asn1_drv06, asn1_drv07, asn1_drv08,
-	  asn1_drv09, asn1_drv10, asn1_drv11, asn1_drv12,
-	  asn1_drv13, asn1_drv14, asn1_drv15, asn1_drv16 }).
-
-%%% --------------------------------------------------------
-%%% Interface Functions. 
-%%% --------------------------------------------------------
-load_driver() ->
-    load_driver(noreason).
-
-load_driver(Reason) ->
-    Ref = make_ref(),
-    case whereis(asn1_driver_owner) of % to prevent unnecessary spawn
-	Pid when is_pid(Pid) ->
-	    asn1_driver_owner ! {self(),Ref,are_you_ready},
-	    receive
-		{Ref,driver_ready} ->
-		    ok
-	    after 10000 ->
-		    {error,{timeout,waiting_for_drivers}}
-	    end;
-	_ ->
-	    {_,Mref} = spawn_monitor(asn1rt_driver_handler, init, [self(),Ref]),
-	    receive
-		{'DOWN', Mref, _, _, NewReason} ->
-		    case NewReason of
-			Reason -> {error,Reason};
-			_ -> load_driver(NewReason)
-		    end;
-		{Ref,driver_ready} ->
-		    erlang:demonitor(Mref),
-		    ok;
-		{Ref,Error = {error,_Reason}} ->
-		    erlang:demonitor(Mref),
-		    Error
-	    after 10000 -> %% 10 seconds
-		    {error,{timeout,waiting_for_drivers}}
-	    end
-    end.
-
-init(FromPid,FromRef) ->
-    case catch register(asn1_driver_owner,self()) of
-	true -> true;
-	_Other -> exit(normal)
-    end,
-    Dir = filename:join([code:priv_dir(asn1),"lib"]),
-    case catch erl_ddll:load_driver(Dir,asn1_erl_drv) of
-	ok ->
-	    Result = open_named_ports(),
-	    catch (FromPid ! {FromRef,Result}),
-	    loop(Result);
-	{error,Err} -> % if erl_ddll:load_driver fails
-	    ForErr = erl_ddll:format_error(Err),
-	    OSDir = filename:join(Dir,erlang:system_info(system_architecture)),
-	    case catch erl_ddll:load_driver(OSDir,asn1_erl_drv) of
-		ok ->
-		    Result = open_named_ports(),
-		    catch (FromPid ! {FromRef,Result}),
-		    loop(Result);
-		{error,Err2} ->
-%		    catch (FromPid ! {FromRef,Error})
-		    ForErr2 = erl_ddll:format_error(Err2),
-		    catch (FromPid ! {FromRef,{error,{{Dir,ForErr},{OSDir,ForErr2}}}})
-	    end
-    end.
-
-    
-open_named_ports() ->
-    open_named_ports(size(?port_names)).
-
-open_named_ports(0) ->
-    driver_ready;
-open_named_ports(N) ->
-    case catch open_port({spawn,"asn1_erl_drv"},[]) of
-	{'EXIT',Reason} ->
-	    {error,{port_error,Reason}};
-	Port ->
-	    register(element(N,?port_names),Port),
-	    open_named_ports(N-1)
-    end.
-
-loop(Result) ->
-    receive
-	{_FromPid,_FromRef,unload} ->
-	    close_ports(size(?port_names)),
-	    erl_ddll:unload_driver(asn1_erl_drv),
-	    ok;
-	{FromPid,FromRef,are_you_ready} ->
-	    catch (FromPid ! {FromRef,driver_ready}),
-	    loop(Result);
-	_ ->
-	    loop(Result)
-    end.
-
-unload_driver() ->
-    case whereis(asn1_driver_owner) of
-	Pid when is_pid(Pid) ->
-	    Pid ! {self(),make_ref(),unload},
-	    ok;
-	_ -> 
-	    ok
-    end.
-
-close_ports(0) ->
-    ok;
-close_ports(N) ->   
-    element(N,?port_names) ! {self(), close}, %% almost same as port_close(Name)
-    close_ports(N-1).
-
-client_port() ->
-    element(erlang:system_info(scheduler_id) rem size(?port_names) + 1,
-	    ?port_names).
diff --git a/lib/asn1/src/asn1rt_nif.erl b/lib/asn1/src/asn1rt_nif.erl
new file mode 100644
index 0000000000..de1fb94816
--- /dev/null
+++ b/lib/asn1/src/asn1rt_nif.erl
@@ -0,0 +1,87 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2002-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+%%
+-module(asn1rt_nif).
+
+%% Nif interface for asn1
+
+-export([encode_per_complete/1,
+	 decode_ber_tlv/1,
+	 encode_ber_tlv/1]).
+
+-on_load(load_nif/0).
+
+-define(ASN1_NIF_VSN,1).
+
+load_nif() ->
+    LibBaseName = "asn1_erl_nif",
+    PrivDir = code:priv_dir(asn1),
+    LibName = case erlang:system_info(build_type) of
+		  opt ->
+		      LibBaseName;
+		  Type ->
+		      LibTypeName = LibBaseName ++ "."  ++ atom_to_list(Type),
+		      case (filelib:wildcard(
+			      filename:join(
+				[PrivDir,
+				 "lib",
+				 LibTypeName ++ "*"])) /= []) orelse
+			  (filelib:wildcard(
+			     filename:join(
+			       [PrivDir,
+				"lib",
+				erlang:system_info(system_architecture),
+				LibTypeName ++ "*"])) /= []) of
+			  true -> LibTypeName;
+			  false -> LibBaseName
+		      end
+	      end,
+    Lib = filename:join([PrivDir, "lib", LibName]),
+    Status = case erlang:load_nif(Lib, ?ASN1_NIF_VSN) of
+		 ok -> ok;
+		 {error, {load_failed, _}}=Error1 ->
+		     ArchLibDir =
+			 filename:join([PrivDir, "lib",
+					erlang:system_info(system_architecture)]),
+		     Candidate =
+			 filelib:wildcard(filename:join([ArchLibDir,LibName ++ "*" ])),
+		     case Candidate of
+			 [] -> Error1;
+			 _ ->
+			     ArchLib = filename:join([ArchLibDir, LibName]),
+			     erlang:load_nif(ArchLib, ?ASN1_NIF_VSN)
+		     end;
+		 Error1 -> Error1
+	     end,
+    case Status of
+	ok -> ok;
+	{error, {E, Str}} ->
+	    error_logger:error_msg("Unable to load asn1 nif library. "
+				   "Failed with error:~n\"~p, ~s\"~n",[E,Str]),
+	    Status
+    end.
+
+encode_per_complete(_TagValueList) ->
+    erlang:nif_error({nif_not_loaded,module,?MODULE,line,?LINE}).
+
+decode_ber_tlv(_Binary) ->
+    erlang:nif_error({nif_not_loaded,module,?MODULE,line,?LINE}).
+
+encode_ber_tlv(_TagValueList) ->
+    erlang:nif_error({nif_not_loaded,module,?MODULE,line,?LINE}).
diff --git a/lib/asn1/src/asn1rt_per_bin.erl b/lib/asn1/src/asn1rt_per_bin.erl
index 6bbca26209..a124c7553d 100644
--- a/lib/asn1/src/asn1rt_per_bin.erl
+++ b/lib/asn1/src/asn1rt_per_bin.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -57,7 +57,7 @@
 	 encode_NumericString/2, decode_NumericString/2,
 	 encode_ObjectDescriptor/2, decode_ObjectDescriptor/1
 	]).
--export([complete_bytes/1]).
+-export([complete_bytes/1, getbits/2, getoctets/2]).
 
 -define('16K',16384).
 -define('32K',32768).
diff --git a/lib/asn1/src/asn1rt_per_bin_rt2ct.erl b/lib/asn1/src/asn1rt_per_bin_rt2ct.erl
index f4aecf9322..c7ead680ce 100644
--- a/lib/asn1/src/asn1rt_per_bin_rt2ct.erl
+++ b/lib/asn1/src/asn1rt_per_bin_rt2ct.erl
@@ -1734,143 +1734,24 @@ get_constraint(C,Key) ->
 -ifdef(nodriver).
 
 complete(L) ->
-    case complete1(L) of
-	{[],[]} ->
-	    <<0>>;
-	{Acc,[]} ->
-	    Acc;
-	{Acc,Bacc}  ->
-	    [Acc|complete_bytes(Bacc)]
-    end.
-
-
-% this function builds the ugly form of lists [E1|E2] to avoid having to reverse it at the end.
-% this is done because it is efficient and that the result always will be sent on a port or
-% converted by means of list_to_binary/1
- complete1(InList) when is_list(InList) ->
-     complete1(InList,[],[]);
- complete1(InList) ->
-     complete1([InList],[],[]).
-
- complete1([],Acc,Bacc) ->
-     {Acc,Bacc};
- complete1([H|T],Acc,Bacc) when is_list(H) ->
-     {NewH,NewBacc} = complete1(H,Acc,Bacc),
-     complete1(T,NewH,NewBacc);
-
- complete1([{octets,Bin}|T],Acc,[]) ->
-     complete1(T,[Acc|Bin],[]);
-
- complete1([{octets,Bin}|T],Acc,Bacc) ->
-     complete1(T,[Acc|[complete_bytes(Bacc),Bin]],[]);
-
- complete1([{debug,_}|T], Acc,Bacc) ->
-     complete1(T,Acc,Bacc);
-
- complete1([{bits,N,Val}|T],Acc,Bacc) ->
-     complete1(T,Acc,complete_update_byte(Bacc,Val,N));
-
- complete1([{bit,Val}|T],Acc,Bacc) ->
-     complete1(T,Acc,complete_update_byte(Bacc,Val,1));
-
- complete1([align|T],Acc,[]) ->
-     complete1(T,Acc,[]);
- complete1([align|T],Acc,Bacc) ->
-     complete1(T,[Acc|complete_bytes(Bacc)],[]);
- complete1([{0,Bin}|T],Acc,[]) when is_binary(Bin) ->
-     complete1(T,[Acc|Bin],[]);
- complete1([{Unused,Bin}|T],Acc,[]) when is_integer(Unused),is_binary(Bin) ->
-     Size = size(Bin)-1,
-     <<Bs:Size/binary,B>> = Bin,
-     NumBits = 8-Unused,
-     complete1(T,[Acc|Bs],[[B bsr Unused]|NumBits]);
- complete1([{Unused,Bin}|T],Acc,Bacc) when is_integer(Unused),is_binary(Bin) ->
-     Size = size(Bin)-1,
-     <<Bs:Size/binary,B>> = Bin,
-     NumBits = 8 - Unused,
-     Bf = complete_bytes(Bacc),
-     complete1(T,[Acc|[Bf,Bs]],[[B bsr Unused]|NumBits]).
-
-
- complete_update_byte([],Val,Len) ->
-     complete_update_byte([[0]|0],Val,Len);
- complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len == 8 ->
-     [[0,((Byte bsl Len) + Val) band 255|Bacc]|0];
- complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) when NumBits + Len > 8  ->
-     Rem = 8 - NumBits,
-     Rest = Len - Rem,
-     complete_update_byte([[0,((Byte bsl Rem) + (Val bsr Rest)) band 255 |Bacc]|0],Val,Rest);
- complete_update_byte([[Byte|Bacc]|NumBits],Val,Len) ->
-     [[((Byte bsl Len) + Val) band 255|Bacc]|NumBits+Len].
-
- 
- complete_bytes([[Byte|Bacc]|0]) ->
-     lists:reverse(Bacc);
- complete_bytes([[Byte|Bacc]|NumBytes]) ->
-     lists:reverse([(Byte bsl (8-NumBytes)) band 255|Bacc]);
- complete_bytes([]) ->
-     [].
+    erlang_complete(L).
 
 -else.
 
-%% asn1-1.6.8.1_dev
-%% complete(L) ->
-%%     case catch port_control(asn1_driver_port,1,L) of
-%% 	Bin when is_binary(Bin) ->
-%% 	    Bin;
-%% 	List when is_list(List) -> handle_error(List,L);
-%% 	{'EXIT',{badarg,Reason}} ->
-%% 	    asn1rt_driver_handler:load_driver(),
-%% 	    receive
-%% 		driver_ready ->
-%% 		    case catch port_control(asn1_driver_port,1,L) of
-%% 			Bin2 when is_binary(Bin2) -> Bin2;
-%% 			List when is_list(List) -> handle_error(List,L);
-%% 			{'EXIT',Reason2={badarg,_R}} -> 
-%% 			    exit({"failed to call driver probably due to bad asn1 value",Reason2});
-%% 			Reason2 -> exit(Reason2)
-%% 		    end;
-%% 		{error,Error} -> % error when loading driver
-%% 		    %% the driver could not be loaded
-%% 		    exit(Error);
-%% 		Error={port_error,Reason} ->
-%% 		    exit(Error)
-%% 	    end;
-%% 	{'EXIT',Reason} ->
-%% 	    exit(Reason)
-%%     end.
-
-%% asn1-1.6.9
+%% asn1-1.7
 complete(L) ->
-    case catch control(?COMPLETE_ENCODE,L) of
- 	Bin when is_binary(Bin) ->
- 	    Bin;
- 	List when is_list(List) -> handle_error(List,L);
- 	{'EXIT',{badarg,_Reason}} ->
- 	    case asn1rt:load_driver() of
- 		ok ->
- 		    case control(?COMPLETE_ENCODE,L) of
- 			Bin when is_binary(Bin) ->Bin;
- 			List when is_list(List) -> handle_error(List,L)
- 		    end;
- 		Err ->
- 		    Err
- 	    end
+    case asn1rt_nif:encode_per_complete(L) of
+	{error, Reason} -> handle_error(Reason, L);
+	Else when is_binary(Else) -> Else
     end.
 
-
 handle_error([],_)->
     exit({error,{asn1,{"memory allocation problem in driver"}}});
-handle_error("1",L) -> % error in complete in driver
+handle_error($1,L) -> % error in complete in driver
     exit({error,{asn1,L}});
 handle_error(ErrL,L) ->
     exit({error,{asn1,ErrL,L}}).
 
-%% asn1-1.6.9
-control(Cmd, Data) ->
-    Port = asn1rt_driver_handler:client_port(),
-    erlang:port_control(Port, Cmd, Data).
-
 -endif.
 
 
diff --git a/lib/asn1/test/asn1.cover b/lib/asn1/test/asn1.cover
index 589a8b7e3d..ad3a0f3db9 100644
--- a/lib/asn1/test/asn1.cover
+++ b/lib/asn1/test/asn1.cover
@@ -1,2 +1,3 @@
 {incl_app,asn1,details}.
 
+{excl_mods, asn1, [asn1rt_nif]}.
\ No newline at end of file
diff --git a/lib/asn1/test/asn1_SUITE.erl.src b/lib/asn1/test/asn1_SUITE.erl.src
index 582ccd877c..124ee2d2bb 100644
--- a/lib/asn1/test/asn1_SUITE.erl.src
+++ b/lib/asn1/test/asn1_SUITE.erl.src
@@ -2036,11 +2036,7 @@ rtUI(Config) ->
     ?line {ok,_} = asn1rt:info('Prim'),
 
     ?line ok = asn1ct:compile(filename:join(DataDir,"Prim"),[?PER]),
-    ?line {ok,_} = asn1rt:info('Prim'),
-
-    ?line ok = asn1rt:load_driver(),
-    ?line ok = asn1rt:load_driver(),
-    ?line ok = asn1rt:unload_driver().
+    ?line {ok,_} = asn1rt:info('Prim').
 
 testROSE(suite) -> [];
 testROSE(Config) -> 
@@ -2236,8 +2232,10 @@ test_compile_options(Config) ->
     	  ?line ok = test_compile_options:path(Config),
     	  ?line ok = test_compile_options:noobj(Config),
 	  ?line ok = test_compile_options:record_name_prefix(Config),
-	  ?line ok = test_compile_options:verbose(Config)
+	  ?line ok = test_compile_options:verbose(Config),
+	  ?line ok = test_compile_options:warnings_as_errors(Config)
     end.
+
 testDoubleEllipses(suite) ->  [];
 testDoubleEllipses(Config) ->
     ?line testDoubleEllipses:compile(Config,?BER,[]),
diff --git a/lib/asn1/test/asn1_bin_v2_particular_SUITE.erl.src b/lib/asn1/test/asn1_bin_v2_particular_SUITE.erl.src
index abd21b0d78..4c3c8c7808 100644
--- a/lib/asn1/test/asn1_bin_v2_particular_SUITE.erl.src
+++ b/lib/asn1/test/asn1_bin_v2_particular_SUITE.erl.src
@@ -11,37 +11,219 @@ smp(Config)  ->
 
             ?line Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
 	    ?line ok = testNBAPsystem:compile(Config,per_bin,[optimize]),
-
-            Parent = self(),
 	    
-	    ?line ok = asn1rt:load_driver(),
-	
-	    smp2(Parent,NumOfProcs,Msg,2),
+	    enc_dec(NumOfProcs,Msg,2),
 
 	    N = 10000,
 
-            ?line {Time1,ok} = timer:tc(?MODULE,smp2,[Parent,NumOfProcs,Msg, N]),
-	    ?line {Time1S,ok} = timer:tc(?MODULE,sequential,[NumOfProcs * N,Msg]),
+            ?line {Time1,ok} = timer:tc(?MODULE,enc_dec,[NumOfProcs,Msg, N]),
+	    ?line {Time1S,ok} = timer:tc(?MODULE,enc_dec,[1, Msg, NumOfProcs * N]),
 
-	    ?line ok = testNBAPsystem:compile(Config,ber_bin,[optimize,driver]),
-            ?line {Time2,ok} = timer:tc(?MODULE,smp2,[Parent,NumOfProcs,Msg, N]),
+	    ?line ok = testNBAPsystem:compile(Config,ber_bin,[optimize,nif]),
+            ?line {Time3,ok} = timer:tc(?MODULE,enc_dec,[NumOfProcs,Msg, N]),
 
-	    ?line {Time2S,ok} = timer:tc(?MODULE,sequential,[NumOfProcs * N,Msg]),
+	    ?line {Time3S,ok} = timer:tc(?MODULE,enc_dec,[1, Msg, NumOfProcs * N]),
 
-            {comment,lists:flatten(io_lib:format("Encode/decode time parallell with ~p cores: ~p [microsecs]~nEncode/decode time sequential: ~p [microsecs]",[NumOfProcs,Time1+Time2,Time1S+Time2S]))};
+            {comment,lists:flatten(
+		       io_lib:format(
+			 "Encode/decode time parallell with ~p cores: ~p [microsecs]~n"
+			 "Encode/decode time sequential: ~p [microsecs]",
+			 [NumOfProcs,Time1+Time3,Time1S+Time3S]))};
         false ->
             {skipped,"No smp support"}
     end.
 
-smp2(Parent,NumOfProcs,Msg, N) ->
-    Pids = [spawn_link(fun() -> worker(Msg,Parent, N) end)
-		    || _ <- lists:seq(1,NumOfProcs)],
-    ?line ok = wait_pids(Pids).
+per_performance(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    NifDir = filename:join(PrivDir,"nif"),
+    ErlDir = filename:join(PrivDir,"erl"),
+    file:make_dir(NifDir),file:make_dir(ErlDir),
+
+    ?line Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
+    ?line ok = testNBAPsystem:compile([{priv_dir,NifDir}|Config],per_bin,
+				      [optimize]),
+    ?line ok = testNBAPsystem:compile([{priv_dir,ErlDir}|Config],per_bin,
+				      []),
+
+    Modules = ['NBAP-CommonDataTypes',
+	       'NBAP-Constants',
+	       'NBAP-Containers',
+	       'NBAP-IEs',
+	       'NBAP-PDU-Contents',
+	       'NBAP-PDU-Discriptions'],
+
+
+    PreNif = fun() ->
+		     code:add_patha(NifDir),
+		     lists:foreach(fun(M) ->
+					   code:purge(M),
+					   code:load_file(M)
+				   end,Modules)
+	     end,
+    
+    PreErl = fun() ->
+		     code:add_patha(ErlDir),
+		     lists:foreach(fun(M) ->
+					   code:purge(M),
+					   code:load_file(M)
+				   end,Modules)
+	     end,
+
+    Func = fun() ->
+		   element(1,timer:tc(
+			       asn1_wrapper,encode,['NBAP-PDU-Discriptions',
+						    'NBAP-PDU',
+						    Msg]))
+	   end,
+
+    nif_vs_erlang_performance({{{PreNif,Func},{PreErl,Func}},100000,32}).
+
+ber_performance(Config) ->
+
+    ?line Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
+    ?line ok = testNBAPsystem:compile(Config,ber_bin,[optimize,nif]),
+
+
+    BerFun = fun() ->
+		     {ok,B} = asn1_wrapper:encode('NBAP-PDU-Discriptions',
+						  'NBAP-PDU', Msg),
+		     asn1_wrapper:decode(
+			'NBAP-PDU-Discriptions',
+			'NBAP-PDU',
+			B)
+	     end,
+    nif_vs_erlang_performance({BerFun,100000,32}).
+
+cert_pem_performance(Config) when is_list(Config) ->
+    cert_pem_performance({100000, 32});
+cert_pem_performance({N,S}) ->
+    nif_vs_erlang_performance({fun cert_pem/0,N,S}).
+
+dsa_pem_performance(Config) when is_list(Config) ->
+    cert_pem_performance({100000, 32});
+dsa_pem_performance({N,S}) ->
+    nif_vs_erlang_performance({fun dsa_pem/0,N,S}).
+
+
+nif_vs_erlang_performance({{TC1,TC2},N,Sched}) ->
+    random:seed({123,456,789}),
+    io:format("Running a ~p sample with ~p max procs...~n~n",[N,Sched]),
+    
+    {True,False} = exec(TC1,TC2,Sched,N+1),
+        
+    io:format("~ndone!~n"),
+
+    io:format("~n"),TStats = print_stats(strip(True,N div 20)),
+    io:format("~n"),FStats = print_stats(strip(False,N div 20)),
+    Str = io_lib:format("~nNifs are ~.3f% faster than erlang!~n",
+			[(element(2,FStats) - element(2,TStats)) / 
+			     element(2,FStats) * 100]),
+    io:format(Str),
+    {comment, lists:flatten(Str)};
+nif_vs_erlang_performance({T,N,Sched}) ->
+    PTC1 = fun() ->
+		  application:set_env(asn1, nif_loadable, true)
+	   end,
+    PTC2 = fun() ->
+		  application:set_env(asn1, nif_loadable, false)
+	   end,
+    TC = fun() ->
+		 element(1,timer:tc(T))
+	 end,
+    nif_vs_erlang_performance({{{PTC1,TC},{PTC2,TC}},N,Sched}).
+    
+
+print_stats(Data) ->
+    Length = length(Data),
+    Mean = lists:sum(Data) / Length,
+    Variance = lists:foldl(fun(N,Acc) -> math:pow(N - Mean, 2)+Acc end, 0, Data),
+    StdDev = math:sqrt(Variance / Length),
+    Median = lists:nth(round(Length/2),Data),
+    Min = lists:min(Data),
+    Max = lists:max(Data),
+    if Length < 20 ->
+	    io:format("Data: ~w~n",[Data]);
+       true ->
+	    ok
+    end,
+    io:format("Length: ~p~nMean: ~p~nStdDev: ~p~nMedian: ~p~nMin: ~p~nMax: ~p~n",
+	      [Length,Mean,StdDev,Median,Min,Max]),
+    {Length,Mean,StdDev,Median,Min,Max}.
+    
+collect(Acc) ->
+    receive
+	{Tag,Val} ->
+	    Prev = proplists:get_value(Tag,Acc,[]),
+	    collect(lists:keystore(Tag,1,Acc,{Tag,[Val|Prev]}))
+    after 100 ->
+	    Acc
+    end.
+
+exec(One,Two,Max,N) ->
+    exec(One,Two,Max,N,{[],[]}).
+exec(_,_,_,1,{D1,D2}) ->
+    {lists:flatten(D1),lists:flatten(D2)};
+exec({PreOne,One} = O,{PreTwo,Two} = T,MaxProcs, N, {D1,D2}) ->
+    Num = random:uniform(round(N/2)),
+    if Num rem 3 == 0 ->
+	    timer:sleep(Num rem 1000);
+       true ->
+	    ok
+    end,
+    Procs = random:uniform(MaxProcs),
+    io:format("\tBatch: ~p items in ~p processes, ~p left~n",[Num,Procs,N-Num]),
+    if Num rem 2 == 1 ->
+	    erlang:garbage_collect(),
+	    PreOne(),
+	    MoreOne = pexec(One, Num, Procs, []),
+	    erlang:garbage_collect(),
+	    PreTwo(),
+	    MoreTwo = pexec(Two, Num, Procs, []);
+       true ->
+	    erlang:garbage_collect(),
+	    PreTwo(),
+	    MoreTwo = pexec(Two, Num, Procs, []),
+	    erlang:garbage_collect(),
+	    PreOne(),
+	    MoreOne = pexec(One, Num, Procs, [])
+    end,
+    exec(O,T,MaxProcs,N-Num,{[MoreOne|D1],
+			     [MoreTwo|D2]}).
+
+pexec(_Fun, _, 0, []) ->
+    [];
+pexec(Fun, _, 0, [{Ref,Pid}|Rest]) ->
+    receive
+	{data,D} ->
+	    [D|pexec(Fun,0,0,[{Ref,Pid}|Rest])];
+	{'DOWN', Ref, process, Pid, normal} ->
+	    pexec(Fun, 0,0,Rest)
+    end;
+pexec(Fun, 0, 1, AccProcs) ->
+    pexec(Fun, 0, 0, AccProcs);
+pexec(Fun, N, 1, AccProcs) ->
+    [Fun()|pexec(Fun, N - 1, 1, AccProcs)];
+pexec(Fun, N, Procs, AccProcs) ->
+    S = self(),
+    Pid = spawn(fun() ->
+			S ! {data,pexec(Fun,N,1,[])}
+		end),
+    Ref = erlang:monitor(process, Pid),
+    pexec(Fun, N, Procs - 1, [{Ref,Pid}|AccProcs]).
 
-worker(Msg, Parent, N) ->
-    %% io:format("smp worker ~p with ~p worker loops.~n",[self(), N]),
-    worker_loop(N, Msg),
-    Parent ! self().
+strip(Data,Num) ->
+    {_,R} = lists:split(Num,lists:sort(Data)),
+    element(2,lists:split(Num,lists:reverse(R))).
+
+faster(A,B) ->
+    (B - A)/B * 100.
+
+enc_dec(1, Msg, N) ->
+    worker_loop(N, Msg);
+enc_dec(NumOfProcs,Msg, N) ->
+    pforeach(fun(_) ->
+		     worker_loop(N, Msg)
+	     end, [I || I <- lists:seq(1,NumOfProcs)]).
 
 worker_loop(0, _Msg) ->
     ok;
@@ -50,28 +232,24 @@ worker_loop(N, Msg) ->
 				     'NBAP-PDU',
 				     Msg),
     ?line {ok,_Msg}=asn1_wrapper:decode('NBAP-PDU-Discriptions',
-				     'NBAP-PDU',
-				     B),
+					'NBAP-PDU',
+					B),
     worker_loop(N - 1, Msg).
 
 
-wait_pids([]) -> 
-    ok;
-wait_pids(Pids) ->
+pforeach(Fun, List) ->
+    pforeach(Fun, List, []).
+pforeach(Fun, [], [{Pid,Ref}|Pids]) ->
     receive
-	Pid when is_pid(Pid) ->
-	    ?line true = lists:member(Pid,Pids),
-	    Others = lists:delete(Pid,Pids),
-	    io:format("wait_pid got ~p, still waiting for ~p\n",[Pid,Others]),
-	    wait_pids(Others);
-        Err ->
-	    io:format("Err: ~p~n",[Err]),
-	    ?line exit(Err)
-    end.
-
-sequential(N,Msg) ->
-     %%io:format("sequential encode/decode with N = ~p~n",[N]),
-     worker_loop(N,Msg).
+	{'DOWN', Ref, process, Pid, normal} ->
+	    pforeach(Fun, [], Pids)
+    end;
+pforeach(Fun, [H|T], Pids) ->
+    Pid = spawn(fun() -> Fun(H) end),
+    Ref = erlang:monitor(process, Pid),
+    pforeach(Fun, T, [{Pid, Ref}|Pids]);
+pforeach(_Fun,[],[]) ->
+    ok.
     
 -record('InitiatingMessage',{procedureCode,criticality,value}).
 -record('Iu-ReleaseCommand',{first,second}).
@@ -93,3 +271,21 @@ ticket7904(Config) ->
     ?line {ok,_} = 'RANAPextract1':encode('InitiatingMessage', Val1),
     asn1rt:unload_driver(),
     ?line {ok,_} = 'RANAPextract1':encode('InitiatingMessage', Val1).
+
+cert_pem() ->
+    'OTP-PUB-KEY':decode('Certificate',<<48,130,3,184,48,130,3,33,160,3,2,1,2,2,1,1,48,13,6,9,42,134,72,134,247,13,1,1,5,5,0,48,129,131,49,14,48,12,6,3,85,4,3,19,5,111,116,112,67,65,49,19,48,17,6,3,85,4,11,19,10,69,114,108,97,110,103,32,79,84,80,49,20,48,18,6,3,85,4,10,19,11,69,114,105,99,115,115,111,110,32,65,66,49,11,48,9,6,3,85,4,6,19,2,83,69,49,18,48,16,6,3,85,4,7,19,9,83,116,111,99,107,104,111,108,109,49,37,48,35,6,9,42,134,72,134,247,13,1,9,1,22,22,112,101,116,101,114,64,101,114,105,120,46,101,114,105,99,115,115,111,110,46,115,101,48,30,23,13,48,56,48,49,48,57,48,56,50,57,51,48,90,23,13,49,55,49,49,49,55,48,56,50,57,51,48,90,48,129,132,49,15,48,13,6,3,85,4,3,19,6,99,108,105,101,110,116,49,19,48,17,6,3,85,4,11,19,10,69,114,108,97,110,103,32,79,84,80,49,20,48,18,6,3,85,4,10,19,11,69,114,105,99,115,115,111,110,32,65,66,49,11,48,9,6,3,85,4,6,19,2,83,69,49,18,48,16,6,3,85,4,7,19,9,83,116,111,99,107,104,111,108,109,49,37,48,35,6,9,42,134,72,134,247,13,1,9,1,22,22,112,101,116,101,114,64,101,114,105,120,46,101,114,105,99,115,115,111,110,46,115,101,48,129,159,48,13,6,9,42,134,72,134,247,13,1,1,1,5,0,3,129,141,0,48,129,137,2,129,129,0,245,56,68,254,220,239,193,190,63,221,182,60,67,77,121,163,214,136,137,183,139,8,166,30,100,27,45,17,126,58,15,173,151,218,75,224,148,14,22,164,10,100,186,183,104,175,197,97,96,182,146,150,106,129,140,100,194,106,90,62,133,233,155,46,155,33,101,220,83,193,182,232,240,99,253,249,114,8,159,172,143,77,179,132,229,205,29,110,185,233,224,52,25,149,249,100,80,229,199,125,23,106,146,233,159,26,13,8,161,206,221,43,240,149,42,45,194,190,85,6,235,152,220,219,160,32,144,67,2,3,1,0,1,163,130,1,55,48,130,1,51,48,9,6,3,85,29,19,4,2,48,0,48,11,6,3,85,29,15,4,4,3,2,5,224,48,29,6,3,85,29,14,4,22,4,20,26,59,44,5,72,211,158,214,23,34,30,241,125,27,123,115,93,163,231,120,48,129,179,6,3,85,29,35,4,129,171,48,129,168,128,20,6,171,128,52,58,164,184,118,178,189,157,46,40,229,109,145,222,125,1,155,161,129,140,164,129,137,48,129,134,49,17,48,15,6,3,85,4,3,19,8,101,114,108,97,110,103,67,65,49,19,48,17,6,3,85,4,11,19,10,69,114,108,97,110,103,32,79,84,80,49,20,48,18,6,3,85,4,10,19,11,69,114,105,99,115,115,111,110,32,65,66,49,18,48,16,6,3,85,4,7,19,9,83,116,111,99,107,104,111,108,109,49,11,48,9,6,3,85,4,6,19,2,83,69,49,37,48,35,6,9,42,134,72,134,247,13,1,9,1,22,22,112,101,116,101,114,64,101,114,105,120,46,101,114,105,99,115,115,111,110,46,115,101,130,1,1,48,33,6,3,85,29,17,4,26,48,24,129,22,112,101,116,101,114,64,101,114,105,120,46,101,114,105,99,115,115,111,110,46,115,101,48,33,6,3,85,29,18,4,26,48,24,129,22,112,101,116,101,114,64,101,114,105,120,46,101,114,105,99,115,115,111,110,46,115,101,48,13,6,9,42,134,72,134,247,13,1,1,5,5,0,3,129,129,0,93,11,112,227,121,15,121,179,247,135,110,216,17,197,84,18,149,166,147,142,190,178,0,209,190,0,142,233,144,100,194,205,220,182,73,204,108,42,95,23,48,63,4,120,239,42,194,25,184,35,117,107,96,229,18,45,76,122,125,40,171,210,132,50,146,178,160,55,17,35,255,208,114,30,47,55,185,154,155,165,204,180,14,143,20,234,6,234,201,225,72,235,5,87,61,255,250,23,217,1,144,246,98,221,223,102,49,168,177,13,70,241,26,27,254,251,217,14,244,18,242,197,151,50,186,214,15,42>>).
+
+dsa_pem() ->
+    'OTP-PUB-KEY':decode('DSAPrivateKey',<<48,130,1,187,2,1,0,2,129,129,0,183,179,230,217,37,99,144,157,21,228,204,162,207,61,246,144,58,139,139,184,184,43,108,206,0,115,173,208,100,233,201,121,21,90,179,119,53,140,25,52,34,202,121,211,164,107,43,56,68,162,159,51,244,232,138,126,164,109,121,89,237,142,57,28,32,188,44,67,253,111,121,104,40,141,211,255,140,118,37,234,150,201,155,160,16,17,51,59,26,249,41,129,16,211,119,128,95,254,182,235,132,0,92,206,93,77,106,217,201,132,203,4,75,201,246,204,216,162,1,84,79,211,10,21,152,195,103,145,2,21,0,213,30,184,86,247,16,247,69,192,241,35,138,84,57,140,3,71,65,206,233,2,129,129,0,148,179,24,63,74,91,128,25,96,29,5,78,223,246,175,0,121,86,54,178,42,231,98,241,147,180,157,60,149,160,50,243,227,76,175,89,234,203,252,242,76,108,9,204,157,182,59,206,227,127,99,215,42,156,194,78,116,25,7,62,243,169,45,5,101,179,247,127,199,144,135,103,23,42,154,125,231,248,154,101,175,155,101,42,232,41,80,41,47,128,208,11,31,106,63,12,202,207,135,80,200,136,250,171,31,118,52,91,200,138,112,111,179,23,214,123,21,118,194,179,0,185,217,52,197,182,236,13,2,129,128,124,66,0,111,121,139,142,209,95,136,95,237,177,150,248,252,49,135,117,100,155,232,138,244,132,89,40,5,70,125,202,96,78,239,76,37,125,149,82,64,107,54,227,73,25,180,227,41,0,234,73,47,80,242,242,129,250,61,68,62,39,38,156,193,146,40,241,247,106,215,223,202,194,110,130,62,186,90,18,28,196,174,99,47,193,61,130,100,150,25,248,115,164,231,153,99,46,69,66,139,33,187,51,49,35,219,234,29,44,172,166,247,42,16,177,187,9,162,81,243,33,26,100,46,78,57,203,135,2,20,89,128,159,14,187,249,182,172,15,88,162,110,211,71,179,209,29,125,217,38>>),
+    'OTP-PUB-KEY':decode('SubjectPublicKeyInfo',<<48,130,1,183,48,130,1,44,6,7,42,134,72,206,56,4,1,48,130,1,31,2,129,129,0,183,179,230,217,37,99,144,157,21,228,204,162,207,61,246,144,58,139,139,184,184,43,108,206,0,115,173,208,100,233,201,121,21,90,179,119,53,140,25,52,34,202,121,211,164,107,43,56,68,162,159,51,244,232,138,126,164,109,121,89,237,142,57,28,32,188,44,67,253,111,121,104,40,141,211,255,140,118,37,234,150,201,155,160,16,17,51,59,26,249,41,129,16,211,119,128,95,254,182,235,132,0,92,206,93,77,106,217,201,132,203,4,75,201,246,204,216,162,1,84,79,211,10,21,152,195,103,145,2,21,0,213,30,184,86,247,16,247,69,192,241,35,138,84,57,140,3,71,65,206,233,2,129,129,0,148,179,24,63,74,91,128,25,96,29,5,78,223,246,175,0,121,86,54,178,42,231,98,241,147,180,157,60,149,160,50,243,227,76,175,89,234,203,252,242,76,108,9,204,157,182,59,206,227,127,99,215,42,156,194,78,116,25,7,62,243,169,45,5,101,179,247,127,199,144,135,103,23,42,154,125,231,248,154,101,175,155,101,42,232,41,80,41,47,128,208,11,31,106,63,12,202,207,135,80,200,136,250,171,31,118,52,91,200,138,112,111,179,23,214,123,21,118,194,179,0,185,217,52,197,182,236,13,3,129,132,0,2,129,128,124,66,0,111,121,139,142,209,95,136,95,237,177,150,248,252,49,135,117,100,155,232,138,244,132,89,40,5,70,125,202,96,78,239,76,37,125,149,82,64,107,54,227,73,25,180,227,41,0,234,73,47,80,242,242,129,250,61,68,62,39,38,156,193,146,40,241,247,106,215,223,202,194,110,130,62,186,90,18,28,196,174,99,47,193,61,130,100,150,25,248,115,164,231,153,99,46,69,66,139,33,187,51,49,35,219,234,29,44,172,166,247,42,16,177,187,9,162,81,243,33,26,100,46,78,57,203,135>>),
+    'OTP-PUB-KEY':decode('DSAParams',<<48,130,1,31,2,129,129,0,183,179,230,217,37,99,144,157,21,228,204,162,207,61,246,144,58,139,139,184,184,43,108,206,0,115,173,208,100,233,201,121,21,90,179,119,53,140,25,52,34,202,121,211,164,107,43,56,68,162,159,51,244,232,138,126,164,109,121,89,237,142,57,28,32,188,44,67,253,111,121,104,40,141,211,255,140,118,37,234,150,201,155,160,16,17,51,59,26,249,41,129,16,211,119,128,95,254,182,235,132,0,92,206,93,77,106,217,201,132,203,4,75,201,246,204,216,162,1,84,79,211,10,21,152,195,103,145,2,21,0,213,30,184,86,247,16,247,69,192,241,35,138,84,57,140,3,71,65,206,233,2,129,129,0,148,179,24,63,74,91,128,25,96,29,5,78,223,246,175,0,121,86,54,178,42,231,98,241,147,180,157,60,149,160,50,243,227,76,175,89,234,203,252,242,76,108,9,204,157,182,59,206,227,127,99,215,42,156,194,78,116,25,7,62,243,169,45,5,101,179,247,127,199,144,135,103,23,42,154,125,231,248,154,101,175,155,101,42,232,41,80,41,47,128,208,11,31,106,63,12,202,207,135,80,200,136,250,171,31,118,52,91,200,138,112,111,179,23,214,123,21,118,194,179,0,185,217,52,197,182,236,13>>),
+    'OTP-PUB-KEY':decode('DSAPublicKey',<<2,129,128,124,66,0,111,121,139,142,209,95,136,95,237,177,150,248,252,49,135,117,100,155,232,138,244,132,89,40,5,70,125,202,96,78,239,76,37,125,149,82,64,107,54,227,73,25,180,227,41,0,234,73,47,80,242,242,129,250,61,68,62,39,38,156,193,146,40,241,247,106,215,223,202,194,110,130,62,186,90,18,28,196,174,99,47,193,61,130,100,150,25,248,115,164,231,153,99,46,69,66,139,33,187,51,49,35,219,234,29,44,172,166,247,42,16,177,187,9,162,81,243,33,26,100,46,78,57,203,135>>),
+    'OTP-PUB-KEY':encode('DSAParams',{params,{'Dss-Parms',129000451850199666185842362389296595317127259539517666765336291347244303954511451744518587442120964433734460998523119938005801396466878889993179871123036311260456172022864663021425348874648247531097042575063545128239655736096045972718934778583429973433661785691086624069991876932064334822608460064613803976593,1216700114794736143432235288305776850295620488937,104420402274523493329542694749036577763086597934731674202966304958550599470165597750883637440049774107540742087494301536297571301945349213110548764383811017178451900599240379681904765817950545426764751538502808499880604633364255316249231153053427235538288687666086821781456733226598288985591031656134573747213}}),
+    'OTP-PUB-KEY':encode(
+      'SubjectPublicKeyInfo',
+      {'SubjectPublicKeyInfo',
+       {'AlgorithmIdentifier',
+        {1,2,840,10040,4,1},
+        <<48,130,1,31,2,129,129,0,183,179,230,217,37,99,144,157,21,228,204,162,207,61,246,144,58,139,139,184,184,43,108,206,0,115,173,208,100,233,201,121,21,90,179,119,53,140,25,52,34,202,121,211,164,107,43,56,68,162,159,51,244,232,138,126,164,109,121,89,237,142,57,28,32,188,44,67,253,111,121,104,40,141,211,255,140,118,37,234,150,201,155,160,16,17,51,59,26,249,41,129,16,211,119,128,95,254,182,235,132,0,92,206,93,77,106,217,201,132,203,4,75,201,246,204,216,162,1,84,79,211,10,21,152,195,103,145,2,21,0,213,30,184,86,247,16,247,69,192,241,35,138,84,57,140,3,71,65,206,233,2,129,129,0,148,179,24,63,74,91,128,25,96,29,5,78,223,246,175,0,121,86,54,178,42,231,98,241,147,180,157,60,149,160,50,243,227,76,175,89,234,203,252,242,76,108,9,204,157,182,59,206,227,127,99,215,42,156,194,78,116,25,7,62,243,169,45,5,101,179,247,127,199,144,135,103,23,42,154,125,231,248,154,101,175,155,101,42,232,41,80,41,47,128,208,11,31,106,63,12,202,207,135,80,200,136,250,171,31,118,52,91,200,138,112,111,179,23,214,123,21,118,194,179,0,185,217,52,197,182,236,13>>},
+       {0,
+	<<2,129,128,124,66,0,111,121,139,142,209,95,136,95,237,177,150,248,252,49,135,117,100,155,232,138,244,132,89,40,5,70,125,202,96,78,239,76,37,125,149,82,64,107,54,227,73,25,180,227,41,0,234,73,47,80,242,242,129,250,61,68,62,39,38,156,193,146,40,241,247,106,215,223,202,194,110,130,62,186,90,18,28,196,174,99,47,193,61,130,100,150,25,248,115,164,231,153,99,46,69,66,139,33,187,51,49,35,219,234,29,44,172,166,247,42,16,177,187,9,162,81,243,33,26,100,46,78,57,203,135>>}}).
diff --git a/lib/asn1/test/ber_decode_error.erl b/lib/asn1/test/ber_decode_error.erl
index 96d6545636..a566e0b07f 100644
--- a/lib/asn1/test/ber_decode_error.erl
+++ b/lib/asn1/test/ber_decode_error.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -45,6 +45,10 @@ run([]) ->
 run([driver]) ->
     %% test of OTP-4797, bad indata to driver does not cause an EXIT
     ?line {error,_Reason} = asn1rt:decode('Constructed','S3',[3,5]),
+    ok;
+run([nif]) ->
+    %% test of OTP-4797, bad indata to driver does not cause an EXIT
+    ?line {error,_Reason} = asn1rt:decode('Constructed','S3',[3,5]),
     ok.
 
 
diff --git a/lib/asn1/test/testPrim.erl b/lib/asn1/test/testPrim.erl
index 97f99e7b1c..39c1e4d1d8 100644
--- a/lib/asn1/test/testPrim.erl
+++ b/lib/asn1/test/testPrim.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -37,21 +37,10 @@ compile(Config,Rules,Opt) ->
     ?line DataDir = ?config(data_dir,Config),
     ?line OutDir = ?config(priv_dir,Config),
     ?line true = code:add_patha(?config(priv_dir,Config)),
-    case Opt of
-	[optimize] ->
-	    ?line ok = asn1ct:compile(DataDir ++ "Prim",
-				      [Rules,optimize,{outdir,OutDir}]),
-	    ?line ok = asn1ct:compile(DataDir ++ "Real",
-				      [Rules,optimize,{outdir,OutDir}]);
-	__ ->
-	    ?line ok = asn1ct:compile(DataDir ++ "Prim",
-				      [Rules,{outdir,OutDir}]),
-	    ?line ok = asn1ct:compile(DataDir ++ "Real",
-				      [Rules,{outdir,OutDir}])
-    end.
-
-
-
+    ?line ok = asn1ct:compile(DataDir ++ "Prim",
+			      [Rules,{outdir,OutDir}] ++ Opt),
+    ?line ok = asn1ct:compile(DataDir ++ "Real",
+			      [Rules,{outdir,OutDir}] ++ Opt).
 
 bool(Rules) ->
 
diff --git a/lib/asn1/test/test_compile_options.erl b/lib/asn1/test/test_compile_options.erl
index 5e027cdedb..a622d5bfd2 100644
--- a/lib/asn1/test/test_compile_options.erl
+++ b/lib/asn1/test/test_compile_options.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -24,7 +24,7 @@
 
 
 -export([wrong_path/1,comp/2,path/1,ticket_6143/1,noobj/1,
-	 record_name_prefix/1,verbose/1]).
+	 record_name_prefix/1,verbose/1,warnings_as_errors/1]).
 
 %% OTP-5689
 wrong_path(Config) ->
@@ -141,6 +141,43 @@ verbose(Config) when is_list(Config) ->
     ?line [] = test_server:capture_get(),
     ok.
 
+warnings_as_errors(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    Asn1File = filename:join([PrivDir,"WERROR.asn1"]),
+    OutFile = filename:join([PrivDir,"WERROR.erl"]),
+    Opts = [{outdir,PrivDir},noobj,verbose],
+
+    %% Generate WERR.asn to emit warning
+    %% Warning: Wrong format of type/value
+    %%     false/{'Externalvaluereference',_,'WERR',noInvokeId}
+    Warn = <<"WERROR DEFINITIONS IMPLICIT TAGS ::=\n"
+	     "\n"
+	     "BEGIN\n"
+	     "\n"
+	     "InvokeId ::= CHOICE\n"
+	     "{\n"
+	     "    present INTEGER,\n"
+	     "    absent NULL\n"
+	     "}\n"
+	     "\n"
+	     "noInvokeId InvokeId ::= absent:NULL\n"
+	     "\n"
+	     "NoInvokeId InvokeId ::= {noInvokeId}\n"
+	     "\n"
+	     "END -- end of useful definitions.\n">>,
+    ?line ok = file:write_file(Asn1File, Warn),
+
+    %% Test warnings_as_errors compile
+    ?line false = filelib:is_regular(OutFile),
+    ?line {error, _} = asn1ct:compile(Asn1File, [warnings_as_errors|Opts]),
+    ?line false = filelib:is_regular(OutFile),
+
+    %% Test normal compile
+    ?line ok = asn1ct:compile(Asn1File, Opts),
+    ?line true = filelib:is_regular(OutFile),
+    ?line ok = file:delete(OutFile),
+    ok.
+
 outfiles_check(OutDir) ->
     outfiles_check(OutDir,outfiles1()).
 
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 36e082c8ba..b1132155e6 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1,2 +1,2 @@
 #next version number to use is 1.6.15 | 1.7 | 2.0
-ASN1_VSN = 1.6.17
+ASN1_VSN = 1.6.18
diff --git a/lib/common_test/doc/src/Makefile b/lib/common_test/doc/src/Makefile
index 3ea6ae65d5..964f7c76c1 100644
--- a/lib/common_test/doc/src/Makefile
+++ b/lib/common_test/doc/src/Makefile
@@ -138,12 +138,6 @@ man: $(MAN6_FILES) $(MAN3_FILES) $(MAN1_FILES)
 
 debug opt: 
 
-#
-# checkout make.dep before generating new dependecies
-#
-#make_doc_depend: xml
-#	docdepend > make.dep
-
 clean clean_docs:
 	rm -f $(CT_XML_FILES)
 	rm -rf $(HTMLDIR)/*
@@ -176,12 +170,3 @@ release_docs_spec: docs
 release_spec:
 
 release_tests_spec:
-
-# ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-include make.dep
-# DO NOT DELETE
-
-
diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index c92566de37..f58b2ab0a9 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -133,9 +133,15 @@
 	    {require,Name,Required} | {userdata,UserData} |
 	    {silent_connections,Conns} | {stylesheet,CSSFile} | 
 	    {ct_hooks, CTHs}</v>
-	<v> Time = MilliSec | {seconds,integer()} | {minutes,integer()}
-	  | {hours,integer()}</v>
+	<v> Time = TimeVal | TimeFunc</v>
+	<v> TimeVal = MilliSec | {seconds,integer()} | {minutes,integer()} |
+	    {hours,integer()}</v>
+	<v> TimeFunc = {Mod,Func,Args} | Fun</v>
 	<v> MilliSec = integer()</v>
+	<v> Mod = atom()</v>
+	<v> Func = atom()</v>
+	<v> Args = list()</v>
+	<v> Fun = fun()</v>
 	<v> Required = Key | {Key,SubKeys}</v>
 	<v> Key = atom()</v>
 	<v> SubKeys = SubKey | [SubKey]</v>
@@ -144,7 +150,7 @@
 	<v> UserData = term()</v>
 	<v> Conns = [atom()]</v>
 	<v> CSSFile = string()</v>
-	<v> CTHs = [CTHModule | {CTHModule, CTHInitArgs}]</v>
+	<v> CTHs = [CTHModule | {CTHModule, CTHInitArgs} | {CTHModule, CTHInitArgs, CTHPriority}]</v>
 	<v> CTHModule = atom()</v>
 	<v> CTHInitArgs = term()</v>
 	</type>
@@ -161,7 +167,9 @@
 	  test case is allowed to take (including <c>init_per_testcase/2</c>
 	  and <c>end_per_testcase/2</c>). If the timetrap time is
 	  exceeded, the test case fails with reason
-	  <c>timetrap_timeout</c>.</p>
+	  <c>timetrap_timeout</c>. If a <c>TimeFunc</c> function is specified,
+	  it will be called initially and must return a value on
+	  <c>TimeVal</c> format.</p>
 	
 	<p>The <c>require</c> tag specifies configuration variables
 	  that are required by test cases in the suite. If the required
@@ -248,7 +256,7 @@
 	</type>
 	<desc>	
 	  
-	  <p> MANDATORY (only if one or more groups are defined) </p>
+	  <p> OPTIONAL </p>
 	  
 	  <p>This function is called before execution of a test case group.
 	  It typically contains initialization which is common for
@@ -279,7 +287,7 @@
 	</type>
 	
 	<desc>	
-	  <p> MANDATORY (only if one or more groups are defined) </p>
+	  <p> OPTIONAL </p>
 	  
 	  <p>This function is called after the execution of a test case group is finished.
 	    It is meant to be used for cleaning up after <c>init_per_group/2</c>.
@@ -353,9 +361,15 @@
 	<v> Info = {timetrap,Time} | {require,Required} | 
 	    {require,Name,Required} | {userdata,UserData} |
 	    {silent_connections,Conns}</v>
-	<v> Time = MilliSec | {seconds,integer()} | {minutes,integer()}
-	  | {hours,integer()}</v>
+	<v> Time = TimeVal | TimeFunc</v>
+	<v> TimeVal = MilliSec | {seconds,integer()} | {minutes,integer()} |
+	    {hours,integer()}</v>
+	<v> TimeFunc = {Mod,Func,Args} | Fun</v>
 	<v> MilliSec = integer()</v>
+	<v> Mod = atom()</v>
+	<v> Func = atom()</v>
+	<v> Args = list()</v>
+	<v> Fun = fun()</v>
 	<v> Required = Key | {Key,SubKeys}</v>
 	<v> Key = atom()</v>
 	<v> SubKeys = SubKey | [SubKey]</v>
@@ -378,7 +392,9 @@
 	  exceeded, the test case fails with reason
 	  <c>timetrap_timeout</c>. <c>init_per_testcase/2</c>
 	  and <c>end_per_testcase/2</c> are included in the
-	  timetrap time.</p>
+	  timetrap time. If a <c>TimeFunc</c> function is specified,
+	  it will be called before the test case (or <c>init_per_testcase/2</c>)
+	  and must return a value on <c>TimeVal</c> format.</p>
 	
 	<p>The <c>require</c> tag specifies configuration variables
 	  that are required by the test case. If the required
diff --git a/lib/common_test/doc/src/config_file_chapter.xml b/lib/common_test/doc/src/config_file_chapter.xml
index 59151a73ec..6fc6638bf7 100644
--- a/lib/common_test/doc/src/config_file_chapter.xml
+++ b/lib/common_test/doc/src/config_file_chapter.xml
@@ -285,7 +285,7 @@
           <c>{ok, Config}</c> - if the configuration variables are read successfully,
         </item>
         <item>
-          <c>{error, Error, ErrorDetails}</c> - if the callback module fails to
+          <c>{error, {Error, ErrorDetails}}</c> - if the callback module fails to
           proceed with the given configuration parameters.
         </item>
       </list>
@@ -422,14 +422,14 @@ stop()->
 call(Client, Request)->
     case whereis(?REGISTERED_NAME) of
         undefined->
-            {error, not_started, Request};
+            {error, {not_started, Request}};
         Pid->
             Pid ! {Client, Request},
             receive
                 Reply->
                     {ok, Reply}
             after 4000->
-                {error, timeout, Request}
+                {error, {timeout, Request}}
             end
     end.
 
diff --git a/lib/common_test/doc/src/ct_hooks.xml b/lib/common_test/doc/src/ct_hooks.xml
index 7d5c9f4750..f9fc1858d0 100644
--- a/lib/common_test/doc/src/ct_hooks.xml
+++ b/lib/common_test/doc/src/ct_hooks.xml
@@ -81,12 +81,14 @@
   
   <funcs>
     <func>
-      <name>Module:init(Id, Opts) -&gt; State</name>
+      <name>Module:init(Id, Opts) -&gt; {ok, State} | 
+      {ok, State, Priority}</name>
       <fsummary>Initiates the Common Test Hook</fsummary>
       <type>
 	<v>Id = reference() | term()</v>
 	<v>Opts = term()</v>
 	<v>State = term()</v>
+	<v>Priority = integer()</v>
       </type>
       
       <desc>	
@@ -103,6 +105,10 @@
 	  if <seealso marker="#Module:id-1">id/1</seealso> is not implemented.
 	</p>
 
+	<p><c>Priority</c> is the relative priority of this hook. Hooks with a
+	lower priority will be executed first. If no priority is given, 
+	it will be set to 0. </p>
+
 	<p>For details about when init is called see
 	  <seealso marker="ct_hooks_chapter#scope">scope</seealso>
 	  in the User's Guide.</p>
@@ -296,7 +302,7 @@
 
 	<p>Note that it is not possible to add CTH's here right now, 
 	that feature might be added later, 
-	but it would right now break backwards compatability.</p>
+	but it would right now break backwards compatibility.</p>
       </desc>
     </func>
 
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index fc5ab48e1b..3b9620d0f2 100644
--- a/lib/common_test/doc/src/ct_hooks_chapter.xml
+++ b/lib/common_test/doc/src/ct_hooks_chapter.xml
@@ -94,9 +94,11 @@
       <seealso marker="common_test#Module:init_per_group-2">
     init_per_group/2</seealso>. <c>CTH</c> in this case can be either
     only the module name of the CTH or a tuple with the module name and the
-    initial arguments to the CTH. Eg:
+    initial arguments and optionally the hook priority of the CTH. Eg:
     <c>{ct_hooks,[my_cth_module]}</c> or 
-    <c>{ct_hooks,[{my_cth_module,[{debug,true}]}]}</c></p>
+    <c>{ct_hooks,[{my_cth_module,[{debug,true}]}]}</c> or 
+    <c>{ct_hooks,[{my_cth_module,[{debug,true}],500}]}</c>
+    </p>
 
     <section>
       <title>Overriding CTHs</title>
@@ -109,7 +111,16 @@
 	<c>id</c> in both places, Common Test knows that this CTH
 	has already been installed and will not try to install it again.</p>
     </section>
-
+   
+    <section>
+      <title>CTH Priority</title>
+      <p>By default each CTH installed will be executed in the order which
+      they are installed. This is not always wanted so common_test allows 
+      the user to specify a priority for each hook. The priority can either
+      be specified in the CTH <seealso marker="ct_hooks#Module:init-2">init/2
+      </seealso> function or when installing the hook. The priority given at
+      installation will override the priority returned by the CTH. </p>
+    </section>
   </section>
 
   <marker id="scope"/>
@@ -331,7 +342,7 @@ id(Opts) ->
 %% any common state. 
 init(Id, Opts) ->
     {ok,D} = file:open(Id,[write]),
-    #state{ file_handle = D, total = 0, data = [] }.
+    {ok, #state{ file_handle = D, total = 0, data = [] }}.
 
 %% @doc Called before init_per_suite is called. 
 pre_init_per_suite(Suite,Config,State) ->
@@ -394,6 +405,38 @@ terminate(State) ->
     ok.</code>
   </section>
 
+  <marker id="builtin_cths"/>
+  <section>
+    <title>Built-in CTHs</title>
+    <p>Common Test is delivered with a couple of general purpose CTHs that
+    can be enabled by the user to provide some generic testing functionality.
+    Some of these are enabled by default when starting running common_test,
+    they can be disabled by setting <c>enable_builtin_hooks</c> to
+    <c>false</c> on the command line or in the test specification. In the
+    table below there is a list of all current CTHs which are delivered with
+    Common Test.</p>
+
+    <table>
+      <row>
+	<cell><em>CTH Name</em></cell>
+	<cell><em>Is Built-in</em></cell>
+	<cell><em>Description</em></cell>
+      </row>
+      <row>
+	<cell>cth_log_redirect</cell>
+	<cell>yes</cell>
+	<cell>Captures all error_logger and SASL logging events and prints them
+	to the current test case log. If an event can not be associated with a
+	testcase it will be printed in the common test framework log. This will
+	happen for testcases which are run in parallel and events which occur
+	inbetween testcases. You can configure the level of
+	<seealso marker="sasl:sasl_app">SASL</seealso> events report
+	using the normal SASL mechanisms. </cell>
+      </row>
+    </table>
+
+  </section>
+
 </chapter>
 
 
diff --git a/lib/common_test/doc/src/ct_run.xml b/lib/common_test/doc/src/ct_run.xml
index 1ab563d74f..9045646733 100644
--- a/lib/common_test/doc/src/ct_run.xml
+++ b/lib/common_test/doc/src/ct_run.xml
@@ -83,7 +83,7 @@
     <title>Run tests from command line</title>
     <pre>
 	ct_run [-dir TestDir1 TestDir2 .. TestDirN] |
-	[-suite Suite1 Suite2 .. SuiteN
+	[[-dir TestDir] -suite Suite1 Suite2 .. SuiteN
 	 [[-group Group1 Group2 .. GroupN] [-case Case1 Case2 .. CaseN]]]
 	[-step [config | keep_inactive]]
 	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
@@ -92,6 +92,7 @@
 	[-decrypt_key Key] | [-decrypt_file KeyFile]
 	[-label Label]
 	[-logdir LogDir]
+	[-logopts LogOpts]
 	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
 	[-stylesheet CSSFile]
 	[-cover CoverCfgFile]
@@ -117,6 +118,7 @@
 	[-decrypt_key Key] | [-decrypt_file KeyFile]
 	[-label Label]
 	[-logdir LogDir]
+	[-logopts LogOpts]
 	[-allow_user_terms]
 	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
 	[-stylesheet CSSFile]
@@ -138,10 +140,11 @@
     <pre>
         ct_run -vts [-browser Browser]
         [-dir TestDir1 TestDir2 .. TestDirN] |
-        [-suite Suite [[-group Group] [-case Case]]]
+        [[dir TestDir] -suite Suite [[-group Group] [-case Case]]]
 	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
 	[-userconfig CallbackModule1 ConfigString1 and CallbackModule2
          ConfigString2 and .. and CallbackModuleN ConfigStringN]
+	[-logopts LogOpts]
 	[-decrypt_key Key] | [-decrypt_file KeyFile]
 	[-include InclDir1 InclDir2 .. InclDirN]
 	[-no_auto_compile]
diff --git a/lib/common_test/doc/src/make.dep b/lib/common_test/doc/src/make.dep
deleted file mode 100644
index e34075888d..0000000000
--- a/lib/common_test/doc/src/make.dep
+++ /dev/null
@@ -1,27 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: basics_chapter.tex book.tex common_test_app.tex \
-		config_file_chapter.tex cover_chapter.tex \
-		ct.tex ct_cover.tex ct_ftp.tex ct_master.tex \
-		ct_master_chapter.tex ct_rpc.tex ct_snmp.tex \
-		ct_ssh.tex ct_telnet.tex dependencies_chapter.tex \
-		event_handler_chapter.tex example_chapter.tex \
-		install_chapter.tex part.tex ref_man.tex run_test.tex \
-		run_test_chapter.tex test_structure_chapter.tex \
-		unix_telnet.tex why_test_chapter.tex write_test_chapter.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 826b3c598d..af96ef621f 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -32,6 +32,229 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.5.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    An error in how comments are colored in the test suite
+	    overview html log file has been corrected. As result, a
+	    new framework callback function, format_comment/1, has
+	    been introduced.</p>
+          <p>
+	    Own Id: OTP-9237</p>
+        </item>
+        <item>
+          <p>
+	    Automatically generated init- and end-configuration
+	    functions for test case groups caused incorrect execution
+	    order of test cases. This has been corrected.</p>
+          <p>
+	    Own Id: OTP-9369</p>
+        </item>
+        <item>
+          <p>
+	    If multiple directories were specified with the 'logdir'
+	    flag/option, Common Test would crash. This has been fixed
+	    so that an error is properly reported instead.</p>
+          <p>
+	    Own Id: OTP-9370</p>
+        </item>
+        <item>
+          <p>
+	    If ct:log/2 was called with bad arguments, this could
+	    cause the Common Test IO handling process to crash. This
+	    fault has been corrected.</p>
+          <p>
+	    Own Id: OTP-9371 Aux Id: OTP-8933 </p>
+        </item>
+        <item>
+          <p>
+	    A bug has been fixed that made Test Server call the
+	    end_tc/3 framework function with an incorrect module name
+	    as first argument.</p>
+          <p>
+	    Own Id: OTP-9379 Aux Id: seq11863 </p>
+        </item>
+        <item>
+          <p>
+	    If a timetrap timeout occured during execution of of a
+	    function in a lib module (i.e. a function called directly
+	    or indirectly from a test case), the Suite argument in
+	    the end_tc/3 framework callback function would not
+	    correctly contain the name of the test suite, but the lib
+	    module. (This would only happen if the lib module was
+	    compiled with ct.hrl included). This error has been
+	    solved.</p>
+          <p>
+	    Own Id: OTP-9398</p>
+        </item>
+        <item>
+          <p>
+	    Corrections of the vts mode. It will now report errors
+	    (about e.g. incorrect config files) instead of crashing
+	    or hanging. Furthermore, the requirement that the test
+	    directory name must have a "_test" suffix has been
+	    removed. Also, a workaround has been implemented for the
+	    limitation that the file browser (in many web browsers)
+	    will only return the basic file name, not the full
+	    directory path (which made it impossible to have config
+	    files in other directories than the main test directory).</p>
+          <p>
+	    Own Id: OTP-9429</p>
+        </item>
+        <item>
+          <p>
+	    Add a proplist() type</p>
+          <p>
+	    Recently I was adding specs to an API and found that
+	    there is no canonical proplist() type defined. (Thanks to
+	    Ryan Zezeski)</p>
+          <p>
+	    Own Id: OTP-9499</p>
+        </item>
+        <item>
+          <p>
+	    It is now possible to use the 'step' flag/option to run
+	    the debugger for test suites that contain test case
+	    groups. This previously caused Common Test to crash. If
+	    'step config' is specified, breakpoints are now also
+	    automatically set on init_per_group and end_per_group.
+	    Note that breakpoints are always set automatically on
+	    test case functions and this is true also for grouped
+	    cases.</p>
+          <p>
+	    Own Id: OTP-9518 Aux Id: OTP-8933 </p>
+        </item>
+        <item>
+          <p>
+	    The test index page was not refreshed at the start of
+	    each test suite which made it impossible to follow test
+	    execution by means of refreshing the browser window (no
+	    links to follow). This has been fixed.</p>
+          <p>
+	    Own Id: OTP-9520 Aux Id: OTP-8933 </p>
+        </item>
+        <item>
+          <p>
+	    If a test suite would start with a test case group
+	    defined without the init_per_group/2 and end_per_group/2
+	    function, init_per_suite/1 would not execute initially
+	    and logging of the test run would fail. This error has
+	    been fixed.</p>
+          <p>
+	    Own Id: OTP-9584</p>
+        </item>
+        <item>
+          <p>
+	    The "Missing Suites" link from the top level index page
+	    was incorrect and has been fixed.</p>
+          <p>
+	    Own Id: OTP-9592</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Various corrections and updates to improve the handling
+	    and reporting of errors.</p>
+          <p>
+	    Own Id: OTP-8933</p>
+        </item>
+        <item>
+          <p>
+	    The dir and suite start option can now be used in
+	    combination. E.g. executing my_SUITE in directory
+	    my_tests can either be specified as "ct_run -suite
+	    my_tests/my_SUITE" or as "ct_run -dir my_tests -suite
+	    my_SUITE". Furthermore, the specification:
+	    ct:run_test([{suite,["./my_SUITE"]},{testcase,t1}]) is
+	    now interpreted as
+	    ct:run_test([{suite,"./my_SUITE"},{testcase,t1}]), i.e.
+	    only testcase t1 in test suite my_SUITE - not all cases -
+	    will be executed.</p>
+          <p>
+	    Own Id: OTP-9155</p>
+        </item>
+        <item>
+          <p>
+	    A new option, 'logopts', has been introduced, to make it
+	    possible to modify some aspects of the logging behaviour
+	    in Common Test (or Test Server). For example, whenever an
+	    io printout is made, test_server adds newline (\n) to the
+	    end of the output string. This may not always be a
+	    preferred action and can therefore be disabled by means
+	    of "ct_run ... -logopts no_nl" (or ct:run_test([...,
+	    {logopts,[no_nl]}])). A new framework callback function,
+	    get_logopts/0, has been introduced (see the ct_framework
+	    module for details).</p>
+          <p>
+	    Own Id: OTP-9372 Aux Id: OTP-9396 </p>
+        </item>
+        <item>
+          <p>
+	    A new option, 'logopts', has been introduced, to make it
+	    possible to modify some aspects of the logging behaviour
+	    in Common Test (or Test Server). For example, if the html
+	    version of the test suite source code should not be
+	    generated during the test run (and consequently be
+	    unavailable in the log file system), the feature may be
+	    disabled by means of "ct_run ... -logopts no_src" (or
+	    ct:run_test([..., {logopts,[no_src]}])). A new framework
+	    callback function, get_logopts/0, has been introduced
+	    (see the ct_framework module for details).</p>
+          <p>
+	    Own Id: OTP-9396 Aux Id: seq11869, OTP-9372 </p>
+        </item>
+        <item>
+          <p>
+	    CT Hooks can now be assigned a priority. The priority of
+	    a CTH determines when it should execute in relation to
+	    other CTHs. The CTH with the lowest priority will be
+	    executed first, CTHs with equal priority will be executed
+	    in the order which they were installed.</p>
+          <p>
+	    Own Id: OTP-9445</p>
+        </item>
+        <item>
+          <p>
+	    It is now possible to use a tuple {M,F,A}, or a fun, as
+	    timetrap specification in the suite info function or test
+	    case info functions. The function must return a valid
+	    timeout value, as documented in the common_test man page
+	    and in the User's Guide.</p>
+          <p>
+	    Own Id: OTP-9501 Aux Id: seq11894 </p>
+        </item>
+        <item>
+          <p>
+	    A new built-in common test hook has been added which
+	    captures error_logger and SASL event and prints them in
+	    the testcase log. To disable this (and any other built-in
+	    hooks) pass 'enable_builtin_hooks false' to common test.</p>
+          <p>
+	    Own Id: OTP-9543</p>
+        </item>
+        <item>
+          <p>
+	    Common Test now has the possibility to have built-in
+	    hooks which are started by default when any test is run.
+	    To disable built-in hooks pass 'enable_builtin_hooks
+	    false' to common test. See the common test hooks
+	    documentation for more details.</p>
+          <p>
+	    Own Id: OTP-9564</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.5.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index e6fb85634f..57059f0ba2 100644
--- a/lib/common_test/doc/src/run_test_chapter.xml
+++ b/lib/common_test/doc/src/run_test_chapter.xml
@@ -128,6 +128,15 @@
     <p><c>$ ct_run -suite $SYS1_TEST/setup_SUITE -case start stop</c></p>
     <p><c>$ ct_run -suite $SYS1_TEST/setup_SUITE -group installation -case start stop</c></p>
     
+    <p>It is also possible to combine the <c>dir</c>, <c>suite</c> and <c>group/case</c> flags. E.g, to run
+    <c>x_SUITE</c> and <c>y_SUITE</c> in directory <c>testdir</c>:</p>
+
+    <p><c>$ ct_run -dir ./testdir -suite x_SUITE y_SUITE</c></p>
+
+    <p>This has the same effect as calling:</p>
+
+    <p><c>$ ct_run -suite ./testdir/x_SUITE ./testdir/y_SUITE</c></p>
+
     <p>Other flags that may be used with <c>ct_run</c>:</p>
     <list>
       <item><c><![CDATA[-logdir <dir>]]></c>, specifies where the HTML log files are to be written.</item>
@@ -150,6 +159,8 @@
         <seealso marker="event_handler_chapter#event_handling">event handlers</seealso> including start arguments.</item>
       <item><c><![CDATA[-ct_hooks <ct_hooks>]]></c>, to install
         <seealso marker="ct_hooks_chapter#installing">Common Test Hooks</seealso> including start arguments.</item>
+      <item><c><![CDATA[-enable_builtin_hooks <bool>]]></c>, to enable/disable
+        <seealso marker="ct_hooks_chapter#builtin_cths">Built-in Common Test Hooks</seealso>. Default is <c>true</c>.</item>
       <item><c><![CDATA[-include]]></c>, specifies include directories (see above).</item>
       <item><c><![CDATA[-no_auto_compile]]></c>, disables the automatic test suite compilation feature (see above).</item>
       <item><c><![CDATA[-multiply_timetraps <n>]]></c>, extends <seealso marker="write_test_chapter#timetraps">timetrap
@@ -165,6 +176,8 @@
       <item><c><![CDATA[-decrypt_file <key_file>]]></c>, points out a file containing a decryption key for 
         <seealso marker="config_file_chapter#encrypted_config_files">encrypted configuration files</seealso>.</item>
       <item><c><![CDATA[-basic_html]]></c>, switches off html enhancements that might not be compatible with older browsers.</item>
+      <item><c><![CDATA[-logopts <opts>]]></c>, makes it possible to modify aspects of the logging behaviour, see
+        <seealso marker="run_test_chapter#logopts">Log options</seealso> below.</item>
     </list>
 
     <note><p>Directories passed to Common Test may have either relative or absolute paths.</p></note>
@@ -322,8 +335,9 @@
        are to be executed by Common Test, and those functions only. If
        the step option <c>config</c> is specified, breakpoints will 
        also be initially set on the configuration functions in the suite, i.e.
-       <c>init_per_suite/1</c>, <c>end_per_suite/1</c>, <c>init_per_testcase/2</c> 
-       and <c>end_per_testcase/2</c>.</p>
+       <c>init_per_suite/1</c>, <c>end_per_suite/1</c>,
+       <c>init_per_group/2</c>, <c>end_per_group/2</c>,
+       <c>init_per_testcase/2</c> and <c>end_per_testcase/2</c>.</p>
     <p>Common Test enables the Debugger auto attach feature, which means
        that for every new interpreted test case function that starts to execute, 
        a new trace window will automatically pop up. (This is because each test 
@@ -450,6 +464,8 @@
 
       {ct_hooks, CTHModules}.
       {ct_hooks, NodeRefs, CTHModules}.
+
+      {enable_builtin_hooks, Bool}.
     </pre>
       <p>Test terms:</p>
     <pre>
@@ -488,7 +504,7 @@
       LogDir        = string()
       EventHandlers = atom() | [atom()]
       InitArgs      = [term()]
-      CTHModules    = [CTHModule | {CTHModule, CTHInitArgs}]
+      CTHModules    = [CTHModule | {CTHModule, CTHInitArgs} | {CTHModule, CTHInitArgs, CTHPriority}]
       CTHModule     = atom()
       CTHInitArgs   = term()
       DirRef        = DirAlias | Dir
@@ -631,7 +647,11 @@
       <p>The minor log file contain full details of every single test
 	case, each one in a separate file. This way the files should
 	be easy to compare with previous test runs, even if the set of
-	test cases change.</p>
+	test cases change. If SASL is running those logs will also be
+        printed there by the
+	<seealso marker="common_test:ct_hooks_chapter#builtin_cths">
+	  cth_log_redirect built-in hook</seealso>.
+        </p>
       
       <p>Which information goes where is user configurable via the
 	test server controller. Three threshold values determine what
@@ -644,6 +664,30 @@
 	to follow test progress simply by refreshing pages in the HTML browser.
 	Statistics totals are not presented until a test is complete however.</p>
 
+	<section>
+	  <marker id="logopts"></marker>
+	  <title>Log options</title>
+	  <p>With the <c>logopts</c> start flag, it's possible to specify
+	  options that modify some aspects of the logging behaviour.
+	  Currently, the following options are available:</p>
+	  <list>
+	    <item><c>no_src</c></item>
+	    <item><c>no_nl</c></item>
+	  </list>
+	  <p>With <c>no_src</c>, the html version of the test suite source
+	  code will not be generated during the test run (and consequently
+	  not be available in the log file system).</p>
+	  <p>With <c>no_nl</c>, Common Test will not add a newline character
+	  (\n) to the end of an output string that it receives from a call to e.g.
+	  <c>io:format/2</c>, and which it prints to the test case log.</p>
+	  <p>For example, if a test is started with:</p>
+	  <p><c>$ ct_run -suite my_SUITE -logopts no_src</c></p>
+	  <p>then printouts during the test made by successive calls to <c>io:format("x")</c>,
+	  will appear in the test case log as:</p>
+	  <p><c>xxx</c></p>
+	  <p>instead of each <c>x</c> printed on a new line, which is the default behaviour.</p>
+	</section>
+
       </section>
   
       <section>
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 3f9fdb7121..e35888e68f 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -280,6 +280,8 @@
 	    the timetrap time is exceeded, the test case fails with
 	    reason <c>timetrap_timeout</c>. Note that <c>init_per_testcase</c> 
 	    and <c>end_per_testcase</c> are included in the timetrap time.
+	    Please see the <seealso marker="write_test_chapter#timetraps">Timetrap</seealso>
+	    section for more details.
 	  </p>
 	</item>
 	<tag><em><c>userdata</c></em></tag>
@@ -699,8 +701,8 @@
   </section>
 
   <section>
-    <title>Timetrap timeouts</title>
     <marker id="timetraps"></marker>
+    <title>Timetrap timeouts</title>
     <p>The default time limit for a test case is 30 minutes, unless a
       <c>timetrap</c> is specified either by the suite info function
       or a test case info function. The timetrap timeout value defined
@@ -723,6 +725,13 @@
       multipled by <c>multiply_timetraps</c>, and possibly scaled up if
       <c>scale_timetraps</c> is enabled, the function <c>ct:sleep/1</c>
       may be called.</p>
+    <p>A function (<c>fun</c> or <c>MFA</c>) may be specified as timetrap value
+      in the suite- and test case info function, e.g:</p>
+      <p><c>{timetrap,{test_utils,get_timetrap_value,[?MODULE,system_start]}}</c></p>
+      <p>The function will be called initially by Common Test (before execution
+	of the suite or the test case) and must return a time value such as an
+	integer (millisec), or a <c>{SecMinOrHourTag,Time}</c> tuple. More
+	information can be found in the <c>common_test</c> reference manual.</p>
   </section>
 
   <section>
@@ -818,6 +827,3 @@
     </list>
   </section>
 </chapter>
-
-
-
diff --git a/lib/common_test/include/ct.hrl b/lib/common_test/include/ct.hrl
index aa1cc832cf..5a77108e1a 100644
--- a/lib/common_test/include/ct.hrl
+++ b/lib/common_test/include/ct.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -18,5 +18,4 @@
 %%
 
 -include_lib("test_server/include/test_server.hrl").
--compile({parse_transform,ct_line}).
 
diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
index 84b122b5e4..125aa828fb 100644
--- a/lib/common_test/src/Makefile
+++ b/lib/common_test/src/Makefile
@@ -40,7 +40,6 @@ RELSYSDIR = $(RELEASE_PATH)/lib/common_test-$(VSN)
 # ----------------------------------------------------
 
 MODULES= \
-	ct_line \
 	ct \
 	ct_logs \
 	ct_framework \
@@ -69,9 +68,11 @@ MODULES= \
 	ct_config_xml \
 	ct_slave \
         ct_hooks\
-        ct_hooks_lock
+        ct_hooks_lock\
+	cth_log_redirect
 
 TARGET_MODULES= $(MODULES:%=$(EBIN)/%)
+BEAM_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 ERL_FILES= $(MODULES:=.erl)
 HRL_FILES = \
@@ -97,7 +98,7 @@ ERL_COMPILE_FLAGS += -pa ../ebin -I../include -I $(ERL_TOP)/lib/snmp/include/ \
 # ----------------------------------------------------
 TARGET_FILES = \
 	$(GEN_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) \
+	$(BEAM_FILES) \
 	$(APP_TARGET) $(APPUP_TARGET)
 
 APP_FILE= common_test.app
diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src
index b42173f412..57606c01db 100644
--- a/lib/common_test/src/common_test.app.src
+++ b/lib/common_test/src/common_test.app.src
@@ -25,7 +25,6 @@
 	     ct_framework,
 	     ct_ftp,
 	     ct_gen_conn,
-	     ct_line,
 	     ct_logs,
 	     ct_make,
 	     ct_master,
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 66da3ef742..69e15fa246 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -148,10 +148,10 @@ run(TestDirs) ->
 %%%               {auto_compile,Bool} | {multiply_timetraps,M} | {scale_timetraps,Bool} |
 %%%               {repeat,N} | {duration,DurTime} | {until,StopTime} |
 %%%               {force_stop,Bool} | {decrypt,DecryptKeyOrFile} |
-%%%               {refresh_logs,LogDir} | {basic_html,Bool} | 
-%%%               {ct_hooks, CTHs}
+%%%               {refresh_logs,LogDir} | {logopts,LogOpts} | {basic_html,Bool} | 
+%%%               {ct_hooks, CTHs} | {enable_builtin_hooks,Bool}
 %%%   TestDirs = [string()] | string()
-%%%   Suites = [string()] | string()
+%%%   Suites = [string()] | [atom()] | string() | atom()
 %%%   Cases = [atom()] | atom()
 %%%   Groups = [atom()] | atom()
 %%%   TestSpecs = [string()] | string()
@@ -177,6 +177,8 @@ run(TestDirs) ->
 %%%   DecryptKeyOrFile = {key,DecryptKey} | {file,DecryptFile}
 %%%   DecryptKey = string()
 %%%   DecryptFile = string()
+%%%   LogOpts = [LogOpt]
+%%%   LogOpt = no_nl | no_src
 %%%   CTHs = [CTHModule | {CTHModule, CTHInitArgs}]
 %%%   CTHModule = atom()
 %%%   CTHInitArgs = term()
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index 6b75937668..fc51aea7f3 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -204,9 +204,9 @@ get_config_file_list(Opts) ->
     DefaultConfigs = process_default_configs(Opts),
     CfgFiles =
 	if
-	    DefaultConfigs == []->
+	    DefaultConfigs == [] ->
 		[];
-	    true->
+	    true ->
 		[{?ct_config_txt, DefaultConfigs}]
 	end ++
 	process_user_configs(Opts, []),
@@ -240,12 +240,12 @@ read_config_files(Opts) ->
 		  end,
 
     ConfigFiles = case lists:keyfind(config, 1, Opts) of
-		      {config,ConfigLists}->
+		      {config,ConfigLists} ->
                           lists:foldr(fun({Callback,Files}, Acc) ->
 					      AddCallback(Callback,Files)
 						  ++ Acc
 				      end,[],ConfigLists);
-		      false->
+		      false ->
 			  []
 		  end,
     read_config_files_int(ConfigFiles, fun store_config/3).
@@ -255,7 +255,9 @@ read_config_files_int([{Callback, File}|Files], FunToSave) ->
 	{ok, Config} ->
 	    FunToSave(Config, Callback, File),
 	    read_config_files_int(Files, FunToSave);
-	{error, ErrorName, ErrorDetail}->
+	{error, {ErrorName, ErrorDetail}} ->
+	    {user_error, {ErrorName, File, ErrorDetail}};
+	{error, ErrorName, ErrorDetail} ->
 	    {user_error, {ErrorName, File, ErrorDetail}}
     end;
 read_config_files_int([], _FunToSave) ->
@@ -283,7 +285,7 @@ rewrite_config(Config, Callback, File) ->
 			      config=File,_='_'}),
     Updater = fun({Key, Value}) ->
 	case keyfindall(Key, #ct_conf.key, OldRows) of
-	    []->
+	    [] ->
 		ets:insert(?attr_table,
 			   #ct_conf{key=Key,
 				    value=Value,
@@ -453,9 +455,9 @@ update_conf(Name, NewConfig) ->
 
 reload_conf(KeyOrName) ->
     case lookup_handler_for_config(KeyOrName) of
-	[]->
+	[] ->
 	    undefined;
-	HandlerList->
+	HandlerList ->
 	    HandlerList2 = lists:usort(HandlerList),
 	    read_config_files_int(HandlerList2, fun rewrite_config/3),
 	    get_config(KeyOrName)
@@ -711,13 +713,13 @@ random_bytes_1(N, Acc) -> random_bytes_1(N-1, [random:uniform(255)|Acc]).
 
 check_callback_load(Callback) ->
     case code:is_loaded(Callback) of
-	{file, _Filename}->
+	{file, _Filename} ->
 	    check_exports(Callback);
-	false->
+	false ->
 	    case code:load_file(Callback) of
-		{module, Callback}->
+		{module, Callback} ->
 		    check_exports(Callback);
-		{error, Error}->
+		{error, Error} ->
 		    {error, Error}
 	    end
     end.
@@ -745,14 +747,14 @@ check_config_files(Configs) ->
 					  end,
 					  Files)
 			end;
-		{error, Why}->
+		{error, Why} ->
 		    {error, {callback, {Callback,Why}}}
 	    end;
 	({Callback, []}) ->
 	    case check_callback_load(Callback) of
-		{ok, Callback}->
+		{ok, Callback} ->
 		     Callback:check_parameter([]);
-		{error, Why}->
+		{error, Why} ->
 		     {error, {callback, {Callback,Why}}}
 	    end
     end,
@@ -773,15 +775,15 @@ prepare_user_configs([], Acc, _) ->
 
 prepare_config_list(Args) ->
     ConfigFiles = case lists:keysearch(ct_config, 1, Args) of
-		      {value,{ct_config,Files}}->
+		      {value,{ct_config,Files}} ->
 			  [{?ct_config_txt,[filename:absname(F) || F <- Files]}];
-		      false->
+		      false ->
 			  []
 		  end,
     UserConfigs = case lists:keysearch(userconfig, 1, Args) of
-		      {value,{userconfig,UserConfigFiles}}->
+		      {value,{userconfig,UserConfigFiles}} ->
 			  prepare_user_configs(UserConfigFiles, [], new);
-		      false->
+		      false ->
 			  []
 		  end,
     ConfigFiles ++ UserConfigs.
diff --git a/lib/common_test/src/ct_config_plain.erl b/lib/common_test/src/ct_config_plain.erl
index 3fbc8af9fb..6698332379 100644
--- a/lib/common_test/src/ct_config_plain.erl
+++ b/lib/common_test/src/ct_config_plain.erl
@@ -29,7 +29,7 @@ read_config(ConfigFile) ->
 	{ok,Config} ->
 	    {ok, Config};
 	{error,enoent} ->
-	    {error, config_file_error, enoent};
+	    {error,{config_file_error,file:format_error(enoent)}};
 	{error,Reason} ->
 	    Key =
 		case application:get_env(common_test, decrypt) of
@@ -45,23 +45,27 @@ read_config(ConfigFile) ->
 		end,
 	    case Key of
 		{error,no_crypt_file} ->
-		    {error, config_file_error, Reason};
+		    {error,{config_file_error,
+			    lists:flatten(
+			      io_lib:format("~s",[file:format_error(Reason)]))}};
 		{error,CryptError} ->
-		    {error, decrypt_file_error, CryptError};
+		    {error,{decrypt_file_error,CryptError}};
 		_ when is_list(Key) ->
-		    case ct_config:decrypt_config_file(ConfigFile, undefined, {key,Key}) of
+		    case ct_config:decrypt_config_file(ConfigFile,
+						       undefined,
+						       {key,Key}) of
 			{ok,CfgBin} ->
 			    case read_config_terms(CfgBin) of
 				{error,ReadFail} ->
-				    {error, config_file_error, ReadFail};
+				    {error,{config_file_error,ReadFail}};
 				Config ->
-				    {ok, Config}
+				    {ok,Config}
 			    end;
 			{error,DecryptFail} ->
-			    {error, decrypt_config_error, DecryptFail}
+			    {error,{decrypt_config_error,DecryptFail}}
 		    end;
 		_ ->
-		    {error, bad_decrypt_key, Key}
+		    {error,{bad_decrypt_key,Key}}
 	    end
     end.
 
@@ -69,9 +73,9 @@ read_config(ConfigFile) ->
 check_parameter(File)->
     case filelib:is_file(File) of
 	true->
-	    {ok, {file, File}};
+	    {ok,{file,File}};
 	false->
-	    {error, {nofile, File}}
+	    {error,{nofile,File}}
     end.
 
 read_config_terms(Bin) when is_binary(Bin) ->
diff --git a/lib/common_test/src/ct_config_xml.erl b/lib/common_test/src/ct_config_xml.erl
index 8a6e75e635..794174e663 100644
--- a/lib/common_test/src/ct_config_xml.erl
+++ b/lib/common_test/src/ct_config_xml.erl
@@ -27,30 +27,30 @@
 % read config file
 read_config(ConfigFile) ->
     case catch do_read_xml_config(ConfigFile) of
-	{ok, Config}->
-	    {ok, Config};
-	{error, Error, ErroneousString}->
-	    {error, Error, ErroneousString}
+	{ok,Config} ->
+	    {ok,Config};
+	Error = {error,_} ->
+	    Error
     end.
 
 % check file exists
-check_parameter(File)->
+check_parameter(File) ->
     case filelib:is_file(File) of
-	true->
-	    {ok, {file, File}};
-	false->
-	    {error, {nofile, File}}
+	true ->
+	    {ok,{file,File}};
+	false ->
+	    {error,{nofile,File}}
     end.
 
 % actual reading of the config
-do_read_xml_config(ConfigFile)->
+do_read_xml_config(ConfigFile) ->
     case catch xmerl_sax_parser:file(ConfigFile,
-	    [{event_fun, fun event/3},
-	    {event_state, []}]) of
-	{ok, EntityList, _}->
-	    {ok, lists:reverse(transform_entity_list(EntityList))};
-	Oops->
-	    {error, parsing_failed, Oops}
+	    [{event_fun,fun event/3},
+	     {event_state,[]}]) of
+	{ok,EntityList,_} ->
+	    {ok,lists:reverse(transform_entity_list(EntityList))};
+	Oops ->
+	    {error,{parsing_failed,Oops}}
     end.
 
 % event callback for xmerl_sax_parser
@@ -92,18 +92,18 @@ tag(_El, State) ->
 	State.
 
 % transform of the ugly deeply nested entity list to the key-value "tree"
-transform_entity_list(EntityList)->
+transform_entity_list(EntityList) ->
     lists:map(fun transform_entity/1, EntityList).
 
 % transform entity from {list(), list()} to {atom(), term()}
 transform_entity({Tag, [Value|Rest]}) when
-    is_tuple(Value)->
+    is_tuple(Value) ->
 	{list_to_atom(Tag), transform_entity_list(lists:reverse([Value|Rest]))};
-transform_entity({Tag, String})->
+transform_entity({Tag, String}) ->
     case list_to_term(String) of
-	{ok, Value}->
+	{ok, Value} ->
 	    {list_to_atom(Tag), Value};
-	Error->
+	Error ->
 	     throw(Error)
     end.
 
@@ -111,8 +111,8 @@ transform_entity({Tag, String})->
 list_to_term(String) ->
     {ok, T, _} = erl_scan:string(String++"."),
     case catch erl_parse:parse_term(T) of
-        {ok, Term} ->
-            {ok, Term};
+        {ok,Term} ->
+            {ok,Term};
         Error ->
-            {error, Error, String}
+            {error,{Error,String}}
     end.
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 809616d8e3..482c5242ce 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -24,10 +24,10 @@
 
 -module(ct_framework).
 
--export([init_tc/3, end_tc/3, end_tc/4, get_suite/2, report/2, warn/1]).
--export([error_notification/4]).
+-export([init_tc/3, end_tc/3, end_tc/4, get_suite/2, get_all_cases/1]).
+-export([report/2, warn/1, error_notification/4]).
 
--export([overview_html_header/1]).
+-export([get_logopts/0, format_comment/1, overview_html_header/1]).
 
 -export([error_in_suite/1, ct_init_per_group/2, ct_end_per_group/2]).
 
@@ -116,7 +116,7 @@ init_tc1(Mod,Func,[Config0],DoInit) when is_list(Config0) ->
     Config = lists:keydelete(watchdog,1,Config1),
     if Func /= init_per_suite, DoInit /= true ->
 	    ok;
-	true ->
+       true ->
 	    %% delete all default values used in previous suite
 	    ct_config:delete_default_config(suite),
 	    %% release all name -> key bindings (once per suite)
@@ -133,7 +133,7 @@ init_tc1(Mod,Func,[Config0],DoInit) when is_list(Config0) ->
     ct_config:delete_default_config(testcase),
     case add_defaults(Mod,Func,TestCaseInfo,DoInit) of
 	Error = {suite0_failed,_} ->
-	    ct_logs:init_tc(),
+	    ct_logs:init_tc(false),
 	    FuncSpec = group_or_func(Func,Config0),
 	    ct_event:notify(#event{name=tc_start,
 				   node=node(),
@@ -143,7 +143,7 @@ init_tc1(Mod,Func,[Config0],DoInit) when is_list(Config0) ->
 	{SuiteInfo,MergeResult} ->
 	    case MergeResult of
 		{error,Reason} when DoInit == false ->
-		    ct_logs:init_tc(),
+		    ct_logs:init_tc(false),
 		    FuncSpec = group_or_func(Func,Config0),
 		    ct_event:notify(#event{name=tc_start,
 					   node=node(),
@@ -194,19 +194,24 @@ init_tc2(Mod,Func,SuiteInfo,MergeResult,Config,DoInit) ->
 	Conns ->
 	    ct_util:silence_connections(Conns)
     end,
-    
-    ct_logs:init_tc(),
+    if Func /= init_per_suite, DoInit /= true ->
+	    ct_logs:init_tc(false);
+       true ->
+	    ct_logs:init_tc(true)
+    end,
     FuncSpec = group_or_func(Func,Config),
     ct_event:notify(#event{name=tc_start,
 			   node=node(),
 			   data={Mod,FuncSpec}}),
     
-    case configure(MergedInfo1,MergedInfo1,SuiteInfo,{Func,DoInit},Config) of
+    case catch configure(MergedInfo1,MergedInfo1,SuiteInfo,{Func,DoInit},Config) of
 	{suite0_failed,Reason} ->
 	    ct_util:set_testdata({curr_tc,{Mod,{suite0_failed,{require,Reason}}}}),
 	    {skip,{require_failed_in_suite0,Reason}};
 	{error,Reason} ->
 	    {auto_skip,{require_failed,Reason}};
+	{'EXIT',Reason} ->
+	    {auto_skip,Reason};
 	{ok, FinalConfig} ->
 	    case MergeResult of
 		{error,Reason} ->
@@ -240,28 +245,45 @@ add_defaults(Mod,Func,FuncInfo,DoInit) ->
     case (catch Mod:suite()) of
 	{'EXIT',{undef,_}} ->
 	    SuiteInfo = merge_with_suite_defaults(Mod,[]),
-	    case add_defaults1(Mod,Func,FuncInfo,SuiteInfo,DoInit) of
+	    SuiteInfoNoCTH = [I || I <- SuiteInfo, element(1,I) =/= ct_hooks],
+	    case add_defaults1(Mod,Func,FuncInfo,SuiteInfoNoCTH,DoInit) of
 		Error = {error,_} -> {SuiteInfo,Error};
 		MergedInfo -> {SuiteInfo,MergedInfo}
 	    end;
-	{'EXIT',Reason} -> 
+	{'EXIT',Reason} ->
+	    ErrStr = io_lib:format("~n*** ERROR *** "
+				   "~w:suite/0 failed: ~p~n",
+				   [Mod,Reason]),
+	    io:format(ErrStr, []),
+	    io:format(user, ErrStr, []),
 	    {suite0_failed,{exited,Reason}};
 	SuiteInfo when is_list(SuiteInfo) ->
 	    case lists:all(fun(E) when is_tuple(E) -> true;
 			      (_) -> false
 			   end, SuiteInfo) of
 		true ->
-		    SuiteInfoNoCTH = 
-			lists:keydelete(ct_hooks,1,SuiteInfo),
-		    SuiteInfo1 = merge_with_suite_defaults(Mod,SuiteInfoNoCTH),
-		    case add_defaults1(Mod,Func,FuncInfo,SuiteInfo1,DoInit) of
+		    SuiteInfo1 = merge_with_suite_defaults(Mod,SuiteInfo),
+		    SuiteInfoNoCTH = [I || I <- SuiteInfo1,
+					   element(1,I) =/= ct_hooks],
+		    case add_defaults1(Mod,Func,FuncInfo,
+				       SuiteInfoNoCTH,DoInit) of
 			Error = {error,_} -> {SuiteInfo1,Error};
 			MergedInfo -> {SuiteInfo1,MergedInfo}
 		    end;
 		false ->
+		    ErrStr = io_lib:format("~n*** ERROR *** "
+					   "Invalid return value from "
+					   "~w:suite/0: ~p~n", [Mod,SuiteInfo]),
+		    io:format(ErrStr, []),
+		    io:format(user, ErrStr, []),
 		    {suite0_failed,bad_return_value}
 	    end;
-	_ ->
+	SuiteInfo ->
+	    ErrStr = io_lib:format("~n*** ERROR *** "
+				   "Invalid return value from "
+				   "~w:suite/0: ~p~n", [Mod,SuiteInfo]),
+	    io:format(ErrStr, []),
+	    io:format(user, ErrStr, []),
 	    {suite0_failed,bad_return_value}
     end.
 
@@ -435,7 +457,7 @@ try_set_default(Name,Key,Info,Where) ->
 %%% @doc Test server framework callback, called by the test_server
 %%% when a test case is finished.
 end_tc(Mod, Fun, Args) ->
-    %% Have to keep end_tc/3 for backwards compatabilty issues
+    %% Have to keep end_tc/3 for backwards compatibility issues
     end_tc(Mod, Fun, Args, '$end_tc_dummy').
 end_tc(?MODULE,error_in_suite,_, _) ->		% bad start!
     ok;
@@ -449,7 +471,6 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
 	{value,{watchdog,Dog}} -> test_server:timetrap_cancel(Dog);
 	false -> ok
     end,
-
     %% save the testcase process pid so that it can be used
     %% to look up the attached trace window later
     case ct_util:get_testdata(interpret) of
@@ -459,7 +480,6 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
 	_ ->
 	    ok
     end,
-
     ct_util:delete_testdata(comment),
     ct_util:delete_suite_data(last_saved_config),
     FuncSpec =
@@ -765,6 +785,37 @@ get_suite(Mod, Name) ->
 
 %%%-----------------------------------------------------------------
 
+get_all_cases(Suite) ->
+    case get_suite(Suite, all) of
+	[{?MODULE,error_in_suite,[[{error,_}=Error]]}] ->
+		Error;
+	[{?MODULE,error_in_suite,[[Error]]}] ->
+	    {error,Error};
+	Tests ->
+	    Cases = get_all_cases1(Suite, Tests),
+	    lists:reverse(
+	      lists:foldl(fun(TC, TCs) ->
+				  case lists:member(TC, TCs) of
+				      true  -> TCs;
+				      false -> [TC | TCs]
+				  end
+			  end, [], Cases))
+    end.
+
+get_all_cases1(Suite, [{conf,_Props,_Init,GrTests,_End} | Tests]) ->
+    get_all_cases1(Suite, GrTests) ++ get_all_cases1(Suite, Tests);
+
+get_all_cases1(Suite, [Test | Tests]) when is_atom(Test) ->
+    [{Suite,Test} | get_all_cases1(Suite, Tests)];
+
+get_all_cases1(Suite, [Test | Tests]) ->
+    [Test | get_all_cases1(Suite, Tests)];
+
+get_all_cases1(_, []) ->
+    [].
+
+%%%-----------------------------------------------------------------
+
 find_groups(Mod, Name, TCs, GroupDefs) ->
     Found = find(Mod, Name, TCs, GroupDefs, [], GroupDefs, false),
     trim(Found).
@@ -976,15 +1027,20 @@ make_conf(Mod, Name, Props, TestSpec) ->
 	_ ->
 	    ok
     end,
-    {InitConf,EndConf} =
+    {InitConf,EndConf,ExtraProps} =
 	case erlang:function_exported(Mod,init_per_group,2) of
 	    true ->
-		{{Mod,init_per_group},{Mod,end_per_group}};
+		{{Mod,init_per_group},{Mod,end_per_group},[]};
 	    false ->
+		ct_logs:log("TEST INFO", "init_per_group/2 and "
+			    "end_per_group/2 missing for group "
+			    "~p in ~p, using default.",
+			    [Name,Mod]),
 		{{?MODULE,ct_init_per_group},
-		 {?MODULE,ct_end_per_group}}
+		 {?MODULE,ct_end_per_group},
+		 [{suite,Mod}]}
 	end,
-    {conf,[{name,Name}|Props],InitConf,TestSpec,EndConf}.
+    {conf,[{name,Name}|Props++ExtraProps],InitConf,TestSpec,EndConf}.
 
 %%%-----------------------------------------------------------------
 
@@ -1157,13 +1213,15 @@ error_in_suite(Config) ->
 %% if the group config functions are missing in the suite,
 %% use these instead
 ct_init_per_group(GroupName, Config) ->
-    ct_logs:log("WARNING", "init_per_group/2 for ~w missing "
+    ct:comment(io_lib:format("start of ~p", [GroupName])),
+    ct_logs:log("TEST INFO", "init_per_group/2 for ~w missing "
 		"in suite, using default.",
 		[GroupName]),
     Config.
 
 ct_end_per_group(GroupName, _) ->
-    ct_logs:log("WARNING", "end_per_group/2 for ~w missing "
+    ct:comment(io_lib:format("end of ~p", [GroupName])),
+    ct_logs:log("TEST INFO", "end_per_group/2 for ~w missing "
 		"in suite, using default.",
 		[GroupName]),
     ok.
@@ -1240,12 +1298,20 @@ report(What,Data) ->
 		    ok;
 		{end_per_group,_} ->
 		    ok;
+		{ct_init_per_group,_} ->
+		    ok;
+		{ct_end_per_group,_} ->
+		    ok;
 		{_,ok} ->
 		    add_to_stats(ok);
 		{_,{skipped,{failed,{_,init_per_testcase,_}}}} ->
 		    add_to_stats(auto_skipped);
 		{_,{skipped,{require_failed,_}}} ->
 		    add_to_stats(auto_skipped);
+		{_,{skipped,{timetrap_error,_}}} ->
+		    add_to_stats(auto_skipped);
+		{_,{skipped,{invalid_time_format,_}}} ->
+		    add_to_stats(auto_skipped);
 		{_,{skipped,_}} ->
 		    add_to_stats(user_skipped);
 		{_,{SkipOrFail,_Reason}} ->
@@ -1330,6 +1396,21 @@ add_data_dir(File,Config) when is_list(File) ->
     end.
 
 %%%-----------------------------------------------------------------
+%%% @spec get_logopts() -> [LogOpt]
+get_logopts() ->
+    case ct_util:get_testdata(logopts) of
+	undefined ->
+	    [];
+	LogOpts ->
+	    LogOpts
+    end.
+
+%%%-----------------------------------------------------------------
+%%% @spec format_comment(Comment) -> HtmlComment
+format_comment(Comment) ->
+    "<font color=\"green\">" ++ Comment ++ "</font>".
+
+%%%-----------------------------------------------------------------
 %%% @spec overview_html_header(TestName) -> Header
 overview_html_header(TestName) ->
     TestName1 = lists:flatten(io_lib:format("~p", [TestName])),
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
index 984e04b90f..ffafc582cf 100644
--- a/lib/common_test/src/ct_hooks.erl
+++ b/lib/common_test/src/ct_hooks.erl
@@ -31,11 +31,17 @@
 -export([on_tc_skip/2]).
 -export([on_tc_fail/2]).
 
--type proplist() :: [{atom(),term()}].
-
 %% If you change this, remember to update ct_util:look -> stop clause as well.
 -define(config_name, ct_hooks).
 
+%% All of the hooks which are to be started by default. Remove by issuing
+%% -enable_builtin_hooks false to when starting common test.
+-define(BUILTIN_HOOKS,[#ct_hook_config{ module = cth_log_redirect,
+					opts = [],
+					prio = ctfirst }]).
+
+-record(ct_hook_config, {id, module, prio, scope, opts = [], state = []}).
+
 %% -------------------------------------------------------------------------
 %% API Functions
 %% -------------------------------------------------------------------------
@@ -44,7 +50,7 @@
 -spec init(State :: term()) -> ok |
 			       {error, Reason :: term()}.
 init(Opts) ->
-    call([{Hook, call_id, undefined} || Hook <- get_new_hooks(Opts)],
+    call(get_new_hooks(Opts, undefined) ++ get_builtin_hooks(Opts),
 	 ok, init, []).
 		      
 
@@ -52,14 +58,15 @@ init(Opts) ->
 -spec terminate(Hooks :: term()) ->
     ok.
 terminate(Hooks) ->
-    call([{HookId, fun call_terminate/3} || {HookId,_,_} <- Hooks],
+    call([{HookId, fun call_terminate/3}
+	  || #ct_hook_config{id = HookId} <- Hooks],
 	 ct_hooks_terminate_dummy, terminate, Hooks),
     ok.
 
 %% @doc Called as each test case is started. This includes all configuration
 %% tests.
 -spec init_tc(Mod :: atom(), Func :: atom(), Args :: list()) ->
-    NewConfig :: proplist() |
+    NewConfig :: proplists:proplist() |
     {skip, Reason :: term()} |
     {auto_skip, Reason :: term()} |
     {fail, Reason :: term()}.
@@ -68,11 +75,11 @@ init_tc(ct_framework, _Func, Args) ->
 init_tc(Mod, init_per_suite, Config) ->
     Info = try proplists:get_value(ct_hooks, Mod:suite(),[]) of
 	       List when is_list(List) -> 
-		   [{ct_hooks,List}];
+		   [{?config_name,List}];
 	       CTHook when is_atom(CTHook) ->
-		   [{ct_hooks,[CTHook]}]
+		   [{?config_name,[CTHook]}]
 	   catch error:undef ->
-		   [{ct_hooks,[]}]
+		   [{?config_name,[]}]
 	   end,
     call(fun call_generic/3, Config ++ Info, [pre_init_per_suite, Mod]);
 init_tc(Mod, end_per_suite, Config) ->
@@ -92,7 +99,7 @@ init_tc(_Mod, TC, Config) ->
 	     Args :: list(),
 	     Result :: term(),
 	     Resturn :: term()) ->
-    NewConfig :: proplist() |
+    NewConfig :: proplists:proplist() |
     {skip, Reason :: term()} |
     {auto_skip, Reason :: term()} |
     {fail, Reason :: term()} |
@@ -131,36 +138,48 @@ on_tc_fail(_How, {Suite, Case, Reason}) ->
 %% -------------------------------------------------------------------------
 %% Internal Functions
 %% -------------------------------------------------------------------------
-call_id(Mod, Config, Meta) when is_atom(Mod) ->
-    call_id({Mod, []}, Config, Meta);
-call_id({Mod, Opts}, Config, Scope) ->
+call_id(#ct_hook_config{ module = Mod, opts = Opts} = Hook, Config, Scope) ->
     Id = catch_apply(Mod,id,[Opts], make_ref()),
-    {Config, {Id, scope(Scope), {Mod, {Id,Opts}}}}.
+    {Config, Hook#ct_hook_config{ id = Id, scope = scope(Scope)}}.
 	
-call_init({Mod,{Id,Opts}},Config,_Meta) ->
-    NewState = Mod:init(Id, Opts),
-    {Config, {Mod, NewState}}.
-
-call_terminate({Mod, State}, _, _) ->
+call_init(#ct_hook_config{ module = Mod, opts = Opts, id = Id, prio = P} = Hook,
+	  Config,_Meta) ->
+    case Mod:init(Id, Opts) of
+	{ok, NewState} when P =:= undefined ->
+	    {Config, Hook#ct_hook_config{ state = NewState, prio = 0 } };
+	{ok, NewState} ->
+	    {Config, Hook#ct_hook_config{ state = NewState } };
+	{ok, NewState, Prio} when P =:= undefined ->
+	    %% Only set prio if not already set when installing hook
+	    {Config, Hook#ct_hook_config{ state = NewState, prio = Prio } };
+	{ok, NewState, _} ->
+	    {Config, Hook#ct_hook_config{ state = NewState } };
+	NewState -> %% Keep for backward compatability reasons
+	    {Config, Hook#ct_hook_config{ state = NewState } }
+    end.    
+
+call_terminate(#ct_hook_config{ module = Mod, state = State} = Hook, _, _) ->
     catch_apply(Mod,terminate,[State], ok),
-    {[],{Mod,State}}.
+    {[],Hook}.
 
-call_cleanup({Mod, State}, Reason, [Function, _Suite | Args]) ->
+call_cleanup(#ct_hook_config{ module = Mod, state = State} = Hook,
+	     Reason, [Function, _Suite | Args]) ->
     NewState = catch_apply(Mod,Function, Args ++ [Reason, State],
 			   State),
-    {Reason, {Mod, NewState}}.
+    {Reason, Hook#ct_hook_config{ state = NewState } }.
 
-call_generic({Mod, State}, Value, [Function | Args]) ->
+call_generic(#ct_hook_config{ module = Mod, state = State} = Hook,
+	     Value, [Function | Args]) ->
     {NewValue, NewState} = catch_apply(Mod, Function, Args ++ [Value, State],
 				       {Value,State}),
-    {NewValue, {Mod, NewState}}.
+    {NewValue, Hook#ct_hook_config{ state = NewState } }.
 
 %% Generic call function
 call(Fun, Config, Meta) ->
     maybe_lock(),
     Hooks = get_hooks(),
-    Res = call([{HookId,Fun} || {HookId,_, _} <- Hooks] ++
-		   get_new_hooks(Config, Fun),
+    Res = call(get_new_hooks(Config, Fun) ++
+		   [{HookId,Fun} || #ct_hook_config{id = HookId} <- Hooks],
 	       remove(?config_name,Config), Meta, Hooks),
     maybe_unlock(),
     Res.
@@ -173,19 +192,20 @@ call(Fun, Config, Meta, NoChangeRet) when is_function(Fun) ->
 
 call([{Hook, call_id, NextFun} | Rest], Config, Meta, Hooks) ->
     try
-	{Config, {NewId, _, _} = NewHook} = call_id(Hook, Config, Meta),
+	{Config, #ct_hook_config{ id = NewId } = NewHook} =
+	    call_id(Hook, Config, Meta),
 	{NewHooks, NewRest} = 
-	    case lists:keyfind(NewId, 1, Hooks) of
+	    case lists:keyfind(NewId, #ct_hook_config.id, Hooks) of
 		false when NextFun =:= undefined ->
 		    {Hooks ++ [NewHook],
-		     [{NewId, fun call_init/3} | Rest]};
+		     [{NewId, call_init} | Rest]};
 		ExistingHook when is_tuple(ExistingHook) ->
 		    {Hooks, Rest};
 		_ ->
 		    {Hooks ++ [NewHook],
-		     [{NewId, fun call_init/3},{NewId,NextFun} | Rest]}
+		     [{NewId, call_init}, {NewId,NextFun} | Rest]}
 	    end,
-	call(NewRest, Config, Meta, NewHooks)
+	call(resort(NewRest,NewHooks), Config, Meta, NewHooks)
     catch Error:Reason ->
 	    Trace = erlang:get_stacktrace(),
 	    ct_logs:log("Suite Hook","Failed to start a CTH: ~p:~p",
@@ -193,13 +213,16 @@ call([{Hook, call_id, NextFun} | Rest], Config, Meta, Hooks) ->
 	    call([], {fail,"Failed to start CTH"
 		      ", see the CT Log for details"}, Meta, Hooks)
     end;
+call([{HookId, call_init} | Rest], Config, Meta, Hooks) ->
+    call([{HookId, fun call_init/3} | Rest], Config, Meta, Hooks);
 call([{HookId, Fun} | Rest], Config, Meta, Hooks) ->
     try
-        {_,Scope,ModState} = lists:keyfind(HookId, 1, Hooks),
-        {NewConf, NewHookInfo} =  Fun(ModState, Config, Meta),
+        Hook = lists:keyfind(HookId, #ct_hook_config.id, Hooks),
+        {NewConf, NewHook} =  Fun(Hook, Config, Meta),
         NewCalls = get_new_hooks(NewConf, Fun),
-        NewHooks = lists:keyreplace(HookId, 1, Hooks, {HookId, Scope, NewHookInfo}),
-        call(NewCalls  ++ Rest, remove(?config_name, NewConf), Meta,
+        NewHooks = lists:keyreplace(HookId, #ct_hook_config.id, Hooks, NewHook),
+        call(resort(NewCalls ++ Rest,NewHooks), %% Resort if call_init changed prio
+	     remove(?config_name, NewConf), Meta,
              terminate_if_scope_ends(HookId, Meta, NewHooks))
     catch throw:{error_in_cth_call,Reason} ->
             call(Rest, {fail, Reason}, Meta,
@@ -237,19 +260,26 @@ terminate_if_scope_ends(HookId, [on_tc_skip,Suite,end_per_suite], Hooks) ->
 terminate_if_scope_ends(HookId, [Function,Tag|T], Hooks) when T =/= [] ->
     terminate_if_scope_ends(HookId,[Function,Tag],Hooks);
 terminate_if_scope_ends(HookId, Function, Hooks) ->
-    case lists:keyfind(HookId, 1, Hooks) of
-        {HookId, Function, _ModState} = Hook ->
+    case lists:keyfind(HookId, #ct_hook_config.id, Hooks) of
+        #ct_hook_config{ id = HookId, scope = Function} = Hook ->
             terminate([Hook]),
-            lists:keydelete(HookId, 1, Hooks);
+            lists:keydelete(HookId, #ct_hook_config.id, Hooks);
         _ ->
             Hooks
     end.
 
 %% Fetch hook functions
 get_new_hooks(Config, Fun) ->
-    lists:foldl(fun(NewHook, Acc) ->
-			[{NewHook, call_id, Fun} | Acc]
-		end, [], get_new_hooks(Config)).
+    lists:map(fun(NewHook) when is_atom(NewHook) ->
+		      {#ct_hook_config{ module = NewHook }, call_id, Fun};
+		 ({NewHook,Opts}) ->
+		      {#ct_hook_config{ module = NewHook,
+					opts = Opts}, call_id, Fun};
+		 ({NewHook,Opts,Prio}) ->
+		      {#ct_hook_config{ module = NewHook,
+					opts = Opts,
+					prio = Prio }, call_id, Fun}
+		end, get_new_hooks(Config)).
 
 get_new_hooks(Config) when is_list(Config) ->
     lists:flatmap(fun({?config_name, HookConfigs}) ->
@@ -260,11 +290,63 @@ get_new_hooks(Config) when is_list(Config) ->
 get_new_hooks(_Config) ->
     [].
 
+get_builtin_hooks(Opts) ->
+    case proplists:get_value(enable_builtin_hooks,Opts) of
+	false ->
+	    [];
+	_Else ->
+	    [{HookConf, call_id, undefined} || HookConf <- ?BUILTIN_HOOKS]
+    end.
+
 save_suite_data_async(Hooks) ->
     ct_util:save_suite_data_async(?config_name, Hooks).
 
 get_hooks() ->
-    ct_util:read_suite_data(?config_name).
+    lists:keysort(#ct_hook_config.prio,ct_util:read_suite_data(?config_name)).
+
+%% Sort all calls in this order:
+%% call_id < call_init < ctfirst < Priority 1 < .. < Priority N < ctlast
+%% If Hook Priority is equal, check when it has been installed and
+%% sort on that instead.
+resort(Calls, Hooks) ->
+    lists:sort(
+      fun({_,_,_},_) ->
+	      true;
+	 (_,{_,_,_}) ->
+	      false;
+	 ({_,call_init},_) ->
+	      true;
+	 (_,{_,call_init}) ->
+	      false;
+	 ({Id1,_},{Id2,_}) ->
+	      P1 = (lists:keyfind(Id1, #ct_hook_config.id, Hooks))#ct_hook_config.prio,
+	      P2 = (lists:keyfind(Id2, #ct_hook_config.id, Hooks))#ct_hook_config.prio,
+	      if
+		  P1 == P2 ->
+		      %% If priorities are equal, we check the position in the
+		      %% hooks list
+		      pos(Id1,Hooks) < pos(Id2,Hooks);
+		  P1 == ctfirst ->
+		      true;
+		  P2 == ctfirst ->
+		      false;
+		  P1 == ctlast ->
+		      false;
+		  P2 == ctlast ->
+		      true;
+		  true ->
+		      P1 < P2
+	      end
+      end,Calls).
+
+pos(Id,Hooks) ->
+    pos(Id,Hooks,0).
+pos(Id,[#ct_hook_config{ id = Id}|_],Num) ->
+    Num;
+pos(Id,[_|Rest],Num) ->
+    pos(Id,Rest,Num+1).
+
+
 
 catch_apply(M,F,A, Default) ->
     try
@@ -272,7 +354,7 @@ catch_apply(M,F,A, Default) ->
     catch error:Reason ->
 	    case erlang:get_stacktrace() of
             %% Return the default if it was the CTH module which did not have the function.
-		[{M,F,A}|_] when Reason == undef ->
+		[{M,F,A,_}|_] when Reason == undef ->
 		    Default;
 		Trace ->
 		    ct_logs:log("Suite Hook","Call to CTH failed: ~p:~p",
diff --git a/lib/common_test/src/ct_line.erl b/lib/common_test/src/ct_line.erl
deleted file mode 100644
index 4af9da5463..0000000000
--- a/lib/common_test/src/ct_line.erl
+++ /dev/null
@@ -1,266 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. 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.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%% @doc Parse transform for inserting line numbers
-
--module(ct_line).
-
--record(vars, {module,                      % atom() Module name
-	       vsn,                         % atom()
-	       
-	       init_info=[],                % [{M,F,A,C,L}]
-
-	       function,                    % atom()
-	       arity,                       % int()
-	       clause,                      % int()
-	       lines,                       % [int()]
-	       depth,                       % int()
-	       is_guard=false               % boolean
-	      }).
-
--export([parse_transform/2,
-	line/1]).
-
-line(LOC={{Mod,Func},_Line}) ->
-    Lines = case get(test_server_loc) of
-		[{{Mod,Func},_}|Ls] -> 
-		    Ls;
-		Ls when is_list(Ls) -> 
-		    case length(Ls) of
-			10 ->
-			    [_|T]=lists:reverse(Ls),
-			    lists:reverse(T);
-			_ ->
-			    Ls
-		    end;
-		_ -> 
-		    [] 
-	    end,
-    put(test_server_loc,[LOC|Lines]).
-
-parse_transform(Forms, _Options) ->
-    transform(Forms, _Options).
-
-%% forms(Fs) -> lists:map(fun (F) -> form(F) end, Fs).
-
-transform(Forms, _Options)->
-    Vars0 = #vars{},
-    {ok, MungedForms, _Vars} = transform(Forms, [], Vars0),
-    MungedForms.
-    
-
-transform([Form|Forms], MungedForms, Vars) ->
-    case munge(Form, Vars) of
-	ignore ->
-	    transform(Forms, MungedForms, Vars);
-	{MungedForm, Vars2} ->
-	    transform(Forms, [MungedForm|MungedForms], Vars2)
-    end;
-transform([], MungedForms, Vars) ->
-    {ok, lists:reverse(MungedForms), Vars}.
-
-%% This code traverses the abstract code, stored as the abstract_code
-%% chunk in the BEAM file, as described in absform(3) for Erlang/OTP R8B
-%% (Vsn=abstract_v2).
-%% The abstract format after preprocessing differs slightly from the abstract
-%% format given eg using epp:parse_form, this has been noted in comments.
-munge(Form={attribute,_,module,Module}, Vars) ->
-    Vars2 = Vars#vars{module=Module},
-    {Form, Vars2};
-
-munge({function,0,module_info,_Arity,_Clauses}, _Vars) ->
-    ignore; % module_info will be added again when the forms are recompiled
-munge({function,Line,Function,Arity,Clauses}, Vars) ->
-    Vars2 = Vars#vars{function=Function,
-		      arity=Arity,
-		      clause=1,
-		      lines=[],
-		      depth=1},
-    {MungedClauses, Vars3} = munge_clauses(Clauses, Vars2, []),
-    {{function,Line,Function,Arity,MungedClauses}, Vars3};
-munge(Form, Vars) -> % attributes
-    {Form, Vars}.
-
-munge_clauses([{clause,Line,Pattern,Guards,Body}|Clauses], Vars, MClauses) ->
-    {MungedGuards, _Vars} = munge_exprs(Guards, Vars#vars{is_guard=true},[]),
-
-    case Vars#vars.depth of
-	1 -> % function clause
-	    {MungedBody, Vars2} = munge_body(Body, Vars#vars{depth=2}, []),
-	    ClauseInfo = {Vars2#vars.module,
-			  Vars2#vars.function,
-			  Vars2#vars.arity,
-			  Vars2#vars.clause,
-			  length(Vars2#vars.lines)},
-	    InitInfo = [ClauseInfo | Vars2#vars.init_info],
-	    Vars3 = Vars2#vars{init_info=InitInfo,
-			       clause=(Vars2#vars.clause)+1,
-			       lines=[],
-			       depth=1},
-	    munge_clauses(Clauses, Vars3,
-			  [{clause,Line,Pattern,MungedGuards,MungedBody}|
-			   MClauses]);
-
-	2 -> % receive-,  case- or if clause
-	    {MungedBody, Vars2} = munge_body(Body, Vars, []),
-	    munge_clauses(Clauses, Vars2,
-			  [{clause,Line,Pattern,MungedGuards,MungedBody}|
-			   MClauses])
-    end;
-munge_clauses([], Vars, MungedClauses) -> 
-    {lists:reverse(MungedClauses), Vars}.
-
-munge_body([Expr|Body], Vars, MungedBody) ->
-    %% Here is the place to add a call to cover:bump/6!
-    Line = element(2, Expr),
-    Lines = Vars#vars.lines,
-    case lists:member(Line,Lines) of
-	true -> % already a bump at this line!
-	    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-	    munge_body(Body, Vars2, [MungedExpr|MungedBody]);
-	false ->
-	    Bump = {call, 0, {remote,0,{atom,0,?MODULE},{atom,0,line}},
-		    [{tuple,0,[{tuple,0,[{atom,0,Vars#vars.module},
-					 {atom, 0, Vars#vars.function}]},
-		     {integer, 0, Line}]}]},
-	    Lines2 = [Line|Lines],
-
-	    {MungedExpr, Vars2} = munge_expr(Expr, Vars#vars{lines=Lines2}),
-	    munge_body(Body, Vars2, [MungedExpr,Bump|MungedBody])
-    end;
-munge_body([], Vars, MungedBody) ->
-    {lists:reverse(MungedBody), Vars}.
-
-munge_expr({match,Line,ExprL,ExprR}, Vars) ->
-    {MungedExprL, Vars2} = munge_expr(ExprL, Vars),
-    {MungedExprR, Vars3} = munge_expr(ExprR, Vars2),
-    {{match,Line,MungedExprL,MungedExprR}, Vars3};
-munge_expr({tuple,Line,Exprs}, Vars) ->
-    {MungedExprs, Vars2} = munge_exprs(Exprs, Vars, []),
-    {{tuple,Line,MungedExprs}, Vars2};
-munge_expr({record,Line,Expr,Exprs}, Vars) ->
-    %% Only for Vsn=raw_abstract_v1
-    {MungedExprName, Vars2} = munge_expr(Expr, Vars),
-    {MungedExprFields, Vars3} = munge_exprs(Exprs, Vars2, []),
-    {{record,Line,MungedExprName,MungedExprFields}, Vars3};
-munge_expr({record_field,Line,ExprL,ExprR}, Vars) ->
-    %% Only for Vsn=raw_abstract_v1
-    {MungedExprL, Vars2} = munge_expr(ExprL, Vars),
-    {MungedExprR, Vars3} = munge_expr(ExprR, Vars2),
-    {{record_field,Line,MungedExprL,MungedExprR}, Vars3};
-munge_expr({cons,Line,ExprH,ExprT}, Vars) ->
-    {MungedExprH, Vars2} = munge_expr(ExprH, Vars),
-    {MungedExprT, Vars3} = munge_expr(ExprT, Vars2),
-    {{cons,Line,MungedExprH,MungedExprT}, Vars3};
-munge_expr({op,Line,Op,ExprL,ExprR}, Vars) ->
-    {MungedExprL, Vars2} = munge_expr(ExprL, Vars),
-    {MungedExprR, Vars3} = munge_expr(ExprR, Vars2),
-    {{op,Line,Op,MungedExprL,MungedExprR}, Vars3};
-munge_expr({op,Line,Op,Expr}, Vars) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    {{op,Line,Op,MungedExpr}, Vars2};
-munge_expr({'catch',Line,Expr}, Vars) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    {{'catch',Line,MungedExpr}, Vars2};
-munge_expr({call,Line1,{remote,Line2,ExprM,ExprF},Exprs},
-	   Vars) when Vars#vars.is_guard==false->
-    {MungedExprM, Vars2} = munge_expr(ExprM, Vars),
-    {MungedExprF, Vars3} = munge_expr(ExprF, Vars2),
-    {MungedExprs, Vars4} = munge_exprs(Exprs, Vars3, []),
-    {{call,Line1,{remote,Line2,MungedExprM,MungedExprF},MungedExprs}, Vars4};
-munge_expr({call,Line1,{remote,_Line2,_ExprM,ExprF},Exprs},
-	   Vars) when Vars#vars.is_guard==true ->
-    %% Difference in abstract format after preprocessing: BIF calls in guards
-    %% are translated to {remote,...} (which is not allowed as source form)
-    %% NOT NECESSARY FOR Vsn=raw_abstract_v1
-    munge_expr({call,Line1,ExprF,Exprs}, Vars);
-munge_expr({call,Line,Expr,Exprs}, Vars) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    {MungedExprs, Vars3} = munge_exprs(Exprs, Vars2, []),
-    {{call,Line,MungedExpr,MungedExprs}, Vars3};
-munge_expr({lc,Line,Expr,LC}, Vars) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    {MungedLC, Vars3} = munge_lc(LC, Vars2, []),
-    {{lc,Line,MungedExpr,MungedLC}, Vars3};
-munge_expr({block,Line,Body}, Vars) ->
-    {MungedBody, Vars2} = munge_body(Body, Vars, []),
-    {{block,Line,MungedBody}, Vars2};
-munge_expr({'if',Line,Clauses}, Vars) -> 
-    {MungedClauses,Vars2} = munge_clauses(Clauses, Vars, []),
-    {{'if',Line,MungedClauses}, Vars2};
-munge_expr({'case',Line,Expr,Clauses}, Vars) ->
-    {MungedExpr,Vars2} = munge_expr(Expr,Vars),
-    {MungedClauses,Vars3} = munge_clauses(Clauses, Vars2, []),
-    {{'case',Line,MungedExpr,MungedClauses}, Vars3};
-munge_expr({'receive',Line,Clauses}, Vars) -> 
-    {MungedClauses,Vars2} = munge_clauses(Clauses, Vars, []),
-    {{'receive',Line,MungedClauses}, Vars2};
-munge_expr({'receive',Line,Clauses,Expr,Body}, Vars) ->
-    {MungedClauses,Vars2} = munge_clauses(Clauses, Vars, []),
-    {MungedExpr, Vars3} = munge_expr(Expr, Vars2),
-    {MungedBody, Vars4} = munge_body(Body, Vars3, []),
-    {{'receive',Line,MungedClauses,MungedExpr,MungedBody}, Vars4};
-munge_expr({'try',Line,Exprs,Clauses,CatchClauses}, Vars) ->
-    {MungedExprs, Vars1} = munge_exprs(Exprs, Vars, []),
-    {MungedClauses, Vars2} = munge_clauses(Clauses, Vars1, []),
-    {MungedCatchClauses, Vars3} = munge_clauses(CatchClauses, Vars2, []),
-    {{'try',Line,MungedExprs,MungedClauses,MungedCatchClauses}, Vars3};
-%% Difference in abstract format after preprocessing: Funs get an extra
-%% element Extra.
-%% NOT NECESSARY FOR Vsn=raw_abstract_v1
-munge_expr({'fun',Line,{function,Name,Arity},_Extra}, Vars) ->
-    {{'fun',Line,{function,Name,Arity}}, Vars};
-munge_expr({'fun',Line,{clauses,Clauses},_Extra}, Vars) ->
-    {MungedClauses,Vars2}=munge_clauses(Clauses, Vars, []),
-    {{'fun',Line,{clauses,MungedClauses}}, Vars2};
-munge_expr({'fun',Line,{clauses,Clauses}}, Vars) ->
-    %% Only for Vsn=raw_abstract_v1
-    {MungedClauses,Vars2}=munge_clauses(Clauses, Vars, []),
-    {{'fun',Line,{clauses,MungedClauses}}, Vars2};
-munge_expr(Form, Vars) -> % var|char|integer|float|string|atom|nil|bin|eof
-    {Form, Vars}.
-
-munge_exprs([Expr|Exprs], Vars, MungedExprs) when Vars#vars.is_guard==true,
-						  is_list(Expr) ->
-    {MungedExpr, _Vars} = munge_exprs(Expr, Vars, []),
-    munge_exprs(Exprs, Vars, [MungedExpr|MungedExprs]);
-munge_exprs([Expr|Exprs], Vars, MungedExprs) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    munge_exprs(Exprs, Vars2, [MungedExpr|MungedExprs]);
-munge_exprs([], Vars, MungedExprs) ->
-    {lists:reverse(MungedExprs), Vars}.
-
-munge_lc([{generate,Line,Pattern,Expr}|LC], Vars, MungedLC) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    munge_lc(LC, Vars2, [{generate,Line,Pattern,MungedExpr}|MungedLC]);
-munge_lc([Expr|LC], Vars, MungedLC) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    munge_lc(LC, Vars2, [MungedExpr|MungedLC]);
-munge_lc([], Vars, MungedLC) ->
-    {lists:reverse(MungedLC), Vars}.
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index b839521e24..c1523509a5 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -28,7 +28,7 @@
 
 -module(ct_logs).
 
--export([init/1,close/1,init_tc/0,end_tc/1]).
+-export([init/1,close/2,init_tc/1,end_tc/1]).
 -export([get_log_dir/0,log/3,start_log/1,cont_log/2,end_log/0]).
 -export([set_stylesheet/2,clear_stylesheet/1]).
 -export([add_external_logs/1,add_link/3]).
@@ -36,7 +36,7 @@
 -export([make_all_suites_index/1,make_all_runs_index/1]).
 
 %% Logging stuff directly from testcase
--export([tc_log/3,tc_print/3,tc_pal/3,
+-export([tc_log/3,tc_print/3,tc_pal/3,ct_log/3,
 	 basic_html/0]).
 
 %% Simulate logger process for use without ct environment running
@@ -97,11 +97,11 @@ logdir_node_prefix() ->
     logdir_prefix()++"."++atom_to_list(node()).
 
 %%%-----------------------------------------------------------------
-%%% @spec close(Info) -> ok
+%%% @spec close(Info, StartDir) -> ok
 %%%
 %%% @doc Create index pages with test results and close the CT Log
 %%% (tool-internal use only).
-close(Info) ->
+close(Info, StartDir) ->
     make_last_run_index(),
 
     ct_event:notify(#event{name=stop_logging,node=node(),data=[]}),
@@ -124,14 +124,29 @@ close(Info) ->
 		    ok;
 		Error ->
 		    io:format("Warning! Cleanup failed: ~p~n", [Error])
-	    end;
+	    end,
+	    make_all_suites_index(stop),
+	    make_all_runs_index(stop);
        true -> 
-	    file:set_cwd("..")
-    end,       
-
-    make_all_suites_index(stop),
-    make_all_runs_index(stop),
-
+	    file:set_cwd(".."),
+	    make_all_suites_index(stop),
+	    make_all_runs_index(stop),
+	    case ct_util:get_profile_data(browser, StartDir) of
+		undefined ->
+		    ok;
+		BrowserData ->
+		    case {proplists:get_value(prog, BrowserData),
+			  proplists:get_value(args, BrowserData),
+			  proplists:get_value(page, BrowserData)} of
+			{Prog,Args,Page} when is_list(Args),
+					      is_list(Page) ->
+			    URL = "\"file://" ++ ?abs(Page) ++ "\"",
+			    ct_util:open_url(Prog, Args, URL);
+			_ ->
+			    ok
+		    end
+	    end
+    end,
     ok.
 
 %%%-----------------------------------------------------------------
@@ -182,15 +197,14 @@ cast(Msg) ->
 	    ?MODULE ! Msg
     end.
 
-
 %%%-----------------------------------------------------------------
-%%% @spec init_tc() -> ok
+%%% @spec init_tc(RefreshLog) -> ok
 %%%
 %%% @doc Test case initiation (tool-internal use only).
 %%%
 %%% <p>This function is called by ct_framework:init_tc/3</p>
-init_tc() ->
-    call({init_tc,self(),group_leader()}),
+init_tc(RefreshLog) ->
+    call({init_tc,self(),group_leader(),RefreshLog}),
     ok.
 
 %%%-----------------------------------------------------------------
@@ -360,6 +374,23 @@ tc_pal(Category,Format,Args) ->
     ok.
 
 
+%%%-----------------------------------------------------------------
+%%% @spec tc_pal(Category,Format,Args) -> ok
+%%%      Category = atom()
+%%%      Format = string()
+%%%      Args = list()
+%%%
+%%% @doc Print and log to the ct framework log
+%%%
+%%% <p>This function is called by internal ct functions to
+%%% force logging to the ct framework log</p>
+ct_log(Category,Format,Args) ->
+    cast({ct_log,[{div_header(Category),[]},
+		  {Format,Args},
+		  {div_footer(),[]}]}),
+    ok.
+
+
 %%%=================================================================
 %%% Internal functions
 int_header() ->
@@ -469,8 +500,8 @@ logger_loop(State) ->
 							  [Str,Args]),
 						%% stop the testcase, we need
 						%% to see the fault
-						exit(Pid,logging_failed),
-						ok;
+						exit(Pid,{log_printout_error,Str,Args}),
+						[];
 					    IoStr when IoList == [] ->
 						[IoStr];
 					    IoStr ->
@@ -490,10 +521,15 @@ logger_loop(State) ->
 		    [begin io:format(Fd,Str,Args),io:nl(Fd) end || {Str,Args} <- List],
 		    logger_loop(State#logger_state{tc_groupleaders=TCGLs})
 	    end;
-	{{init_tc,TCPid,GL},From} ->
+	{{init_tc,TCPid,GL,RefreshLog},From} ->
 	    print_style(GL, State#logger_state.stylesheet),
 	    set_evmgr_gl(GL),
 	    TCGLs = add_tc_gl(TCPid,GL,State),
+	    if not RefreshLog ->
+		    ok;
+	       true ->
+		    make_last_run_index(State#logger_state.start_time)
+	    end,
 	    return(From,ok),
 	    logger_loop(State#logger_state{tc_groupleaders=TCGLs});
 	{{end_tc,TCPid},From} ->
@@ -516,7 +552,12 @@ logger_loop(State) ->
 	{clear_stylesheet,_} when State#logger_state.stylesheet == undefined ->
 	    logger_loop(State);
 	{clear_stylesheet,_} ->
-	    logger_loop(State#logger_state{stylesheet=undefined});	   
+	    logger_loop(State#logger_state{stylesheet=undefined});
+	{ct_log, List} ->
+	    Fd = State#logger_state.ct_log_fd,
+	    [begin io:format(Fd,Str,Args),io:nl(Fd) end ||
+				{Str,Args} <- List],
+	    logger_loop(State);
 	stop ->
 	    io:format(State#logger_state.ct_log_fd,
 		      int_header()++int_footer(),
@@ -819,6 +860,7 @@ make_one_index_entry1(SuiteName, Link, Label, Success, Fail, UserSkip, AutoSkip,
 				    ""
 			    end
 		    end,
+    CtRunDir = filename:dirname(filename:dirname(Link)),
     {Lbl,Timestamp,Node,AllInfo} =
 	case All of
 	    {true,OldRuns} -> 
@@ -828,7 +870,6 @@ make_one_index_entry1(SuiteName, Link, Label, Success, Fail, UserSkip, AutoSkip,
 			    _ -> NodeOrDate
 			end,
 		N = ["<TD ALIGN=right><FONT SIZE=-1>",Node1,"</FONT></TD>\n"],
-		CtRunDir = filename:dirname(filename:dirname(Link)),
 		L = ["<TD ALIGN=center><FONT SIZE=-1><B>",Label,"</FONT></B></TD>\n"],
 		T = ["<TD><FONT SIZE=-1>",timestamp(CtRunDir),"</FONT></TD>\n"],
 		CtLogFile = filename:join(CtRunDir,?ct_log_name),
@@ -847,7 +888,7 @@ make_one_index_entry1(SuiteName, Link, Label, Success, Fail, UserSkip, AutoSkip,
 	if NotBuilt == 0 ->
 		["<TD ALIGN=right>",integer_to_list(NotBuilt),"</TD>\n"];
 	   true ->
-		["<TD ALIGN=right><A HREF=\"",?ct_log_name,"\">",
+		["<TD ALIGN=right><A HREF=\"",filename:join(CtRunDir,?ct_log_name),"\">",
 		integer_to_list(NotBuilt),"</A></TD>\n"]
 	end,
     FailStr =
diff --git a/lib/common_test/src/ct_make.erl b/lib/common_test/src/ct_make.erl
index 233e45248e..40e9e99f37 100644
--- a/lib/common_test/src/ct_make.erl
+++ b/lib/common_test/src/ct_make.erl
@@ -177,7 +177,7 @@ members([],_MakefileMods,I,Rest) ->
     {I,Rest}.
 
 
-%% Any flags that are not recognixed as make flags are passed directly
+%% Any flags that are not recognised as make flags are passed directly
 %% to the compiler.
 %% So for example make:all([load,debug_info]) will make everything
 %% with the debug_info flag and load it.
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index c01e97b358..0a9bb5af67 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -33,7 +33,7 @@
 
 
 %% Exported for VTS
--export([run_make/3,do_run/3,tests/1,tests/2,tests/3]).
+-export([run_make/3,do_run/4,tests/1,tests/2,tests/3]).
 
 
 %% Misc internal functions
@@ -46,15 +46,18 @@
 -define(testdir(Name, Suite), ct_util:get_testdir(Name, Suite)).
 
 -record(opts, {label,
+	       profile,
 	       vts,
 	       shell,
 	       cover,
 	       coverspec,
 	       step,
 	       logdir,
+	       logopts = [],
 	       config = [],
 	       event_handlers = [],
 	       ct_hooks = [],
+	       enable_builtin_hooks = true,
 	       include = [],
 	       silent_connections,
 	       stylesheet,
@@ -156,15 +159,19 @@ script_start(Args) ->
 	end,
     stop_trace(Tracing),
     timer:sleep(1000),
+    io:nl(),
     Res.
 
 script_start1(Parent, Args) ->
     %% read general start flags
     Label = get_start_opt(label, fun([Lbl]) -> Lbl end, Args),
+    Profile = get_start_opt(profile, fun([Prof]) -> Prof end, Args),
     Vts = get_start_opt(vts, true, Args),
     Shell = get_start_opt(shell, true, Args),
     Cover = get_start_opt(cover, fun([CoverFile]) -> ?abs(CoverFile) end, Args),
     LogDir = get_start_opt(logdir, fun([LogD]) -> LogD end, Args),
+    LogOpts = get_start_opt(logopts, fun(Os) -> [list_to_atom(O) || O <- Os] end,
+			    [], Args),
     MultTT = get_start_opt(multiply_timetraps,
 			   fun([MT]) -> list_to_integer(MT) end, 1, Args),
     ScaleTT = get_start_opt(scale_timetraps,
@@ -173,6 +180,10 @@ script_start1(Parent, Args) ->
 			    end, false, Args),
     EvHandlers = event_handler_args2opts(Args),
     CTHooks = ct_hooks_args2opts(Args),
+    EnableBuiltinHooks = get_start_opt(enable_builtin_hooks,
+				       fun([CT]) -> list_to_atom(CT);
+					  ([]) -> true
+				       end, true, Args),
 
     %% check flags and set corresponding application env variables
 
@@ -234,9 +245,12 @@ script_start1(Parent, Args) ->
 	    application:set_env(common_test, basic_html, true)
     end,
 
-   StartOpts = #opts{label = Label, vts = Vts, shell = Shell, cover = Cover,
-		     logdir = LogDir, event_handlers = EvHandlers,
+   StartOpts = #opts{label = Label, profile = Profile,
+		     vts = Vts, shell = Shell, cover = Cover,
+		     logdir = LogDir, logopts = LogOpts,
+		     event_handlers = EvHandlers,
 		     ct_hooks = CTHooks,
+		     enable_builtin_hooks = EnableBuiltinHooks,
 		     include = IncludeDirs,
 		     silent_connections = SilentConns,
 		     stylesheet = Stylesheet,
@@ -297,9 +311,15 @@ script_start2(StartOpts = #opts{vts = undefined,
 			Label = choose_val(StartOpts#opts.label,
 					   SpecStartOpts#opts.label),
 
+			Profile = choose_val(StartOpts#opts.profile,
+					     SpecStartOpts#opts.profile),
+
 			LogDir = choose_val(StartOpts#opts.logdir,
 					    SpecStartOpts#opts.logdir),
 
+			AllLogOpts = merge_vals([StartOpts#opts.logopts,
+						 SpecStartOpts#opts.logopts]),
+
 			Cover = choose_val(StartOpts#opts.cover,
 					   SpecStartOpts#opts.cover),
 			MultTT = choose_val(StartOpts#opts.multiply_timetraps,
@@ -311,18 +331,27 @@ script_start2(StartOpts = #opts{vts = undefined,
 			AllCTHooks = merge_vals(
 					[StartOpts#opts.ct_hooks,
 					 SpecStartOpts#opts.ct_hooks]),
+
+			EnableBuiltinHooks =
+			    choose_val(
+			      StartOpts#opts.enable_builtin_hooks,
+			      SpecStartOpts#opts.enable_builtin_hooks),
 			
 			AllInclude = merge_vals([StartOpts#opts.include,
 						 SpecStartOpts#opts.include]),
 			application:set_env(common_test, include, AllInclude),
 
 			{TS,StartOpts#opts{label = Label,
+					   profile = Profile,
 					   testspecs = Specs,
 					   cover = Cover,
 					   logdir = LogDir,
+					   logopts = AllLogOpts,
 					   config = SpecStartOpts#opts.config,
 					   event_handlers = AllEvHs,
 					   ct_hooks = AllCTHooks,
+					   enable_builtin_hooks =
+					       EnableBuiltinHooks,
 					   include = AllInclude,
 					   multiply_timetraps = MultTT,
 					   scale_timetraps = ScaleTT}}
@@ -339,9 +368,7 @@ script_start2(StartOpts = #opts{vts = undefined,
 	{[],_} ->
 	    {error,no_testspec_specified};
 	{undefined,_} ->   % no testspec used
-	    case check_and_install_configfiles(InitConfig, TheLogDir,
-					       Opts#opts.event_handlers,
-					       Opts#opts.ct_hooks) of
+	    case check_and_install_configfiles(InitConfig, TheLogDir, Opts) of
 		ok ->      % go on read tests from start flags
 		    script_start3(Opts#opts{config=InitConfig,
 					    logdir=TheLogDir}, Args);
@@ -351,9 +378,7 @@ script_start2(StartOpts = #opts{vts = undefined,
 	{_,_} ->           % testspec used
 	    %% merge config from start flags with config from testspec
 	    AllConfig = merge_vals([InitConfig, Opts#opts.config]),
-	    case check_and_install_configfiles(AllConfig, TheLogDir,
-					       Opts#opts.event_handlers,
-					       Opts#opts.ct_hooks) of
+	    case check_and_install_configfiles(AllConfig, TheLogDir, Opts) of
 		ok ->      % read tests from spec
 		    {Run,Skip} = ct_testspec:prepare_tests(Terms, node()),
 		    do_run(Run, Skip, Opts#opts{config=AllConfig,
@@ -367,9 +392,7 @@ script_start2(StartOpts, Args) ->
     %% read config/userconfig from start flags
     InitConfig = ct_config:prepare_config_list(Args),
     LogDir = which(logdir, StartOpts#opts.logdir),
-    case check_and_install_configfiles(InitConfig, LogDir,
-				       StartOpts#opts.event_handlers,
-				       StartOpts#opts.ct_hooks) of
+    case check_and_install_configfiles(InitConfig, LogDir, StartOpts) of
 	ok ->      % go on read tests from start flags
 	    script_start3(StartOpts#opts{config=InitConfig,
 					 logdir=LogDir}, Args);
@@ -377,12 +400,17 @@ script_start2(StartOpts, Args) ->
 	    Error
     end.
 
-check_and_install_configfiles(Configs, LogDir, EvHandlers, CTHooks) ->
+check_and_install_configfiles(
+  Configs, LogDir, #opts{
+	     event_handlers = EvHandlers,
+	     ct_hooks = CTHooks,
+	     enable_builtin_hooks = EnableBuiltinHooks} ) ->
     case ct_config:check_config_files(Configs) of
 	false ->
 	    install([{config,Configs},
 		     {event_handler,EvHandlers},
-		     {ct_hooks,CTHooks}], LogDir);
+		     {ct_hooks,CTHooks},
+		     {enable_builtin_hooks,EnableBuiltinHooks}], LogDir);
 	{value,{error,{nofile,File}}} ->
 	    {error,{cant_read_config_file,File}};
 	{value,{error,{wrong_config,Message}}}->
@@ -392,50 +420,72 @@ check_and_install_configfiles(Configs, LogDir, EvHandlers, CTHooks) ->
     end.
 
 script_start3(StartOpts, Args) ->
-    case proplists:get_value(dir, Args) of
-	[] ->
+    StartOpts1 = get_start_opt(step,
+			       fun(Step) ->
+				       StartOpts#opts{step = Step,
+						      cover = undefined}
+			       end, StartOpts, Args),
+    case {proplists:get_value(dir, Args),
+	  proplists:get_value(suite, Args),
+	  groups_and_cases(proplists:get_value(group, Args),
+			   proplists:get_value(testcase, Args))} of
+	%% flag specified without data
+	{_,_,Error={error,_}} ->
+	    Error;
+	{_,[],_} ->
+	    {error,no_suite_specified};
+	{[],_,_} ->
 	    {error,no_dir_specified};
-	Dirs when is_list(Dirs) ->
+
+	{Dirs,undefined,[]} when is_list(Dirs) ->
 	    script_start4(StartOpts#opts{tests = tests(Dirs)}, Args);
-	undefined ->
-	    case proplists:get_value(suite, Args) of
-		[] ->
-		    {error,no_suite_specified};
-		Suites when is_list(Suites) ->
-		    StartOpts1 =
-			get_start_opt(step,
-				      fun(Step) ->
-					      StartOpts#opts{step = Step,
-							     cover = undefined}
-				      end, StartOpts, Args),
-		    DirMods = [suite_to_test(S) || S <- Suites],
-		    case groups_and_cases(proplists:get_value(group, Args),
-					  proplists:get_value(testcase, Args)) of
-			Error = {error,_} ->
-			    Error;
-			[] when DirMods =/= [] ->
-			    Ts = tests(DirMods),
-			    script_start4(StartOpts1#opts{tests = Ts}, Args);
-			GroupsAndCases when length(DirMods) == 1 ->
-			    Ts = tests(DirMods, GroupsAndCases),
-			    script_start4(StartOpts1#opts{tests = Ts}, Args);
-			[_,_|_] when length(DirMods) > 1 ->
-			    {error,multiple_suites_and_cases};
-			_ ->
-			    {error,incorrect_suite_option}
-		    end;
-		undefined ->
-		    if StartOpts#opts.vts ; StartOpts#opts.shell ->
-			    script_start4(StartOpts#opts{tests = []}, Args);
-		       true ->
-			    script_usage(),
-			    {error,incorrect_usage}
-		    end
+
+	{undefined,Suites,[]} when is_list(Suites) ->
+	    Ts = tests([suite_to_test(S) || S <- Suites]),
+	    script_start4(StartOpts1#opts{tests = Ts}, Args);
+
+	{undefined,Suite,GsAndCs} when is_list(Suite) ->
+	    case [suite_to_test(S) || S <- Suite] of
+		DirMods = [_] ->
+		    Ts = tests(DirMods, GsAndCs),
+		    script_start4(StartOpts1#opts{tests = Ts}, Args);
+		[_,_|_] ->
+		    {error,multiple_suites_and_cases};
+		_ ->
+		    {error,incorrect_start_options}
+	    end;
+
+	{[_,_|_],Suite,[]} when is_list(Suite) ->
+	    {error,multiple_dirs_and_suites};
+
+	{[Dir],Suite,GsAndCs} when is_list(Dir), is_list(Suite) ->
+	    case [suite_to_test(Dir,S) || S <- Suite] of
+		DirMods when GsAndCs == [] ->
+		    Ts = tests(DirMods),
+		    script_start4(StartOpts1#opts{tests = Ts}, Args);
+		DirMods = [_] when GsAndCs /= [] ->
+		    Ts = tests(DirMods, GsAndCs),
+		    script_start4(StartOpts1#opts{tests = Ts}, Args);
+		[_,_|_] when GsAndCs /= [] ->
+		    {error,multiple_suites_and_cases};
+		_ ->
+		    {error,incorrect_start_options}
+	    end;
+
+	{undefined,undefined,GsAndCs} when GsAndCs /= [] ->
+	    {error,incorrect_start_options};
+
+	{undefined,undefined,_} ->
+	    if StartOpts#opts.vts ; StartOpts#opts.shell ->
+		    script_start4(StartOpts#opts{tests = []}, Args);
+	       true ->
+		    script_usage(),
+		    {error,missing_start_options}
 	    end
     end.
 
 script_start4(#opts{vts = true, config = Config, event_handlers = EvHandlers,
-		    tests = Tests, logdir = LogDir}, _Args) ->
+		    tests = Tests, logdir = LogDir, logopts = LogOpts}, _Args) ->
     ConfigFiles =
 	lists:foldl(fun({ct_config_plain,CfgFiles}, AllFiles) when
 			      is_list(hd(CfgFiles)) ->
@@ -446,25 +496,32 @@ script_start4(#opts{vts = true, config = Config, event_handlers = EvHandlers,
 		       (_, AllFiles) ->
 			    AllFiles
 		    end, [], Config),
-    vts:init_data(ConfigFiles, EvHandlers, ?abs(LogDir), Tests);
+    vts:init_data(ConfigFiles, EvHandlers, ?abs(LogDir), LogOpts, Tests);
 
-script_start4(#opts{label = Label, shell = true, config = Config,
+script_start4(#opts{label = Label, profile = Profile,
+		    shell = true, config = Config,
 		    event_handlers = EvHandlers,
 		    ct_hooks = CTHooks,
+		    logopts = LogOpts,
+		    enable_builtin_hooks = EnableBuiltinHooks,
 		    logdir = LogDir, testspecs = Specs}, _Args) ->
     %% label - used by ct_logs
     application:set_env(common_test, test_label, Label),
 
-    InstallOpts = [{config,Config},{event_handler,EvHandlers},
-		   {ct_hooks, CTHooks}],
+    %% profile - used in ct_util
+    application:set_env(common_test, profile, Profile),
+
     if Config == [] ->
 	    ok;
        true ->
 	    io:format("\nInstalling: ~p\n\n", [Config])
     end,
-    case install(InstallOpts) of
+    case install([{config,Config},{event_handler,EvHandlers},
+		  {ct_hooks, CTHooks},
+		  {enable_builtin_hooks,EnableBuiltinHooks}]) of
 	ok ->
 	    ct_util:start(interactive, LogDir),
+	    ct_util:set_testdata({logopts, LogOpts}),
 	    log_ts_names(Specs),
 	    io:nl(),
 	    ok;
@@ -505,6 +562,7 @@ script_usage() ->
 	      "\n\t[-decrypt_key Key] | [-decrypt_file KeyFile]"
 	      "\n\t[-dir TestDir1 TestDir2 .. TestDirN] |"
 	      "\n\t[-suite Suite [-case Case]]"
+	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
 	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
 	      "\n\t[-multiply_timetraps N]"
@@ -522,6 +580,7 @@ script_usage() ->
 	      "\n\t[-stylesheet CSSFile]"
 	      "\n\t[-cover CoverCfgFile]"
 	      "\n\t[-event_handler EvHandler1 EvHandler2 .. EvHandlerN]"
+	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
 	      "\n\t[-ct_hooks CTHook1 CTHook2 .. CTHookN]"
 	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
@@ -541,6 +600,7 @@ script_usage() ->
 	      "\n\t[-stylesheet CSSFile]"
 	      "\n\t[-cover CoverCfgFile]"
 	      "\n\t[-event_handler EvHandler1 EvHandler2 .. EvHandlerN]"
+	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
 	      "\n\t[-ct_hooks CTHook1 CTHook2 .. CTHookN]"
 	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
@@ -619,6 +679,16 @@ run_test(StartOpt) when is_tuple(StartOpt) ->
     run_test([StartOpt]);
 
 run_test(StartOpts) when is_list(StartOpts) ->
+    CTPid = spawn(fun() -> run_test1(StartOpts) end),
+    Ref = monitor(process, CTPid),
+    receive
+	{'DOWN',Ref,process,CTPid,{user_error,Error}} ->
+		    Error;
+	{'DOWN',Ref,process,CTPid,Other} ->
+		    Other
+    end.
+
+run_test1(StartOpts) when is_list(StartOpts) ->
     case proplists:get_value(refresh_logs, StartOpts) of
 	undefined ->
 	    Tracing = start_trace(StartOpts),
@@ -627,7 +697,7 @@ run_test(StartOpts) when is_list(StartOpts) ->
 	    Res =
 		case ct_repeat:loop_test(func, StartOpts) of
 		    false ->
-			case catch run_test1(StartOpts) of
+			case catch run_test2(StartOpts) of
 			    {'EXIT',Reason} ->
 				file:set_cwd(Cwd),
 				{error,Reason};
@@ -638,20 +708,27 @@ run_test(StartOpts) when is_list(StartOpts) ->
 			Result
 		end,
 	    stop_trace(Tracing),
-	    Res;
+	    exit(Res);
 	RefreshDir ->
 	    refresh_logs(?abs(RefreshDir)),
-	    ok
+	    exit(done)
     end.
 
-run_test1(StartOpts) ->
+run_test2(StartOpts) ->
     %% label
     Label = get_start_opt(label, fun(Lbl) when is_list(Lbl) -> Lbl;
 				    (Lbl) when is_atom(Lbl) -> atom_to_list(Lbl)
 				 end, StartOpts),
+    %% profile
+    Profile = get_start_opt(profile, fun(Prof) when is_list(Prof) -> Prof;
+					(Prof) when is_atom(Prof) -> atom_to_list(Prof)
+				     end, StartOpts),
     %% logdir
     LogDir = get_start_opt(logdir, fun(LD) when is_list(LD) -> LD end,
 			   StartOpts),
+    %% logopts
+    LogOpts = get_start_opt(logopts, value, [], StartOpts),
+
     %% config & userconfig
     CfgFiles = ct_config:get_config_file_list(StartOpts),
 
@@ -682,6 +759,11 @@ run_test1(StartOpts) ->
 
     %% CT Hooks
     CTHooks = get_start_opt(ct_hooks, value, [], StartOpts),
+    EnableBuiltinHooks = get_start_opt(enable_builtin_hooks,
+				       fun(EBH) when EBH == true;
+						     EBH == false ->
+					       EBH
+				       end, true, StartOpts),
 
     %% silent connections
     SilentConns = get_start_opt(silent_connections,
@@ -750,10 +832,12 @@ run_test1(StartOpts) ->
     %% stepped execution
     Step = get_start_opt(step, value, StartOpts),
 
-    Opts = #opts{label = Label,
-		 cover = Cover, step = Step, logdir = LogDir, config = CfgFiles,
+    Opts = #opts{label = Label, profile = Profile,
+		 cover = Cover, step = Step, logdir = LogDir,
+		 logopts = LogOpts, config = CfgFiles,
 		 event_handlers = EvHandlers,
 		 ct_hooks = CTHooks,
+		 enable_builtin_hooks = EnableBuiltinHooks,
 		 include = Include,
 		 silent_connections = SilentConns,
 		 stylesheet = Stylesheet,
@@ -792,8 +876,12 @@ run_spec_file(Relaxed,
 	    SpecOpts = get_data_for_node(TS, node()),
 	    Label = choose_val(Opts#opts.label,
 			       SpecOpts#opts.label),
+	    Profile = choose_val(Opts#opts.profile,
+			       SpecOpts#opts.profile),
 	    LogDir = choose_val(Opts#opts.logdir,
 				SpecOpts#opts.logdir),
+	    AllLogOpts = merge_vals([Opts#opts.logopts,
+				     SpecOpts#opts.logopts]),
 	    AllConfig = merge_vals([CfgFiles, SpecOpts#opts.config]),
 	    Cover = choose_val(Opts#opts.cover,
 			       SpecOpts#opts.cover),
@@ -808,24 +896,29 @@ run_spec_file(Relaxed,
 
 	    AllCTHooks = merge_vals([Opts#opts.ct_hooks,
 				      SpecOpts#opts.ct_hooks]),
+	    EnableBuiltinHooks = choose_val(Opts#opts.enable_builtin_hooks,
+					    SpecOpts#opts.enable_builtin_hooks),
 	    
 	    application:set_env(common_test, include, AllInclude),
 
-	    case check_and_install_configfiles(AllConfig,
-					       which(logdir,LogDir),
-					       AllEvHs,
-					       AllCTHooks) of
+	    Opts1 = Opts#opts{label = Label,
+			      profile = Profile,
+			      cover = Cover,
+			      logdir = which(logdir, LogDir),
+			      logopts = AllLogOpts,
+			      config = AllConfig,
+			      event_handlers = AllEvHs,
+			      include = AllInclude,
+			      testspecs = AbsSpecs,
+			      multiply_timetraps = MultTT,
+			      scale_timetraps = ScaleTT,
+			      ct_hooks = AllCTHooks,
+			      enable_builtin_hooks = EnableBuiltinHooks
+			     },
+
+	    case check_and_install_configfiles(AllConfig,Opts1#opts.logdir,
+					       Opts1) of
 		ok ->
-		    Opts1 = Opts#opts{label = Label,
-				      cover = Cover,
-				      logdir = which(logdir, LogDir),
-				      config = AllConfig,
-				      event_handlers = AllEvHs,
-				      include = AllInclude,
-				      testspecs = AbsSpecs,
-				      multiply_timetraps = MultTT,
-				      scale_timetraps = ScaleTT,
-				      ct_hooks = AllCTHooks},
 		    {Run,Skip} = ct_testspec:prepare_tests(TS, node()),
 		    reformat_result(catch do_run(Run, Skip, Opts1, StartOpts));
 		{error,GCFReason} ->
@@ -834,13 +927,10 @@ run_spec_file(Relaxed,
     end.
 
 run_prepared(Run, Skip, Opts = #opts{logdir = LogDir,
-				     config = CfgFiles,
-				     event_handlers = EvHandlers,
-				     ct_hooks = CTHooks},
+				     config = CfgFiles },
 	     StartOpts) ->
     LogDir1 = which(logdir, LogDir),
-    case check_and_install_configfiles(CfgFiles, LogDir1,
-				       EvHandlers, CTHooks) of
+    case check_and_install_configfiles(CfgFiles, LogDir1, Opts) of
 	ok ->
 	    reformat_result(catch do_run(Run, Skip, Opts#opts{logdir = LogDir1},
 					 StartOpts));
@@ -872,7 +962,8 @@ check_config_file(Callback, File)->
 run_dir(Opts = #opts{logdir = LogDir,
 		     config = CfgFiles,
 		     event_handlers = EvHandlers,
-		     ct_hooks = CTHook }, StartOpts) ->
+		     ct_hooks = CTHook,
+		     enable_builtin_hooks = EnableBuiltinHooks }, StartOpts) ->
     LogDir1 = which(logdir, LogDir),
     Opts1 = Opts#opts{logdir = LogDir1},
     AbsCfgFiles =
@@ -895,71 +986,107 @@ run_dir(Opts = #opts{logdir = LogDir,
 		  end, CfgFiles),
     case install([{config,AbsCfgFiles},
 		  {event_handler,EvHandlers},
-		  {ct_hooks, CTHook}], LogDir1) of
+		  {ct_hooks, CTHook},
+		  {enable_builtin_hooks,EnableBuiltinHooks}], LogDir1) of
 	ok -> ok;
 	{error,IReason} -> exit(IReason)
     end,
-    case lists:keysearch(dir, 1, StartOpts) of
-	{value,{_,Dirs=[Dir|_]}} when not is_integer(Dir),
-	                              length(Dirs)>1 ->
-	    %% multiple dirs (no suite)
-	    reformat_result(catch do_run(tests(Dirs), [], Opts1, StartOpts));
-	false ->				% no dir
-	    %% fun for converting suite name to {Dir,Mod} tuple
-	    S2M = fun(S) when is_list(S) ->
-			  {filename:dirname(S),
-			   list_to_atom(filename:rootname(filename:basename(S)))};
-		     (A) ->
-			  {".",A}
-		  end,
-	    case lists:keysearch(suite, 1, StartOpts) of
-		{value,{_,Suite}} when is_integer(hd(Suite)) ; is_atom(Suite) ->
-		    {Dir,Mod} = S2M(Suite),
-		    case groups_and_cases(proplists:get_value(group, StartOpts),
-					  proplists:get_value(testcase, StartOpts)) of
-			Error = {error,_} ->
-			    exit(Error);
+    case {proplists:get_value(dir, StartOpts),
+	  proplists:get_value(suite, StartOpts),
+	  groups_and_cases(proplists:get_value(group, StartOpts),
+			   proplists:get_value(testcase, StartOpts))} of
+	%% flag specified without data
+	{_,_,Error={error,_}} ->
+	    Error;
+	{_,[],_} ->
+	    {error,no_suite_specified};
+	{[],_,_} ->
+	    {error,no_dir_specified};
+
+	{Dirs=[Hd|_],undefined,[]} when is_list(Dirs), not is_integer(Hd) ->
+	    Dirs1 = [if is_atom(D) -> atom_to_list(D);
+			true -> D end || D <- Dirs],
+	    reformat_result(catch do_run(tests(Dirs1), [], Opts1, StartOpts));
+
+	{Dir=[Hd|_],undefined,[]} when is_list(Dir) and is_integer(Hd) ->
+	    reformat_result(catch do_run(tests(Dir), [], Opts1, StartOpts));
+
+	{Dir,undefined,[]} when is_atom(Dir) and (Dir /= undefined) ->
+	    reformat_result(catch do_run(tests(atom_to_list(Dir)),
+					 [], Opts1, StartOpts));
+
+	{undefined,Suites=[Hd|_],[]} when not is_integer(Hd) ->
+	    Suites1 = [suite_to_test(S) || S <- Suites],
+	    reformat_result(catch do_run(tests(Suites1), [], Opts1, StartOpts));
+
+	{undefined,Suite,[]} when is_atom(Suite) and
+				  (Suite /= undefined) ->
+	    {Dir,Mod} = suite_to_test(Suite),
+	    reformat_result(catch do_run(tests(Dir, Mod), [], Opts1, StartOpts));
+
+	{undefined,Suite,GsAndCs} when is_atom(Suite) and
+				       (Suite /= undefined) ->
+	    {Dir,Mod} = suite_to_test(Suite),
+	    reformat_result(catch do_run(tests(Dir, Mod, GsAndCs),
+					 [], Opts1, StartOpts));
+
+	{undefined,[Hd,_|_],_GsAndCs} when not is_integer(Hd) ->
+	    exit(multiple_suites_and_cases);
+
+	{undefined,Suite=[Hd|Tl],GsAndCs} when is_integer(Hd) ;
+					       (is_list(Hd) and	(Tl == [])) ;
+					       (is_atom(Hd) and	(Tl == [])) ->
+	    {Dir,Mod} = suite_to_test(Suite),
+	    reformat_result(catch do_run(tests(Dir, Mod, GsAndCs),
+					 [], Opts1, StartOpts));
+
+	{[Hd,_|_],_Suites,[]} when is_list(Hd) ; not is_integer(Hd) ->
+	    exit(multiple_dirs_and_suites);
+
+	{undefined,undefined,GsAndCs} when GsAndCs /= [] ->
+	    exit(incorrect_start_options);
+
+	{Dir,Suite,GsAndCs} when is_integer(hd(Dir)) ;
+				 (is_atom(Dir) and (Dir /= undefined)) ;
+				 ((length(Dir) == 1) and is_atom(hd(Dir))) ;
+				 ((length(Dir) == 1) and is_list(hd(Dir))) ->
+	    Dir1 = if is_atom(Dir) -> atom_to_list(Dir);
+		      true -> Dir end,
+	    if Suite == undefined ->
+		  exit(incorrect_start_options);
+
+	       is_integer(hd(Suite)) ;
+	       (is_atom(Suite) and (Suite /= undefined)) ;
+	       ((length(Suite) == 1) and is_atom(hd(Suite))) ;
+	       ((length(Suite) == 1) and is_list(hd(Suite))) ->
+		    {Dir2,Mod} = suite_to_test(Dir1, Suite),
+		    case GsAndCs of
 			[] ->
-			    reformat_result(catch do_run(tests(Dir, listify(Mod)),
+			    reformat_result(catch do_run(tests(Dir2, Mod),
 							 [], Opts1, StartOpts));
-			GsAndCs ->
-			    reformat_result(catch do_run(tests(Dir, Mod, GsAndCs),
+			_ ->
+			    reformat_result(catch do_run(tests(Dir2, Mod, GsAndCs),
 							 [], Opts1, StartOpts))
 		    end;
-		{value,{_,Suites}} ->
-		    reformat_result(catch do_run(tests(lists:map(S2M, Suites)),
-						 [], Opts1, StartOpts));
-		_ ->
-		    exit(no_tests_specified)
-	    end;
-	{value,{_,Dir}} ->
-	    case lists:keysearch(suite, 1, StartOpts) of
-		{value,{_,Suite}} when is_integer(hd(Suite)) ; is_atom(Suite) ->
-		    Mod = if is_atom(Suite) -> Suite;
-			     true -> list_to_atom(Suite)
-			  end,
-		    case groups_and_cases(proplists:get_value(group, StartOpts),
-					  proplists:get_value(testcase, StartOpts)) of
-			Error = {error,_} ->
-			    exit(Error);
-			[] ->
-			    reformat_result(catch do_run(tests(Dir, listify(Mod)),
+
+		is_list(Suite) ->		% multiple suites
+		    case [suite_to_test(Dir1, S) || S <- Suite] of
+			[_,_|_] when GsAndCs /= [] ->
+			    exit(multiple_suites_and_cases);
+			[{Dir2,Mod}] when GsAndCs /= [] ->
+			    reformat_result(catch do_run(tests(Dir2, Mod, GsAndCs),
 							 [], Opts1, StartOpts));
-			GsAndCs ->
-			    reformat_result(catch do_run(tests(Dir, Mod, GsAndCs),
+			DirMods ->
+			    reformat_result(catch do_run(tests(DirMods),
 							 [], Opts1, StartOpts))
-		    end;
-		{value,{_,Suites=[Suite|_]}} when is_list(Suite) ->
-		    Mods = lists:map(fun(Str) -> list_to_atom(Str) end, Suites),
-		    reformat_result(catch do_run(tests(delistify(Dir), Mods),
-						 [], Opts1, StartOpts));
-		{value,{_,Suites}} ->
-		    reformat_result(catch do_run(tests(delistify(Dir), Suites),
-						 [], Opts1, StartOpts));
-	        false ->			% no suite, only dir
-		    reformat_result(catch do_run(tests(listify(Dir)),
-						 [], Opts1, StartOpts))
-	    end
+		    end
+	    end;
+
+	{undefined,undefined,[]} ->
+	    exit(no_test_specified);
+
+	{Dir,Suite,GsAndCs} ->
+	    exit({incorrect_start_options,{Dir,Suite,GsAndCs}})
     end.
 
 %%%-----------------------------------------------------------------
@@ -970,19 +1097,38 @@ run_dir(Opts = #opts{logdir = LogDir,
 %%% the same as those used in test specification files.
 %%% @equiv ct:run_testspec/1
 %%%-----------------------------------------------------------------
-
 run_testspec(TestSpec) ->
+    CTPid = spawn(fun() -> run_testspec1(TestSpec) end),
+    Ref = monitor(process, CTPid),
+    receive
+	{'DOWN',Ref,process,CTPid,{user_error,Error}} ->
+		    Error;
+	{'DOWN',Ref,process,CTPid,Other} ->
+		    Other
+    end.
+
+run_testspec1(TestSpec) ->
     {ok,Cwd} = file:get_cwd(),
     io:format("~nCommon Test starting (cwd is ~s)~n~n", [Cwd]),
-    case catch run_testspec1(TestSpec) of
+    case catch run_testspec2(TestSpec) of
 	{'EXIT',Reason} ->
 	    file:set_cwd(Cwd),
-	    {error,Reason};
+	    exit({error,Reason});
 	Result ->
-	    Result
+	    exit(Result)
     end.
 
-run_testspec1(TestSpec) ->
+run_testspec2(File) when is_list(File), is_integer(hd(File)) ->
+    case file:read_file_info(File) of
+	{ok,_} ->
+	    exit("Bad argument, "
+		 "use ct:run_test([{spec," ++ File ++ "}])");
+	_ ->
+	    exit("Bad argument, list of tuples expected, "
+		 "use ct:run_test/1 for test specification files")
+    end;
+
+run_testspec2(TestSpec) ->
     case catch ct_testspec:collect_tests_from_list(TestSpec, false) of
 	{E,CTReason}  when E == error ; E == 'EXIT' ->
 	    exit(CTReason);
@@ -999,9 +1145,8 @@ run_testspec1(TestSpec) ->
 		end,
 	    application:set_env(common_test, include, AllInclude),
 	    LogDir1 = which(logdir,Opts#opts.logdir),
-	    case check_and_install_configfiles(Opts#opts.config, LogDir1,
-					       Opts#opts.event_handlers,
-					       Opts#opts.ct_hooks) of
+	    case check_and_install_configfiles(
+		   Opts#opts.config, LogDir1, Opts) of
 		ok ->
 		    Opts1 = Opts#opts{testspecs = [],
 				      logdir = LogDir1,
@@ -1014,20 +1159,28 @@ run_testspec1(TestSpec) ->
     end.
 
 get_data_for_node(#testspec{label = Labels,
+			    profile = Profiles,
 			    logdir = LogDirs,
+			    logopts = LogOptsList,
 			    cover = CoverFs,
 			    config = Cfgs,
 			    userconfig = UsrCfgs,
 			    event_handler = EvHs,
 			    ct_hooks = CTHooks,
+			    enable_builtin_hooks = EnableBuiltinHooks,
 			    include = Incl,
 			    multiply_timetraps = MTs,
 			    scale_timetraps = STs}, Node) ->
     Label = proplists:get_value(Node, Labels),
+    Profile = proplists:get_value(Node, Profiles),
     LogDir = case proplists:get_value(Node, LogDirs) of
 		 undefined -> ".";
 		 Dir -> Dir
 	     end,
+    LogOpts = case proplists:get_value(Node, LogOptsList) of
+		  undefined -> [];
+		  LOs -> LOs
+	      end,
     Cover = proplists:get_value(Node, CoverFs),
     MT = proplists:get_value(Node, MTs),
     ST = proplists:get_value(Node, STs),
@@ -1037,11 +1190,14 @@ get_data_for_node(#testspec{label = Labels,
     FiltCTHooks = [Hook || {N,Hook} <- CTHooks, N==Node],
     Include =  [I || {N,I} <- Incl, N==Node],
     #opts{label = Label,
+	  profile = Profile,
 	  logdir = LogDir,
+	  logopts = LogOpts,
 	  cover = Cover,
 	  config = ConfigFiles,
 	  event_handlers = EvHandlers,
 	  ct_hooks = FiltCTHooks,
+	  enable_builtin_hooks = EnableBuiltinHooks,
 	  include = Include,
 	  multiply_timetraps = MT,
 	  scale_timetraps = ST}.
@@ -1118,8 +1274,24 @@ reformat_result({user_error,Reason}) ->
 reformat_result(Result) ->
     Result.
 
-suite_to_test(Suite) ->
-    {filename:dirname(Suite),list_to_atom(filename:rootname(filename:basename(Suite)))}.
+suite_to_test(Suite) when is_atom(Suite) ->
+    suite_to_test(atom_to_list(Suite));
+
+suite_to_test(Suite) when is_list(Suite) ->
+    {filename:dirname(Suite),
+     list_to_atom(filename:rootname(filename:basename(Suite)))}.
+
+suite_to_test(Dir, Suite) when is_atom(Suite) ->
+    suite_to_test(Dir, atom_to_list(Suite));
+
+suite_to_test(Dir, Suite) when is_list(Suite) ->
+    case filename:dirname(Suite) of
+	"." ->
+	    {Dir,list_to_atom(filename:rootname(Suite))};
+	DirName ->				% ignore Dir
+	    File = filename:basename(Suite),
+	    {DirName,list_to_atom(filename:rootname(File))}
+    end.
 
 groups_and_cases(Gs, Cs) when ((Gs == undefined) or (Gs == [])) and
 			      ((Cs == undefined) or (Cs == [])) ->
@@ -1153,9 +1325,11 @@ tests(TestDirs) when is_list(TestDirs), is_list(hd(TestDirs)) ->
     [{?testdir(TestDir,all),all,all} || TestDir <- TestDirs].
 
 do_run(Tests, Misc) when is_list(Misc) ->
-    do_run(Tests, Misc, ".").
+    do_run(Tests, Misc, ".", []).
 
-do_run(Tests, Misc, LogDir) when is_list(Misc) ->
+do_run(Tests, Misc, LogDir, LogOpts) when is_list(Misc),
+					  is_list(LogDir),
+					  is_list(LogOpts) ->
     Opts =
 	case proplists:get_value(step, Misc) of
 	    undefined ->
@@ -1170,11 +1344,10 @@ do_run(Tests, Misc, LogDir) when is_list(Misc) ->
 	    CoverFile ->
 		Opts#opts{cover = CoverFile}
 	end,
-    do_run(Tests, [], Opts1#opts{logdir = LogDir}, []).
-
-do_run(Tests, Skip, Opts, Args) ->
-    #opts{label = Label, cover = Cover} = Opts,
+    do_run(Tests, [], Opts1#opts{logdir = LogDir}, []);
 
+do_run(Tests, Skip, Opts, Args) when is_record(Opts, opts) ->
+    #opts{label = Label, profile = Profile, cover = Cover} = Opts,
     %% label - used by ct_logs
     TestLabel =
 	if Label == undefined -> undefined;
@@ -1184,6 +1357,15 @@ do_run(Tests, Skip, Opts, Args) ->
 	end,
     application:set_env(common_test, test_label, TestLabel),
 
+    %% profile - used in ct_util
+    TestProfile =
+	if Profile == undefined -> undefined;
+	   is_atom(Profile)     -> atom_to_list(Profile);
+	   is_list(Profile)     -> Profile;
+	   true                 -> undefined
+	end,
+    application:set_env(common_test, profile, TestProfile),
+
     case code:which(test_server) of
 	non_existing ->
 	    exit({error,no_path_to_test_server});
@@ -1218,6 +1400,8 @@ do_run(Tests, Skip, Opts, Args) ->
 		_Pid ->
 		    %% save stylesheet info
 		    ct_util:set_testdata({stylesheet,Opts#opts.stylesheet}),
+		    %% save logopts
+		    ct_util:set_testdata({logopts,Opts#opts.logopts}),
 		    %% enable silent connections
 		    case Opts#opts.silent_connections of
 			[] ->
@@ -1985,7 +2169,14 @@ maybe_interpret1(Suite, Cases, StepOpts) when is_list(Cases) ->
 
 maybe_interpret2(Suite, Cases, StepOpts) ->
     set_break_on_config(Suite, StepOpts),
-    [i:ib(Suite, Case, 1) || Case <- Cases],
+    [begin try i:ib(Suite, Case, 1) of
+	       _ -> ok
+	   catch
+	       _:_Error ->
+		   io:format(user, "Invalid breakpoint: ~w:~w/1~n",
+			     [Suite,Case])
+	   end
+     end || Case <- Cases, is_atom(Case)],
     test_server_ctrl:multiply_timetraps(infinity),
     WinOp = case lists:member(keep_inactive, ensure_atom(StepOpts)) of
 		true -> no_kill;
@@ -1998,10 +2189,18 @@ maybe_interpret2(Suite, Cases, StepOpts) ->
 set_break_on_config(Suite, StepOpts) ->
     case lists:member(config, ensure_atom(StepOpts)) of
 	true ->
-	    i:ib(Suite, init_per_suite, 1),
-	    i:ib(Suite, init_per_testcase, 2),
-	    i:ib(Suite, end_per_testcase, 2),
-	    i:ib(Suite, end_per_suite, 1);
+	    SetBPIfExists = fun(F,A) ->
+				    case erlang:function_exported(Suite, F, A) of
+					true -> i:ib(Suite, F, A);
+					false -> ok
+				    end
+			    end,
+	    SetBPIfExists(init_per_suite, 1),
+	    SetBPIfExists(init_per_group, 2),
+	    SetBPIfExists(init_per_testcase, 2),
+	    SetBPIfExists(end_per_testcase, 2),
+	    SetBPIfExists(end_per_group, 2),
+	    SetBPIfExists(end_per_suite, 1);
 	false ->
 	    ok
     end.
@@ -2055,6 +2254,15 @@ get_start_opt(Key, IfExists, Args) ->
     get_start_opt(Key, IfExists, undefined, Args).
 
 get_start_opt(Key, IfExists, IfNotExists, Args) ->
+    try try_get_start_opt(Key, IfExists, IfNotExists, Args) of
+	Result ->
+	    Result
+    catch
+	error:_ ->
+	    exit({user_error,{bad_argument,Key}})
+    end.
+
+try_get_start_opt(Key, IfExists, IfNotExists, Args) ->
     case lists:keysearch(Key, 1, Args) of
 	{value,{Key,Val}} when is_function(IfExists) ->
 	    IfExists(Val);
@@ -2067,18 +2275,27 @@ get_start_opt(Key, IfExists, IfNotExists, Args) ->
     end.
 
 ct_hooks_args2opts(Args) ->
-    ct_hooks_args2opts(
-      proplists:get_value(ct_hooks, Args, []),[]).
+    lists:foldl(fun({ct_hooks,Hooks}, Acc) ->
+			ct_hooks_args2opts(Hooks,Acc);
+		   (_,Acc) ->
+			Acc
+		end,[],Args).
 
+ct_hooks_args2opts([CTH,Arg,Prio,"and"| Rest],Acc) ->
+    ct_hooks_args2opts(Rest,[{list_to_atom(CTH),
+			      parse_cth_args(Arg),
+			      parse_cth_args(Prio)}|Acc]);
 ct_hooks_args2opts([CTH,Arg,"and"| Rest],Acc) ->
     ct_hooks_args2opts(Rest,[{list_to_atom(CTH),
-				     parse_cth_args(Arg)}|Acc]);
+			      parse_cth_args(Arg)}|Acc]);
 ct_hooks_args2opts([CTH], Acc) ->
     ct_hooks_args2opts([CTH,"and"],Acc);
 ct_hooks_args2opts([CTH, "and" | Rest], Acc) ->
     ct_hooks_args2opts(Rest,[list_to_atom(CTH)|Acc]);
 ct_hooks_args2opts([CTH, Args], Acc) ->
     ct_hooks_args2opts([CTH, Args, "and"],Acc);
+ct_hooks_args2opts([CTH, Args, Prio], Acc) ->
+    ct_hooks_args2opts([CTH, Args, Prio, "and"],Acc);
 ct_hooks_args2opts([],Acc) ->
     lists:reverse(Acc).
 
@@ -2220,12 +2437,21 @@ opts2args(EnvStartOpts) ->
 					   end, EHs),
 			  [_LastAnd|StrsR] = lists:reverse(lists:flatten(Strs)),
 			  [{event_handler_init,lists:reverse(StrsR)}];
+		     ({logopts,LOs}) when is_list(LOs) ->
+			  [{logopts,[atom_to_list(LO) || LO <- LOs]}];
 		     ({ct_hooks,[]}) ->
 			  [];
 		     ({ct_hooks,CTHs}) when is_list(CTHs) ->
 			  io:format(user,"ct_hooks: ~p",[CTHs]),
 			  Strs = lists:flatmap(
-				   fun({CTH,Arg}) ->
+				   fun({CTH,Arg,Prio}) ->
+					   [atom_to_list(CTH),
+					    lists:flatten(
+					      io_lib:format("~p",[Arg])),
+					    lists:flatten(
+					      io_lib:format("~p",[Prio])),
+					    "and"];
+				       ({CTH,Arg}) ->
 					   [atom_to_list(CTH),
 					    lists:flatten(
 					      io_lib:format("~p",[Arg])),
@@ -2276,32 +2502,31 @@ is_suite(ModOrFile) when is_list(ModOrFile) ->
     end.
 
 get_all_testcases(Suite) ->
-    %%! this needs to be updated to handle testcase groups later!!
-    case catch Suite:all() of
-	{'EXIT',Why} ->
-	    {error,Why};
-	{skip,_} ->
-	    [];
-	Cases ->
-	    AllCases =
-		lists:foldl(fun({sequence,SeqName}, All) ->
-				    case catch Suite:sequences() of
-					{'EXIT',_} ->
-					    All;
-					Seqs ->
-					    case proplists:get_value(SeqName, Seqs) of
-						undefined ->
-						    All;
-						SeqCases ->
-						    lists:reverse(SeqCases) ++ All
-					    end
-				    end;
-			       (Case,All) ->
-				    [Case|All]
-			    end, [], Cases),
-	    lists:reverse(AllCases)
+    try ct_framework:get_all_cases(Suite) of
+	{error,_Reason} = Error ->
+	    Error;
+	SuiteCases ->
+	    Cases = [C || {_S,C} <- SuiteCases],
+	    try Suite:sequences() of
+		[] ->
+		    Cases;
+		Seqs ->
+		    TCs1 = lists:flatten([TCs || {_,TCs} <- Seqs]),
+		    lists:reverse(
+		      lists:foldl(fun(TC, Acc) ->
+					  case lists:member(TC, Acc) of
+					      true  -> Acc;
+					      false -> [TC | Acc]
+					  end
+				  end, [], Cases ++ TCs1))
+	    catch
+		_:_ ->
+		    Cases
+	    end
+    catch
+	_:Error ->
+	    {error,Error}
     end.
-					
 
 %% Internal tracing support. If {ct_trace,TraceSpec} is present, the
 %% TraceSpec file will be consulted and dbg used to trace function
@@ -2322,8 +2547,8 @@ start_trace(Args) ->
 			    false
 		    end;
 		{_,Error} ->
-		    io:format("Warning! Tracing not started. Reason: ~p~n~n",
-			      [Error]),
+		    io:format("Warning! Tracing not started. Reason: ~s~n~n",
+			      [file:format_error(Error)]),
 		    false
 	    end;
 	false ->
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index c6f5fd7df4..71a784870c 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -245,7 +245,6 @@ cmdf(Connection,CmdFormat,Args) ->
 %%%      Data = [string()]
 %%% @doc Send a telnet command and wait for prompt 
 %%%      (uses a format string and list of arguments to build the command).
-%%%-----------------------------------------------------------------
 cmdf(Connection,CmdFormat,Args,Timeout) when is_list(Args) ->
     Cmd = lists:flatten(io_lib:format(CmdFormat,Args)),
     cmd(Connection,Cmd,Timeout).
@@ -360,15 +359,15 @@ expect(Connection,Patterns) ->
 %%% will also be a <code>HaltReason</code> returned.</p>
 %%%
 %%% <p><underline>Examples:</underline><br/>
-%%% <code>expect(Connection,[{abc,"ABC"},{xyz,"XYZ"}],
-%%% [sequence,{halt,[{nnn,"NNN"}]}]).</code><br/> will try to match
+%%% <code>expect(Connection,[{abc,"ABC"},{xyz,"XYZ"}],</code>
+%%% <code>[sequence,{halt,[{nnn,"NNN"}]}]).</code><br/> will try to match
 %%% "ABC" first and then "XYZ", but if "NNN" appears the function will
 %%% return <code>{error,{nnn,["NNN"]}}</code>. If both "ABC" and "XYZ"
 %%% are matched, the function will return
 %%% <code>{ok,[AbcMatch,XyzMatch]}</code>.</p>
 %%%
-%%% <p><code>expect(Connection,[{abc,"ABC"},{xyz,"XYZ"}],
-%%% [{repeat,2},{halt,[{nnn,"NNN"}]}]).</code><br/> will try to match
+%%% <p><code>expect(Connection,[{abc,"ABC"},{xyz,"XYZ"}],</code>
+%%% <code>[{repeat,2},{halt,[{nnn,"NNN"}]}]).</code><br/> will try to match
 %%% "ABC" or "XYZ" twice. If "NNN" appears the function will return
 %%% with <code>HaltReason = {nnn,["NNN"]}</code>.</p>
 %%%
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index d845358bb2..317910d5c8 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -249,11 +249,15 @@ collect_tests_from_file1([Spec|Specs],TestSpec,Relaxed) ->
     SpecDir = filename:dirname(filename:absname(Spec)),
     case file:consult(Spec) of
 	{ok,Terms} ->	    
-	    TestSpec1 = collect_tests(Terms,TestSpec#testspec{spec_dir=SpecDir},
+	    TestSpec1 = collect_tests(Terms,
+				      TestSpec#testspec{spec_dir=SpecDir},
 				      Relaxed),
 	    collect_tests_from_file1(Specs,TestSpec1,Relaxed);
 	{error,Reason} ->
-	    throw({error,{Spec,Reason}})
+	    ReasonStr =
+		lists:flatten(io_lib:format("~s",
+					    [file:format_error(Reason)])),
+	    throw({error,{Spec,ReasonStr}})
     end;
 collect_tests_from_file1([],TS=#testspec{config=Cfgs,event_handler=EvHs,
 					 include=Incl,tests=Tests},_) ->
@@ -481,6 +485,26 @@ add_tests([{logdir,Node,Dir}|Ts],Spec) ->
 add_tests([{logdir,Dir}|Ts],Spec) ->
     add_tests([{logdir,all_nodes,Dir}|Ts],Spec);
 
+%% --- logopts ---
+add_tests([{logopts,all_nodes,Opts}|Ts],Spec) ->
+    LogOpts = Spec#testspec.logopts,
+    Tests = [{logopts,N,Opts} ||
+		N <- list_nodes(Spec),
+		lists:keymember(ref2node(N,Spec#testspec.nodes),1,
+				LogOpts) == false],
+    add_tests(Tests++Ts,Spec);
+add_tests([{logopts,Nodes,Opts}|Ts],Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,logopts,[Opts],Ts,Spec#testspec.nodes),
+    add_tests(Ts1,Spec);
+add_tests([{logopts,Node,Opts}|Ts],Spec) ->
+    LogOpts = Spec#testspec.logopts,
+    LogOpts1 = [{ref2node(Node,Spec#testspec.nodes),Opts} |
+		lists:keydelete(ref2node(Node,Spec#testspec.nodes),
+				1,LogOpts)],
+    add_tests(Ts,Spec#testspec{logopts=LogOpts1});
+add_tests([{logopts,Opts}|Ts],Spec) ->
+    add_tests([{logopts,all_nodes,Opts}|Ts],Spec);
+
 %% --- label ---
 add_tests([{label,all_nodes,Lbl}|Ts],Spec) ->
     Labels = Spec#testspec.label,
@@ -646,6 +670,10 @@ add_tests([{ct_hooks, _Node, []}|Ts], Spec) ->
 add_tests([{ct_hooks, Hooks}|Ts], Spec) ->
     add_tests([{ct_hooks, all_nodes, Hooks}|Ts], Spec);
 
+%% -- enable_builtin_hooks --
+add_tests([{enable_builtin_hooks,Bool}|Ts],Spec) ->
+    add_tests(Ts, Spec#testspec{ enable_builtin_hooks = Bool });
+
 %% --- include ---
 add_tests([{include,all_nodes,InclDirs}|Ts],Spec) ->
     Tests = lists:map(fun(N) -> {include,N,InclDirs} end, list_nodes(Spec)),
@@ -1097,6 +1125,8 @@ valid_terms() ->
      {merge_tests,1},
      {logdir,2},
      {logdir,3},
+     {logopts,2},
+     {logopts,3},
      {label,2},
      {label,3},
      {event_handler,2},
@@ -1104,6 +1134,7 @@ valid_terms() ->
      {event_handler,4},
      {ct_hooks,2},
      {ct_hooks,3},
+     {enable_builtin_hooks,1},
      {multiply_timetraps,2},
      {multiply_timetraps,3},
      {scale_timetraps,2},
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index b3e345b4e5..3b6ad6f98d 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -47,7 +47,7 @@
 
 -export([get_mode/0, create_table/3, read_opts/0]).
 
--export([set_cwd/1, reset_cwd/0]).
+-export([set_cwd/1, reset_cwd/0, get_start_dir/0]).
 
 -export([parse_table/1]).
 
@@ -61,6 +61,9 @@
 
 -export([warn_duplicates/1]).
 
+-export([get_profile_data/0, get_profile_data/1,
+	 get_profile_data/2, open_url/3]).
+
 -include("ct_event.hrl").
 -include("ct_util.hrl").
 
@@ -121,13 +124,15 @@ do_start(Parent,Mode,LogDir) ->
 	ok -> ok;
 	E -> exit(E)
     end,
+    DoExit = fun(Reason) -> file:set_cwd(StartDir), exit(Reason) end,
     Opts = case read_opts() of
 	       {ok,Opts1} ->
 		   Opts1;
 	       Error ->
 		   Parent ! {self(),Error},
-		   exit(Error)
+		   DoExit(Error)
 	   end,
+
     %% start an event manager (if not already started by master)
     case ct_event:start_link() of
 	{error,{already_started,_}} ->
@@ -140,16 +145,23 @@ do_start(Parent,Mode,LogDir) ->
 		    ct_event:add_handler([{vts,VtsPid}])
 	    end
     end,
+
     %% start ct_config server
-    ct_config:start(Mode),
+    try ct_config:start(Mode) of
+	_ -> ok
+    catch
+	_Class:CfgError ->
+	    DoExit(CfgError)
+    end,
+
     %% add user event handlers
     case lists:keysearch(event_handler,1,Opts) of
 	{value,{_,Handlers}} ->
 	    Add = fun({H,Args}) ->
 			  case catch gen_event:add_handler(?CT_EVMGR_REF,H,Args) of
 			      ok -> ok;
-			      {'EXIT',Why} -> exit(Why);
-			      Other -> exit({event_handler,Other})
+			      {'EXIT',Why} -> DoExit(Why);
+			      Other -> DoExit({event_handler,Other})
 			  end
 		  end,
 	    case catch lists:foreach(Add,Handlers) of
@@ -168,10 +180,15 @@ do_start(Parent,Mode,LogDir) ->
 			   data={StartTime,
 				 lists:flatten(TestLogDir)}}),
     %% Initialize ct_hooks
-    case catch ct_hooks:init(Opts) of
+    try ct_hooks:init(Opts) of
 	ok ->
 	    Parent ! {self(),started};
-	{_,CTHReason} ->
+	{fail,CTHReason} ->
+	    ct_logs:tc_print('Suite Callback',CTHReason,[]),
+	    self() ! {{stop,{self(),{user_error,CTHReason}}},
+		      {Parent,make_ref()}}
+    catch
+	_:CTHReason ->
 	    ct_logs:tc_print('Suite Callback',CTHReason,[]),
 	    self() ! {{stop,{self(),{user_error,CTHReason}}},
 		      {Parent,make_ref()}}
@@ -243,6 +260,9 @@ set_cwd(Dir) ->
 reset_cwd() ->
     call(reset_cwd).
 
+get_start_dir() ->
+    call(get_start_dir).
+
 loop(Mode,TestData,StartDir) ->
     receive 
 	{update_last_run_index,From} ->
@@ -319,6 +339,9 @@ loop(Mode,TestData,StartDir) ->
 	{reset_cwd,From} ->
 	    return(From,file:set_cwd(StartDir)),
 	    loop(From,TestData,StartDir);
+	{get_start_dir,From} ->
+	    return(From,StartDir),
+	    loop(From,TestData,StartDir);
 	{{stop,Info},From} ->
 	    Time = calendar:local_time(),
 	    ct_event:sync_notify(#event{name=test_done,
@@ -332,7 +355,7 @@ loop(Mode,TestData,StartDir) ->
 	    ets:delete(?conn_table),
 	    ets:delete(?board_table),
 	    ets:delete(?suite_table),
-	    ct_logs:close(Info),
+	    ct_logs:close(Info, StartDir),
 	    ct_event:stop(),
 	    ct_config:stop(),
 	    file:set_cwd(StartDir),
@@ -727,6 +750,79 @@ warn_duplicates(Suites) ->
     lists:foreach(Warn, Suites),
     ok.
 
+%%%-----------------------------------------------------------------
+%%% @spec
+%%%
+%%% @doc
+get_profile_data() ->
+    get_profile_data(all).
+
+get_profile_data(KeyOrStartDir) ->
+    if is_atom(KeyOrStartDir) ->
+	    get_profile_data(KeyOrStartDir, get_start_dir());
+       is_list(KeyOrStartDir) ->
+	    get_profile_data(all, KeyOrStartDir)
+    end.
+
+get_profile_data(Key, StartDir) ->
+    Profile = case application:get_env(common_test, profile) of
+		  {ok,undefined} -> default;
+		  {ok,Prof}      -> Prof;
+		  _              -> default
+	      end,
+    get_profile_data(Profile, Key, StartDir).
+
+get_profile_data(Profile, Key, StartDir) ->
+    File = case Profile of
+	       default ->
+		   ?ct_profile_file;
+	       _ when is_list(Profile) ->
+		   ?ct_profile_file ++ "." ++ Profile;
+	       _ when is_atom(Profile) ->
+		   ?ct_profile_file ++ "." ++ atom_to_list(Profile)
+	   end,
+    FullNameWD = filename:join(StartDir, File),
+    {WhichFile,Result} =
+	case file:consult(FullNameWD) of
+	    {error,enoent} ->
+		case init:get_argument(home) of
+		    {ok,[[HomeDir]]} ->
+			FullNameHome = filename:join(HomeDir, File),
+			{FullNameHome,file:consult(FullNameHome)};
+		    _ ->
+			{File,{error,enoent}}
+		end;
+	    Consulted ->
+		{FullNameWD,Consulted}
+	end,
+    case Result of
+	{error,enoent} when Profile /= default ->
+	    io:format(user, "~nERROR! Missing profile file ~p~n", [File]),
+	    undefined;
+	{error,enoent} when Profile == default ->
+	    undefined;
+	{error,Reason} ->
+	    io:format(user,"~nERROR! Error in profile file ~p: ~p~n",
+		      [WhichFile,Reason]),
+	    undefined;
+	{ok,Data} ->
+	    Data1 = case Data of
+			[List] when is_list(List) ->
+			    List;
+			_ when is_list(Data) ->
+			    Data;
+			_ ->
+			    io:format(user,
+				      "~nERROR! Invalid profile data in ~p~n",
+				      [WhichFile]),
+			    []
+		    end,
+	    if Key == all ->
+		    Data1;
+	       true ->
+		    proplists:get_value(Key, Data)
+	    end
+    end.
 
 %%%-----------------------------------------------------------------
 %%% Internal functions
@@ -799,3 +895,28 @@ abs_name2([H|T],Acc) ->
     abs_name2(T,[H|Acc]);
 abs_name2([],Acc) ->
     filename:join(lists:reverse(Acc)).
+
+open_url(iexplore, Args, URL) ->
+    {ok,R} = win32reg:open([read]),
+    ok = win32reg:change_key(R,"applications\\iexplore.exe\\shell\\open\\command"),
+    case win32reg:values(R) of
+	{ok, Paths} ->
+	    Path = proplists:get_value(default, Paths),
+	    [Cmd | _] = string:tokens(Path, "%"),
+	    Cmd1 = Cmd ++ " " ++ Args ++ " " ++ URL,
+	    io:format(user, "~nOpening ~s with command:~n  ~s~n", [URL,Cmd1]),
+	    open_port({spawn,Cmd1}, []);
+	_ ->
+	    io:format("~nNo path to iexplore.exe~n",[])
+    end,
+    win32reg:close(R),
+    ok;
+
+open_url(Prog, Args, URL) ->
+    ProgStr = if is_atom(Prog) -> atom_to_list(Prog);
+		 is_list(Prog) -> Prog
+	      end,
+    Cmd = ProgStr ++ " " ++ Args ++ " " ++ URL,
+    io:format(user, "~nOpening ~s with command:~n  ~s~n", [URL,Cmd]),
+    open_port({spawn,Cmd},[]),
+    ok.
diff --git a/lib/common_test/src/ct_util.hrl b/lib/common_test/src/ct_util.hrl
index 556f88c84d..bde832811a 100644
--- a/lib/common_test/src/ct_util.hrl
+++ b/lib/common_test/src/ct_util.hrl
@@ -31,12 +31,15 @@
 	           nodes=[],
 		   init=[],
 		   label=[],
+		   profile=[],
 		   logdir=["."],
+		   logopts=[],
 		   cover=[],
 		   config=[],
 		   userconfig=[],
 		   event_handler=[],
 		   ct_hooks=[],
+		   enable_builtin_hooks=true,
 		   include=[],
 		   multiply_timetraps=[],
 		   scale_timetraps=[],
@@ -58,3 +61,5 @@
 
 -define(missing_suites_info, "missing_suites.info").
 -define(ct_config_txt, ct_config_plain).
+
+-define(ct_profile_file, ".common_test").
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
new file mode 100644
index 0000000000..14663b7738
--- /dev/null
+++ b/lib/common_test/src/cth_log_redirect.erl
@@ -0,0 +1,111 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+-module(cth_log_redirect).
+
+%%% @doc Common Test Framework functions handling test specifications.
+%%%
+%%% <p>This module redirects sasl and error logger info to common test log.</p>
+%%% @end
+
+
+%% CTH Callbacks
+-export([id/1, init/2, post_init_per_group/4, pre_end_per_group/3,
+	 post_end_per_testcase/4]).
+
+%% Event handler Callbacks
+-export([init/1,
+	 handle_event/2, handle_call/2, handle_info/2,
+	 terminate/2]).
+
+id(_Opts) ->
+    ?MODULE.
+
+init(?MODULE, _Opts) ->
+    error_logger:add_report_handler(?MODULE),
+    tc_log.
+
+post_init_per_group(Group, Config, Result, tc_log) ->
+    case lists:member(parallel,proplists:get_value(
+				 tc_group_properties,Config,[])) of
+	true ->
+	    {Result, {set_log_func(ct_log),Group}};
+	false ->
+	    {Result, tc_log}
+    end;
+post_init_per_group(_Group, _Config, Result, State) ->
+    {Result, State}.
+
+post_end_per_testcase(_TC, _Config, Result, State) ->
+    %% Make sure that the event queue is flushed
+    %% before ending this test case.
+    gen_event:call(error_logger, ?MODULE, flush),
+    {Result, State}.
+
+pre_end_per_group(Group, Config, {ct_log, Group}) ->
+    {Config, set_log_func(tc_log)};
+pre_end_per_group(_Group, Config, State) ->
+    {Config, State}.
+
+
+%% Copied and modified from sasl_report_tty_h.erl
+init(_Type) ->
+    {ok, tc_log}.
+
+handle_event({_Type, GL, _Msg}, State) when node(GL) /= node() ->
+    {ok, State};
+handle_event(Event, LogFunc) ->
+    case lists:keyfind(sasl, 1, application:which_applications()) of
+	false ->
+	    sasl_not_started;
+	_Else ->
+	    {ok, ErrLogType} = application:get_env(sasl, errlog_type),
+	    SReport = sasl_report:format_report(group_leader(), ErrLogType,
+						tag_event(Event)),
+	    if is_list(SReport) ->
+		    ct_logs:LogFunc(sasl, SReport, []);
+	       true -> %% Report is an atom if no logging is to be done
+		    ignore
+	    end
+    end,
+    EReport = error_logger_tty_h:write_event(
+		tag_event(Event),io_lib),
+    if is_list(EReport) ->
+	    ct_logs:LogFunc(error_logger, EReport, []);
+       true -> %% Report is an atom if no logging is to be done
+	    ignore
+    end,
+    {ok, LogFunc}.
+
+
+handle_info(_,State) -> {ok, State}.
+
+handle_call(flush,State) ->
+    {ok, ok, State};
+handle_call({set_logfunc,NewLogFunc},_) ->
+    {ok, NewLogFunc, NewLogFunc};
+handle_call(_Query, _State) -> {error, bad_query}.
+
+terminate(_Reason, _Type) ->
+    [].
+
+tag_event(Event) ->
+    {calendar:local_time(), Event}.
+
+set_log_func(Func) ->
+    gen_event:call(error_logger, ?MODULE, {set_logfunc, Func}).
diff --git a/lib/common_test/src/vts.erl b/lib/common_test/src/vts.erl
index f0bf090804..cc8a932887 100644
--- a/lib/common_test/src/vts.erl
+++ b/lib/common_test/src/vts.erl
@@ -20,7 +20,7 @@
 -module(vts).
 
 -export([start/0,
-	 init_data/4,
+	 init_data/5,
 	 stop/0,
 	 report/2]).
 
@@ -32,6 +32,7 @@
 	 menu_frame/2,
 	 welcome_frame/2,
 	 config_frame/2,
+	 browse_config_file/2,
 	 add_config_file/2,
 	 remove_config_file/2,
 	 run_frame/2,
@@ -56,7 +57,7 @@
 
 -record(state,{tests=[],config=[],event_handler=[],test_runner,
 	       running=0,reload_results=false,start_dir,current_log_dir,
-	       total=0,ok=0,fail=0,skip=0,testruns=[]}).
+	       logopts=[],total=0,ok=0,fail=0,skip=0,testruns=[]}).
 
 
 %%%-----------------------------------------------------------------
@@ -65,8 +66,8 @@ start() ->
     webtool:start(),
     webtool:start_tools([],"app=vts").
 
-init_data(ConfigFiles,EvHandlers,LogDir,Tests) ->
-    call({init_data,ConfigFiles,EvHandlers,LogDir,Tests}).
+init_data(ConfigFiles,EvHandlers,LogDir,LogOpts,Tests) ->
+    call({init_data,ConfigFiles,EvHandlers,LogDir,LogOpts,Tests}).
 
 stop() ->
     webtool:stop_tools([],"app=vts"),
@@ -119,6 +120,8 @@ menu_frame(_Env,_Input) ->
     call(menu_frame).
 config_frame(_Env,_Input) ->
     call(config_frame).
+browse_config_file(_Env,Input) ->
+    call({browse_config_file,Input}).
 add_config_file(_Env,Input) ->
     call({add_config_file,Input}).
 remove_config_file(_Env,Input) ->
@@ -160,10 +163,11 @@ init(Parent) ->
 
 loop(State) ->
     receive
-	{{init_data,Config,EvHandlers,LogDir,Tests},From} ->
+	{{init_data,Config,EvHandlers,LogDir,LogOpts,Tests},From} ->
 	    %% ct:pal("State#state.current_log_dir=~p", [State#state.current_log_dir]),
 	    NewState = State#state{config=Config,event_handler=EvHandlers,
-			current_log_dir=LogDir,tests=Tests},
+				   current_log_dir=LogDir,
+				   logopts=LogOpts,tests=Tests},
 	    ct_install(NewState),
 	    return(From,ok),
 	    loop(NewState);
@@ -182,6 +186,9 @@ loop(State) ->
 	{config_frame,From} ->
 	    return(From,config_frame1(State)),
 	    loop(State);
+	{{browse_config_file,_Input},From} ->
+	    return(From,ok),
+	    loop(State);
 	{{add_config_file,Input},From} ->
 	    {Return,State1} = add_config_file1(Input,State),
 	    ct_install(State1),
@@ -241,10 +248,12 @@ loop(State) ->
 	    return(From,ok);
 	{'EXIT',Pid,Reason} ->
 	    case State#state.test_runner of
-		Pid -> io:format("ERROR: test runner crashed: ~p\n",[Reason]);
-		_ -> ignore
-	    end,
-	    loop(State);
+		Pid ->
+		    io:format("Test run error: ~p\n",[Reason]),
+		    loop(State);
+		_ ->
+		    loop(State)
+	    end;
 	{{test_info,_Type,_Data},From} ->
 	    return(From,ok),
 	    loop(State)
@@ -270,10 +279,11 @@ return({To,Ref},Result) ->
     To ! {Ref, Result}.
 
 
-run_test1(State=#state{tests=Tests,current_log_dir=LogDir}) ->
+run_test1(State=#state{tests=Tests,current_log_dir=LogDir,
+		       logopts=LogOpts}) ->
     Self=self(),
     RunTest = fun() ->
-		      case ct_run:do_run(Tests,[],LogDir) of
+		      case ct_run:do_run(Tests,[],LogDir,LogOpts) of
 			  {error,_Reason} ->
 			      aborted();
 			  _ ->
@@ -282,17 +292,18 @@ run_test1(State=#state{tests=Tests,current_log_dir=LogDir}) ->
 		      unlink(Self)
 	      end,
     Pid = spawn_link(RunTest),
-    Total =
+    {Total,Tests1} =
 	receive 
 	    {{test_info,start_info,{_,_,Cases}},From} ->
 		return(From,ok),
-		Cases;
+		{Cases,Tests};
 	    EXIT = {'EXIT',_,_} ->
-		self() ! EXIT
+		self() ! EXIT,
+		{0,[]}
 	after 30000 ->
-		0
+		{0,[]}
 	end,
-    State#state{test_runner=Pid,running=length(Tests),
+    State#state{test_runner=Pid,running=length(Tests1),
 		total=Total,ok=0,fail=0,skip=0,testruns=[]}.
 
  
@@ -356,22 +367,32 @@ config_frame1(State) ->
 config_body(State) ->
     Entry = [input("TYPE=file NAME=browse SIZE=40"),
 	     input("TYPE=hidden NAME=file")],
+    BrowseForm =
+	form(
+	  "NAME=read_file_form METHOD=post ACTION=\"./browse_config_file\"",
+	  table(
+	    "BORDER=0",
+	    [tr(td("1. Locate config file")),
+	     tr(td(Entry))])),
     AddForm = 
 	form(
-	  "NAME=read_file_form METHOD=post ACTION=\"./add_config_file\"",
+	  "NAME=add_file_form METHOD=post ACTION=\"./add_config_file\"",
 	  table(
 	    "BORDER=0",
-	    [tr(
-	       [td(Entry),
+	    [tr(td("2. Paste full config file name here")),
+	     tr(
+	       [td(input("TYPE=text NAME=file SIZE=40")),
 		td("ALIGN=center",
 		   input("TYPE=submit onClick=\"file.value=browse.value;\""
 			 " VALUE=\"Add\""))])])),
+
     {Text,RemoveForm} = 
 	case State#state.config of
 	    [] ->
-		T = "To be able to run any tests, one or more configuration " 
-		    "files must be added. Enter the name of the configuration "
-		    "file below and click the \"Add\" button.",
+		T = "Before running the tests, one or more configuration "
+		    "files may be added. Locate the config file, copy its "
+		    "full name, paste this into the text field below, then "
+		    "click the \"Add\" button.",
 		R = "",
 		{T,R};
 	    Files ->
@@ -394,20 +415,24 @@ config_body(State) ->
 				  input("TYPE=submit VALUE=\"Remove\"")))])),
 		{T,R}
 	end,
-    
+
     [h1("ALIGN=center","Config"),
      table(
-       "WIDTH=600 ALIGN=center CELLPADDING=5",
+       "WIDTH=450 ALIGN=center CELLPADDING=5",
        [tr(td(["BGCOLOR=",?INFO_BG_COLOR],Text)),
-	tr(td("ALIGN=center",AddForm)),
-	tr(td("ALIGN=center",RemoveForm))])].
-
+	tr(td("")),
+	tr(td("")),
+	tr(td("ALIGN=left",BrowseForm)),
+	tr(td("ALIGN=left",AddForm)),
+	tr(td("ALIGN=left",RemoveForm))])].
 
 add_config_file1(Input,State) ->
     State1 = 
 	case get_input_data(Input,"file") of
-	    "" -> State;
-	    File -> State#state{config=[File|State#state.config]}
+	    "" ->
+		State;
+	    File ->
+		State#state{config=[File|State#state.config]}
 	end,
     Return = config_frame1(State1),
     {Return,State1}.
@@ -427,10 +452,17 @@ run_body(#state{running=Running}) when Running>0 ->
     [h1("ALIGN=center","Run Test"),
      p(["Test are ongoing: ",href("./result_frameset","Results")])];
 run_body(State) ->
-    ConfigList = ul([li(File) || File <- State#state.config]),
+    ConfigList =
+	case State#state.config of
+	    [] ->
+		ul(["none"]);
+	    CfgFiles ->
+		ul([li(File) || File <- CfgFiles])
+	end,
     ConfigFiles = [h3("Config Files"),
 		   ConfigList],
-    
+    {ok,CWD} = file:get_cwd(),
+    CurrWD = [h3("Current Working Directory"), ul(CWD)],
     AddDirForm = 
 	form(
 	  "NAME=add_dir_form METHOD=post ACTION=\"./add_test_dir\"",
@@ -442,7 +474,6 @@ run_body(State) ->
 		td("ALIGN=center",
 		   input("TYPE=submit onClick=\"dir.value=browse.value;\""
 			 " VALUE=\"Add Test Dir\""))])])),
-
     {LoadedTestsTable,Submit} = 
 	case create_testdir_entries(State#state.tests,1) of
 	    [] -> {"",""};
@@ -454,22 +485,20 @@ run_body(State) ->
 		{table("CELLPADDING=5",[Heading,TestDirs]),
 		submit_button()} 
 	end,
-
-    %% It should be ok to have no config-file!
     Body = 
-	%% case State#state.config of %% [] -> %% p("ALIGN=center",
-	%% 	       href("./config_frame","Please select one or
-	%% 	       more config files")); %% _ ->
 	table(
-	  "WIDTH=100%",
-	  [tr(td(ConfigFiles)),
+	  "WIDTH=450 ALIGN=center",
+	  [tr(td("")),
+	   tr(td("")),
+	   tr(td(ConfigFiles)),
+	   tr(td("")),
+	   tr(td(CurrWD)),
 	   tr(td("")),
 	   tr(td(AddDirForm)),
 	   tr(td("")),
 	   tr(td(LoadedTestsTable)),
-	   tr(td(Submit))]),
-    %%    end,
-    
+	   tr(td(Submit))
+	  ]),
     [h1("ALIGN=center","Run Test"), Body].
 
 create_testdir_entries([{Dir,Suite,Case}|Tests],N) ->
@@ -556,18 +585,17 @@ options([Element|Elements],Selected,N,Func) ->
 options([],_Selected,_N,_Func) ->
     [].
 
-add_test_dir1(Input,State) ->
+add_test_dir1(Input, State) ->
     State1 = 
 	case get_input_data(Input,"dir") of
 	    "" -> State;
 	    Dir0 ->
 		Dir = case ct_util:is_test_dir(Dir0) of
-			  true -> 
-			      Dir0;
-			  false -> filename:join(Dir0,"test")
+			  true  -> Dir0;
+			  false -> ct_util:get_testdir(Dir0, all)
 		      end,
 		case filelib:is_dir(Dir) of
-		    true -> 
+		    true  ->
 			Test = ct_run:tests(Dir),
 			State#state{tests=State#state.tests++Test};
 		    false ->
@@ -577,8 +605,6 @@ add_test_dir1(Input,State) ->
     Return = run_frame1(State1),
     {Return,State1}.
 
-
-
 remove_test_dir1(Input,State) ->
     N = list_to_integer(get_input_data(Input,"dir")),
     State1 = State#state{tests=delete_test(N,State#state.tests)},
@@ -641,6 +667,9 @@ result_frameset2(State) ->
 		"./redirect_to_result_log_frame";
 	    {_Dir,0} ->
 		filename:join(["/log_dir","index.html"]);
+	    {_Dir,_} when State#state.testruns == [] ->
+		%% crash before first test
+		"./no_result_log_frame";
 	    {_Dir,_} ->
 		{_,CurrentLog} = hd(State#state.testruns),
 		CurrentLog
@@ -749,6 +778,8 @@ report1(tc_done,{_Suite,_Case,{skipped,_Reason}},State) ->
     State#state{skip=State#state.skip+1};
 report1(tc_user_skip,{_Suite,_Case,_Reason},State) ->
     State#state{skip=State#state.skip+1};
+report1(tc_auto_skip,{_Suite,_Case,_Reason},State) ->
+    State#state{skip=State#state.skip+1};
 report1(loginfo,_,State) ->
     State.
 
@@ -850,6 +881,8 @@ h2(Text) ->
     ["<H2>",Text,"</H2>\n"].
 h3(Text) ->
     ["<H3>",Text,"</H3>\n"].
+%%h4(Text) ->
+%%    ["<H4>",Text,"</H4>\n"].
 font(Args,Text) ->
     ["<FONT ",Args,">\n",Text,"\n</FONT>\n"].
 p(Text) ->    
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 6867e59b60..c1a455c6d8 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -60,7 +60,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [cfg_error, lib_error, no_compile, timetrap_end_conf,
-     timetrap_normal, timetrap_extended].
+     timetrap_normal, timetrap_extended, timetrap_parallel,
+     timetrap_fun].
 
 groups() -> 
     [].
@@ -228,6 +229,28 @@ timetrap_parallel(Config) when is_list(Config) ->
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
+%%%
+timetrap_fun(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Join = fun(D, S) -> filename:join(D, "error/test/"++S) end,
+    Suites = [Join(DataDir, "timetrap_4_SUITE"),
+	      Join(DataDir, "timetrap_5_SUITE"),
+	      Join(DataDir, "timetrap_6_SUITE"),
+	      Join(DataDir, "timetrap_7_SUITE")],
+    {Opts,ERPid} = setup([{suite,Suites}], Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(timetrap_fun,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(timetrap_fun),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+
+%%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
 
@@ -260,7 +283,7 @@ test_events(cfg_error) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{14,14,43}},
+     {?eh,start_info,{14,14,45}},
 
      {?eh,tc_start,{cfg_error_1_SUITE,init_per_suite}},
      {?eh,tc_done,
@@ -280,41 +303,21 @@ test_events(cfg_error) ->
      {?eh,tc_start,{cfg_error_2_SUITE,init_per_suite}},
      {?eh,tc_done,
       {cfg_error_2_SUITE,init_per_suite,
-       {failed,{error,{{badmatch,[1,2]},
-		       [{cfg_error_2_SUITE,init_per_suite,1},
-			{test_server,my_apply,3},
-			{test_server,ts_tc,3},
-			{test_server,run_test_case_eval1,6},
-			{test_server,run_test_case_eval,8}]}}}}},
+       {failed,{error,{{badmatch,[1,2]},'_'}}}}},
      {?eh,tc_auto_skip,
       {cfg_error_2_SUITE,tc1,
        {failed,{cfg_error_2_SUITE,init_per_suite,      
-		{'EXIT',{{badmatch,[1,2]},
-			 [{cfg_error_2_SUITE,init_per_suite,1},
-			  {test_server,my_apply,3},
-			  {test_server,ts_tc,3},
-			  {test_server,run_test_case_eval1,6},
-			  {test_server,run_test_case_eval,8}]}}}}}},
+		{'EXIT',{{badmatch,[1,2]},'_'}}}}}},
      {?eh,test_stats,{0,0,{0,3}}},
      {?eh,tc_auto_skip,
       {cfg_error_2_SUITE,tc2,
        {failed,{cfg_error_2_SUITE,init_per_suite,      
-		{'EXIT',{{badmatch,[1,2]},
-			 [{cfg_error_2_SUITE,init_per_suite,1},
-			  {test_server,my_apply,3},
-			  {test_server,ts_tc,3},
-			  {test_server,run_test_case_eval1,6},
-			  {test_server,run_test_case_eval,8}]}}}}}},
+		{'EXIT',{{badmatch,[1,2]},'_'}}}}}},
      {?eh,test_stats,{0,0,{0,4}}},
      {?eh,tc_auto_skip,
       {cfg_error_2_SUITE,end_per_suite,
        {failed,{cfg_error_2_SUITE,init_per_suite,      
-		{'EXIT',{{badmatch,[1,2]},
-			 [{cfg_error_2_SUITE,init_per_suite,1},
-			  {test_server,my_apply,3},
-			  {test_server,ts_tc,3},
-			  {test_server,run_test_case_eval1,6},
-			  {test_server,run_test_case_eval,8}]}}}}}},
+		{'EXIT',{{badmatch,[1,2]},'_'}}}}}},
 
      {?eh,tc_start,{cfg_error_3_SUITE,init_per_suite}},
      {?eh,tc_done,
@@ -373,12 +376,7 @@ test_events(cfg_error) ->
       {?eh,tc_done,{cfg_error_6_SUITE,{end_per_group,g1,[]},ok}}],
      {?eh,tc_start,{cfg_error_6_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_6_SUITE,end_per_suite,
-		   {failed,{error,{{badmatch,[1,2]},
-				   [{cfg_error_6_SUITE,end_per_suite,1},
-				    {test_server,my_apply,3},
-				    {test_server,ts_tc,3},
-				    {test_server,run_test_case_eval1,6},
-				    {test_server,run_test_case_eval,8}]}}}}},
+		   {failed,{error,{{badmatch,[1,2]},'_'}}}}},
 
      {?eh,tc_start,{cfg_error_7_SUITE,init_per_suite}},
      {?eh,tc_done,{cfg_error_7_SUITE,init_per_suite,ok}},
@@ -427,31 +425,16 @@ test_events(cfg_error) ->
      [{?eh,tc_start,{cfg_error_8_SUITE,{init_per_group,g3,[]}}},
       {?eh,tc_done,
        {cfg_error_8_SUITE,{init_per_group,g3,[]},
-	{failed,{error,{{badmatch,42},
-			[{cfg_error_8_SUITE,init_per_group,2},
-			 {test_server,my_apply,3},
-			 {test_server,ts_tc,3},
-			 {test_server,run_test_case_eval1,6},
-			 {test_server,run_test_case_eval,8}]}}}}},
+	{failed,{error,{{badmatch,42},'_'}}}}},
       {?eh,tc_auto_skip,
        {cfg_error_8_SUITE,tc1,
 	{failed,{cfg_error_8_SUITE,init_per_group,
-		 {'EXIT',{{badmatch,42},
-			  [{cfg_error_8_SUITE,init_per_group,2},
-			   {test_server,my_apply,3},
-			   {test_server,ts_tc,3},
-			   {test_server,run_test_case_eval1,6},
-			   {test_server,run_test_case_eval,8}]}}}}}},
+		 {'EXIT',{{badmatch,42},'_'}}}}}},
       {?eh,test_stats,{4,0,{0,13}}},
       {?eh,tc_auto_skip,
        {cfg_error_8_SUITE,end_per_group,
 	{failed,{cfg_error_8_SUITE,init_per_group,
-		 {'EXIT',{{badmatch,42},
-			  [{cfg_error_8_SUITE,init_per_group,2},
-			   {test_server,my_apply,3},
-			   {test_server,ts_tc,3},
-			   {test_server,run_test_case_eval1,6},
-			   {test_server,run_test_case_eval,8}]}}}}}}],
+		 {'EXIT',{{badmatch,42},'_'}}}}}}],
 
      [{?eh,tc_start,{cfg_error_8_SUITE,{init_per_group,g4,[]}}},
       {?eh,tc_done,{cfg_error_8_SUITE,{init_per_group,g4,[]},ok}},
@@ -520,12 +503,7 @@ test_events(cfg_error) ->
      {?eh,tc_start,{cfg_error_9_SUITE,tc3}},
      {?eh,tc_done,{cfg_error_9_SUITE,tc3,
 		   {skipped,{failed,{cfg_error_9_SUITE,init_per_testcase,
-				     {{badmatch,undefined},
-				      [{cfg_error_9_SUITE,init_per_testcase,2},
-				       {test_server,my_apply,3},
-				       {test_server,init_per_testcase,3},
-				       {test_server,run_test_case_eval1,6},
-				       {test_server,run_test_case_eval,8}]}}}}}},
+				     {{badmatch,undefined},'_'}}}}}},
      {?eh,test_stats,{9,0,{0,17}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc4}},
      {?eh,tc_done,
@@ -562,13 +540,18 @@ test_events(cfg_error) ->
 				      {test_server,my_apply,3},
 				      {test_server,do_end_per_testcase,4},
 				      {test_server,run_test_case_eval1,6},
-				      {test_server,run_test_case_eval,8}]}}}}}},
+				      {test_server,run_test_case_eval,9}]}}}}}},
      {?eh,test_stats,{12,3,{0,18}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc14}},
      {?eh,tc_done,
       {cfg_error_9_SUITE,tc14,{failed,{error,tc14_should_be_failed}}}},
-     {?eh,test_stats,{12,4,{0,18}}},
-
+     {?eh,tc_start,{cfg_error_9_SUITE,tc15}},
+     {?eh,tc_done,
+      {cfg_error_9_SUITE,tc15,{failed,{error,this_error_must_show}}}},
+     {?eh,tc_start,{cfg_error_9_SUITE,tc16}},
+     {?eh,tc_done,
+      {cfg_error_9_SUITE,tc16,{failed,{error,this_error_must_show}}}},
+     {?eh,test_stats,{12,6,{0,18}}},
      {?eh,tc_start,{cfg_error_9_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_9_SUITE,end_per_suite,ok}},
 
@@ -578,7 +561,7 @@ test_events(cfg_error) ->
      {?eh,tc_auto_skip,{cfg_error_10_SUITE,tc1,
 			{failed,{cfg_error_10_SUITE,init_per_suite,
 				 {failed,fail_init_per_suite}}}}},
-     {?eh,test_stats,{12,4,{0,19}}},
+     {?eh,test_stats,{12,6,{0,19}}},
      {?eh,tc_auto_skip,{cfg_error_10_SUITE,end_per_suite,
 			{failed,{cfg_error_10_SUITE,init_per_suite,
 				 {failed,fail_init_per_suite}}}}},
@@ -587,40 +570,40 @@ test_events(cfg_error) ->
      {?eh,tc_start,{cfg_error_11_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_11_SUITE,tc1,
 		   {skipped,{config_name_already_in_use,[dummy0]}}}},
-     {?eh,test_stats,{12,4,{1,19}}},
+     {?eh,test_stats,{12,6,{1,19}}},
      {?eh,tc_start,{cfg_error_11_SUITE,tc2}},
      {?eh,tc_done,{cfg_error_11_SUITE,tc2,ok}},
-     {?eh,test_stats,{13,4,{1,19}}},
+     {?eh,test_stats,{13,6,{1,19}}},
      {?eh,tc_start,{cfg_error_11_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_11_SUITE,end_per_suite,ok}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc1,{failed,{timetrap_timeout,500}}}},
-     {?eh,test_stats,{13,5,{1,19}}},
+     {?eh,test_stats,{13,7,{1,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc2}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc2,{failed,
 					   {cfg_error_12_SUITE,end_per_testcase,
 					    {timetrap_timeout,500}}}}},
-     {?eh,test_stats,{14,5,{1,19}}},
+     {?eh,test_stats,{14,7,{1,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc3}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc3,ok}},
-     {?eh,test_stats,{15,5,{1,19}}},
+     {?eh,test_stats,{15,7,{1,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc4}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc4,{failed,
 					   {cfg_error_12_SUITE,end_per_testcase,
 					    {timetrap_timeout,500}}}}},
-     {?eh,test_stats,{16,5,{1,19}}},
+     {?eh,test_stats,{16,7,{1,19}}},
      {?eh,tc_start,{cfg_error_13_SUITE,init_per_suite}},
      {?eh,tc_done,{cfg_error_13_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_13_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_13_SUITE,tc1,ok}},
-     {?eh,test_stats,{17,5,{1,19}}},
+     {?eh,test_stats,{17,7,{1,19}}},
      {?eh,tc_start,{cfg_error_13_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_13_SUITE,end_per_suite,ok}},
      {?eh,tc_start,{cfg_error_14_SUITE,init_per_suite}},
      {?eh,tc_done,{cfg_error_14_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_14_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_14_SUITE,tc1,ok}},
-     {?eh,test_stats,{18,5,{1,19}}},
+     {?eh,test_stats,{18,7,{1,19}}},
      {?eh,tc_start,{cfg_error_14_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_14_SUITE,end_per_suite,
 		   {comment,
@@ -640,13 +623,7 @@ test_events(lib_error) ->
      {?eh,tc_done,
       {lib_error_1_SUITE,lines_error,{failed,
 				      {error,
-				       {{badmatch,[1,2]},
-					[{lib_lines,do_error,0},
-					 {lib_error_1_SUITE,lines_error,1},
-					 {test_server,my_apply,3},
-					 {test_server,ts_tc,3},
-					 {test_server,run_test_case_eval1,6},
-					 {test_server,run_test_case_eval,8}]}}}}},
+				       {{badmatch,[1,2]},'_'}}}}},
      {?eh,test_stats,{0,1,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,lines_exit}},
      {?eh,tc_done,
@@ -654,7 +631,7 @@ test_events(lib_error) ->
      {?eh,test_stats,{0,2,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,lines_hang}},
      {?eh,tc_done,
-      {lib_lines,do_hang,{failed,{timetrap_timeout,3000}}}},
+      {lib_error_1_SUITE,lines_hang,{failed,{timetrap_timeout,3000}}}},
      {?eh,test_stats,{0,3,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,lines_throw}},
      {?eh,tc_done,
@@ -665,13 +642,7 @@ test_events(lib_error) ->
      {?eh,tc_done,
       {lib_error_1_SUITE,no_lines_error,{failed,
 					 {error,
-					  {{badmatch,[1,2]},
-					   [{lib_no_lines,do_error,0},
-					    {lib_error_1_SUITE,no_lines_error,1},
-					    {test_server,my_apply,3},
-					    {test_server,ts_tc,3},
-					    {test_server,run_test_case_eval1,6},
-					    {test_server,run_test_case_eval,8}]}}}}},
+					  {{badmatch,[1,2]},'_'}}}}},
      {?eh,test_stats,{0,5,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,no_lines_exit}},
      {?eh,tc_done,
@@ -809,7 +780,7 @@ test_events(timetrap_parallel) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{1,1,7}},
+     {?eh,start_info,{1,1,8}},
      {?eh,tc_done,{timetrap_3_SUITE,init_per_suite,ok}},
      {parallel,
       [{?eh,tc_start,
@@ -821,9 +792,12 @@ test_events(timetrap_parallel) ->
        {?eh,tc_start,{timetrap_3_SUITE,tc2}},
        {?eh,tc_start,{timetrap_3_SUITE,tc3}},
        {?eh,tc_start,{timetrap_3_SUITE,tc4}},
+       {?eh,tc_start,{timetrap_3_SUITE,tc5}},
        {?eh,tc_start,{timetrap_3_SUITE,tc6}},
        {?eh,tc_start,{timetrap_3_SUITE,tc7}},
        {?eh,tc_done,
+        {timetrap_3_SUITE,tc5,ok}},
+       {?eh,tc_done,
         {timetrap_3_SUITE,tc1,{failed,{timetrap_timeout,500}}}},
        {?eh,tc_done,
         {timetrap_3_SUITE,tc2,{failed,{timetrap_timeout,1000}}}},
@@ -837,11 +811,90 @@ test_events(timetrap_parallel) ->
         {timetrap_3_SUITE,tc4,{failed,{timetrap_timeout,2000}}}},
        {?eh,tc_done,
         {timetrap_3_SUITE,tc3,{failed,{timetrap_timeout,3000}}}},
-       {?eh,test_stats,{0,7,{0,0}}},
+       {?eh,test_stats,{1,7,{0,0}}},
        {?eh,tc_start,
 	{timetrap_3_SUITE,{end_per_group,g1,[parallel]}}},
        {?eh,tc_done,
 	{timetrap_3_SUITE,{end_per_group,g1,[parallel]},ok}}]},
      {?eh,tc_done,{timetrap_3_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
-     {?eh,stop_logging,[]}].
+     {?eh,stop_logging,[]}];
+
+test_events(timetrap_fun) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,start_info,{4,4,17}},
+     {?eh,tc_done,{timetrap_4_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{timetrap_4_SUITE,tc0}},
+     {?eh,tc_done,
+      {timetrap_4_SUITE,tc0,{failed,{timetrap_timeout,1000}}}},
+     {?eh,tc_start,{timetrap_4_SUITE,tc1}},
+     {?eh,tc_done,
+      {timetrap_4_SUITE,tc1,{failed,{timetrap_timeout,2000}}}},
+     {?eh,tc_start,{timetrap_4_SUITE,tc2}},
+     {?eh,tc_done,
+      {timetrap_4_SUITE,tc2,{failed,{timetrap_timeout,500}}}},
+     {?eh,tc_start,{timetrap_4_SUITE,tc3}},
+     {?eh,tc_done,
+      {timetrap_4_SUITE,tc3,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,4,{0,0}}},
+     {?eh,tc_done,{timetrap_4_SUITE,end_per_suite,ok}},
+
+     {?eh,tc_done,{timetrap_5_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc0}},
+     {?eh,tc_done,
+      {timetrap_5_SUITE,tc0,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,5,{0,0}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc1}},
+     {?eh,tc_done,
+      {timetrap_5_SUITE,tc1,{skipped,{timetrap_error,kaboom}}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc2}},
+     {?eh,tc_done,
+      {timetrap_5_SUITE,tc2,{skipped,{timetrap_error,kaboom}}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc3}},
+     {?eh,tc_done,
+      {timetrap_5_SUITE,tc3,
+       {skipped,{invalid_time_format,{timetrap_utils,timetrap_val,[5000]}}}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc4}},
+     {?eh,tc_done,
+      {timetrap_5_SUITE,tc4,{skipped,{invalid_time_format,'_'}}}},
+     {?eh,test_stats,{0,5,{0,4}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc5}},
+     {?eh,tc_done,
+      {timetrap_5_SUITE,tc5,{failed,{timetrap_timeout,1000}}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc6}},
+     {?eh,tc_done,
+      {timetrap_5_SUITE,tc6,{failed,{timetrap_timeout,1000}}}},
+     {?eh,tc_start,{timetrap_5_SUITE,tc7}},
+     {?eh,tc_done,
+      {timetrap_5_SUITE,tc7,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,8,{0,4}}},
+     {?eh,tc_done,{timetrap_5_SUITE,end_per_suite,ok}},
+
+     {?eh,tc_start,{timetrap_6_SUITE,init_per_suite}},
+     {?eh,tc_done,
+      {timetrap_6_SUITE,init_per_suite,{skipped,{timetrap_error,kaboom}}}},
+     {?eh,tc_auto_skip,
+      {timetrap_6_SUITE,tc0,{fw_auto_skip,{timetrap_error,kaboom}}}},
+     {?eh,test_stats,{0,8,{0,5}}},
+     {?eh,tc_auto_skip,
+      {timetrap_6_SUITE,end_per_suite,{fw_auto_skip,{timetrap_error,kaboom}}}},
+
+     {?eh,tc_done,{timetrap_7_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{timetrap_7_SUITE,tc0}},
+     {?eh,tc_done,
+      {timetrap_7_SUITE,tc0,{failed,{timetrap_timeout,1000}}}},
+     {?eh,tc_start,{timetrap_7_SUITE,tc1}},
+     {?eh,tc_done,
+      {timetrap_7_SUITE,tc1,{failed,{timetrap_timeout,2000}}}},
+     {?eh,tc_start,{timetrap_7_SUITE,tc2}},
+     {?eh,tc_done,
+      {timetrap_7_SUITE,tc2,{failed,{timetrap_timeout,500}}}},
+     {?eh,tc_start,{timetrap_7_SUITE,tc3}},
+     {?eh,tc_done,
+      {timetrap_7_SUITE,tc3,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,12,{0,5}}},
+     {?eh,tc_done,{timetrap_7_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl
index c4e0d72948..f292985c0c 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl
@@ -76,7 +76,7 @@ init_per_testcase(tc1, Config) ->
     Config;
 init_per_testcase(tc2, Config) ->
     ct:comment("init_per_testcase(tc2) timeout"),
-    timer:sleep(5000),
+    ct:sleep(5000),
     Config;
 init_per_testcase(tc3, Config) ->
     badmatch = ?config(void, Config),
@@ -96,22 +96,20 @@ init_per_testcase(_, Config) ->
 %%--------------------------------------------------------------------
 end_per_testcase(tc11, _Config) ->
     ct:comment("A warning should be printed"),
-    exit(warning_should_be_printed),
-    done;
+    exit(warning_should_be_printed);
 end_per_testcase(tc12, _Config) ->
     ct:comment("A warning should be printed"),
-    timer:sleep(5000),
-    done;
+    ct:sleep(5000);
 end_per_testcase(tc13, Config) ->
     ct:comment("A warning should be printed"),
-    badmatch = ?config(void, Config),
-    done;
+    badmatch = ?config(void, Config);
 end_per_testcase(tc14, Config) ->
     ok = ?config(tc_status, Config),
     {fail,tc14_should_be_failed};
 end_per_testcase(tc15, Config) ->
-    {failed,byebye} = ?config(tc_status, Config),
-    ok;
+    exit(kaboom);
+end_per_testcase(tc16, Config) ->
+    ct:sleep(5000);
 end_per_testcase(_TestCase, _Config) ->
     done.
 
@@ -139,7 +137,7 @@ groups() ->
 %%--------------------------------------------------------------------
 all() -> 
     [tc1,tc2,tc3,tc4,tc5,tc6,tc7,
-     tc11,tc12,tc13,tc14].
+     tc11,tc12,tc13,tc14,tc15,tc16].
 
 tc1(_) ->
     fini.
@@ -189,4 +187,6 @@ tc14(_) ->
     ct:comment("This one should be failed by eptc"),
     yes.
 tc15(_) ->
-    exit(byebye).
+    exit(this_error_must_show).
+tc16(_) ->
+    exit(this_error_must_show).
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_3_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_3_SUITE.erl
new file mode 100644
index 0000000000..8271b23afe
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_3_SUITE.erl
@@ -0,0 +1,146 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+-module(timetrap_3_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(TO, 3).
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,?TO}}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%%--------------------------------------------------------------------
+groups() ->
+    [{g1,[parallel],[tc0,tc1,tc2,tc3,tc4,tc5,tc6,tc7]}].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() ->
+    [{group,g1}].
+
+tc0() ->
+    [{timetrap,2000}].
+tc0(_) ->
+    ct:comment("TO after 2 sec"),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc1() ->
+    [{timetrap,500}].
+tc1(_) ->
+    ct:comment("TO after 1/2 sec"),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc2() ->
+    [{timetrap,1000}].
+tc2(_) ->
+    ct:comment("TO after 1 sec"),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc3(_) ->    
+    ct:comment(io_lib:format("TO after ~w sec", [?TO])),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc4() ->
+    [{timetrap,2000}].
+tc4(_) ->
+    ct:comment(io_lib:format("TO after 2 sec", [])),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc5() ->
+    [{timetrap,2000}].
+tc5(_) ->
+    ct:comment("No timeout"),
+    ct:sleep({seconds,1}),
+    ok.
+
+tc6() ->
+    [{timetrap,1000}].
+tc6(_) ->
+    ct:comment("TO after 1 sec"),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc7() ->
+    [{timetrap,1500}].
+tc7(_) ->
+    ct:comment("TO after 1 1/2 sec"),
+    ct:sleep({seconds,5}),
+    ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_4_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_4_SUITE.erl
new file mode 100644
index 0000000000..d902454f09
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_4_SUITE.erl
@@ -0,0 +1,135 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+-module(timetrap_4_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(TO, 1).
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{timetrap_utils,timetrap_val,[{seconds,?TO}]}}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() ->
+    [tc0,tc1,tc2,tc3].
+
+tc0(_) ->
+    ct:comment(io_lib:format("TO after ~w sec", [?TO])),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc1() ->
+    [{timetrap,{timetrap_utils,timetrap_val,[2000]}}].
+tc1(_) ->
+    ct:comment("TO after 2 sec"),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc2() ->
+    [{timetrap,fun() -> timetrap_utils:timetrap_val(500) end}].
+tc2(_) ->
+    ct:comment("TO after 0.5 sec"),
+    ct:sleep(1000),
+    ok.
+
+tc3(_) ->
+    ct:comment(io_lib:format("TO after ~w sec", [?TO])),
+    ct:sleep({seconds,5}),
+    ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_5_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_5_SUITE.erl
new file mode 100644
index 0000000000..c5d4b5062e
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_5_SUITE.erl
@@ -0,0 +1,155 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+-module(timetrap_5_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(TO, 1).
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap, fun() -> timetrap_utils:timetrap_val({seconds,?TO}) end}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() ->
+    [tc0,tc1,tc2,tc3,tc4,tc5,tc6,tc7].
+
+tc0(_) ->
+    ct:comment(io_lib:format("TO after ~w sec", [?TO])),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc1() ->
+    [{timetrap,{timetrap_utils,timetrap_exit,[kaboom]}}].
+tc1(_) ->
+    exit(this_should_not_execute).
+
+tc2() ->
+    [{timetrap,fun() -> exit(kaboom) end}].
+tc2(_) ->
+    exit(this_should_not_execute).
+
+tc3() ->
+    [{timetrap,{timetrap_utils,timetrap_err_mfa,[]}}].
+tc3(_) ->
+    exit(this_should_not_execute).
+
+tc4() ->
+    [{timetrap,fun() -> timetrap_utils:timetrap_err_fun() end}].
+tc4(_) ->
+    exit(this_should_not_execute).
+
+tc5() ->
+    [{timetrap,{timetrap_utils,timetrap_timeout,[{seconds,40},
+						 {seconds,1}]}}].
+tc5(_) ->    
+    ct:comment("TO after 40+1 sec"),
+    ct:sleep({seconds,42}),
+    ok.
+
+tc6() ->
+    [{timetrap,fun() -> ct:sleep(6000), 1000 end}].
+tc6(_) ->
+    ct:comment("TO after 6+1 sec"),
+    ct:sleep({seconds,10}).
+
+tc7(_) ->
+    ct:comment(io_lib:format("TO after ~w sec", [?TO])),
+    ct:sleep({seconds,5}),
+    ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_6_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_6_SUITE.erl
new file mode 100644
index 0000000000..90467ff752
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_6_SUITE.erl
@@ -0,0 +1,114 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+-module(timetrap_6_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(TO, 1).
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap, fun() -> exit(kaboom) end}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() ->
+    [tc0].
+
+tc0(_) ->
+    ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_7_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_7_SUITE.erl
new file mode 100644
index 0000000000..b25b7770a7
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_7_SUITE.erl
@@ -0,0 +1,137 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+-module(timetrap_7_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(TO, 1).
+-define(HANG, 6).
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{timetrap_utils,timetrap_timeout,[{seconds,?HANG},
+						 {seconds,?TO}]}}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() ->
+    [tc0,tc1,tc2,tc3].
+
+tc0(_) ->
+    ct:comment(io_lib:format("TO after ~w+~w sec", [?HANG,?TO])),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc1() ->
+    [{timetrap,{timetrap_utils,timetrap_val,[2000]}}].
+tc1(_) ->
+    ct:comment("TO after 2 sec"),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc2() ->
+    [{timetrap,fun() -> timetrap_utils:timetrap_val(500) end}].
+tc2(_) ->
+    ct:comment("TO after 0.5 sec"),
+    ct:sleep(1000),
+    ok.
+
+tc3(_) ->
+    ct:comment(io_lib:format("TO after ~w+~w sec", [?HANG,?TO])),
+    ct:sleep({seconds,5}),
+    ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_utils.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_utils.erl
new file mode 100644
index 0000000000..fcde6cd701
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_utils.erl
@@ -0,0 +1,43 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(timetrap_utils).
+
+-export([timetrap_val/1,
+	 timetrap_err_fun/0,
+	 timetrap_err_mfa/0,
+	 timetrap_exit/1,
+	 timetrap_timeout/2]).
+
+timetrap_val(Val) ->
+    Val.
+
+timetrap_err_fun() ->
+    fun() -> 5000 end.
+
+timetrap_err_mfa() ->
+    {?MODULE,timetrap_val,[5000]}.
+
+timetrap_exit(Reason) ->
+    exit(Reason).
+
+timetrap_timeout(Sleep, Val) ->
+    ct:sleep(Sleep),
+    Val.
+	    
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE.erl
index f33be8a9d4..940d791b15 100644
--- a/lib/common_test/test/ct_groups_test_2_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_2_SUITE.erl
@@ -173,16 +173,14 @@ test_events(missing_conf) ->
      {?eh,start_info,{1,1,2}},
      {?eh,tc_start,{ct_framework,ct_init_per_group}},
      {?eh,tc_done,{ct_framework,ct_init_per_group,ok}},
-     {?eh,test_stats,{1,0,{0,0}}},
      {?eh,tc_start,{missing_conf_SUITE,tc1}},
      {?eh,tc_done,{missing_conf_SUITE,tc1,ok}},
-     {?eh,test_stats,{2,0,{0,0}}},
+     {?eh,test_stats,{1,0,{0,0}}},
      {?eh,tc_start,{missing_conf_SUITE,tc2}},
      {?eh,tc_done,{missing_conf_SUITE,tc2,ok}},
-     {?eh,test_stats,{3,0,{0,0}}},
+     {?eh,test_stats,{2,0,{0,0}}},
      {?eh,tc_start,{ct_framework,ct_end_per_group}},
      {?eh,tc_done,{ct_framework,ct_end_per_group,ok}},
-     {?eh,test_stats,{4,0,{0,0}}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index 8574d7aabc..5c99f0f9f7 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -83,7 +83,7 @@ all(suite) ->
        fail_post_suite_cth, skip_pre_suite_cth,
        skip_post_suite_cth, recover_post_suite_cth, update_config_cth,
        state_update_cth, options_cth, same_id_cth, 
-       fail_n_skip_with_minimal_cth
+       fail_n_skip_with_minimal_cth, prio_cth
       ]
     )
 	.
@@ -209,6 +209,11 @@ fail_n_skip_with_minimal_cth(Config) when is_list(Config) ->
     do_test(fail_n_skip_with_minimal_cth, "ct_cth_fail_one_skip_one_SUITE.erl",
 	    [minimal_terminate_cth],Config).
 
+prio_cth(Config) when is_list(Config) ->
+    do_test(prio_cth, "ct_cth_prio_SUITE.erl",
+	    [{empty_cth,[1000],1000},{empty_cth,[900],900},
+	     {prio_cth,[1100,100],100},{prio_cth,[1100]}],Config).
+
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
@@ -296,9 +301,9 @@ test_events(two_empty_cth) ->
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,cth,{'_',id,[[]]}},
-     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,cth,{'_',id,[[]]}},
      {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,cth,{'_',init,['_',[]]}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
@@ -365,9 +370,9 @@ test_events(minimal_and_maximal_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',id,[[]]}},
      {negative,{?eh,cth,{'_',id,['_',[]]}},
       {?eh,cth,{'_',init,['_',[]]}}},
-     {?eh,cth,{'_',id,[[]]}},
      {?eh,cth,{'_',init,['_',[]]}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
@@ -954,8 +959,8 @@ test_events(same_id_cth) ->
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,cth,{'_',id,[[]]}},
-     {?eh,cth,{'_',init,[same_id_cth,[]]}},
      {?eh,cth,{'_',id,[[]]}},
+     {?eh,cth,{'_',init,[same_id_cth,[]]}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
      {negative,
@@ -1001,6 +1006,73 @@ test_events(fail_n_skip_with_minimal_cth) ->
      {?eh,stop_logging,[]}
     ];
 
+test_events(prio_cth) ->
+    
+    GenPre = fun(Func,States) ->
+		     [{?eh,cth,{'_',Func,['_','_',State]}} || 
+			 State <- States]
+	     end,
+
+    GenPost = fun(Func,States) ->
+		      [{?eh,cth,{'_',Func,['_','_','_',State]}} || 
+			  State <- States]
+	     end,
+    
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}] ++
+
+	[{?eh,tc_start,{ct_cth_prio_SUITE,init_per_suite}}] ++
+	GenPre(pre_init_per_suite,
+	       [[1100,100],[800],[900],[1000],[1200,1050],[1100],[1200]]) ++
+	GenPost(post_init_per_suite,
+		[[1100,100],[600,200],[600,600],[700],[800],[900],[1000],
+		 [1200,1050],[1100],[1200]]) ++
+	[{?eh,tc_done,{ct_cth_prio_SUITE,init_per_suite,ok}},
+	 
+
+	 [{?eh,tc_start,{ct_cth_prio_SUITE,{init_per_group,'_',[]}}}] ++
+	     GenPre(pre_init_per_group,
+		    [[1100,100],[600,200],[600,600],[700],[800],
+		     [900],[1000],[1200,1050],[1100],[1200]]) ++
+	     GenPost(post_init_per_group,
+		     [[1100,100],[600,200],[600,600],[600],[700],[800],
+		      [900],[900,900],[500,900],[1000],[1200,1050],
+		      [1100],[1200]]) ++
+	     [{?eh,tc_done,{ct_cth_prio_SUITE,{init_per_group,'_',[]},ok}}] ++
+	 
+	     [{?eh,tc_start,{ct_cth_prio_SUITE,test_case}}] ++
+	     GenPre(pre_init_per_testcase,
+		    [[1100,100],[600,200],[600,600],[600],[700],[800],
+		     [900],[900,900],[500,900],[1000],[1200,1050],
+		     [1100],[1200]]) ++
+	     GenPost(post_end_per_testcase,
+		     [[1100,100],[600,200],[600,600],[600],[700],[800],
+		      [900],[900,900],[500,900],[1000],[1200,1050],
+		      [1100],[1200]]) ++
+	     [{?eh,tc_done,{ct_cth_prio_SUITE,test_case,ok}},
+
+	      {?eh,tc_start,{ct_cth_prio_SUITE,{end_per_group,'_',[]}}}] ++
+	     GenPre(pre_end_per_group, 
+		    [[1100,100],[600,200],[600,600],[600],[700],[800],
+		     [900],[900,900],[500,900],[1000],[1200,1050],
+		     [1100],[1200]]) ++
+	     GenPost(post_end_per_group,
+		     [[1100,100],[600,200],[600,600],[600],[700],[800],
+		      [900],[900,900],[500,900],[1000],[1200,1050],
+		      [1100],[1200]]) ++
+	     [{?eh,tc_done,{ct_cth_prio_SUITE,{end_per_group,'_',[]},ok}}],
+
+	 {?eh,tc_start,{ct_cth_prio_SUITE,end_per_suite}}] ++
+	GenPre(pre_end_per_suite,
+	       [[1100,100],[600,200],[600,600],[700],[800],[900],[1000],
+		[1200,1050],[1100],[1200]]) ++
+	GenPost(post_end_per_suite,
+		[[1100,100],[600,200],[600,600],[700],[800],[900],[1000],
+		[1200,1050],[1100],[1200]]) ++
+	[{?eh,tc_done,{ct_cth_prio_SUITE,end_per_suite,ok}},
+	 {?eh,test_done,{'DEF','STOP_TIME'}},
+	 {?eh,stop_logging,[]}];
+
 test_events(ok) ->
     ok.
 
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_prio_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_prio_SUITE.erl
new file mode 100644
index 0000000000..d564398cd0
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_prio_SUITE.erl
@@ -0,0 +1,62 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010-2011. 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.

+%%

+%% %CopyrightEnd%

+%%

+

+-module(ct_cth_prio_SUITE).

+

+%% Note: This directive should only be used in test suites.

+-compile(export_all).

+

+-include("ct.hrl").

+

+suite() ->

+    ([{timetrap, {minutes, 10}},

+      {ct_hooks, [{empty_cth,[800],800},

+		  {prio_cth,[1200]},{prio_cth,[1200,1050],1050}]}]).

+

+%% Test server callback functions

+init_per_suite(Config) ->

+    [{ct_hooks, [{empty_cth,[700],700},

+		 {prio_cth,[600,600]},

+		 {prio_cth,[600,200],200}]}|Config].

+

+end_per_suite(_Config) ->

+    ok.

+

+init_per_group(_G, Config) ->

+    [{ct_hooks, [{empty_cth,[600],600},

+		 {prio_cth,[900,900]},{prio_cth,[500,900],900}]}|Config].

+

+end_per_group(_G, _Config) ->

+    ok.

+

+init_per_testcase(_TestCase, Config) ->

+    Config.

+

+end_per_testcase(_TestCase, _Config) ->

+    ok.

+

+all() ->

+    [{group,test_group}].

+

+groups() ->

+    [{test_group,[],[test_case]}].

+

+%% Test cases starts here.

+test_case(Config) when is_list(Config) ->

+    ok.

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
index ebebfd18a9..7befcfa57c 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
@@ -59,8 +59,7 @@
 -include_lib("common_test/src/ct_util.hrl").

 -include_lib("common_test/include/ct_event.hrl").

 

--type proplist() :: list({atom(),term()}).

--type config() :: proplist().

+-type config() :: proplists:proplist().
 -type reason() :: term().

 -type skip_or_fail() :: {skip, reason()} |

                         {auto_skip, reason()} |

@@ -71,17 +70,17 @@
 

 %% @doc Always called before any other callback function. Use this to initiate

 %% any common state. It should return an state for this CTH.

--spec init(Id :: term(), Opts :: proplist()) ->

-    State :: #state{}.

+-spec init(Id :: term(), Opts :: proplists:proplist()) ->
+    {ok, State :: #state{}}.

 init(Id, Opts) ->

     gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),

 					    data = {?MODULE, init, [Id, Opts]}}),

-    Opts.

+    {ok,Opts}.

 

 %% @doc The ID is used to uniquly identify an CTH instance, if two CTH's 

 %% return the same ID the seconds CTH is ignored. This function should NOT 

 %% have any side effects as it might be called multiple times by common test.

--spec id(Opts :: proplist()) ->

+-spec id(Opts :: proplists:proplist()) ->
     Id :: term().

 id(Opts) ->

     gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/prio_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/prio_cth.erl
new file mode 100644
index 0000000000..82511ab0d3
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/prio_cth.erl
@@ -0,0 +1,74 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010-2011. 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.

+%%

+%% %CopyrightEnd%

+%%

+

+

+-module(prio_cth).

+

+

+-include_lib("common_test/src/ct_util.hrl").

+

+

+%% CT Hooks

+-compile(export_all).

+

+id(Opts) ->

+    empty_cth:id(Opts).

+

+init(Id, Opts) ->

+    {ok, [Prio|_] = State} = empty_cth:init(Id, Opts),

+    {ok, State, Prio}.

+

+pre_init_per_suite(Suite, Config, State) ->

+    empty_cth:pre_init_per_suite(Suite,Config,State).

+

+post_init_per_suite(Suite,Config,Return,State) ->

+    empty_cth:post_init_per_suite(Suite,Config,Return,State).

+

+pre_end_per_suite(Suite,Config,State) ->

+    empty_cth:pre_end_per_suite(Suite,Config,State).

+

+post_end_per_suite(Suite,Config,Return,State) ->

+    empty_cth:post_end_per_suite(Suite,Config,Return,State).

+

+pre_init_per_group(Group,Config,State) ->

+    empty_cth:pre_init_per_group(Group,Config,State).

+

+post_init_per_group(Group,Config,Return,State) ->

+    empty_cth:post_init_per_group(Group,Config,Return,State).

+

+pre_end_per_group(Group,Config,State) ->

+    empty_cth:pre_end_per_group(Group,Config,State).

+

+post_end_per_group(Group,Config,Return,State) ->

+    empty_cth:post_end_per_group(Group,Config,Return,State).

+

+pre_init_per_testcase(TC,Config,State) ->

+    empty_cth:pre_init_per_testcase(TC,Config,State).

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    empty_cth:post_end_per_testcase(TC,Config,Return,State).

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State).

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

+terminate(State) ->

+    empty_cth:terminate(State).

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl
index 35c990c0be..9da48d3a4c 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl
@@ -29,7 +29,7 @@
 

 init(Id, Opts) ->

     State = empty_cth:init(Id, Opts),

-    [init|State].

+    {ok, [init|State]}.

 

 pre_init_per_suite(Suite, Config, State) ->

     empty_cth:pre_init_per_suite(Suite,Config,State),

diff --git a/lib/common_test/test/ct_repeat_1_SUITE.erl b/lib/common_test/test/ct_repeat_1_SUITE.erl
index 4e842bd6d6..090002d0c2 100644
--- a/lib/common_test/test/ct_repeat_1_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_1_SUITE.erl
@@ -560,12 +560,7 @@ test_events(repeat_cs_until_any_fail) ->
 	{repeat_1_SUITE,tc_fail_1,
 	 {failed,
 	  {error,
-	   {{badmatch,2},
-	    [{repeat_1_SUITE,tc_fail_1,1},
-	     {test_server,my_apply,3},
-	     {test_server,ts_tc,3},
-	     {test_server,run_test_case_eval1,6},
-	     {test_server,run_test_case_eval,8}]}}}}},
+	   {{badmatch,2},'_'}}}}},
        {?eh,test_stats,{5,2,{0,0}}},
        {?eh,tc_start,{repeat_1_SUITE,tc_fail_2}},
        {?eh,tc_done,
diff --git a/lib/common_test/test/ct_skip_SUITE.erl b/lib/common_test/test/ct_skip_SUITE.erl
index 4ba4479208..b8be55f43a 100644
--- a/lib/common_test/test/ct_skip_SUITE.erl
+++ b/lib/common_test/test/ct_skip_SUITE.erl
@@ -197,7 +197,7 @@ test_events(auto_skip) ->
      {?eh,tc_done,
       {auto_skip_3_SUITE,tc1,
        {skipped,{failed,{auto_skip_3_SUITE,init_per_testcase,
-			 {init_per_testcase,tc1,failed}}}}}},
+			 {{init_per_testcase,tc1,failed},'_'}}}}}},
      {?eh,test_stats,{0,0,{0,4}}},
      {?eh,tc_start,{auto_skip_3_SUITE,tc2}},
      {?eh,tc_done,{auto_skip_3_SUITE,tc2,ok}},
@@ -364,12 +364,7 @@ test_events(auto_skip) ->
 	 {?eh,tc_done,
 	  {auto_skip_9_SUITE,tc8,
 	   {skipped,{failed,{auto_skip_9_SUITE,init_per_testcase,
-			     {{badmatch,undefined},
-			      [{auto_skip_9_SUITE,init_per_testcase,2},
-			       {test_server,my_apply,3},
-			       {test_server,init_per_testcase,3},
-			       {test_server,run_test_case_eval1,6},
-			       {test_server,run_test_case_eval,8}]}}}}}},
+			     {{badmatch,undefined},'_'}}}}}},
 	 {?eh,tc_start,
 	  {auto_skip_9_SUITE,{end_per_group,g5,[parallel]}}},
 	 {?eh,tc_done,
diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl
index 47cea190dd..bda7d91161 100644
--- a/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl
+++ b/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl
@@ -143,7 +143,7 @@ tc1(_) ->
     exit(should_have_been_skipped).
 
 tc2(_) ->
-    exit(should_have_been_skipped).
+    timeout_in_end_per_testcase.
 
 tc3(_) ->
    timer:sleep(5000).
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 31381abc40..6df02d12b7 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -23,8 +23,8 @@
 %%%
 -module(ct_test_support).
 
--include_lib("test_server/include/test_server.hrl").
 -include_lib("common_test/include/ct_event.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([init_per_suite/1, init_per_suite/2, end_per_suite/1,
 	 init_per_testcase/2, end_per_testcase/2,
@@ -46,9 +46,10 @@ init_per_suite(Config) ->
 init_per_suite(Config, Level) ->
     case os:type() of
 	{win32, _} ->
-	    %% Extend timeout for windows as starting node
+	    %% Extend timeout to 1 hour for windows as starting node
 	    %% can take a long time there
-	    test_server:timetrap( 120000 * test_server:timetrap_scale_factor());
+	    test_server:timetrap( 60*60*1000 * 
+				      test_server:timetrap_scale_factor());
 	_ ->
 	    ok
     end,
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index f77629b4d1..4782a32933 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1,3 +1,3 @@
-COMMON_TEST_VSN = 1.5.4
+COMMON_TEST_VSN = 1.5.5
 
 
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index 830c89ae84..522c1dc411 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -395,6 +395,14 @@ module.beam: module.erl \
 	  <code>-compile({no_auto_import,[error/1]}).</code>
 	  </item>
 
+          <tag><c>no_line_info</c></tag>
+
+          <item>
+            <p>Omit line number information in order to produce a slightly
+	      smaller output file.
+	    </p>
+          </item>
+
         </taglist>
 
         <p>If warnings are turned on (the <c>report_warnings</c> option
diff --git a/lib/compiler/doc/src/make.dep b/lib/compiler/doc/src/make.dep
deleted file mode 100644
index f5c097afad..0000000000
--- a/lib/compiler/doc/src/make.dep
+++ /dev/null
@@ -1,19 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex compile.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index dd29323787..740cbcf8eb 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -31,6 +31,34 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 4.7.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Compiler options given in the source code using a
+	    <c>-compile()</c> attribute used to be included twice in
+	    <c>Mod:module_info(compile)</c>. They are now only
+	    included once at the beginning of the list of options.</p>
+          <p>
+	    Own Id: OTP-9534</p>
+        </item>
+        <item>
+          <p>
+	    beam_disasm: Handle stripped BEAM files</p>
+          <p>
+	    beam_disasm:file/1 would crash if asked to disassemble a
+	    stripped BEAM file without an "Attr" chunk. (Thanks to
+	    Haitao Li)</p>
+          <p>
+	    Own Id: OTP-9571</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 4.7.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/src/beam_asm.erl b/lib/compiler/src/beam_asm.erl
index 89d64834cf..6e63c4d0f2 100644
--- a/lib/compiler/src/beam_asm.erl
+++ b/lib/compiler/src/beam_asm.erl
@@ -23,7 +23,7 @@
 -export([module/4]).
 -export([encode/2]).
 
--import(lists, [map/2,member/2,keymember/3,duplicate/2]).
+-import(lists, [map/2,member/2,keymember/3,duplicate/2,splitwith/2]).
 -include("beam_opcodes.hrl").
 
 module(Code, Abst, SourceFile, Opts) ->
@@ -31,22 +31,20 @@ module(Code, Abst, SourceFile, Opts) ->
 
 assemble({Mod,Exp,Attr0,Asm0,NumLabels}, Abst, SourceFile, Opts) ->
     {1,Dict0} = beam_dict:atom(Mod, beam_dict:new()),
+    {0,Dict1} = beam_dict:fname(atom_to_list(Mod) ++ ".erl", Dict0),
     NumFuncs = length(Asm0),
     {Asm,Attr} = on_load(Asm0, Attr0),
-    {Code,Dict1} = assemble_1(Asm, Exp, Dict0, []),
-    build_file(Code, Attr, Dict1, NumLabels, NumFuncs, Abst, SourceFile, Opts).
+    {Code,Dict2} = assemble_1(Asm, Exp, Dict1, []),
+    build_file(Code, Attr, Dict2, NumLabels, NumFuncs, Abst, SourceFile, Opts).
 
 on_load(Fs0, Attr0) ->
     case proplists:get_value(on_load, Attr0) of
 	undefined ->
 	    {Fs0,Attr0};
 	[{Name,0}] ->
-	    Fs = map(fun({function,N,0,Entry,Asm0}) when N =:= Name ->
-			     [{label,_}=L,
-			      {func_info,_,_,_}=Fi,
-			      {label,_}=E|Asm1] = Asm0,
-			     Asm = [L,Fi,E,on_load|Asm1],
-			     {function,N,0,Entry,Asm};
+	    Fs = map(fun({function,N,0,Entry,Is0}) when N =:= Name ->
+			     Is = insert_on_load_instruction(Is0, Entry),
+			     {function,N,0,Entry,Is};
 			(F) ->
 			     F
 		     end, Fs0),
@@ -54,6 +52,13 @@ on_load(Fs0, Attr0) ->
 	    {Fs,Attr}
     end.
 
+insert_on_load_instruction(Is0, Entry) ->
+    {Bef,[{label,Entry}=El|Is]} =
+	splitwith(fun({label,L}) when L =:= Entry -> false;
+		     (_) -> true
+		  end, Is0),
+    Bef ++ [El,on_load|Is].
+
 assemble_1([{function,Name,Arity,Entry,Asm}|T], Exp, Dict0, Acc) ->
     Dict1 = case member({Name,Arity}, Exp) of
 		true ->
@@ -132,7 +137,10 @@ build_file(Code, Attr, Dict, NumLabels, NumFuncs, Abst, SourceFile, Opts) ->
 			   LitTab = iolist_to_binary(zlib:compress(LitTab2)),
 			   chunk(<<"LitT">>, <<(byte_size(LitTab2)):32>>, LitTab)
 		   end,
+
+    %% Create the line chunk.
     
+    LineChunk = chunk(<<"Line">>, build_line_table(Dict)),
 
     %% Create the attributes and compile info chunks.
 
@@ -150,8 +158,11 @@ build_file(Code, Attr, Dict, NumLabels, NumFuncs, Abst, SourceFile, Opts) ->
     %% Create IFF chunk.
 
     Chunks = case member(slim, Opts) of
-		 true -> [Essentials,AttrChunk,AbstChunk];
-		 false -> [Essentials,LocChunk,AttrChunk,CompileChunk,AbstChunk]
+		 true ->
+		     [Essentials,AttrChunk,AbstChunk];
+		 false ->
+		     [Essentials,LocChunk,AttrChunk,
+		      CompileChunk,AbstChunk,LineChunk]
 	     end,
     build_form(<<"BEAM">>, Chunks).
 
@@ -201,6 +212,31 @@ build_attributes(Opts, SourceFile, Attr, Essentials) ->
     Compile = [{options,Opts},{version,?COMPILER_VSN}|Misc],
     {term_to_binary(calc_vsn(Attr, Essentials)),term_to_binary(Compile)}.
 
+build_line_table(Dict) ->
+    {NumLineInstrs,NumFnames0,Fnames0,NumLines,Lines0} =
+	beam_dict:line_table(Dict),
+    NumFnames = NumFnames0 - 1,
+    [_|Fnames1] = Fnames0,
+    Fnames2 = [unicode:characters_to_binary(F) || F <- Fnames1],
+    Fnames = << <<(byte_size(F)):16,F/binary>> || F <- Fnames2 >>,
+    Lines1 = encode_line_items(Lines0, 0),
+    Lines = iolist_to_binary(Lines1),
+    Ver = 0,
+    Bits = 0,
+    <<Ver:32,Bits:32,NumLineInstrs:32,NumLines:32,NumFnames:32,
+     Lines/binary,Fnames/binary>>.
+
+%% encode_line_items([{FnameIndex,Line}], PrevFnameIndex)
+%%  Encode the line items compactly. Tag the FnameIndex with
+%%  an 'a' tag (atom) and only include it when it has changed.
+%%  Tag the line numbers with an 'i' (integer) tag.
+
+encode_line_items([{F,L}|T], F) ->
+    [encode(?tag_i, L)|encode_line_items(T, F)];
+encode_line_items([{F,L}|T], _) ->
+    [encode(?tag_a, F),encode(?tag_i, L)|encode_line_items(T, F)];
+encode_line_items([], _) -> [].
+
 %%
 %% If the attributes contains no 'vsn' attribute, we'll insert one
 %% with an MD5 "checksum" calculated on the code as its value.
@@ -243,6 +279,9 @@ bif_type(_, 2)      -> bif2.
 
 make_op({'%',_}, Dict) ->
     {[],Dict};
+make_op({line,Location}, Dict0) ->
+    {Index,Dict} = beam_dict:line(Location, Dict0),
+    encode_op(line, [Index], Dict);
 make_op({bif, Bif, {f,_}, [], Dest}, Dict) ->
     %% BIFs without arguments cannot fail.
     encode_op(bif0, [{extfunc, erlang, Bif, 0}, Dest], Dict);
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index c45874597a..432d1e7eea 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -36,13 +36,14 @@ function({function,Name,Arity,CLabel,Is0}, Lc0) ->
 
 	%% Collect basic blocks and optimize them.
 	Is2 = blockify(Is1),
-	Is3 = move_allocates(Is2),
-	Is4 = beam_utils:live_opt(Is3),
-	Is5 = opt_blocks(Is4),
-	Is6 = beam_utils:delete_live_annos(Is5),
+	Is3 = embed_lines(Is2),
+	Is4 = move_allocates(Is3),
+	Is5 = beam_utils:live_opt(Is4),
+	Is6 = opt_blocks(Is5),
+	Is7 = beam_utils:delete_live_annos(Is6),
 
 	%% Optimize bit syntax.
-	{Is,Lc} = bsm_opt(Is6, Lc0),
+	{Is,Lc} = bsm_opt(Is7, Lc0),
 
 	%% Done.
 	{{function,Name,Arity,CLabel,Is},Lc}
@@ -148,6 +149,24 @@ collect(remove_message)      -> {set,[],[],remove_message};
 collect({'catch',R,L})       -> {set,[R],[],{'catch',L}};
 collect(_)                   -> error.
 
+%% embed_lines([Instruction]) -> [Instruction]
+%%  Combine blocks that would be split by line/1 instructions.
+%%  Also move a line instruction before a block into the block,
+%%  but leave the line/1 instruction after a block outside.
+
+embed_lines(Is) ->
+    embed_lines(reverse(Is), []).
+
+embed_lines([{block,B2},{line,_}=Line,{block,B1}|T], Acc) ->
+    B = {block,B1++[{set,[],[],Line}]++B2},
+    embed_lines([B|T], Acc);
+embed_lines([{block,B1},{line,_}=Line|T], Acc) ->
+    B = {block,[{set,[],[],Line}|B1]},
+    embed_lines([B|T], Acc);
+embed_lines([I|Is], Acc) ->
+    embed_lines(Is, [I|Acc]);
+embed_lines([], Acc) -> Acc.
+
 opt_blocks([{block,Bl0}|Is]) ->
     %% The live annotation at the beginning is not useful.
     [{'%live',_}|Bl] = Bl0,
@@ -225,10 +244,12 @@ opt([{set,[Dst],As,{bif,Bif,Fail}}=I1,
  	RevBif -> [{set,[Dst],As,{bif,RevBif,Fail}}|opt(Is)]
     end;
 opt([{set,[X],[X],move}|Is]) -> opt(Is);
-opt([{set,[D1],[{integer,Idx1},Reg],{bif,element,{f,0}}}=I1,
+opt([{set,_,_,{line,_}}=Line1,
+     {set,[D1],[{integer,Idx1},Reg],{bif,element,{f,0}}}=I1,
+     {set,_,_,{line,_}}=Line2,
      {set,[D2],[{integer,Idx2},Reg],{bif,element,{f,0}}}=I2|Is])
   when Idx1 < Idx2, D1 =/= D2, D1 =/= Reg, D2 =/= Reg ->
-    opt([I2,I1|Is]);
+    opt([Line2,I2,Line1,I1|Is]);
 opt([{set,Ds0,Ss,Op}|Is0]) ->	
     {Ds,Is} = opt_moves(Ds0, Is0),
     [{set,Ds,Ss,Op}|opt(Is)];
diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl
index 415864b8e9..1217f7f777 100644
--- a/lib/compiler/src/beam_bsm.erl
+++ b/lib/compiler/src/beam_bsm.erl
@@ -20,7 +20,7 @@
 -module(beam_bsm).
 -export([module/2,format_error/1]).
 
--import(lists, [member/2,foldl/3,reverse/1,sort/1,all/2]).
+-import(lists, [member/2,foldl/3,reverse/1,sort/1,all/2,dropwhile/2]).
 
 %%%
 %%% We optimize bit syntax matching where the tail end of a binary is
@@ -376,6 +376,8 @@ btb_reaches_match_2([{func_info,_,_,Arity}=I|_], Regs0, D) ->
 	[] -> D;
 	_ -> {binary_used_in,I}
     end;
+btb_reaches_match_2([{line,_}|Is], Regs, D) ->
+    btb_reaches_match_1(Is, Regs, D);
 btb_reaches_match_2([I|_], Regs, _) ->
     btb_error({btb_context_regs(Regs),I,not_handled}).
 
@@ -580,7 +582,10 @@ btb_index(Fs) ->
     btb_index_1(Fs, []).
 
 btb_index_1([{function,_,_,Entry,Is0}|Fs], Acc0) ->
-    [{label,_},{func_info,_,_,_},{label,Entry}|Is] = Is0,
+    [{label,Entry}|Is] =
+	dropwhile(fun({label,L}) when L =:= Entry -> false;
+		     (_) -> true
+		  end, Is0),
     Acc = btb_index_2(Is, Entry, false, Acc0),
     btb_index_1(Fs, Acc);
 btb_index_1([], Acc) -> gb_trees:from_orddict(sort(Acc)).
diff --git a/lib/compiler/src/beam_clean.erl b/lib/compiler/src/beam_clean.erl
index 64c93e11f7..a7994ab3b3 100644
--- a/lib/compiler/src/beam_clean.erl
+++ b/lib/compiler/src/beam_clean.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -23,9 +23,9 @@
 -export([module/2]).
 -export([bs_clean_saves/1]).
 -export([clean_labels/1]).
--import(lists, [map/2,foldl/3,reverse/1]).
+-import(lists, [map/2,foldl/3,reverse/1,filter/2]).
 
-module({Mod,Exp,Attr,Fs0,_}, _Opt) ->
+module({Mod,Exp,Attr,Fs0,_}, Opts) ->
     Order = [Lbl || {function,_,_,Lbl,_} <- Fs0],
     All = foldl(fun({function,_,_,Lbl,_}=Func,D) -> dict:store(Lbl, Func, D) end,
 		dict:new(), Fs0),
@@ -33,7 +33,8 @@ module({Mod,Exp,Attr,Fs0,_}, _Opt) ->
     Used = find_all_used(WorkList, All, sets:from_list(WorkList)),
     Fs1 = remove_unused(Order, Used, All),
     {Fs2,Lc} = clean_labels(Fs1),
-    Fs = bs_fix(Fs2),
+    Fs3 = bs_fix(Fs2),
+    Fs = maybe_remove_lines(Fs3, Opts),
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
 %% Remove all bs_save2/2 instructions not referenced by a bs_restore2/2.
@@ -375,3 +376,20 @@ bs_clean_saves_1([{bs_save2,_,{_,_}=SavePoint}=I|Is], Needed, Acc) ->
 bs_clean_saves_1([I|Is], Needed, Acc) ->
     bs_clean_saves_1(Is, Needed, [I|Acc]);
 bs_clean_saves_1([], _, Acc) -> reverse(Acc).
+
+%%%
+%%% Remove line instructions if requested.
+%%%
+
+maybe_remove_lines(Fs, Opts) ->
+    case proplists:get_bool(no_line_info, Opts) of
+	false -> Fs;
+	true -> remove_lines(Fs)
+    end.
+
+remove_lines([{function,N,A,Lbl,Is0}|T]) ->
+    Is = filter(fun({line,_}) -> false;
+		   (_)  -> true
+		end, Is0),
+    [{function,N,A,Lbl,Is}|remove_lines(T)];
+remove_lines([]) -> [].
diff --git a/lib/compiler/src/beam_dead.erl b/lib/compiler/src/beam_dead.erl
index 1365f3d20a..9f81a6ab43 100644
--- a/lib/compiler/src/beam_dead.erl
+++ b/lib/compiler/src/beam_dead.erl
@@ -144,9 +144,9 @@ function({function,Name,Arity,CLabel,Is0}, Lc0) ->
 	%% Initialize label information with the code
 	%% for the func_info label. Without it, a register
 	%% may seem to be live when it is not.
-	[{label,L},{func_info,_,_,_}=FI|_] = Is1,
+	[{label,L}|FiIs] = Is1,
 	D0 = beam_utils:empty_label_index(),
-	D = beam_utils:index_label(L, [FI], D0),
+	D = beam_utils:index_label(L, FiIs, D0),
 
 	%% Optimize away dead code.
 	{Is2,Lc} = forward(Is1, Lc0),
@@ -185,6 +185,8 @@ split_block([{set,[R],As,{alloc,Live,{gc_bif,N,{f,Lbl}=Fail}}}|Is], Bl, Acc)
     split_block(Is, [], [{gc_bif,N,Fail,Live,As,R}|make_block(Bl, Acc)]);
 split_block([{set,[R],[],{'catch',L}}|Is], Bl, Acc) ->
     split_block(Is, [], [{'catch',R,L}|make_block(Bl, Acc)]);
+split_block([{set,[],[],{line,_}=Line}|Is], Bl, Acc) ->
+    split_block(Is, [], [Line|make_block(Bl, Acc)]);
 split_block([I|Is], Bl, Acc) ->
     split_block(Is, [I|Bl], Acc);
 split_block([], Bl, Acc) -> make_block(Bl, Acc).
@@ -406,7 +408,7 @@ backward([{test,Op,{f,To0},Live,Ops0,Dst}|Is], D, Acc) ->
 	 end,
     I = {test,Op,{f,To},Live,Ops0,Dst},
     backward(Is, D, [I|Acc]);
-backward([{kill,_}=I|Is], D, [Exit|_]=Acc) ->
+backward([{kill,_}=I|Is], D, [{line,_},Exit|_]=Acc) ->
     case beam_jump:is_exit_instruction(Exit) of
 	false -> backward(Is, D, [I|Acc]);
 	true -> backward(Is, D, Acc)
@@ -471,7 +473,7 @@ shortcut_fail_label(To0, Reg, Val, D) ->
 
 shortcut_boolean_label(To0, Reg, Bool0, D) when is_boolean(Bool0) ->
     case beam_utils:code_at(To0, D) of
-	[{bif,'not',_,[Reg],Reg},{jump,{f,To}}|_] ->
+	[{line,_},{bif,'not',_,[Reg],Reg},{jump,{f,To}}|_] ->
 	    Bool = not Bool0,
 	    {shortcut_select_label(To, Reg, Bool, D),Bool};
 	_ ->
diff --git a/lib/compiler/src/beam_dict.erl b/lib/compiler/src/beam_dict.erl
index c50ed28aa9..ee76623976 100644
--- a/lib/compiler/src/beam_dict.erl
+++ b/lib/compiler/src/beam_dict.erl
@@ -22,9 +22,10 @@
 
 -export([new/0,opcode/2,highest_opcode/1,
 	 atom/2,local/4,export/4,import/4,
-	 string/2,lambda/5,literal/2,
+	 string/2,lambda/5,literal/2,line/2,fname/2,
 	 atom_table/1,local_table/1,export_table/1,import_table/1,
-	 string_table/1,lambda_table/1,literal_table/1]).
+	 string_table/1,lambda_table/1,literal_table/1,
+	 line_table/1]).
 
 -type label() :: non_neg_integer().
 
@@ -36,6 +37,9 @@
 	 strings = <<>>		    :: binary(),	%String pool
 	 lambdas = [],				%[{...}]
 	 literals = dict:new()	    :: dict(),	%Format: {Literal,Number}
+	 fnames = gb_trees:empty()  :: gb_tree(),       %{Name,Index}
+	 lines = gb_trees:empty()   :: gb_tree(),	%{{Fname,Line},Index}
+	 num_lines = 0		    :: non_neg_integer(), %Number of line instructions
 	 next_import = 0	    :: non_neg_integer(),
 	 string_offset = 0	    :: non_neg_integer(),
 	 next_literal = 0	    :: non_neg_integer(),
@@ -152,6 +156,36 @@ literal(Lit, #asm{literals=Tab0,next_literal=NextIndex}=Dict) ->
 	    {NextIndex,Dict#asm{literals=Tab,next_literal=NextIndex+1}}
     end.
 
+%% Returns the index for a line instruction (adding information
+%% to the location information table).
+-spec line(list(), bdict()) -> {non_neg_integer(), bdict()}.
+
+line([], #asm{num_lines=N}=Dict) ->
+    %% No location available. Return the special pre-defined
+    %% index 0.
+    {0,Dict#asm{num_lines=N+1}};
+line([{location,Name,Line}], #asm{lines=Lines0,num_lines=N}=Dict0) ->
+    {FnameIndex,Dict1} = fname(Name, Dict0),
+    case gb_trees:lookup({FnameIndex,Line}, Lines0) of
+	{value,Index} ->
+	    {Index,Dict1#asm{num_lines=N+1}};
+	none ->
+	    Index = gb_trees:size(Lines0) + 1,
+	    Lines = gb_trees:insert({FnameIndex,Line}, Index, Lines0),
+	    Dict = Dict1#asm{lines=Lines,num_lines=N+1},
+	    {Index,Dict}
+    end.
+
+fname(Name, #asm{fnames=Fnames0}=Dict) ->
+    case gb_trees:lookup(Name, Fnames0) of
+	{value,Index} ->
+	    {Index,Dict};
+	none ->
+	    Index = gb_trees:size(Fnames0),
+	    Fnames = gb_trees:insert(Name, Index, Fnames0),
+	    {Index,Dict#asm{fnames=Fnames}}
+    end.
+
 %% Returns the atom table.
 %%    atom_table(Dict) -> {LastIndex,[Length,AtomString...]}
 -spec atom_table(bdict()) -> {non_neg_integer(), [[non_neg_integer(),...]]}.
@@ -219,6 +253,21 @@ literal_table(#asm{literals=Tab,next_literal=NumLiterals}) ->
 my_term_to_binary(Term) ->
     term_to_binary(Term, [{minor_version,1}]).
 
+%% Return the line table.
+-spec line_table(bdict()) ->
+    {non_neg_integer(),				%Number of line instructions.
+     non_neg_integer(),[string()],
+     non_neg_integer(),[{non_neg_integer(),non_neg_integer()}]}.
+
+line_table(#asm{fnames=Fnames0,lines=Lines0,num_lines=NumLineInstrs}) ->
+    NumFnames = gb_trees:size(Fnames0),
+    Fnames1 = lists:keysort(2, gb_trees:to_list(Fnames0)),
+    Fnames = [Name || {Name,_} <- Fnames1],
+    NumLines = gb_trees:size(Lines0),
+    Lines1 = lists:keysort(2, gb_trees:to_list(Lines0)),
+    Lines = [L || {L,_} <- Lines1],
+    {NumLineInstrs,NumFnames,Fnames,NumLines,Lines}.
+
 %% Search for binary string Str in the binary string pool Pool.
 %%    old_string(Str, Pool) -> none | Index
 -spec old_string(binary(), binary()) -> 'none' | pos_integer().
diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl
index 017ca129b0..7103d2390f 100644
--- a/lib/compiler/src/beam_disasm.erl
+++ b/lib/compiler/src/beam_disasm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -204,7 +204,7 @@ process_chunks(F) ->
 optional_chunk(F, ChunkTag) ->
     case beam_lib:chunks(F, [ChunkTag]) of
 	{ok,{_Module,[{ChunkTag,Chunk}]}} -> Chunk;
-	{error,beam_lib,{missing_chunk,_,ChunkTag}} -> none
+	{error,beam_lib,{missing_chunk,_,_}} -> none
     end.
 
 %%-----------------------------------------------------------------------
@@ -296,6 +296,8 @@ get_function_chunks(Code) ->
 labels_r([], R) -> {R, []};
 labels_r([{label,_}=I|Is], R) ->
     labels_r(Is, [I|R]);
+labels_r([{line,_}=I|Is], R) ->
+    labels_r(Is, [I|R]);
 labels_r(Is, R) -> {R, Is}.
 
 get_funs({[],[]}) -> [];
@@ -335,20 +337,17 @@ local_labels(Funs) ->
 				   local_labels_1(function__code(F), R)
 			   end, [], Funs)).
 
-%% The first clause below attempts to provide some (limited form of)
-%% backwards compatibility; it is not needed for .beam files generated
-%% by the R8 compiler.  The clause should one fine day be taken out.
-local_labels_1([{label,_}|[{label,_}|_]=Code], R) ->
-    local_labels_1(Code, R);
-local_labels_1([{label,_},{func_info,{atom,M},{atom,F},A}|Code], R)
-  when is_atom(M), is_atom(F) ->
-    local_labels_2(Code, R, M, F, A);
-local_labels_1(Code, _) ->
-    ?exit({'local_labels: no label in code',Code}).
+local_labels_1(Code0, R) ->
+    Code1 = lists:dropwhile(fun({label,_}) -> true;
+			       ({line,_}) -> true;
+			       ({func_info,_,_,_}) -> false
+			    end, Code0),
+    [{func_info,{atom,M},{atom,F},A}|Code] = Code1,
+    local_labels_2(Code, R, {M,F,A}).
 
-local_labels_2([{label,[{u,L}]}|Code], R, M, F, A) ->
-    local_labels_2(Code, [{L,{M,F,A}}|R], M, F, A);
-local_labels_2(_, R, _, _, _) -> R.
+local_labels_2([{label,[{u,L}]}|Code], R, MFA) ->
+    local_labels_2(Code, [{L,MFA}|R], MFA);
+local_labels_2(_, R, _) -> R.
 
 %%-----------------------------------------------------------------------
 %% Disassembles a single BEAM instruction; most instructions are handled
@@ -1105,6 +1104,12 @@ resolve_inst({recv_set,[Lbl]},_,_,_) ->
     {recv_set,Lbl};
 
 %%
+%% R15A.
+%%
+resolve_inst({line,[Index]},_,_,_) ->
+    {line,resolve_arg(Index)};
+
+%%
 %% Catches instructions that are not yet handled.
 %%
 resolve_inst(X,_,_,_) -> ?exit({resolve_inst,X}).
diff --git a/lib/compiler/src/beam_jump.erl b/lib/compiler/src/beam_jump.erl
index 3cab55c4cb..537f8ca81b 100644
--- a/lib/compiler/src/beam_jump.erl
+++ b/lib/compiler/src/beam_jump.erl
@@ -169,7 +169,7 @@ share_1([{label,L}=Lbl|Is], Dict0, Seq, Acc) ->
 	    share_1(Is, Dict0, [], [Lbl,{jump,{f,Label}}|Acc])
     end;
 share_1([{func_info,_,_,_}=I|Is], _, [], Acc) ->
-    Is++[I|Acc];
+    reverse(Is, [I|Acc]);
 share_1([I|Is], Dict, Seq, Acc) ->
     case is_unreachable_after(I) of
 	false ->
@@ -206,25 +206,35 @@ is_label(_) -> false.
 move(Is) ->
     move_1(Is, [], []).
 
-move_1([I|Is], End, Acc) ->
+move_1([I|Is], End0, Acc0) ->
     case is_exit_instruction(I) of
-	false -> move_1(Is, End, [I|Acc]);
-	true -> move_2(I, Is, End, Acc)
+	false ->
+	    move_1(Is, End0, [I|Acc0]);
+	true ->
+	    case extract_seq(Acc0, [I|End0]) of
+		no ->
+		    move_1(Is, End0, [I|Acc0]);
+		{yes,End,Acc} ->
+		    move_1(Is, End, Acc)
+	    end
     end;
-move_1([], End, Acc) ->
-    reverse(Acc, reverse(End)).
-
-move_2(Exit, Is, End, [{block,_},{label,_},{func_info,_,_,_}|_]=Acc) ->
-    move_1(Is, End, [Exit|Acc]);
-move_2(Exit, Is, End, [{block,_}=Blk,{label,_}=Lbl,Unreachable|More]) ->
-    move_1([Unreachable|Is], [Exit,Blk,Lbl|End], More);
-move_2(Exit, Is, End, [{bs_context_to_binary,_}=Bs,{label,_}=Lbl,
-		       Unreachable|More]) ->
-    move_1([Unreachable|Is], [Exit,Bs,Lbl|End], More);
-move_2(Exit, Is, End, [{label,_}=Lbl,Unreachable|More]) ->
-    move_1([Unreachable|Is], [Exit,Lbl|End], More);
-move_2(Exit, Is, End, Acc) ->
-    move_1(Is, End, [Exit|Acc]).
+move_1([], End, Acc) -> reverse(Acc, End).
+
+extract_seq([{line,_}=Line|Is], Acc) ->
+    extract_seq(Is, [Line|Acc]);
+extract_seq([{block,_}=Bl|Is], Acc) ->
+    extract_seq_1(Is, [Bl|Acc]);
+extract_seq([{label,_}|_]=Is, Acc) ->
+    extract_seq_1(Is, Acc);
+extract_seq(_, _) -> no.
+
+extract_seq_1([{line,_}=Line|Is], Acc) ->
+    extract_seq_1(Is, [Line|Acc]);
+extract_seq_1([{label,_},{func_info,_,_,_}|_], _) ->
+    no;
+extract_seq_1([{label,_}=Lbl|Is], Acc) ->
+    {yes,[Lbl|Acc],Is};
+extract_seq_1(_, _) -> no.
 
 %%%
 %%% (3) (4) (5) (6) Jump and unreachable code optimizations.
@@ -454,6 +464,7 @@ is_label_used_in_2({set,_,_,Info}, Lbl) ->
 	{put_tuple,_} -> false;
 	{get_tuple_element,_} -> false;
 	{set_tuple_element,_} -> false;
+	{line,_} -> false;
 	_ when is_atom(Info) -> false
     end.
 
@@ -487,6 +498,8 @@ rem_unused([], _, Acc) -> reverse(Acc).
 initial_labels(Is) ->
     initial_labels(Is, []).
 
+initial_labels([{line,_}|Is], Acc) ->
+    initial_labels(Is, Acc);
 initial_labels([{label,Lbl}|Is], Acc) ->
     initial_labels(Is, [Lbl|Acc]);
 initial_labels([{func_info,_,_,_},{label,Lbl}|_], Acc) ->
diff --git a/lib/compiler/src/beam_listing.erl b/lib/compiler/src/beam_listing.erl
index be7b14c3dd..2941f6135c 100644
--- a/lib/compiler/src/beam_listing.erl
+++ b/lib/compiler/src/beam_listing.erl
@@ -61,7 +61,7 @@ print_op(Stream, Label) when element(1, Label) == label ->
 print_op(Stream, Op) ->
     io:format(Stream, "    ~p.\n", [Op]).
 
-function(File, {function,Name,Arity,Args,Body,Vdb}) ->
+function(File, {function,Name,Arity,Args,Body,Vdb,_Anno}) ->
     io:nl(File),
     io:format(File, "function ~p/~p.\n", [Name,Arity]),
     io:format(File, " ~p.\n", [Args]),
diff --git a/lib/compiler/src/beam_receive.erl b/lib/compiler/src/beam_receive.erl
index 9ed44ad5d7..c483d85a97 100644
--- a/lib/compiler/src/beam_receive.erl
+++ b/lib/compiler/src/beam_receive.erl
@@ -175,6 +175,8 @@ opt_update_regs({label,Lbl}, R, L) ->
     end;
 opt_update_regs({try_end,_}, R, L) ->
     {R,L};
+opt_update_regs({line,_}, R, L) ->
+    {R,L};
 opt_update_regs(_I, _R, L) ->
     %% Unrecognized instruction. Abort the search.
     {regs_init(),L}.
diff --git a/lib/compiler/src/beam_trim.erl b/lib/compiler/src/beam_trim.erl
index 790aba0a9a..25e6ffbb73 100644
--- a/lib/compiler/src/beam_trim.erl
+++ b/lib/compiler/src/beam_trim.erl
@@ -222,7 +222,9 @@ remap([{call_last,Ar,Name,N}|Is], Map, Acc) ->
     reverse(Acc, [I|Is]);
 remap([{call_ext_last,Ar,Name,N}|Is], Map, Acc) ->
     I = {call_ext_last,Ar,Name,Map({frame_size,N})},
-    reverse(Acc, [I|Is]).
+    reverse(Acc, [I|Is]);
+remap([{line,_}=I|Is], Map, Acc) ->
+    remap(Is, Map, [I|Acc]).
     
 remap_block([{set,Ds0,Ss0,Info}|Is], Map, Acc) ->
     Ds = [Map(D) || D <- Ds0],
@@ -230,14 +232,15 @@ remap_block([{set,Ds0,Ss0,Info}|Is], Map, Acc) ->
     remap_block(Is, Map, [{set,Ds,Ss,Info}|Acc]);
 remap_block([], _, Acc) -> reverse(Acc).
     
-safe_labels([{label,L},{badmatch,{Tag,_}}|Is], Acc) when Tag =/= y ->
+safe_labels([{label,L},{line,_},{badmatch,{Tag,_}}|Is], Acc) when Tag =/= y ->
     safe_labels(Is, [L|Acc]);
-safe_labels([{label,L},{case_end,{Tag,_}}|Is], Acc) when Tag =/= y ->
+safe_labels([{label,L},{line,_},{case_end,{Tag,_}}|Is], Acc) when Tag =/= y ->
     safe_labels(Is, [L|Acc]);
-safe_labels([{label,L},if_end|Is], Acc) ->
+safe_labels([{label,L},{line,_},if_end|Is], Acc) ->
     safe_labels(Is, [L|Acc]);
 safe_labels([{label,L},
 	     {block,[{set,[{x,0}],[{Tag,_}],move}]},
+	     {line,_},
 	     {call_ext,1,{extfunc,erlang,error,1}}|Is], Acc) when Tag =/= y ->
     safe_labels(Is, [L|Acc]);
 safe_labels([_|Is], Acc) ->
@@ -321,6 +324,8 @@ frame_size([{make_fun2,_,_,_,_}|Is], Safe) ->
 frame_size([{deallocate,N}|_], _) -> N;
 frame_size([{call_last,_,_,N}|_], _) -> N;
 frame_size([{call_ext_last,_,_,N}|_], _) -> N;
+frame_size([{line,_}|Is], Safe) ->
+    frame_size(Is, Safe);
 frame_size([_|_], _) -> throw(not_possible).
 
 frame_size_branch(0, Is, Safe) ->
diff --git a/lib/compiler/src/beam_type.erl b/lib/compiler/src/beam_type.erl
index f83f73b224..7fdb8d072a 100644
--- a/lib/compiler/src/beam_type.erl
+++ b/lib/compiler/src/beam_type.erl
@@ -400,6 +400,7 @@ update({call_ext,3,{extfunc,erlang,setelement,3}}, Ts0) ->
 update({call,_Arity,_Func}, Ts) -> tdb_kill_xregs(Ts);
 update({call_ext,_Arity,_Func}, Ts) -> tdb_kill_xregs(Ts);
 update({make_fun2,_,_,_,_}, Ts) -> tdb_kill_xregs(Ts);
+update({line,_}, Ts) -> Ts;
 
 %% The instruction is unknown.  Kill all information.
 update(_I, _Ts) -> tdb_new().
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index 45cdf8a659..f281ad5eac 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -26,7 +26,7 @@
 	 code_at/2,bif_to_test/3,is_pure_test/1,
 	 live_opt/1,delete_live_annos/1,combine_heap_needs/2]).
 
--import(lists, [member/2,sort/1,reverse/1]).
+-import(lists, [member/2,sort/1,reverse/1,splitwith/2]).
 
 -record(live,
 	{bl,					%Block check fun.
@@ -195,10 +195,14 @@ is_pure_test({test,Op,_,Ops}) ->
 %%  Also insert {'%live',Live} annotations at the beginning
 %%  and end of each block.
 %%
-live_opt([{label,Fail}=I1,
-	  {func_info,_,_,Live}=I2|Is]) ->
+live_opt(Is0) ->
+    {[{label,Fail}|_]=Bef,[Fi|Is]} =
+	splitwith(fun({func_info,_,_,_}) -> false;
+		     (_) -> true
+		  end, Is0),
+    {func_info,_,_,Live} = Fi,
     D = gb_trees:insert(Fail, live_call(Live), gb_trees:empty()),
-    [I1,I2|live_opt(reverse(Is), 0, D, [])].
+    Bef ++ [Fi|live_opt(reverse(Is), 0, D, [])].
 
 
 %% delete_live_annos([Instruction]) -> [Instruction].
@@ -499,6 +503,8 @@ check_liveness(R, [{loop_rec,{f,_},{x,0}}|_], St) ->
     end;
 check_liveness(R, [{loop_rec_end,{f,Fail}}|_], St) ->
     check_liveness_at(R, Fail, St);
+check_liveness(R, [{line,_}|Is], St) ->
+    check_liveness(R, Is, St);
 check_liveness(_R, Is, St) when is_list(Is) ->
 %%     case Is of
 %% 	[I|_] ->
@@ -799,6 +805,8 @@ live_opt([{wait,_}=I|Is], Regs, D, Acc) ->
     live_opt(Is, Regs, D, [I|Acc]);
 live_opt([{wait_timeout,_,{Tag,_}}=I|Is], Regs, D, Acc) when Tag =/= x ->
     live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{line,_}=I|Is], Regs, D, Acc) ->
+    live_opt(Is, Regs, D, [I|Acc]);
 
 %% The following instructions can occur if the "compilation" has been
 %% started from a .S file using the 'asm' option.
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index fb267b35b6..fe3b1680d9 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -166,12 +166,17 @@ validate(Module, Fs) ->
     Ft = index_bs_start_match(Fs, []),
     validate_0(Module, Fs, Ft).
 
-index_bs_start_match([{function,_,_,Entry,Code}|Fs], Acc0) ->
+index_bs_start_match([{function,_,_,Entry,Code0}|Fs], Acc0) ->
+    Code = dropwhile(fun({label,L}) when L =:= Entry -> false;
+			(_) -> true
+		     end, Code0),
     case Code of
-	[_,_,{label,Entry}|Is] ->
+	[{label,Entry}|Is] ->
 	    Acc = index_bs_start_match_1(Is, Entry, Acc0),
 	    index_bs_start_match(Fs, Acc);
 	_ ->
+	    %% Something serious is wrong. Ignore it for now.
+	    %% It will be detected and diagnosed later.
 	    index_bs_start_match(Fs, Acc0)
     end;
 index_bs_start_match([], Acc) ->
@@ -292,6 +297,8 @@ labels(Is) ->
 
 labels_1([{label,L}|Is], R) ->
     labels_1(Is, [L|R]);
+labels_1([{line,_}|Is], R) ->
+    labels_1(Is, R);
 labels_1(Is, R) ->
     {lists:reverse(R),Is}.
 
@@ -433,6 +440,8 @@ valfun_1(remove_message, Vst) ->
     Vst;
 valfun_1({'%',_}, Vst) ->
     Vst;
+valfun_1({line,_}, Vst) ->
+    Vst;
 %% Exception generating calls
 valfun_1({call_ext,Live,Func}=I, Vst) ->
     case return_type(Func, Vst) of
@@ -870,6 +879,8 @@ val_dsetel({set_tuple_element,_,_,_}, #vst{current=#st{setelem=false}}) ->
     error(illegal_context_for_set_tuple_element);
 val_dsetel({set_tuple_element,_,_,_}, #vst{current=#st{setelem=true}}=Vst) ->
     Vst;
+val_dsetel({line,_}, Vst) ->
+    Vst;
 val_dsetel(_, #vst{current=#st{setelem=true}=St}=Vst) ->
     Vst#vst{current=St#st{setelem=false}};
 val_dsetel(_, Vst) -> Vst.
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index ce8a5bf864..bfa7c6cedd 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -113,7 +113,7 @@ noenv_forms(Forms, Opt) when is_atom(Opt) ->
 
 noenv_output_generated(Opts) ->
     {_,Passes} = passes(file, expand_opts(Opts)),
-    any(fun ({save_binary,_F}) -> true;
+    any(fun ({save_binary,_T,_F}) -> true;
 	    (_Other) -> false
 	end, Passes).
 
@@ -122,6 +122,7 @@ noenv_output_generated(Opts) ->
 %%
 
 -define(pass(P), {P,fun P/1}).
+-define(pass(P,T), {P,fun T/1,fun P/1}).
 
 env_default_opts() ->
     Key = "ERL_COMPILER_OPTIONS",
@@ -171,9 +172,9 @@ expand_opt(report, Os) ->
 expand_opt(return, Os) ->
     [return_errors,return_warnings|Os];
 expand_opt(r12, Os) ->
-    [no_recv_opt|Os];
+    [no_recv_opt,no_line_info|Os];
 expand_opt(r13, Os) ->
-    [no_recv_opt|Os];
+    [no_recv_opt,no_line_info|Os];
 expand_opt({debug_info_key,_}=O, Os) ->
     [encrypt_debug_info,O|Os];
 expand_opt(no_float_opt, Os) ->
@@ -304,7 +305,7 @@ run_tc({Name,Fun}, St) ->
     Val.
 
 comp_ret_ok(#compile{code=Code,warnings=Warn0,module=Mod,options=Opts}=St) ->
-    case member(warnings_as_errors, Opts) andalso length(Warn0) > 0 of
+    case werror(St) of
         true ->
             case member(report_warnings, Opts) of
                 true ->
@@ -339,6 +340,11 @@ comp_ret_err(#compile{warnings=Warn0,errors=Err0,options=Opts}=St) ->
 	false -> error
     end.
 
+not_werror(St) -> not werror(St).
+
+werror(#compile{options=Opts,warnings=Ws}) ->
+    Ws =/= [] andalso member(warnings_as_errors, Opts).
+
 %% messages_per_file([{File,[Message]}]) -> [{File,[Message]}]
 messages_per_file(Ms) ->
     T = lists:sort([{File,M} || {File,Messages} <- Ms, M <- Messages]),
@@ -373,7 +379,7 @@ passes(Type, Opts) ->
     %% insert a first pass to remove the file (unless the
     %% source file is a BEAM file).
     {Ext,case last(Passes) of
-	     {save_binary,_Fun} ->
+	     {save_binary,_TestFun,_Fun} ->
 		 case Passes of
 		     [{read_beam_file,_}|_] ->
 			 %% The BEAM is both input and output.
@@ -655,7 +661,7 @@ asm_passes() ->
 
 binary_passes() ->
     [{native_compile,fun test_native/1,fun native_compile/1},
-     {unless,binary,?pass(save_binary)}].
+     {unless,binary,?pass(save_binary,not_werror)}].
 
 %%%
 %%% Compiler passes.
@@ -1379,28 +1385,34 @@ report_errors(#compile{options=Opts,errors=Errors}) ->
     end.
 
 report_warnings(#compile{options=Opts,warnings=Ws0}) ->
-    case member(report_warnings, Opts) of
+    Werror = member(warnings_as_errors, Opts),
+    P = case Werror of
+	    true -> "";
+	    false -> "Warning: "
+	end,
+    ReportWerror = Werror andalso member(report_errors, Opts),
+    case member(report_warnings, Opts) orelse ReportWerror of
 	true ->
-	    Ws1 = flatmap(fun({{F,_L},Eds}) -> format_message(F, Eds);
-			     ({F,Eds}) -> format_message(F, Eds) end,
+	    Ws1 = flatmap(fun({{F,_L},Eds}) -> format_message(F, P, Eds);
+			     ({F,Eds}) -> format_message(F, P, Eds) end,
 			  Ws0),
 	    Ws = lists:sort(Ws1),
 	    foreach(fun({_,Str}) -> io:put_chars(Str) end, Ws);
 	false -> ok
     end.
 
-format_message(F, [{{Line,Column}=Loc,Mod,E}|Es]) ->
-    M = {{F,Loc},io_lib:format("~s:~w:~w Warning: ~s\n",
-                                [F,Line,Column,Mod:format_error(E)])},
-    [M|format_message(F, Es)];
-format_message(F, [{Line,Mod,E}|Es]) ->
-    M = {{F,{Line,0}},io_lib:format("~s:~w: Warning: ~s\n",
-                                [F,Line,Mod:format_error(E)])},
-    [M|format_message(F, Es)];
-format_message(F, [{Mod,E}|Es]) ->
-    M = {none,io_lib:format("~s: Warning: ~s\n", [F,Mod:format_error(E)])},
-    [M|format_message(F, Es)];
-format_message(_, []) -> [].
+format_message(F, P, [{{Line,Column}=Loc,Mod,E}|Es]) ->
+    M = {{F,Loc},io_lib:format("~s:~w:~w ~s~s\n",
+                                [F,Line,Column,P,Mod:format_error(E)])},
+    [M|format_message(F, P, Es)];
+format_message(F, P, [{Line,Mod,E}|Es]) ->
+    M = {{F,{Line,0}},io_lib:format("~s:~w: ~s~s\n",
+                                [F,Line,P,Mod:format_error(E)])},
+    [M|format_message(F, P, Es)];
+format_message(F, P, [{Mod,E}|Es]) ->
+    M = {none,io_lib:format("~s: ~s~s\n", [F,P,Mod:format_error(E)])},
+    [M|format_message(F, P, Es)];
+format_message(_, _, []) -> [].
 
 %% list_errors(File, ErrorDescriptors) -> ok
 
@@ -1426,6 +1438,8 @@ iofile(File) when is_atom(File) ->
 iofile(File) ->
     {filename:dirname(File), filename:basename(File, ".erl")}.
 
+erlfile(".", Base, Suffix) ->
+    Base ++ Suffix;
 erlfile(Dir, Base, Suffix) ->
     filename:join(Dir, Base ++ Suffix).
 
@@ -1498,6 +1512,8 @@ restore_expand_module([{attribute,Line,opaque,[Type]}|Fs]) ->
     [{attribute,Line,opaque,Type}|restore_expand_module(Fs)];
 restore_expand_module([{attribute,Line,spec,[Arg]}|Fs]) ->
     [{attribute,Line,spec,Arg}|restore_expand_module(Fs)];
+restore_expand_module([{attribute,Line,callback,[Arg]}|Fs]) ->
+    [{attribute,Line,callback,Arg}|restore_expand_module(Fs)];
 restore_expand_module([F|Fs]) ->
     [F|restore_expand_module(Fs)];
 restore_expand_module([]) -> [].
diff --git a/lib/compiler/src/erl_bifs.erl b/lib/compiler/src/erl_bifs.erl
index f8128702dd..2514c06360 100644
--- a/lib/compiler/src/erl_bifs.erl
+++ b/lib/compiler/src/erl_bifs.erl
@@ -72,7 +72,6 @@ is_pure(erlang, binary_to_list, 1) -> true;
 is_pure(erlang, binary_to_list, 3) -> true;
 is_pure(erlang, bit_size, 1) -> true;
 is_pure(erlang, byte_size, 1) -> true;
-is_pure(erlang, concat_binary, 1) -> true;
 is_pure(erlang, element, 2) -> true;
 is_pure(erlang, float, 1) -> true;
 is_pure(erlang, float_to_list, 1) -> true;
diff --git a/lib/compiler/src/genop.tab b/lib/compiler/src/genop.tab
index 63527bda8f..39c1e8297f 100644
--- a/lib/compiler/src/genop.tab
+++ b/lib/compiler/src/genop.tab
@@ -280,3 +280,7 @@ BEAM_FORMAT_NUMBER=0
 150: recv_mark/1
 151: recv_set/1
 152: gc_bif3/7
+
+# R15A
+
+153: line/1
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl
index 480954adac..0fa1fea09f 100644
--- a/lib/compiler/src/sys_pre_expand.erl
+++ b/lib/compiler/src/sys_pre_expand.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -43,6 +43,7 @@
                  mod_imports,                   %Module Imports
                  compile=[],                    %Compile flags
                  attributes=[],                 %Attributes
+                 callbacks=[],                  %Callbacks
                  defined=[],                    %Defined functions
                  vcount=0,                      %Variable counter
                  func=[],                       %Current function
@@ -172,10 +173,41 @@ define_functions(Forms, #expand{defined=Predef}=St) ->
                end, Predef, Forms),
     St#expand{defined=ordsets:from_list(Fs)}.
 
-module_attrs(St) ->
-    {[{attribute,Line,Name,Val} || {Name,Line,Val} <- St#expand.attributes],St}.
+module_attrs(#expand{attributes=Attributes}=St) ->
+    Attrs = [{attribute,Line,Name,Val} || {Name,Line,Val} <- Attributes],
+    Callbacks = [Callback || {_,_,callback,_}=Callback <- Attrs],
+    {Attrs,St#expand{callbacks=Callbacks}}.
 
 module_predef_funcs(St) ->
+    {Mpf1,St1}=module_predef_func_beh_info(St),
+    {Mpf2,St2}=module_predef_funcs_mod_info(St1),
+    {Mpf1++Mpf2,St2}.
+
+module_predef_func_beh_info(#expand{callbacks=[]}=St) ->
+    {[], St};
+module_predef_func_beh_info(#expand{callbacks=Callbacks,defined=Defined,
+				    exports=Exports}=St) ->
+    PreDef=[{behaviour_info,1}],
+    PreExp=PreDef,
+    {[gen_beh_info(Callbacks)],
+     St#expand{defined=union(from_list(PreDef), Defined),
+	       exports=union(from_list(PreExp), Exports)}}.
+
+gen_beh_info(Callbacks) ->
+    List = make_list(Callbacks),
+    {function,0,behaviour_info,1,
+     [{clause,0,[{atom,0,callbacks}],[],
+       [List]}]}.
+
+make_list([]) -> {nil,0};
+make_list([{_,_,_,[{{Name,Arity},_}]}|Rest]) ->
+    {cons,0,
+     {tuple,0,
+      [{atom,0,Name},
+       {integer,0,Arity}]},
+     make_list(Rest)}.
+
+module_predef_funcs_mod_info(St) ->
     PreDef = [{module_info,0},{module_info,1}],
     PreExp = PreDef,
     {[{function,0,module_info,0,
@@ -223,10 +255,8 @@ attribute(export, Es, _L, St) ->
     St#expand{exports=union(from_list(Es), St#expand.exports)};
 attribute(import, Is, _L, St) ->
     import(Is, St);
-attribute(compile, C, _L, St) when is_list(C) ->
-    St#expand{compile=St#expand.compile ++ C};
-attribute(compile, C, _L, St) ->
-    St#expand{compile=St#expand.compile ++ [C]};
+attribute(compile, _C, _L, St) ->
+    St;
 attribute(Name, Val, Line, St) when is_list(Val) ->
     St#expand{attributes=St#expand.attributes ++ [{Name,Line,Val}]};
 attribute(Name, Val, Line, St) ->
diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl
index 55e3c58d2a..e7dae67085 100644
--- a/lib/compiler/src/v3_codegen.erl
+++ b/lib/compiler/src/v3_codegen.erl
@@ -79,9 +79,10 @@ module({Mod,Exp,Attr,Forms}, Options) ->
 functions(Forms, AtomMod) ->
     mapfoldl(fun (F, St) -> function(F, AtomMod, St) end, #cg{lcount=1}, Forms).
 
-function({function,Name,Arity,Asm0,Vb,Vdb}, AtomMod, St0) ->
+function({function,Name,Arity,Asm0,Vb,Vdb,Anno}, AtomMod, St0) ->
     try
-	{Asm,EntryLabel,St} = cg_fun(Vb, Asm0, Vdb, AtomMod, {Name,Arity}, St0),
+	{Asm,EntryLabel,St} = cg_fun(Vb, Asm0, Vdb, AtomMod,
+				     {Name,Arity}, Anno, St0),
 	Func = {function,Name,Arity,EntryLabel,Asm},
 	{Func,St}
     catch
@@ -93,7 +94,7 @@ function({function,Name,Arity,Asm0,Vb,Vdb}, AtomMod, St0) ->
 
 %% cg_fun([Lkexpr], [HeadVar], Vdb, State) -> {[Ainstr],State}
 
-cg_fun(Les, Hvs, Vdb, AtomMod, NameArity, St0) ->
+cg_fun(Les, Hvs, Vdb, AtomMod, NameArity, Anno, St0) ->
     {Fi,St1} = new_label(St0),			%FuncInfo label
     {Fl,St2} = local_func_label(NameArity, St1),
 
@@ -129,7 +130,7 @@ cg_fun(Les, Hvs, Vdb, AtomMod, NameArity, St0) ->
 				 ultimate_failure=UltimateMatchFail,
 				 is_top_block=true}),
     {Name,Arity} = NameArity,
-    Asm = [{label,Fi},{func_info,AtomMod,{atom,Name},Arity},
+    Asm = [{label,Fi},line(Anno),{func_info,AtomMod,{atom,Name},Arity},
 	   {label,Fl}|B++[{label,UltimateMatchFail},if_end]],
     {Asm,Fl,St}.
 
@@ -307,23 +308,23 @@ match_fail_cg({badmatch,Term}, Le, Vdb, Bef, St) ->
     R = cg_reg_arg(Term, Bef),
     Int0 = clear_dead(Bef, Le#l.i, Vdb),
     {Sis,Int} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
-    {Sis ++ [{badmatch,R}],
+    {Sis ++ [line(Le),{badmatch,R}],
      Int#sr{reg=clear_regs(Int0#sr.reg)},St};
 match_fail_cg({case_clause,Reason}, Le, Vdb, Bef, St) ->
     R = cg_reg_arg(Reason, Bef),
     Int0 = clear_dead(Bef, Le#l.i, Vdb),
     {Sis,Int} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
-    {Sis++[{case_end,R}],
+    {Sis++[line(Le),{case_end,R}],
      Int#sr{reg=clear_regs(Bef#sr.reg)},St};
 match_fail_cg(if_clause, Le, Vdb, Bef, St) ->
     Int0 = clear_dead(Bef, Le#l.i, Vdb),
     {Sis,Int1} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
-    {Sis++[if_end],Int1#sr{reg=clear_regs(Int1#sr.reg)},St};
+    {Sis++[line(Le),if_end],Int1#sr{reg=clear_regs(Int1#sr.reg)},St};
 match_fail_cg({try_clause,Reason}, Le, Vdb, Bef, St) ->
     R = cg_reg_arg(Reason, Bef),
     Int0 = clear_dead(Bef, Le#l.i, Vdb),
     {Sis,Int} = adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb),
-    {Sis ++ [{try_case_end,R}],
+    {Sis ++ [line(Le),{try_case_end,R}],
      Int#sr{reg=clear_regs(Int0#sr.reg)},St}.
 
 %% bsm_rename_ctx([Clause], Var) -> [Clause]
@@ -1047,7 +1048,7 @@ call_cg({var,_V} = Var, As, Rs, Le, Vdb, Bef, St0) ->
     %% Build complete code and final stack/register state.
     Arity = length(As),
     {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
-    {Sis ++ Frees ++ [{call_fun,Arity}],Aft,
+    {Sis ++ Frees ++ [line(Le),{call_fun,Arity}],Aft,
      need_stack_frame(St0)};
 call_cg({remote,Mod,Name}, As, Rs, Le, Vdb, Bef, St0)
   when element(1, Mod) =:= var;
@@ -1057,11 +1058,10 @@ call_cg({remote,Mod,Name}, As, Rs, Le, Vdb, Bef, St0)
     Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
     %% Build complete code and final stack/register state.
     Arity = length(As),
-    Call = {apply,Arity},
     St = need_stack_frame(St0),
     %%{Call,St1} = build_call(Func, Arity, St0),
     {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
-    {Sis ++ Frees ++ [Call],Aft,St};
+    {Sis ++ Frees ++ [line(Le),{apply,Arity}],Aft,St};
 call_cg(Func, As, Rs, Le, Vdb, Bef, St0) ->
     case St0 of
 	#cg{bfail=Fail} when Fail =/= 0 ->
@@ -1091,7 +1091,7 @@ call_cg(Func, As, Rs, Le, Vdb, Bef, St0) ->
 	    Arity = length(As),
 	    {Call,St1} = build_call(Func, Arity, St0),
 	    {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
-	    {Sis ++ Frees ++ Call,Aft,St1}
+	    {Sis ++ Frees ++ [line(Le)|Call],Aft,St1}
     end.
 
 build_call({remote,{atom,erlang},{atom,'!'}}, 2, St0) ->
@@ -1118,7 +1118,7 @@ enter_cg({var,_V} = Var, As, Le, Vdb, Bef, St0) ->
     {Sis,Int} = cg_setup_call(As++[Var], Bef, Le#l.i, Vdb),
     %% Build complete code and final stack/register state.
     Arity = length(As),
-    {Sis ++ [{call_fun,Arity},return],
+    {Sis ++ [line(Le),{call_fun,Arity},return],
      clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
      need_stack_frame(St0)};
 enter_cg({remote,Mod,Name}, As, Le, Vdb, Bef, St0)
@@ -1127,9 +1127,8 @@ enter_cg({remote,Mod,Name}, As, Le, Vdb, Bef, St0)
     {Sis,Int} = cg_setup_call(As++[Mod,Name], Bef, Le#l.i, Vdb),
     %% Build complete code and final stack/register state.
     Arity = length(As),
-    Call = {apply_only,Arity},
     St = need_stack_frame(St0),
-    {Sis ++ [Call],
+    {Sis ++ [line(Le),{apply_only,Arity}],
      clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
      St};
 enter_cg(Func, As, Le, Vdb, Bef, St0) ->
@@ -1137,7 +1136,8 @@ enter_cg(Func, As, Le, Vdb, Bef, St0) ->
     %% Build complete code and final stack/register state.
     Arity = length(As),
     {Call,St1} = build_enter(Func, Arity, St0),
-    {Sis ++ Call,
+    Line = enter_line(Func, Arity, Le),
+    {Sis ++ Line ++ Call,
      clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
      St1}.
 
@@ -1153,6 +1153,23 @@ build_enter(Name, Arity, St0) when is_atom(Name) ->
     {Lbl,St1} = local_func_label(Name, Arity, St0),
     {[{call_only,Arity,{f,Lbl}}],St1}.
 
+enter_line({remote,{atom,Mod},{atom,Name}}, Arity, Le) ->
+    case erl_bifs:is_safe(Mod, Name, Arity) of
+	false ->
+	    %% Tail-recursive call, possibly to a BIF.
+	    %% We'll need a line instruction in case the
+	    %% BIF call fails.
+	    [line(Le)];
+	true ->
+	    %% Call to a safe BIF. Since it cannot fail,
+	    %% we don't need any line instruction here.
+	    []
+    end;
+enter_line(_, _, _) ->
+    %% Tail-recursive call to a local function. A line
+    %% instruction will not be useful.
+    [].
+
 %% local_func_label(Name, Arity, State) -> {Label,State'}
 %% local_func_label({Name,Arity}, State) -> {Label,State'}
 %%  Get the function entry label for a local function.
@@ -1226,9 +1243,10 @@ bif_cg(Bif, As, [{var,V}], Le, Vdb, Bef, St0) ->
     %%   Currently, we are somewhat pessimistic in
     %% that we save any variable that will be live after this BIF call.
 
+    MayFail = not erl_bifs:is_safe(erlang, Bif, length(As)),
     {Sis,Int0} = case St0#cg.in_catch andalso
 		     St0#cg.bfail =:= 0 andalso
-		     not erl_bifs:is_safe(erlang, Bif, length(As)) of
+		     MayFail of
 		     true -> adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb);
 		     false -> {[],Bef}
 		 end,
@@ -1237,7 +1255,14 @@ bif_cg(Bif, As, [{var,V}], Le, Vdb, Bef, St0) ->
     Int = Int1#sr{reg=Reg},
     Dst = fetch_reg(V, Reg),
     BifFail = {f,St0#cg.bfail},
-    {Sis++[{bif,Bif,BifFail,Ars,Dst}],
+    %% We need a line instructions for BIFs that may fail in a body.
+    Line = case BifFail of
+	       {f,0} when MayFail ->
+		   [line(Le)];
+	       _ ->
+		   []
+	   end,
+    {Sis++Line++[{bif,Bif,BifFail,Ars,Dst}],
      clear_dead(Int, Le#l.i, Vdb), St0}.
 
 
@@ -1266,7 +1291,11 @@ gc_bif_cg(Bif, As, [{var,V}], Le, Vdb, Bef, St0) ->
     Int = Int1#sr{reg=Reg},
     Dst = fetch_reg(V, Reg),
     BifFail = {f,St0#cg.bfail},
-    {Sis++[{gc_bif,Bif,BifFail,max_reg(Bef#sr.reg),Ars,Dst}],
+    Line = case BifFail of
+	       {f,0} -> [line(Le)];
+	       {f,_} -> []
+	   end,
+    {Sis++Line++[{gc_bif,Bif,BifFail,max_reg(Bef#sr.reg),Ars,Dst}],
      clear_dead(Int, Le#l.i, Vdb), St0}.
 
 %% recv_loop_cg(TimeOut, ReceiveVar, ReceiveMatch, TimeOutExprs,
@@ -1284,7 +1313,7 @@ recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, Vdb, Bef, St0) ->
     {Wis,Taft,St6} = cg_recv_wait(Te, Tes, Le#l.i, Int1, St5),
     Int2 = sr_merge(Raft, Taft),		%Merge stack/registers
     Reg = load_vars(Rs, Int2#sr.reg),
-    {Sis ++ Ris ++ [{label,Tl}] ++ Wis ++ [{label,Bl}],
+    {Sis ++ [line(Le)] ++ Ris ++ [{label,Tl}] ++ Wis ++ [{label,Bl}],
      clear_dead(Int2#sr{reg=Reg}, Le#l.i, Vdb),
      St6#cg{break=St0#cg.break,recv=St0#cg.recv}}.
 
@@ -1463,12 +1492,13 @@ cg_binary([{bs_put_binary,Fail,{atom,all},U,_Flags,Src}|PutCode],
 		 {bs_append,Fail,Target,0,MaxRegs,U,Src,BinFlags,Target}
 	 end] ++ PutCode,
     cg_bin_opt(Code);
-cg_binary(PutCode, Target, Temp, Fail, MaxRegs, _Anno) ->
+cg_binary(PutCode, Target, Temp, Fail, MaxRegs, Anno) ->
+    Line = line(Anno),
     Live = cg_live(Target, MaxRegs),
     {InitOp,SzCode} = cg_binary_size(PutCode, Target, Temp, Fail, Live),
 
-    Code = SzCode ++ [{InitOp,Fail,Target,0,MaxRegs,
-		       {field_flags,[]},Target}|PutCode],
+    Code = [Line|SzCode] ++ [{InitOp,Fail,Target,0,MaxRegs,
+			      {field_flags,[]},Target}|PutCode],
     cg_bin_opt(Code).
 
 cg_live({x,X}, MaxRegs) when X =:= MaxRegs -> MaxRegs+1;
@@ -2052,6 +2082,38 @@ drop_catch(Tag, [Other|Stk]) -> [Other|drop_catch(Tag, Stk)].
 new_label(#cg{lcount=Next}=St) ->
     {Next,St#cg{lcount=Next+1}}.
 
+%% line(Le) -> {line,[] | {location,File,Line}}
+%%  Create a line instruction, containing information about
+%%  the current filename and line number. A line information
+%%  instruction should be placed before any operation that could
+%%  cause an exception.
+
+line(#l{a=Anno}) ->
+    line(Anno);
+line([Line,{file,Name}]) when is_integer(Line) ->
+    line_1(Name, Line);
+line([_|_]=A) ->
+    {Name,Line} = find_loc(A, no_file, 0),
+    line_1(Name, Line);
+line([]) ->
+    {line,[]}.
+
+line_1(no_file, _) ->
+    {line,[]};
+line_1(_, 0) ->
+    %% Missing line number or line number 0.
+    {line,[]};
+line_1(Name, Line) ->
+    {line,[{location,Name,abs(Line)}]}.
+
+find_loc([Line|T], File, _) when is_integer(Line) ->
+    find_loc(T, File, Line);
+find_loc([{file,File}|T], _, Line) ->
+    find_loc(T, File, Line);
+find_loc([_|T], File, Line) ->
+    find_loc(T, File, Line);
+find_loc([], File, Line) -> {File,Line}.
+
 flatmapfoldl(F, Accu0, [Hd|Tail]) ->
     {R,Accu1} = F(Hd, Accu0),
     {Rs,Accu2} = flatmapfoldl(F, Accu1, Tail),
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index 87bb5bec25..6f3590b156 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -180,7 +180,7 @@ body(Cs0, Name, Arity, St0) ->
     {Args,St1} = new_vars(Anno, Arity, St0),
     {Cs1,St2} = clauses(Cs0, St1),
     {Ps,St3} = new_vars(Arity, St2),    %Need new variables here
-    Fc = function_clause(Ps, {Name,Arity}),
+    Fc = function_clause(Ps, Anno, {Name,Arity}),
     {#ifun{anno=#a{anno=Anno},id=[],vars=Args,clauses=Cs1,fc=Fc},St3}.
 
 %% clause(Clause, State) -> {Cclause,State} | noclause.
@@ -507,15 +507,15 @@ expr({block,_,Es0}, St0) ->
     {E1,Es1 ++ Eps,St2};
 expr({'if',L,Cs0}, St0) ->
     {Cs1,St1} = clauses(Cs0, St0),
-    Fc = fail_clause([], #c_literal{val=if_clause}),
     Lanno = lineno_anno(L, St1),
+    Fc = fail_clause([], Lanno, #c_literal{val=if_clause}),
     {#icase{anno=#a{anno=Lanno},args=[],clauses=Cs1,fc=Fc},[],St1};
 expr({'case',L,E0,Cs0}, St0) ->
     {E1,Eps,St1} = novars(E0, St0),
     {Cs1,St2} = clauses(Cs0, St1),
     {Fpat,St3} = new_var(St2),
-    Fc = fail_clause([Fpat], c_tuple([#c_literal{val=case_clause},Fpat])),
-    Lanno = lineno_anno(L, St3),
+    Lanno = lineno_anno(L, St2),
+    Fc = fail_clause([Fpat], Lanno, c_tuple([#c_literal{val=case_clause},Fpat])),
     {#icase{anno=#a{anno=Lanno},args=[E1],clauses=Cs1,fc=Fc},Eps,St3};
 expr({'receive',L,Cs0}, St0) ->
     {Cs1,St1} = clauses(Cs0, St0),
@@ -541,9 +541,10 @@ expr({'try',L,Es0,Cs0,Ecs,[]}, St0) ->
     {V,St2} = new_var(St1),		%This name should be arbitrary
     {Cs1,St3} = clauses(Cs0, St2),
     {Fpat,St4} = new_var(St3),
-    Fc = fail_clause([Fpat], c_tuple([#c_literal{val=try_clause},Fpat])),
+    Lanno = lineno_anno(L, St4),
+    Fc = fail_clause([Fpat], Lanno,
+		     c_tuple([#c_literal{val=try_clause},Fpat])),
     {Evs,Hs,St5} = try_exception(Ecs, St4),
-    Lanno = lineno_anno(L, St1),
     {#itry{anno=#a{anno=lineno_anno(L, St5)},args=Es1,
 	   vars=[V],body=[#icase{anno=#a{anno=Lanno},args=[V],clauses=Cs1,fc=Fc}],
 	   evars=Evs,handler=Hs},
@@ -607,8 +608,8 @@ expr({match,L,P0,E0}, St0) ->
 		 Thrown
 	 end,
     {Fpat,St4} = new_var(St3),
-    Fc = fail_clause([Fpat], c_tuple([#c_literal{val=badmatch},Fpat])),
     Lanno = lineno_anno(L, St4),
+    Fc = fail_clause([Fpat], Lanno, c_tuple([#c_literal{val=badmatch},Fpat])),
     case P2 of
 	nomatch ->
 	    St = add_warning(L, nomatch, St4),
@@ -828,8 +829,9 @@ fun_tq({_,_,Name}=Id, Cs0, L, St0) ->
     {Cs1,St1} = clauses(Cs0, St0),
     {Args,St2} = new_vars(Arity, St1),
     {Ps,St3} = new_vars(Arity, St2),		%Need new variables here
-    Fc = function_clause(Ps, {Name,Arity}),
-    Fun = #ifun{anno=#a{anno=lineno_anno(L, St3)},
+    Anno = lineno_anno(L, St3),
+    Fc = function_clause(Ps, Anno, {Name,Arity}),
+    Fun = #ifun{anno=#a{anno=Anno},
 		id=[{id,Id}],				%We KNOW!
 		vars=Args,clauses=Cs1,fc=Fc},
     {Fun,[],St3}.
@@ -929,7 +931,7 @@ lc_tq(Line, E, [{b_generate,Lg,P,G}|Qs0], Mc, St0) ->
      [],St};
 lc_tq(Line, E, [Fil0|Qs0], Mc, St0) ->
     %% Special case sequences guard tests.
-    LA = lineno_anno(Line, St0),
+    LA = lineno_anno(element(2, Fil0), St0),
     LAnno = #a{anno=LA},
     case is_guard_test(Fil0) of
 	true ->
@@ -945,7 +947,8 @@ lc_tq(Line, E, [Fil0|Qs0], Mc, St0) ->
 	false ->
 	    {Lc,Lps,St1} = lc_tq(Line, E, Qs0, Mc, St0),
 	    {Fpat,St2} = new_var(St1),
-	    Fc = fail_clause([Fpat], c_tuple([#c_literal{val=case_clause},Fpat])),
+	    Fc = fail_clause([Fpat], LA,
+			     c_tuple([#c_literal{val=case_clause},Fpat])),
 	    %% Do a novars little optimisation here.
 	    {Filc,Fps,St3} = novars(Fil0, St2),
 	    {#icase{anno=LAnno,
@@ -1072,7 +1075,7 @@ bc_tq1(Line, E, [{b_generate,Lg,P,G}|Qs0], AccExpr, St0) ->
      [],St};
 bc_tq1(Line, E, [Fil0|Qs0], AccVar, St0) ->
     %% Special case sequences guard tests.
-    LA = lineno_anno(Line, St0),
+    LA = lineno_anno(element(2, Fil0), St0),
     LAnno = #a{anno=LA},
     case is_guard_test(Fil0) of
 	true ->
@@ -1089,7 +1092,8 @@ bc_tq1(Line, E, [Fil0|Qs0], AccVar, St0) ->
 	false ->
 	    {Bc,Bps,St1} = bc_tq1(Line, E, Qs0, AccVar, St0),
 	    {Fpat,St2} = new_var(St1),
-	    Fc = fail_clause([Fpat], c_tuple([#c_literal{val=case_clause},Fpat])),
+	    Fc = fail_clause([Fpat], LA,
+			     c_tuple([#c_literal{val=case_clause},Fpat])),
 	    %% Do a novars little optimisation here.
 	    {Filc,Fps,St} = novars(Fil0, St2),
 	    {#icase{anno=LAnno,
@@ -1562,17 +1566,11 @@ new_vars_1(N, Anno, St0, Vs) when N > 0 ->
     new_vars_1(N-1, Anno, St1, [V|Vs]);
 new_vars_1(0, _, St, Vs) -> {Vs,St}.
 
-function_clause(Ps, Name) ->
-    function_clause(Ps, [], Name).
-
 function_clause(Ps, LineAnno, Name) ->
-    FcAnno = [{function_name,Name}],
+    FcAnno = [{function_name,Name}|LineAnno],
     fail_clause(Ps, FcAnno,
 		ann_c_tuple(LineAnno, [#c_literal{val=function_clause}|Ps])).
 
-fail_clause(Pats, Arg) ->
-    fail_clause(Pats, [], Arg).
-
 fail_clause(Pats, Anno, Arg) ->
     #iclause{anno=#a{anno=[compiler_generated]},
 	     pats=Pats,guard=[],
diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl
index 3b33a08cf7..4e06b464a4 100644
--- a/lib/compiler/src/v3_kernel.erl
+++ b/lib/compiler/src/v3_kernel.erl
@@ -247,7 +247,7 @@ expr(#c_var{anno=A,name={_Name,Arity}}=Fname, Sub, St) ->
     %% instead of one for each occurrence as done now.
     Vs = [#c_var{name=list_to_atom("V" ++ integer_to_list(V))} ||
 	     V <- integers(1, Arity)],
-    Fun = #c_fun{anno=A,vars=Vs,body=#c_apply{op=Fname,args=Vs}},
+    Fun = #c_fun{anno=A,vars=Vs,body=#c_apply{anno=A,op=Fname,args=Vs}},
     expr(Fun, Sub, St);
 expr(#c_var{anno=A,name=V}, Sub, St) ->
     {#k_var{anno=A,name=get_vsub(V, Sub)},[],St};
@@ -291,7 +291,7 @@ expr(#c_binary{anno=A,segments=Cv}, Sub, St0) ->
 	    Erl = #c_literal{val=erlang},
 	    Name = #c_literal{val=error},
 	    Args = [#c_literal{val=badarg}],
-	    Error = #c_call{module=Erl,name=Name,args=Args},
+	    Error = #c_call{anno=A,module=Erl,name=Name,args=Args},
 	    expr(Error, Sub, St0)
     end;
 expr(#c_fun{anno=A,vars=Cvs,body=Cb}, Sub0, #kern{ff=OldFF,func=Func}=St0) ->
@@ -1167,9 +1167,7 @@ select_bin_int_1(_, _, _, _) -> throw(not_possible).
 
 select_assert_match_possible(Sz, Val, Fs) ->
     EmptyBindings = erl_eval:new_bindings(),
-    MatchFun = fun({integer,_,_}, NewV, Bs) when NewV =:= Val ->
-		       {match,Bs}
-	       end,
+    MatchFun = match_fun(Val),
     EvalFun = fun({integer,_,S}, B) -> {value,S,B} end,
     Expr = [{bin_element,0,{integer,0,Val},{integer,0,Sz},[{unit,1}|Fs]}],
     {value,Bin,EmptyBindings} = eval_bits:expr_grp(Expr, EmptyBindings, EvalFun),
@@ -1184,6 +1182,11 @@ select_assert_match_possible(Sz, Val, Fs) ->
 	    throw(not_possible)
     end.
 
+match_fun(Val) ->
+    fun(match, {{integer,_,_},NewV,Bs}) when NewV =:= Val ->
+	    {match,Bs}
+    end.
+
 select_utf8(Val0) ->
     try
 	Bin = <<Val0/utf8>>,
diff --git a/lib/compiler/src/v3_life.erl b/lib/compiler/src/v3_life.erl
index a7a4d4dc91..a1d92af9f8 100644
--- a/lib/compiler/src/v3_life.erl
+++ b/lib/compiler/src/v3_life.erl
@@ -65,7 +65,7 @@ functions([], Acc) -> reverse(Acc).
 
 %% function(Kfunc) -> Func.
 
-function(#k_fdef{func=F,arity=Ar,vars=Vs,body=Kb}) ->
+function(#k_fdef{anno=#k{a=Anno},func=F,arity=Ar,vars=Vs,body=Kb}) ->
     try
 	As = var_list(Vs),
 	Vdb0 = foldl(fun ({var,N}, Vdb) -> new_var(N, 0, Vdb) end, [], As),
@@ -80,7 +80,7 @@ function(#k_fdef{func=F,arity=Ar,vars=Vs,body=Kb}) ->
 	put(guard_refc, 0),
 	{B1,_,Vdb1} = body(B0, 1, Vdb0),
 	erase(guard_refc),
-	{function,F,Ar,As,B1,Vdb1}
+	{function,F,Ar,As,B1,Vdb1,Anno}
     catch
 	Class:Error ->
 	    Stack = erlang:get_stacktrace(),
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index fe713fd019..b90adaf917 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -9,6 +9,7 @@ MODULES= \
 	andor_SUITE \
 	apply_SUITE \
 	beam_validator_SUITE \
+	beam_disasm_SUITE \
 	bs_bincomp_SUITE \
 	bs_bit_binaries_SUITE \
 	bs_construct_SUITE \
diff --git a/lib/compiler/test/beam_disasm_SUITE.erl b/lib/compiler/test/beam_disasm_SUITE.erl
new file mode 100644
index 0000000000..44574ae64a
--- /dev/null
+++ b/lib/compiler/test/beam_disasm_SUITE.erl
@@ -0,0 +1,65 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+-module(beam_disasm_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
+	 init_per_group/2,end_per_group/2]).
+
+-export([stripped/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [stripped].
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+stripped(doc) ->
+    ["Check that stripped beam files can be disassembled"];
+stripped(Config) when is_list(Config) ->
+    ?line PrivDir = ?config(priv_dir, Config),
+    ?line SrcName = filename:join(PrivDir, "tmp.erl"),
+    ?line BeamName = filename:join(PrivDir, "tmp.beam"),
+    Prog = <<"-module(tmp).\n-export([tmp/0]).\ntmp()->ok.\n">>,
+    ?line ok = file:write_file(SrcName, Prog),
+    ?line {ok, tmp} =
+	compile:file(SrcName, [{outdir, PrivDir}]),
+    ?line {beam_file, tmp, _, Attr, CompileInfo, [_|_]} =
+	beam_disasm:file(BeamName),
+    ?line true = is_list(Attr),
+    ?line true = is_list(CompileInfo),
+    ?line {ok, {tmp, _}} = beam_lib:strip(BeamName),
+    ?line {beam_file, tmp, _, none, none, [_|_]} =
+	beam_disasm:file(BeamName),
+    ok.
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index 6a795f6634..f8c71a0257 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -1028,8 +1028,8 @@ haystack_2(Haystack) ->
 fc({'EXIT',{function_clause,_}}) -> ok;
 fc({'EXIT',{{case_clause,_},_}}) when ?MODULE =:= bs_match_inline_SUITE -> ok.
 
-fc(Name, Args, {'EXIT',{function_clause,[{?MODULE,Name,Args}|_]}}) -> ok;
-fc(Name, Args, {'EXIT',{function_clause,[{?MODULE,Name,Arity}|_]}})
+fc(Name, Args, {'EXIT',{function_clause,[{?MODULE,Name,Args,_}|_]}}) -> ok;
+fc(Name, Args, {'EXIT',{function_clause,[{?MODULE,Name,Arity,_}|_]}})
   when length(Args) =:= Arity ->
     true = test_server:is_native(?MODULE);
 fc(_, Args, {'EXIT',{{case_clause,ActualArgs},_}})
diff --git a/lib/compiler/test/bs_utf_SUITE.erl b/lib/compiler/test/bs_utf_SUITE.erl
index f30a4d3fef..94549ad0d3 100644
--- a/lib/compiler/test/bs_utf_SUITE.erl
+++ b/lib/compiler/test/bs_utf_SUITE.erl
@@ -264,18 +264,10 @@ literals(Config) when is_list(Config) ->
     ?line {'EXIT',{badarg,_}} = (catch <<(-1)/utf32,I/utf8>>),
     ?line {'EXIT',{badarg,_}} = (catch <<(-1)/little-utf32,I/utf8>>),
     ?line {'EXIT',{badarg,_}} = (catch <<16#D800/utf8,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#FFFE/utf8,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#FFFF/utf8,I/utf8>>),
     ?line {'EXIT',{badarg,_}} = (catch <<16#D800/utf16,I/utf8>>),
     ?line {'EXIT',{badarg,_}} = (catch <<16#D800/little-utf16,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#FFFE/utf16,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#FFFE/little-utf16,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#FFFF/utf16,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#FFFF/little-utf16,I/utf8>>),
     ?line {'EXIT',{badarg,_}} = (catch <<16#D800/utf32,I/utf8>>),
     ?line {'EXIT',{badarg,_}} = (catch <<16#D800/little-utf32,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#FFFE/utf32,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#FFFF/little-utf32,I/utf8>>),
 
     B = 16#10FFFF+1,
     ?line {'EXIT',{badarg,_}} = (catch <<B/utf8>>),
@@ -286,20 +278,11 @@ literals(Config) when is_list(Config) ->
 
     %% Matching of bad literals.
     ?line error = bad_literal_match(<<237,160,128>>), %16#D800 in UTF-8
-    ?line error = bad_literal_match(<<239,191,190>>), %16#FFFE in UTF-8
-    ?line error = bad_literal_match(<<239,191,191>>), %16#FFFF in UTF-8
     ?line error = bad_literal_match(<<244,144,128,128>>), %16#110000 in UTF-8
 
-    ?line error = bad_literal_match(<<255,254>>), %16#FFFE in UTF-16
-    ?line error = bad_literal_match(<<255,255>>), %16#FFFF in UTF-16
-
     ?line error = bad_literal_match(<<16#D800:32>>),
-    ?line error = bad_literal_match(<<16#FFFE:32>>),
-    ?line error = bad_literal_match(<<16#FFFF:32>>),
     ?line error = bad_literal_match(<<16#110000:32>>),
     ?line error = bad_literal_match(<<16#D800:32/little>>),
-    ?line error = bad_literal_match(<<16#FFFE:32/little>>),
-    ?line error = bad_literal_match(<<16#FFFF:32/little>>),
     ?line error = bad_literal_match(<<16#110000:32/little>>),
 
     ok.
@@ -314,11 +297,7 @@ match_literal(<<"bj\366rn"/big-utf16>>) -> bjorn_utf16be;
 match_literal(<<"bj\366rn"/little-utf16>>) -> bjorn_utf16le.
 
 bad_literal_match(<<16#D800/utf8>>) -> ok;
-bad_literal_match(<<16#FFFE/utf8>>) -> ok;
-bad_literal_match(<<16#FFFF/utf8>>) -> ok;
 bad_literal_match(<<16#110000/utf8>>) -> ok;
-bad_literal_match(<<16#FFFE/utf16>>) -> ok;
-bad_literal_match(<<16#FFFF/utf16>>) -> ok;
 bad_literal_match(<<16#D800/utf32>>) -> ok;
 bad_literal_match(<<16#110000/utf32>>) -> ok;
 bad_literal_match(<<16#D800/little-utf32>>) -> ok;
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index b3e5376ffd..8c6a623dfb 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -82,6 +82,7 @@ file_1(Config) when is_list(Config) ->
     ?line {ok,simple} = compile:file(Simple, [native,report]), %Smoke test.
     ?line {ok,simple} = compile:file(Target, [native,from_beam]), %Smoke test.
     ?line {ok,simple} = compile:file(Simple, [debug_info]),
+    ?line {ok,simple} = compile:file(Simple, [no_line_info]), %Coverage
     ?line ok = file:set_cwd(Cwd),
     ?line true = exists(Target),
     ?line passed = run(Target, test, []),
diff --git a/lib/compiler/test/error_SUITE.erl b/lib/compiler/test/error_SUITE.erl
index 6e0aadf007..eb5e50818e 100644
--- a/lib/compiler/test/error_SUITE.erl
+++ b/lib/compiler/test/error_SUITE.erl
@@ -183,23 +183,47 @@ get_compilation_errors(Config, Filename) ->
     E.
 
 warnings_as_errors(Config) when is_list(Config) ->
-    Ts = [{warnings_as_errors,
+    ?line TestFile = test_filename(Config),
+    ?line BeamFile = filename:rootname(TestFile, ".erl") ++ ".beam",
+    ?line OutDir = ?config(priv_dir, Config),
+
+    Ts1 = [{warnings_as_errors,
            <<"
                t() ->
                  A = unused,
                  ok.
              ">>,
-           [export_all,warnings_as_errors],
-          {error,
-           [],
-           [{3,erl_lint,{unused_var,'A'}}]} }],
-    ?line [] = run(Config, Ts),
+	    [warnings_as_errors, export_all, {outdir, OutDir}],
+	    {error,
+	     [],
+	     [{3,erl_lint,{unused_var,'A'}}]} }],
+    ?line [] = run(Ts1, TestFile, write_beam),
+    ?line false = filelib:is_regular(BeamFile),
+
+    Ts2 = [{warning_unused_var,
+           <<"
+               t() ->
+                 A = unused,
+                 ok.
+             ">>,
+	    [return_warnings, export_all, {outdir, OutDir}],
+	    {warning,
+	       [{3,erl_lint,{unused_var,'A'}}]} }],
+
+    ?line [] = run(Ts2, TestFile, write_beam),
+    ?line true = filelib:is_regular(BeamFile),
+    ?line ok = file:delete(BeamFile),
+
     ok.
 
 
 run(Config, Tests) ->
+    ?line File = test_filename(Config),
+    run(Tests, File, dont_write_beam).
+
+run(Tests, File, WriteBeam) ->
     F = fun({N,P,Ws,E}, BadL) ->
-                case catch run_test(Config, P, Ws) of
+                case catch run_test(P, File, Ws, WriteBeam) of
                     E -> 
                         BadL;
                     Bad -> 
@@ -211,8 +235,12 @@ run(Config, Tests) ->
     lists:foldl(F, [], Tests).
 
 run2(Config, Tests) ->
+    ?line File = test_filename(Config),
+    run2(Tests, File, dont_write_beam).
+
+run2(Tests, File, WriteBeam) ->
     F = fun({N,P,Ws,E}, BadL) ->
-                case catch filter(run_test(Config, P, Ws)) of
+                case catch filter(run_test(P, File, Ws, WriteBeam)) of
                     E ->
                         BadL;
                     Bad ->
@@ -231,12 +259,19 @@ filter(X) ->
 
 %% Compiles a test module and returns the list of errors and warnings.
 
-run_test(Conf, Test0, Warnings) ->
-    Filename = 'errors_test.erl',
-    ?line DataDir = ?config(priv_dir, Conf),
+test_filename(Conf) ->
+    Filename = "errors_test.erl",
+    DataDir = ?config(priv_dir, Conf),
+    filename:join(DataDir, Filename).
+
+run_test(Test0, File, Warnings, WriteBeam) ->
     ?line Test = ["-module(errors_test). ", Test0],
-    ?line File = filename:join(DataDir, Filename),
-    ?line Opts = [binary,return_errors|Warnings],
+    ?line Opts = case WriteBeam of
+		     dont_write_beam ->
+			 [binary,return_errors|Warnings];
+		     write_beam ->
+			 [return_errors|Warnings]
+		 end,
     ?line ok = file:write_file(File, Test),
 
     %% Compile once just to print all errors and warnings.
@@ -252,6 +287,10 @@ run_test(Conf, Test0, Warnings) ->
 			%io:format("compile:file(~s,~p) ->~n~p~n",
 			%	  [File,Opts,Ws]),
 			[];
+		    {ok,errors_test,[{_File,Ws}]} ->
+			{warning,Ws};
+		    {ok,errors_test,[]} ->
+			[];
 		    {error,[{XFile,Es}],Ws} = _ZZ when is_list(XFile) ->
 			%io:format("compile:file(~s,~p) ->~n~p~n",
 			%	  [File,Opts,_ZZ]),
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index 0e69efba6b..40711783ed 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -32,7 +32,8 @@
 	 t_is_boolean/1,is_function_2/1,
 	 tricky/1,rel_ops/1,literal_type_tests/1,
 	 basic_andalso_orelse/1,traverse_dcd/1,
-	 check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1]).
+	 check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1,
+	 bad_constants/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -44,7 +45,8 @@ all() ->
      more_xor_guards, build_in_guard, old_guard_tests, gbif,
      t_is_boolean, is_function_2, tricky, rel_ops,
      literal_type_tests, basic_andalso_orelse, traverse_dcd,
-     check_qlc_hrl, andalso_semi, t_tuple_size, binary_part].
+     check_qlc_hrl, andalso_semi, t_tuple_size, binary_part,
+     bad_constants].
 
 groups() -> 
     [].
@@ -1517,8 +1519,27 @@ bptest(B,A,C)  when erlang:binary_part(B,{A,C}) =:= <<3,3>> ->
 bptest(_,_,_) ->
     error.
 
-
-
+-define(FAILING(C),
+	if
+	    C -> ?t:fail(should_fail);
+	    true -> ok
+	end,
+	if
+	    true, C -> ?t:fail(should_fail);
+	    true -> ok
+	end).
+
+bad_constants(Config) when is_list(Config) ->
+    ?line ?FAILING(false),
+    ?line ?FAILING([]),
+    ?line ?FAILING([a]),
+    ?line ?FAILING([Config]),
+    ?line ?FAILING({a,b}),
+    ?line ?FAILING({a,Config}),
+    ?line ?FAILING(<<1>>),
+    ?line ?FAILING(42),
+    ?line ?FAILING(3.14),
+    ok.
 
 %% Call this function to turn off constant propagation.
 id(I) -> I.
diff --git a/lib/compiler/test/inline_SUITE.erl b/lib/compiler/test/inline_SUITE.erl
index af2b8ec92a..086fba2649 100644
--- a/lib/compiler/test/inline_SUITE.erl
+++ b/lib/compiler/test/inline_SUITE.erl
@@ -263,7 +263,8 @@ my_apply(M, F, A, Init) ->
 
 really_inlined(Config) when is_list(Config) ->
     %% Make sure that badarg/2 really gets inlined.
-    {'EXIT',{badarg,[{?MODULE,fail_me_now,[]}|_]}} = (catch fail_me_now()),
+    {'EXIT',{badarg,[{?MODULE,fail_me_now,[],_}|_]}} =
+	(catch fail_me_now()),
     ok.
 
 fail_me_now() ->
diff --git a/lib/compiler/test/lc_SUITE.erl b/lib/compiler/test/lc_SUITE.erl
index c8908858ba..f5948504b3 100644
--- a/lib/compiler/test/lc_SUITE.erl
+++ b/lib/compiler/test/lc_SUITE.erl
@@ -179,8 +179,8 @@ empty_generator(Config) when is_list(Config) ->
 
 id(I) -> I.
     
-fc(Args, {'EXIT',{function_clause,[{?MODULE,_,Args}|_]}}) -> ok;
-fc(Args, {'EXIT',{function_clause,[{?MODULE,_,Arity}|_]}})
+fc(Args, {'EXIT',{function_clause,[{?MODULE,_,Args,_}|_]}}) -> ok;
+fc(Args, {'EXIT',{function_clause,[{?MODULE,_,Arity,_}|_]}})
   when length(Args) =:= Arity ->
     true = test_server:is_native(?MODULE);
 fc(Args, {'EXIT',{{case_clause,ActualArgs},_}})
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index c941a80e61..9b414cade6 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -179,7 +179,7 @@ silly_coverage(Config) when is_list(Config) ->
     ?line expect_error(fun() -> v3_life:module(BadKernel, []) end),
 
     %% v3_codegen
-    CodegenInput = {?MODULE,[{foo,0}],[],[{function,foo,0,[a|b],a,b}]},
+    CodegenInput = {?MODULE,[{foo,0}],[],[{function,foo,0,[a|b],a,b,[]}]},
     ?line expect_error(fun() -> v3_codegen:module(CodegenInput, []) end),
 
     %% beam_block
@@ -187,7 +187,7 @@ silly_coverage(Config) when is_list(Config) ->
 		  [{function,foo,0,2,
 		    [{label,1},
 		     {func_info,{atom,?MODULE},{atom,foo},0},
-		     {label,2}|non_proper_list],99}]},
+		     {label,2}|non_proper_list]}],99},
     ?line expect_error(fun() -> beam_block:module(BlockInput, []) end),
 
     %% beam_bool
diff --git a/lib/compiler/test/trycatch_SUITE.erl b/lib/compiler/test/trycatch_SUITE.erl
index c6e0f8d85d..760cf17225 100644
--- a/lib/compiler/test/trycatch_SUITE.erl
+++ b/lib/compiler/test/trycatch_SUITE.erl
@@ -314,19 +314,19 @@ eclectic(Conf) when is_list(Conf) ->
     V = {make_ref(),3.1415926535,[[]|{}]},
     ?line {{value,{value,V},V},V} = 
 	eclectic_1({foo,{value,{value,V}}}, undefined, {value,V}),
-    ?line {{'EXIT',{V,[{?MODULE,foo,1}|_]}},V} = 
+    ?line {{'EXIT',{V,[{?MODULE,foo,1,_}|_]}},V} =
 	eclectic_1({catch_foo,{error,V}}, undefined, {value,V}),
     ?line {{error,{exit,V},{'EXIT',V}},V} =
 	eclectic_1({foo,{error,{exit,V}}}, error, {value,V}),
     ?line {{value,{value,V},V},
-	   {'EXIT',{badarith,[{?MODULE,my_add,2}|_]}}} =
+	   {'EXIT',{badarith,[{?MODULE,my_add,2,_}|_]}}} =
 	eclectic_1({foo,{value,{value,V}}}, undefined, {'add',{0,a}}),
     ?line {{'EXIT',V},V} =
 	eclectic_1({catch_foo,{exit,V}}, undefined, {throw,V}),
-    ?line {{error,{'div',{1,0}},{'EXIT',{badarith,[{?MODULE,my_div,2}|_]}}},
+    ?line {{error,{'div',{1,0}},{'EXIT',{badarith,[{?MODULE,my_div,2,_}|_]}}},
 	   {'EXIT',V}} =
 	eclectic_1({foo,{error,{'div',{1,0}}}}, error, {exit,V}),
-    ?line {{{error,V},{'EXIT',{V,[{?MODULE,foo,1}|_]}}},
+    ?line {{{error,V},{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},
 	   {'EXIT',V}} =
 	eclectic_1({catch_foo,{throw,{error,V}}}, undefined, {exit,V}),
     %%
@@ -336,15 +336,15 @@ eclectic(Conf) when is_list(Conf) ->
 	eclectic_2({throw,{value,V}}, throw, {value,V}),
     ?line {{caught,{'EXIT',V}},undefined} =
 	eclectic_2({value,{value,V}}, undefined, {exit,V}),
-    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,1}|_]}}},undefined} =
+    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},undefined} =
 	eclectic_2({error,{value,V}}, throw, {error,V}),
-    ?line {{caught,{'EXIT',{badarg,[{erlang,abs,[V]}|_]}}},V} =
+    ?line {{caught,{'EXIT',{badarg,[{erlang,abs,[V],_}|_]}}},V} =
 	eclectic_2({value,{'abs',V}}, undefined, {value,V}),
-    ?line {{caught,{'EXIT',{badarith,[{?MODULE,my_add,2}|_]}}},V} =
+    ?line {{caught,{'EXIT',{badarith,[{?MODULE,my_add,2,_}|_]}}},V} =
 	eclectic_2({exit,{'add',{0,a}}}, exit, {value,V}),
     ?line {{caught,{'EXIT',V}},undefined} =
 	eclectic_2({value,{error,V}}, undefined, {exit,V}),
-    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,1}|_]}}},undefined} =
+    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},undefined} =
 	eclectic_2({throw,{'div',{1,0}}}, throw, {error,V}),
     ok.
 
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index 5863842f5b..04290c0a7f 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 4.7.4
+COMPILER_VSN = 4.7.5
diff --git a/lib/cosEvent/doc/src/Makefile b/lib/cosEvent/doc/src/Makefile
index 4b76a64b7d..db2f7e6da5 100644
--- a/lib/cosEvent/doc/src/Makefile
+++ b/lib/cosEvent/doc/src/Makefile
@@ -26,13 +26,6 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../../vsn.mk
 VSN=$(COSEVENT_VSN)
 APPLICATION=cosEvent
-# ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
 
 # ----------------------------------------------------
 # Release directory specification
@@ -98,32 +91,10 @@ EXTRA_FILES = summary.html.src \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-
-TOP_PS_FILE = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-endif
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -136,8 +107,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -153,31 +122,6 @@ clean clean_docs:
 	rm -f errs core *~
 	rm -f $(JD_HTML) $(JD_PACK)
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) $(INTERNAL_HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) 
-endif
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -192,8 +136,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -204,30 +146,4 @@ release_docs_spec: docs
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-
-endif
-endif
-
-endif
-
 release_spec:
-
diff --git a/lib/cosEvent/doc/src/make.dep b/lib/cosEvent/doc/src/make.dep
deleted file mode 100644
index b8a95c2d58..0000000000
--- a/lib/cosEvent/doc/src/make.dep
+++ /dev/null
@@ -1,34 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: CosEventChannelAdmin.tex CosEventChannelAdmin_ConsumerAdmin.tex \
-		CosEventChannelAdmin_EventChannel.tex CosEventChannelAdmin_ProxyPullConsumer.tex \
-		CosEventChannelAdmin_ProxyPullSupplier.tex \
-		CosEventChannelAdmin_ProxyPushConsumer.tex \
-		CosEventChannelAdmin_ProxyPushSupplier.tex \
-		CosEventChannelAdmin_SupplierAdmin.tex book.tex \
-		ch_contents.tex ch_event_service.tex ch_introduction.tex \
-		cosEventApp.tex part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-CosEventChannelAdmin.tex: ../../src/CosEventChannelAdmin.idl
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: e_s_components.ps e_s_models.ps
-
diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
index a62d47ce74..736b95538a 100644
--- a/lib/cosEvent/src/Makefile
+++ b/lib/cosEvent/src/Makefile
@@ -164,7 +164,7 @@ debug:
 	@${MAKE} TYPE=debug opt
 
 clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET)
+	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
@@ -177,16 +177,18 @@ docs:
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
-$(GEN_ERL_FILES1) $(EXTERNAL_GEN_HRL_FILES1): CosEventChannelAdmin.idl
+
+IDL-GENERATED: CosEventChannelAdmin.idl cosEventApp.idl CosEventComm.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosEventChannelAdmin.cfg"}' CosEventChannelAdmin.idl
 	mv $(GEN_HRL_FILES1) $(EXTERNAL_INC_PATH)
-
-$(GEN_ERL_FILES2) $(GEN_HRL_FILES2): cosEventApp.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"cosEventApp.cfg"}' cosEventApp.idl
-
-$(GEN_ERL_FILES3) $(EXTERNAL_GEN_HRL_FILES3): CosEventComm.idl
 	erlc $(ERL_IDL_FLAGS) CosEventComm.idl
 	mv $(GEN_HRL_FILES3) $(EXTERNAL_INC_PATH)
+	>IDL-GENERATED
+
+$(GEN_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/cosEvent/test/Makefile b/lib/cosEvent/test/Makefile
index c59c7ee315..c3f07c156f 100644
--- a/lib/cosEvent/test/Makefile
+++ b/lib/cosEvent/test/Makefile
@@ -121,17 +121,13 @@ docs:
 # Special Targets
 # ----------------------------------------------------
 
-#
-# Each IDL file produces many target files so no pattern
-# rule can be used.
-#
-TGT_COS = \
-	$(GEN_HRL_COS:%=$(IDLOUTDIR)/%) \
-	$(GEN_MOD_COS:%=$(IDLOUTDIR)/%.erl)
+IDL-GENERATED: event_test_server.idl
+	erlc $(ERL_IDL_FLAGS) -o$(IDLOUTDIR) event_test_server.idl
+	>IDL-GENERATED
 
+$(GEN_FILES): IDL-GENERATED
 
-$(TGT_COS): event_test_server.idl
-	erlc $(ERL_IDL_FLAGS) -o$(IDLOUTDIR) event_test_server.idl
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Targets
diff --git a/lib/cosEventDomain/doc/src/Makefile b/lib/cosEventDomain/doc/src/Makefile
index 6a0d3c353a..b2cdef278a 100644
--- a/lib/cosEventDomain/doc/src/Makefile
+++ b/lib/cosEventDomain/doc/src/Makefile
@@ -28,14 +28,6 @@ VSN=$(COSEVENTDOMAIN_VSN)
 APPLICATION=cosEventDomain
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -93,33 +85,10 @@ EXTRA_FILES = summary.html.src \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-
-TOP_PS_FILE = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -132,8 +101,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT 
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -149,32 +116,6 @@ clean clean_docs:
 	rm -f errs core *~
 	rm -f $(JD_HTML) $(JD_PACK)
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) $(INTERNAL_HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) 
-
-endif
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -189,9 +130,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -201,30 +139,5 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-
-endif
-endif
-
-endif
 
 release_spec:
-
diff --git a/lib/cosEventDomain/doc/src/make.dep b/lib/cosEventDomain/doc/src/make.dep
deleted file mode 100644
index 2f3f1ae53d..0000000000
--- a/lib/cosEventDomain/doc/src/make.dep
+++ /dev/null
@@ -1,23 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: CosEventDomainAdmin.tex CosEventDomainAdmin_EventDomain.tex \
-		CosEventDomainAdmin_EventDomainFactory.tex \
-		book.tex ch_QoS.tex ch_contents.tex ch_event_domain_service.tex \
-		ch_introduction.tex cosEventDomainApp.tex \
-		part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile
index 56a67cd225..5af790c760 100644
--- a/lib/cosEventDomain/src/Makefile
+++ b/lib/cosEventDomain/src/Makefile
@@ -137,7 +137,7 @@ debug:
 	@${MAKE} TYPE=debug opt
 
 clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET)
+	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
@@ -150,9 +150,14 @@ docs:
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
-$(GEN_ERL_FILES) $(EXTERNAL_GEN_HRL_FILES): CosEventDomainAdmin.idl
+IDL-GENERATED: CosEventDomainAdmin.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosEventDomainAdmin.cfg"}' CosEventDomainAdmin.idl
 	mv $(GEN_HRL_FILES) $(EXTERNAL_INC_PATH)
+	>IDL-GENERATED
+
+$(GEN_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml
index 5ac2c61c92..918f0bf9f7 100644
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml
+++ b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml
@@ -159,7 +159,7 @@
     </func>
     <func>
       <name>insert(FTS, SourceFile, DestinationFile, Offset) -> Return</name>
-      <fsummary>Insert the <c>SourceFile</c>into the <c>DestinationFile</c><c>Offset</c>bytes from the start of the file</fsummary>
+      <fsummary>Insert the <c>SourceFile</c>into the <c>DestinationFile</c> <c>Offset</c>bytes from the start of the file</fsummary>
       <type>
         <v>FTS = SourceFile = DestinationFile = #objref</v>
         <v>Offset = long()</v>
@@ -168,7 +168,7 @@
       <desc>
         <p>This operation behaves almost like the <c>append/3</c> operation. The 
           difference is that the <c>SourceFile</c> will be inserted into the
-          <c>DestinationFile</c><c>Offset</c> bytes from the start of the file.</p>
+          <c>DestinationFile</c> <c>Offset</c> bytes from the start of the file.</p>
         <p>Currently, it is not possible to use this operation when the target 
           object represents FTP.</p>
       </desc>
diff --git a/lib/cosFileTransfer/doc/src/Makefile b/lib/cosFileTransfer/doc/src/Makefile
index 2286db43ff..e62738daba 100644
--- a/lib/cosFileTransfer/doc/src/Makefile
+++ b/lib/cosFileTransfer/doc/src/Makefile
@@ -26,14 +26,6 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../../vsn.mk
 VSN=$(COSFILETRANSFER_VSN)
 APPLICATION=cosFileTransfer
-# ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
 
 # ----------------------------------------------------
 # Release directory specification
@@ -97,33 +89,10 @@ EXTRA_FILES = summary.html.src \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-
-TOP_PS_FILE = $(APPLICATION)-$-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -136,8 +105,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -152,32 +119,6 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) $(INTERNAL_HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) 
-
-endif
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -192,9 +133,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -204,30 +142,5 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-
-endif
-endif
-
-endif
 
 release_spec:
-
diff --git a/lib/cosFileTransfer/doc/src/make.dep b/lib/cosFileTransfer/doc/src/make.dep
deleted file mode 100644
index 3be0c185c3..0000000000
--- a/lib/cosFileTransfer/doc/src/make.dep
+++ /dev/null
@@ -1,30 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: CosFileTransfer_Directory.tex CosFileTransfer_File.tex \
-		CosFileTransfer_FileIterator.tex CosFileTransfer_FileTransferSession.tex \
-		CosFileTransfer_VirtualFileSystem.tex book.tex \
-		ch_contents.tex ch_example.tex ch_install.tex \
-		ch_introduction.tex ch_system.tex cosFileTransferApp.tex \
-		part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: CosFileTransfer.ps
-
diff --git a/lib/cosFileTransfer/doc/src/notes.xml b/lib/cosFileTransfer/doc/src/notes.xml
index 53c207db2f..c7a4fd4504 100644
--- a/lib/cosFileTransfer/doc/src/notes.xml
+++ b/lib/cosFileTransfer/doc/src/notes.xml
@@ -30,7 +30,21 @@
     <file>notes.xml</file>
   </header>
 
-  <section>
+  <section><title>cosFileTransfer 1.1.12</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> XML files have been corrected. </p>
+          <p>
+	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section>
     <title>cosFileTransfer 1.1.11</title>
 
     <section>
diff --git a/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl b/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl
index e222c5b92b..b7643fb30d 100644
--- a/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl
+++ b/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -792,7 +792,7 @@ target_FTS_operation(State, _SrcFile, DestFile, Op, Offset) ->
             %% Delete the temporary local copy.
 	    delete_tmp_file(TempName, 
 			    "Transfer completed but failed to remove temporary local copy."),
-            %% Completed the transfer succesfully.
+            %% Completed the transfer successfully.
 	    {reply, ok, State};
 	{error, epath} ->
 	    delete_tmp_file(TempName,
diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile
index 773ed7f6b7..b811ef1106 100644
--- a/lib/cosFileTransfer/src/Makefile
+++ b/lib/cosFileTransfer/src/Makefile
@@ -147,7 +147,7 @@ cleanb:
 	rm -f errs core *~
 
 clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET)
+	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
@@ -161,9 +161,14 @@ docs:
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): CosFileTransfer.idl
+IDL-GENERATED: CosFileTransfer.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosFileTransfer.cfg"}' CosFileTransfer.idl
 	mv $(LOCAL_HRL_FILES) $(EXTERNAL_INC_PATH)
+	>IDL-GENERATED
+
+$(GEN_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/cosFileTransfer/vsn.mk b/lib/cosFileTransfer/vsn.mk
index 9d68ab2720..fe0226e3b3 100644
--- a/lib/cosFileTransfer/vsn.mk
+++ b/lib/cosFileTransfer/vsn.mk
@@ -1 +1 @@
-COSFILETRANSFER_VSN = 1.1.11
+COSFILETRANSFER_VSN = 1.1.12
diff --git a/lib/cosNotification/doc/src/Makefile b/lib/cosNotification/doc/src/Makefile
index bfdd2f1f8c..2ead9aba7b 100644
--- a/lib/cosNotification/doc/src/Makefile
+++ b/lib/cosNotification/doc/src/Makefile
@@ -28,14 +28,6 @@ VSN=$(COSNOTIFICATION_VSN)
 APPLICATION=cosNotification
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -122,33 +114,10 @@ EXTRA_FILES = summary.html.src \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-
-TOP_PS_FILE = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -161,8 +130,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT 
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -177,32 +144,6 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) $(INTERNAL_HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) 
-
-endif
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -217,8 +158,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -228,30 +167,5 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-
-endif
-endif
-
-endif
 
 release_spec:
-
diff --git a/lib/cosNotification/doc/src/make.dep b/lib/cosNotification/doc/src/make.dep
deleted file mode 100644
index 031a2b3e98..0000000000
--- a/lib/cosNotification/doc/src/make.dep
+++ /dev/null
@@ -1,48 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: CosNotification.tex CosNotification_AdminPropertiesAdmin.tex \
-		CosNotification_QoSAdmin.tex CosNotifyChannelAdmin_ConsumerAdmin.tex \
-		CosNotifyChannelAdmin_EventChannel.tex CosNotifyChannelAdmin_EventChannelFactory.tex \
-		CosNotifyChannelAdmin_ProxyConsumer.tex CosNotifyChannelAdmin_ProxyPullConsumer.tex \
-		CosNotifyChannelAdmin_ProxyPullSupplier.tex \
-		CosNotifyChannelAdmin_ProxyPushConsumer.tex \
-		CosNotifyChannelAdmin_ProxyPushSupplier.tex \
-		CosNotifyChannelAdmin_ProxySupplier.tex CosNotifyChannelAdmin_SequenceProxyPullConsumer.tex \
-		CosNotifyChannelAdmin_SequenceProxyPullSupplier.tex \
-		CosNotifyChannelAdmin_SequenceProxyPushConsumer.tex \
-		CosNotifyChannelAdmin_SequenceProxyPushSupplier.tex \
-		CosNotifyChannelAdmin_StructuredProxyPullConsumer.tex \
-		CosNotifyChannelAdmin_StructuredProxyPullSupplier.tex \
-		CosNotifyChannelAdmin_StructuredProxyPushConsumer.tex \
-		CosNotifyChannelAdmin_StructuredProxyPushSupplier.tex \
-		CosNotifyChannelAdmin_SupplierAdmin.tex CosNotifyComm_NotifyPublish.tex \
-		CosNotifyComm_NotifySubscribe.tex CosNotifyFilter_Filter.tex \
-		CosNotifyFilter_FilterAdmin.tex CosNotifyFilter_FilterFactory.tex \
-		CosNotifyFilter_MappingFilter.tex book.tex \
-		ch_BNF.tex ch_QoS.tex ch_contents.tex ch_example.tex \
-		ch_install.tex ch_introduction.tex ch_system.tex \
-		cosNotificationApp.tex part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: eventstructure.ps
-
-book.dvi: notificationFlow.ps
-
diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile
index 637c633e52..be52d1a06f 100644
--- a/lib/cosNotification/src/Makefile
+++ b/lib/cosNotification/src/Makefile
@@ -242,20 +242,26 @@ GEN_OE_EVENTCOMM_HRL_FILES =  \
 	oe_CosNotificationComm.hrl \
 	oe_CosNotificationComm_Event.hrl
 
-GEN_ERL_FILES = \
+IDL_GEN_ERL_FILES = \
 	$(GEN_NOTIFICATION_ERL_FILES) \
 	$(GEN_OE_EVENTCOMM_ERL_FILES) \
 	$(GEN_NOTIFYCOMM_ERL_FILES) \
 	$(GEN_NOTIFYFILTER_ERL_FILES) \
-	$(GEN_CHANNELADMIN_ERL_FILES) \
-	$(GEN_YECC_ERL_FILES)
+	$(GEN_CHANNELADMIN_ERL_FILES)
 
-GEN_HRL_FILES = \
+IDL_GEN_HRL_FILES = \
 	$(EXTERNAL_GEN_NOTIFICATION_HRL_FILES) \
 	$(GEN_OE_EVENTCOMM_HRL_FILES) \
 	$(EXTERNAL_GEN_NOTIFYCOMM_HRL_FILES) \
 	$(EXTERNAL_GEN_NOTIFYFILTER_HRL_FILES) \
-	$(EXTERNAL_GEN_CHANNELADMIN_HRL_FILES) \
+	$(EXTERNAL_GEN_CHANNELADMIN_HRL_FILES)
+
+GEN_ERL_FILES = \
+	$(IDL_GEN_ERL_FILES) \
+	$(GEN_YECC_ERL_FILES)
+
+GEN_HRL_FILES = \
+	$(IDL_GEN_HRL_FILES) \
 	$(GEN_YECC_HRL_FILES)
 
 
@@ -322,7 +328,7 @@ cleanb:
 	rm -f errs core *~
 
 clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET)
+	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
@@ -336,20 +342,23 @@ docs:
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
-$(GEN_NOTIFICATION_ERL_FILES) $(EXTERNAL_GEN_NOTIFICATION_HRL_FILES): CosNotification.idl
+IDL-GENERATED: CosNotification.idl CosNotifyChannelAdmin.idl \
+  CosNotifyFilter.idl cosNotificationAppComm.idl CosNotifyComm.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotification.cfg"}' CosNotification.idl
 	mv $(GEN_NOTIFICATION_HRL_FILES) $(EXTERNAL_INC_PATH)
-$(GEN_CHANNELADMIN_ERL_FILES) $(EXTERNAL_GEN_CHANNELADMIN_HRL_FILES): CosNotifyChannelAdmin.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyChannelAdmin.cfg"}' CosNotifyChannelAdmin.idl
 	mv $(GEN_CHANNELADMIN_HRL_FILES) $(EXTERNAL_INC_PATH)
-$(GEN_NOTIFYFILTER_ERL_FILES) $(EXTERNAL_GEN_NOTIFYFILTER_HRL_FILES): CosNotifyFilter.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyFilter.cfg"}' CosNotifyFilter.idl
 	mv $(GEN_NOTIFYFILTER_HRL_FILES) $(EXTERNAL_INC_PATH)
-$(GEN_OE_EVENTCOMM_ERL_FILES) $(GEN_OE_EVENTCOMM_HRL_FILES): cosNotificationAppComm.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"cosNotificationComm.cfg"}' cosNotificationAppComm.idl
-$(GEN_NOTIFYCOMM_ERL_FILES) $(EXTERNAL_GEN_NOTIFYCOMM_HRL_FILES): CosNotifyComm.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosNotifyComm.cfg"}' CosNotifyComm.idl
 	mv $(GEN_NOTIFYCOMM_HRL_FILES) $(EXTERNAL_INC_PATH)
+	>IDL-GENERATED
+
+$(IDL_GEN_ERL_FILES) $(IDL_GEN_HRL_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
+
 $(GEN_YECC_ERL_FILES) $(GEN_YECC_HRL_FILES): cosNotification_Grammar.yrl
 
 # ----------------------------------------------------
diff --git a/lib/cosNotification/test/Makefile b/lib/cosNotification/test/Makefile
index 43f73addae..f509370430 100644
--- a/lib/cosNotification/test/Makefile
+++ b/lib/cosNotification/test/Makefile
@@ -161,13 +161,14 @@ docs:
 # Special Targets
 # ----------------------------------------------------
 
-TGT_TEST = \
-        $(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
-        $(GEN_MODULES:%=$(IDLOUTDIR)/%.erl)
-
-$(TGT_TEST): notify_test_server.idl
+IDL-GENERATED: notify_test_server.idl
 	erlc $(ERL_COMPILE_FLAGS) -o$(IDLOUTDIR) \
                 +'{cfgfile,"notify_test_server.cfg"}' notify_test_server.idl
+	>IDL-GENERATED
+
+$(GEN_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Targets
diff --git a/lib/cosProperty/doc/src/Makefile b/lib/cosProperty/doc/src/Makefile
index baf995d35e..d4c89ff44f 100644
--- a/lib/cosProperty/doc/src/Makefile
+++ b/lib/cosProperty/doc/src/Makefile
@@ -28,14 +28,6 @@ VSN=$(COSPROPERTY_VSN)
 APPLICATION=cosProperty
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -99,35 +91,10 @@ EXTRA_FILES = summary.html.src \
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 MAN6_FILES = $(XML_REF6_FILES:%.xml=$(MAN6DIR)/%.6)
 
-
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_REF6_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-
-TOP_PS_FILE = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -140,8 +107,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -156,42 +121,6 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) $(INTERNAL_HTML_FILES)
-
-tex_users_guide: $(TEX_FILES_USERS_GUIDE) 
-tex_ref_man: $(TEX_FILES_REF_MAN)
-tex: tex_users_guide tex_ref_man $(TEX_FILES_BOOK)
-
-$(DOCDIR)/latexlog: $(BOOK_FILES:%.xml=%.dvi)
-	-fgrep -i "latex warning" $(BOOK_FILES:%.xml=%.log) >$(DOCDIR)/latexlog
-
-clean_tex:
-	-rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-
-clean:
-	rm -f ../html/* $(MAN3_FILES) $(MAN6_FILES) $(TEX_FILES_USERS_GUIDE) 
-	rm -f *xmls_output *xmls_errs
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ $(LATEX_CLEAN) 
-
-endif
-
 man: $(MAN3_FILES) $(MAN6_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -206,8 +135,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -217,30 +144,5 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-
-endif
-endif
-
-endif
 
 release_spec:
-
diff --git a/lib/cosProperty/doc/src/make.dep b/lib/cosProperty/doc/src/make.dep
deleted file mode 100644
index 383af54244..0000000000
--- a/lib/cosProperty/doc/src/make.dep
+++ /dev/null
@@ -1,26 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: CosPropertyService_PropertiesIterator.tex \
-		CosPropertyService_PropertyNamesIterator.tex \
-		CosPropertyService_PropertySet.tex CosPropertyService_PropertySetDef.tex \
-		CosPropertyService_PropertySetDefFactory.tex \
-		CosPropertyService_PropertySetFactory.tex \
-		book.tex ch_contents.tex ch_example.tex ch_install.tex \
-		ch_introduction.tex cosProperty.tex part.tex \
-		ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile
index 1d2119dfb3..b72019f37d 100644
--- a/lib/cosProperty/src/Makefile
+++ b/lib/cosProperty/src/Makefile
@@ -147,7 +147,7 @@ cleanb:
 	rm -f errs core *~
 
 clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET)
+	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
@@ -161,10 +161,14 @@ docs:
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
-$(GEN_ERL_FILES) $(GEN_HRL_FILES): CosProperty.idl
+IDL-GENERATED: CosProperty.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosProperty.cfg"}' CosProperty.idl
 	mv $(LOCAL_HRL_FILES) $(EXTERNAL_INC_PATH)
+	>IDL-GENERATED
 
+$(GEN_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/cosTime/doc/src/Makefile b/lib/cosTime/doc/src/Makefile
index 83abc5e7c2..af418896aa 100644
--- a/lib/cosTime/doc/src/Makefile
+++ b/lib/cosTime/doc/src/Makefile
@@ -28,14 +28,6 @@ VSN=$(COSTIME_VSN)
 APPLICATION=cosTime
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -93,33 +85,10 @@ EXTRA_FILES = summary.html.src \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-
-TOP_PS_FILE = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -132,8 +101,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -148,32 +115,6 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) $(INTERNAL_HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) 
-
-endif
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -188,8 +129,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -199,30 +138,5 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-
-endif
-endif
-
-endif
 
 release_spec:
-
diff --git a/lib/cosTime/doc/src/make.dep b/lib/cosTime/doc/src/make.dep
deleted file mode 100644
index 69a584ab95..0000000000
--- a/lib/cosTime/doc/src/make.dep
+++ /dev/null
@@ -1,22 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: CosTime_TIO.tex CosTime_TimeService.tex CosTime_UTO.tex \
-		CosTimerEvent_TimerEventHandler.tex CosTimerEvent_TimerEventService.tex \
-		book.tex ch_contents.tex ch_example.tex ch_install.tex \
-		ch_introduction.tex cosTime.tex part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile
index 3b6f7bae2e..fa456249bd 100644
--- a/lib/cosTime/src/Makefile
+++ b/lib/cosTime/src/Makefile
@@ -162,7 +162,7 @@ cleanb:
 	rm -f errs core *~
 
 clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET)
+	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
@@ -176,17 +176,18 @@ docs:
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
-$(GEN_TIMEBASE_ERL_FILES) $(EXTERNAL_TIMEBASE_HRL_FILES): TimeBase.idl
+IDL-GENERATED: TimeBase.idl CosTime.idl CosTimerEvent.idl
 	erlc $(ERL_IDL_FLAGS) TimeBase.idl
 	mv $(GEN_TIMEBASE_HRL_FILES) $(EXTERNAL_INC_PATH)
-
-$(GEN_COSTIME_ERL_FILES) $(EXTERNAL_COSTIME_HRL_FILES): CosTime.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTime.cfg"}' CosTime.idl
 	mv $(GEN_COSTIME_HRL_FILES) $(EXTERNAL_INC_PATH)
-
-$(GEN_COSTIMEREVENT_ERL_FILES) $(EXTERNAL_COSTIMEREVENT_HRL_FILES): CosTimerEvent.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTimerEvent.cfg"}' CosTimerEvent.idl
 	mv $(GEN_COSTIMEREVENT_HRL_FILES) $(EXTERNAL_INC_PATH)
+	>IDL-GENERATED
+
+$(GEN_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/cosTransactions/doc/src/Makefile b/lib/cosTransactions/doc/src/Makefile
index 1af9ed24b7..7d959cbc8f 100644
--- a/lib/cosTransactions/doc/src/Makefile
+++ b/lib/cosTransactions/doc/src/Makefile
@@ -28,14 +28,6 @@ VSN=$(COSTRANSACTIONS_VSN)
 APPLICATION=cosTransactions
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -97,33 +89,10 @@ EXTRA_FILES = summary.html.src \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-
-TOP_PS_FILE = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -136,8 +105,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -152,32 +119,6 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) $(INTERNAL_HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) 
-
-endif
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -192,8 +133,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -203,30 +142,5 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-
-endif
-endif
-
-endif
 
 release_spec:
-
diff --git a/lib/cosTransactions/doc/src/make.dep b/lib/cosTransactions/doc/src/make.dep
deleted file mode 100644
index bd45aea286..0000000000
--- a/lib/cosTransactions/doc/src/make.dep
+++ /dev/null
@@ -1,27 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: CosTransactions_Control.tex CosTransactions_Coordinator.tex \
-		CosTransactions_RecoveryCoordinator.tex CosTransactions_Resource.tex \
-		CosTransactions_SubtransactionAwareResource.tex \
-		CosTransactions_Terminator.tex CosTransactions_TransactionFactory.tex \
-		book.tex ch_contents.tex ch_example.tex ch_install.tex \
-		ch_introduction.tex ch_skeletons.tex cosTransactions.tex \
-		part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-ch_example.tex: ../../../../system/doc/definitions/term.defs
-
diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile
index 7e10ec175b..e7d4b0b080 100644
--- a/lib/cosTransactions/src/Makefile
+++ b/lib/cosTransactions/src/Makefile
@@ -141,7 +141,7 @@ debug:
 	@${MAKE} TYPE=debug
 
 clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET)
+	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
@@ -155,9 +155,14 @@ docs:
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
-$(GEN_ERL_FILES) $(EXTERNAL_GEN_HRL_FILES): CosTransactions.idl
+IDL-GENERATED: CosTransactions.idl
 	erlc $(ERL_IDL_FLAGS) +'{cfgfile,"CosTransactions.cfg"}' CosTransactions.idl
 	mv $(GEN_HRL_FILES) $(EXTERNAL_INC_PATH)
+	>IDL-GENERATED
+
+$(GEN_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/cosTransactions/test/Makefile b/lib/cosTransactions/test/Makefile
index 44c90e8f84..0bc8c007da 100644
--- a/lib/cosTransactions/test/Makefile
+++ b/lib/cosTransactions/test/Makefile
@@ -121,13 +121,14 @@ docs:
 # Special Targets
 # ----------------------------------------------------
 
-TGT_TEST = \
-        $(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
-        $(GEN_MODULES:%=$(IDLOUTDIR)/%.erl)
-
-$(TGT_TEST): etrap_test.idl
+IDL-GENERATED: etrap_test.idl
 	erlc $(ERL_IDL_FLAGS) -o$(IDLOUTDIR) \
                 +'{cfgfile,"etrap_test.cfg"}' etrap_test.idl
+	>IDL-GENERATED
+
+$(GEN_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Targets
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 276c84d601..285537643e 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -41,6 +41,7 @@ CFLAGS = $(DED_CFLAGS)
 SSL_LIBDIR = @SSL_LIBDIR@
 SSL_INCLUDE = @SSL_INCLUDE@
 SSL_CRYPTO_LIBNAME = @SSL_CRYPTO_LIBNAME@
+SSL_SSL_LIBNAME = @SSL_SSL_LIBNAME@
 
 
 INCLUDES = $(SSL_INCLUDE) $(DED_INCLUDES)
@@ -84,7 +85,7 @@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
 
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
 SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
-CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
+CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
 else
 SSL_DED_LD_RUNTIME_LIBRARY_PATH=
 CRYPTO_LINK_LIB=$(SSL_LIBDIR)/lib$(SSL_CRYPTO_LIBNAME).a 
@@ -94,13 +95,9 @@ endif
 # Targets
 # ----------------------------------------------------
 
-debug opt valgrind: $(OBJDIR) $(LIBDIR) $(NIF_LIB)
+_create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
-$(OBJDIR):
-	-@mkdir -p $(OBJDIR)
-
-$(LIBDIR):
-	-@mkdir -p $(LIBDIR)
+debug opt valgrind: $(NIF_LIB)
 
 $(OBJDIR)/%$(TYPEMARKER).o: %.c
 	$(INSTALL_DIR) $(OBJDIR)
@@ -112,7 +109,7 @@ $(LIBDIR)/crypto$(TYPEMARKER).so: $(OBJS)
 
 $(LIBDIR)/crypto$(TYPEMARKER).dll: $(OBJS)
 	$(INSTALL_DIR) $(LIBDIR)
-	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -l$(SSL_CRYPTO_LIBNAME)
+	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
 
 clean:
 ifeq ($(findstring win32,$(TARGET)), win32)
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index c781ccb302..10fe333d18 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -134,8 +134,10 @@ static ERL_NIF_TERM hmac_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
 static ERL_NIF_TERM hmac_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM hmac_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM des_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM des_cfb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM des_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM des_ede3_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM des_ede3_cfb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_ctr_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -210,8 +212,10 @@ static ErlNifFunc nif_funcs[] = {
     {"hmac_final", 1, hmac_final},
     {"hmac_final_n", 2, hmac_final},
     {"des_cbc_crypt", 4, des_cbc_crypt},
+    {"des_cfb_crypt", 4, des_cfb_crypt},
     {"des_ecb_crypt", 3, des_ecb_crypt},
     {"des_ede3_cbc_crypt", 6, des_ede3_cbc_crypt},
+    {"des_ede3_cfb_crypt", 6, des_ede3_cfb_crypt},
     {"aes_cfb_128_crypt", 4, aes_cfb_128_crypt},
     {"aes_ctr_encrypt", 3, aes_ctr_encrypt},
     {"aes_ctr_decrypt", 3, aes_ctr_encrypt},
@@ -693,6 +697,25 @@ static ERL_NIF_TERM des_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
     return ret;
 }
 
+static ERL_NIF_TERM des_cfb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, Ivec, Text, IsEncrypt) */
+    ErlNifBinary key, ivec, text;
+    DES_key_schedule schedule;
+    DES_cblock ivec_clone; /* writable copy */
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key) || key.size != 8
+	|| !enif_inspect_binary(env, argv[1], &ivec) || ivec.size != 8
+	|| !enif_inspect_iolist_as_binary(env, argv[2], &text)) {
+	return enif_make_badarg(env);
+    }
+    memcpy(&ivec_clone, ivec.data, 8);
+    DES_set_key((const_DES_cblock*)key.data, &schedule);
+    DES_cfb_encrypt(text.data, enif_make_new_binary(env, text.size, &ret),
+		     8, text.size, &schedule, &ivec_clone, (argv[3] == atom_true));
+    return ret;
+}
+
 static ERL_NIF_TERM des_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Key, Text/Cipher, IsEncrypt) */
     ErlNifBinary key, text;
@@ -735,6 +758,31 @@ static ERL_NIF_TERM des_ede3_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_T
     return ret;
 }
 
+static ERL_NIF_TERM des_ede3_cfb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key1, Key2, Key3, IVec, Text/Cipher, IsEncrypt) */
+    ErlNifBinary key1, key2, key3, ivec, text;
+    DES_key_schedule schedule1, schedule2, schedule3;
+    DES_cblock ivec_clone; /* writable copy */
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key1) || key1.size != 8
+	|| !enif_inspect_iolist_as_binary(env, argv[1], &key2) || key2.size != 8
+	|| !enif_inspect_iolist_as_binary(env, argv[2], &key3) || key3.size != 8
+	|| !enif_inspect_binary(env, argv[3], &ivec) || ivec.size != 8
+	|| !enif_inspect_iolist_as_binary(env, argv[4], &text)) {
+	return enif_make_badarg(env);
+    }
+
+    memcpy(&ivec_clone, ivec.data, 8);
+    DES_set_key((const_DES_cblock*)key1.data, &schedule1);
+    DES_set_key((const_DES_cblock*)key2.data, &schedule2);
+    DES_set_key((const_DES_cblock*)key3.data, &schedule3);
+    DES_ede3_cfb_encrypt(text.data, enif_make_new_binary(env,text.size,&ret),
+			 8, text.size, &schedule1, &schedule2, &schedule3,
+			 &ivec_clone, (argv[5] == atom_true));
+    return ret;
+}
+
 static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Key, IVec, Data, IsEncrypt) */    
     ErlNifBinary key, ivec, text;
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 179ba4498c..824be09438 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -347,7 +347,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
     </func>
     <func>
       <name>sha_mac_96(Key, Data) -> Mac</name>
-      <fsummary>Compute an <c>MD5 MAC</c>message authentification code</fsummary>
+      <fsummary>Compute an <c>SHA MAC</c>message authentification code</fsummary>
       <type>
         <v>Key = Data = iolist() | binary()</v>
         <v>Mac = binary()</v>
@@ -404,6 +404,51 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       </desc>
     </func>
     <func>
+      <name>des_cfb_encrypt(Key, IVec, Text) -> Cipher</name>
+      <fsummary>Encrypt <c>Text</c>according to DES in CFB mode</fsummary>
+      <type>
+        <v>Key = Text = iolist() | binary()</v>
+        <v>IVec = Cipher = binary()</v>
+      </type>
+      <desc>
+        <p>Encrypts <c>Text</c> according to DES in 8-bit CFB
+          mode. <c>Key</c> is the DES key, and <c>IVec</c> is an
+          arbitrary initializing vector. The lengths of <c>Key</c> and
+          <c>IVec</c> must be 64 bits (8 bytes).</p>
+      </desc>
+    </func>
+    <func>
+      <name>des_cfb_decrypt(Key, IVec, Cipher) -> Text</name>
+      <fsummary>Decrypt <c>Cipher</c>according to DES in CFB mode</fsummary>
+      <type>
+        <v>Key = Cipher = iolist() | binary()</v>
+        <v>IVec = Text = binary()</v>
+      </type>
+      <desc>
+        <p>Decrypts <c>Cipher</c> according to DES in 8-bit CFB mode.
+          <c>Key</c> is the DES key, and <c>IVec</c> is an arbitrary
+          initializing vector.  <c>Key</c> and <c>IVec</c> must have
+          the same values as those used when encrypting.  The lengths of
+          <c>Key</c> and <c>IVec</c> must be 64 bits (8 bytes).</p>
+      </desc>
+    </func>
+    <func>
+      <name>des_cfb_ivec(IVec, Data) -> NextIVec</name>
+      <fsummary>Get <c>IVec</c> to be used in next iteration of
+                <c>des_cfb_[ecrypt|decrypt]</c></fsummary>
+      <type>
+        <v>IVec = iolist() | binary()</v>
+        <v>Data = iolist() | binary()</v>
+        <v>NextIVec = binary()</v>
+      </type>
+      <desc>
+        <p>Returns the <c>IVec</c> to be used in a next iteration of
+          <c>des_cfb_[encrypt|decrypt]</c>. <c>IVec</c> is the vector
+          used in the previous iteration step. <c>Data</c> is the encrypted
+          data from the previous iteration step.</p>
+      </desc>
+    </func>
+    <func>
       <name>des3_cbc_encrypt(Key1, Key2, Key3, IVec, Text) -> Cipher</name>
       <fsummary>Encrypt <c>Text</c>according to DES3 in CBC mode</fsummary>
       <type>
@@ -421,7 +466,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
     </func>
     <func>
       <name>des3_cbc_decrypt(Key1, Key2, Key3, IVec, Cipher) -> Text</name>
-      <fsummary>Decrypt <c>Cipher</c>according to DES in CBC mode</fsummary>
+      <fsummary>Decrypt <c>Cipher</c>according to DES3 in CBC mode</fsummary>
       <type>
         <v>Key1 = Key2 = Key3 = Cipher = iolist() | binary()</v>
         <v>IVec = Text = binary()</v>
@@ -437,6 +482,38 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
           <c>Key3</c>, and <c>IVec</c> must be 64 bits (8 bytes).</p>
       </desc>
     </func>
+    <func>
+      <name>des3_cfb_encrypt(Key1, Key2, Key3, IVec, Text) -> Cipher</name>
+      <fsummary>Encrypt <c>Text</c>according to DES3 in CFB mode</fsummary>
+      <type>
+        <v>Key1 =Key2 = Key3 Text = iolist() | binary()</v>
+        <v>IVec = Cipher = binary()</v>
+      </type>
+      <desc>
+        <p>Encrypts <c>Text</c> according to DES3 in 8-bit CFB
+          mode. <c>Key1</c>, <c>Key2</c>, <c>Key3</c>, are the DES
+          keys, and <c>IVec</c> is an arbitrary initializing
+          vector. The lengths of each of <c>Key1</c>, <c>Key2</c>,
+          <c>Key3</c> and <c>IVec</c> must be 64 bits (8 bytes).</p>
+      </desc>
+    </func>
+    <func>
+      <name>des3_cfb_decrypt(Key1, Key2, Key3, IVec, Cipher) -> Text</name>
+      <fsummary>Decrypt <c>Cipher</c>according to DES3 in CFB mode</fsummary>
+      <type>
+        <v>Key1 = Key2 = Key3 = Cipher = iolist() | binary()</v>
+        <v>IVec = Text = binary()</v>
+      </type>
+      <desc>
+        <p>Decrypts <c>Cipher</c> according to DES3 in 8-bit CFB mode.
+          <c>Key1</c>, <c>Key2</c>, <c>Key3</c> are the DES key, and
+          <c>IVec</c> is an arbitrary initializing vector.
+          <c>Key1</c>, <c>Key2</c>, <c>Key3</c> and <c>IVec</c> must
+          and <c>IVec</c> must have the same values as those used when
+          encrypting.  The lengths of <c>Key1</c>, <c>Key2</c>,
+          <c>Key3</c>, and <c>IVec</c> must be 64 bits (8 bytes).</p>
+      </desc>
+    </func>
 
     <func>
       <name>des_ecb_encrypt(Key, Text) -> Cipher</name>
@@ -744,7 +821,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
         <p>Generate a random number <c><![CDATA[N, Lo =< N < Hi.]]></c> Uses the
           <c>crypto</c> library pseudo-random number generator. The
           arguments (and result) can be either erlang integers or binary
-          multi-precision integers.</p>
+          multi-precision integers. <c>Hi</c> must be larger than <c>Lo</c>.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/crypto/doc/src/make.dep b/lib/crypto/doc/src/make.dep
deleted file mode 100644
index 73b090bbb6..0000000000
--- a/lib/crypto/doc/src/make.dep
+++ /dev/null
@@ -1,20 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex crypto.tex crypto_app.tex licenses.tex \
-		ref_man.tex usersguide.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index a5434ebd68..763f79e02d 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -30,6 +30,31 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 2.0.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    <c>crypto:rand_uniform</c> works correctly for negative
+	    integers. Fails with <c>badarg</c> exception for invalid
+	    ranges (when <c>Hi =&lt; Lo</c>) instead of returning
+	    incorrect output.</p>
+          <p>
+	    Own Id: OTP-9526</p>
+        </item>
+        <item>
+          <p>
+	    Fix win32 OpenSSL static linking (Thanks to Dave
+	    Cottlehuber)</p>
+          <p>
+	    Own Id: OTP-9532</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 2.0.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index c35dfcebab..e3b921f9fa 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -31,7 +31,9 @@
 -export([hmac_init/2, hmac_update/2, hmac_final/1, hmac_final_n/2]).
 -export([des_cbc_encrypt/3, des_cbc_decrypt/3, des_cbc_ivec/1]).
 -export([des_ecb_encrypt/2, des_ecb_decrypt/2]).
+-export([des_cfb_encrypt/3, des_cfb_decrypt/3, des_cfb_ivec/2]).
 -export([des3_cbc_encrypt/5, des3_cbc_decrypt/5]).
+-export([des3_cfb_encrypt/5, des3_cfb_decrypt/5]).
 -export([blowfish_ecb_encrypt/2, blowfish_ecb_decrypt/2]).
 -export([blowfish_cbc_encrypt/3, blowfish_cbc_decrypt/3]).
 -export([blowfish_cfb64_encrypt/3, blowfish_cfb64_decrypt/3]).
@@ -68,8 +70,10 @@
 		    sha_mac,  sha_mac_96,
                     sha_mac_init, sha_mac_update, sha_mac_final,
 		    des_cbc_encrypt, des_cbc_decrypt,
+		    des_cfb_encrypt, des_cfb_decrypt,
 		    des_ecb_encrypt, des_ecb_decrypt,
 		    des_ede3_cbc_encrypt, des_ede3_cbc_decrypt,
+		    des_ede3_cfb_encrypt, des_ede3_cfb_decrypt,
 		    aes_cfb_128_encrypt, aes_cfb_128_decrypt,
 		    rand_bytes,
 		    strong_rand_bytes,
@@ -294,6 +298,33 @@ des_cbc_ivec(Data) when is_list(Data) ->
     des_cbc_ivec(list_to_binary(Data)).
 
 %%
+%% DES - in 8-bits cipher feedback mode (CFB)
+%%
+-spec des_cfb_encrypt(iodata(), binary(), iodata()) -> binary().
+-spec des_cfb_decrypt(iodata(), binary(), iodata()) -> binary().
+
+des_cfb_encrypt(Key, IVec, Data) ->
+    des_cfb_crypt(Key, IVec, Data, true).
+
+des_cfb_decrypt(Key, IVec, Data) ->
+    des_cfb_crypt(Key, IVec, Data, false).
+
+des_cfb_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
+
+%%
+%% dec_cfb_ivec(IVec, Data) -> binary()
+%%
+%% Returns the IVec to be used in the next iteration of
+%% des_cfb_[encrypt|decrypt].
+%%
+-spec des_cfb_ivec(iodata(), iodata()) -> binary().
+
+des_cfb_ivec(IVec, Data) ->
+    IVecAndData = list_to_binary([IVec, Data]),
+    {_, NewIVec} = split_binary(IVecAndData, byte_size(IVecAndData) - 8),
+    NewIVec.
+
+%%
 %% DES - in electronic codebook mode (ECB)
 %%
 -spec des_ecb_encrypt(iodata(), iodata()) -> binary().
@@ -326,6 +357,26 @@ des_ede3_cbc_decrypt(Key1, Key2, Key3, IVec, Data) ->
 des_ede3_cbc_crypt(_Key1, _Key2, _Key3, _IVec, _Data, _IsEncrypt) -> ?nif_stub.    
 
 %%
+%% DES3 - in 8-bits cipher feedback mode (CFB)
+%%
+-spec des3_cfb_encrypt(iodata(), iodata(), iodata(), binary(), iodata()) ->
+			     binary().
+-spec des3_cfb_decrypt(iodata(), iodata(), iodata(), binary(), iodata()) ->
+			     binary().
+
+des3_cfb_encrypt(Key1, Key2, Key3, IVec, Data) ->
+    des_ede3_cfb_encrypt(Key1, Key2, Key3, IVec, Data).
+des_ede3_cfb_encrypt(Key1, Key2, Key3, IVec, Data) ->
+    des_ede3_cfb_crypt(Key1, Key2, Key3, IVec, Data, true).
+
+des3_cfb_decrypt(Key1, Key2, Key3, IVec, Data) ->
+    des_ede3_cfb_decrypt(Key1, Key2, Key3, IVec, Data).
+des_ede3_cfb_decrypt(Key1, Key2, Key3, IVec, Data) ->
+    des_ede3_cfb_crypt(Key1, Key2, Key3, IVec, Data, false).
+
+des_ede3_cfb_crypt(_Key1, _Key2, _Key3, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
+
+%%
 %% Blowfish
 %%
 -spec blowfish_ecb_encrypt(iodata(), iodata()) -> binary().
@@ -415,6 +466,13 @@ rand_uniform(From,To) when is_binary(From), is_binary(To) ->
 	    Whatever
     end;
 rand_uniform(From,To) when is_integer(From),is_integer(To) ->
+    if From < 0 -> 
+	    rand_uniform_pos(0, To - From) + From;
+       true ->
+	    rand_uniform_pos(From, To)
+    end.
+
+rand_uniform_pos(From,To) when From < To ->
     BinFrom = mpint(From),
     BinTo = mpint(To),
     case rand_uniform(BinFrom, BinTo) of
@@ -422,7 +480,9 @@ rand_uniform(From,To) when is_integer(From),is_integer(To) ->
             erlint(Result);
         Other ->
             Other
-    end.
+    end;
+rand_uniform_pos(_,_) ->
+    error(badarg).
 
 rand_uniform_nif(_From,_To) -> ?nif_stub.     
 
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 283aadb6ea..53b4c2a7e1 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -44,7 +44,11 @@
 	 md5_mac_io/1,
 	 des_cbc/1,
 	 des_cbc_iter/1,
+	 des_cfb/1,
+	 des_cfb_iter/1,
 	 des_ecb/1,
+	 des3_cbc/1,
+	 des3_cfb/1,
 	 aes_cfb/1,
 	 aes_cbc/1,
 	 aes_cbc_iter/1,
@@ -75,8 +79,8 @@ all() ->
      md5_mac_io, sha, sha_update, 
      hmac_update_sha, hmac_update_sha_n, hmac_update_md5_n, hmac_update_md5_io, hmac_update_md5,
      %% sha256, sha256_update, sha512,sha512_update,
-     des_cbc, aes_cfb, aes_cbc,
-     aes_cbc_iter, aes_ctr, aes_ctr_stream, des_cbc_iter, des_ecb,
+     des_cbc, des_cfb, des3_cbc, des3_cfb, aes_cfb, aes_cbc,
+     aes_cbc_iter, aes_ctr, aes_ctr_stream, des_cbc_iter, des_cfb_iter, des_ecb,
      rand_uniform_test, strong_rand_test,
      rsa_verify_test, dsa_verify_test, rsa_sign_test,
      dsa_sign_test, rsa_encrypt_decrypt, dh, exor_test,
@@ -138,14 +142,15 @@ link_test_2(Drv) ->
 	    Libs = os:cmd(Cmd),
 	    io:format("~p\n", [Libs]),
 	    case string:str(Libs, "libcrypto") of
-		0 -> ok;
-		_ ->
+		0 -> 
 		    case ?t:is_commercial() of
 			true ->
-			    ?t:fail({libcrypto,not_statically_linked});
+			    ?t:fail({libcrypto,statically_linked});
 			false ->
-			    {comment,"Not statically linked (OK for open-source platform)"}
-		    end
+			    {comment,"Statically linked (OK for open-source platform)"}
+		    end;
+		_ ->
+		    ok
 	    end
     end.
 
@@ -291,7 +296,7 @@ sha(Config) when is_list(Config) ->
 		hexstr2bin("84983E441C3BD26EBAAE4AA1F95129E5E54670F1")).
 
 
-%% 
+%%
 hmac_update_sha_n(doc) ->
     ["Request a larger-than-allowed SHA1 HMAC using hmac_init, hmac_update, and hmac_final_n. "
      "Expected values for examples are generated using crypto:sha_mac." ];
@@ -546,6 +551,40 @@ des_cbc_iter(Config) when is_list(Config) ->
 
 %%
 %%
+des_cfb(doc) ->
+    "Encrypt and decrypt according to CFB DES. and check the result. "
+	"Example is from FIPS-81.";
+des_cfb(suite) ->
+    [];
+des_cfb(Config) when is_list(Config) ->
+    ?line Key =  hexstr2bin("0123456789abcdef"),
+    ?line IVec = hexstr2bin("1234567890abcdef"),
+    ?line Plain = "Now is the",
+    ?line Cipher = crypto:des_cfb_encrypt(Key, IVec, Plain),
+    ?line m(Cipher, hexstr2bin("f31fda07011462ee187f")),
+    ?line m(list_to_binary(Plain),
+	    crypto:des_cfb_decrypt(Key, IVec, Cipher)).
+
+%%
+%%
+des_cfb_iter(doc) ->
+        "Encrypt and decrypt according to CFB DES in two steps, and "
+    "check the result. Example is from FIPS-81.";
+des_cfb_iter(suite) ->
+    [];
+des_cfb_iter(Config) when is_list(Config) ->
+    ?line Key =  hexstr2bin("0123456789abcdef"),
+    ?line IVec = hexstr2bin("1234567890abcdef"),
+    ?line Plain1 = "Now i",
+    ?line Plain2 = "s the",
+    ?line Cipher1 = crypto:des_cfb_encrypt(Key, IVec, Plain1),
+    ?line IVec2 = crypto:des_cfb_ivec(IVec, Cipher1),
+    ?line Cipher2 = crypto:des_cfb_encrypt(Key, IVec2, Plain2),
+    ?line Cipher = list_to_binary([Cipher1, Cipher2]),
+    ?line m(Cipher, hexstr2bin("f31fda07011462ee187f")).
+
+%%
+%%
 des_ecb(doc) ->
     "Encrypt and decrypt according to ECB DES and check the result. "
     "Example are from FIPS-81.";
@@ -568,6 +607,66 @@ des_ecb(Config) when is_list(Config) ->
 
 %%
 %%
+des3_cbc(doc) ->
+    "Encrypt and decrypt according to CBC 3DES, and check the result.";
+des3_cbc(suite) ->
+    [];
+des3_cbc(Config) when is_list(Config) ->
+    ?line Key1 = hexstr2bin("0123456789abcdef"),
+    ?line Key2 = hexstr2bin("fedcba9876543210"),
+    ?line Key3 = hexstr2bin("0f2d4b6987a5c3e1"),
+    ?line IVec = hexstr2bin("1234567890abcdef"),
+    ?line Plain = "Now is the time for all ",
+    ?line Cipher = crypto:des3_cbc_encrypt(Key1, Key2, Key3, IVec, Plain),
+    ?line m(Cipher, hexstr2bin("8a2667ee5577267cd9b1af2c5a0480"
+			       "0bac1ae66970fb2b89")),
+    ?line m(list_to_binary(Plain),
+	    crypto:des3_cbc_decrypt(Key1, Key2, Key3, IVec, Cipher)),
+    ?line Plain2 = "7654321 Now is the time for " ++ [0, 0, 0, 0],
+    ?line Cipher2 = crypto:des3_cbc_encrypt(Key1, Key2, Key3, IVec, Plain2),
+    ?line m(Cipher2, hexstr2bin("eb33ec6ede2c8e90f6877e77b95d5"
+				"4c83cee22907f7f0041ca1b7abe202bfafe")),
+    ?line m(list_to_binary(Plain2),
+	    crypto:des3_cbc_decrypt(Key1, Key2, Key3, IVec, Cipher2)),
+
+    ?line Key =  hexstr2bin("0123456789abcdef"),
+    ?line DESCipher = crypto:des3_cbc_encrypt(Key, Key, Key, IVec, Plain),
+    ?line m(DESCipher, hexstr2bin("e5c7cdde872bf27c43e934008c389c"
+			       "0f683788499a7c05f6")),
+    ?line m(list_to_binary(Plain),
+	    crypto:des3_cbc_decrypt(Key, Key, Key, IVec, DESCipher)),
+    ?line DESCipher2 = crypto:des3_cbc_encrypt(Key, Key, Key, IVec, Plain2),
+    ?line m(DESCipher2, hexstr2bin("b9916b8ee4c3da64b4f44e3cbefb9"
+				"9484521388fa59ae67d58d2e77e86062733")),
+    ?line m(list_to_binary(Plain2),
+	    crypto:des3_cbc_decrypt(Key, Key, Key, IVec, DESCipher2)).
+
+%%
+%%
+des3_cfb(doc) ->
+    "Encrypt and decrypt according to CFB 3DES, and check the result.";
+des3_cfb(suite) ->
+    [];
+des3_cfb(Config) when is_list(Config) ->
+    ?line Key1 = hexstr2bin("0123456789abcdef"),
+    ?line Key2 = hexstr2bin("fedcba9876543210"),
+    ?line Key3 = hexstr2bin("0f2d4b6987a5c3e1"),
+    ?line IVec = hexstr2bin("1234567890abcdef"),
+    ?line Plain = "Now is the time for all ",
+    ?line Cipher = crypto:des3_cfb_encrypt(Key1, Key2, Key3, IVec, Plain),
+    ?line m(Cipher, hexstr2bin("fc0ba7a20646ba53cc8bff263f0937"
+			       "1deab42a00666db02c")),
+    ?line m(list_to_binary(Plain),
+	    crypto:des3_cfb_decrypt(Key1, Key2, Key3, IVec, Cipher)),
+    ?line Plain2 = "7654321 Now is the time for " ++ [0, 0, 0, 0],
+    ?line Cipher2 = crypto:des3_cfb_encrypt(Key1, Key2, Key3, IVec, Plain2),
+    ?line m(Cipher2, hexstr2bin("8582c59ac01897422632c0accb66c"
+				"e413f5efab838fce7e41e2ba67705bad5bc")),
+    ?line m(list_to_binary(Plain2),
+	    crypto:des3_cfb_decrypt(Key1, Key2, Key3, IVec, Cipher2)).
+
+%%
+%%
 aes_cfb(doc) ->
     "Encrypt and decrypt according to AES CFB 128 bit and check "
 	"the result. Example are from NIST SP 800-38A.";
@@ -878,10 +977,17 @@ rand_uniform_aux_test(0) ->
 rand_uniform_aux_test(N) ->
     ?line L = N*1000,
     ?line H = N*100000+1,
+    ?line crypto_rand_uniform(L, H),
+    ?line crypto_rand_uniform(-L, L),
+    ?line crypto_rand_uniform(-H, -L),
+    ?line crypto_rand_uniform(-H, L),
+    ?line rand_uniform_aux_test(N-1).
+
+crypto_rand_uniform(L,H) ->
     ?line R1 = crypto:rand_uniform(L, H),
     ?line t(R1 >= L),
-    ?line t(R1 < H),
-    ?line rand_uniform_aux_test(N-1).
+    ?line t(R1 < H).
+
 
 %%
 %%
@@ -1225,8 +1331,8 @@ rc4_test(doc) ->
 rc4_test(suite) ->
     [];
 rc4_test(Config) when is_list(Config) ->
-    CT1 = <<"hej p� dig">>,
-    R1 = <<71,112,14,44,140,33,212,144,155,47>>,
+    CT1 = <<"Yo baby yo">>,
+    R1 = <<118,122,68,110,157,166,141,212,139,39>>,
     K = "apaapa",
     R1 = crypto:rc4_encrypt(K, CT1),
     CT1 = crypto:rc4_encrypt(K, R1),
@@ -1240,14 +1346,14 @@ rc4_stream_test(doc) ->
 rc4_stream_test(suite) ->
     [];
 rc4_stream_test(Config) when is_list(Config) ->
-    CT1 = <<"hej">>,
-    CT2 = <<" p� dig">>,
+    CT1 = <<"Yo ">>,
+    CT2 = <<"baby yo">>,
     K = "apaapa",
     State0 = crypto:rc4_set_key(K),
     {State1, R1} = crypto:rc4_encrypt_with_state(State0, CT1),
     {_State2, R2} = crypto:rc4_encrypt_with_state(State1, CT2),
     R = list_to_binary([R1, R2]),
-    <<71,112,14,44,140,33,212,144,155,47>> = R,
+    <<118,122,68,110,157,166,141,212,139,39>> = R,
     ok.
 
 blowfish_cfb64(doc) -> ["Test Blowfish encrypt/decrypt."];
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index e754aabc44..33fa9b1ec3 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 2.0.3
+CRYPTO_VSN = 2.0.4
diff --git a/lib/debugger/doc/src/debugger_chapter.xml b/lib/debugger/doc/src/debugger_chapter.xml
index 1f5d4dd5ff..2d812b0236 100644
--- a/lib/debugger/doc/src/debugger_chapter.xml
+++ b/lib/debugger/doc/src/debugger_chapter.xml
@@ -254,19 +254,17 @@ c_break(Bindings) ->
       used, for example, if an error occurs:</p>
     <pre>
 1> <input>catch a+1.</input>
-{'EXIT',{badarith,[{erlang,'+',[a,1]},
-                   {erl_eval,do_apply,5},
-                   {erl_eval,expr,5},
-                   {shell,exprs,6},
-                   {shell,eval_exprs,6},
-                   {shell,eval_loop,3}]}}</pre>
-
-    <p>In the case above, the stack trace shows that the function called
-      last was <c>erl_eval:eval_op/3</c>. See <em>Erlang Reference
-	Manual, Errors and Error handling</em>, for more information
-      about stack trace.</p>
-
-    <p>Debugger emulates the stack trace by keeping track of recently
+{'EXIT',{badarith,[{erlang,'+',[a,1],[]},
+                   {erl_eval,do_apply,5,[{file,"erl_eval.erl"},{line,562}]},
+                   {erl_eval,expr,5,[{file,"erl_eval.erl"},{line,359}]},
+                   {shell,exprs,7,[{file,"shell.erl"},{line,668}]},
+                   {shell,eval_exprs,7,[{file,"shell.erl"},{line,623}]},
+                   {shell,eval_loop,3,[{file,"shell.erl"},{line,608}]}]}}</pre>
+
+    <p>See the <em>Erlang Reference Manual, Errors and Error handling</em>,
+      for more information about the stack trace.</p>
+
+    <p>The Debugger emulates the stack trace by keeping track of recently
       called interpreted functions. (The real stack trace cannot be
       used, as it shows which functions of the Debugger have been
       called, rather than which interpreted functions).</p>
@@ -276,17 +274,15 @@ c_break(Bindings) ->
       <seealso marker="#attach">the Attach Process window</seealso>.
     </p>
 
-    <p>By default, the Debugger saves information about all current
+    <p>By default, the Debugger only saves information about recursive
       function calls, that is, function calls that have not yet returned
-      a value (option 'Stack On, Tail').</p>
-
-    <p>This means, however, that information is saved also for tail
-      recursive calls. For example, repeated calls to the <c>loop</c>
-      function of an Erlang process. This may consume unnecessary
-      amounts of memory for debugged processes with long lifetimes and
-      many tail recursive calls. It is therefore possible to set
-      the option 'Stack On, no tail', in which case information about
-      previous calls are discarded when a tail recursive call is made.
+      a value (option 'Stack On, No Tail').</p>
+
+    <p>Sometimes, however, it can be useful to save all calls, even
+      tail-recursive calls. That can be done with the 'Stack On, Tail'
+      option. Note that this option will consume more memory and slow
+      down execution of interpreted functions when there are many
+      tail-recursive calls.
     </p>
 
     <p>It is also possible to turn off the Debugger stack trace
diff --git a/lib/debugger/doc/src/int.xml b/lib/debugger/doc/src/int.xml
index 8b55461a44..c9d815755d 100644
--- a/lib/debugger/doc/src/int.xml
+++ b/lib/debugger/doc/src/int.xml
@@ -284,12 +284,12 @@ spawn(Module, Name, [Pid | Args])
 	<list>
 	  <item><c>all</c> - save information about all current calls,
 	    that is, function calls that have not yet returned a value.
-	    This is the default.</item>
+	    </item>
 	  <item><c>no_tail</c> - save information about current calls,
 	    but discard previous information when a tail recursive call
 	    is made. This option consumes less memory and may be
 	    necessary to use for processes with long lifetimes and many
-	    tail recursive calls.</item>
+	    tail recursive calls. This is the default.</item>
 	  <item><c>false</c> - do not save any information about current
 	    calls.</item>
 	</list>
diff --git a/lib/debugger/doc/src/make.dep b/lib/debugger/doc/src/make.dep
deleted file mode 100644
index c11fd3c21c..0000000000
--- a/lib/debugger/doc/src/make.dep
+++ /dev/null
@@ -1,29 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex debugger.tex debugger_chapter.tex \
-		i.tex int.tex part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: part.xml ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: images/attach.ps images/cond_break_dialog.ps \
-		images/function_break_dialog.ps images/interpret.ps \
-		images/line_break_dialog.ps images/monitor.ps \
-		images/view.ps
-
diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
index 8551fe887d..6dc7d0d783 100644
--- a/lib/debugger/src/Makefile
+++ b/lib/debugger/src/Makefile
@@ -44,6 +44,7 @@ MODULES= \
 	dbg_ieval \
 	dbg_iload \
 	dbg_iserver \
+	dbg_istk \
 	dbg_ui_break \
 	dbg_ui_break_win \
 	dbg_ui_edit \
diff --git a/lib/debugger/src/dbg_debugged.erl b/lib/debugger/src/dbg_debugged.erl
index 3732c40c73..18dcd92ff3 100644
--- a/lib/debugger/src/dbg_debugged.erl
+++ b/lib/debugger/src/dbg_debugged.erl
@@ -76,8 +76,8 @@ msg_loop(Meta, Mref, SaveStacktrace) ->
 	    msg_loop(Meta, Mref, SaveStacktrace);
 
 	%% Meta needs something evaluated within context of real process
-	{sys, Meta, {command, Command, Stacktrace}} ->
-	    Reply = handle_command(Command, Stacktrace),
+	{sys, Meta, {command,Command}} ->
+	    Reply = handle_command(Command),
 	    Meta ! {sys, self(), Reply},
 	    msg_loop(Meta, Mref, SaveStacktrace);
 
@@ -93,11 +93,12 @@ msg_loop(Meta, Mref, SaveStacktrace) ->
 	    end
     end.
 
-handle_command(Command, Stacktrace) ->
-    try reply(Command)
+handle_command(Command) ->
+    try
+	reply(Command)
     catch Class:Reason ->
-	    Stacktrace2 = stacktrace_f(erlang:get_stacktrace()),
-	    {exception, {Class,Reason,Stacktrace2++Stacktrace}}
+	    Stacktrace = stacktrace_f(erlang:get_stacktrace()),
+	    {exception,{Class,Reason,Stacktrace}}
     end.
 
 reply({apply,M,F,As}) ->
@@ -116,5 +117,5 @@ demonitor(Mref) ->
 %% Fix stacktrace - keep all above call to this module.
 %%
 stacktrace_f([]) -> [];
-stacktrace_f([{?MODULE,_,_}|_]) -> [];
+stacktrace_f([{?MODULE,_,_,_}|_]) -> [];
 stacktrace_f([F|S]) -> [F|stacktrace_f(S)].
diff --git a/lib/debugger/src/dbg_icmd.erl b/lib/debugger/src/dbg_icmd.erl
index e9502eaa2b..b230efaa7a 100644
--- a/lib/debugger/src/dbg_icmd.erl
+++ b/lib/debugger/src/dbg_icmd.erl
@@ -273,7 +273,7 @@ handle_int_msg({old_code,Mod}, Status, Bs,
 	    erase([Mod|db]),
 	    put(cache, []);
 	true ->
-	    case dbg_ieval:in_use_p(Mod, M) of
+	    case dbg_istk:in_use_p(Mod, M) of
 		true ->
 		    %% A call to Mod is on the stack (or might be),
 		    %% so we must terminate.
@@ -342,11 +342,11 @@ handle_user_msg({set,stack_trace,Flag}, _Status, _Bs, _Ieval) ->
 handle_user_msg({get,bindings,From,SP}, _Status, Bs, _Ieval) ->
     reply(From, bindings, bindings(Bs, SP));
 handle_user_msg({get,stack_frame,From,{Dir,SP}}, _Status, _Bs,_Ieval) ->
-    reply(From, stack_frame, dbg_ieval:stack_frame(Dir, SP));
+    reply(From, stack_frame, dbg_istk:stack_frame(Dir, SP));
 handle_user_msg({get,messages,From,_}, _Status, _Bs, _Ieval) ->
     reply(From, messages, messages());
-handle_user_msg({get,backtrace,From,N}, _Status, _Bs, _Ieval) ->
-    reply(From, backtrace, dbg_ieval:backtrace(N)).
+handle_user_msg({get,backtrace,From,N}, _Status, _Bs, Ieval) ->
+    reply(From, backtrace, dbg_istk:backtrace(N, Ieval)).
 
 set_stack_trace(true) ->
     set_stack_trace(all);
@@ -366,11 +366,11 @@ reply(From, Tag, Reply) ->
 bindings(Bs, nostack) ->
     Bs;
 bindings(Bs, SP) ->
-    case dbg_ieval:stack_level() of
+    case dbg_istk:stack_level() of
 	Le when SP > Le ->
 	    Bs;
 	_ ->
-	    dbg_ieval:bindings(SP)
+	    dbg_istk:bindings(SP)
     end.
 
 messages() ->
@@ -422,7 +422,7 @@ eval_nonrestricted({From, _Mod, Cmd, _SP}, Bs,
 
 eval_nonrestricted_1({match,_,{var,_,Var},Expr}, Bs, Ieval) ->
     {value,Res,Bs2} = 
-	dbg_ieval:eval_expr(Expr, Bs, Ieval#ieval{last_call=false}),
+	dbg_ieval:eval_expr(Expr, Bs, Ieval#ieval{top=false}),
     Bs3 = case lists:keyfind(Var, 1, Bs) of
 	      {Var,_Value} ->
 		  lists:keyreplace(Var, 1, Bs2, {Var,Res});
@@ -437,7 +437,7 @@ eval_nonrestricted_1({var,_,Var}, Bs, _Ieval) ->
     {Res,Bs};
 eval_nonrestricted_1(Expr, Bs, Ieval) ->
     {value,Res,Bs2} = 
-	dbg_ieval:eval_expr(Expr, Bs, Ieval#ieval{last_call=false}),
+	dbg_ieval:eval_expr(Expr, Bs, Ieval#ieval{top=false}),
     {Res,Bs2}.
 
 mark_running(LineNo, Le) ->
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl
index 306323f8ea..df725ed9e5 100644
--- a/lib/debugger/src/dbg_ieval.erl
+++ b/lib/debugger/src/dbg_ieval.erl
@@ -20,8 +20,7 @@
 
 -export([eval/3,exit_info/5]).
 -export([eval_expr/3]).
--export([check_exit_msg/3,exception/4,in_use_p/2]).
--export([stack_level/0, bindings/1, stack_frame/2, backtrace/1]).
+-export([check_exit_msg/3,exception/4]).
 
 -include("dbg_ieval.hrl").
 
@@ -71,13 +70,12 @@ exit_info(Int, AttPid, OrigPid, Reason, ExitInfo) ->
     
     case ExitInfo of
 	{{Mod,Line},Bs,S} ->
-	    Stack = binary_to_term(S),
-	    put(stack, Stack),
-	    Le = stack_level(Stack),
+	    dbg_istk:from_external(S),
+	    Le = dbg_istk:stack_level(),
 	    dbg_icmd:tell_attached({exit_at, {Mod, Line}, Reason, Le}),
 	    exit_loop(OrigPid, Reason, Bs,#ieval{module=Mod,line=Line});
 	{} ->
-	    put(stack, []),
+	    dbg_istk:init(),
 	    dbg_icmd:tell_attached({exit_at, null, Reason, 1}),
 	    exit_loop(OrigPid, Reason, erl_eval:new_bindings(),#ieval{})
     end.
@@ -142,12 +140,12 @@ check_exit_msg({'DOWN',_,_,_,Reason}, Bs,
 	    undefined when Le =:= 1 -> % died outside interpreted code
 		{};
 	    undefined when Le > 1 ->
-		StackBin = term_to_binary(get(stack)),
-		{{Mod, Li}, Bs, StackBin};
+		StackExternal = (dbg_istk:delayed_to_external())(),
+		{{Mod, Li}, Bs, StackExternal};
 
 	    %% Debugged has terminated due to an exception
-	    ExitInfo0 ->
-		ExitInfo0
+	    ExitInfo0 when is_function(ExitInfo0, 0) ->
+		ExitInfo0()
 	end,
     dbg_iserver:cast(get(int), {set_exit_info,self(),ExitInfo}),
 
@@ -170,30 +168,26 @@ check_exit_msg(_Msg, _Bs, _Ieval) ->
 %% and then raise the exception.
 %%--------------------------------------------------------------------
 exception(Class, Reason, Bs, Ieval) ->
-    exception(Class, Reason, fix_stacktrace(1), Bs, Ieval).
-
-exception(Class, Reason, Stacktrace, Bs, #ieval{module=M, line=Line}) ->
-    ExitInfo = {{M,Line}, Bs, term_to_binary(get(stack))},
+    exception(Class, Reason, Bs, Ieval, false).
+
+exception(Class, Reason, Bs, Ieval, false) ->
+    do_exception(Class, Reason,
+		 dbg_istk:delayed_stacktrace(no_args, Ieval),
+		 Bs, Ieval);
+exception(Class, Reason, Bs, Ieval, true) ->
+    do_exception(Class, Reason,
+		 dbg_istk:delayed_stacktrace(include_args, Ieval),
+		 Bs, Ieval).
+
+do_exception(Class, Reason, Stacktrace, Bs, #ieval{module=M, line=Line}) ->
+    StackFun = dbg_istk:delayed_to_external(),
+    ExitInfo = fun() ->
+		       {{M,Line},Bs,StackFun()}
+	       end,
     put(exit_info, ExitInfo),
     put(stacktrace, Stacktrace),
     erlang:Class(Reason).
 
-%%--------------------------------------------------------------------
-%% in_use_p(Mod, Cm) -> boolean()
-%%   Mod = Cm = atom()
-%% Returns true if Mod is found on the stack, otherwise false.
-%%--------------------------------------------------------------------
-in_use_p(Mod, Mod) -> true;
-in_use_p(Mod, _Cm) ->
-    case get(trace_stack) of
-	false -> true;
-	_ -> %  all | no_tail
-	    lists:any(fun({_,{M,_,_,_}}) when M =:= Mod -> true;
-			 (_) -> false
-		      end,
-		      get(stack))
-    end.
-
 %%====================================================================
 %% Internal functions
 %%====================================================================
@@ -225,7 +219,7 @@ meta(Int, Debugged, M, F, As) ->
     put(cache, []),
     put(next_break, Status), % break | running (other values later)
     put(self, Debugged),     % pid() interpreted process
-    put(stack, []),
+    dbg_istk:init(),
     put(stacktrace, []),
     put(trace_stack, dbg_iserver:call(Int, get_stack_trace)),
     put(trace, false),       % bool() Trace on/off
@@ -243,8 +237,7 @@ meta(Int, Debugged, M, F, As) ->
 
 debugged_cmd(Cmd, Bs, Ieval) ->
     Debugged = get(self),
-    Stacktrace = fix_stacktrace(2),
-    Debugged ! {sys, self(), {command,Cmd,Stacktrace}},
+    Debugged ! {sys, self(), {command,Cmd}},
     meta_loop(Debugged, Bs, Ieval).
 
 meta_loop(Debugged, Bs, #ieval{level=Le} = Ieval) ->
@@ -257,12 +250,17 @@ meta_loop(Debugged, Bs, #ieval{level=Le} = Ieval) ->
 	    {value, Val, Bs};
 	{sys, Debugged, {value,Val,Bs2}} ->
 	    {value, Val, Bs2};
-	{sys, Debugged, {exception,{Class,Reason,Stacktrace}}} ->
+	{sys, Debugged, {exception,{Class,Reason,Stk}}} ->
 	    case get(exit_info) of
 
-		%% Error occured outside interpreted code
+		%% Error occurred outside of interpreted code.
 		undefined ->
-		    exception(Class,Reason,Stacktrace,Bs,Ieval);
+		    MakeStk0 = dbg_istk:delayed_stacktrace(),
+		    MakeStk = fun(Depth0) ->
+				      Depth = max(0, Depth0 - length(Stk)),
+				      Stk ++ MakeStk0(Depth)
+			      end,
+		    do_exception(Class, Reason, MakeStk, Bs, Ieval);
 
 		%% Error must have occured within a re-entry to
 		%% interpreted code, simply raise the exception
@@ -275,7 +273,7 @@ meta_loop(Debugged, Bs, #ieval{level=Le} = Ieval) ->
 	    %% Reset process dictionary
 	    %% This is really only necessary if the process left
 	    %% interpreted code at a call level > 1
-	    put(stack, []),
+	    dbg_istk:init(),
 	    put(stacktrace, []),
 	    put(exit_info, undefined),
 	    
@@ -313,177 +311,6 @@ exit_loop(OrigPid, Reason, Bs, Ieval) ->
 	    exit_loop(OrigPid, Reason, Bs, Ieval)
     end.
 
-%%--Stack emulation---------------------------------------------------
-
-%% We keep track of a call stack that is used for
-%%  1) saving stack frames that can be inspected from an Attached
-%%     Process GUI (using dbg_icmd:get(Meta, stack_frame, {Dir, SP})
-%%  2) generate an approximation of regular stacktrace -- sent to
-%%     Debugged when it should raise an exception or evaluate a
-%%     function (since it might possible raise an exception)
-%%
-%% Stack = [Entry]
-%%   Entry = {Le, {MFA, Where, Bs}}
-%%     Le = int()         % current call level
-%%     MFA = {M,F,Args}   % called function (or fun)
-%%         | {Fun,Args}   %
-%%     Where = {M,Li}     % from where (module+line) function is called
-%%     Bs = bindings()    % current variable bindings
-%%
-%% How to push depends on the "Stack Trace" option (value saved in
-%% process dictionary item 'trace_stack').
-%%   all - everything is pushed
-%%   no_tail - tail recursive push
-%%   false - nothing is pushed
-%% Whenever a function returns, the corresponding call frame is popped.
-
-push(MFA, Bs, #ieval{level=Le,module=Cm,line=Li,last_call=Lc}) ->
-    Entry = {Le, {MFA, {Cm,Li}, Bs}},
-    case get(trace_stack) of
-	false -> ignore;
-	no_tail when Lc ->
-	    case get(stack) of
-		[] -> put(stack, [Entry]);
-		[_Entry|Entries] -> put(stack, [Entry|Entries])
-	    end;
-	_ -> % all | no_tail when Lc =:= false
-	    put(stack, [Entry|get(stack)])
-    end.
-
-pop() ->
-    case get(trace_stack) of
-	false -> ignore;
-	_ -> % all � no_tail
-	    case get(stack) of
-		[_Entry|Entries] ->
-		    put(stack, Entries);
-		[] ->
-		    ignore
-	    end
-    end.
-
-pop(Le) ->
-    case get(trace_stack) of
-	false -> ignore;
-	_ -> % all | no_tail
-	    put(stack, pop(Le, get(stack)))
-    end.
-
-pop(Level, [{Le, _}|Stack]) when Level=<Le ->
-    pop(Level, Stack);
-pop(_Level, Stack) ->
-    Stack.
-
-
-%% stack_level() -> Le
-%% stack_level(Stack) -> Le
-%% Top call level
-stack_level() ->
-    stack_level(get(stack)).
-
-stack_level([]) -> 1;
-stack_level([{Le,_}|_]) -> Le.
-
-%% fix_stacktrace(Start) -> Stacktrace
-%%   Start = 1|2
-%%   Stacktrace = [{M,F,Args|Arity} | {Fun,Args}]
-%% Convert internal stack format to imitation of regular stacktrace.
-%% Max three elements, no repeated (recursive) calls to the same
-%% function and convert argument lists to arity for all but topmost
-%% entry (and funs).
-%% 'Start' indicates where at get(stack) to start. This somewhat ugly
-%% solution is because fix_stacktrace has two uses: 1) to imitate
-%% the stacktrace in the case of an exception in the interpreted code,
-%% in which case the current call (top of the stack = first of the list)
-%% should be included, and 2) to send a current stacktrace to Debugged
-%% when evaluation passes into non-interpreted code, in which case
-%% the current call should NOT be included (as it is Debugged which
-%% will make the actual function call).
-fix_stacktrace(Start) ->
-    case fix_stacktrace2(sublist(get(stack), Start, 3)) of
-	[] ->
-	    [];
-	[H|T] ->
-	    [H|args2arity(T)]
-    end.
-
-sublist([], _Start, _Length) ->
-    []; % workaround, lists:sublist([],2,3) fails
-sublist(L, Start, Length) ->
-    lists:sublist(L, Start, Length).
-
-fix_stacktrace2([{_,{{M,F,As1},_,_}}, {_,{{M,F,As2},_,_}}|_])
-  when length(As1) =:= length(As2) ->
-    [{M,F,As1}];
-fix_stacktrace2([{_,{{Fun,As1},_,_}}, {_,{{Fun,As2},_,_}}|_])
-  when length(As1) =:= length(As2) ->
-    [{Fun,As1}];
-fix_stacktrace2([{_,{MFA,_,_}}|Entries]) ->
-    [MFA|fix_stacktrace2(Entries)];
-fix_stacktrace2([]) ->
-    [].
-
-args2arity([{M,F,As}|Entries]) when is_list(As) ->
-    [{M,F,length(As)}|args2arity(Entries)];
-args2arity([Entry|Entries]) ->
-    [Entry|args2arity(Entries)];
-args2arity([]) ->
-    [].
-
-%% bindings(SP) -> Bs
-%%   SP = Le  % stack pointer
-%% Return the bindings for the specified call level
-bindings(SP) ->
-    bindings(SP, get(stack)).
-
-bindings(SP, [{SP,{_MFA,_Wh,Bs}}|_]) ->
-    Bs;
-bindings(SP, [_Entry|Entries]) ->
-    bindings(SP, Entries);
-bindings(_SP, []) ->
-    erl_eval:new_bindings().
-
-%% stack_frame(Dir, SP) -> {Le, Where, Bs} | top | bottom
-%%   Dir = up | down
-%%   Where = {Cm, Li}
-%%     Cm = Module | undefined  % module
-%%     Li = int()  | -1         % line number
-%%     Bs = bindings()
-%% Return stack frame info one step up/down from given stack pointer
-%%  up = to lower call levels
-%%  down = to higher call levels
-stack_frame(up, SP) ->
-    stack_frame(SP, up, get(stack));
-stack_frame(down, SP) ->
-    stack_frame(SP, down, lists:reverse(get(stack))).
-
-stack_frame(SP, up, [{Le, {_MFA,Where,Bs}}|_]) when Le<SP ->
-    {Le, Where, Bs};
-stack_frame(SP, down, [{Le, {_MFA,Where,Bs}}|_]) when Le>SP ->
-    {Le, Where, Bs};
-stack_frame(SP, Dir, [{SP, _}|Stack]) ->
-    case Stack of
-	[{Le, {_MFA,Where,Bs}}|_] ->
-	    {Le, Where, Bs};
-	[] when Dir =:= up ->
-	    top;
-	[] when Dir =:= down ->
-	    bottom
-    end;
-stack_frame(SP, Dir, [_Entry|Stack]) ->
-    stack_frame(SP, Dir, Stack).
-
-%% backtrace(HowMany) -> Backtrace
-%%   HowMany = all | int()
-%%   Backtrace = {Le, MFA}
-%% Return all/the last N called functions, in reversed call order
-backtrace(HowMany) ->
-    Stack = case HowMany of
-		all -> get(stack);
-		N -> lists:sublist(get(stack), N)
-	    end,
-    [{Le, MFA} || {Le,{MFA,_Wh,_Bs}} <- Stack].
-
 %%--Trace function----------------------------------------------------
 
 %%--------------------------------------------------------------------
@@ -558,7 +385,7 @@ format_args1([]) ->
 
 %% Mimic catch behaviour
 catch_value(error, Reason) ->
-    {'EXIT',{Reason,get(stacktrace)}};
+    {'EXIT',{Reason,get_stacktrace()}};
 catch_value(exit, Reason) ->
     {'EXIT',Reason};
 catch_value(throw, Reason) ->
@@ -570,11 +397,13 @@ catch_value(throw, Reason) ->
 %% Top level function of meta evaluator. 
 %% Return message to be replied to the target process.
 %%--------------------------------------------------------------------
-eval_mfa(Debugged, M, F, As, Ieval) ->
+eval_mfa(Debugged, M, F, As, #ieval{level=Le}=Ieval0) ->
     Int = get(int),
     Bs = erl_eval:new_bindings(),
-    try eval_function(M,F,As,Bs,extern,Ieval#ieval{last_call=true}) of
+    Ieval = Ieval0#ieval{level=Le+1,top=true},
+    try do_eval_function(M, F, As, Bs, extern, Ieval) of
 	{value, Val, _Bs} ->
+	    trace(return, {Le,Val}),
 	    {ready, Val}
     catch
 	exit:{Debugged, Reason} ->
@@ -582,76 +411,68 @@ eval_mfa(Debugged, M, F, As, Ieval) ->
 	exit:{Int, Reason} ->
 	    exit(Reason);
 	Class:Reason ->
-	    {exception, {Class, Reason, get(stacktrace)}}
+	    {exception, {Class, Reason, get_stacktrace()}}
+    end.
+
+eval_function(Mod, Name, As, Bs, Called, Ieval0, Lc) ->
+    Tail = Lc andalso get(trace_stack) =:= no_tail,
+    case Tail of
+	false ->
+	    Ieval = dbg_istk:push(Bs, Ieval0, Lc),
+	    {value,Val,_} = do_eval_function(Mod, Name, As, Bs, Called, Ieval),
+	    dbg_istk:pop(),
+	    trace(return, {Ieval#ieval.level,Val}),
+	    {value,Val,Bs};
+	true ->
+	    do_eval_function(Mod, Name, As, Bs, Called, Ieval0)
     end.
 
-eval_function(Mod, Fun, As0, Bs0, _Called, Ieval) when is_function(Fun);
-						       Mod =:= ?MODULE,
-						       Fun =:= eval_fun ->
-    #ieval{level=Le, line=Li, last_call=Lc} = Ieval,
+do_eval_function(Mod, Fun, As0, Bs0, _, Ieval0) when is_function(Fun);
+						    Mod =:= ?MODULE,
+						    Fun =:= eval_fun ->
+    #ieval{level=Le,line=Li,top=Top} = Ieval0,
     case lambda(Fun, As0) of
-	{Cs,Module,Name,As,Bs} ->
-	    push({Module,Name,As}, Bs0, Ieval),
+	{[{clause,Fc,_,_,_}|_]=Cs,Module,Name,As,Bs} ->
+	    Ieval = Ieval0#ieval{module=Module,function=Name,
+				 arguments=As0,line=Fc},
 	    trace(call_fun, {Le,Li,Name,As}),
-	    {value, Val, _Bs} =
-		fnk_clauses(Cs, Module, Name, As, Bs,
-			    Ieval#ieval{level=Le+1}),
-	    pop(),
-	    trace(return, {Le,Val}),
-	    {value, Val, Bs0};
+	    fnk_clauses(Cs, As, Bs, Ieval);
 
-	not_interpreted when Lc -> % We are leaving interpreted code
+	not_interpreted when Top -> % We are leaving interpreted code
 	    trace(call_fun, {Le,Li,Fun,As0}),
 	    {value, {dbg_apply,erlang,apply,[Fun,As0]}, Bs0};
 	not_interpreted ->
-	    push({Fun,As0}, Bs0, Ieval),
 	    trace(call_fun, {Le,Li,Fun,As0}),
-	    {value, Val, _Bs} =
-		debugged_cmd({apply,erlang,apply,[Fun,As0]},Bs0,
-			     Ieval#ieval{level=Le+1}),
-	    pop(),
-	    trace(return, {Le,Val}),
-	    {value, Val, Bs0};
+	    debugged_cmd({apply,erlang,apply,[Fun,As0]}, Bs0, Ieval0);
 
 	{error,Reason} ->
 	    %% It's ok not to push anything in this case, the error
 	    %% reason contains information about the culprit
 	    %% ({badarity,{{Mod,Name},As}})
-	    exception(error, Reason, Bs0, Ieval)
+	    exception(error, Reason, Bs0, Ieval0)
     end;
 
 %% Common Test adaptation
-eval_function(ct_line, line, As, Bs, extern, #ieval{level=Le}=Ieval) ->
+do_eval_function(ct_line, line, As, Bs, extern, #ieval{level=Le}=Ieval) ->
     debugged_cmd({apply,ct_line,line,As}, Bs, Ieval#ieval{level=Le+1}),
     {value, ignore, Bs};
 
-eval_function(Mod, Name, As0, Bs0, Called, Ieval) ->
-    #ieval{level=Le, line=Li, last_call=Lc} = Ieval,
-
-    push({Mod,Name,As0}, Bs0, Ieval),
+do_eval_function(Mod, Name, As0, Bs0, Called, Ieval0) ->
+    #ieval{level=Le,line=Li,top=Top} = Ieval0,
     trace(call, {Called, {Le,Li,Mod,Name,As0}}),
-
+    Ieval = Ieval0#ieval{module=Mod,function=Name,arguments=As0},
     case get_function(Mod, Name, As0, Called) of
-	Cs when is_list(Cs) ->
-	    {value, Val, _Bs} =
-		fnk_clauses(Cs, Mod, Name, As0, erl_eval:new_bindings(),
-			    Ieval#ieval{level=Le+1}),
-	    pop(),
-	    trace(return, {Le,Val}),
-	    {value, Val, Bs0};
+	[{clause,FcLine,_,_,_}|_]=Cs ->
+	    fnk_clauses(Cs, As0, erl_eval:new_bindings(),
+			Ieval#ieval{line=FcLine});
 
-	not_interpreted when Lc -> % We are leaving interpreted code
+	not_interpreted when Top -> % We are leaving interpreted code
 	    {value, {dbg_apply,Mod,Name,As0}, Bs0};
 	not_interpreted ->
-	    {value, Val, _Bs} =
-		debugged_cmd({apply,Mod,Name,As0}, Bs0,
-			     Ieval#ieval{level=Le+1}),
-	    pop(),
-	    trace(return, {Le,Val}),
-	    {value, Val, Bs0};
+	    debugged_cmd({apply,Mod,Name,As0}, Bs0, Ieval);
 
 	undef ->
-	    exception(error, undef, Bs0, Ieval)
+	    exception(error, undef, Bs0, Ieval, true)
     end.
 
 lambda(eval_fun, [Cs,As,Bs,{Mod,Name}=F]) ->
@@ -752,23 +573,21 @@ cached(Key) ->
 
 %% Try to find a matching function clause
 %% #ieval.level is set, the other fields must be set in this function
-fnk_clauses([{clause,Line,Pars,Gs,Body}|Cs], M, F, As, Bs0, Ieval) ->
+fnk_clauses([{clause,Line,Pars,Gs,Body}|Cs], As, Bs0, Ieval) ->
     case head_match(Pars, As, [], Bs0) of
 	{match,Bs1} ->
 	    Bs = add_bindings(Bs1, Bs0),
 	    case guard(Gs, Bs) of
 		true ->
-		    seq(Body, Bs,
-			Ieval#ieval{line=Line,
-				    module=M,function=F,arguments=As});
+		    seq(Body, Bs, Ieval#ieval{line=Line});
 		false ->
-		    fnk_clauses(Cs, M, F, As, Bs0, Ieval)
+		    fnk_clauses(Cs, As, Bs0, Ieval)
 	    end;
 	nomatch ->
-	    fnk_clauses(Cs, M, F, As, Bs0, Ieval)
+	    fnk_clauses(Cs, As, Bs0, Ieval)
     end;
-fnk_clauses([], _M, _F, _As, Bs, Ieval) ->
-    exception(error, function_clause, Bs, Ieval).
+fnk_clauses([], _As, Bs, Ieval) ->
+    exception(error, function_clause, Bs, Ieval, true).
 
 seq([E], Bs0, Ieval) ->
     case dbg_icmd:cmd(E, Bs0, Ieval) of
@@ -782,7 +601,7 @@ seq([E|Es], Bs0, Ieval) ->
 	{skip,Bs} ->
 	    seq(Es, Bs, Ieval);
 	Bs1 ->
-	    {value,_,Bs} = expr(E, Bs1, Ieval#ieval{last_call=false}),
+	    {value,_,Bs} = expr(E, Bs1, Ieval#ieval{top=false}),
 	    seq(Es, Bs, Ieval)
     end;
 seq([], Bs, _) ->
@@ -804,10 +623,9 @@ expr({value,Val}, Bs, _Ieval) -> % Special case straight values
 
 %% List
 expr({cons,Line,H0,T0}, Bs0, Ieval0) ->
-    Ieval = Ieval0#ieval{line=Line},
-    Ieval1 = Ieval#ieval{last_call=false},
-    {value,H,Bs1} = expr(H0,Bs0,Ieval1),
-    {value,T,Bs2} = expr(T0,Bs0,Ieval1),
+    Ieval = Ieval0#ieval{line=Line,top=false},
+    {value,H,Bs1} = expr(H0, Bs0, Ieval),
+    {value,T,Bs2} = expr(T0, Bs0, Ieval),
     {value,[H|T],merge_bindings(Bs2, Bs1, Ieval)};
 
 %% Tuple
@@ -821,12 +639,12 @@ expr({block,Line,Es},Bs,Ieval) ->
 
 %% Catch statement
 expr({'catch',Line,Expr}, Bs0, Ieval) ->
-    try expr(Expr, Bs0, Ieval#ieval{line=Line, last_call=false})
+    try expr(Expr, Bs0, Ieval#ieval{line=Line, top=false})
     catch
 	Class:Reason ->
 	    %% Exception caught, reset exit info
 	    put(exit_info, undefined),
-	    pop(Ieval#ieval.level),
+	    dbg_istk:pop(Ieval#ieval.level),
 	    Value = catch_value(Class, Reason),
 	    trace(return, {Ieval#ieval.level,Value}),
 	    {value, Value, Bs0}
@@ -835,7 +653,7 @@ expr({'catch',Line,Expr}, Bs0, Ieval) ->
 %% Try-catch statement
 expr({'try',Line,Es,CaseCs,CatchCs,[]}, Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
-    try seq(Es, Bs0, Ieval#ieval{last_call=false}) of
+    try seq(Es, Bs0, Ieval#ieval{top=false}) of
 	{value,Val,Bs} = Value ->
 	    case CaseCs of
 		[] -> Value;
@@ -848,7 +666,7 @@ expr({'try',Line,Es,CaseCs,CatchCs,[]}, Bs0, Ieval0) ->
     end;
 expr({'try',Line,Es,CaseCs,CatchCs,As}, Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
-    try seq(Es, Bs0, Ieval#ieval{last_call=false}) of
+    try seq(Es, Bs0, Ieval#ieval{top=false}) of
 	{value,Val,Bs} = Value ->
 	    case CaseCs of
 		[] -> Value;
@@ -859,13 +677,13 @@ expr({'try',Line,Es,CaseCs,CatchCs,As}, Bs0, Ieval0) ->
 	Class:Reason when CatchCs =/= [] ->
 	    catch_clauses({Class,Reason,[]}, CatchCs, Bs0, Ieval)
     after
-            seq(As, Bs0, Ieval#ieval{last_call=false})
+            seq(As, Bs0, Ieval#ieval{top=false})
     end;
 
 %% Case statement
 expr({'case',Line,E,Cs}, Bs0, Ieval) ->
     {value,Val,Bs} =
-	expr(E, Bs0, Ieval#ieval{line=Line, last_call=false}),
+	expr(E, Bs0, Ieval#ieval{line=Line, top=false}),
     case_clauses(Val, Cs, Bs, case_clause, Ieval#ieval{line=Line});
 
 %% If statement
@@ -874,20 +692,20 @@ expr({'if',Line,Cs}, Bs, Ieval) ->
 
 %% Andalso/orelse
 expr({'andalso',Line,E1,E2}, Bs, Ieval) ->
-    case expr(E1, Bs, Ieval#ieval{line=Line, last_call=false}) of
+    case expr(E1, Bs, Ieval#ieval{line=Line, top=false}) of
 	{value,false,_}=Res ->
 	    Res;
 	{value,true,_} -> 
-	    expr(E2, Bs, Ieval#ieval{line=Line, last_call=false});
+	    expr(E2, Bs, Ieval#ieval{line=Line, top=false});
 	{value,Val,Bs} ->
 	    exception(error, {badarg,Val}, Bs, Ieval)
     end;
 expr({'orelse',Line,E1,E2}, Bs, Ieval) ->
-    case expr(E1, Bs, Ieval#ieval{line=Line, last_call=false}) of
+    case expr(E1, Bs, Ieval#ieval{line=Line, top=false}) of
 	{value,true,_}=Res ->
 	    Res;
 	{value,false,_} ->
-	    expr(E2, Bs, Ieval#ieval{line=Line, last_call=false});
+	    expr(E2, Bs, Ieval#ieval{line=Line, top=false});
 	{value,Val,_} ->
 	    exception(error, {badarg,Val}, Bs, Ieval)
     end;
@@ -895,7 +713,7 @@ expr({'orelse',Line,E1,E2}, Bs, Ieval) ->
 %% Matching expression
 expr({match,Line,Lhs,Rhs0}, Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
-    {value,Rhs,Bs1} = expr(Rhs0, Bs0, Ieval#ieval{last_call=false}),
+    {value,Rhs,Bs1} = expr(Rhs0, Bs0, Ieval#ieval{top=false}),
     case match(Lhs, Rhs, Bs1) of
 	{match,Bs} ->
 	    {value,Rhs,Bs};
@@ -951,21 +769,21 @@ expr({make_fun,Line,Name,Cs}, Bs, #ieval{module=Module}=Ieval) ->
     {value,Fun,Bs};
 
 %% Common test adaptation
-expr({call_remote,0,ct_line,line,As0}, Bs0, Ieval0) ->
+expr({call_remote,0,ct_line,line,As0,Lc}, Bs0, Ieval0) ->
     {As,_Bs} = eval_list(As0, Bs0, Ieval0),
-    eval_function(ct_line, line, As, Bs0, extern, Ieval0);
+    eval_function(ct_line, line, As, Bs0, extern, Ieval0, Lc);
 
 %% Local function call
-expr({local_call,Line,F,As0}, Bs0, #ieval{module=M} = Ieval0) ->
+expr({local_call,Line,F,As0,Lc}, Bs0, #ieval{module=M} = Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
     {As,Bs} = eval_list(As0, Bs0, Ieval),
-    eval_function(M, F, As, Bs, local, Ieval);
+    eval_function(M, F, As, Bs, local, Ieval, Lc);
 
 %% Remote function call
-expr({call_remote,Line,M,F,As0}, Bs0, Ieval0) ->
+expr({call_remote,Line,M,F,As0,Lc}, Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
     {As,Bs} = eval_list(As0, Bs0, Ieval),
-    eval_function(M, F, As, Bs, extern, Ieval);
+    eval_function(M, F, As, Bs, extern, Ieval, Lc);
 
 %% Emulated semantics of some BIFs
 expr({dbg,Line,self,[]}, Bs, #ieval{level=Le}) ->
@@ -975,9 +793,28 @@ expr({dbg,Line,self,[]}, Bs, #ieval{level=Le}) ->
     {value,Self,Bs};
 expr({dbg,Line,get_stacktrace,[]}, Bs, #ieval{level=Le}) ->
     trace(bif, {Le,Line,erlang,get_stacktrace,[]}),
-    Stacktrace = get(stacktrace),
+    Stacktrace = get_stacktrace(),
     trace(return, {Le,Stacktrace}),
     {value,Stacktrace,Bs};
+expr({dbg,Line,raise,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
+    %% Since erlang:get_stacktrace/0 is emulated, we will
+    %% need to emulate erlang:raise/3 too so that we can
+    %% capture the stacktrace.
+    Ieval = Ieval0#ieval{line=Line},
+    {[Class,Reason,Stk0]=As,Bs} = eval_list(As0, Bs0, Ieval),
+    trace(bif, {Le,Line,erlang,raise,As}),
+    try
+	%% Evaluate raise/3 for error checking and
+	%% truncating of the stacktrace to the correct depth.
+	Error = erlang:raise(Class, Reason, Stk0),
+	trace(return, {Le,Error}),
+	{value,Error,Bs}
+    catch
+	_:_ ->
+	    Stk = erlang:get_stacktrace(),	%Possibly truncated.
+	    StkFun = fun(_) -> Stk end,
+	    do_exception(Class, Reason, StkFun, Bs, Ieval)
+    end;
 expr({dbg,Line,throw,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
     {[Term],Bs} = eval_list(As0, Bs0, Ieval),
@@ -988,11 +825,6 @@ expr({dbg,Line,error,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
     {[Term],Bs} = eval_list(As0, Bs0, Ieval),
     trace(bif, {Le,Line,erlang,error,[Term]}),
     exception(error, Term, Bs, Ieval);
-expr({dbg,Line,fault,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
-    Ieval = Ieval0#ieval{line=Line},
-    {[Term],Bs} = eval_list(As0, Bs0, Ieval),
-    trace(bif, {Le,Line,erlang,fault,[Term]}),
-    exception(fault, Term, Bs, Ieval);
 expr({dbg,Line,exit,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
     {[Term],Bs} = eval_list(As0, Bs0, Ieval),
@@ -1001,36 +833,26 @@ expr({dbg,Line,exit,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
 
 %% Call to "safe" BIF, ie a BIF that can be executed in Meta process
 expr({safe_bif,Line,M,F,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
-    Ieval = Ieval0#ieval{line=Line},
-    {As,Bs} = eval_list(As0, Bs0, Ieval),
+    Ieval1 = Ieval0#ieval{line=Line},
+    {As,Bs} = eval_list(As0, Bs0, Ieval1),
     trace(bif, {Le,Line,M,F,As}),
-    push({M,F,As}, Bs0, Ieval),
+    Ieval2 = dbg_istk:push(Bs0, Ieval1, false),
+    Ieval = Ieval2#ieval{module=M,function=F,arguments=As,line=-1},
     {_,Value,_} = Res = safe_bif(M, F, As, Bs, Ieval),
     trace(return, {Le,Value}),
-    pop(),
+    dbg_istk:pop(),
     Res;
 
 %% Call to a BIF that must be evaluated in the correct process
 expr({bif,Line,M,F,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
-    Ieval = Ieval0#ieval{line=Line},
-    {As,Bs} = eval_list(As0, Bs0, Ieval),
+    Ieval1 = Ieval0#ieval{line=Line},
+    {As,Bs} = eval_list(As0, Bs0, Ieval1),
     trace(bif, {Le,Line,M,F,As}),
-    push({M,F,As}, Bs0, Ieval),
-    {_,Value,_} =
-	Res = debugged_cmd({apply,M,F,As}, Bs, Ieval#ieval{level=Le+1}),
+    Ieval2 = dbg_istk:push(Bs0, Ieval1, false),
+    Ieval = Ieval2#ieval{module=M,function=F,arguments=As,line=-1},
+    {_,Value,_} = Res = debugged_cmd({apply,M,F,As}, Bs, Ieval),
     trace(return, {Le,Value}),
-    pop(),
-    Res;
-
-%% Call to a BIF that spawns a new process
-expr({spawn_bif,Line,M,F,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
-    Ieval = Ieval0#ieval{line=Line},
-    {As,Bs} = eval_list(As0, Bs0, Ieval),
-    trace(bif, {Le,Line,M,F,As}),
-    push({M,F,As}, Bs0, Ieval),
-    Res = debugged_cmd({apply,M,F,As}, Bs,Ieval#ieval{level=Le+1}),
-    trace(return, {Le,Res}),
-    pop(),
+    dbg_istk:pop(),
     Res;
 
 %% Call to an operation
@@ -1046,7 +868,7 @@ expr({op,Line,Op,As0}, Bs0, Ieval0) ->
     end;
 
 %% apply/2 (fun)
-expr({apply_fun,Line,Fun0,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
+expr({apply_fun,Line,Fun0,As0,Lc}, Bs0, #ieval{level=Le}=Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
     FunValue = case expr(Fun0, Bs0, Ieval) of
 		   {value,{dbg_apply,Mx,Fx,Asx},Bsx} ->
@@ -1058,31 +880,20 @@ expr({apply_fun,Line,Fun0,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
     case FunValue of
 	{value,Fun,Bs1} when is_function(Fun) ->
 	    {As,Bs} = eval_list(As0, Bs1, Ieval),
-	    eval_function(undefined, Fun, As, Bs, extern, Ieval);
+	    eval_function(undefined, Fun, As, Bs, extern, Ieval, Lc);
 	{value,{M,F},Bs1} when is_atom(M), is_atom(F) ->
 	    {As,Bs} = eval_list(As0, Bs1, Ieval),
-	    eval_function(M, F, As, Bs, extern, Ieval);
+	    eval_function(M, F, As, Bs, extern, Ieval, Lc);
 	{value,BadFun,Bs1} ->
 	    exception(error, {badfun,BadFun}, Bs1, Ieval)
     end;
 
 %% apply/3
-expr({apply,Line,As0}, Bs0, Ieval0) ->
+expr({apply,Line,As0,Lc}, Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
     {[M,F,As],Bs} = eval_list(As0, Bs0, Ieval),
-    eval_function(M, F, As, Bs, extern, Ieval);
+    eval_function(M, F, As, Bs, extern, Ieval, Lc);
     
-%% Mod:module_info/0,1
-expr({module_info_0,_,Mod}, Bs, _Ieval) ->
-    {value,[{compile,module_info(Mod,compile)},
-	    {attributes,module_info(Mod,attributes)},
-	    {imports,module_info(Mod,imports)},
-	    {exports,module_info(Mod,exports)}],Bs};
-expr({module_info_1,Line,Mod,[As0]}, Bs0, Ieval0) ->
-    Ieval = Ieval0#ieval{line=Line},
-    {value,What,Bs} = expr(As0, Bs0, Ieval),
-    {value,module_info(Mod, What),Bs};
-
 %% Receive statement
 expr({'receive',Line,Cs}, Bs0, #ieval{level=Le}=Ieval) ->
     trace(receivex, {Le,false}),
@@ -1091,7 +902,7 @@ expr({'receive',Line,Cs}, Bs0, #ieval{level=Le}=Ieval) ->
 %% Receive..after statement
 expr({'receive',Line,Cs,To,ToExprs}, Bs0, #ieval{level=Le}=Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
-    {value,ToVal,ToBs} = expr(To, Bs0, Ieval#ieval{last_call=false}),
+    {value,ToVal,ToBs} = expr(To, Bs0, Ieval#ieval{top=false}),
     trace(receivex, {Le,true}),
     check_timeoutvalue(ToVal, ToBs, To, Ieval),
     {Stamp,_} = statistics(wall_clock),
@@ -1101,7 +912,7 @@ expr({'receive',Line,Cs,To,ToExprs}, Bs0, #ieval{level=Le}=Ieval0) ->
 %% Send (!)
 expr({send,Line,To0,Msg0}, Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
-    Ieval1 = Ieval#ieval{last_call=false},
+    Ieval1 = Ieval#ieval{top=false},
     {value,To,Bs1} = expr(To0, Bs0, Ieval1),
     {value,Msg,Bs2} = expr(Msg0, Bs0, Ieval1),
     Bs = merge_bindings(Bs2, Bs1, Ieval),
@@ -1110,10 +921,15 @@ expr({send,Line,To0,Msg0}, Bs0, Ieval0) ->
 %% Binary
 expr({bin,Line,Fs}, Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
-    eval_bits:expr_grp(Fs, Bs0,
-		       fun (E, B) -> expr(E, B, Ieval) end,
-		       [],
-		       false);
+    try
+	eval_bits:expr_grp(Fs, Bs0,
+			   fun (E, B) -> expr(E, B, Ieval) end,
+			   [],
+			   false)
+    catch
+	Class:Reason ->
+	    exception(Class, Reason, Bs0, Ieval)
+    end;
 
 %% List comprehension
 expr({lc,_Line,E,Qs}, Bs, Ieval) ->
@@ -1138,12 +954,12 @@ eval_lc(E, Qs, Bs, Ieval) ->
 
 eval_lc1(E, [{generate,Line,P,L0}|Qs], Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
-    {value,L1,Bs1} = expr(L0, Bs0, Ieval#ieval{last_call=false}),
+    {value,L1,Bs1} = expr(L0, Bs0, Ieval#ieval{top=false}),
     CompFun = fun(NewBs) -> eval_lc1(E, Qs, NewBs, Ieval) end,
     eval_generate(L1, P, Bs1, CompFun, Ieval);
 eval_lc1(E, [{b_generate,Line,P,L0}|Qs], Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
-    {value,Bin,_} = expr(L0, Bs0, Ieval#ieval{last_call=false}),
+    {value,Bin,_} = expr(L0, Bs0, Ieval#ieval{top=false}),
     CompFun = fun(NewBs) -> eval_lc1(E, Qs, NewBs, Ieval) end,
     eval_b_generate(Bin, P, Bs0, CompFun, Ieval);
 eval_lc1(E, [{guard,Q}|Qs], Bs0, Ieval) ->
@@ -1152,13 +968,13 @@ eval_lc1(E, [{guard,Q}|Qs], Bs0, Ieval) ->
 	false -> []
     end;
 eval_lc1(E, [Q|Qs], Bs0, Ieval) ->
-    case expr(Q, Bs0, Ieval#ieval{last_call=false}) of
+    case expr(Q, Bs0, Ieval#ieval{top=false}) of
 	{value,true,Bs} -> eval_lc1(E, Qs, Bs, Ieval);
 	{value,false,_Bs} -> [];
 	{value,V,Bs} -> exception(error, {bad_filter,V}, Bs, Ieval)
     end;
 eval_lc1(E, [], Bs, Ieval) ->
-    {value,V,_} = expr(E, Bs, Ieval#ieval{last_call=false}),
+    {value,V,_} = expr(E, Bs, Ieval#ieval{top=false}),
     [V].
 
 %% eval_bc(Expr,[Qualifier],Bindings,IevalState) ->
@@ -1171,12 +987,12 @@ eval_bc(E, Qs, Bs, Ieval) ->
 
 eval_bc1(E, [{generate,Line,P,L0}|Qs], Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
-    {value,L1,Bs1} = expr(L0, Bs0, Ieval#ieval{last_call=false}),
+    {value,L1,Bs1} = expr(L0, Bs0, Ieval#ieval{top=false}),
     CompFun = fun(NewBs) -> eval_bc1(E, Qs, NewBs, Ieval) end,
     eval_generate(L1, P, Bs1, CompFun, Ieval);
 eval_bc1(E, [{b_generate,Line,P,L0}|Qs], Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line},
-    {value,Bin,_} = expr(L0, Bs0, Ieval#ieval{last_call=false}),
+    {value,Bin,_} = expr(L0, Bs0, Ieval#ieval{top=false}),
     CompFun = fun(NewBs) -> eval_bc1(E, Qs, NewBs, Ieval) end,
     eval_b_generate(Bin, P, Bs0, CompFun, Ieval);
 eval_bc1(E, [{guard,Q}|Qs], Bs0, Ieval) ->
@@ -1185,13 +1001,13 @@ eval_bc1(E, [{guard,Q}|Qs], Bs0, Ieval) ->
 	false -> []
     end;
 eval_bc1(E, [Q|Qs], Bs0, Ieval) ->
-    case expr(Q, Bs0, Ieval#ieval{last_call=false}) of
+    case expr(Q, Bs0, Ieval#ieval{top=false}) of
 	{value,true,Bs} -> eval_bc1(E, Qs, Bs, Ieval);
 	{value,false,_Bs} -> [];
 	{value,V,Bs} -> exception(error, {bad_filter,V}, Bs, Ieval)
     end;
 eval_bc1(E, [], Bs, Ieval) ->
-    {value,V,_} = expr(E, Bs, Ieval#ieval{last_call=false}),
+    {value,V,_} = expr(E, Bs, Ieval#ieval{top=false}),
     [V].
 
 eval_generate([V|Rest], P, Bs0, CompFun, Ieval) ->
@@ -1208,7 +1024,7 @@ eval_generate(Term, _P, Bs, _CompFun, Ieval) ->
     exception(error, {bad_generator,Term}, Bs, Ieval).
 
 eval_b_generate(<<_/bitstring>>=Bin, P, Bs0, CompFun, Ieval) ->
-    Mfun = fun(L, R, Bs) -> match1(L, R, Bs, Bs0) end,
+    Mfun = match_fun(Bs0),
     Efun = fun(Exp, Bs) -> expr(Exp, Bs, #ieval{}) end,
     case eval_bits:bin_gen(P, Bin, erl_eval:new_bindings(), Bs0, Mfun, Efun) of
 	{match,Rest,Bs1} ->
@@ -1222,24 +1038,13 @@ eval_b_generate(<<_/bitstring>>=Bin, P, Bs0, CompFun, Ieval) ->
 eval_b_generate(Term, _P, Bs, _CompFun, Ieval) ->
     exception(error, {bad_generator,Term}, Bs, Ieval).
 
-module_info(Mod, module) -> Mod;
-module_info(_Mod, compile) -> [];
-module_info(Mod, attributes) ->
-    {ok, Attr} = dbg_iserver:call(get(int), {lookup, Mod, attributes}),
-    Attr;
-module_info(_Mod, imports) -> [];
-module_info(Mod, exports) ->
-    {ok, Exp} = dbg_iserver:call(get(int), {lookup, Mod, exports}),
-    Exp;
-module_info(_Mod, functions) -> [].
-
 safe_bif(M, F, As, Bs, Ieval) ->
     try apply(M, F, As) of
        	Value ->
 	    {value,Value,Bs}
     catch
 	Class:Reason ->
-	    exception(Class, Reason, Bs, Ieval)
+	    exception(Class, Reason, Bs, Ieval, true)
     end.
 
 eval_send(To, Msg, Bs, Ieval) ->
@@ -1408,12 +1213,12 @@ flush_traces(Debugged) ->
 %% eval_list(ExpressionList, Bindings, Ieval)
 %%  Evaluate a list of expressions "in parallel" at the same level.
 eval_list(Es, Bs, Ieval) ->
-    eval_list(Es, [], Bs, Bs, Ieval).
+    eval_list_1(Es, [], Bs, Bs, Ieval#ieval{top=false}).
 
-eval_list([E|Es], Vs, BsOrig, Bs0, Ieval) ->
-    {value,V,Bs1} = expr(E, BsOrig, Ieval#ieval{last_call=false}),
-    eval_list(Es, [V|Vs], BsOrig, merge_bindings(Bs1,Bs0,Ieval), Ieval);
-eval_list([], Vs, _, Bs, _Ieval) ->
+eval_list_1([E|Es], Vs, BsOrig, Bs0, Ieval) ->
+    {value,V,Bs1} = expr(E, BsOrig, Ieval),
+    eval_list_1(Es, [V|Vs], BsOrig, merge_bindings(Bs1, Bs0, Ieval), Ieval);
+eval_list_1([], Vs, _, Bs, _Ieval) ->
     {lists:reverse(Vs,[]),Bs}.
 
 %% if_clauses(Clauses, Bindings, Ieval)
@@ -1453,7 +1258,7 @@ catch_clauses(Exception, [{clause,_,[P],G,B}|CatchCs], Bs0, Ieval) ->
 		true ->
 		    %% Exception caught, reset exit info
 		    put(exit_info, undefined),
-		    pop(Ieval#ieval.level),
+		    dbg_istk:pop(Ieval#ieval.level),
 		    seq(B, Bs, Ieval);
 		false ->
 		    catch_clauses(Exception, CatchCs, Bs0, Ieval)
@@ -1588,11 +1393,9 @@ match1({cons,_,H,T}, [H1|T1], Bs0, BBs) ->
 match1({tuple,_,Elts}, Tuple, Bs, BBs) 
   when length(Elts) =:= tuple_size(Tuple) ->
     match_tuple(Elts, Tuple, 1, Bs, BBs);
-match1({bin,_,Fs}, B, Bs0, BBs0) when is_bitstring(B) ->
-    Bs1 = lists:sort(Bs0),  %Kludge.
-    BBs = lists:sort(BBs0),
-    try eval_bits:match_bits(Fs, B, Bs1, BBs,
-			     fun(L, R, Bs) -> match1(L, R, Bs, BBs) end,
+match1({bin,_,Fs}, B, Bs0, BBs) when is_bitstring(B) ->
+    try eval_bits:match_bits(Fs, B, Bs0, BBs,
+			     match_fun(BBs),
 			     fun(E, Bs) -> expr(E, Bs, #ieval{}) end,
 			     false)
     catch
@@ -1601,6 +1404,12 @@ match1({bin,_,Fs}, B, Bs0, BBs0) when is_bitstring(B) ->
 match1(_,_,_,_) ->
     throw(nomatch).
 
+match_fun(BBs) ->
+    fun(match, {L,R,Bs}) -> match1(L, R, Bs, BBs);
+       (binding, {Name,Bs}) -> binding(Name, Bs);
+       (add_binding, {Name,Val,Bs}) -> add_binding(Name, Val, Bs)
+    end.
+
 match_tuple([E|Es], Tuple, I, Bs0, BBs) ->
     {match,Bs} = match1(E, element(I, Tuple), Bs0, BBs),
     match_tuple(Es, Tuple, I+1, Bs, BBs);
@@ -1731,3 +1540,19 @@ add_binding(N,Val,[B1|Bs]) ->
     [B1|add_binding(N,Val,Bs)];
 add_binding(N,Val,[]) ->
     [{N,Val}].
+
+%% get_stacktrace() -> Stacktrace
+%%  Return the latest stacktrace for the process.
+get_stacktrace() ->
+    case get(stacktrace) of
+	MakeStk when is_function(MakeStk, 1) ->
+	    %% The stacktrace has not been constructed before.
+	    %% Construct it and remember the result.
+	    Depth = erlang:system_flag(backtrace_depth, 8),
+	    erlang:system_flag(backtrace_depth, Depth),
+	    Stk = MakeStk(Depth),
+	    put(stacktrace, Stk),
+	    Stk;
+	Stk when is_list(Stk) ->
+	    Stk
+    end.
diff --git a/lib/debugger/src/dbg_ieval.hrl b/lib/debugger/src/dbg_ieval.hrl
index a344748f48..ea6189ad02 100644
--- a/lib/debugger/src/dbg_ieval.hrl
+++ b/lib/debugger/src/dbg_ieval.hrl
@@ -21,6 +21,8 @@
 		module,           % MFA which called the currently
 		function,         %  interpreted function
 		arguments,        %
-		last_call = false % True if current expression is
-	       }).                % the VERY last to be evaluated
-                                  % (ie at all, not only in a clause)
+
+		%% True if the current expression is at the top level
+		%% (i.e. the next call will leave interpreted code).
+		top = false
+	       }).
diff --git a/lib/debugger/src/dbg_iload.erl b/lib/debugger/src/dbg_iload.erl
index 2ae0c333da..ce5631e45f 100644
--- a/lib/debugger/src/dbg_iload.erl
+++ b/lib/debugger/src/dbg_iload.erl
@@ -62,22 +62,23 @@ load_mod1(Mod, File, Binary, Db) ->
 store_module(Mod, File, Binary, Db) ->
     {interpreter_module, Exp, Abst, Src, MD5} = binary_to_term(Binary),
     Forms = case abstr(Abst) of
-		{abstract_v1,Forms0} -> Forms0;
-		{abstract_v2,Forms0} -> Forms0;
+		{abstract_v1,_} ->
+		    exit({Mod,too_old_beam_file});
+		{abstract_v2,_} ->
+		    exit({Mod,too_old_beam_file});
 		{raw_abstract_v1,Code0} ->
                     Code = interpret_file_attribute(Code0),
 		    {_,_,Forms0,_} = sys_pre_expand:module(Code, []),
 		    Forms0
 	    end,
     dbg_idb:insert(Db, mod_file, File),
-    dbg_idb:insert(Db, exports, Exp),
     dbg_idb:insert(Db, defs, []),
 
     put(vcount, 0),
     put(fun_count, 0),
     put(funs, []),
     put(mod_md5, MD5),
-    Attr = store_forms(Forms, Mod, Db, Exp, []),
+    store_forms(Forms, Mod, Db, Exp),
     erase(mod_md5),
     erase(current_function),
     %% store_funs(Db, Mod),
@@ -85,11 +86,10 @@ store_module(Mod, File, Binary, Db) ->
     erase(funs),
     erase(fun_count),
     
-    dbg_idb:insert(Db, attributes, Attr),
     NewBinary = store_mod_line_no(Mod, Db, binary_to_list(Src)),
     dbg_idb:insert(Db, mod_bin, NewBinary),
-    dbg_idb:insert(Db, mod_raw, <<Src/binary,0:8>>), %% Add eos
-    dbg_idb:insert(Db, module, Mod).
+    dbg_idb:insert(Db, mod_raw, <<Src/binary,0:8>>). %% Add eos
+
 %% Adjust line numbers using the file/2 attribute. 
 %% Also take the absolute value of line numbers.
 %% This simple fix will make the marker point at the correct line
@@ -111,27 +111,19 @@ abstr(Term) -> Term.
 %     store_funs_1(Fs, Db, Mod);
 % store_funs_1([], _, _) -> ok.
 
-store_forms([{function,_,module_info,0,_}|Fs], Mod, Db, Exp, Attr) ->
-    Cs = [{clause,0,[],[], [{module_info_0,0,Mod}]}],
-    dbg_idb:insert(Db, {Mod,module_info,0,true}, Cs),
-    store_forms(Fs, Mod, Db, Exp, Attr);
-store_forms([{function,_,module_info,1,_}|Fs], Mod, Db, Exp, Attr) ->
-    Cs = [{clause,0,[{var,0,'What'}],[], [{module_info_1,0,Mod,[{var,0,'What'}]}]}],
-    dbg_idb:insert(Db, {Mod,module_info,1,true}, Cs),
-    store_forms(Fs, Mod, Db, Exp, Attr);
-store_forms([{function,_,Name,Arity,Cs0}|Fs], Mod, Db, Exp, Attr) ->
+store_forms([{function,_,Name,Arity,Cs0}|Fs], Mod, Db, Exp) ->
     FA = {Name,Arity},
     put(current_function, FA),
     Cs = clauses(Cs0),
     Exported = lists:member(FA, Exp),
     dbg_idb:insert(Db, {Mod,Name,Arity,Exported}, Cs),
-    store_forms(Fs, Mod, Db, Exp, Attr);
-store_forms([{attribute,_,Name,Val}|Fs], Mod, Db, Exp, Attr) ->
-    store_forms(Fs, Mod, Db, Exp, [{Name,Val}|Attr]);
-store_forms([F|_], _Mod, _Db, _Exp, _Attr) ->
+    store_forms(Fs, Mod, Db, Exp);
+store_forms([{attribute,_,_Name,_Val}|Fs], Mod, Db, Exp) ->
+    store_forms(Fs, Mod, Db, Exp);
+store_forms([F|_], _Mod, _Db, _Exp) ->
     exit({unknown_form,F});
-store_forms([], _, _, _, Attr) ->
-    lists:reverse(Attr).
+store_forms([], _, _, _) ->
+    ok.
 
 store_mod_line_no(Mod, Db, Contents) ->
     store_mod_line_no(Mod, Db, Contents, 1, 0, []).
@@ -164,14 +156,14 @@ get_nl([],Pos,Head) -> {lists:reverse(Head),[],Pos}.
 %%% to interpret.
 
 clauses([C0|Cs]) ->
-    C1 = clause(C0),
+    C1 = clause(C0, true),
     [C1|clauses(Cs)];
 clauses([]) -> [].
 
-clause({clause,Line,H0,G0,B0}) ->
+clause({clause,Line,H0,G0,B0}, Lc) ->
     H1 = head(H0),
     G1 = guard(G0),
-    B1 = exprs(B0),
+    B1 = exprs(B0, Lc),
     {clause,Line,H1,G1,B1}.
 
 head(Ps) -> patterns(Ps).
@@ -219,7 +211,7 @@ pattern({bin,Line,Grp}) ->
     {bin,Line,Grp1};
 pattern({bin_element,Line,Expr,Size,Type}) ->
     Expr1 = pattern(Expr),
-    Size1 = expr(Size),
+    Size1 = expr(Size, false),
     {bin_element,Line,Expr1,Size1,Type}.
 
 %%  These patterns are processed "in parallel" for purposes of variable
@@ -235,8 +227,6 @@ guard([G0|Gs]) ->
     [G1|guard(Gs)];
 guard([]) -> [].
 
-and_guard([{atom,_,true}|Gs]) ->
-    and_guard(Gs);
 and_guard([G0|Gs]) ->
     G1 = guard_test(G0),
     [G1|and_guard(Gs)];
@@ -244,12 +234,7 @@ and_guard([]) -> [].
 
 guard_test({call,Line,{remote,_,{atom,_,erlang},{atom,_,F}},As0}) ->
     As = gexpr_list(As0),
-    case map_guard_bif(F, length(As0)) of
-	{ok,Name} ->
-	    {safe_bif,Line,erlang,Name,As};
-	error ->
-	    {safe_bif,Line,erlang,F,As}
-    end;
+    {safe_bif,Line,erlang,F,As};
 guard_test({op,Line,Op,L0}) ->
     true = erl_internal:arith_op(Op, 1) orelse %Assertion.
 	erl_internal:bool_op(Op, 1),
@@ -266,25 +251,18 @@ guard_test({op,Line,Op,L0,R0}) ->
     L1 = gexpr(L0),
     R1 = gexpr(R0),				%They see the same variables
     {safe_bif,Line,erlang,Op,[L1,R1]};
-guard_test({integer,_,_}=I) -> I;
-guard_test({char,_,_}=C) -> C;
-guard_test({float,_,_}=F) -> F;
-guard_test({atom,_,_}=A) -> A;
-guard_test({nil,_}=N) -> N;
-guard_test({var,_,_}=V) ->V.    % Boolean var
-
-map_guard_bif(integer, 1) -> {ok,is_integer};
-map_guard_bif(float, 1) -> {ok,is_float};
-map_guard_bif(number, 1) -> {ok,is_number};
-map_guard_bif(atom, 1) -> {ok,is_atom};
-map_guard_bif(list, 1) -> {ok,is_list};
-map_guard_bif(tuple, 1) -> {ok,is_tuple};
-map_guard_bif(pid, 1) -> {ok,is_pid};
-map_guard_bif(reference, 1) -> {ok,is_reference};
-map_guard_bif(port, 1) -> {ok,is_port};
-map_guard_bif(binary, 1) -> {ok,is_binary};
-map_guard_bif(function, 1) -> {ok,is_function};
-map_guard_bif(_, _) -> error.
+guard_test({var,_,_}=V) ->V;    % Boolean var
+guard_test({atom,Line,true}) -> {value,Line,true};
+%% All other constants at this level means false.
+guard_test({atom,Line,_}) -> {value,Line,false};
+guard_test({integer,Line,_}) -> {value,Line,false};
+guard_test({char,Line,_}) -> {value,Line,false};
+guard_test({float,Line,_}) -> {value,Line,false};
+guard_test({string,Line,_}) -> {value,Line,false};
+guard_test({nil,Line}) -> {value,Line,false};
+guard_test({cons,Line,_,_}) -> {value,Line,false};
+guard_test({tuple,Line,_}) -> {value,Line,false};
+guard_test({bin,Line,_}) ->  {value,Line,false}.
 
 gexpr({var,Line,V}) -> {var,Line,V};
 gexpr({integer,Line,I}) -> {value,Line,I};
@@ -341,186 +319,179 @@ gexpr_list([]) -> [].
 %%  These expressions are processed "sequentially" for purposes of variable
 %%  definition etc.
 
-exprs([E0|Es]) ->
-    E1 = expr(E0),
-    [E1|exprs(Es)];
-exprs([]) -> [].
-
-expr({var,Line,V}) -> {var,Line,V};
-expr({integer,Line,I}) -> {value,Line,I};
-expr({char,Line,I}) -> {value,Line,I};
-expr({float,Line,F}) -> {value,Line,F};
-expr({atom,Line,A}) -> {value,Line,A};
-expr({string,Line,S}) -> {value,Line,S};
-expr({nil,Line}) -> {value,Line,[]};
-expr({cons,Line,H0,T0}) ->
-    case {expr(H0),expr(T0)} of
+exprs([E], Lc) ->
+    [expr(E, Lc)];
+exprs([E0|Es], Lc) ->
+    E1 = expr(E0, false),
+    [E1|exprs(Es, Lc)];
+exprs([], _Lc) -> [].
+
+expr({var,Line,V}, _Lc) -> {var,Line,V};
+expr({integer,Line,I}, _Lc) -> {value,Line,I};
+expr({char,Line,I}, _Lc) -> {value,Line,I};
+expr({float,Line,F}, _Lc) -> {value,Line,F};
+expr({atom,Line,A}, _Lc) -> {value,Line,A};
+expr({string,Line,S}, _Lc) -> {value,Line,S};
+expr({nil,Line}, _Lc) -> {value,Line,[]};
+expr({cons,Line,H0,T0}, _Lc) ->
+    case {expr(H0, false),expr(T0, false)} of
 	{{value,Line,H1},{value,Line,T1}} -> {value,Line,[H1|T1]};
 	{H1,T1} -> {cons,Line,H1,T1}
     end;
-expr({tuple,Line,Es0}) ->
+expr({tuple,Line,Es0}, _Lc) ->
     Es1 = expr_list(Es0),
     {tuple,Line,Es1};
-expr({block,Line,Es0}) ->
+expr({block,Line,Es0}, Lc) ->
     %% Unfold block into a sequence.
-    Es1 = exprs(Es0),
+    Es1 = exprs(Es0, Lc),
     {block,Line,Es1};
-expr({'if',Line,Cs0}) ->
-    Cs1 = icr_clauses(Cs0),
+expr({'if',Line,Cs0}, Lc) ->
+    Cs1 = icr_clauses(Cs0, Lc),
     {'if',Line,Cs1};
-expr({'case',Line,E0,Cs0}) ->
-    E1 = expr(E0),
-    Cs1 = icr_clauses(Cs0),
+expr({'case',Line,E0,Cs0}, Lc) ->
+    E1 = expr(E0, false),
+    Cs1 = icr_clauses(Cs0, Lc),
     {'case',Line,E1,Cs1};
-expr({'receive',Line,Cs0}) ->
-    Cs1 = icr_clauses(Cs0),
+expr({'receive',Line,Cs0}, Lc) ->
+    Cs1 = icr_clauses(Cs0, Lc),
     {'receive',Line,Cs1};
-expr({'receive',Line,Cs0,To0,ToEs0}) ->
-    To1 = expr(To0),
-    ToEs1 = exprs(ToEs0),
-    Cs1 = icr_clauses(Cs0),
+expr({'receive',Line,Cs0,To0,ToEs0}, Lc) ->
+    To1 = expr(To0, false),
+    ToEs1 = exprs(ToEs0, Lc),
+    Cs1 = icr_clauses(Cs0, Lc),
     {'receive',Line,Cs1,To1,ToEs1};
-expr({'fun',Line,{clauses,Cs0},{_,_,Name}}) when is_atom(Name) ->
+expr({'fun',Line,{clauses,Cs0},{_,_,Name}}, _Lc) when is_atom(Name) ->
     %% New R10B-2 format (abstract_v2).
     Cs = fun_clauses(Cs0),
     {make_fun,Line,Name,Cs};
-expr({'fun',Line,{clauses,Cs0},{_,_,_,_,Name}}) when is_atom(Name) ->
-    %% New R8 format (abstract_v2).
-    Cs = fun_clauses(Cs0),
-    {make_fun,Line,Name,Cs};
-expr({'fun',Line,{function,F,A},{_Index,_OldUniq,Name}}) ->
+expr({'fun',Line,{function,F,A},{_Index,_OldUniq,Name}}, _Lc) ->
     %% New R8 format (abstract_v2).
     As = new_vars(A, Line),
-    Cs = [{clause,Line,As,[],[{local_call,Line,F,As}]}],
+    Cs = [{clause,Line,As,[],[{local_call,Line,F,As,true}]}],
     {make_fun,Line,Name,Cs};
-expr({'fun',_,{clauses,_},{_OldUniq,_Hvss,_Free}}) ->
-    %% Old format (abstract_v1).
-    exit({?MODULE,old_funs});
-expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,self}},[]}) ->
+expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,self}},[]}, _Lc) ->
     {dbg,Line,self,[]};
-expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,get_stacktrace}},[]}) ->
+expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,get_stacktrace}},[]}, _Lc) ->
     {dbg,Line,get_stacktrace,[]};
-expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,throw}},[_]=As}) ->
+expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,throw}},[_]=As}, _Lc) ->
     {dbg,Line,throw,expr_list(As)};
-expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,error}},[_]=As}) ->
+expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,error}},[_]=As}, _Lc) ->
     {dbg,Line,error,expr_list(As)};
-expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,fault}},[_]=As}) ->
-    {dbg,Line,fault,expr_list(As)};
-expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,exit}},[_]=As}) ->
+expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,exit}},[_]=As}, _Lc) ->
     {dbg,Line,exit,expr_list(As)};
-expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,apply}},[_,_,_]=As0}) ->
+expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,raise}},[_,_,_]=As}, _Lc) ->
+    {dbg,Line,raise,expr_list(As)};
+expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,apply}},[_,_,_]=As0}, Lc) ->
     As = expr_list(As0),
-    {apply,Line,As};
-expr({call,Line,{remote,_,{atom,_,Mod},{atom,_,Func}},As0}) ->
+    {apply,Line,As,Lc};
+expr({call,Line,{remote,_,{atom,_,Mod},{atom,_,Func}},As0}, Lc) ->
     As = expr_list(As0),
     case erlang:is_builtin(Mod, Func, length(As)) of
 	false ->
-	    {call_remote,Line,Mod,Func,As};
+	    {call_remote,Line,Mod,Func,As,Lc};
 	true ->
-	    case bif_type(Mod, Func) of
+	    case bif_type(Mod, Func, length(As0)) of
 		safe -> {safe_bif,Line,Mod,Func,As};
-		spawn -> {spawn_bif,Line,Mod,Func,As};
 		unsafe ->{bif,Line,Mod,Func,As}
 	    end
     end;
-expr({call,Line,{remote,_,Mod0,Func0},As0}) ->
+expr({call,Line,{remote,_,Mod0,Func0},As0}, Lc) ->
     %% New R8 format (abstract_v2).
-    Mod = expr(Mod0),
-    Func = expr(Func0),
+    Mod = expr(Mod0, false),
+    Func = expr(Func0, false),
     As = consify(expr_list(As0)),
-    {apply,Line,[Mod,Func,As]};
-expr({call,Line,{atom,_,Func},As0}) ->
+    {apply,Line,[Mod,Func,As],Lc};
+expr({call,Line,{atom,_,Func},As0}, Lc) ->
     As = expr_list(As0),
-    {local_call,Line,Func,As};
-expr({call,Line,Fun0,As0}) ->
-    Fun = expr(Fun0),
+    {local_call,Line,Func,As,Lc};
+expr({call,Line,Fun0,As0}, Lc) ->
+    Fun = expr(Fun0, false),
     As = expr_list(As0),
-    {apply_fun,Line,Fun,As};
-expr({'catch',Line,E0}) ->
+    {apply_fun,Line,Fun,As,Lc};
+expr({'catch',Line,E0}, _Lc) ->
     %% No new variables added.
-    E1 = expr(E0),
+    E1 = expr(E0, false),
     {'catch',Line,E1};
-expr({'try',Line,Es0,CaseCs0,CatchCs0,As0}) ->
+expr({'try',Line,Es0,CaseCs0,CatchCs0,As0}, Lc) ->
     %% No new variables added.
     Es = expr_list(Es0),
-    CaseCs = icr_clauses(CaseCs0),
-    CatchCs = icr_clauses(CatchCs0),
+    CaseCs = icr_clauses(CaseCs0, Lc),
+    CatchCs = icr_clauses(CatchCs0, Lc),
     As = expr_list(As0),
     {'try',Line,Es,CaseCs,CatchCs,As};
-expr({'query', Line, E0}) ->
-    E = expr(E0),
-    {'query', Line, E};
-expr({lc,Line,E0,Gs0}) ->			%R8.
+expr({lc,Line,E0,Gs0}, _Lc) ->			%R8.
     Gs = lists:map(fun ({generate,L,P0,Qs}) ->
-			   {generate,L,expr(P0),expr(Qs)};
+			   {generate,L,expr(P0, false),expr(Qs, false)};
 		       ({b_generate,L,P0,Qs}) -> %R12.
-			   {b_generate,L,expr(P0),expr(Qs)};
+			   {b_generate,L,expr(P0, false),expr(Qs, false)};
 		       (Expr) ->
-			   case is_guard_test(Expr) of
-			       true -> {guard,[[guard_test(Expr)]]};
-			       false -> expr(Expr)
+			   case is_guard(Expr) of
+			       true -> {guard,guard([[Expr]])};
+			       false -> expr(Expr, false)
 			   end
 		   end, Gs0),
-    {lc,Line,expr(E0),Gs};
-expr({bc,Line,E0,Gs0}) ->			%R12.
+    {lc,Line,expr(E0, false),Gs};
+expr({bc,Line,E0,Gs0}, _Lc) ->			%R12.
     Gs = lists:map(fun ({generate,L,P0,Qs}) ->
-			   {generate,L,expr(P0),expr(Qs)};
+			   {generate,L,expr(P0, false),expr(Qs, false)};
 		       ({b_generate,L,P0,Qs}) -> %R12.
-			   {b_generate,L,expr(P0),expr(Qs)};
+			   {b_generate,L,expr(P0, false),expr(Qs, false)};
 		       (Expr) ->
-			   case is_guard_test(Expr) of
-			       true -> {guard,[[guard_test(Expr)]]};
-			       false -> expr(Expr)
+			   case is_guard(Expr) of
+			       true -> {guard,guard([[Expr]])};
+			       false -> expr(Expr, false)
 			   end
 		   end, Gs0),
-    {bc,Line,expr(E0),Gs};
-expr({match,Line,P0,E0}) ->
-    E1 = expr(E0),
+    {bc,Line,expr(E0, false),Gs};
+expr({match,Line,P0,E0}, _Lc) ->
+    E1 = expr(E0, false),
     P1 = pattern(P0),
     {match,Line,P1,E1};
-expr({op,Line,Op,A0}) ->
-    A1 = expr(A0),
+expr({op,Line,Op,A0}, _Lc) ->
+    A1 = expr(A0, false),
     {op,Line,Op,[A1]};
-expr({op,Line,'++',L0,R0}) ->
-    L1 = expr(L0),
-    R1 = expr(R0),				%They see the same variables
+expr({op,Line,'++',L0,R0}, _Lc) ->
+    L1 = expr(L0, false),
+    R1 = expr(R0, false),		  %They see the same variables
     {op,Line,append,[L1,R1]};
-expr({op,Line,'--',L0,R0}) ->
-    L1 = expr(L0),
-    R1 = expr(R0),				%They see the same variables
+expr({op,Line,'--',L0,R0}, _Lc) ->
+    L1 = expr(L0, false),
+    R1 = expr(R0, false),		  %They see the same variables
     {op,Line,subtract,[L1,R1]};
-expr({op,Line,'!',L0,R0}) ->
-    L1 = expr(L0),
-    R1 = expr(R0),				%They see the same variables
+expr({op,Line,'!',L0,R0}, _Lc) ->
+    L1 = expr(L0, false),
+    R1 = expr(R0, false),		  %They see the same variables
     {send,Line,L1,R1};
-expr({op,Line,Op,L0,R0}) when Op =:= 'andalso'; Op =:= 'orelse' ->
-    L1 = expr(L0),
-    R1 = expr(R0),				%They see the same variables
+expr({op,Line,Op,L0,R0}, _Lc) when Op =:= 'andalso'; Op =:= 'orelse' ->
+    L1 = expr(L0, false),
+    R1 = expr(R0, false),		  %They see the same variables
     {Op,Line,L1,R1};
-expr({op,Line,Op,L0,R0}) ->
-    L1 = expr(L0),
-    R1 = expr(R0),				%They see the same variables
+expr({op,Line,Op,L0,R0}, _Lc) ->
+    L1 = expr(L0, false),
+    R1 = expr(R0, false),		  %They see the same variables
     {op,Line,Op,[L1,R1]};
-expr({bin,Line,Grp}) ->
+expr({bin,Line,Grp}, _Lc) ->
     Grp1 = expr_list(Grp),
     {bin,Line,Grp1};
-expr({bin_element,Line,Expr,Size,Type}) ->
-    Expr1 = expr(Expr),
-    Size1 = expr(Size),
+expr({bin_element,Line,Expr,Size,Type}, _Lc) ->
+    Expr1 = expr(Expr, false),
+    Size1 = expr(Size, false),
     {bin_element,Line,Expr1,Size1,Type};
-expr(Other) ->
+expr(Other, _Lc) ->
     exit({?MODULE,{unknown_expr,Other}}).
 
-%% is_guard_test(Expression) -> true | false.
-%%  Test if a general expression is a guard test.  Cannot use erl_lint
-%%  here as sys_pre_expand has transformed source.
+%% is_guard(Expression) -> true | false.
+%%  Test if a general expression is a guard test or guard BIF.
+%%  Cannot use erl_lint here as sys_pre_expand has transformed source.
 
-is_guard_test({op,_,Op,L,R}) ->
+is_guard({op,_,Op,L,R}) ->
     erl_internal:comp_op(Op, 2) andalso is_gexpr_list([L,R]);
-is_guard_test({call,_,{remote,_,{atom,_,erlang},{atom,_,Test}},As}) ->
-    erl_internal:type_test(Test, length(As)) andalso is_gexpr_list(As);
-is_guard_test({atom,_,true}) -> true;
-is_guard_test(_) -> false.
+is_guard({call,_,{remote,_,{atom,_,erlang},{atom,_,Test}},As}) ->
+    Arity = length(As),
+    (erl_internal:guard_bif(Test, Arity) orelse
+     erl_internal:old_type_test(Test, Arity)) andalso is_gexpr_list(As);
+is_guard({atom,_,true}) -> true;
+is_guard(_) -> false.
 
 is_gexpr({var,_,_}) -> true;
 is_gexpr({atom,_,_}) -> true;
@@ -555,17 +526,17 @@ consify([]) -> {value,0,[]}.
 %%  definition etc.
 
 expr_list([E0|Es]) ->
-    E1 = expr(E0),
+    E1 = expr(E0, false),
     [E1|expr_list(Es)];
 expr_list([]) -> [].
 
-icr_clauses([C0|Cs]) ->
-    C1 = clause(C0),
-    [C1|icr_clauses(Cs)];
-icr_clauses([]) -> [].
+icr_clauses([C0|Cs], Lc) ->
+    C1 = clause(C0, Lc),
+    [C1|icr_clauses(Cs, Lc)];
+icr_clauses([], _) -> [].
 
 fun_clauses([{clause,L,H,G,B}|Cs]) ->
-    [{clause,L,head(H),guard(G),exprs(B)}|fun_clauses(Cs)];
+    [{clause,L,head(H),guard(G),exprs(B, true)}|fun_clauses(Cs)];
 fun_clauses([]) -> [].
 
 %% new_var_name() -> VarName.
@@ -585,24 +556,21 @@ new_vars(N, L, Vs) when N > 0 ->
     new_vars(N-1, L, [V|Vs]);
 new_vars(0, _, Vs) -> Vs.
 
-bif_type(erlang, Name) -> bif_type(Name);
-bif_type(_, _) -> unsafe.
+bif_type(erlang, Name, Arity) ->
+    case erl_internal:guard_bif(Name, Arity) of
+	true ->
+	    %% Guard BIFs are safe (except for self/0, but it is
+	    %% handled with a special instruction anyway).
+	    safe;
+	false ->
+	    bif_type(Name)
+    end;
+bif_type(_, _, _) -> unsafe.
 
 bif_type(register)           -> safe;
 bif_type(unregister)         -> safe;
 bif_type(whereis)            -> safe;
 bif_type(registered)         -> safe;
-bif_type(abs)                -> safe;
-bif_type(float)              -> safe;
-bif_type(trunc)              -> safe;
-bif_type(round)              -> safe;
-bif_type(math)               -> safe;
-bif_type(node)               -> safe;
-bif_type(length)             -> safe;
-bif_type(hd)                 -> safe;
-bif_type(tl)                 -> safe;
-bif_type(size)               -> safe;
-bif_type(element)            -> safe;
 bif_type(setelement)         -> safe;
 bif_type(atom_to_list)       -> safe;
 bif_type(list_to_atom)       -> safe;
@@ -627,22 +595,14 @@ bif_type(list_to_pid)        -> safe;
 bif_type(module_loaded)      -> safe;
 bif_type(binary_to_term)     -> safe;
 bif_type(term_to_binary)     -> safe;
-bif_type(alive)              -> safe;
-bif_type(notalive)           -> safe;
 bif_type(nodes)              -> safe;
 bif_type(is_alive)           -> safe;
 bif_type(disconnect_node)    -> safe;
 bif_type(binary_to_list)     -> safe;
 bif_type(list_to_binary)     -> safe;
 bif_type(split_binary)       -> safe;
-bif_type(concat_binary)      -> safe;
-bif_type(term_to_atom)       -> safe;
 bif_type(hash)               -> safe;
 bif_type(pre_loaded)         -> safe;
-bif_type(info)               -> safe;
 bif_type(set_cookie)         -> safe;
 bif_type(get_cookie)         -> safe;
-bif_type(spawn)              -> spawn;
-bif_type(spawn_link)         -> spawn;
-bif_type(spawn_opt)          -> spawn;
 bif_type(_)                  -> unsafe.
diff --git a/lib/debugger/src/dbg_iserver.erl b/lib/debugger/src/dbg_iserver.erl
index 212bc2b8ab..1bb73a43b9 100644
--- a/lib/debugger/src/dbg_iserver.erl
+++ b/lib/debugger/src/dbg_iserver.erl
@@ -97,13 +97,10 @@ ensure_started() ->
 %%
 %% Key                        Value
 %% ---                        -----
-%% attributes                 Attr
-%% exports                    Exp
 %% defs                       []
 %% mod_bin                    Binary
 %% mod_raw                    Raw Binary
 %% mod_file                   File
-%% module                     Mod
 %% {Mod,Name,Arity,Exported}  Cs
 %% {'fun',Mod,Index,Uniq}     {Name,Arity,Cs}
 %% Line                       {Pos,PosNL}
@@ -117,7 +114,7 @@ init([]) ->
     process_flag(trap_exit, true),
     global:register_name(?MODULE, self()),
     Db = ets:new(?MODULE, [ordered_set, protected]),
-    {ok, #state{db=Db, auto=false, stack=all}}.
+    {ok, #state{db=Db, auto=false, stack=no_tail}}.
 
 %% Attaching to a process
 handle_call({attached, AttPid, Pid}, _From, State) ->
diff --git a/lib/debugger/src/dbg_istk.erl b/lib/debugger/src/dbg_istk.erl
new file mode 100644
index 0000000000..c6922a80e4
--- /dev/null
+++ b/lib/debugger/src/dbg_istk.erl
@@ -0,0 +1,245 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+-module(dbg_istk).
+-export([init/0,delayed_to_external/0,from_external/1,
+	 push/3,pop/0,pop/1,stack_level/0,
+	 delayed_stacktrace/0,delayed_stacktrace/2,
+	 bindings/1,stack_frame/2,backtrace/2,
+	 in_use_p/2]).
+
+-include("dbg_ieval.hrl").
+
+-define(STACK, ?MODULE).
+
+-record(e,
+	{level,					%Level
+	 mfa,					%{Mod,Func,Args|Arity}|{Fun,Args}
+	 line,					%Line called from
+	 bindings,
+	 lc					%Last call (true|false)
+	 }).
+
+init() ->
+    init([]).
+
+delayed_to_external() ->
+    Stack = get(?STACK),
+    fun() -> {stack,term_to_binary(Stack)} end.
+
+from_external({stack,Stk}) ->
+    put(?STACK, binary_to_term(Stk)).
+
+init(Stack) ->
+    put(?STACK, Stack).
+
+%% We keep track of a call stack that is used for
+%%  1) saving stack frames that can be inspected from an Attached
+%%     Process GUI (using dbg_icmd:get(Meta, stack_frame, {Dir, SP})
+%%  2) generate an approximation of regular stacktrace -- sent to
+%%     Debugged when it should raise an exception or evaluate a
+%%     function (since it might possible raise an exception)
+%%
+%% How to push depends on the "Stack Trace" option (value saved in
+%% process dictionary item 'trace_stack').
+%%   all - everything is pushed
+%%   no_tail - tail recursive push
+%%   false - nothing is pushed
+%% Whenever a function returns, the corresponding call frame is popped.
+
+push(Bs, #ieval{level=Le,module=Mod,function=Name,
+		arguments=As,line=Li}=Ieval, Lc) ->
+    Entry = #e{level=Le,mfa={Mod,Name,As},line=Li,bindings=Bs,lc=Lc},
+    case get(trace_stack) of
+	false ->
+	    Ieval#ieval{level=Le+1};
+	no_tail when Lc ->
+	    Ieval;
+	_ -> % all | no_tail when Lc =:= false
+	    put(?STACK, [Entry|get(?STACK)]),
+	    Ieval#ieval{level=Le+1}
+    end.
+
+pop() ->
+    case get(trace_stack) of
+	false -> ignore;
+	_ -> % all ¦ no_tail
+	    case get(?STACK) of
+		[_Entry|Entries] ->
+		    put(?STACK, Entries);
+		[] ->
+		    ignore
+	    end
+    end.
+
+pop(Le) ->
+    case get(trace_stack) of
+	false -> ignore;
+	_ -> % all | no_tail
+	    put(?STACK, pop(Le, get(?STACK)))
+    end.
+
+pop(Level, [#e{level=Le}|Stack]) when Level =< Le ->
+    pop(Level, Stack);
+pop(_Level, Stack) ->
+    Stack.
+
+%% stack_level() -> Le
+%% stack_level(Stack) -> Le
+%% Top call level
+stack_level() ->
+    stack_level(get(?STACK)).
+
+stack_level([]) -> 1;
+stack_level([#e{level=Le}|_]) -> Le.
+
+%% delayed_stacktrace() -> CreateStacktraceFun
+%% delayed_stacktrace(ArgFlag, #ieval{}) -> CreateStacktraceFun
+%%   ArgFlag = no_args | include_args
+%%   CreateStacktraceFun = fun(NumberOfEntries)
+%%
+%% Return a fun that can convert the internal stack format to
+%% an imitation of the regular stacktrace.
+
+delayed_stacktrace() ->
+    Stack0 = get(?STACK),
+    fun(NumEntries) ->
+	    Stack = stacktrace(NumEntries, Stack0, []),
+	    [finalize(ArityOnly) || {ArityOnly,_} <- Stack]
+    end.
+
+delayed_stacktrace(include_args, Ieval) ->
+    #ieval{module=Mod,function=Name,arguments=As,line=Li} = Ieval,
+    Stack0 = [#e{mfa={Mod,Name,As},line=Li}|get(?STACK)],
+    fun(NumEntries) ->
+	    case stacktrace(NumEntries, Stack0, []) of
+		[] ->
+		    [];
+		[{_,WithArgs}|Stack] ->
+		    [finalize(WithArgs) |
+		     [finalize(ArityOnly) || {ArityOnly,_} <- Stack]]
+	    end
+    end;
+delayed_stacktrace(no_args, Ieval) ->
+    #ieval{module=Mod,function=Name,arguments=As,line=Li} = Ieval,
+    Stack0 = [#e{mfa={Mod,Name,As},line=Li}|get(?STACK)],
+    fun(NumEntries) ->
+	    Stack = stacktrace(NumEntries, Stack0, []),
+	    [finalize(ArityOnly) || {ArityOnly,_} <- Stack]
+    end.
+
+stacktrace(N, [#e{lc=true}|T], Acc) ->
+    stacktrace(N, T, Acc);
+stacktrace(N, [E|T], []) ->
+    stacktrace(N-1, T, [normalize(E)]);
+stacktrace(N, [E|T], [{P,_}|_]=Acc) when N > 0 ->
+    case normalize(E) of
+	{P,_} ->
+	    stacktrace(N, T, Acc);
+	New ->
+	    stacktrace(N-1, T, [New|Acc])
+    end;
+stacktrace(_, _, Acc) ->
+    lists:reverse(Acc).
+
+normalize(#e{mfa={M,Fun,As},line=Li}) when is_function(Fun) ->
+    Loc = {M,Li},
+    {{Fun,length(As),Loc},{Fun,As,Loc}};
+normalize(#e{mfa={M,F,As},line=Li}) ->
+    Loc = {M,Li},
+    {{M,F,length(As),Loc},{M,F,As,Loc}}.
+
+finalize({M,F,A,Loc}) -> {M,F,A,line(Loc)};
+finalize({Fun,A,Loc}) -> {Fun,A,line(Loc)}.
+
+line({Mod,Line}) when Line > 0 ->
+    [{file,atom_to_list(Mod)++".erl"},{line,Line}];
+line(_) -> [].
+
+%% bindings(SP) -> Bs
+%%   SP = Le  % stack pointer
+%% Return the bindings for the specified call level
+bindings(SP) ->
+    bindings(SP, get(?STACK)).
+
+bindings(SP, [#e{level=SP,bindings=Bs}|_]) ->
+    Bs;
+bindings(SP, [_Entry|Entries]) ->
+    bindings(SP, Entries);
+bindings(_SP, []) ->
+    erl_eval:new_bindings().
+
+%% stack_frame(Dir, SP) -> {Le, Where, Bs} | top | bottom
+%%   Dir = up | down
+%%   Where = {Cm, Li}
+%%     Cm = Module | undefined  % module
+%%     Li = int()  | -1         % line number
+%%     Bs = bindings()
+%% Return stack frame info one step up/down from given stack pointer
+%%  up = to lower call levels
+%%  down = to higher call levels
+stack_frame(up, SP) ->
+    stack_frame(SP, up, get(?STACK));
+stack_frame(down, SP) ->
+    stack_frame(SP, down, lists:reverse(get(?STACK))).
+
+stack_frame(SP, up, [#e{level=Le,mfa={Cm,_,_},line=Li,bindings=Bs}|_])
+  when Le < SP ->
+    {Le,{Cm,Li},Bs};
+stack_frame(SP, down, [#e{level=Le,mfa={Cm,_,_},line=Li,bindings=Bs}|_])
+  when Le > SP ->
+    {Le,{Cm,Li},Bs};
+stack_frame(SP, Dir, [#e{level=SP}|Stack]) ->
+    case Stack of
+	[#e{level=Le,mfa={Cm,_,_},line=Li,bindings=Bs}|_] ->
+	    {Le,{Cm,Li},Bs};
+	[] when Dir =:= up ->
+	    top;
+	[] when Dir =:= down ->
+	    bottom
+    end;
+stack_frame(SP, Dir, [_Entry|Stack]) ->
+    stack_frame(SP, Dir, Stack).
+
+%% backtrace(HowMany) -> Backtrace
+%%   HowMany = all | int()
+%%   Backtrace = {Le, MFA}
+%% Return all/the last N called functions, in reversed call order
+backtrace(HowMany, Ieval) ->
+    #ieval{level=Level,module=Mod,function=Name,arguments=As} = Ieval,
+    Stack0 = [#e{level=Level,mfa={Mod,Name,As}}|get(?STACK)],
+    Stack = case HowMany of
+		all -> Stack0;
+		N -> lists:sublist(Stack0, N)
+	    end,
+    [{Le,MFA} || #e{level=Le,mfa=MFA} <- Stack].
+
+%%--------------------------------------------------------------------
+%% in_use_p(Mod, Cm) -> boolean()
+%%   Mod = Cm = atom()
+%% Returns true if Mod is found on the stack, otherwise false.
+%%--------------------------------------------------------------------
+in_use_p(Mod, Mod) -> true;
+in_use_p(Mod, _Cm) ->
+    case get(trace_stack) of
+	false -> true;
+	_ -> %  all | no_tail
+	    lists:any(fun(#e{mfa={M,_,_}}) when M =:= Mod -> true;
+			 (_) -> false
+		      end, get(?STACK))
+    end.
diff --git a/lib/debugger/src/debugger.app.src b/lib/debugger/src/debugger.app.src
index 21cf59a2e1..5538f66260 100644
--- a/lib/debugger/src/debugger.app.src
+++ b/lib/debugger/src/debugger.app.src
@@ -26,6 +26,7 @@
 	     dbg_ieval,
 	     dbg_iload,
 	     dbg_iserver,
+	     dbg_istk,
 	     dbg_ui_break,
 	     dbg_ui_break_win,
 	     dbg_ui_edit,
diff --git a/lib/debugger/test/Makefile b/lib/debugger/test/Makefile
index 2296bd0ae6..3dfbed31ff 100644
--- a/lib/debugger/test/Makefile
+++ b/lib/debugger/test/Makefile
@@ -43,6 +43,7 @@ MODULES= \
 	exception_SUITE \
 	fun_SUITE \
 	lc_SUITE \
+	line_number_SUITE \
 	record_SUITE \
 	trycatch_SUITE \
 	test_lib \
diff --git a/lib/debugger/test/bs_construct_SUITE.erl b/lib/debugger/test/bs_construct_SUITE.erl
index 5c7d49e951..187c9f53b0 100644
--- a/lib/debugger/test/bs_construct_SUITE.erl
+++ b/lib/debugger/test/bs_construct_SUITE.erl
@@ -19,18 +19,31 @@
 
 -module(bs_construct_SUITE).
 
+%% Copied from bs_construct_SUITE in the emulator test suite.
+%% The following test cases have been omitted since they don't
+%% make much sense for the debugger:
+%%  bs_add
+%%  kostis
+
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
 	 init_per_suite/1,end_per_suite/1,
-	 test1/1, test2/1, test3/1, test4/1, test5/1, testf/1, not_used/1, in_guard/1,
-	 coerce_to_float/1]).
+	 test1/1, test2/1, test3/1, test4/1, test5/1, testf/1,
+	 not_used/1, in_guard/1,
+	 mem_leak/1, coerce_to_float/1, bjorn/1,
+	 huge_float_field/1, huge_binary/1, system_limit/1, badarg/1,
+	 copy_writable_binary/1, dynamic/1,
+	 otp_7422/1, zero_width/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    cases().
+    [test1, test2, test3, test4, test5, testf, not_used,
+     in_guard, mem_leak, coerce_to_float, bjorn,
+     huge_float_field, huge_binary, system_limit, badarg,
+     copy_writable_binary, dynamic, otp_7422, zero_width].
 
 groups() -> 
     [].
@@ -41,11 +54,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-
-cases() -> 
-    [test1, test2, test3, test4, test5, testf, not_used,
-     in_guard, coerce_to_float].
-
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
     Dog = test_server:timetrap(?t:minutes(1)),
@@ -75,7 +83,9 @@ r(L) ->
 -define(T(B, L), {B, ??B, L}).
 -define(N(B), {B, ??B, unknown}).
 
--define(FAIL(Expr), ?line {'EXIT',{badarg,_}} = (catch Expr)).
+-define(FAIL(Expr), ?line fail_check(catch Expr, ??Expr, [])).
+
+-define(FAIL_VARS(Expr, Vars), ?line fail_check(catch Expr, ??Expr, Vars)).
 
 l(I_13, I_big1) ->
     [
@@ -143,7 +153,13 @@ l(I_13, I_big1) ->
 	native_3798()),
 
      ?T(<<32978297842987249827298387697777669766334937:128/native-integer>>,
-	native_bignum())
+	native_bignum()),
+
+     %% Unit tests.
+     ?T(<<<<5:3>>/bitstring>>, <<5:3>>),
+     ?T(<<42,<<7:4>>/binary-unit:4>>, <<42,7:4>>),
+     ?T(<<<<344:17>>/binary-unit:17>>, <<344:17>>),
+     ?T(<<<<42,3,7656:16>>/binary-unit:16>>, <<42,3,7656:16>>)
 
      ].
 
@@ -179,7 +195,7 @@ eval_list([{C_bin, Str, Bytes} | Rest], Vars) ->
 	    [{C_bin, E_bin, Str, Bytes} | eval_list(Rest, Vars)]
     end.
 
-one_test({C_bin, E_bin, Str, Bytes}) when list(Bytes) ->
+one_test({C_bin, E_bin, Str, Bytes}) when is_list(Bytes) ->
     io:format("  ~s, ~p~n", [Str, Bytes]),
     Bin = list_to_binary(Bytes),
     if
@@ -222,7 +238,7 @@ one_test({C_bin, E_bin, Str, Result}) ->
 		    ok;
 		%% For situations where the final bits may not matter, like
 		%% for floats:
-		N when integer(N) ->
+		N when is_integer(N) ->
 		    io:format("Info: compiled and interpreted differ in the"
 			      " last bytes:~n ~p, ~p.~n",
 			      [binary_to_list(C_bin), binary_to_list(E_bin)]),
@@ -248,9 +264,22 @@ equal_lists(A, B, R) ->
 	    false
     end.
 
+fail_check({'EXIT',{badarg,_}}, Str, Vars) ->
+    try	evaluate(Str, Vars) of
+	Res ->
+	    io:format("Interpreted result: ~p", [Res]),
+	    ?t:fail(did_not_fail_in_intepreted_code)
+    catch
+	error:badarg ->
+	    ok
+    end;
+fail_check(Res, _, _) ->
+    io:format("Compiled result: ~p", [Res]),
+    ?t:fail(did_not_fail_in_compiled_code).
+
 %%% Simple working cases
 test1(suite) -> [];
-test1(Config) when list(Config) ->
+test1(Config) when is_list(Config) ->
     ?line I_13 = i(13),
     ?line I_big1 = big(1),
     ?line Vars = [{'I_13', I_13},
@@ -272,7 +301,7 @@ gen_l(N, S, A) ->
     [?T(<<A:S/little, A:(N-S)/little>>, comp(N, A, S))].
 
 test2(suite) -> [];
-test2(Config) when list(Config) ->
+test2(Config) when is_list(Config) ->
     ?line test2(0, 8, 2#10101010101010101),
     ?line test2(0, 8, 2#1111111111).
 
@@ -300,7 +329,7 @@ t3() ->
     ].
 
 test3(suite) -> [];
-test3(Config) when list(Config) ->
+test3(Config) when is_list(Config) ->
     ?line Vars = [],
     ?line lists:foreach(fun one_test/1, eval_list(t3(), Vars)).
 
@@ -311,7 +340,7 @@ gen_u_l(N, S, A) ->
     [?N(<<A:S/little, A:(N-S)/little>>)].
 
 test4(suite) -> [];
-test4(Config) when list(Config) ->
+test4(Config) when is_list(Config) ->
     ?line test4(0, 16, 2#10101010101010101),
     ?line test4(0, 16, 2#1111111111).
 
@@ -333,7 +362,7 @@ gen_b(N, S, A) ->
 
 test5(suite) -> [];
 test5(doc) -> ["OTP-3995"];
-test5(Config) when list(Config) ->
+test5(Config) when is_list(Config) ->
     ?line test5(0, 8, <<73>>),
     ?line test5(0, 8, <<68>>).
 
@@ -350,40 +379,63 @@ test5(S, A) ->
 
 %%% Failure cases
 testf(suite) -> [];
-testf(Config) when list(Config) ->
-    ?FAIL(<<3.14>>),
-    ?FAIL(<<<<1,2>>>>),
-
-    ?FAIL(<<2.71/binary>>),
-    ?FAIL(<<24334/binary>>),
-    ?FAIL(<<24334344294788947129487129487219847/binary>>),
-
-    ?FAIL(<<<<1,2,3>>/float>>),
+testf(Config) when is_list(Config) ->
+    ?line ?FAIL(<<3.14>>),
+    ?line ?FAIL(<<<<1,2>>>>),
+
+    ?line ?FAIL(<<2.71/binary>>),
+    ?line ?FAIL(<<24334/binary>>),
+    ?line ?FAIL(<<24334344294788947129487129487219847/binary>>),
+    BigInt = id(24334344294788947129487129487219847),
+    ?line ?FAIL_VARS(<<BigInt/binary>>, [{'BigInt',BigInt}]),
+    ?line ?FAIL_VARS(<<42,BigInt/binary>>, [{'BigInt',BigInt}]),
+    ?line ?FAIL_VARS(<<BigInt:2/binary>>, [{'BigInt',BigInt}]),
+
+    %% One negative field size, but the sum of field sizes will be 1 byte.
+    %% Make sure that we reject that properly.
+    I_minus_777 = id(-777),
+    I_minus_2047 = id(-2047),
+    ?line ?FAIL_VARS(<<I_minus_777:2048/unit:8,57:I_minus_2047/unit:8>>,
+		     ordsets:from_list([{'I_minus_777',I_minus_777},
+					{'I_minus_2047',I_minus_2047}])),
+    ?line ?FAIL(<<<<1,2,3>>/float>>),
 
     %% Negative field widths.
-    testf_1(-8, <<1,2,3,4,5>>),
-
-    ?FAIL(<<42:(-16)>>),
-    ?FAIL(<<3.14:(-8)/float>>),
-    ?FAIL(<<<<23,56,0,2>>:(-16)/binary>>),
-    ?FAIL(<<<<23,56,0,2>>:(2.5)/binary>>),
-    ?FAIL(<<<<23,56,0,2>>:(anka)>>),
+    ?line testf_1(-8, <<1,2,3,4,5>>),
+    ?line ?FAIL(<<0:(-(1 bsl 100))>>),
+
+    ?line ?FAIL(<<42:(-16)>>),
+    ?line ?FAIL(<<3.14:(-8)/float>>),
+    ?line ?FAIL(<<<<23,56,0,2>>:(-16)/binary>>),
+    ?line ?FAIL(<<<<23,56,0,2>>:(2.5)/binary>>),
+    ?line ?FAIL(<<<<23,56,0,2>>:(anka)>>),
+    ?line ?FAIL(<<<<23,56,0,2>>:(anka)>>),
+
+    %% Unit failures.
+    ?line ?FAIL(<<<<1:1>>/binary>>),
+    Sz = id(1),
+    ?line ?FAIL_VARS(<<<<1:Sz>>/binary>>, [{'Sz',Sz}]),
+    ?line {'EXIT',{badarg,_}} = (catch <<<<1:(id(1))>>/binary>>),
+    ?line ?FAIL(<<<<7,8,9>>/binary-unit:16>>),
+    ?line ?FAIL(<<<<7,8,9,3:7>>/binary-unit:16>>),
+    ?line ?FAIL(<<<<7,8,9,3:7>>/binary-unit:17>>),
 
     ok.
 
 testf_1(W, B) ->
-    ?FAIL(<<42:W>>),
-    ?FAIL(<<3.14:W/float>>),
-    ?FAIL(<<B:W/binary>>).
+    Vars = [{'W',W}],
+    ?FAIL_VARS(<<42:W>>, Vars),
+    ?FAIL_VARS(<<3.14:W/float>>, Vars),
+    ?FAIL_VARS(<<B:W/binary>>, [{'B',B}|Vars]).
 
 not_used(doc) ->
     "Test that constructed binaries that are not used will still give an exception.";
 not_used(Config) when is_list(Config) ->
     ?line ok = not_used1(3, <<"dum">>),
-    ?line ?FAIL(not_used1(3, "dum")),
-    ?line ?FAIL(not_used2(444, -2)),
-    ?line ?FAIL(not_used2(444, anka)),
-    ?line ?FAIL(not_used3(444)),
+    ?line {'EXIT',{badarg,_}} = (catch not_used1(3, "dum")),
+    ?line {'EXIT',{badarg,_}} = (catch not_used2(444, -2)),
+    ?line {'EXIT',{badarg,_}} = (catch not_used2(444, anka)),
+    ?line {'EXIT',{badarg,_}} = (catch not_used3(444)),
     ok.
 
 not_used1(I, BinString) ->
@@ -398,7 +450,7 @@ not_used3(I) ->
     <<I:(-8)>>,
     ok.
 
-in_guard(Config) when list(Config) ->
+in_guard(Config) when is_list(Config) ->
     ?line 1 = in_guard(<<16#74ad:16>>, 16#e95, 5),
     ?line 2 = in_guard(<<16#3A,16#F7,"hello">>, 16#3AF7, <<"hello">>),
     ?line 3 = in_guard(<<16#FBCD:14,3.1415/float,3:2>>, 16#FBCD, 3.1415),
@@ -415,6 +467,36 @@ in_guard(Bin, A, B) when <<A:14,B/float,3:2>> == Bin -> 3;
 in_guard(Bin, A, B) when {a,b,<<A:14,B/float,3:2>>} == Bin -> cant_happen;
 in_guard(_, _, _) -> nope.
 
+mem_leak(doc) -> "Make sure that construction has no memory leak";
+mem_leak(Config) when is_list(Config) ->
+    ?line B = make_bin(16, <<0>>),
+    ?line mem_leak(1024, B),
+    ok.
+
+mem_leak(0, _) -> ok;
+mem_leak(N, B) ->
+    ?line big_bin(B, <<23>>),
+    ?line {'EXIT',{badarg,_}} = (catch big_bin(B, bad)),
+    maybe_gc(),
+    mem_leak(N-1, B).
+
+big_bin(B1, B2) ->
+    <<B1/binary,B1/binary,B1/binary,B1/binary,
+      B1/binary,B1/binary,B1/binary,B1/binary,
+      B1/binary,B1/binary,B1/binary,B1/binary,
+      B1/binary,B1/binary,B1/binary,B1/binary,
+      B2/binary>>.
+
+make_bin(0, Acc) -> Acc;
+make_bin(N, Acc) -> make_bin(N-1, <<Acc/binary,Acc/binary>>).
+
+maybe_gc() ->
+    case erlang:system_info(heap_type) of
+	shared -> erlang:garbage_collect();
+	hybrid -> erlang:garbage_collect();
+	private -> ok
+    end.
+
 -define(COF(Int0),
 	?line (fun(Int) ->
 		       true = <<Int:32/float>> =:= <<(float(Int)):32/float>>,
@@ -431,7 +513,7 @@ in_guard(_, _, _) -> nope.
 
 nonliteral(X) -> X.
 
-coerce_to_float(Config) when list(Config) ->
+coerce_to_float(Config) when is_list(Config) ->
     ?COF(0),
     ?COF(-1),
     ?COF(1),
@@ -444,3 +526,232 @@ coerce_to_float(Config) when list(Config) ->
     ?COF64(298748888888888888888888888883478264866528467367364766666666666666663),
     ?COF64(-367546729879999999999947826486652846736736476555566666663),
     ok.
+
+bjorn(Config) when is_list(Config) ->
+    ?line error = bjorn_1(),
+    ok.
+
+bjorn_1() ->
+    Bitstr = <<7:13>>,
+    try
+	do_something()
+    catch
+	throw:blurf ->
+	    ignore
+    end,
+    do_more(Bitstr, 13).
+
+do_more(Bin, Sz) ->
+    %% Previous bug in the bs_bits_to_bytes instruction: The exeption code
+    %% was not set - the previous exception (throw:blurf) would be used,
+    %% causing the catch to slip.
+    try <<Bin:Sz/binary>> of
+	_V -> ok
+    catch
+	error:_ ->
+	    error
+    end.
+
+do_something() ->
+    throw(blurf).
+
+huge_float_field(Config) when is_list(Config) ->
+    ?line {'EXIT',{badarg,_}} = (catch <<0.0:9/float-unit:8>>),
+    ?line huge_float_check(catch <<0.0:67108865/float-unit:64>>),
+    ?line huge_float_check(catch <<0.0:((1 bsl 26)+1)/float-unit:64>>),
+    ?line huge_float_check(catch <<0.0:(id(67108865))/float-unit:64>>),
+%%  ?line huge_float_check(catch <<0.0:((1 bsl 60)+1)/float-unit:64>>),
+    ?line huge_float_check(catch <<3839739387439387383739387987347983:((1 bsl 26)+1)/float-unit:64>>),
+%%  ?line huge_float_check(catch <<3839739387439387383739387987347983:((1 bsl 60)+1)/float-unit:64>>),
+    ok.
+
+huge_float_check({'EXIT',{system_limit,_}}) -> ok;
+huge_float_check({'EXIT',{badarg,_}}) -> ok.
+
+huge_binary(Config) when is_list(Config) ->
+    ?line 16777216 = size(<<0:(id(1 bsl 26)),(-1):(id(1 bsl 26))>>),
+    ok.
+
+system_limit(Config) when is_list(Config) ->
+    WordSize = erlang:system_info(wordsize),
+    BitsPerWord = WordSize * 8,
+    ?line {'EXIT',{system_limit,_}} =
+	(catch <<0:(id(0)),42:(id(1 bsl BitsPerWord))>>),
+    ?line {'EXIT',{system_limit,_}} =
+	(catch <<42:(id(1 bsl BitsPerWord)),0:(id(0))>>),
+    ?line {'EXIT',{system_limit,_}} =
+	(catch <<(id(<<>>))/binary,0:(id(1 bsl 100))>>),
+
+    case WordSize of
+	4 ->
+	    system_limit_32();
+	8 ->
+	    ok
+    end.
+
+system_limit_32() ->
+    ?line {'EXIT',{badarg,_}} = (catch <<42:(-1)>>),
+    ?line {'EXIT',{badarg,_}} = (catch <<42:(id(-1))>>),
+    ?line {'EXIT',{badarg,_}} = (catch <<42:(id(-389739873536870912))/unit:8>>),
+    ?line {'EXIT',{system_limit,_}} = (catch <<42:536870912/unit:8>>),
+    ?line {'EXIT',{system_limit,_}} = (catch <<42:(id(536870912))/unit:8>>),
+    ?line {'EXIT',{system_limit,_}} = (catch <<0:(id(8)),42:536870912/unit:8>>),
+    ?line {'EXIT',{system_limit,_}} =
+	(catch <<0:(id(8)),42:(id(536870912))/unit:8>>),
+    ok.
+
+badarg(Config) when is_list(Config) ->
+    %% BEAM will generate a badarg exception for:
+    %%   <<0:(id(1 bsl 100)),0:(id(-1))>>
+    %% but the debugger will generate a system_limit exception.
+    %% It does not seems worthwhile to fix the debugger.
+
+    ?line {'EXIT',{badarg,_}} =
+	(catch <<(id(<<>>))/binary,0:(id(-(1 bsl 100)))>>),
+
+    ok.
+
+copy_writable_binary(Config) when is_list(Config) ->
+    ?line [copy_writable_binary_1(I) || I <- lists:seq(0, 256)],
+    ok.
+
+copy_writable_binary_1(_) ->
+    ?line Bin0 = <<(id(<<>>))/binary,0,1,2,3,4,5,6,7>>,
+    ?line SubBin = make_sub_bin(Bin0),
+    ?line id(<<42,34,55,Bin0/binary>>),		%Make reallocation likelier.
+    ?line Pid = spawn(fun() ->
+			      copy_writable_binary_holder(Bin0, SubBin)
+		      end),
+    ?line Tab = ets:new(holder, []),
+    ?line ets:insert(Tab, {17,Bin0}),
+    ?line ets:insert(Tab, {42,SubBin}),
+    ?line id(<<Bin0/binary,0:(64*1024*8)>>),
+    ?line Pid ! self(),
+    ?line [{17,Bin0}] = ets:lookup(Tab, 17),
+    ?line [{42,Bin0}] = ets:lookup(Tab, 42),
+    receive
+	{Pid,Bin0,Bin0} -> ok;
+	Other ->
+	    io:format("Unexpected message: ~p", [Other]),
+	    ?line ?t:fail()
+    end,
+    ok.
+
+copy_writable_binary_holder(Bin, SubBin) ->
+    receive
+	Pid ->
+	    Pid ! {self(),Bin,SubBin}
+    end.
+
+make_sub_bin(Bin0) ->
+    N = bit_size(Bin0),
+    <<_:17,Bin:N/bitstring,_:5>> = <<(-1):17,Bin0/bitstring,(-1):5>>,
+    Bin = Bin0,					%Assertion.
+    Bin.
+
+%% Test that different ways of using bit syntax instructions
+%% give the same result.
+
+dynamic(Config) when is_list(Config) ->
+    ?line dynamic_1(fun dynamic_big/5),
+    ?line dynamic_1(fun dynamic_little/5),
+    ok.
+
+dynamic_1(Dynamic) ->
+    <<Lpad:128>> = erlang:md5([0]),
+    <<Rpad:128>> = erlang:md5([1]),
+    <<Int:128>> = erlang:md5([2]),
+    8385 = dynamic_2(0, {Int,Lpad,Rpad,Dynamic}, 0).
+
+dynamic_2(129, _, Count) -> Count;
+dynamic_2(Bef, Data, Count0) ->
+    Count = dynamic_3(Bef, 128-Bef, Data, Count0),
+    dynamic_2(Bef+1, Data, Count).
+
+dynamic_3(_, -1, _, Count) -> Count;
+dynamic_3(Bef, N, {Int0,Lpad,Rpad,Dynamic}=Data, Count) ->
+    Int1 = Int0 band ((1 bsl (N+3))-1),
+    Dynamic(Bef, N, Int1, Lpad, Rpad),
+    Dynamic(Bef, N, -Int1, Lpad, Rpad),
+
+    %% OTP-7085: Test a small number in a wide field.
+    Int2 = Int0 band 16#FFFFFF,
+    Dynamic(Bef, N, Int2, Lpad, Rpad),
+    Dynamic(Bef, N, -Int2, Lpad, Rpad),
+    dynamic_3(Bef, N-1, Data, Count+1).
+
+dynamic_big(Bef, N, Int, Lpad, Rpad) ->
+    NumBin = id(<<Int:N>>),
+    MaskedInt = Int band ((1 bsl N) - 1),
+    <<MaskedInt:N>> = NumBin,
+
+    %% Construct the binary in two different ways.
+    Bin = id(<<Lpad:Bef,NumBin/bitstring,Rpad:(128-Bef-N)>>),
+    Bin = <<Lpad:Bef,Int:N,Rpad:(128-Bef-N)>>,
+
+    %% Further verify the result by matching.
+    LpadMasked = Lpad band ((1 bsl Bef) - 1),
+    RpadMasked = Rpad band ((1 bsl (128-Bef-N)) - 1),
+    Rbits = (128-Bef-N),
+    <<LpadMasked:Bef,MaskedInt:N,RpadMasked:Rbits>> = id(Bin),
+    ok.
+
+dynamic_little(Bef, N, Int, Lpad, Rpad) ->
+    NumBin = id(<<Int:N/little>>),
+    MaskedInt = Int band ((1 bsl N) - 1),
+    <<MaskedInt:N/little>> = NumBin,
+
+    %% Construct the binary in two different ways.
+    Bin = id(<<Lpad:Bef/little,NumBin/bitstring,Rpad:(128-Bef-N)/little>>),
+    Bin = <<Lpad:Bef/little,Int:N/little,Rpad:(128-Bef-N)/little>>,
+
+    %% Further verify the result by matching.
+    LpadMasked = Lpad band ((1 bsl Bef) - 1),
+    RpadMasked = Rpad band ((1 bsl (128-Bef-N)) - 1),
+    Rbits = (128-Bef-N),
+    <<LpadMasked:Bef/little,MaskedInt:N/little,RpadMasked:Rbits/little>> = id(Bin),
+    ok.
+
+otp_7422(Config) when is_list(Config) ->
+    otp_7422_int(0),
+    otp_7422_bin(0).
+
+otp_7422_int(N) when N < 512 ->
+    T = erlang:make_tuple(N, []),
+    spawn_link(fun() ->
+		       id(T),
+		       %% A size of field 0 would write one byte beyond
+		       %% the current position in the binary. It could
+		       %% overwrite the continuation pointer stored on
+		       %% the stack if HTOP was equal to E (the stack pointer).
+		       id(<<0:(id(0))>>)
+	       end),
+    otp_7422_int(N+1);
+otp_7422_int(_) -> ok.
+
+otp_7422_bin(N) when N < 512 ->
+    T = erlang:make_tuple(N, []),
+    Z = id(<<>>),
+    spawn_link(fun() ->
+		       id(T),
+		       id(<<Z:(id(0))/bits>>)
+	       end),
+    otp_7422_bin(N+1);
+otp_7422_bin(_) -> ok.
+
+zero_width(Config) when is_list(Config) ->
+    ?line Z = id(0),
+    Small = id(42),
+    Big = id(1 bsl 128),
+    ?line <<>> = <<Small:Z>>,
+    ?line <<>> = <<Small:0>>,
+    ?line <<>> = <<Big:Z>>,
+    ?line <<>> = <<Big:0>>,
+
+    ?line {'EXIT',{badarg,_}} = (catch <<not_a_number:0>>),
+    ?line {'EXIT',{badarg,_}} = (catch <<(id(not_a_number)):Z>>),
+    ?line {'EXIT',{badarg,_}} = (catch <<(id(not_a_number)):0>>),
+
+    ok.
+
+id(I) -> I.
diff --git a/lib/debugger/test/bs_match_bin_SUITE.erl b/lib/debugger/test/bs_match_bin_SUITE.erl
index b42b84aef2..5a7c30f16b 100644
--- a/lib/debugger/test/bs_match_bin_SUITE.erl
+++ b/lib/debugger/test/bs_match_bin_SUITE.erl
@@ -24,14 +24,14 @@
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
 	 init_per_suite/1,end_per_suite/1,
-	 byte_split_binary/1,bit_split_binary/1]).
+	 byte_split_binary/1,bit_split_binary/1,match_huge_bin/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    cases().
+    [byte_split_binary, bit_split_binary, match_huge_bin].
 
 groups() -> 
     [].
@@ -42,10 +42,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-
-cases() -> 
-    [byte_split_binary, bit_split_binary].
-
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
     Dog = test_server:timetrap(?t:minutes(1)),
@@ -65,11 +61,12 @@ end_per_suite(Config) when is_list(Config) ->
     ok.
 
 byte_split_binary(doc) -> "Tries to split a binary at all byte-aligned positions.";
-byte_split_binary(suite) -> [];
-byte_split_binary(Config) when list(Config) ->
+byte_split_binary(Config) when is_list(Config) ->
     ?line L = lists:seq(0, 57),
     ?line B = mkbin(L),
-    ?line byte_split(L, B, size(B)).
+    ?line byte_split(L, B, size(B)),
+    ?line Unaligned = make_unaligned_sub_binary(B),
+    ?line byte_split(L, Unaligned, size(Unaligned)).
 
 byte_split(L, B, Pos) when Pos >= 0 ->
     ?line Sz1 = Pos,
@@ -78,18 +75,19 @@ byte_split(L, B, Pos) when Pos >= 0 ->
     ?line B1 = list_to_binary(lists:sublist(L, 1, Pos)),
     ?line B2 = list_to_binary(lists:nthtail(Pos, L)),
     ?line byte_split(L, B, Pos-1);
-byte_split(_L, _B, _) -> ok.
+byte_split(_, _, _) -> ok.
 
 bit_split_binary(doc) -> "Tries to split a binary at all positions.";
-bit_split_binary(suite) -> [];
-bit_split_binary(Config) when list(Config) ->
+bit_split_binary(Config) when is_list(Config) ->
     Fun = fun(Bin, List, SkipBef, N) ->
 		  ?line SkipAft = 8*size(Bin) - N - SkipBef,
-		  io:format("~p, ~p, ~p", [SkipBef,N,SkipAft]),
-		  ?line <<_I1:SkipBef,OutBin:N/binary-unit:1,_I2:SkipAft>> = Bin,
+		  %%io:format("~p, ~p, ~p", [SkipBef,N,SkipAft]),
+		  ?line <<_:SkipBef,OutBin:N/binary-unit:1,_:SkipAft>> = Bin,
 		  ?line OutBin = make_bin_from_list(List, N)
 	  end,
     ?line bit_split_binary1(Fun, erlang:md5(<<1,2,3>>)),
+    ?line bit_split_binary1(Fun,
+			    make_unaligned_sub_binary(erlang:md5(<<1,2,3>>))),
     ok.
 
 bit_split_binary1(Action, Bin) ->
@@ -99,24 +97,23 @@ bit_split_binary1(Action, Bin) ->
 bit_split_binary2(Action, Bin, [_|T]=List, Bef) ->
     bit_split_binary3(Action, Bin, List, Bef, size(Bin)*8),
     bit_split_binary2(Action, Bin, T, Bef+1);
-bit_split_binary2(_Action, _Bin, [], _Bef) -> ok.
+bit_split_binary2(_, _, [], _) -> ok.
 
 bit_split_binary3(Action, Bin, List, Bef, Aft) when Bef =< Aft ->
     Action(Bin, List, Bef, (Aft-Bef) div 8 * 8),
     bit_split_binary3(Action, Bin, List, Bef, Aft-8);
 bit_split_binary3(_, _, _, _, _) -> ok.
 
-make_bin_from_list(_List, 0) ->
-    mkbin([]);
+make_bin_from_list(_, 0) -> mkbin([]);
 make_bin_from_list(List, N) ->
     list_to_binary([make_int(List, 8, 0),
 		    make_bin_from_list(lists:nthtail(8, List), N-8)]).
 
 
-make_int(_List, 0, Acc) -> Acc;
+make_int(_, 0, Acc) -> Acc;
 make_int([H|T], N, Acc) -> make_int(T, N-1, Acc bsl 1 bor H).
 
-bits_to_list([_H|T], 0) -> bits_to_list(T, 16#80);
+bits_to_list([_|T], 0) -> bits_to_list(T, 16#80);
 bits_to_list([H|_]=List, Mask) ->
     [case H band Mask of
 	 0 -> 0;
@@ -124,5 +121,109 @@ bits_to_list([H|_]=List, Mask) ->
      end|bits_to_list(List, Mask bsr 1)];
 bits_to_list([], _) -> [].
 
+mkbin(L) when is_list(L) -> list_to_binary(L).
+
+make_unaligned_sub_binary(Bin0) ->
+    Bin1 = <<0:3,Bin0/binary,31:5>>,
+    Sz = size(Bin0),
+    <<0:3,Bin:Sz/binary,31:5>> = id(Bin1),
+    Bin.
+
+id(I) -> I.
+
+match_huge_bin(Config) when is_list(Config) ->
+    ?line Bin = <<0:(1 bsl 27),13:8>>,
+    ?line skip_huge_bin_1(1 bsl 27, Bin),
+    ?line 16777216 = match_huge_bin_1(1 bsl 27, Bin),
+
+    %% Test overflowing the size of a binary field.
+    ?line nomatch = overflow_huge_bin_skip_32(Bin),
+    ?line nomatch = overflow_huge_bin_32(Bin),
+    ?line nomatch = overflow_huge_bin_skip_64(Bin),
+    ?line nomatch = overflow_huge_bin_64(Bin),
+
+    %% Size in variable
+    ?line ok = overflow_huge_bin(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
+    ?line ok = overflow_huge_bin_unit128(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
+
+    ok.
+
+overflow_huge_bin(Bin, [Sz0|Sizes]) ->
+    Sz = id(1 bsl Sz0),
+    case Bin of
+	<<_:Sz/binary-unit:8,0,_/binary>> ->
+	    {error,Sz};
+	_ ->
+	    case Bin of
+		<<NewBin:Sz/binary-unit:8,0,_/binary>> ->
+		    {error,Sz,size(NewBin)};
+		_ ->
+		    overflow_huge_bin(Bin, Sizes)
+	    end
+    end;
+overflow_huge_bin(_, []) -> ok.
+
+overflow_huge_bin_unit128(Bin, [Sz0|Sizes]) ->
+    Sz = id(1 bsl Sz0),
+    case Bin of
+	<<_:Sz/binary-unit:128,0,_/binary>> ->
+	    {error,Sz};
+	_ ->
+	    case Bin of
+		<<NewBin:Sz/binary-unit:128,0,_/binary>> ->
+		    {error,Sz,size(NewBin)};
+		_ ->
+		    overflow_huge_bin_unit128(Bin, Sizes)
+	    end
+    end;
+overflow_huge_bin_unit128(_, []) -> ok.
+
+skip_huge_bin_1(I, Bin) ->
+    <<_:I/binary-unit:1,13>> = Bin,
+    ok.
 
-mkbin(L) when list(L) -> list_to_binary(L).
+match_huge_bin_1(I, Bin) ->
+    case Bin of
+	<<Val:I/binary-unit:1,13>> -> size(Val);
+	_ -> nomatch
+    end.
+
+overflow_huge_bin_skip_32(<<_:4294967296/binary,0,_/binary>>) -> 1; % 1 bsl 32
+overflow_huge_bin_skip_32(<<_:33554432/binary-unit:128,0,_/binary>>) -> 2; % 1 bsl 25
+overflow_huge_bin_skip_32(<<_:67108864/binary-unit:64,0,_/binary>>) -> 3; % 1 bsl 26
+overflow_huge_bin_skip_32(<<_:134217728/binary-unit:32,0,_/binary>>) -> 4; % 1 bsl 27
+overflow_huge_bin_skip_32(<<_:268435456/binary-unit:16,0,_/binary>>) -> 5; % 1 bsl 28
+overflow_huge_bin_skip_32(<<_:536870912/binary-unit:8,0,_/binary>>) -> 6; % 1 bsl 29
+overflow_huge_bin_skip_32(<<_:1073741824/binary-unit:8,0,_/binary>>) -> 7; % 1 bsl 30
+overflow_huge_bin_skip_32(<<_:2147483648/binary-unit:8,0,_/binary>>) -> 8; % 1 bsl 31
+overflow_huge_bin_skip_32(_) -> nomatch.
+
+overflow_huge_bin_32(<<Bin:4294967296/binary,_/binary>>) -> {1,Bin}; % 1 bsl 32
+overflow_huge_bin_32(<<Bin:33554432/binary-unit:128,0,_/binary>>) -> {2,Bin}; % 1 bsl 25
+overflow_huge_bin_32(<<Bin:67108864/binary-unit:128,0,_/binary>>) -> {3,Bin}; % 1 bsl 26
+overflow_huge_bin_32(<<Bin:134217728/binary-unit:128,0,_/binary>>) -> {4,Bin}; % 1 bsl 27
+overflow_huge_bin_32(<<Bin:268435456/binary-unit:128,0,_/binary>>) -> {5,Bin}; % 1 bsl 28
+overflow_huge_bin_32(<<Bin:536870912/binary-unit:128,0,_/binary>>) -> {6,Bin}; % 1 bsl 29
+overflow_huge_bin_32(<<Bin:1073741824/binary-unit:128,0,_/binary>>) -> {7,Bin}; % 1 bsl 30
+overflow_huge_bin_32(<<Bin:2147483648/binary-unit:128,0,_/binary>>) -> {8,Bin}; % 1 bsl 31
+overflow_huge_bin_32(_) -> nomatch.
+
+overflow_huge_bin_skip_64(<<_:18446744073709551616/binary,0,_/binary>>) -> 1; % 1 bsl 64
+overflow_huge_bin_skip_64(<<_:144115188075855872/binary-unit:128,0,_/binary>>) -> 2; % 1 bsl 57
+overflow_huge_bin_skip_64(<<_:288230376151711744/binary-unit:64,0,_/binary>>) -> 3; % 1 bsl 58
+overflow_huge_bin_skip_64(<<_:576460752303423488/binary-unit:32,0,_/binary>>) -> 4; % 1 bsl 59
+overflow_huge_bin_skip_64(<<_:1152921504606846976/binary-unit:16,0,_/binary>>) -> 5; % 1 bsl 60
+overflow_huge_bin_skip_64(<<_:2305843009213693952/binary-unit:8,0,_/binary>>) -> 6; % 1 bsl 61
+overflow_huge_bin_skip_64(<<_:4611686018427387904/binary-unit:8,0,_/binary>>) -> 7; % 1 bsl 62
+overflow_huge_bin_skip_64(<<_:9223372036854775808/binary-unit:8,_/binary>>) -> 8; % 1 bsl 63
+overflow_huge_bin_skip_64(_) -> nomatch.
+
+overflow_huge_bin_64(<<Bin:18446744073709551616/binary,_/binary>>) -> {1,Bin}; % 1 bsl 64
+overflow_huge_bin_64(<<Bin:144115188075855872/binary-unit:128,0,_/binary>>) -> {2,Bin}; % 1 bsl 57
+overflow_huge_bin_64(<<Bin:288230376151711744/binary-unit:128,0,_/binary>>) -> {3,Bin}; % 1 bsl 58
+overflow_huge_bin_64(<<Bin:576460752303423488/binary-unit:128,0,_/binary>>) -> {4,Bin}; % 1 bsl 59
+overflow_huge_bin_64(<<Bin:1152921504606846976/binary-unit:128,0,_/binary>>) -> {5,Bin}; % 1 bsl 60
+overflow_huge_bin_64(<<Bin:2305843009213693952/binary-unit:128,0,_/binary>>) -> {6,Bin}; % 1 bsl 61
+overflow_huge_bin_64(<<Bin:4611686018427387904/binary-unit:128,0,_/binary>>) -> {7,Bin}; % 1 bsl 62
+overflow_huge_bin_64(<<Bin:9223372036854775808/binary-unit:128,0,_/binary>>) -> {8,Bin}; % 1 bsl 63
+overflow_huge_bin_64(_) -> nomatch.
diff --git a/lib/debugger/test/bs_match_int_SUITE.erl b/lib/debugger/test/bs_match_int_SUITE.erl
index 745368fdfc..bff5f8ff65 100644
--- a/lib/debugger/test/bs_match_int_SUITE.erl
+++ b/lib/debugger/test/bs_match_int_SUITE.erl
@@ -19,11 +19,11 @@
 
 -module(bs_match_int_SUITE).
 
--author('[email protected]').
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
 	 init_per_suite/1,end_per_suite/1,
-	 integer/1,signed_integer/1,dynamic/1,more_dynamic/1,mml/1]).
+	 integer/1,signed_integer/1,dynamic/1,more_dynamic/1,mml/1,
+	 match_huge_int/1,bignum/1,unaligned_32_bit/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -32,7 +32,8 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [cases()].
+    [integer, signed_integer, dynamic, more_dynamic, mml,
+     match_huge_int, bignum, unaligned_32_bit].
 
 groups() -> 
     [].
@@ -43,10 +44,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-
-cases() -> 
-    [integer, signed_integer, dynamic, more_dynamic, mml].
-
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
     Dog = test_server:timetrap(?t:minutes(4)),
@@ -65,8 +62,7 @@ init_per_suite(Config) when is_list(Config) ->
 end_per_suite(Config) when is_list(Config) ->
     ok.
 
-integer(suite) -> [];
-integer(Config) when list(Config) ->
+integer(Config) when is_list(Config) ->
     ?line 0 = get_int(mkbin([])),
     ?line 0 = get_int(mkbin([0])),
     ?line 42 = get_int(mkbin([42])),
@@ -78,22 +74,33 @@ integer(Config) when list(Config) ->
     ?line 65534 = get_int(mkbin([255,254])),
     ?line 16776455 = get_int(mkbin([255,253,7])),
     ?line 4245492555 = get_int(mkbin([253,13,19,75])),
+    ?line 4294967294 = get_int(mkbin([255,255,255,254])),
+    ?line 4294967295 = get_int(mkbin([255,255,255,255])),
     ?line Eight = [200,1,19,128,222,42,97,111],
     ?line cmp128(Eight, uint(Eight)),
     ?line fun_clause(catch get_int(mkbin(seq(1,5)))),
     ok.
 
-get_int(<<I:0>>) -> I;
-get_int(<<I:8>>) -> I;
-get_int(<<I:16>>) -> I;
-get_int(<<I:24>>) -> I;
-get_int(<<I:32>>) -> I.
+get_int(Bin) ->
+    I = get_int1(Bin),
+    get_int(Bin, I).
+
+get_int(Bin0, I) when size(Bin0) < 4 ->
+    Bin = <<0,Bin0/binary>>,
+    I = get_int1(Bin),
+    get_int(Bin, I);
+get_int(_, I) -> I.
+
+get_int1(<<I:0>>) -> I;
+get_int1(<<I:8>>) -> I;
+get_int1(<<I:16>>) -> I;
+get_int1(<<I:24>>) -> I;
+get_int1(<<I:32>>) -> I.
 
 cmp128(<<I:128>>, I) -> equal;
-cmp128(_B, _I) -> not_equal.
+cmp128(_, _) -> not_equal.
 
-signed_integer(suite) -> [];
-signed_integer(Config) when list(Config) ->
+signed_integer(Config) when is_list(Config) ->
     ?line {no_match,_} = sint(mkbin([])),
     ?line {no_match,_} = sint(mkbin([1,2,3])),
     ?line 127 = sint(mkbin([127])),
@@ -113,7 +120,7 @@ uint(L) -> uint(L, 0).
 uint([H|T], Acc) -> uint(T, Acc bsl 8 bor H);
 uint([], Acc) -> Acc.
 
-dynamic(Config) when list(Config) ->
+dynamic(Config) when is_list(Config) ->
     dynamic(mkbin([255]), 8),
     dynamic(mkbin([255,255]), 16),
     dynamic(mkbin([255,255,255]), 24),
@@ -124,7 +131,7 @@ dynamic(Bin, S1) when S1 >= 0 ->
     S2 = size(Bin) * 8 - S1,
     dynamic(Bin, S1, S2, (1 bsl S1) - 1, (1 bsl S2) - 1),
     dynamic(Bin, S1-1);
-dynamic(_Bin, _) -> ok.
+dynamic(_, _) -> ok.
 
 dynamic(Bin, S1, S2, A, B) ->
 %    io:format("~p ~p ~p ~p\n", [S1,S2,A,B]),
@@ -132,25 +139,24 @@ dynamic(Bin, S1, S2, A, B) ->
 	<<A:S1,B:S2>> ->
 	    io:format("~p ~p ~p ~p\n", [S1,S2,A,B]),
 	    ok;
-	_Other ->
-	    erlang:error(badmatch, [Bin,S1,S2,A,B])
+	_Other -> erlang:error(badmatch, [Bin,S1,S2,A,B])
     end.
 
 more_dynamic(doc) -> "Extract integers at different alignments and of different sizes.";
-more_dynamic(Config) when list(Config) ->
+more_dynamic(Config) when is_list(Config) ->
 
     % Unsigned big-endian numbers.
     Unsigned  = fun(Bin, List, SkipBef, N) ->
 			SkipAft = 8*size(Bin) - N - SkipBef,
-			<<_I1:SkipBef,Int:N,_I2:SkipAft>> = Bin,
+			<<_:SkipBef,Int:N,_:SkipAft>> = Bin,
 			Int = make_int(List, N, 0)
 		end,
     ?line more_dynamic1(Unsigned, funny_binary(42)),
 
-    % Signed big-endian numbers.
+    %% Signed big-endian numbers.
     Signed  = fun(Bin, List, SkipBef, N) ->
 		      SkipAft = 8*size(Bin) - N - SkipBef,
-		      <<_I1:SkipBef,Int:N/signed,_I2:SkipAft>> = Bin,
+		      <<_:SkipBef,Int:N/signed,_:SkipAft>> = Bin,
 		      case make_signed_int(List, N) of
 			  Int -> ok;
 			  Other ->
@@ -162,18 +168,18 @@ more_dynamic(Config) when list(Config) ->
 	      end,
     ?line more_dynamic1(Signed, funny_binary(43)),
 
-    % Unsigned little-endian numbers.
+    %% Unsigned little-endian numbers.
     UnsLittle  = fun(Bin, List, SkipBef, N) ->
 			 SkipAft = 8*size(Bin) - N - SkipBef,
-			 <<_I1:SkipBef,Int:N/little,_I2:SkipAft>> = Bin,
+			 <<_:SkipBef,Int:N/little,_:SkipAft>> = Bin,
 			 Int = make_int(big_to_little(List, N), N, 0)
 		 end,
     ?line more_dynamic1(UnsLittle, funny_binary(44)),
 
-    % Signed little-endian numbers.
+    %% Signed little-endian numbers.
     SignLittle  = fun(Bin, List, SkipBef, N) ->
 			  SkipAft = 8*size(Bin) - N - SkipBef,
-			  <<_I1:SkipBef,Int:N/signed-little,_I2:SkipAft>> = Bin,
+			  <<_:SkipBef,Int:N/signed-little,_:SkipAft>> = Bin,
 			  Little = big_to_little(List, N),
 			  Int = make_signed_int(Little, N)
 		  end,
@@ -181,11 +187,6 @@ more_dynamic(Config) when list(Config) ->
 
     ok.
 
-funny_binary(N) ->
-    B0 = erlang:md5([N]),
-    {B1,_B2} = split_binary(B0, size(B0) div 2),
-    B1.
-
 more_dynamic1(Action, Bin) ->
     BitList = bits_to_list(binary_to_list(Bin), 16#80),
     more_dynamic2(Action, Bin, BitList, 0).
@@ -193,7 +194,7 @@ more_dynamic1(Action, Bin) ->
 more_dynamic2(Action, Bin, [_|T]=List, Bef) ->
     more_dynamic3(Action, Bin, List, Bef, size(Bin)*8),
     more_dynamic2(Action, Bin, T, Bef+1);
-more_dynamic2(_Action, _Bin, [], _Bef) -> ok.
+more_dynamic2(_, _, [], _) -> ok.
 
 more_dynamic3(Action, Bin, List, Bef, Aft) when Bef =< Aft ->
 %%    io:format("~p, ~p", [Bef,Aft-Bef]),
@@ -208,8 +209,8 @@ big_to_little([B0,B1,B2,B3,B4,B5,B6,B7|T], N, Acc) when N >= 8 ->
 big_to_little(List, N, Acc) -> lists:sublist(List, 1, N) ++ Acc.
 
 make_signed_int(_List, 0) -> 0;
-make_signed_int([0|_T]=List, N) -> make_int(List, N, 0);
-make_signed_int([1|_T]=List0, N) ->
+make_signed_int([0|_]=List, N) -> make_int(List, N, 0);
+make_signed_int([1|_]=List0, N) ->
     List1 = reversed_sublist(List0, N, []),
     List2 = two_complement_and_reverse(List1, 1, []),
     -make_int(List2, length(List2), 0).
@@ -225,7 +226,7 @@ two_complement_and_reverse([], Carry, Acc) -> [Carry|Acc].
 make_int(_List, 0, Acc) -> Acc;
 make_int([H|T], N, Acc) -> make_int(T, N-1, Acc bsl 1 bor H).
 
-bits_to_list([_H|T], 0) -> bits_to_list(T, 16#80);
+bits_to_list([_|T], 0) -> bits_to_list(T, 16#80);
 bits_to_list([H|_]=List, Mask) ->
     [case H band Mask of
 	 0 -> 0;
@@ -234,11 +235,134 @@ bits_to_list([H|_]=List, Mask) ->
 bits_to_list([], _) -> [].
 
 fun_clause({'EXIT',{function_clause,_}}) -> ok.
-mkbin(L) when list(L) -> list_to_binary(L).
+mkbin(L) when is_list(L) -> list_to_binary(L).
+
+funny_binary(N) ->
+    B0 = erlang:md5([N]),
+    {B1,_B2} = split_binary(B0, byte_size(B0) div 3),
+    B1.
 
-mml(Config) when list(Config) ->
+mml(Config) when is_list(Config) ->
     ?line single_byte_binary = mml_choose(<<42>>),
     ?line multi_byte_binary = mml_choose(<<42,43>>).
 
 mml_choose(<<_A:8>>) -> single_byte_binary;
-mml_choose(<<_A:8, _T/binary>>) -> multi_byte_binary.
+mml_choose(<<_A:8,_T/binary>>) -> multi_byte_binary.
+
+match_huge_int(Config) when is_list(Config) ->
+    Sz = 1 bsl 27,
+    ?line Bin = <<0:Sz,13:8>>,
+    ?line skip_huge_int_1(Sz, Bin),
+    ?line 0 = match_huge_int_1(Sz, Bin),
+
+    %% Test overflowing the size of an integer field.
+    ?line nomatch = overflow_huge_int_skip_32(Bin),
+    case erlang:system_info(wordsize) of
+	4 ->
+	    ?line nomatch = overflow_huge_int_32(Bin);
+	8 ->
+	    %% An attempt will be made to allocate heap space for
+	    %% the bignum (which will probably fail); only if the
+	    %% allocation succeds will the matching fail because
+	    %% the binary is too small.
+	    ok
+    end,
+    ?line nomatch = overflow_huge_int_skip_64(Bin),
+    ?line nomatch = overflow_huge_int_64(Bin),
+
+    %% Test overflowing the size of an integer field using variables as sizes.
+    ?line Sizes = case erlang:system_info(wordsize) of
+		      4 -> lists:seq(25, 32);
+		      8 -> []
+		  end ++ lists:seq(50, 64),
+    ?line ok = overflow_huge_int_unit128(Bin, Sizes),
+
+    ok.
+
+overflow_huge_int_unit128(Bin, [Sz0|Sizes]) ->
+    Sz = id(1 bsl Sz0),
+    case Bin of
+	<<_:Sz/unit:128,0,_/binary>> ->
+	    {error,Sz};
+	_ ->
+	    case Bin of
+		<<Var:Sz/unit:128,0,_/binary>> ->
+		    {error,Sz,Var};
+		_ ->
+		    overflow_huge_int_unit128(Bin, Sizes)
+	    end
+    end;
+overflow_huge_int_unit128(_, []) -> ok.
+
+match_huge_int_1(I, Bin) ->
+    <<Int:I,13>> = Bin,
+    Int.
+
+skip_huge_int_1(I, Bin) ->
+    <<_:I,13>> = Bin.
+
+overflow_huge_int_skip_32(<<_:4294967296,0,_/binary>>) -> 1; % 1 bsl 32
+overflow_huge_int_skip_32(<<_:33554432/unit:128,0,_/binary>>) -> 2; % 1 bsl 25
+overflow_huge_int_skip_32(<<_:67108864/unit:64,0,_/binary>>) -> 3; % 1 bsl 26
+overflow_huge_int_skip_32(<<_:134217728/unit:32,0,_/binary>>) -> 4; % 1 bsl 27
+overflow_huge_int_skip_32(<<_:268435456/unit:16,0,_/binary>>) -> 5; % 1 bsl 28
+overflow_huge_int_skip_32(<<_:536870912/unit:8,0,_/binary>>) -> 6; % 1 bsl 29
+overflow_huge_int_skip_32(<<_:1073741824/unit:8,0,_/binary>>) -> 7; % 1 bsl 30
+overflow_huge_int_skip_32(<<_:2147483648/unit:8,0,_/binary>>) -> 8; % 1 bsl 31
+overflow_huge_int_skip_32(_) -> nomatch.
+
+overflow_huge_int_32(<<Int:4294967296,_/binary>>) -> {1,Int}; % 1 bsl 32
+overflow_huge_int_32(<<Int:33554432/unit:128,0,_/binary>>) -> {2,Int}; % 1 bsl 25
+overflow_huge_int_32(<<Int:67108864/unit:128,0,_/binary>>) -> {3,Int}; % 1 bsl 26
+overflow_huge_int_32(<<Int:134217728/unit:128,0,_/binary>>) -> {4,Int}; % 1 bsl 27
+overflow_huge_int_32(<<Int:268435456/unit:128,0,_/binary>>) -> {5,Int}; % 1 bsl 28
+overflow_huge_int_32(<<Int:536870912/unit:128,0,_/binary>>) -> {6,Int}; % 1 bsl 29
+overflow_huge_int_32(<<Int:1073741824/unit:128,0,_/binary>>) -> {7,Int}; % 1 bsl 30
+overflow_huge_int_32(<<Int:2147483648/unit:128,0,_/binary>>) -> {8,Int}; % 1 bsl 31
+overflow_huge_int_32(_) -> nomatch.
+
+overflow_huge_int_skip_64(<<_:18446744073709551616,_/binary>>) -> 1; % 1 bsl 64
+overflow_huge_int_skip_64(<<_:144115188075855872/unit:128,0,_/binary>>) -> 2; % 1 bsl 57
+overflow_huge_int_skip_64(<<_:288230376151711744/unit:64,0,_/binary>>) -> 3; % 1 bsl 58
+overflow_huge_int_skip_64(<<_:576460752303423488/unit:32,0,_/binary>>) -> 4; % 1 bsl 59
+overflow_huge_int_skip_64(<<_:1152921504606846976/unit:16,0,_/binary>>) -> 5; % 1 bsl 60
+overflow_huge_int_skip_64(<<_:2305843009213693952/unit:8,0,_/binary>>) -> 6; % 1 bsl 61
+overflow_huge_int_skip_64(<<_:4611686018427387904/unit:8,0,_/binary>>) -> 7; % 1 bsl 62
+overflow_huge_int_skip_64(<<_:9223372036854775808/unit:8,0,_/binary>>) -> 8; % 1 bsl 63
+overflow_huge_int_skip_64(_) -> nomatch.
+
+overflow_huge_int_64(<<Int:18446744073709551616,_/binary>>) -> {1,Int}; % 1 bsl 64
+overflow_huge_int_64(<<Int:144115188075855872/unit:128,0,_/binary>>) -> {2,Int}; % 1 bsl 57
+overflow_huge_int_64(<<Int:288230376151711744/unit:128,0,_/binary>>) -> {3,Int}; % 1 bsl 58
+overflow_huge_int_64(<<Int:576460752303423488/unit:128,0,_/binary>>) -> {4,Int}; % 1 bsl 59
+overflow_huge_int_64(<<Int:1152921504606846976/unit:128,0,_/binary>>) -> {5,Int}; % 1 bsl 60
+overflow_huge_int_64(<<Int:2305843009213693952/unit:128,0,_/binary>>) -> {6,Int}; % 1 bsl 61
+overflow_huge_int_64(<<Int:4611686018427387904/unit:128,0,_/binary>>) -> {7,Int}; % 1 bsl 62
+overflow_huge_int_64(<<Int:9223372036854775808/unit:128,0,_/binary>>) -> {8,Int}; % 1 bsl 63
+overflow_huge_int_64(_) -> nomatch.
+
+bignum(Config) when is_list(Config) ->
+    ?line Bin = id(<<42,0:1024/unit:8,43>>),
+    ?line <<42:1025/little-integer-unit:8,_:8>> = Bin,
+    ?line <<_:8,43:1025/integer-unit:8>> = Bin,
+
+    ?line BignumBin = id(<<0:512/unit:8,258254417031933722623:9/unit:8>>),
+    ?line <<258254417031933722623:(512+9)/unit:8>> = BignumBin,
+    erlang:garbage_collect(),			%Search for holes in debug-build.
+    ok.
+
+unaligned_32_bit(Config) when is_list(Config) ->
+    %% There used to be a risk for heap overflow (fixed in R11B-5).
+    ?line L = unaligned_32_bit_1(<<-1:(64*1024)>>),
+    ?line unaligned_32_bit_verify(L, 1638).
+
+unaligned_32_bit_1(<<1:1,U:32,_:7,T/binary>>) ->
+    [U|unaligned_32_bit_1(T)];
+unaligned_32_bit_1(_) ->
+    [].
+
+unaligned_32_bit_verify([], 0) -> ok;
+unaligned_32_bit_verify([4294967295|T], N) when N > 0 ->
+    unaligned_32_bit_verify(T, N-1).
+
+id(I) -> I.
diff --git a/lib/debugger/test/bs_match_misc_SUITE.erl b/lib/debugger/test/bs_match_misc_SUITE.erl
index 53d11ba179..89fce263f5 100644
--- a/lib/debugger/test/bs_match_misc_SUITE.erl
+++ b/lib/debugger/test/bs_match_misc_SUITE.erl
@@ -19,18 +19,24 @@
 
 -module(bs_match_misc_SUITE).
 
--author('[email protected]').
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
 	 init_per_suite/1,end_per_suite/1,
-	 bound_var/1,bound_tail/1,t_float/1,little_float/1,sean/1]).
+	 bound_var/1,bound_tail/1,t_float/1,little_float/1,sean/1,
+	 kenneth/1,encode_binary/1,native/1,happi/1,
+	 size_var/1,wiger/1,x0_context/1,huge_float_field/1,
+	 writable_binary_matched/1,otp_7198/1,
+	 unordered_bindings/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    cases().
+    [bound_var, bound_tail, t_float, little_float, sean,
+     kenneth, encode_binary, native, happi, size_var, wiger,
+     x0_context, huge_float_field, writable_binary_matched,
+     otp_7198, unordered_bindings].
 
 groups() -> 
     [].
@@ -41,9 +47,13 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
 
-cases() -> 
-    [bound_var, bound_tail, t_float, little_float, sean].
+end_per_suite(Config) when is_list(Config) ->
+    ok.
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -55,16 +65,8 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-init_per_suite(Config) when is_list(Config) ->
-    ?line test_lib:interpret(?MODULE),
-    ?line true = lists:member(?MODULE, int:interpreted()),
-    Config.
-
-end_per_suite(Config) when is_list(Config) ->
-    ok.
-
 bound_var(doc) -> "Test matching of bound variables.";
-bound_var(Config) when list(Config) ->
+bound_var(Config) when is_list(Config) ->
     ?line ok = bound_var(42, 13, <<42,13>>),
     ?line nope = bound_var(42, 13, <<42,255>>),
     ?line nope = bound_var(42, 13, <<154,255>>),
@@ -74,7 +76,7 @@ bound_var(A, B, <<A:8,B:8>>) -> ok;
 bound_var(_, _, _) -> nope.
 
 bound_tail(doc) -> "Test matching of a bound tail.";
-bound_tail(Config) when list(Config) ->
+bound_tail(Config) when is_list(Config) ->
     ?line ok = bound_tail(<<>>, <<13,14>>),
     ?line ok = bound_tail(<<2,3>>, <<1,1,2,3>>),
     ?line nope = bound_tail(<<2,3>>, <<1,1,2,7>>),
@@ -85,7 +87,7 @@ bound_tail(Config) when list(Config) ->
 bound_tail(T, <<_:16,T/binary>>) -> ok;
 bound_tail(_, _) -> nope.
 
-t_float(Config) when list(Config) ->
+t_float(Config) when is_list(Config) ->
     F = f1(),
     G = f_one(),
 
@@ -98,6 +100,10 @@ t_float(Config) when list(Config) ->
     ?line fcmp(F, match_float(<<1:1,F:64/float,127:7>>, 64, 1)),
     ?line fcmp(F, match_float(<<1:13,F:32/float,127:3>>, 32, 13)),
     ?line fcmp(F, match_float(<<1:13,F:64/float,127:3>>, 64, 13)),
+
+    ?line {'EXIT',{{badmatch,_},_}} = (catch match_float(<<0,0>>, 16, 0)),
+    ?line {'EXIT',{{badmatch,_},_}} = (catch match_float(<<0,0>>, 16#7fffffff, 0)),
+
     ok.
 
 
@@ -110,7 +116,7 @@ match_float(Bin0, Fsz, I) ->
     <<_:I,F:Fsz/float,_:Tsz>> = Bin,
     F.
 
-little_float(Config) when list(Config) ->
+little_float(Config) when is_list(Config) ->
     F = f2(),
     G = f_one(),
 
@@ -149,7 +155,7 @@ f2() ->
 f_one() ->
     1.0.
 
-sean(Config) when list(Config) ->
+sean(Config) when is_list(Config) ->
     ?line small = sean1(<<>>),
     ?line small = sean1(<<1>>),
     ?line small = sean1(<<1,2>>),
@@ -162,5 +168,414 @@ sean(Config) when list(Config) ->
     ?line {'EXIT',{function_clause,_}} = (catch sean1(<<4,5,6,7>>)),
     ok.
 
-sean1(<<B/binary>>) when size(B) < 4 ->	small;
+sean1(<<B/binary>>) when byte_size(B) < 4 -> small;
 sean1(<<1, _B/binary>>) -> large.
+
+kenneth(Config) when is_list(Config) ->
+    {ok,[145,148,113,129,0,0,0,0]} =
+	msisdn_internal_storage(<<145,148,113,129,0,0,0,0>>, []).
+
+msisdn_internal_storage(<<>>,MSISDN) ->
+    {ok,lists:reverse(MSISDN)};
+msisdn_internal_storage(<<2#11111111:8,_Rest/binary>>,MSISDN) ->
+    {ok,lists:reverse(MSISDN)};
+msisdn_internal_storage(<<2#1111:4,DigitN:4,_Rest/binary>>,MSISDN) when
+    DigitN < 10 ->
+    {ok,lists:reverse([(DigitN bor 2#11110000)|MSISDN])};
+msisdn_internal_storage(<<DigitNplus1:4,DigitN:4,Rest/binary>>,MSISDN) when
+    DigitNplus1 < 10,
+    DigitN < 10 ->
+    NewMSISDN=[((DigitNplus1 bsl 4) bor DigitN)|MSISDN],
+    msisdn_internal_storage(Rest,NewMSISDN);
+msisdn_internal_storage(_Rest,_MSISDN) ->
+    {fault}. %% Mandatory IE incorrect
+
+encode_binary(Config) when is_list(Config) ->
+    "C2J2QiSc" = encodeBinary(<<11,98,118,66,36,156>>, []),
+    ok.
+
+encodeBinary(<<>>, Output) ->
+    lists:reverse(Output);
+encodeBinary(<<Data:1/binary>>, Output) ->
+    <<DChar1:6, DChar2:2>> = Data,
+    Char1 = getBase64Char(DChar1),
+    Char2 = getBase64Char(DChar2),
+    Char3 = "=",
+    Char4 = "=",
+    NewOutput = Char4 ++ Char3 ++ Char2 ++ Char1 ++ Output,
+    encodeBinary(<<>>, NewOutput);
+encodeBinary(<<Data:2/binary>>, Output) ->
+    <<DChar1:6, DChar2:6, DChar3:4>> = Data,
+    Char1 = getBase64Char(DChar1),
+    Char2 = getBase64Char(DChar2),
+    Char3 = getBase64Char(DChar3),
+    Char4 = "=",
+    NewOutput = Char4 ++ Char3 ++ Char2 ++ Char1 ++ Output,
+    encodeBinary(<<>>, NewOutput);
+encodeBinary(<<Data:3/binary, Rest/binary>>, Output) ->
+    <<DChar1:6, DChar2:6, DChar3:6, DChar4:6>> = Data,
+    Char1 = getBase64Char(DChar1),
+    Char2 = getBase64Char(DChar2),
+    Char3 = getBase64Char(DChar3),
+    Char4 = getBase64Char(DChar4),
+    NewOutput = Char4 ++ Char3 ++ Char2 ++ Char1 ++ Output,
+    encodeBinary(Rest, NewOutput);
+encodeBinary(_Data, _) ->
+    error.
+
+getBase64Char(0)  -> "A";
+getBase64Char(1)  -> "B";
+getBase64Char(2)  -> "C";
+getBase64Char(3)  -> "D";
+getBase64Char(4)  -> "E";
+getBase64Char(5)  -> "F";
+getBase64Char(6)  -> "G";
+getBase64Char(7)  -> "H";
+getBase64Char(8)  -> "I";
+getBase64Char(9)  -> "J";
+getBase64Char(10) -> "K";
+getBase64Char(11) -> "L";
+getBase64Char(12) -> "M";
+getBase64Char(13) -> "N";
+getBase64Char(14) -> "O";
+getBase64Char(15) -> "P";
+getBase64Char(16) -> "Q";
+getBase64Char(17) -> "R";
+getBase64Char(18) -> "S";
+getBase64Char(19) -> "T";
+getBase64Char(20) -> "U";
+getBase64Char(21) -> "V";
+getBase64Char(22) -> "W";
+getBase64Char(23) -> "X";
+getBase64Char(24) -> "Y";
+getBase64Char(25) -> "Z";
+getBase64Char(26) -> "a";
+getBase64Char(27) -> "b";
+getBase64Char(28) -> "c";
+getBase64Char(29) -> "d";
+getBase64Char(30) -> "e";
+getBase64Char(31) -> "f";
+getBase64Char(32) -> "g";
+getBase64Char(33) -> "h";
+getBase64Char(34) -> "i";
+getBase64Char(35) -> "j";
+getBase64Char(36) -> "k";
+getBase64Char(37) -> "l";
+getBase64Char(38) -> "m";
+getBase64Char(39) -> "n";
+getBase64Char(40) -> "o";
+getBase64Char(41) -> "p";
+getBase64Char(42) -> "q";
+getBase64Char(43) -> "r";
+getBase64Char(44) -> "s";
+getBase64Char(45) -> "t";
+getBase64Char(46) -> "u";
+getBase64Char(47) -> "v";
+getBase64Char(48) -> "w";
+getBase64Char(49) -> "x";
+getBase64Char(50) -> "y";
+getBase64Char(51) -> "z";
+getBase64Char(52) -> "0";
+getBase64Char(53) -> "1";
+getBase64Char(54) -> "2";
+getBase64Char(55) -> "3";
+getBase64Char(56) -> "4";
+getBase64Char(57) -> "5";
+getBase64Char(58) -> "6";
+getBase64Char(59) -> "7";
+getBase64Char(60) -> "8";
+getBase64Char(61) -> "9";
+getBase64Char(62) -> "+";
+getBase64Char(63) -> "/";
+getBase64Char(_Else) ->
+    %% This is an illegal input.
+%    cgLogEM:log(error, ?MODULE, getBase64Char, [Else],
+%		"illegal input",
+%		?LINE, version()),
+    "**".
+
+-define(M(F), <<F>> = <<F>>).
+
+native(Config) when is_list(Config) ->
+    ?line ?M(3.14:64/native-float),
+    ?line ?M(333:16/native),
+    ?line ?M(38658345:32/native),
+    case <<1:16/native>> of
+	<<0,1>> -> native_big();
+	<<1,0>> -> native_little()
+    end.
+
+native_big() ->
+    ?line <<37.33:64/native-float>> = <<37.33:64/big-float>>,
+    ?line <<3974:16/native-integer>> = <<3974:16/big-integer>>,
+    {comment,"Big endian"}.
+
+native_little() ->
+    ?line <<37869.32343:64/native-float>> = <<37869.32343:64/little-float>>,
+    ?line <<7974:16/native-integer>> = <<7974:16/little-integer>>,
+    {comment,"Little endian"}.
+
+happi(Config) when is_list(Config) ->
+    Bin = <<".123">>,
+    ?line <<"123">> = lex_digits1(Bin, 1, []),
+    ?line <<"123">> = lex_digits2(Bin, 1, []),
+    ok.
+
+lex_digits1(<<$., Rest/binary>>,_Val,_Acc) ->
+    Rest;
+lex_digits1(<<N, Rest/binary>>,Val, Acc) when N >= $0 , N =< $9 ->
+    lex_digits1(Rest,Val*10+dec(N),Acc);
+lex_digits1(_Other,_Val,_Acc) ->
+    not_ok.
+
+lex_digits2(<<N, Rest/binary>>,Val, Acc) when N >= $0 , N =< $9 ->
+    lex_digits2(Rest,Val*10+dec(N),Acc);
+lex_digits2(<<$., Rest/binary>>,_Val,_Acc) ->
+    Rest;
+lex_digits2(_Other,_Val,_Acc) ->
+    not_ok.
+
+dec(A) ->
+    A-$0.
+
+size_var(Config) when is_list(Config) ->
+    ?line {<<45>>,<<>>} = split(<<1:16,45>>),
+    ?line {<<45>>,<<46,47>>} = split(<<1:16,45,46,47>>),
+    ?line {<<45,46>>,<<47>>} = split(<<2:16,45,46,47>>),
+
+    ?line {<<45,46,47>>,<<48>>} = split_2(<<16:8,3:16,45,46,47,48>>),
+
+    ?line {<<45,46>>,<<47>>} = split(2, <<2:16,45,46,47>>),
+    ?line {'EXIT',{function_clause,_}} = (catch split(42, <<2:16,45,46,47>>)),
+
+    ?line <<"cdef">> = skip(<<2:8,"abcdef">>),
+
+    ok.
+
+split(<<N:16,B:N/binary,T/binary>>) ->
+    {B,T}.
+
+split(N, <<N:16,B:N/binary,T/binary>>) ->
+    {B,T}.
+
+split_2(<<N0:8,N:N0,B:N/binary,T/binary>>) ->
+    {B,T}.
+
+skip(<<N:8,_:N/binary,T/binary>>) -> T.
+
+wiger(Config) when is_list(Config) ->
+    ?line ok1 = wcheck(<<3>>),
+    ?line ok2 = wcheck(<<1,2,3>>),
+    ?line ok3 = wcheck(<<4>>),
+    ?line {error,<<1,2,3,4>>} = wcheck(<<1,2,3,4>>),
+    ?line {error,<<>>} = wcheck(<<>>),
+    ok.
+
+wcheck(<<A>>) when A==3->
+    ok1;
+wcheck(<<_,_:2/binary>>) ->
+    ok2;
+wcheck(<<_>>) ->
+    ok3;
+wcheck(Other) ->
+    {error,Other}.
+
+%% Test that having the match context in x(0) works.
+
+x0_context(Config) when is_list(Config) ->
+    x0_0([], <<3.0:64/float,42:16,123456:32>>).
+
+x0_0(_, Bin) ->
+    <<3.0:64/float,42:16,_/binary>> = Bin,
+    x0_1([], Bin, 64, 16, 2).
+
+x0_1(_, Bin, FloatSz, IntSz, BinSz) ->
+    <<_:FloatSz/float,42:IntSz,B:BinSz/binary,C:1/binary,D/binary>> = Bin,
+    id({B,C,D}),
+    <<_:FloatSz/float,42:IntSz,B:BinSz/binary,_/binary>> = Bin,
+    x0_2([], Bin).
+
+x0_2(_, Bin) ->
+    <<_:64,0:7,42:9,_/binary>> = Bin,
+    x0_3([], Bin).
+
+x0_3(_, Bin) ->
+    case Bin of
+	<<_:72,7:8,_/binary>> ->
+	    ?line ?t:fail();
+	<<_:64,0:16,_/binary>> ->
+	    ?line ?t:fail();
+	<<_:64,42:16,123456:32,_/binary>> ->
+	    ok
+    end.
+
+
+huge_float_field(Config) when is_list(Config) ->
+    Sz = 1 bsl 27,
+    ?line Bin = <<0:Sz>>,
+
+    ?line nomatch = overflow_huge_float_skip_32(Bin),
+    ?line nomatch = overflow_huge_float_32(Bin),
+
+    ?line ok = overflow_huge_float(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
+    ?line ok = overflow_huge_float_unit128(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
+    ok.
+
+overflow_huge_float_skip_32(<<_:4294967296/float,0,_/binary>>) -> 1; % 1 bsl 32
+overflow_huge_float_skip_32(<<_:33554432/float-unit:128,0,_/binary>>) -> 2; % 1 bsl 25
+overflow_huge_float_skip_32(<<_:67108864/float-unit:64,0,_/binary>>) -> 3; % 1 bsl 26
+overflow_huge_float_skip_32(<<_:134217728/float-unit:32,0,_/binary>>) -> 4; % 1 bsl 27
+overflow_huge_float_skip_32(<<_:268435456/float-unit:16,0,_/binary>>) -> 5; % 1 bsl 28
+overflow_huge_float_skip_32(<<_:536870912/float-unit:8,0,_/binary>>) -> 6; % 1 bsl 29
+overflow_huge_float_skip_32(<<_:1073741824/float-unit:8,0,_/binary>>) -> 7; % 1 bsl 30
+overflow_huge_float_skip_32(<<_:2147483648/float-unit:8,0,_/binary>>) -> 8; % 1 bsl 31
+overflow_huge_float_skip_32(_) -> nomatch.
+
+overflow_huge_float_32(<<F:4294967296/float,_/binary>>) -> {1,F}; % 1 bsl 32
+overflow_huge_float_32(<<F:33554432/float-unit:128,0,_/binary>>) -> {2,F}; % 1 bsl 25
+overflow_huge_float_32(<<F:67108864/float-unit:128,0,_/binary>>) -> {3,F}; % 1 bsl 26
+overflow_huge_float_32(<<F:134217728/float-unit:128,0,_/binary>>) -> {4,F}; % 1 bsl 27
+overflow_huge_float_32(<<F:268435456/float-unit:128,0,_/binary>>) -> {5,F}; % 1 bsl 28
+overflow_huge_float_32(<<F:536870912/float-unit:128,0,_/binary>>) -> {6,F}; % 1 bsl 29
+overflow_huge_float_32(<<F:1073741824/float-unit:128,0,_/binary>>) -> {7,F}; % 1 bsl 30
+overflow_huge_float_32(<<F:2147483648/float-unit:128,0,_/binary>>) -> {8,F}; % 1 bsl 31
+overflow_huge_float_32(_) -> nomatch.
+
+
+overflow_huge_float(Bin, [Sz0|Sizes]) ->
+    Sz = id(1 bsl Sz0),
+    case Bin of
+	<<_:Sz/float-unit:8,0,_/binary>> ->
+	    {error,Sz};
+	_ ->
+	    case Bin of
+		<<Var:Sz/float-unit:8,0,_/binary>> ->
+		    {error,Sz,Var};
+		_ ->
+		    overflow_huge_float(Bin, Sizes)
+	    end
+    end;
+overflow_huge_float(_, []) -> ok.
+
+overflow_huge_float_unit128(Bin, [Sz0|Sizes]) ->
+    Sz = id(1 bsl Sz0),
+    case Bin of
+	<<_:Sz/float-unit:128,0,_/binary>> ->
+	    {error,Sz};
+	_ ->
+	    case Bin of
+		<<Var:Sz/float-unit:128,0,_/binary>> ->
+		    {error,Sz,Var};
+		_ ->
+		    overflow_huge_float_unit128(Bin, Sizes)
+	    end
+    end;
+overflow_huge_float_unit128(_, []) -> ok.
+
+
+%%
+%% Test that a writable binary can be safely matched.
+%%
+
+writable_binary_matched(Config) when is_list(Config) ->
+    ?line WritableBin = create_writeable_binary(),
+    ?line writable_binary_matched(WritableBin, WritableBin, 500).
+
+writable_binary_matched(<<0>>, _, N) ->
+    if
+	N =:= 0 -> ok;
+	true ->
+	    put(grow_heap, [N|get(grow_heap)]),
+	    ?line WritableBin = create_writeable_binary(),
+	    ?line writable_binary_matched(WritableBin, WritableBin, N-1)
+    end;
+writable_binary_matched(<<B:8,T/binary>>, WritableBin0, N) ->
+    ?line WritableBin = writable_binary(WritableBin0, B),
+    writable_binary_matched(T, WritableBin, N).
+
+writable_binary(WritableBin0, B) when is_binary(WritableBin0) ->
+    %% Heavy append to force the binary to move.
+    ?line WritableBin = <<WritableBin0/binary,0:(size(WritableBin0))/unit:8,B>>,
+    ?line id(<<(id(0)):128/unit:8>>),
+    WritableBin.
+
+create_writeable_binary() ->
+  <<(id(<<>>))/binary,1,2,3,4,5,6,0>>.
+
+otp_7198(Config) when is_list(Config) ->
+    %% When a match context was reused, and grown at the same time to
+    %% increase the number of saved positions, the thing word was not updated
+    %% to account for the new size. Therefore, if there was a garbage collection,
+    %% the new slots would be included in the garbage collection.
+    ?line [do_otp_7198(FillerSize) || FillerSize <- lists:seq(0, 256)],
+    ok.
+
+do_otp_7198(FillerSize) ->
+    Filler = erlang:make_tuple(FillerSize, 42),
+    {Pid,Ref} = spawn_monitor(fun() -> do_otp_7198_test(Filler) end),
+    receive
+	{'DOWN',Ref,process,Pid,normal} ->
+	    ok;
+	{'DOWN',Ref,process,Pid,Reason} ->
+	    io:format("unexpected: ~p", [Reason]),
+	    ?line ?t:fail()
+    end.
+
+do_otp_7198_test(_) ->
+    [{'KEYWORD',114},
+     {'KEYWORD',101},
+     {'KEYWORD',103},
+     {'KEYWORD',105},
+     {'KEYWORD',111},
+     {'FIELD',110},
+     {'KEYWORD',119},
+     {'KEYWORD',104},
+     {'KEYWORD',97},
+     {'KEYWORD',116},
+     {'KEYWORD',101},
+     {'KEYWORD',118},
+     {'KEYWORD',101},
+     {'KEYWORD',114},
+     '$thats_all_folks$'] = otp_7198_scan(<<"region:whatever">>, []).
+
+
+otp_7198_scan(<<>>, TokAcc) ->
+        lists:reverse(['$thats_all_folks$' | TokAcc]);
+
+otp_7198_scan(<<D, Z, Rest/binary>>, TokAcc) when
+                        (D =:= $D orelse D =:= $d) and
+                        ((Z =:= $\s) or (Z =:= $() or (Z =:= $))) ->
+        otp_7198_scan(<<Z, Rest/binary>>, ['AND' | TokAcc]);
+
+otp_7198_scan(<<D>>, TokAcc) when
+                        (D =:= $D) or (D =:= $d) ->
+        otp_7198_scan(<<>>, ['AND' | TokAcc]);
+
+otp_7198_scan(<<N, Z, Rest/binary>>, TokAcc) when
+                        (N =:= $N orelse N =:= $n) and
+                        ((Z =:= $\s) or (Z =:= $() or (Z =:= $))) ->
+        otp_7198_scan(<<Z, Rest/binary>>, ['NOT' | TokAcc]);
+
+otp_7198_scan(<<C, Rest/binary>>, TokAcc) when
+                                (C >= $A) and (C =< $Z);
+                                (C >= $a) and (C =< $z);
+                                (C >= $0) and (C =< $9) ->
+        case Rest of
+                <<$:, R/binary>> ->
+                        otp_7198_scan(R, [{'FIELD', C} | TokAcc]);
+                _ ->
+                        otp_7198_scan(Rest, [{'KEYWORD', C} | TokAcc])
+        end.
+
+unordered_bindings(Config) when is_list(Config) ->
+    {<<1,2,3,4>>,<<42,42>>,<<3,3,3>>} =
+	unordered_bindings(4, 2, 3, <<1,2,3,4, 42,42, 3,3,3, 3>>),
+    ok.
+
+unordered_bindings(CompressedLength, HashSize, PadLength, T) ->
+    <<Content:CompressedLength/binary,Mac:HashSize/binary,
+     Padding:PadLength/binary,PadLength>> = T,
+    {Content,Mac,Padding}.
+
+
+id(I) -> I.
diff --git a/lib/debugger/test/bs_match_tail_SUITE.erl b/lib/debugger/test/bs_match_tail_SUITE.erl
index 961ccbb599..9f7519cf3a 100644
--- a/lib/debugger/test/bs_match_tail_SUITE.erl
+++ b/lib/debugger/test/bs_match_tail_SUITE.erl
@@ -64,7 +64,7 @@ end_per_suite(Config) when is_list(Config) ->
     ok.
 
 aligned(doc) -> "Test aligned tails.";
-aligned(Config) when list(Config) ->
+aligned(Config) when is_list(Config) ->
     ?line Tail1 = mkbin([]),
     ?line {258,Tail1} = al_get_tail_used(mkbin([1,2])),
     ?line Tail2 = mkbin(lists:seq(1, 127)),
@@ -84,10 +84,10 @@ aligned(Config) when list(Config) ->
     ok.
 
 al_get_tail_used(<<A:16,T/binary>>) -> {A,T}.
-al_get_tail_unused(<<A:16,_T/binary>>) -> A.
+al_get_tail_unused(<<A:16,_/binary>>) -> A.
 
 unaligned(doc) -> "Test that an non-aligned tail cannot be matched out.";
-unaligned(Config) when list(Config) ->
+unaligned(Config) when is_list(Config) ->
     ?line {'EXIT',{function_clause,_}} = (catch get_tail_used(mkbin([42]))),
     ?line {'EXIT',{{badmatch,_},_}} = (catch get_dyn_tail_used(mkbin([137]), 3)),
     ?line {'EXIT',{function_clause,_}} = (catch get_tail_unused(mkbin([42,33]))),
@@ -103,11 +103,11 @@ get_dyn_tail_used(Bin, Sz) ->
     {A,T}.
 
 get_dyn_tail_unused(Bin, Sz) ->
-    <<A:Sz,_T/binary>> = Bin,
+    <<A:Sz,_/binary>> = Bin,
     A.
 
 zero_tail(doc) -> "Test that zero tails are tested correctly.";
-zero_tail(Config) when list(Config) ->
+zero_tail(Config) when is_list(Config) ->
     ?line 7 = (catch test_zero_tail(mkbin([7]))),
     ?line {'EXIT',{function_clause,_}} = (catch test_zero_tail(mkbin([1,2]))),
     ?line {'EXIT',{function_clause,_}} = (catch test_zero_tail2(mkbin([1,2,3]))),
@@ -117,4 +117,4 @@ test_zero_tail(<<A:8>>) -> A.
 
 test_zero_tail2(<<_A:4,_B:4>>) -> ok.
 
-mkbin(L) when list(L) -> list_to_binary(L).
+mkbin(L) when is_list(L) -> list_to_binary(L).
diff --git a/lib/debugger/test/bug_SUITE.erl b/lib/debugger/test/bug_SUITE.erl
index a831897dfb..1a7e876329 100644
--- a/lib/debugger/test/bug_SUITE.erl
+++ b/lib/debugger/test/bug_SUITE.erl
@@ -51,7 +51,7 @@ end_per_group(_GroupName, Config) ->
 
 otp2163(doc) -> ["BIF exit reason"];
 otp2163(suite) -> [];
-otp2163(Config) when list(Config) ->
+otp2163(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
 
     %% First compile and get the expected results:
@@ -74,7 +74,7 @@ otp2163(Config) when list(Config) ->
 
 otp4845(doc) -> ["BIF not loading and not bug compatible, OTP-4845 OTP-4859"];
 otp4845(suite) -> [];
-otp4845(Config) when list(Config) ->
+otp4845(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
 
     %% First compile and get the expected results:
diff --git a/lib/debugger/test/exception_SUITE.erl b/lib/debugger/test/exception_SUITE.erl
index 8c864e4b5f..86554ab2d4 100644
--- a/lib/debugger/test/exception_SUITE.erl
+++ b/lib/debugger/test/exception_SUITE.erl
@@ -23,7 +23,8 @@
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
 	 init_per_suite/1,end_per_suite/1,
-	 badmatch/1,pending_errors/1,nil_arith/1]).
+	 badmatch/1,pending_errors/1,nil_arith/1,
+         stacktrace/1,nested_stacktrace/1,raise/1,gunilla/1,per/1]).
 
 -export([bad_guy/2]).
 
@@ -31,6 +32,19 @@
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
+%% Filler.
+%%
+%%
+%%
+%%
+%% This is line 40.
+even(N) when is_integer(N), N > 1, (N rem 2) == 0 ->
+    odd(N-1)++[N].
+
+odd(N) when is_integer(N), N > 1, (N rem 2) == 1 ->
+    even(N-1)++[N].
+
+
 all() -> 
     cases().
 
@@ -45,7 +59,8 @@ end_per_group(_GroupName, Config) ->
 
 
 cases() -> 
-    [badmatch, pending_errors, nil_arith].
+    [badmatch, pending_errors, nil_arith, stacktrace,
+     nested_stacktrace, raise, gunilla, per].
 
 -define(try_match(E),
 	catch ?MODULE:bar(),
@@ -69,9 +84,9 @@ init_per_suite(Config) when is_list(Config) ->
 end_per_suite(Config) when is_list(Config) ->
     ok.
 
-badmatch(doc) -> "Test that deliberately bad matches are reported correctly.";
-badmatch(suite) -> [];
-badmatch(Config) when list(Config) ->
+%% Test that deliberately bad matches are reported correctly.
+
+badmatch(Config) when is_list(Config) ->
     ?line ?try_match(a),
     ?line ?try_match(42),
     ?line ?try_match({a, b, c}),
@@ -79,11 +94,9 @@ badmatch(Config) when list(Config) ->
     ?line ?try_match(1.0),
     ok.
 
-pending_errors(doc) ->
-    ["Test various exceptions, in the presence of a previous error suppressed ",
-     "in a guard."];
-pending_errors(suite) -> [];
-pending_errors(Config) when list(Config) ->
+%% Test various exceptions, in the presence of a previous error suppressed
+%% in a guard.
+pending_errors(Config) when is_list(Config) ->
     ?line pending(e_badmatch, {badmatch, b}),
     ?line pending(x, function_clause),
     ?line pending(e_case, {case_clause, xxx}),
@@ -100,7 +113,7 @@ bad_guy(pe_badarith, Other) when Other+1 == 0 -> % badarith (suppressed)
 bad_guy(pe_badarg, Other) when length(Other) > 0 -> % badarg (suppressed)
     ok;
 bad_guy(_, e_case) ->
-    case xxx of
+    case id(xxx) of
 	ok -> ok
     end;					% case_clause
 bad_guy(_, e_if) ->
@@ -121,7 +134,7 @@ bad_guy(_, e_badarg) ->
 bad_guy(_, e_badarg_spawn) ->
     spawn({}, {}, {});				% badarg
 bad_guy(_, e_badmatch) ->
-    a = b.					% badmatch
+    a = id(b).					% badmatch
 
 pending(Arg, Expected) ->
     pending(pe_badarith, Arg, Expected),
@@ -155,28 +168,23 @@ pending_exit_message(Args, Expected) ->
     end,
     process_flag(trap_exit, false).
 
-pending({badarg,[{erlang,Bif,BifArgs},{?MODULE,Func,Arity}|_]}, Func, Args, _Code)
-  when atom(Bif), list(BifArgs), length(Args) == Arity -> %Threaded code.
-    ok;
-pending({badarg,[{erlang,Bif,BifArgs},{?MODULE,Func,Args}|_]}, Func, Args, _Code)
-  when atom(Bif), list(BifArgs) -> %From interpreted code.
+pending({badarg, [{erlang,Bif,BifArgs,_},{?MODULE,Func,Arity,_}|_]},
+	Func, Args, _Code)
+  when is_atom(Bif), is_list(BifArgs), length(Args) == Arity ->
     ok;
-pending({undef,[{non_existing_module,foo,[]}|_]}, _, _, _) ->
+pending({undef,[{non_existing_module,foo,[],_}|_]}, _, _, _) ->
     ok;
-pending({function_clause,[{?MODULE,Func,Args}|_]}, Func, Args, _Code) ->
+pending({function_clause,[{?MODULE,Func,Args,_}|_]}, Func, Args, _Code) ->
     ok;
-pending({Code,[{?MODULE,Func,Arity}|_]}, Func, Args, Code) when length(Args) == Arity -> %Threaded code
+pending({Code,[{?MODULE,Func,Arity,_}|_]}, Func, Args, Code)
+  when length(Args) == Arity ->
     ok;
-pending({Code,[{?MODULE,Func,Args}|_]}, Func, Args, Code) -> %From interpreted code.
-    ok;
-pending(Reason, Func, Args, Code) ->
-    test_server:fail({bad_exit_reason,Reason,{Func,Args,Code}}).
-
-nil_arith(doc) ->
-    "Test that doing arithmetics on [] gives a badarith EXIT and not a crash.";
-nil_arith(suite) ->
-    [];
-nil_arith(Config) when list(Config) ->
+pending(Reason, _Function, _Args, _Code) ->
+    test_server:fail({bad_exit_reason,Reason}).
+
+%% Test that doing arithmetics on [] gives a badarith EXIT and not a crash.
+
+nil_arith(Config) when is_list(Config) ->
     ?line ba_plus_minus_times([], []),
 
     ?line ba_plus_minus_times([], 0),
@@ -268,3 +276,199 @@ ba_shift(A, B) ->
 ba_bnot(A) ->
     io:format("bnot ~p", [A]),
     {'EXIT', {badarith, _}} = (catch bnot A).
+
+stacktrace(Conf) when is_list(Conf) ->
+    Tag = make_ref(),
+    ?line {_,Mref} = spawn_monitor(fun() -> exit({Tag,erlang:get_stacktrace()}) end),
+    ?line {Tag,[]} = receive {'DOWN',Mref,_,_,Info} -> Info end,
+    V = [make_ref()|self()],
+    ?line {value2,{caught1,badarg,[{erlang,abs,[V],_}|_]=St1}} =
+	stacktrace_1({'abs',V}, error, {value,V}),
+    ?line St1 = erase(stacktrace1),
+    ?line St1 = erase(stacktrace2),
+    ?line St1 = erlang:get_stacktrace(),
+    ?line {caught2,{error,badarith},[{?MODULE,my_add,2,_}|_]=St2} =
+	stacktrace_1({'div',{1,0}}, error, {'add',{0,a}}),
+    ?line [{?MODULE,my_div,2,_}|_] = erase(stacktrace1),
+    ?line St2 = erase(stacktrace2),
+    ?line St2 = erlang:get_stacktrace(),
+    ?line {caught2,{error,{try_clause,V}},[{?MODULE,stacktrace_1,3,_}|_]=St3} =
+	stacktrace_1({value,V}, error, {value,V}),
+    ?line St3 = erase(stacktrace1),
+    ?line St3 = erase(stacktrace2),
+    ?line St3 = erlang:get_stacktrace(),
+    ?line {caught2,{throw,V},[{?MODULE,foo,1,_}|_]=St4} =
+	stacktrace_1({value,V}, error, {throw,V}),
+    ?line [{?MODULE,stacktrace_1,3,_}|_] = erase(stacktrace1),
+    ?line St4 = erase(stacktrace2),
+    ?line St4 = erlang:get_stacktrace(),
+    ok.
+
+stacktrace_1(X, C1, Y) ->
+    erase(stacktrace1),
+    erase(stacktrace2),
+    try try foo(X) of
+            C1 -> value1
+        catch
+            C1:D1 -> {caught1,D1,erlang:get_stacktrace()}
+        after
+            put(stacktrace1, erlang:get_stacktrace()),
+	    foo(Y)
+        end of
+        V2 -> {value2,V2}
+    catch
+        C2:D2 -> {caught2,{C2,D2},erlang:get_stacktrace()}
+    after
+        put(stacktrace2, erlang:get_stacktrace())
+    end.
+
+
+
+nested_stacktrace(Conf) when is_list(Conf) ->
+    V = [{make_ref()}|[self()]],
+    ?line value1 =
+	nested_stacktrace_1({{value,{V,x1}},void,{V,x1}},
+			    {void,void,void}),
+    ?line {caught1,
+	   [{?MODULE,my_add,2,_}|_],
+	   value2,
+	   [{?MODULE,my_add,2,_}|_]} =
+	nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+			    {{value,{V,x2}},void,{V,x2}}),
+    ?line {caught1,
+	   [{?MODULE,my_add,2,_}|_],
+	   {caught2,[{erlang,abs,[V],_}|_]},
+	   [{erlang,abs,[V],_}|_]} =
+	nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+			    {{'abs',V},error,badarg}),
+    ok.
+
+nested_stacktrace_1({X1,C1,V1}, {X2,C2,V2}) ->
+    try foo(X1) of
+        V1 -> value1
+    catch
+        C1:V1 ->
+	    S1 = erlang:get_stacktrace(),
+            T2 =
+                try foo(X2) of
+	            V2 -> value2
+                catch
+                    C2:V2 -> {caught2,erlang:get_stacktrace()}
+                end,
+            {caught1,S1,T2,erlang:get_stacktrace()}
+    end.
+
+
+
+raise(Conf) when is_list(Conf) ->
+    ?line erase(raise),
+    ?line A =
+	try
+	    ?line try foo({'div',{1,0}})
+		  catch
+		      error:badarith ->
+			  put(raise, A0 = erlang:get_stacktrace()),
+			  ?line erlang:raise(error, badarith, A0)
+		  end
+	catch
+	    error:badarith ->
+		?line A1 = erlang:get_stacktrace(),
+		?line A1 = get(raise)
+	end,
+    ?line A = erlang:get_stacktrace(),
+    ?line A = get(raise),
+    ?line [{?MODULE,my_div,2,_}|_] = A,
+    %%
+    N = 8, % Must be even
+    ?line N = erlang:system_flag(backtrace_depth, N),
+    ?line try even(N)
+	  catch error:function_clause -> ok
+	  end,
+    ?line B = odd_even(N, []),
+    ?line B = erlang:get_stacktrace(),
+    %%
+    ?line C0 = odd_even(N+1, []),
+    ?line C = lists:sublist(C0, N),
+    ?line try odd(N+1)
+	  catch error:function_clause -> ok
+	  end,
+    ?line C = erlang:get_stacktrace(),
+    ?line try erlang:raise(error, function_clause, C0)
+          catch error:function_clause -> ok
+          end,
+    ?line C = erlang:get_stacktrace(),
+    ok.
+
+odd_even(N, R) when is_integer(N), N > 1 ->
+    odd_even(N-1,
+	     [if (N rem 2) == 0 ->
+		      {?MODULE,even,1,[{file,?MODULE_STRING++".erl"},
+				       {line,42}]};
+		 true ->
+		      {?MODULE,odd,1,[{file,?MODULE_STRING++".erl"},
+				      {line,45}]}
+	      end|R]);
+odd_even(1, R) ->
+    [{?MODULE,odd,[1],[{file,?MODULE_STRING++".erl"},
+		       {line,44}]}|R].
+
+foo({value,Value}) -> Value;
+foo({'div',{A,B}}) ->
+    my_div(A, B);
+foo({'add',{A,B}}) ->
+    my_add(A, B);
+foo({'abs',X}) ->
+    my_abs(X);
+foo({error,Error}) ->
+    erlang:error(Error);
+foo({throw,Throw}) ->
+    erlang:throw(Throw);
+foo({exit,Exit}) ->
+    erlang:exit(Exit);
+foo({raise,{Class,Reason,Stacktrace}}) ->
+    erlang:raise(Class, Reason, Stacktrace).
+%%foo(function_clause) -> % must not be defined!
+
+my_div(A, B) ->
+    A div B.
+
+my_add(A, B) ->
+    A + B.
+
+my_abs(X) -> abs(X).
+
+gunilla(Config) when is_list(Config) ->
+    ?line {throw,kalle} = gunilla_1(),
+    ?line [] = erlang:get_stacktrace(),
+    ok.
+
+gunilla_1() ->
+    try try arne()
+	after
+	    pelle
+	end
+    catch
+	C:R ->
+	    {C,R}
+    end.
+
+arne() ->
+    %% Empty stack trace used to cause change the error class to 'error'.
+    erlang:raise(throw, kalle, []).
+
+per(Config) when is_list(Config) ->
+    try
+	t1(0,pad,0),
+	t2(0,pad,0)
+    catch
+	error:badarith ->
+	    ok
+    end.
+
+t1(_,X,_) ->
+   (1 bsl X) + 1.
+
+t2(_,X,_) ->
+   (X bsl 1) + 1.
+
+id(I) -> I.
diff --git a/lib/debugger/test/guard_SUITE.erl b/lib/debugger/test/guard_SUITE.erl
index 611dcb4dff..bf5fa82749 100644
--- a/lib/debugger/test/guard_SUITE.erl
+++ b/lib/debugger/test/guard_SUITE.erl
@@ -35,7 +35,8 @@
 	 t_is_boolean/1,is_function_2/1,
 	 tricky/1,rel_ops/1,
 	 basic_andalso_orelse/1,traverse_dcd/1,
-	 check_qlc_hrl/1]).
+	 check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1,
+	 bad_constants/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -65,7 +66,8 @@ cases() ->
      xor_guard, more_xor_guards, build_in_guard,
      old_guard_tests, gbif, t_is_boolean, is_function_2,
      tricky, rel_ops, basic_andalso_orelse, traverse_dcd,
-     check_qlc_hrl].
+     check_qlc_hrl, andalso_semi, t_tuple_size, binary_part,
+     bad_constants].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -294,9 +296,7 @@ try_gbif(Id, X, Y) ->
 
 try_fail_gbif(Id, X, Y) ->
     case catch guard_bif(Id, X, Y) of
-	{'EXIT', {function_clause,{?MODULE,guard_bif,[Id,X,Y]}}} -> %Jam
-	    io:format("guard_bif(~p, ~p, ~p) -- ok", [Id,X,Y]);
-	{'EXIT', {function_clause,[{?MODULE,guard_bif,[Id,X,Y]}|_]}} ->	%Beam
+	{'EXIT', {function_clause,[{?MODULE,guard_bif,[Id,X,Y],_}|_]}} ->
 	    io:format("guard_bif(~p, ~p, ~p) -- ok", [Id,X,Y]);
 	Other ->
 	    ?line ok = io:format("guard_bif(~p, ~p, ~p) -- bad result: ~p\n",
@@ -367,9 +367,8 @@ type_tests(Test, [Type|T], Allowed) ->
 	    end;
 	false ->
 	    case catch type_test(Test, Value) of
-		{'EXIT', {function_clause, {?MODULE, type_test, [Test, Value]}}} ->
-		    ok;
-		{'EXIT', {function_clause,[{?MODULE,type_test,[Test,Value]}|_]}} ->
+		{'EXIT',{function_clause,
+			 [{?MODULE,type_test,[Test,Value],_}|_]}} ->
 		    ok;
 		{'EXIT',Other} ->
 		    ?line test_server:fail({unexpected_error_reason,Other});
@@ -1477,7 +1476,207 @@ cqlc(M, F, As, St) ->
             St
     end.
 
+%% OTP-7679: Thanks to Hunter Morris.
+andalso_semi(Config) when is_list(Config) ->
+    ?line ok = andalso_semi_foo(0),
+    ?line ok = andalso_semi_foo(1),
+    ?line fc(catch andalso_semi_foo(2)),
+
+    ?line ok = andalso_semi_bar([a,b,c]),
+    ?line ok = andalso_semi_bar(1),
+    ?line fc(catch andalso_semi_bar([a,b])),
+    ok.
+
+andalso_semi_foo(Bar) when is_integer(Bar) andalso Bar =:= 0; Bar =:= 1 ->
+   ok.
+
+andalso_semi_bar(Bar) when is_list(Bar) andalso length(Bar) =:= 3; Bar =:= 1 ->
+   ok.
+
+
+t_tuple_size(Config) when is_list(Config) ->
+    ?line 10 = do_tuple_size({1,2,3,4}),
+    ?line fc(catch do_tuple_size({1,2,3})),
+    ?line fc(catch do_tuple_size(42)),
 
+    ?line error = ludicrous_tuple_size({a,b,c}),
+    ?line error = ludicrous_tuple_size([a,b,c]),
+
+    ok.
+
+do_tuple_size(T) when tuple_size(T) =:= 4 ->
+    {A,B,C,D} = T,
+    A+B+C+D.
+
+ludicrous_tuple_size(T)
+  when tuple_size(T) =:= 16#7777777777777777777777777777777777 -> ok;
+ludicrous_tuple_size(T)
+  when tuple_size(T) =:= 16#10000000000000000 -> ok;
+ludicrous_tuple_size(T)
+  when tuple_size(T) =:= (1 bsl 64) - 1 -> ok;
+ludicrous_tuple_size(T)
+  when tuple_size(T) =:= 16#FFFFFFFFFFFFFFFF -> ok;
+ludicrous_tuple_size(_) -> error.
+
+%%
+%% The binary_part/2,3 guard BIFs
+%%
+-define(MASK_ERROR(EXPR),mask_error((catch (EXPR)))).
+mask_error({'EXIT',{Err,_}}) ->
+    Err;
+mask_error(Else) ->
+    Else.
+
+binary_part(doc) ->
+    ["Tests the binary_part/2,3 guard (GC) bif's"];
+binary_part(Config) when is_list(Config) ->
+    %% This is more or less a copy of what the guard_SUITE in emulator
+    %% does to cover the guard bif's
+    ?line 1 = bptest(<<1,2,3>>),
+    ?line 2 = bptest(<<2,1,3>>),
+    ?line error = bptest(<<1>>),
+    ?line error = bptest(<<>>),
+    ?line error = bptest(apa),
+    ?line 3 = bptest(<<2,3,3>>),
+    % With one variable (pos)
+    ?line 1 = bptest(<<1,2,3>>,1),
+    ?line 2 = bptest(<<2,1,3>>,1),
+    ?line error = bptest(<<1>>,1),
+    ?line error = bptest(<<>>,1),
+    ?line error = bptest(apa,1),
+    ?line 3 = bptest(<<2,3,3>>,1),
+    % With one variable (length)
+    ?line 1 = bptesty(<<1,2,3>>,1),
+    ?line 2 = bptesty(<<2,1,3>>,1),
+    ?line error = bptesty(<<1>>,1),
+    ?line error = bptesty(<<>>,1),
+    ?line error = bptesty(apa,1),
+    ?line 3 = bptesty(<<2,3,3>>,2),
+    % With one variable (whole tuple)
+    ?line 1 = bptestx(<<1,2,3>>,{1,1}),
+    ?line 2 = bptestx(<<2,1,3>>,{1,1}),
+    ?line error = bptestx(<<1>>,{1,1}),
+    ?line error = bptestx(<<>>,{1,1}),
+    ?line error = bptestx(apa,{1,1}),
+    ?line 3 = bptestx(<<2,3,3>>,{1,2}),
+    % With two variables
+    ?line 1 = bptest(<<1,2,3>>,1,1),
+    ?line 2 = bptest(<<2,1,3>>,1,1),
+    ?line error = bptest(<<1>>,1,1),
+    ?line error = bptest(<<>>,1,1),
+    ?line error = bptest(apa,1,1),
+    ?line 3 = bptest(<<2,3,3>>,1,2),
+    % Direct (autoimported) call, these will be evaluated by the compiler...
+    ?line <<2>> = binary_part(<<1,2,3>>,1,1),
+    ?line <<1>> = binary_part(<<2,1,3>>,1,1),
+    % Compiler warnings due to constant evaluation expected (3)
+    ?line badarg = ?MASK_ERROR(binary_part(<<1>>,1,1)),
+    ?line badarg = ?MASK_ERROR(binary_part(<<>>,1,1)),
+    ?line badarg = ?MASK_ERROR(binary_part(apa,1,1)),
+    ?line <<3,3>> = binary_part(<<2,3,3>>,1,2),
+    % Direct call through apply
+    ?line <<2>> = apply(erlang,binary_part,[<<1,2,3>>,1,1]),
+    ?line <<1>> = apply(erlang,binary_part,[<<2,1,3>>,1,1]),
+    % Compiler warnings due to constant evaluation expected (3)
+    ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<1>>,1,1])),
+    ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<>>,1,1])),
+    ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[apa,1,1])),
+    ?line <<3,3>> = apply(erlang,binary_part,[<<2,3,3>>,1,2]),
+    % Constant propagation
+    ?line  Bin = <<1,2,3>>,
+    ?line  ok = if
+		    binary_part(Bin,1,1) =:= <<2>> ->
+			ok;
+		    %% Compiler warning, clause cannot match (expected)
+		    true ->
+			error
+		end,
+    ?line  ok = if
+		    binary_part(Bin,{1,1}) =:= <<2>> ->
+			ok;
+		    %% Compiler warning, clause cannot match (expected)
+		    true ->
+			error
+		end,
+    ok.
+
+
+bptest(B) when length(B) =:= 1337 ->
+    1;
+bptest(B) when binary_part(B,{1,1}) =:= <<2>> ->
+    1;
+bptest(B) when erlang:binary_part(B,1,1) =:= <<1>> ->
+    2;
+bptest(B)  when erlang:binary_part(B,{1,2}) =:= <<3,3>> ->
+    3;
+bptest(_) ->
+    error.
+
+bptest(B,A) when length(B) =:= A ->
+    1;
+bptest(B,A) when binary_part(B,{A,1}) =:= <<2>> ->
+    1;
+bptest(B,A) when erlang:binary_part(B,A,1) =:= <<1>> ->
+    2;
+bptest(B,A)  when erlang:binary_part(B,{A,2}) =:= <<3,3>> ->
+    3;
+bptest(_,_) ->
+    error.
+
+bptestx(B,A) when length(B) =:= A ->
+    1;
+bptestx(B,A) when binary_part(B,A) =:= <<2>> ->
+    1;
+bptestx(B,A) when erlang:binary_part(B,A) =:= <<1>> ->
+    2;
+bptestx(B,A)  when erlang:binary_part(B,A) =:= <<3,3>> ->
+    3;
+bptestx(_,_) ->
+    error.
+
+bptesty(B,A) when length(B) =:= A ->
+    1;
+bptesty(B,A) when binary_part(B,{1,A}) =:= <<2>> ->
+    1;
+bptesty(B,A) when erlang:binary_part(B,1,A) =:= <<1>> ->
+    2;
+bptesty(B,A)  when erlang:binary_part(B,{1,A}) =:= <<3,3>> ->
+    3;
+bptesty(_,_) ->
+    error.
+
+bptest(B,A,_C) when length(B) =:= A ->
+    1;
+bptest(B,A,C) when binary_part(B,{A,C}) =:= <<2>> ->
+    1;
+bptest(B,A,C) when erlang:binary_part(B,A,C) =:= <<1>> ->
+    2;
+bptest(B,A,C)  when erlang:binary_part(B,{A,C}) =:= <<3,3>> ->
+    3;
+bptest(_,_,_) ->
+    error.
+
+-define(FAILING(C),
+	if
+	    C -> ?t:fail(should_fail);
+	    true -> ok
+	end,
+	if
+	    true, C -> ?t:fail(should_fail);
+	    true -> ok
+	end).
+
+bad_constants(Config) when is_list(Config) ->
+    ?line ?FAILING(false),
+    ?line ?FAILING([]),
+    ?line ?FAILING([a]),
+    ?line ?FAILING([Config]),
+    ?line ?FAILING({a,b}),
+    ?line ?FAILING({a,Config}),
+    ?line ?FAILING(<<1>>),
+    ?line ?FAILING(42),
+    ?line ?FAILING(3.14),
+    ok.
 
 %% Call this function to turn off constant propagation.
 id(I) -> I.
@@ -1490,3 +1689,5 @@ check(F, Result) ->
 	    io:format("     Got: ~p\n", [Other]),
 	    test_server:fail()
     end.
+
+fc({'EXIT',{function_clause,_}}) -> ok.
diff --git a/lib/debugger/test/int_eval_SUITE.erl b/lib/debugger/test/int_eval_SUITE.erl
index f36ed213d1..4ffcf7888e 100644
--- a/lib/debugger/test/int_eval_SUITE.erl
+++ b/lib/debugger/test/int_eval_SUITE.erl
@@ -28,7 +28,7 @@
 	 bifs_outside_erlang/1, spawning/1, applying/1,
 	 catch_and_throw/1, external_call/1, test_module_info/1,
 	 apply_interpreted_fun/1, apply_uninterpreted_fun/1,
-	 interpreted_exit/1, otp_8310/1]).
+	 interpreted_exit/1, otp_8310/1, stacktrace/1]).
 
 %% Helpers.
 -export([applier/3]).
@@ -44,7 +44,7 @@ all() ->
     [bifs_outside_erlang, spawning, applying,
      catch_and_throw, external_call, test_module_info,
      apply_interpreted_fun, apply_uninterpreted_fun,
-     interpreted_exit, otp_8310].
+     interpreted_exit, otp_8310, stacktrace].
 
 groups() -> 
     [].
@@ -191,23 +191,23 @@ apply_interpreted_fun(Config) when is_list(Config) ->
     ?line {ok,ATerm} = spawn_eval(fun() -> F2() end),
 
     %% Called from uninterpreted code, badarity
-    ?line {'EXIT',{{badarity,{F1,[snape]}},[{?MODULE,_,_}|_]}} =
+    ?line {'EXIT',{{badarity,{F1,[snape]}},[{?MODULE,_,_,_}|_]}} =
 	spawn_eval(fun() -> F1(snape) end),
 
     %% Called from uninterpreted code, error in fun
     ?line F3 = spawn_eval(fun() -> ?IM:give_me_a_bad_fun() end),
-    ?line {'EXIT',{snape,[{?IM,_FunName,_}|_]}} =
+    ?line {'EXIT',{snape,[{?IM,_FunName,_,_}|_]}} =
 	spawn_eval(fun() -> F3(snape) end),
 
     %% Called from within interpreted code
     ?line perfectly_alright = spawn_eval(fun() -> ?IM:do_apply(F1) end),
 
     %% Called from within interpreted code, badarity
-    ?line {'EXIT',{{badarity,{F1,[snape]}},[{?IM,do_apply,_}|_]}} =
+    ?line {'EXIT',{{badarity,{F1,[snape]}},[{?IM,do_apply,_,_}|_]}} =
 	spawn_eval(fun() -> ?IM:do_apply(F1, snape) end),
 
     %% Called from within interpreted code, error in fun
-    ?line {'EXIT',{snape,[{?IM,_FunName,_}|_]}} =
+    ?line {'EXIT',{snape,[{?IM,_FunName,_,_}|_]}} =
 	spawn_eval(fun() -> ?IM:do_apply(F3, snape) end),
 
     %% Try some more complex funs.
@@ -239,11 +239,11 @@ apply_uninterpreted_fun(Config) when is_list(Config) ->
 	spawn_eval(fun() -> ?IM:do_apply(F1, any_arg) end),
 
     %% Badarity (evaluated in dbg_debugged, which calls erlang:apply/2)
-    ?line {'EXIT',{{badarity,{F1,[]}},[{erlang,apply,_}|_]}} =
+    ?line {'EXIT',{{badarity,{F1,[]}},[{erlang,apply,_,_}|_]}} =
 	spawn_eval(fun() -> ?IM:do_apply(F1) end),
 
     %% Error in fun
-    ?line {'EXIT',{snape,[{?MODULE,_FunName,_}|_]}} =
+    ?line {'EXIT',{snape,[{?MODULE,_FunName,_,_}|_]}} =
 	spawn_eval(fun() -> ?IM:do_apply(F1, snape) end),
 
     ok.
@@ -277,6 +277,37 @@ applier(M, F, A) ->
     io:format("~p:~p(~p) => ~p\n", [M,F,A,Res]),
     Res.
 
+stacktrace(Config) when is_list(Config) ->
+    ?line {done,Stk} = do_eval(Config, stacktrace),
+    ?line 13 = length(Stk),
+    ?line OldStackTraceFlag = int:stack_trace(),
+    ?line int:stack_trace(no_tail),
+    try
+	?line Res = spawn_eval(fun() -> stacktrace:stacktrace() end),
+	?line io:format("\nInterpreted (no_tail):\n~p", [Res]),
+	?line {done,Stk} = Res
+	after
+	    ?line int:stack_trace(OldStackTraceFlag)
+	end,
+    ok.
+
+
+do_eval(Config, Mod) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line ok = file:set_cwd(DataDir),
+
+    ?line {ok,Mod} = compile:file(Mod, [report,debug_info]),
+    ?line {module,Mod} = code:load_file(Mod),
+    ?line CompiledRes = Mod:Mod(),
+    ?line ok = io:format("Compiled:\n~p", [CompiledRes]),
+    io:nl(),
+
+    ?line {module,Mod} = int:i(Mod),
+    ?line IntRes = Mod:Mod(),
+    ?line ok = io:format("Interpreted:\n~p", [IntRes]),
+
+    ?line CompiledRes = IntRes.
+
 %%
 %% Evaluate in another process, to prevent the test_case process to become
 %% interpreted.
diff --git a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
index 997ee6e17d..90f83e80e8 100644
--- a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
+++ b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
@@ -117,7 +117,7 @@ more_nocatch(Fun) ->
 %% External calls.
 
 external_call_test(Data) ->
-    {'EXIT',{undef,[{?MODULE,not_exported,[42,Data]}|_]}} =
+    {'EXIT',{undef,[{?MODULE,not_exported,[42,Data],_}|_]}} =
 	(catch ?MODULE:not_exported(42, Data)),
     {yes,Data} = i_am_exported(Data),
     {yes,Data} = ?MODULE:i_am_exported(Data),
@@ -127,7 +127,7 @@ external_call_test(Data) ->
     {ok,Data,[a,b]} = not_exported(Data, [a,b]),
     {yes,Data} = i_am_exported(Data),
     {ok,Data,[a,b]} = not_exported(Data, [a,b]),
-    {'EXIT',{undef,[{?MODULE,not_exported,[7,Data]}|_]}} =
+    {'EXIT',{undef,[{?MODULE,not_exported,[7,Data],_}|_]}} =
 	(catch ?MODULE:not_exported(7, Data)),
     {yes,Data} = ?MODULE:i_am_exported(Data),
     ok.
diff --git a/lib/debugger/test/int_eval_SUITE_data/stacktrace.erl b/lib/debugger/test/int_eval_SUITE_data/stacktrace.erl
new file mode 100644
index 0000000000..3380178fdc
--- /dev/null
+++ b/lib/debugger/test/int_eval_SUITE_data/stacktrace.erl
@@ -0,0 +1,130 @@
+-module(stacktrace).
+-export([?MODULE/0]).
+
+?MODULE() ->
+    OldDepth = erlang:system_flag(backtrace_depth, 32),
+    done = (catch do_try()),
+    Stk = trim(erlang:get_stacktrace()),
+    erlang:system_flag(backtrace_depth, OldDepth),
+    {done,Stk}.
+
+trim([{int_eval_SUITE,_,_,_}|_]) ->
+    [];
+trim([H|T]) ->
+    [H|trim(T)];
+trim([]) -> [].
+
+do_try() ->
+    try
+	0 = id(42)
+    catch
+	error:{badmatch,42} ->
+	    do_try2()				%Tail-recursive
+    end.
+
+do_try2() ->
+    try
+	0 = id(42)
+    catch
+	error:{badmatch,42} ->
+	    do_try3()				%Not tail-recursive
+    end,
+    ?LINE.
+
+do_try3() ->
+    try id(42) of
+	42 -> do_try4()				%Tail-recursive
+    catch
+	error:ignore ->				%Should never catch
+	    ?LINE
+    end.
+
+do_try4() ->
+    try
+	do_recv()				%Not tail-recursive
+    catch
+	error:ignore ->				%Should never catch
+	    ?LINE
+    end.
+
+do_recv() ->
+    self() ! x,
+    receive
+	x -> do_recv2()				%Not tail-recursive
+    end,
+    ?LINE.
+
+do_recv2() ->
+    self() ! y,
+    receive
+	y -> do_recv3()				%Tail-recursive
+    end.
+
+do_recv3() ->
+    receive
+	after 0 -> do_recv4()			%Tail-recursive
+    end.
+
+do_recv4() ->
+    receive
+	after 0 -> do_if(true)			%Not tail-recursive
+    end,
+    ?LINE.
+
+do_if(Bool) ->
+    if
+	Bool -> do_if2(Bool)			%Tail-recursive
+    end.
+
+do_if2(Bool) ->
+    if
+	Bool -> do_case(Bool)			%Not tail-recursive
+    end,
+    ?LINE.
+
+
+do_case(Bool) ->
+    case Bool of
+	true -> do_case2(Bool)			%Tail-recursive
+    end.
+
+do_case2(Bool) ->
+    case Bool of
+	true -> do_fun(Bool)			%Not tail-recursive
+    end,
+    ?LINE.
+
+do_fun(Bool) ->
+    F = fun(true) ->
+		do_fun2(Bool)			%Tail-recursive
+	end,
+    F(Bool).					%Tail-recursive
+
+do_fun2(Bool) ->
+    F = fun(true) ->
+		cons(Bool)			%Tail-recursive
+	end,
+    F(Bool),					%Not tail-recursive
+    ?LINE.
+
+cons(Bool) ->
+    [Bool|tuple()].
+
+tuple() ->
+    {ok,op()}.
+
+op() ->
+    1 + lc().
+
+lc() ->
+    [done() || true].
+
+done() ->
+    tail(100),
+    throw(done).
+
+tail(0) -> ok;
+tail(N) -> tail(N-1).
+
+id(I) ->
+    I.
diff --git a/lib/debugger/test/lc_SUITE.erl b/lib/debugger/test/lc_SUITE.erl
index 92a03ef58e..2f05eb7fca 100644
--- a/lib/debugger/test/lc_SUITE.erl
+++ b/lib/debugger/test/lc_SUITE.erl
@@ -17,21 +17,22 @@
 %% %CopyrightEnd%
 %%
 
-%%
 -module(lc_SUITE).
 
--author('[email protected]').
+%% Copied from lc_SUITE in the compiler application.
+
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
 	 init_per_suite/1,end_per_suite/1,
-	 basic/1]).
+	 basic/1,deeply_nested/1,no_generator/1,
+	 empty_generator/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    cases().
+    [basic, deeply_nested, no_generator, empty_generator].
 
 groups() -> 
     [].
@@ -42,10 +43,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-
-cases() -> 
-    [basic].
-
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
     Dog = test_server:timetrap(?t:minutes(1)),
@@ -64,7 +61,7 @@ init_per_suite(Config) when is_list(Config) ->
 end_per_suite(Config) when is_list(Config) ->
     ok.
 
-basic(Config) when list(Config) ->
+basic(Config) when is_list(Config) ->
     ?line L0 = lists:seq(1, 10),
     ?line L1 = my_map(fun(X) -> {x,X} end, L0),
     ?line L1 = [{x,X} || X <- L0],
@@ -73,16 +70,116 @@ basic(Config) when list(Config) ->
     ?line [4,5,6] = [X || X <- L0, X > 3, X < 7],
     ?line [] = [X || X <- L0, X > 32, X < 7],
     ?line [1,3,5,7,9] = [X || X <- L0, odd(X)],
+    ?line [2,4,6,8,10] = [X || X <- L0, not odd(X)],
+    ?line [1,3,5,9] = [X || X <- L0, odd(X), X =/= 7],
+    ?line [2,4,8,10] = [X || X <- L0, not odd(X), X =/= 6],
+
+    %% Append is specially handled.
+    ?line [1,3,5,9,2,4,8,10] = [X || X <- L0, odd(X), X =/= 7] ++
+	[X || X <- L0, not odd(X), X =/= 6],
+
+    %% Guards BIFs are evaluated in guard context. Weird, but true.
+    ?line [{a,b,true},{x,y,true,true}] = [X || X <- tuple_list(), element(3, X)],
+
+    %% Filter expressions with andalso/orelse.
+    ?line "abc123" = alphanum("?abc123.;"),
 
     %% Error cases.
-    ?line [] = [X || X <- L1, X+1 < 2],
     ?line [] = [{xx,X} || X <- L0, element(2, X) == no_no_no],
-    ?line {'EXIT',_}  = (catch [X || X <- L1, odd(X)]),
+    ?line {'EXIT',_} = (catch [X || X <- L1, list_to_atom(X) == dum]),
+    ?line [] = [X || X <- L1, X+1 < 2],
+    ?line {'EXIT',_} = (catch [X || X <- L1, odd(X)]),
 
+    %% A bad generator has a different exception compared to BEAM.
+    ?line {'EXIT',{{bad_generator,x},_}} = (catch [E || E <- id(x)]),
     ok.
 
+tuple_list() ->
+    [{a,b,true},[a,b,c],glurf,{a,b,false,xx},{a,b},{x,y,true,true},{a,b,d,ddd}].
+
 my_map(F, L) ->
     [F(X) || X <- L].
 
 odd(X) ->
     X rem 2 == 1.
+
+alphanum(Str) ->
+    [C || C <- Str, ((C >= $0) andalso (C =< $9))
+	      orelse ((C >= $a) andalso (C =< $z))
+	      orelse ((C >= $A) andalso (C =< $Z))].
+
+deeply_nested(Config) when is_list(Config) ->
+    [[99,98,97,96,42,17,1764,12,11,10,9,8,7,6,5,4,3,7,2,1]] =  deeply_nested_1(),
+    ok.
+
+deeply_nested_1() ->
+    %% This used to compile really, really SLOW before R11B-1...
+    [[X1,X2,X3,X4,X5,X6,X7(),X8,X9,X10,X11,X12,X13,X14,X15,X16,X17,X18(),X19,X20] ||
+        X1 <- [99],X2 <- [98],X3 <- [97],X4 <- [96],X5 <- [42],X6 <- [17],
+	X7 <- [fun() -> X5*X5 end],X8 <- [12],X9 <- [11],X10 <- [10],
+        X11 <- [9],X12 <- [8],X13 <- [7],X14 <- [6],X15 <- [5],
+	X16 <- [4],X17 <- [3],X18 <- [fun() -> X16+X17 end],X19 <- [2],X20 <- [1]].
+
+no_generator(Config) when is_list(Config) ->
+    ?line Seq = lists:seq(-10, 17),
+    ?line [no_gen_verify(no_gen(A, B), A, B) || A <- Seq, B <- Seq],
+
+    %% Literal expression, for coverage.
+    ?line [a] = [a || true],
+    ?line [a,b,c] = [a || true] ++ [b,c],
+    ok.
+
+no_gen(A, B) ->
+    [{A,B} || A+B =:= 0] ++
+	[{A,B} || A*B =:= 0] ++
+	[{A,B} || A rem B =:= 3] ++
+	[{A,B} || A =:= B] ++
+	[{one_more,A,B} || no_gen_one_more(A, B)] ++
+	[A || A =:= 1] ++
+	[A || A =:= 2] ++
+	[A || A =:= 3] ++
+	[A || A =:= 4] ++
+	[A || A =:= 5] ++
+	[A || A =:= 6] ++
+	[A || A =:= 7] ++
+	[A || A =:= 8] ++
+	[A || A =:= 9] ++
+	[B || B =:= 1] ++
+	[B || B =:= 2] ++
+	[B || B =:= 3] ++
+	[B || B =:= 4] ++
+	[B || B =:= 5] ++
+	[B || B =:= 6] ++
+	[B || B =:= 7] ++
+	[B || B =:= 8] ++
+	[B || B =:= 9].
+
+no_gen_verify(Res, A, B) ->
+    Pair = {A,B},
+    ShouldBe = no_gen_eval(fun() -> A+B =:= 0 end, Pair) ++
+	no_gen_eval(fun() -> A*B =:= 0 end, Pair) ++
+	no_gen_eval(fun() -> B =/= 0 andalso A rem B =:= 3 end, Pair) ++
+	no_gen_eval(fun() -> A =:= B end, Pair) ++
+	no_gen_eval(fun() -> A + 1 =:= B end, {one_more,A,B}) ++
+	no_gen_eval(fun() -> 1 =< A andalso A =< 9 end, A) ++
+	no_gen_eval(fun() -> 1 =< B andalso B =< 9 end, B),
+    case Res of
+	ShouldBe -> ok;
+	_ ->
+	    io:format("A = ~p; B = ~p; Expected = ~p, actual = ~p", [A,B,ShouldBe,Res]),
+	    ?t:fail()
+    end.
+
+no_gen_eval(Fun, Res) ->
+    case Fun() of
+	true -> [Res];
+	false -> []
+    end.
+
+no_gen_one_more(A, B) -> A + 1 =:= B.
+
+empty_generator(Config) when is_list(Config) ->
+    ?line [] = [X || {X} <- [], (false or (X/0 > 3))],
+    ok.
+
+id(I) -> I.
diff --git a/lib/debugger/test/line_number_SUITE.erl b/lib/debugger/test/line_number_SUITE.erl
new file mode 100644
index 0000000000..d1f56d3493
--- /dev/null
+++ b/lib/debugger/test/line_number_SUITE.erl
@@ -0,0 +1,220 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(line_number_SUITE).
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 line_numbers/1]).
+-export([crash/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    cases().
+
+groups() ->
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+cases() ->
+    [line_numbers].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+
+
+
+
+%%
+%% === Make sure that this is always line 70 ===
+%%
+line1(Tag, X) ->				%Line 72
+    case Tag of					%Line 73
+	a ->
+	    Y = X + 1,				%Line 75
+	    Res = id({ok,Y}),			%Line 76
+	    ?MODULE:crash({ok,42} = Res);	%Line 77
+	b ->
+	    x = id(x),				%Line 79
+	    ok					%Line 80
+    end.					%Line 81
+
+crash(_) ->					%Line 83
+    erlang:error(crash).			%Line 84
+
+close_calls(Where) ->				%Line 86
+    put(where_to_crash, Where),			%Line 87
+    try
+	call1(),				%Line 89
+	call2(),				%Line 90
+	call3(),				%Line 91
+	no_crash				%Line 92
+    catch error:crash ->
+	    erlang:get_stacktrace()		%Line 94
+    end.					%Line 95
+
+call1() ->					%Line 97
+    maybe_crash(call1),				%Line 98
+    ok.						%Line 99
+
+call2() ->					%Line 101
+    maybe_crash(call2),				%Line 102
+    ok.						%Line 103
+
+call3() ->					%Line 105
+    maybe_crash(call3),				%Line 106
+    ok.						%Line 107
+
+maybe_crash(Name) ->				%Line 109
+    case get(where_to_crash) of			%Line 110
+	Name ->
+	    erlang:error(crash);		%Line 112
+	_ ->
+	    ok					%Line 114
+    end.					%Line 115
+
+build_binary1(Size) ->				%Line 117
+    id(42),					%Line 118
+    <<0:Size>>.					%Line 119
+
+build_binary2(Size, Bin) ->			%Line 121
+    id(0),					%Line 122
+    <<7:Size,Bin/binary>>.			%Line 123
+
+do_call_abs(x, Arg) ->				%Line 125
+    abs(Arg).					%Line 126
+
+do_call_unsafe_bif(x, Arg) ->			%Line 128
+    link(Arg).					%Line 129
+
+
+line_numbers(Config) when is_list(Config) ->
+    File = ?MODULE_STRING ++ ".erl",
+    {'EXIT',{{case_clause,bad_tag},
+	     [{?MODULE,line1,2,
+	       [{file,File},{line,73}]},
+	      {?MODULE,line_numbers,1,_}|_]}} =
+	(catch line1(bad_tag, 0)),
+    {'EXIT',{badarith,
+	     [{?MODULE,line1,2,
+	       [{file,File},{line,75}]},
+	      {?MODULE,line_numbers,1,_}|_]}} =
+	(catch line1(a, not_an_integer)),
+    {'EXIT',{{badmatch,{ok,1}},
+	     [{?MODULE,line1,2,
+	       [{file,File},{line,77}]},
+	      {?MODULE,line_numbers,1,_}|_]}} =
+	(catch line1(a, 0)),
+    {'EXIT',{crash,
+	     [{?MODULE,crash,1,
+	       [{file,File},{line,84}]},
+	      {?MODULE,line_numbers,1,_}|_]}} =
+	(catch line1(a, 41)),
+
+    [{?MODULE,maybe_crash,1,[{file,File},{line,112}]},
+     {?MODULE,call1,0,[{file,File},{line,98}]},
+     {?MODULE,close_calls,1,[{file,File},{line,89}]},
+     {?MODULE,line_numbers,1,[{file,File},{line,_}]}|_] =
+	close_calls(call1),
+    [{?MODULE,maybe_crash,1,[{file,File},{line,112}]},
+     {?MODULE,call2,0,[{file,File},{line,102}]},
+     {?MODULE,close_calls,1,[{file,File},{line,90}]},
+     {?MODULE,line_numbers,1,[{file,File},{line,_}]}|_] =
+	close_calls(call2),
+    [{?MODULE,maybe_crash,1,[{file,File},{line,112}]},
+     {?MODULE,call3,0,[{file,File},{line,106}]},
+     {?MODULE,close_calls,1,[{file,File},{line,91}]},
+     {?MODULE,line_numbers,1,[{file,File},{line,_}]}|_] =
+	close_calls(call3),
+    no_crash = close_calls(other),
+
+    <<0,0>> = build_binary1(16),
+    {'EXIT',{badarg,
+	     [{?MODULE,build_binary1,1,
+	       [{file,File},{line,119}]},
+	      {?MODULE,line_numbers,1,
+	       [{file,ModFile},{line,_}]}|_]}} =
+	(catch build_binary1(bad_size)),
+
+    <<7,1,2,3>> = build_binary2(8, <<1,2,3>>),
+    {'EXIT',{badarg,
+	     [{?MODULE,build_binary2,2,
+	       [{file,File},{line,123}]},
+	      {?MODULE,line_numbers,1,
+	       [{file,ModFile},{line,_}]}|_]}} =
+	(catch build_binary2(bad_size, <<>>)),
+    {'EXIT',{badarg,
+	     [%% Beam has an extra here:
+	      %%   {erlang,bit_size,[bad_binary],[]}
+	      %% Since this is an artifact of the implementation,
+	      %% we don't attempt to mimic it in the debugger.
+	      {?MODULE,build_binary2,2,
+	       [{file,File},{line,123}]},
+	      {?MODULE,line_numbers,1,
+	       [{file,ModFile},{line,_}]}|_]}} =
+	(catch build_binary2(8, bad_binary)),
+
+    {'EXIT',{function_clause,
+	     [{?MODULE,do_call_abs,[y,y],
+	       [{file,File},{line,125}]},
+	      {?MODULE,line_numbers,1,_}|_]}} =
+	(catch do_call_abs(y, y)),
+    {'EXIT',{badarg,
+	     [{erlang,abs,[[]],[]},
+	      {?MODULE,do_call_abs,2,
+	       [{file,File},{line,126}]},
+	      {?MODULE,line_numbers,1,_}|_]}} =
+	(catch do_call_abs(x, [])),
+
+    {'EXIT',{badarg,
+	     [{erlang,link,[[]],[]},
+	      {?MODULE,do_call_unsafe_bif,2,
+	       [{file,File},{line,129}]},
+	      {?MODULE,line_numbers,1,_}|_]}} =
+	(catch do_call_unsafe_bif(x, [])),
+
+    ok.
+
+id(I) ->
+    I.
diff --git a/lib/debugger/test/test_lib.erl b/lib/debugger/test/test_lib.erl
index 541375e64a..5e4ac7f164 100644
--- a/lib/debugger/test/test_lib.erl
+++ b/lib/debugger/test/test_lib.erl
@@ -22,7 +22,7 @@
 
 -export([interpret/1]).
 
-interpret(Mod) when atom(Mod) ->
+interpret(Mod) when is_atom(Mod) ->
     case lists:member(Mod, int:interpreted()) of
 	true -> ok;
 	false -> {module,Mod} = i:ii(Mod)
diff --git a/lib/debugger/test/trycatch_SUITE.erl b/lib/debugger/test/trycatch_SUITE.erl
index a87c5db138..470d46d915 100644
--- a/lib/debugger/test/trycatch_SUITE.erl
+++ b/lib/debugger/test/trycatch_SUITE.erl
@@ -318,17 +318,18 @@ eclectic(Conf) when is_list(Conf) ->
     V = {make_ref(),3.1415926535,[[]|{}]},
     ?line {{value,{value,V},V},V} =
 	eclectic_1({foo,{value,{value,V}}}, undefined, {value,V}),
-    ?line {{'EXIT',{V,[{?MODULE,foo,_}|_]}},V} =
+    ?line {{'EXIT',{V,[{?MODULE,foo,_,_}|_]}},V} =
 	eclectic_1({catch_foo,{error,V}}, undefined, {value,V}),
     ?line {{error,{exit,V},{'EXIT',V}},V} =
 	eclectic_1({foo,{error,{exit,V}}}, error, {value,V}),
-    ?line {{value,{value,V},V},{'EXIT',{badarith,[{?MODULE,my_add,_}|_]}}} =
+    ?line {{value,{value,V},V},{'EXIT',{badarith,[{?MODULE,my_add,_,_}|_]}}} =
 	eclectic_1({foo,{value,{value,V}}}, undefined, {'add',{0,a}}),
     ?line {{'EXIT',V},V} =
 	eclectic_1({catch_foo,{exit,V}}, undefined, {throw,V}),
-    ?line {{error,{'div',{1,0}},{'EXIT',{badarith,[{?MODULE,my_div,_}|_]}}}, {'EXIT',V}} =
+    ?line {{error,{'div',{1,0}},{'EXIT',{badarith,[{?MODULE,my_div,_,_}|_]}}},
+	   {'EXIT',V}} =
 	eclectic_1({foo,{error,{'div',{1,0}}}}, error, {exit,V}),
-    ?line {{{error,V},{'EXIT',{V,[{?MODULE,foo,_}|_]}}},{'EXIT',V}} =
+    ?line {{{error,V},{'EXIT',{V,[{?MODULE,foo,_,_}|_]}}},{'EXIT',V}} =
 	eclectic_1({catch_foo,{throw,{error,V}}}, undefined, {exit,V}),
     %%
     ?line {{value,{value,{value,V},V}},V} =
@@ -337,15 +338,15 @@ eclectic(Conf) when is_list(Conf) ->
 	eclectic_2({throw,{value,V}}, throw, {value,V}),
     ?line {{caught,{'EXIT',V}},undefined} =
 	eclectic_2({value,{value,V}}, undefined, {exit,V}),
-    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,_}|_]}}},undefined} =
+    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,_,_}|_]}}},undefined} =
 	eclectic_2({error,{value,V}}, throw, {error,V}),
-    ?line {{caught,{'EXIT',{badarg,[{erlang,abs,[V]}|_]}}},V} =
+    ?line {{caught,{'EXIT',{badarg,[{erlang,abs,[V],_}|_]}}},V} =
 	eclectic_2({value,{'abs',V}}, undefined, {value,V}),
-    ?line {{caught,{'EXIT',{badarith,[{?MODULE,my_add,_}|_]}}},V} =
+    ?line {{caught,{'EXIT',{badarith,[{?MODULE,my_add,_,_}|_]}}},V} =
 	eclectic_2({exit,{'add',{0,a}}}, exit, {value,V}),
     ?line {{caught,{'EXIT',V}},undefined} =
 	eclectic_2({value,{error,V}}, undefined, {exit,V}),
-    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,_}|_]}}},undefined} =
+    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,_,_}|_]}}},undefined} =
 	eclectic_2({throw,{'div',{1,0}}}, throw, {error,V}),
     ok.
 
diff --git a/lib/dialyzer/doc/src/make.dep b/lib/dialyzer/doc/src/make.dep
deleted file mode 100755
index f8177cd419..0000000000
--- a/lib/dialyzer/doc/src/make.dep
+++ /dev/null
@@ -1,20 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex dialyzer.tex dialyzer_chapter.tex \
-		part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 81622a3854..17291b24f7 100755
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -31,6 +31,115 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 2.4.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Update results of race_SUITE/extract_translations Update
+	    results of small_SUITE/flatten Add codec_can and
+	    list_to_bitstring tests Fix bug when reporting unused
+	    functions Update Dialyzer r9c_suite results Fix dialyzer
+	    warning on default clause for binary comprehension
+	    (Thanks to Ivan Dubrov)</p>
+          <p>
+	    Own Id: OTP-9483</p>
+        </item>
+        <item>
+          <p>
+	    Fix server loop detection</p>
+          <p>
+	    Dialyzer does not normally emit warnings for functions
+	    that implement non-terminating server loops. This
+	    detection failed when some of the elements in an SCC
+	    terminated normally (being for example list
+	    comprehensions or other generic anonymous functions that
+	    were included in the SCC). This patch fixes that.</p>
+          <p>
+	    Own Id: OTP-9489</p>
+        </item>
+        <item>
+          <p>
+	    Add a proplist() type</p>
+          <p>
+	    Recently I was adding specs to an API and found that
+	    there is no canonical proplist() type defined. (Thanks to
+	    Ryan Zezeski)</p>
+          <p>
+	    Own Id: OTP-9499</p>
+        </item>
+        <item>
+          <p>
+	    Suppress some warnings about generation of non-returning
+	    funs</p>
+          <p>
+	    No warnings are emitted for funs that are non-returning
+	    when the function that generates them has a contract that
+	    specifies that it will return such a non-returning fun.</p>
+          <p>
+	    Enhance Dialyzer's inference on comparisons</p>
+          <p>
+	    This patch makes Dialyzer aware of Erlang's total
+	    ordering of terms, enabling discrepancy detection in
+	    cases where e.g. integer() &lt; tuple() is treated as a
+	    comparison that might also return false (when it is
+	    certain to always return true).</p>
+          <p>
+	    Minor fix in dead code</p>
+          <p>
+	    Fix infinite loop in dataflow</p>
+          <p>
+	    Update r9c/{inets,mnesia} results in dialyzer's test
+	    suite</p>
+          <p>
+	    Add origin information to #fun_var closures</p>
+          <p>
+	    (Thanks to Tuncer Ayaz and Maria Christakis)</p>
+          <p>
+	    Own Id: OTP-9529</p>
+        </item>
+        <item>
+          <p>
+	    Quote atoms if necessary in types</p>
+          <p>
+	    Atoms in some occurrences were not correctly quoted when
+	    formatted to strings, for instance by the typer program
+	    (Thanks to Tomas Abrahamsson)</p>
+          <p>
+	    Update Dialyzer's reference results</p>
+          <p>
+	    Own Id: OTP-9560</p>
+        </item>
+        <item>
+          <p>
+	    Fix typer's crash for nonexisting files Remove unused
+	    macro Fix bug in dataflow Decrease tuple arity limit This
+	    fixes a memory related crash.</p>
+          <p>
+	    Own Id: OTP-9597</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Types for several BIFs have been extended/corrected. Also
+	    the types for types for <c>lists:keyfind/3</c>,
+	    <c>lists:keysearch/3</c>, and <c>lists:keyemember/3</c>
+	    have been corrected. The incorrect/incomplete types could
+	    cause false dialyzer warnings.</p>
+          <p>
+	    Own Id: OTP-9496</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 2.4.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index 7137dbc036..d74c04385b 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -528,7 +528,7 @@ handle_apply(Tree, Map, State) ->
       {CallSitesKnown, FunList} =
 	case state__lookup_call_site(Tree, State2) of
 	  error -> {false, []};
-	  {ok, [external]} -> {false, {}};
+	  {ok, [external]} -> {false, []};
 	  {ok, List} -> {true, List}
 	end,
       case CallSitesKnown of
@@ -554,7 +554,13 @@ handle_apply(Tree, Map, State) ->
 		  {State3, enter_type(Op, OpType1, Map2), t_none()};
 		false ->
 		  Map3 = enter_type_lists(Args, NewArgs, Map2),
-		  {State2, enter_type(Op, OpType1, Map3), t_fun_range(OpType1)}
+		  Range0 = t_fun_range(OpType1),
+		  Range =
+		    case t_is_unit(Range0) of
+		      true  -> t_none();
+		      false -> Range0
+		    end,
+		  {State2, enter_type(Op, OpType1, Map3), Range}
 	      end
 	  end;
 	true ->
@@ -1393,10 +1399,14 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
 		    true -> Any = t_any(), [Any || _ <- Pats];
 		    false -> t_to_tlist(OrigArgType)
 		  end,
-		case bind_pat_vars(Pats, OrigArgTypes, [], Map1, State1) of
-		  {error, bind, _, _, _} -> {{pattern_match, PatTypes}, false};
-		  {_, _} -> {{pattern_match_cov, PatTypes}, false}
-		end;
+		Tag =
+		  case bind_pat_vars(Pats, OrigArgTypes, [], Map1, State1) of
+		    {error,   bind, _, _, _} -> pattern_match;
+		    {error, record, _, _, _} -> record_match;
+		    {error, opaque, _, _, _} -> opaque_match;
+		    {_, _} -> pattern_match_cov
+		  end,
+		{{Tag, PatTypes}, false};
 	      false ->
 		%% Try to find out if this is a default clause in a list
 		%% comprehension and supress this. A real Hack(tm)
@@ -1414,6 +1424,17 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
 			    false ->
 			      true
 			  end;
+			[Pat0, Pat1] -> % binary comprehension
+			  case cerl:is_c_cons(Pat0) of
+			    true ->
+			      not (cerl:is_c_var(cerl:cons_hd(Pat0)) andalso
+				   cerl:is_c_var(cerl:cons_tl(Pat0)) andalso
+                                   cerl:is_c_var(Pat1) andalso
+				   cerl:is_literal(Guard) andalso
+				   (cerl:concrete(Guard) =:= true));
+			    false ->
+			      true
+			  end;
 			_ -> true
 		      end;
 		    false ->
@@ -1425,12 +1446,12 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
 			     opaque -> [PatString, format_type(Type, State1),
 					format_type(OpaqueTerm, State1)]
 			   end,
-		FailedMsg = case ErrorType of
-			      bind  -> {pattern_match, PatTypes};
-			      record -> {record_match, PatTypes};
-			      opaque -> {opaque_match, PatTypes}
+		FailedTag = case ErrorType of
+			      bind  -> pattern_match;
+			      record -> record_match;
+			      opaque -> opaque_match
 			    end,
-		{FailedMsg, Force0}
+		{{FailedTag, PatTypes}, Force0}
 	    end,
 	  WarnType = case Msg of
 		       {opaque_match, _} -> ?WARN_OPAQUE;
@@ -2915,7 +2936,7 @@ state__get_warnings(#state{tree_map = TreeMap, fun_tab = FunTab,
 	    {Warn, Msg} =
 	      case dialyzer_callgraph:lookup_name(FunLbl, Callgraph) of
 		error -> {true, {unused_fun, []}};
-		{ok, {_M, F, A}} = MFA ->
+		{ok, {_M, F, A} = MFA} ->
 		  {not sets:is_element(MFA, NoWarnUnused),
 		   {unused_fun, [F, A]}}
 	      end,
@@ -2935,7 +2956,7 @@ state__get_warnings(#state{tree_map = TreeMap, fun_tab = FunTab,
 		%% Check if the function has a contract that allows this.
 		Warn =
 		  case Contract of
-		    none -> true;
+		    none -> not parent_allows_this(FunLbl, State);
 		    {value, C} ->
 		      GenRet = dialyzer_contracts:get_contract_return(C),
 		      not t_is_unit(GenRet)
@@ -3423,6 +3444,33 @@ map_pats(Pats) ->
 	end,
   cerl_trees:map(Fun, Pats).
 
+parent_allows_this(FunLbl, #state{callgraph = Callgraph, plt = Plt} =State) ->
+  case state__is_escaping(FunLbl, State) of
+    false -> false; % if it isn't escaping it can't be a return value
+    true ->
+      case state__lookup_name(FunLbl, State) of
+	{_M, _F, _A} -> false; % if it has a name it is not a fun
+	_ ->
+	  case dialyzer_callgraph:in_neighbours(FunLbl, Callgraph) of
+	    [Parent] ->
+	      case state__lookup_name(Parent, State) of
+		{_M, _F, _A} = PMFA ->
+		  case dialyzer_plt:lookup_contract(Plt, PMFA) of
+		    none -> false;
+		    {value, C} ->
+		      GenRet = dialyzer_contracts:get_contract_return(C),
+		      case erl_types:t_is_fun(GenRet) of
+			false -> false; % element of structure? far-fetched...
+			true -> t_is_unit(t_fun_range(GenRet))
+		      end
+		  end;
+		_ -> false % parent should have a name to have a contract
+	      end;
+	    _ -> false % called in other funs? far-fetched...
+	  end
+      end
+  end.
+
 classify_returns(Tree) ->
   case find_terminals(cerl:fun_body(Tree)) of
     {false, false} -> no_match;
diff --git a/lib/dialyzer/src/dialyzer_typesig.erl b/lib/dialyzer/src/dialyzer_typesig.erl
index c45615d670..30aec59d22 100644
--- a/lib/dialyzer/src/dialyzer_typesig.erl
+++ b/lib/dialyzer/src/dialyzer_typesig.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. 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
@@ -62,7 +62,8 @@
 -type dep()      :: integer().  %% type variable names used as constraint ids
 -type type_var() :: erl_types:erl_type(). %% actually: {'c','var',_,_}
 
--record(fun_var, {'fun' :: fun((_) -> erl_types:erl_type()), deps :: [dep()]}).
+-record(fun_var, {'fun' :: fun((_) -> erl_types:erl_type()), deps :: [dep()],
+		  origin :: integer()}).
 
 -type constr_op()    :: 'eq' | 'sub'.
 -type fvar_or_type() :: #fun_var{} | erl_types:erl_type().
@@ -121,8 +122,10 @@
 
 -ifdef(DEBUG).
 -define(debug(__String, __Args), io:format(__String, __Args)).
+-define(mk_fun_var(Fun, Vars), mk_fun_var(?LINE, Fun, Vars)).
 -else.
 -define(debug(__String, __Args), ok).
+-define(mk_fun_var(Fun, Vars), mk_fun_var(Fun, Vars)).
 -endif.
 
 %% ============================================================================
@@ -218,10 +221,10 @@ traverse(Tree, DefinedVars, State) ->
     binary ->
       {State1, SegTypes} = traverse_list(cerl:binary_segments(Tree),
 					 DefinedVars, State),
-      Type = mk_fun_var(fun(Map) ->
-			    TmpSegTypes = lookup_type_list(SegTypes, Map),
-			    t_bitstr_concat(TmpSegTypes)
-			end, SegTypes),
+      Type = ?mk_fun_var(fun(Map) ->
+			     TmpSegTypes = lookup_type_list(SegTypes, Map),
+			     t_bitstr_concat(TmpSegTypes)
+			 end, SegTypes),
       {state__store_conj(mk_var(Tree), sub, Type, State1), mk_var(Tree)};
     bitstr ->
       Size = cerl:bitstr_size(Tree),
@@ -236,7 +239,7 @@ traverse(Tree, DefinedVars, State) ->
 	  N when is_integer(N) -> {State1, t_bitstr(0, N)};
 	  any -> % Size is not a literal
 	    {state__store_conj(SizeType, sub, t_non_neg_integer(), State1),
-	     mk_fun_var(bitstr_constr(SizeType, UnitVal), [SizeType])}
+	     ?mk_fun_var(bitstr_constr(SizeType, UnitVal), [SizeType])}
 	end,
       ValTypeConstr =
 	case cerl:concrete(cerl:bitstr_type(Tree)) of
@@ -250,8 +253,8 @@ traverse(Tree, DefinedVars, State) ->
 	    case state__is_in_match(State1) of
 	      true ->
 		Flags = cerl:concrete(cerl:bitstr_flags(Tree)),
-		mk_fun_var(bitstr_val_constr(SizeType, UnitVal, Flags),
-			   [SizeType]);
+		?mk_fun_var(bitstr_val_constr(SizeType, UnitVal, Flags),
+			    [SizeType]);
 	      false -> t_integer()
 	    end;
 	  utf8  -> t_integer();
@@ -281,24 +284,24 @@ traverse(Tree, DefinedVars, State) ->
 	  {State, t_cons(HdVar, TlVar)};
 	false ->
 	  ConsVar = mk_var(Tree),
-	  ConsType = mk_fun_var(fun(Map) ->
-				    t_cons(lookup_type(HdVar, Map),
-					   lookup_type(TlVar, Map))
-				end, [HdVar, TlVar]),
-	  HdType = mk_fun_var(fun(Map) ->
-				  Cons = lookup_type(ConsVar, Map),
-				  case t_is_cons(Cons) of
-				    false -> t_any();
-				    true -> t_cons_hd(Cons)
-				  end
-			      end, [ConsVar]),
-	  TlType = mk_fun_var(fun(Map) ->
-				  Cons = lookup_type(ConsVar, Map),
-				  case t_is_cons(Cons) of
-				    false -> t_any();
-				    true -> t_cons_tl(Cons)
-				  end
-			      end, [ConsVar]),
+	  ConsType = ?mk_fun_var(fun(Map) ->
+				     t_cons(lookup_type(HdVar, Map),
+					    lookup_type(TlVar, Map))
+				 end, [HdVar, TlVar]),
+	  HdType = ?mk_fun_var(fun(Map) ->
+				   Cons = lookup_type(ConsVar, Map),
+				   case t_is_cons(Cons) of
+				     false -> t_any();
+				     true -> t_cons_hd(Cons)
+				   end
+			       end, [ConsVar]),
+	  TlType = ?mk_fun_var(fun(Map) ->
+				   Cons = lookup_type(ConsVar, Map),
+				   case t_is_cons(Cons) of
+				     false -> t_any();
+				     true -> t_cons_tl(Cons)
+				   end
+			       end, [ConsVar]),
 	  State2 = state__store_conj_lists([HdVar, TlVar, ConsVar], sub,
 					   [HdType, TlType, ConsType],
 					   State1),
@@ -656,25 +659,25 @@ get_plt_constr(MFA, Dst, ArgVars, State) ->
       {RetType, ArgCs} =
 	case PltRes of
 	  none ->
-	    {mk_fun_var(fun(Map) ->
-			    ArgTypes = lookup_type_list(ArgVars, Map),
-			    dialyzer_contracts:get_contract_return(C, ArgTypes)
-			end, ArgVars), GenArgs};
+	    {?mk_fun_var(fun(Map) ->
+			     ArgTypes = lookup_type_list(ArgVars, Map),
+			     dialyzer_contracts:get_contract_return(C, ArgTypes)
+			 end, ArgVars), GenArgs};
 	  {value, {PltRetType, PltArgTypes}} ->
 	    %% Need to combine the contract with the success typing.
-	    {mk_fun_var(
-	       fun(Map) ->
-		   ArgTypes0 = lookup_type_list(ArgVars, Map),
-		   ArgTypes = case FunModule =:= Module of
-				false ->
-				  List = lists:zip(PltArgTypes, ArgTypes0),
-				  [erl_types:t_unopaque_on_mismatch(T1, T2, Opaques)
-				   || {T1, T2} <- List];
-				true -> ArgTypes0
-			      end,
-		   CRet = dialyzer_contracts:get_contract_return(C, ArgTypes),
-		   t_inf(CRet, PltRetType, opaque)
-	       end, ArgVars),
+	    {?mk_fun_var(
+		fun(Map) ->
+		    ArgTypes0 = lookup_type_list(ArgVars, Map),
+		    ArgTypes = case FunModule =:= Module of
+				 false ->
+				   List = lists:zip(PltArgTypes, ArgTypes0),
+				   [erl_types:t_unopaque_on_mismatch(T1, T2, Opaques)
+				    || {T1, T2} <- List];
+				 true -> ArgTypes0
+			       end,
+		    CRet = dialyzer_contracts:get_contract_return(C, ArgTypes),
+		    t_inf(CRet, PltRetType, opaque)
+		end, ArgVars),
 	     [t_inf(X, Y, opaque) || {X, Y} <- lists:zip(GenArgs, PltArgTypes)]}
 	end,
       state__store_conj_lists([Dst|ArgVars], sub, [RetType|ArgCs], State)
@@ -766,10 +769,10 @@ handle_clauses_1([Clause|Tail], TopVar, Arg, DefinedVars,
 	  case SubtrTypes =:= overflow of
 	    true -> S;
 	    false ->
-	      SubtrPatVar = mk_fun_var(fun(Map) ->
-					   TmpType = lookup_type(Arg, Map),
-					   t_subtract_list(TmpType, SubtrTypes)
-				       end, [Arg]),
+	      SubtrPatVar = ?mk_fun_var(fun(Map) ->
+					    TmpType = lookup_type(Arg, Map),
+					    t_subtract_list(TmpType, SubtrTypes)
+					end, [Arg]),
 	      state__store_conj(Arg, sub, SubtrPatVar, S)
 	  end
       end,
@@ -1043,10 +1046,10 @@ handle_guard(Guard, DefinedVars, State) ->
 
 get_bif_constr({erlang, Op, 2}, Dst, Args = [Arg1, Arg2], _State)
   when Op =:= '+'; Op =:= '-'; Op =:= '*' ->
-  ReturnType = mk_fun_var(fun(Map) ->
-			      TmpArgTypes = lookup_type_list(Args, Map),
-			      erl_bif_types:type(erlang, Op, 2, TmpArgTypes)
-			  end, Args),
+  ReturnType = ?mk_fun_var(fun(Map) ->
+			       TmpArgTypes = lookup_type_list(Args, Map),
+			       erl_bif_types:type(erlang, Op, 2, TmpArgTypes)
+			   end, Args),
   ArgFun =
     fun(A, Pos) ->
 	F =
@@ -1074,7 +1077,7 @@ get_bif_constr({erlang, Op, 2}, Dst, Args = [Arg1, Arg2], _State)
 		  end
 	      end
 	  end,
-	mk_fun_var(F, [Dst, A])
+	?mk_fun_var(F, [Dst, A])
     end,
   Arg1FunVar = ArgFun(Arg2, 2),
   Arg2FunVar = ArgFun(Arg1, 1),
@@ -1131,12 +1134,12 @@ get_bif_constr({erlang, Op, 2}, Dst, [Arg1, Arg2] = Args, _State)
       '>=' -> {ArgFun(Arg1, Arg2, '>='), ArgFun(Arg2, Arg1, '=<')}
     end,
   DstArgs = [Dst, Arg1, Arg2],
-  Arg1Var = mk_fun_var(Arg1Fun, DstArgs),
-  Arg2Var = mk_fun_var(Arg2Fun, DstArgs),
-  DstVar = mk_fun_var(fun(Map) ->
-			  TmpArgTypes = lookup_type_list(Args, Map),
-			  erl_bif_types:type(erlang, Op, 2, TmpArgTypes)
-		      end, Args),
+  Arg1Var = ?mk_fun_var(Arg1Fun, DstArgs),
+  Arg2Var = ?mk_fun_var(Arg2Fun, DstArgs),
+  DstVar = ?mk_fun_var(fun(Map) ->
+			   TmpArgTypes = lookup_type_list(Args, Map),
+			   erl_bif_types:type(erlang, Op, 2, TmpArgTypes)
+		       end, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstVar),
 			   mk_constraint(Arg1, sub, Arg1Var),
 			   mk_constraint(Arg2, sub, Arg2Var)]);
@@ -1172,13 +1175,13 @@ get_bif_constr({erlang, '++', 2}, Dst, [Hd, Tl] = Args, _State) ->
 	      end
 	  end,
   DstL = [Dst],
-  HdVar = mk_fun_var(HdFun, DstL),
-  TlVar = mk_fun_var(TlFun, DstL),
+  HdVar = ?mk_fun_var(HdFun, DstL),
+  TlVar = ?mk_fun_var(TlFun, DstL),
   ArgTypes = erl_bif_types:arg_types(erlang, '++', 2),
-  ReturnType = mk_fun_var(fun(Map) ->
-			      TmpArgTypes = lookup_type_list(Args, Map),
-			      erl_bif_types:type(erlang, '++', 2, TmpArgTypes)
-			  end, Args),
+  ReturnType = ?mk_fun_var(fun(Map) ->
+			       TmpArgTypes = lookup_type_list(Args, Map),
+			       erl_bif_types:type(erlang, '++', 2, TmpArgTypes)
+			   end, Args),
   Cs = mk_constraints(Args, sub, ArgTypes),
   mk_conj_constraint_list([mk_constraint(Dst, sub, ReturnType),
 			   mk_constraint(Hd, sub, HdVar),
@@ -1209,7 +1212,7 @@ get_bif_constr({erlang, is_function, 2}, Dst, [Fun, Arity], _State) ->
 		 false -> t_any()
 	       end
 	   end,
-  ArgV = mk_fun_var(ArgFun, [Dst, Arity]),
+  ArgV = ?mk_fun_var(ArgFun, [Dst, Arity]),
   mk_conj_constraint_list([mk_constraint(Dst, sub, t_boolean()),
 			   mk_constraint(Arity, sub, t_integer()),
 			   mk_constraint(Fun, sub, ArgV)]);
@@ -1232,12 +1235,12 @@ get_bif_constr({erlang, is_record, 2}, Dst, [Var, Tag] = Args, _State) ->
 		 false -> t_any()
 	       end
 	   end,
-  ArgV = mk_fun_var(ArgFun, [Dst]),
+  ArgV = ?mk_fun_var(ArgFun, [Dst]),
   DstFun = fun(Map) ->
 	       TmpArgTypes = lookup_type_list(Args, Map),
 	       erl_bif_types:type(erlang, is_record, 2, TmpArgTypes)
 	   end,
-  DstV = mk_fun_var(DstFun, Args),
+  DstV = ?mk_fun_var(DstFun, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Tag, sub, t_atom()),
 			   mk_constraint(Var, sub, ArgV)]);
@@ -1280,7 +1283,7 @@ get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
 	  false -> t_any()
 	end
     end,
-  ArgV = mk_fun_var(ArgFun, [Tag, Arity, Dst]),
+  ArgV = ?mk_fun_var(ArgFun, [Tag, Arity, Dst]),
   DstFun = fun(Map) ->
 	       [TmpVar, TmpTag, TmpArity] = TmpArgTypes = lookup_type_list(Args, Map),
 	       TmpArgTypes2 =
@@ -1314,7 +1317,7 @@ get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
 		 end,
 	       erl_bif_types:type(erlang, is_record, 3, TmpArgTypes2)
 	   end,
-  DstV = mk_fun_var(DstFun, Args),
+  DstV = ?mk_fun_var(DstFun, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arity, sub, t_integer()),
 			   mk_constraint(Tag, sub, t_atom()),
@@ -1359,9 +1362,9 @@ get_bif_constr({erlang, 'and', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 		   end
 	       end
 	   end,
-  ArgV1 = mk_fun_var(ArgFun(Arg2), [Arg2, Dst]),
-  ArgV2 = mk_fun_var(ArgFun(Arg1), [Arg1, Dst]),
-  DstV = mk_fun_var(DstFun, Args),
+  ArgV1 = ?mk_fun_var(ArgFun(Arg2), [Arg2, Dst]),
+  ArgV2 = ?mk_fun_var(ArgFun(Arg1), [Arg1, Dst]),
+  DstV = ?mk_fun_var(DstFun, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arg1, sub, ArgV1),
 			   mk_constraint(Arg2, sub, ArgV2)]);
@@ -1403,9 +1406,9 @@ get_bif_constr({erlang, 'or', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 		   end
 	       end
 	   end,
-  ArgV1 = mk_fun_var(ArgFun(Arg2), [Arg2, Dst]),
-  ArgV2 = mk_fun_var(ArgFun(Arg1), [Arg1, Dst]),
-  DstV = mk_fun_var(DstFun, Args),
+  ArgV1 = ?mk_fun_var(ArgFun(Arg2), [Arg2, Dst]),
+  ArgV2 = ?mk_fun_var(ArgFun(Arg1), [Arg1, Dst]),
+  DstV = ?mk_fun_var(DstFun, Args),
   F = fun(A) ->
 	  try [mk_constraint(A, sub, True)]
 	  catch throw:error -> []
@@ -1433,8 +1436,8 @@ get_bif_constr({erlang, 'not', 1}, Dst, [Arg] = Args, _State) ->
 		end
 	    end
 	end,
-  ArgV = mk_fun_var(Fun(Dst), [Dst]),
-  DstV = mk_fun_var(Fun(Arg), Args),
+  ArgV = ?mk_fun_var(Fun(Dst), [Dst]),
+  DstV = ?mk_fun_var(Fun(Arg), Args),
   mk_conj_constraint_list([mk_constraint(Arg, sub, ArgV),
 			   mk_constraint(Dst, sub, DstV)]);
 get_bif_constr({erlang, '=:=', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
@@ -1467,9 +1470,9 @@ get_bif_constr({erlang, '=:=', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 	       end
 	   end,
   DstArgs = [Dst, Arg1, Arg2],
-  ArgV1 = mk_fun_var(ArgFun(Arg1, Arg2), DstArgs),
-  ArgV2 = mk_fun_var(ArgFun(Arg2, Arg1), DstArgs),
-  DstV = mk_fun_var(DstFun, Args),
+  ArgV1 = ?mk_fun_var(ArgFun(Arg1, Arg2), DstArgs),
+  ArgV2 = ?mk_fun_var(ArgFun(Arg2, Arg1), DstArgs),
+  DstV = ?mk_fun_var(DstFun, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arg1, sub, ArgV1),
 			   mk_constraint(Arg2, sub, ArgV2)]);
@@ -1510,10 +1513,10 @@ get_bif_constr({erlang, '==', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 	    end
 	end
     end,
-  DstV = mk_fun_var(DstFun, Args),
+  DstV = ?mk_fun_var(DstFun, Args),
   ArgL = [Arg1, Arg2, Dst],
-  ArgV1 = mk_fun_var(ArgFun(Arg2, Arg1), ArgL),
-  ArgV2 = mk_fun_var(ArgFun(Arg1, Arg2), ArgL),
+  ArgV1 = ?mk_fun_var(ArgFun(Arg2, Arg1), ArgL),
+  ArgV2 = ?mk_fun_var(ArgFun(Arg1, Arg2), ArgL),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arg1, sub, ArgV1),
 			   mk_constraint(Arg2, sub, ArgV2)]);
@@ -1531,7 +1534,7 @@ get_bif_constr({erlang, element, 2} = _BIF, Dst, Args,
 		       end,
 		erl_bif_types:type(erlang, element, 2, ATs2)
 	    end,
-      ReturnType = mk_fun_var(Fun, Args),
+      ReturnType = ?mk_fun_var(Fun, Args),
       ArgTypes = erl_bif_types:arg_types(erlang, element, 2),
       Cs = mk_constraints(Args, sub, ArgTypes),
       NewCs =
@@ -1553,7 +1556,7 @@ get_bif_constr({M, F, A} = _BIF, Dst, Args, State) ->
 		    false -> T
 		  end
 	end,
-      ReturnType = mk_fun_var(fun(Map) ->
+      ReturnType = ?mk_fun_var(fun(Map) ->
 				  TmpArgTypes0 = lookup_type_list(Args, Map),
 				  TmpArgTypes = [UnopaqueFun(T) || T<- TmpArgTypes0],
 				  erl_bif_types:type(M, F, A, TmpArgTypes)
@@ -1608,7 +1611,7 @@ get_bif_test_constr(Dst, Arg, Type, State) ->
 		 false -> t_any()
 	       end
 	   end,
-  ArgV = mk_fun_var(ArgFun, [Dst]),
+  ArgV = ?mk_fun_var(ArgFun, [Dst]),
   DstFun = fun(Map) ->
 	       ArgType = lookup_type(Arg, Map),
 	       case t_is_none(t_inf(ArgType, Type)) of
@@ -1633,7 +1636,7 @@ get_bif_test_constr(Dst, Arg, Type, State) ->
 		   end
 	       end
 	   end,
-  DstV = mk_fun_var(DstFun, [Arg]),
+  DstV = ?mk_fun_var(DstFun, [Arg]),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arg, sub, ArgV)]).
 
@@ -1684,11 +1687,14 @@ solve_scc(SCC, Map, State, TryingUnit) ->
     true ->
       ?debug("SCC ~w reached fixpoint\n", [SCC]),
       NewTypes = unsafe_lookup_type_list(Funs, Map2),
-      case lists:all(fun(T) -> t_is_none(t_fun_range(T)) end, NewTypes)
+      case erl_types:any_none([t_fun_range(T) || T <- NewTypes])
 	andalso TryingUnit =:= false of
 	true ->
-	  UnitTypes = [t_fun(state__fun_arity(F, State), t_unit())
-		       || F <- Funs],
+	  UnitTypes =
+	    [case t_is_none(t_fun_range(T)) of
+	       false -> T;
+	       true -> t_fun(t_fun_args(T), t_unit())
+	     end || T <- NewTypes],
 	  Map3 = enter_type_lists(Funs, UnitTypes, Map2),
 	  solve_scc(SCC, Map3, State, true);
 	false ->
@@ -2320,12 +2326,25 @@ mk_constraint(Lhs, Op, Rhs) ->
 constraint_opnd_is_any(#fun_var{}) -> false;
 constraint_opnd_is_any(Type) -> t_is_any(Type).
 
+-ifdef(DEBUG).
+
+-spec mk_fun_var(fun((_) -> erl_types:erl_type()), [erl_types:erl_type()],
+		    integer()) -> #fun_var{}.
+
+mk_fun_var(Line, Fun, Types) ->
+  Deps = [t_var_name(Var) || Var <- t_collect_vars(t_product(Types))],
+  #fun_var{'fun' = Fun, deps = ordsets:from_list(Deps), origin = Line}.
+
+-else.
+
 -spec mk_fun_var(fun((_) -> erl_types:erl_type()), [erl_types:erl_type()]) -> #fun_var{}.
 
 mk_fun_var(Fun, Types) ->
   Deps = [t_var_name(Var) || Var <- t_collect_vars(t_product(Types))],
   #fun_var{'fun' = Fun, deps = ordsets:from_list(Deps)}.
 
+-endif.
+
 -spec get_deps(constr()) -> [dep()].
 
 get_deps(#constraint{deps = D}) -> D;
@@ -2676,8 +2695,9 @@ find_constraint(Tuple, [_|Cs]) ->
 -endif.
 
 -ifdef(DEBUG).
-format_type(#fun_var{deps = Deps}) ->
-  io_lib:format("Fun(~s)", [lists:flatten([format_type(t_var(X))||X<-Deps])]);
+format_type(#fun_var{deps = Deps, origin = Origin}) ->
+  io_lib:format("Fun@L~p(~s)",
+		[Origin, lists:flatten([format_type(t_var(X))||X<-Deps])]);
 format_type(Type) ->
   case cerl:is_literal(Type) of
     true -> io_lib:format("~w", [cerl:concrete(Type)]);
diff --git a/lib/dialyzer/test/Makefile b/lib/dialyzer/test/Makefile
index 69a8fd742e..47deb17f1d 100644
--- a/lib/dialyzer/test/Makefile
+++ b/lib/dialyzer/test/Makefile
@@ -26,7 +26,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_tests_spec:
 	$(INSTALL_DIR) $(RELSYSDIR)
-	chmod -f -R u+w $(RELSYSDIR)
+	chmod -R u+w $(RELSYSDIR)
 	$(INSTALL_DATA) $(AUXILIARY_FILES) $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 	cd $(RELSYSDIR);\
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/asn1 b/lib/dialyzer/test/r9c_SUITE_data/results/asn1
index ac83366bc8..292275dd6e 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/asn1
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/asn1
@@ -2,11 +2,11 @@
 asn1ct.erl:1500: The variable Err can never match since previous clauses completely covered the type #type{}
 asn1ct.erl:1596: The variable _ can never match since previous clauses completely covered the type 'ber_bin_v2'
 asn1ct.erl:1673: The pattern 'all' can never match the type 'asn1_module' | 'exclusive_decode' | 'partial_decode'
-asn1ct.erl:672: The pattern <{'false', Result}, _, _> can never match the type <{'true','true'},atom() | binary() | [atom() | binary() | [atom() | binary() | [any()] | char()] | char()],[any()]>
+asn1ct.erl:672: The pattern <{'false', Result}, _, _> can never match the type <{'true','true'},atom() | binary() | [atom() | [any()] | char()],[any()]>
 asn1ct.erl:909: Guard test is_atom(Ext::[49 | 97 | 98 | 100 | 110 | 115]) can never succeed
 asn1ct_check.erl:1698: The pattern {'error', _} can never match the type [any()]
 asn1ct_check.erl:2733: The pattern {'type', Tag, _, _, _, _} can never match the type 'ASN1_OPEN_TYPE' | {_,_} | {'fixedtypevaluefield',_,_}
-asn1ct_check.erl:2738: The pattern <_S, _> can never match since previous clauses completely covered the type <#state{},#ObjectClassFieldType{class::#objectclass{fields::maybe_improper_list() | {_,_,_,_}},fieldname::{_,maybe_improper_list()},type::'ASN1_OPEN_TYPE' | {_,_} | {'fixedtypevaluefield',_,_}}>
+asn1ct_check.erl:2738: The pattern <_S, _> can never match since previous clauses completely covered the type <#state{},#'ObjectClassFieldType'{class::#objectclass{fields::maybe_improper_list() | {_,_,_,_}},fieldname::{_,maybe_improper_list()},type::'ASN1_OPEN_TYPE' | {_,_} | {'fixedtypevaluefield',_,_}}>
 asn1ct_check.erl:2887: The variable Other can never match since previous clauses completely covered the type any()
 asn1ct_check.erl:3188: The pattern <_S, [], B> can never match the type <#state{},{'SingleValue',_},{'ValueRange',_}>
 asn1ct_check.erl:3190: The pattern <_S, A, []> can never match the type <#state{},{'SingleValue',_},{'ValueRange',_}>
@@ -29,8 +29,8 @@ asn1ct_check.erl:5128: Guard test is_record(Type::{_,_} | {'fixedtypevaluefield'
 asn1ct_check.erl:540: The pattern <_S, {'poc', _ObjSet, _Params}> can never match since previous clauses completely covered the type <#state{},_>
 asn1ct_check.erl:5517: The pattern <_, []> can never match the type <_,[{'ABSTRACT-SYNTAX',{_,_,_}} | {'TYPE-IDENTIFIER',{_,_,_}},...]>
 asn1ct_constructed_ber.erl:1075: The pattern {{{'ObjectClassFieldType', _, _, _, {'objectfield', PrimFieldName1, PFNList}}, _}, {'componentrelation', _, _}} can never match the type {#type{},_}
-asn1ct_constructed_ber.erl:695: The pattern {'EXTENSIONMARK', _, _} can never match the type #ComponentType{}
-asn1ct_constructed_ber.erl:748: The pattern <Erules, TopType, {CompList, _ExtList}> can never match the type <_,maybe_improper_list(),[#ComponentType{typespec::{_,_,_,_,_,_}}]>
+asn1ct_constructed_ber.erl:695: The pattern {'EXTENSIONMARK', _, _} can never match the type #'ComponentType'{}
+asn1ct_constructed_ber.erl:748: The pattern <Erules, TopType, {CompList, _ExtList}> can never match the type <_,maybe_improper_list(),[#'ComponentType'{typespec::{_,_,_,_,_,_}}]>
 asn1ct_constructed_ber_bin_v2.erl:914: The pattern {{{'ObjectClassFieldType', _, _, _, {'objectfield', PrimFieldName1, PFNList}}, _}, {'componentrelation', _, _}} can never match the type {#type{},_}
 asn1ct_gen.erl:740: The pattern [] can never match the type [any(),...]
 asn1ct_gen_ber.erl:974: The pattern <Erules, [{Name, Def} | Rest]> can never match the type <_,[#typedef{name::atom(),typespec::{_,_,_,_,_,_}}]>
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/inets b/lib/dialyzer/test/r9c_SUITE_data/results/inets
index fd5e36a3cd..0177dcc88c 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/inets
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/inets
@@ -3,13 +3,15 @@ ftp.erl:1243: The pattern {'ok', {N, Bytes}} can never match the type 'eof' | {'
 ftp.erl:640: The pattern {'closed', _Why} can never match the type 'perm_fname_not_allowed' | 'perm_neg_compl' | 'perm_no_space' | 'pos_compl' | 'pos_interm' | 'pos_interm_acct' | 'trans_neg_compl' | 'trans_no_space' | {'error' | 'perm_fname_not_allowed' | 'perm_neg_compl' | 'perm_no_space' | 'pos_compl' | 'pos_interm' | 'pos_interm_acct' | 'pos_prel' | 'trans_neg_compl' | 'trans_no_space',atom() | [any()] | {'invalid_server_response',[any(),...]}}
 http.erl:117: The pattern {'error', Reason} can never match the type #req_headers{connection::[45 | 97 | 101 | 105 | 107 | 108 | 112 | 118,...],content_length::[48,...],other::[{_,_}]}
 http.erl:138: Function close_session/2 will never be called
-http_lib.erl:286: The call http_lib:close('ip_comm' | {'ssl',_},any()) will never return since it differs in the 1st argument from the success typing arguments: ('http' | 'https',any())
-http_lib.erl:424: The variable _ can never match since previous clauses completely covered the type any()
-http_lib.erl:438: The variable _ can never match since previous clauses completely covered the type any()
+http_lib.erl:286: The call http_lib:close('ip_comm' | {'ssl',_},port() | {'sslsocket',_,_}) will never return since it differs in the 1st argument from the success typing arguments: ('http' | 'https',port() | {'sslsocket',_,pid() | {_,{'config',_,_,_,_,{_,_,_,_}}} | {'sslsocket',_,pid() | {'sslsocket',_,pid() | {_,_,_}}}})
+http_lib.erl:415: The pattern 61 can never match the type 'http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | #http_request{method::'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),path::'*' | binary() | string() | {'abs_path',binary() | string()} | {'scheme',binary() | string(),binary() | string()} | {'absoluteURI','http' | 'https',binary() | string(),'undefined' | non_neg_integer(),binary() | string()},version::{non_neg_integer(),non_neg_integer()}} | #http_response{version::{non_neg_integer(),non_neg_integer()},status::integer(),phrase::binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}
+http_lib.erl:417: The pattern 59 can never match the type 'http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | #http_request{method::'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),path::'*' | binary() | string() | {'abs_path',binary() | string()} | {'scheme',binary() | string(),binary() | string()} | {'absoluteURI','http' | 'https',binary() | string(),'undefined' | non_neg_integer(),binary() | string()},version::{non_neg_integer(),non_neg_integer()}} | #http_response{version::{non_neg_integer(),non_neg_integer()},status::integer(),phrase::binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}
+http_lib.erl:420: The pattern 13 can never match the type 'http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | #http_request{method::'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),path::'*' | binary() | string() | {'abs_path',binary() | string()} | {'scheme',binary() | string(),binary() | string()} | {'absoluteURI','http' | 'https',binary() | string(),'undefined' | non_neg_integer(),binary() | string()},version::{non_neg_integer(),non_neg_integer()}} | #http_response{version::{non_neg_integer(),non_neg_integer()},status::integer(),phrase::binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}
+http_lib.erl:424: The variable _ can never match since previous clauses completely covered the type 'http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | #http_request{method::'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),path::'*' | binary() | string() | {'abs_path',binary() | string()} | {'scheme',binary() | string(),binary() | string()} | {'absoluteURI','http' | 'https',binary() | string(),'undefined' | non_neg_integer(),binary() | string()},version::{non_neg_integer(),non_neg_integer()}} | #http_response{version::{non_neg_integer(),non_neg_integer()},status::integer(),phrase::binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}
+http_lib.erl:428: Function read_chunk_ext_val/6 will never be called
+http_lib.erl:444: The pattern 10 can never match the type 'http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | #http_request{method::'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),path::'*' | binary() | string() | {'abs_path',binary() | string()} | {'scheme',binary() | string(),binary() | string()} | {'absoluteURI','http' | 'https',binary() | string(),'undefined' | non_neg_integer(),binary() | string()},version::{non_neg_integer(),non_neg_integer()}} | #http_response{version::{non_neg_integer(),non_neg_integer()},status::integer(),phrase::binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}
+http_lib.erl:552: Call to missing or unexported function ssl:accept/2
 http_lib.erl:99: Function getHeaderValue/2 will never be called
-httpc_handler.erl:322: Function status_continue/2 has no local return
-httpc_handler.erl:37: Function init_connection/2 has no local return
-httpc_handler.erl:65: Function next_response_with_request/2 has no local return
 httpc_handler.erl:660: Function exit_session_ok/2 has no local return
 httpc_manager.erl:145: The pattern {ErrorReply, State2} can never match the type {{'ok',number()},number(),#state{reqid::number()}}
 httpc_manager.erl:160: The pattern {ErrorReply, State2} can never match the type {{'ok',number()},number(),#state{reqid::number()}}
@@ -24,11 +26,14 @@ httpd_manager.erl:885: The pattern {'EXIT', Reason} can never match since previo
 httpd_manager.erl:919: Function auth_status/1 will never be called
 httpd_manager.erl:926: Function sec_status/1 will never be called
 httpd_manager.erl:933: Function acceptor_status/1 will never be called
-httpd_request_handler.erl:374: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 66 | 98 | 100 | 103 | 105 | 111 | 116 | 121,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
-httpd_request_handler.erl:378: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 77 | 97 | 100 | 101 | 104 | 108 | 110 | 111 | 116 | 119,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
-httpd_request_handler.erl:401: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 77 | 97 | 100 | 101 | 104 | 108 | 110 | 111 | 116 | 119,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
-httpd_request_handler.erl:644: The call lists:reverse(Fields0::{'error',_} | {'ok',[[any()]]}) will never return since it differs in the 1st argument from the success typing arguments: ([any()])
+httpd_request_handler.erl:374: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 66 | 98 | 100 | 103 | 105 | 111 | 116 | 121,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_},socket::port() | {'sslsocket',_,_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
+httpd_request_handler.erl:378: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 77 | 97 | 100 | 101 | 104 | 108 | 110 | 111 | 116 | 119,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_},socket::port() | {'sslsocket',_,_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
+httpd_request_handler.erl:401: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 77 | 97 | 100 | 101 | 104 | 108 | 110 | 111 | 116 | 119,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_},socket::port() | {'sslsocket',_,_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
+httpd_request_handler.erl:489: The variable Other can never match since previous clauses completely covered the type {'error',_} | {'ok','http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | {'http_request','DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),'*' | binary() | string() | {'abs_path',binary() | [any()]} | {'scheme',binary() | [any()],binary() | [any()]} | {'absoluteURI','http' | 'https',binary() | [any()],'undefined' | non_neg_integer(),binary() | [any()]},{non_neg_integer(),non_neg_integer()}} | {'http_response',{non_neg_integer(),non_neg_integer()},integer(),binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}}
+httpd_request_handler.erl:644: The call lists:reverse(Fields0::{'error',_} | {'ok',_}) will never return since it differs in the 1st argument from the success typing arguments: ([any()])
 httpd_request_handler.erl:645: Function will never be called
+httpd_socket.erl:129: Call to missing or unexported function ssl:accept/2
+httpd_socket.erl:49: The pattern {'ok', _} can never match the type {'error',_}
 httpd_sup.erl:63: The variable Else can never match since previous clauses completely covered the type {'error',_} | {'ok',[any()],_,_}
 httpd_sup.erl:88: The pattern {'error', Reason} can never match the type {'ok',_,_}
 httpd_sup.erl:92: The variable Else can never match since previous clauses completely covered the type {'ok',_,_}
@@ -38,17 +43,17 @@ mod_auth_plain.erl:100: The variable _ can never match since previous clauses co
 mod_auth_plain.erl:159: The variable _ can never match since previous clauses completely covered the type [any()]
 mod_auth_plain.erl:83: The variable O can never match since previous clauses completely covered the type [any()]
 mod_cgi.erl:372: The pattern {'http_response', NewAccResponse} can never match the type 'ok'
-mod_dir.erl:101: The call lists:flatten(nonempty_improper_list(atom() | binary() | [any()] | char(),atom())) will never return since it differs in the 1st argument from the success typing arguments: ([any()])
+mod_dir.erl:101: The call lists:flatten(nonempty_improper_list(atom() | [any()] | char(),atom())) will never return since it differs in the 1st argument from the success typing arguments: ([any()])
 mod_dir.erl:72: The pattern {'error', Reason} can never match the type {'ok',[[[any()] | char()],...]}
-mod_get.erl:135: The pattern <{'enfile', _}, _Info, Path> can never match the type <atom(),#mod{},atom() | binary() | [atom() | binary() | [any()] | char()]>
-mod_head.erl:80: The pattern <{'enfile', _}, _Info, Path> can never match the type <atom(),#mod{},atom() | binary() | [atom() | binary() | [atom() | binary() | [any()] | char()] | char()]>
+mod_get.erl:135: The pattern <{'enfile', _}, _Info, Path> can never match the type <atom(),#mod{},atom() | binary() | [atom() | [any()] | char()]>
+mod_head.erl:80: The pattern <{'enfile', _}, _Info, Path> can never match the type <atom(),#mod{},atom() | binary() | [atom() | [any()] | char()]>
 mod_htaccess.erl:460: The pattern {'error', BadData} can never match the type {'ok',_}
-mod_include.erl:193: The pattern {_, Name, {[], []}} can never match the type {[any()],[any()],maybe_improper_list()}
-mod_include.erl:195: The pattern {_, Name, {PathInfo, []}} can never match the type {[any()],[any()],maybe_improper_list()}
-mod_include.erl:197: The pattern {_, Name, {PathInfo, QueryString}} can never match the type {[any()],[any()],maybe_improper_list()}
-mod_include.erl:201: The variable Gurka can never match since previous clauses completely covered the type {[any()],[any()],maybe_improper_list()}
-mod_include.erl:692: The pattern <{'read', Reason}, Info, Path> can never match the type <{'open',atom()},#mod{},atom() | binary() | [atom() | binary() | [atom() | binary() | [any()] | char()] | char()]>
-mod_include.erl:706: The pattern <{'enfile', _}, _Info, Path> can never match the type <atom(),#mod{},atom() | binary() | [atom() | binary() | [atom() | binary() | [any()] | char()] | char()]>
+mod_include.erl:193: The pattern {_, Name, {[], []}} can never match the type {[any()],[any()],string()}
+mod_include.erl:195: The pattern {_, Name, {PathInfo, []}} can never match the type {[any()],[any()],string()}
+mod_include.erl:197: The pattern {_, Name, {PathInfo, QueryString}} can never match the type {[any()],[any()],string()}
+mod_include.erl:201: The variable Gurka can never match since previous clauses completely covered the type {[any()],[any()],string()}
+mod_include.erl:692: The pattern <{'read', Reason}, Info, Path> can never match the type <{'open',atom()},#mod{},atom() | binary() | [atom() | [any()] | char()]>
+mod_include.erl:706: The pattern <{'enfile', _}, _Info, Path> can never match the type <atom(),#mod{},atom() | binary() | [atom() | [any()] | char()]>
 mod_include.erl:716: Function read_error/3 will never be called
 mod_include.erl:719: Function read_error/4 will never be called
 mod_security_server.erl:386: The variable O can never match since previous clauses completely covered the type [any()]
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
index e199581a0e..2be71ac7d7 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
@@ -6,6 +6,7 @@ mnesia_bup.erl:111: The created fun has no local return
 mnesia_bup.erl:574: Function fallback_receiver/2 has no local return
 mnesia_bup.erl:967: Function uninstall_fallback_master/2 has no local return
 mnesia_checkpoint.erl:1014: The variable Error can never match since previous clauses completely covered the type {'ok',#checkpoint_args{nodes::[any()],retainers::[any(),...]}}
+mnesia_checkpoint.erl:894: The call sys:handle_system_msg(Msg::any(),From::any(),'no_parent','mnesia_checkpoint',[],Cp::#checkpoint_args{}) breaks the contract (Msg,From,Parent,Module,Debug,Misc) -> Void when is_subtype(Msg,term()), is_subtype(From,{pid(),Tag::_}), is_subtype(Parent,pid()), is_subtype(Module,module()), is_subtype(Debug,[dbg_opt()]), is_subtype(Misc,term()), is_subtype(Void,term())
 mnesia_controller.erl:1666: The variable Tab can never match since previous clauses completely covered the type [any()]
 mnesia_controller.erl:1679: The pattern {'stop', Reason, Reply, State2} can never match the type {'noreply',_} | {'reply',_,_} | {'stop','shutdown',#state{}}
 mnesia_controller.erl:1685: The pattern {'noreply', State2, _Timeout} can never match the type {'reply',_,_}
@@ -15,6 +16,7 @@ mnesia_frag.erl:294: The call mnesia_frag:remote_collect(Ref::reference(),{'erro
 mnesia_frag.erl:304: The call mnesia_frag:remote_collect(Ref::reference(),{'error',{'node_not_running',_}},[],OldSelectFun::fun(() -> [any()])) will never return since it differs in the 2nd argument from the success typing arguments: (reference(),'ok',[any()],fun(() -> [any()]))
 mnesia_frag.erl:312: The call mnesia_frag:remote_collect(Ref::reference(),LocalRes::{'error',_},[],OldSelectFun::fun(() -> [any()])) will never return since it differs in the 2nd argument from the success typing arguments: (reference(),'ok',[any()],fun(() -> [any()]))
 mnesia_index.erl:52: The call mnesia_lib:other_val(Var::{_,'commit_work' | 'index' | 'setorbag' | 'storage_type' | {'index',_}},_ReASoN_::any()) will never return since it differs in the 1st argument from the success typing arguments: ({_,'active_replicas' | 'where_to_read' | 'where_to_write'},any())
+mnesia_lib.erl:1028: The pattern {'EXIT', Reason} can never match the type [any()] | {'error',_}
 mnesia_lib.erl:957: The pattern {'ok', {0, _}} can never match the type 'eof' | {'error',atom()} | {'ok',binary() | string()}
 mnesia_lib.erl:959: The pattern {'ok', {_, Bin}} can never match the type 'eof' | {'error',atom()} | {'ok',binary() | string()}
 mnesia_loader.erl:36: The call mnesia_lib:other_val(Var::{_,'access_mode' | 'cstruct' | 'db_nodes' | 'setorbag' | 'snmp' | 'storage_type'},Reason::any()) will never return since it differs in the 1st argument from the success typing arguments: ({_,'active_replicas' | 'where_to_read' | 'where_to_write'},any())
@@ -30,5 +32,6 @@ mnesia_schema.erl:1258: Guard test FromS::'disc_copies' | 'disc_only_copies' | '
 mnesia_schema.erl:1639: The pattern {'false', 'mandatory'} can never match the type {'false','optional'}
 mnesia_schema.erl:2434: The variable Reason can never match since previous clauses completely covered the type {'error',_} | {'ok',_}
 mnesia_schema.erl:451: Guard test UseDirAnyway::'false' == 'true' can never succeed
+mnesia_text.erl:180: The variable T can never match since previous clauses completely covered the type {'error',{integer(),atom() | tuple(),_}} | {'ok',_}
 mnesia_tm.erl:1522: Function commit_participant/5 has no local return
 mnesia_tm.erl:2169: Function system_terminate/4 has no local return
diff --git a/lib/dialyzer/test/race_SUITE_data/results/extract_translations b/lib/dialyzer/test/race_SUITE_data/results/extract_translations
index f7d5abc6f5..62aa1aa511 100644
--- a/lib/dialyzer/test/race_SUITE_data/results/extract_translations
+++ b/lib/dialyzer/test/race_SUITE_data/results/extract_translations
@@ -1,5 +1,5 @@
 
-extract_translations.erl:140: The call ets:insert('files',{atom() | binary() | [atom() | binary() | [atom() | binary() | [any()] | char()] | char()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup('files',File::atom() | binary() | [atom() | binary() | [atom() | binary() | [any()] | char()] | char()]) call in extract_translations.erl on line 135
+extract_translations.erl:140: The call ets:insert('files',{atom() | binary() | [atom() | [any()] | char()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup('files',File::atom() | binary() | [atom() | [any()] | char()]) call in extract_translations.erl on line 135
 extract_translations.erl:146: The call ets:insert('translations',{_,[]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup('translations',Str::any()) call in extract_translations.erl on line 126
-extract_translations.erl:152: The call ets:insert('files',{atom() | binary() | [atom() | binary() | [atom() | binary() | [any()] | char()] | char()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup('files',File::atom() | binary() | [atom() | binary() | [atom() | binary() | [any()] | char()] | char()]) call in extract_translations.erl on line 148
+extract_translations.erl:152: The call ets:insert('files',{atom() | binary() | [atom() | [any()] | char()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup('files',File::atom() | binary() | [atom() | [any()] | char()]) call in extract_translations.erl on line 148
 extract_translations.erl:154: The call ets:insert('translations',{_,[]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup('translations',Str::any()) call in extract_translations.erl on line 126
diff --git a/lib/dialyzer/test/small_SUITE_data/results/common_eunit b/lib/dialyzer/test/small_SUITE_data/results/common_eunit
new file mode 100644
index 0000000000..bb5fd1c9ac
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/common_eunit
@@ -0,0 +1,2 @@
+
+common_eunit.erl:57: The created fun has no local return
diff --git a/lib/dialyzer/test/small_SUITE_data/results/comparisons b/lib/dialyzer/test/small_SUITE_data/results/comparisons
new file mode 100644
index 0000000000..642585d25e
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/comparisons
@@ -0,0 +1,153 @@
+
+comparisons.erl:100: The pattern 'true' can never match the type 'false'
+comparisons.erl:101: The pattern 'true' can never match the type 'false'
+comparisons.erl:102: The pattern 'false' can never match the type 'true'
+comparisons.erl:103: The pattern 'false' can never match the type 'true'
+comparisons.erl:104: The pattern 'true' can never match the type 'false'
+comparisons.erl:105: The pattern 'true' can never match the type 'false'
+comparisons.erl:107: The pattern 'true' can never match the type 'false'
+comparisons.erl:108: The pattern 'true' can never match the type 'false'
+comparisons.erl:109: The pattern 'false' can never match the type 'true'
+comparisons.erl:110: The pattern 'false' can never match the type 'true'
+comparisons.erl:111: The pattern 'true' can never match the type 'false'
+comparisons.erl:112: The pattern 'true' can never match the type 'false'
+comparisons.erl:113: The pattern 'false' can never match the type 'true'
+comparisons.erl:114: The pattern 'false' can never match the type 'true'
+comparisons.erl:115: The pattern 'true' can never match the type 'false'
+comparisons.erl:116: The pattern 'true' can never match the type 'false'
+comparisons.erl:117: The pattern 'false' can never match the type 'true'
+comparisons.erl:118: The pattern 'false' can never match the type 'true'
+comparisons.erl:123: The pattern 'false' can never match the type 'true'
+comparisons.erl:124: The pattern 'false' can never match the type 'true'
+comparisons.erl:125: The pattern 'true' can never match the type 'false'
+comparisons.erl:126: The pattern 'true' can never match the type 'false'
+comparisons.erl:127: The pattern 'false' can never match the type 'true'
+comparisons.erl:128: The pattern 'false' can never match the type 'true'
+comparisons.erl:129: The pattern 'true' can never match the type 'false'
+comparisons.erl:130: The pattern 'true' can never match the type 'false'
+comparisons.erl:132: The pattern 'true' can never match the type 'false'
+comparisons.erl:133: The pattern 'true' can never match the type 'false'
+comparisons.erl:134: The pattern 'false' can never match the type 'true'
+comparisons.erl:135: The pattern 'false' can never match the type 'true'
+comparisons.erl:136: The pattern 'true' can never match the type 'false'
+comparisons.erl:137: The pattern 'true' can never match the type 'false'
+comparisons.erl:138: The pattern 'false' can never match the type 'true'
+comparisons.erl:139: The pattern 'false' can never match the type 'true'
+comparisons.erl:140: The pattern 'true' can never match the type 'false'
+comparisons.erl:141: The pattern 'true' can never match the type 'false'
+comparisons.erl:142: The pattern 'false' can never match the type 'true'
+comparisons.erl:143: The pattern 'false' can never match the type 'true'
+comparisons.erl:144: The pattern 'true' can never match the type 'false'
+comparisons.erl:145: The pattern 'true' can never match the type 'false'
+comparisons.erl:146: The pattern 'false' can never match the type 'true'
+comparisons.erl:147: The pattern 'false' can never match the type 'true'
+comparisons.erl:152: The pattern 'false' can never match the type 'true'
+comparisons.erl:153: The pattern 'false' can never match the type 'true'
+comparisons.erl:154: The pattern 'true' can never match the type 'false'
+comparisons.erl:155: The pattern 'true' can never match the type 'false'
+comparisons.erl:157: The pattern 'true' can never match the type 'false'
+comparisons.erl:158: The pattern 'true' can never match the type 'false'
+comparisons.erl:159: The pattern 'false' can never match the type 'true'
+comparisons.erl:160: The pattern 'false' can never match the type 'true'
+comparisons.erl:161: The pattern 'true' can never match the type 'false'
+comparisons.erl:162: The pattern 'true' can never match the type 'false'
+comparisons.erl:163: The pattern 'false' can never match the type 'true'
+comparisons.erl:164: The pattern 'false' can never match the type 'true'
+comparisons.erl:165: The pattern 'true' can never match the type 'false'
+comparisons.erl:166: The pattern 'true' can never match the type 'false'
+comparisons.erl:167: The pattern 'false' can never match the type 'true'
+comparisons.erl:168: The pattern 'false' can never match the type 'true'
+comparisons.erl:169: The pattern 'true' can never match the type 'false'
+comparisons.erl:170: The pattern 'true' can never match the type 'false'
+comparisons.erl:171: The pattern 'false' can never match the type 'true'
+comparisons.erl:172: The pattern 'false' can never match the type 'true'
+comparisons.erl:173: The pattern 'true' can never match the type 'false'
+comparisons.erl:174: The pattern 'true' can never match the type 'false'
+comparisons.erl:175: The pattern 'false' can never match the type 'true'
+comparisons.erl:176: The pattern 'false' can never match the type 'true'
+comparisons.erl:186: The pattern 'false' can never match the type 'true'
+comparisons.erl:187: The pattern 'false' can never match the type 'true'
+comparisons.erl:188: The pattern 'true' can never match the type 'false'
+comparisons.erl:189: The pattern 'true' can never match the type 'false'
+comparisons.erl:190: The pattern 'false' can never match the type 'true'
+comparisons.erl:191: The pattern 'false' can never match the type 'true'
+comparisons.erl:192: The pattern 'true' can never match the type 'false'
+comparisons.erl:193: The pattern 'true' can never match the type 'false'
+comparisons.erl:203: The pattern 'false' can never match the type 'true'
+comparisons.erl:204: The pattern 'false' can never match the type 'true'
+comparisons.erl:205: The pattern 'true' can never match the type 'false'
+comparisons.erl:206: The pattern 'true' can never match the type 'false'
+comparisons.erl:208: The pattern 'true' can never match the type 'false'
+comparisons.erl:209: The pattern 'true' can never match the type 'false'
+comparisons.erl:210: The pattern 'false' can never match the type 'true'
+comparisons.erl:211: The pattern 'false' can never match the type 'true'
+comparisons.erl:221: The pattern 'true' can never match the type 'false'
+comparisons.erl:222: The pattern 'true' can never match the type 'false'
+comparisons.erl:223: The pattern 'false' can never match the type 'true'
+comparisons.erl:224: The pattern 'false' can never match the type 'true'
+comparisons.erl:225: The pattern 'true' can never match the type 'false'
+comparisons.erl:226: The pattern 'true' can never match the type 'false'
+comparisons.erl:227: The pattern 'false' can never match the type 'true'
+comparisons.erl:228: The pattern 'false' can never match the type 'true'
+comparisons.erl:242: The pattern 'false' can never match the type 'true'
+comparisons.erl:243: The pattern 'false' can never match the type 'true'
+comparisons.erl:244: The pattern 'true' can never match the type 'false'
+comparisons.erl:245: The pattern 'true' can never match the type 'false'
+comparisons.erl:246: The pattern 'false' can never match the type 'true'
+comparisons.erl:247: The pattern 'false' can never match the type 'true'
+comparisons.erl:248: The pattern 'true' can never match the type 'false'
+comparisons.erl:249: The pattern 'true' can never match the type 'false'
+comparisons.erl:251: The pattern 'true' can never match the type 'false'
+comparisons.erl:252: The pattern 'true' can never match the type 'false'
+comparisons.erl:253: The pattern 'false' can never match the type 'true'
+comparisons.erl:254: The pattern 'false' can never match the type 'true'
+comparisons.erl:263: The pattern 'false' can never match the type 'true'
+comparisons.erl:264: The pattern 'false' can never match the type 'true'
+comparisons.erl:265: The pattern 'true' can never match the type 'false'
+comparisons.erl:266: The pattern 'true' can never match the type 'false'
+comparisons.erl:268: The pattern 'true' can never match the type 'false'
+comparisons.erl:269: The pattern 'true' can never match the type 'false'
+comparisons.erl:270: The pattern 'false' can never match the type 'true'
+comparisons.erl:271: The pattern 'false' can never match the type 'true'
+comparisons.erl:272: The pattern 'true' can never match the type 'false'
+comparisons.erl:273: The pattern 'true' can never match the type 'false'
+comparisons.erl:274: The pattern 'false' can never match the type 'true'
+comparisons.erl:275: The pattern 'false' can never match the type 'true'
+comparisons.erl:293: The pattern 'false' can never match the type 'true'
+comparisons.erl:294: The pattern 'false' can never match the type 'true'
+comparisons.erl:295: The pattern 'true' can never match the type 'false'
+comparisons.erl:296: The pattern 'true' can never match the type 'false'
+comparisons.erl:311: The pattern 'true' can never match the type 'false'
+comparisons.erl:312: The pattern 'true' can never match the type 'false'
+comparisons.erl:313: The pattern 'false' can never match the type 'true'
+comparisons.erl:314: The pattern 'false' can never match the type 'true'
+comparisons.erl:44: The pattern 'false' can never match the type 'true'
+comparisons.erl:45: The pattern 'false' can never match the type 'true'
+comparisons.erl:46: The pattern 'true' can never match the type 'false'
+comparisons.erl:47: The pattern 'true' can never match the type 'false'
+comparisons.erl:48: The pattern 'false' can never match the type 'true'
+comparisons.erl:49: The pattern 'false' can never match the type 'true'
+comparisons.erl:50: The pattern 'true' can never match the type 'false'
+comparisons.erl:51: The pattern 'true' can never match the type 'false'
+comparisons.erl:52: The pattern 'false' can never match the type 'true'
+comparisons.erl:53: The pattern 'false' can never match the type 'true'
+comparisons.erl:54: The pattern 'true' can never match the type 'false'
+comparisons.erl:55: The pattern 'true' can never match the type 'false'
+comparisons.erl:69: The pattern 'false' can never match the type 'true'
+comparisons.erl:70: The pattern 'false' can never match the type 'true'
+comparisons.erl:71: The pattern 'true' can never match the type 'false'
+comparisons.erl:72: The pattern 'true' can never match the type 'false'
+comparisons.erl:73: The pattern 'false' can never match the type 'true'
+comparisons.erl:74: The pattern 'false' can never match the type 'true'
+comparisons.erl:75: The pattern 'true' can never match the type 'false'
+comparisons.erl:76: The pattern 'true' can never match the type 'false'
+comparisons.erl:77: The pattern 'false' can never match the type 'true'
+comparisons.erl:78: The pattern 'false' can never match the type 'true'
+comparisons.erl:79: The pattern 'true' can never match the type 'false'
+comparisons.erl:80: The pattern 'true' can never match the type 'false'
+comparisons.erl:94: The pattern 'false' can never match the type 'true'
+comparisons.erl:95: The pattern 'false' can never match the type 'true'
+comparisons.erl:96: The pattern 'true' can never match the type 'false'
+comparisons.erl:97: The pattern 'true' can never match the type 'false'
+comparisons.erl:98: The pattern 'false' can never match the type 'true'
+comparisons.erl:99: The pattern 'false' can never match the type 'true'
diff --git a/lib/dialyzer/test/small_SUITE_data/results/failing_funs b/lib/dialyzer/test/small_SUITE_data/results/failing_funs
new file mode 100644
index 0000000000..a1fb22cbc6
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/failing_funs
@@ -0,0 +1,20 @@
+
+failing_funs.erl:101: The created fun has no local return
+failing_funs.erl:104: The created fun has no local return
+failing_funs.erl:127: The created fun has no local return
+failing_funs.erl:135: The created fun has no local return
+failing_funs.erl:138: The created fun has no local return
+failing_funs.erl:13: Function foo3/0 has no local return
+failing_funs.erl:13: The pattern 'b' can never match the type 'a'
+failing_funs.erl:161: The created fun has no local return
+failing_funs.erl:169: The created fun has no local return
+failing_funs.erl:172: The created fun has no local return
+failing_funs.erl:17: The pattern 'b' can never match the type 'a'
+failing_funs.erl:195: The created fun has no local return
+failing_funs.erl:203: The created fun has no local return
+failing_funs.erl:206: The created fun has no local return
+failing_funs.erl:229: The created fun has no local return
+failing_funs.erl:55: The created fun has no local return
+failing_funs.erl:62: The created fun has no local return
+failing_funs.erl:69: The created fun has no local return
+failing_funs.erl:76: The created fun has no local return
diff --git a/lib/dialyzer/test/small_SUITE_data/results/flatten b/lib/dialyzer/test/small_SUITE_data/results/flatten
index 4571214e49..8aa44dd002 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/flatten
+++ b/lib/dialyzer/test/small_SUITE_data/results/flatten
@@ -1,2 +1,2 @@
 
-flatten.erl:17: The call lists:flatten(nonempty_improper_list(atom() | binary() | [any()] | char(),atom())) will never return since it differs in the 1st argument from the success typing arguments: ([any()])
+flatten.erl:17: The call lists:flatten(nonempty_improper_list(atom() | [any()] | char(),atom())) will never return since it differs in the 1st argument from the success typing arguments: ([any()])
diff --git a/lib/dialyzer/test/small_SUITE_data/results/my_sofs b/lib/dialyzer/test/small_SUITE_data/results/my_sofs
index bfee0bce0d..bc97c08d62 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/my_sofs
+++ b/lib/dialyzer/test/small_SUITE_data/results/my_sofs
@@ -1,3 +1,3 @@
 
-my_sofs.erl:34: The pattern {'Set', _, _} can never match the type #OrdSet{}
-my_sofs.erl:54: The pattern {'Set', _, _} can never match the type #OrdSet{}
+my_sofs.erl:34: The pattern {'Set', _, _} can never match the type #'OrdSet'{}
+my_sofs.erl:54: The pattern {'Set', _, _} can never match the type #'OrdSet'{}
diff --git a/lib/dialyzer/test/small_SUITE_data/src/binary_lc_bug.erl b/lib/dialyzer/test/small_SUITE_data/src/binary_lc_bug.erl
new file mode 100644
index 0000000000..c1e82bfa59
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/binary_lc_bug.erl
@@ -0,0 +1,8 @@
+-module(test).
+
+-export([bin_compr/0]).
+
+bin_compr() ->
+%    [ 0 || {N, V} <- [{a, b}] ]. % Works ok
+    << <<>> || {A, B} <- [{a, b}] >>. % Complains
+%    << <<>> || X <- [{a, b}] >>. % Works ok
diff --git a/lib/dialyzer/test/small_SUITE_data/src/codec_can.erl b/lib/dialyzer/test/small_SUITE_data/src/codec_can.erl
new file mode 100644
index 0000000000..8abf872b37
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/codec_can.erl
@@ -0,0 +1,35 @@
+%%---------------------------------------------------------------------
+%% From: Peer Stritzinger
+%% Date: 1 May 2011
+%% Subject: Dialyzer v2.2.0 crash
+%%
+%% Binaries of the form <<_:N,_:_*M>> in specs resulted in a crash:
+%%     dialyzer: Analysis failed with error: {{case_clause,8},
+%%		 [{erl_types,t_form_to_string,1},
+%%		  {erl_types,t_form_to_string,1},
+%%		  {dialyzer_contracts,contract_to_string_1,1},
+%%		  {dialyzer_contracts,extra_contract_warning,6},
+%%		  {dialyzer_contracts,picky_contract_check,7},
+%% because function erl_types:t_form_to_string/1 was not the inverse
+%% of erl_types:t_to_string/2.
+%%
+%% Fixed on the same date and send to OTP for inclusion.
+%%---------------------------------------------------------------------
+-module(codec_can).
+
+-export([recv/3, decode/1]).
+
+-record(can_pkt, {id, data :: binary(), timestamp}).
+
+-type can_pkt() :: #can_pkt{}.
+-type channel() :: atom() | pid() | {atom(),_}.
+
+-spec recv(<<_:64,_:_*8>>, fun((can_pkt()) -> R), channel()) -> R.
+recv(Packet, Fun, Chan) ->
+  #can_pkt{id = Can_id, data = Can_data} = P = decode(Packet),
+  Fun(P).
+
+-spec decode(<<_:64,_:_*8>>) -> #can_pkt{id::<<_:11>>,timestamp::char()}.
+decode(<<_:12, Len:4, Timestamp:16, 0:3, Id:11/bitstring, 0:18,
+	 Data:Len/binary, _/binary>>) ->
+  #can_pkt{id = Id, data = Data, timestamp = Timestamp}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/common_eunit.erl b/lib/dialyzer/test/small_SUITE_data/src/common_eunit.erl
new file mode 100644
index 0000000000..bca390068e
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/common_eunit.erl
@@ -0,0 +1,121 @@
+%%=====================================================================
+%% Program with an erroneous type declaration that caused dialyzer to
+%% go into an infinite loop. There are some comments that explain the
+%% symptoms and the culprit: the return of test_fun() is erroneous and
+%% its type should read
+%%	fun((config()) -> test_rep() | [test_rep()])
+%% instead. But this should not throw dialyzer into an infinite loop.
+%% This concerned dialyzer in R14B02 (and probably prior).
+%%=====================================================================
+-module(common_eunit).
+
+-export([expand_cases/2]).
+
+-type test_name() :: atom() | {'group', atom()}.
+
+-type test_rep()  :: {{atom(), atom(), arity()}, fun()}
+                   | {'setup', fun(), fun()}
+                   | {'setup', fun(), fun(), fun()}
+                   | {atom(), test_rep()}
+                   | {atom(), term(), test_rep()}.
+
+-type config()    :: [proplists:property()].
+
+-type control()   :: tuple() | atom().
+
+%% The combination of the following type and the (erroneous) spec for
+%% expand_cases/2 is the reason for the infinite loop in dialyzer.
+-type test_fun()  :: fun((config()) -> test_rep()).
+
+%% If one comments out this spec the infinite loop disappears.
+-spec expand_cases(atom(), test_name() | [test_name()]) -> test_fun().
+expand_cases(Module, Cases) ->
+    if is_list(Cases) ->
+            TestFuns = [expand_case(Module, Case) || Case <- Cases],
+            fun(Config) -> [F(Config) || F <- TestFuns] end;
+       is_atom(Cases); is_tuple(Cases) ->
+           expand_cases(Module, [Cases])
+    end.
+
+-spec expand_case(atom(), test_name()) -> test_fun().
+expand_case(Module, CaseName) when is_atom(CaseName) ->
+    TestFun = fun(Config) ->
+		      {{Module, CaseName, 1},
+		       fun() -> apply(Module, CaseName, [Config]) end}
+	      end,
+    setup_wrapper(Module, TestFun, {init_per_testcase, [CaseName]},
+		  {end_per_testcase, [CaseName]});
+expand_case(Module, {group, GroupName}) ->
+    {Control, Cases} = group_specification(Module, GroupName),
+    TestFun = control_wrapper(Control, expand_cases(Module, Cases)),
+    setup_wrapper(Module, TestFun, {init_per_group, [GroupName]},
+		  {end_per_group, [GroupName]}).
+
+-spec control_wrapper([control()], test_fun()) -> test_fun().
+control_wrapper([Control|T], TestFun0) ->
+    TestFun1 = control_wrapper(T, TestFun0),
+    fun(Config) ->
+	    case Control of
+		parallel ->
+		    {inparallel, TestFun1(Config)};
+		sequence ->
+		    {inorder, TestFun1(Config)};
+		{timetrap, Time} ->
+		    Seconds = case Time of
+				  {hours, Hs}   -> Hs * 60 * 60;
+				  {minutes, Ms} -> Ms * 60;
+				  {seconds, Ss} -> Ss;
+				  MSs           -> MSs / 1000
+			      end,
+		    {timeout, Seconds, TestFun1(Config)};
+		C when is_atom(C) ->
+		    {C, TestFun1(Config)};
+		{C, Arg} ->
+		    {C, Arg, TestFun1(Config)}
+	    end
+    end;
+control_wrapper([], TestFun) ->
+    TestFun.
+
+-spec setup_wrapper(atom(), test_fun(), Callback, Callback) -> test_fun()
+        when Callback :: {atom(), list()}.
+setup_wrapper(Module, TestFun, {Setup, SA}, {Cleanup, CA}) ->
+    case erlang:function_exported(Module, Setup, length(SA) + 1) of
+        true ->
+            case erlang:function_exported(Module, Cleanup, length(CA) + 1) of
+                true ->
+                    fun(Config0) ->
+			    {setup,
+			     fun() ->
+				     apply(Module, Setup, SA ++ [Config0])
+			     end,
+			     fun(Config1) ->
+				     apply(Module, Cleanup, CA ++ [Config1])
+			     end,
+			     TestFun}
+                    end;
+                false ->
+                    fun(Config) ->
+			    {setup,
+			     fun() ->
+				     apply(Module, Setup, SA ++ [Config])
+			     end,
+			     TestFun}
+                    end
+            end;
+        false ->
+            TestFun
+    end.
+
+-spec group_specification(atom(), atom()) -> {[control()], [test_name()]}.
+group_specification(Module, GroupName) ->
+    case lists:keyfind(GroupName, 1, Module:groups()) of
+        {_, Control, Cases} when is_list(Control), is_list(Cases) ->
+            {Control, Cases};
+        {_, Cases} when is_list(Cases) ->
+            {[], Cases};
+        false ->
+            exit({missing_group, GroupName});
+        _ ->
+            exit({bad_group_spec, GroupName})
+    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl b/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl
new file mode 100644
index 0000000000..70e3cb6af4
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl
@@ -0,0 +1,322 @@
+-module(comparisons).
+
+-compile(export_all).
+
+-define(r, get(r)).
+
+integer() -> integer(?r).
+integer(X) when is_integer(X) -> X.
+
+mfloat() -> float(?r).
+mfloat(X) when is_float(X) -> X.
+
+atom() -> atom(?r).
+atom(X) when is_atom(X) -> X.
+
+tuple() -> tuple(?r).
+tuple(X) when is_tuple(X) -> X.
+
+list() -> list(?r).
+list(X) when is_list(X) -> X.
+
+i() -> integer().
+f() -> mfloat().
+n() -> case ?r of 1 -> i(); 2 -> f() end.
+a() -> atom().
+t() -> tuple().
+l() -> list().
+na() -> case ?r of 1 -> n(); 2 -> a() end.
+at() -> case ?r of 1 -> t(); 2 -> a() end.
+tl() -> case ?r of 1 -> t(); 2 -> l() end.
+
+test_i_ll_i() -> case i()  < i() of true -> maybe; false -> maybe_too end.
+test_i_le_i() -> case i() =< i() of true -> maybe; false -> maybe_too end.
+test_i_gg_i() -> case i()  > i() of true -> maybe; false -> maybe_too end.
+test_i_ge_i() -> case i() >= i() of true -> maybe; false -> maybe_too end.
+test_i_ll_f() -> case i()  < f() of true -> maybe; false -> maybe_too end.
+test_i_le_f() -> case i() =< f() of true -> maybe; false -> maybe_too end.
+test_i_gg_f() -> case i()  > f() of true -> maybe; false -> maybe_too end.
+test_i_ge_f() -> case i() >= f() of true -> maybe; false -> maybe_too end.
+test_i_ll_n() -> case i()  < n() of true -> maybe; false -> maybe_too end.
+test_i_le_n() -> case i() =< n() of true -> maybe; false -> maybe_too end.
+test_i_gg_n() -> case i()  > n() of true -> maybe; false -> maybe_too end.
+test_i_ge_n() -> case i() >= n() of true -> maybe; false -> maybe_too end.
+test_i_ll_a() -> case i()  < a() of true -> always; false -> never end.
+test_i_le_a() -> case i() =< a() of true -> always; false -> never end.
+test_i_gg_a() -> case i()  > a() of true -> never; false -> always end.
+test_i_ge_a() -> case i() >= a() of true -> never; false -> always end.
+test_i_ll_t() -> case i()  < t() of true -> always; false -> never end.
+test_i_le_t() -> case i() =< t() of true -> always; false -> never end.
+test_i_gg_t() -> case i()  > t() of true -> never; false -> always end.
+test_i_ge_t() -> case i() >= t() of true -> never; false -> always end.
+test_i_ll_l() -> case i()  < l() of true -> always; false -> never end.
+test_i_le_l() -> case i() =< l() of true -> always; false -> never end.
+test_i_gg_l() -> case i()  > l() of true -> never; false -> always end.
+test_i_ge_l() -> case i() >= l() of true -> never; false -> always end.
+
+test_f_ll_i() -> case f()  < i() of true -> maybe; false -> maybe_too end.
+test_f_le_i() -> case f() =< i() of true -> maybe; false -> maybe_too end.
+test_f_gg_i() -> case f()  > i() of true -> maybe; false -> maybe_too end.
+test_f_ge_i() -> case f() >= i() of true -> maybe; false -> maybe_too end.
+test_f_ll_f() -> case f()  < f() of true -> maybe; false -> maybe_too end.
+test_f_le_f() -> case f() =< f() of true -> maybe; false -> maybe_too end.
+test_f_gg_f() -> case f()  > f() of true -> maybe; false -> maybe_too end.
+test_f_ge_f() -> case f() >= f() of true -> maybe; false -> maybe_too end.
+test_f_ll_n() -> case f()  < n() of true -> maybe; false -> maybe_too end.
+test_f_le_n() -> case f() =< n() of true -> maybe; false -> maybe_too end.
+test_f_gg_n() -> case f()  > n() of true -> maybe; false -> maybe_too end.
+test_f_ge_n() -> case f() >= n() of true -> maybe; false -> maybe_too end.
+test_f_ll_a() -> case f()  < a() of true -> always; false -> never end.
+test_f_le_a() -> case f() =< a() of true -> always; false -> never end.
+test_f_gg_a() -> case f()  > a() of true -> never; false -> always end.
+test_f_ge_a() -> case f() >= a() of true -> never; false -> always end.
+test_f_ll_t() -> case f()  < t() of true -> always; false -> never end.
+test_f_le_t() -> case f() =< t() of true -> always; false -> never end.
+test_f_gg_t() -> case f()  > t() of true -> never; false -> always end.
+test_f_ge_t() -> case f() >= t() of true -> never; false -> always end.
+test_f_ll_l() -> case f()  < l() of true -> always; false -> never end.
+test_f_le_l() -> case f() =< l() of true -> always; false -> never end.
+test_f_gg_l() -> case f()  > l() of true -> never; false -> always end.
+test_f_ge_l() -> case f() >= l() of true -> never; false -> always end.
+
+test_n_ll_i() -> case n()  < i() of true -> maybe; false -> maybe_too end.
+test_n_le_i() -> case n() =< i() of true -> maybe; false -> maybe_too end.
+test_n_gg_i() -> case n()  > i() of true -> maybe; false -> maybe_too end.
+test_n_ge_i() -> case n() >= i() of true -> maybe; false -> maybe_too end.
+test_n_ll_f() -> case n()  < f() of true -> maybe; false -> maybe_too end.
+test_n_le_f() -> case n() =< f() of true -> maybe; false -> maybe_too end.
+test_n_gg_f() -> case n()  > f() of true -> maybe; false -> maybe_too end.
+test_n_ge_f() -> case n() >= f() of true -> maybe; false -> maybe_too end.
+test_n_ll_n() -> case n()  < n() of true -> maybe; false -> maybe_too end.
+test_n_le_n() -> case n() =< n() of true -> maybe; false -> maybe_too end.
+test_n_gg_n() -> case n()  > n() of true -> maybe; false -> maybe_too end.
+test_n_ge_n() -> case n() >= n() of true -> maybe; false -> maybe_too end.
+test_n_ll_a() -> case n()  < a() of true -> always; false -> never end.
+test_n_le_a() -> case n() =< a() of true -> always; false -> never end.
+test_n_gg_a() -> case n()  > a() of true -> never; false -> always end.
+test_n_ge_a() -> case n() >= a() of true -> never; false -> always end.
+test_n_ll_t() -> case n()  < t() of true -> always; false -> never end.
+test_n_le_t() -> case n() =< t() of true -> always; false -> never end.
+test_n_gg_t() -> case n()  > t() of true -> never; false -> always end.
+test_n_ge_t() -> case n() >= t() of true -> never; false -> always end.
+test_n_ll_l() -> case n()  < l() of true -> always; false -> never end.
+test_n_le_l() -> case n() =< l() of true -> always; false -> never end.
+test_n_gg_l() -> case n()  > l() of true -> never; false -> always end.
+test_n_ge_l() -> case n() >= l() of true -> never; false -> always end.
+
+test_a_ll_i() -> case a()  < i() of true -> never; false -> always end.
+test_a_le_i() -> case a() =< i() of true -> never; false -> always end.
+test_a_gg_i() -> case a()  > i() of true -> always; false -> never end.
+test_a_ge_i() -> case a() >= i() of true -> always; false -> never end.
+test_a_ll_f() -> case a()  < f() of true -> never; false -> always end.
+test_a_le_f() -> case a() =< f() of true -> never; false -> always end.
+test_a_gg_f() -> case a()  > f() of true -> always; false -> never end.
+test_a_ge_f() -> case a() >= f() of true -> always; false -> never end.
+test_a_ll_n() -> case a()  < n() of true -> never; false -> always end.
+test_a_le_n() -> case a() =< n() of true -> never; false -> always end.
+test_a_gg_n() -> case a()  > n() of true -> always; false -> never end.
+test_a_ge_n() -> case a() >= n() of true -> always; false -> never end.
+test_a_ll_a() -> case a()  < a() of true -> maybe; false -> maybe_too end.
+test_a_le_a() -> case a() =< a() of true -> maybe; false -> maybe_too end.
+test_a_gg_a() -> case a()  > a() of true -> maybe; false -> maybe_too end.
+test_a_ge_a() -> case a() >= a() of true -> maybe; false -> maybe_too end.
+test_a_ll_t() -> case a()  < t() of true -> always; false -> never end.
+test_a_le_t() -> case a() =< t() of true -> always; false -> never end.
+test_a_gg_t() -> case a()  > t() of true -> never; false -> always end.
+test_a_ge_t() -> case a() >= t() of true -> never; false -> always end.
+test_a_ll_l() -> case a()  < l() of true -> always; false -> never end.
+test_a_le_l() -> case a() =< l() of true -> always; false -> never end.
+test_a_gg_l() -> case a()  > l() of true -> never; false -> always end.
+test_a_ge_l() -> case a() >= l() of true -> never; false -> always end.
+
+test_t_ll_i() -> case t()  < i() of true -> never; false -> always end.
+test_t_le_i() -> case t() =< i() of true -> never; false -> always end.
+test_t_gg_i() -> case t()  > i() of true -> always; false -> never end.
+test_t_ge_i() -> case t() >= i() of true -> always; false -> never end.
+test_t_ll_f() -> case t()  < f() of true -> never; false -> always end.
+test_t_le_f() -> case t() =< f() of true -> never; false -> always end.
+test_t_gg_f() -> case t()  > f() of true -> always; false -> never end.
+test_t_ge_f() -> case t() >= f() of true -> always; false -> never end.
+test_t_ll_n() -> case t()  < n() of true -> never; false -> always end.
+test_t_le_n() -> case t() =< n() of true -> never; false -> always end.
+test_t_gg_n() -> case t()  > n() of true -> always; false -> never end.
+test_t_ge_n() -> case t() >= n() of true -> always; false -> never end.
+test_t_ll_a() -> case t()  < a() of true -> never; false -> always end.
+test_t_le_a() -> case t() =< a() of true -> never; false -> always end.
+test_t_gg_a() -> case t()  > a() of true -> always; false -> never end.
+test_t_ge_a() -> case t() >= a() of true -> always; false -> never end.
+test_t_ll_t() -> case t()  < t() of true -> maybe; false -> maybe_too end.
+test_t_le_t() -> case t() =< t() of true -> maybe; false -> maybe_too end.
+test_t_gg_t() -> case t()  > t() of true -> maybe; false -> maybe_too end.
+test_t_ge_t() -> case t() >= t() of true -> maybe; false -> maybe_too end.
+test_t_ll_l() -> case t()  < l() of true -> always; false -> never end.
+test_t_le_l() -> case t() =< l() of true -> always; false -> never end.
+test_t_gg_l() -> case t()  > l() of true -> never; false -> always end.
+test_t_ge_l() -> case t() >= l() of true -> never; false -> always end.
+
+test_l_ll_i() -> case l()  < i() of true -> never; false -> always end.
+test_l_le_i() -> case l() =< i() of true -> never; false -> always end.
+test_l_gg_i() -> case l()  > i() of true -> always; false -> never end.
+test_l_ge_i() -> case l() >= i() of true -> always; false -> never end.
+test_l_ll_f() -> case l()  < f() of true -> never; false -> always end.
+test_l_le_f() -> case l() =< f() of true -> never; false -> always end.
+test_l_gg_f() -> case l()  > f() of true -> always; false -> never end.
+test_l_ge_f() -> case l() >= f() of true -> always; false -> never end.
+test_l_ll_n() -> case l()  < n() of true -> never; false -> always end.
+test_l_le_n() -> case l() =< n() of true -> never; false -> always end.
+test_l_gg_n() -> case l()  > n() of true -> always; false -> never end.
+test_l_ge_n() -> case l() >= n() of true -> always; false -> never end.
+test_l_ll_a() -> case l()  < a() of true -> never; false -> always end.
+test_l_le_a() -> case l() =< a() of true -> never; false -> always end.
+test_l_gg_a() -> case l()  > a() of true -> always; false -> never end.
+test_l_ge_a() -> case l() >= a() of true -> always; false -> never end.
+test_l_ll_t() -> case l()  < t() of true -> never; false -> always end.
+test_l_le_t() -> case l() =< t() of true -> never; false -> always end.
+test_l_gg_t() -> case l()  > t() of true -> always; false -> never end.
+test_l_ge_t() -> case l() >= t() of true -> always; false -> never end.
+test_l_ll_l() -> case l()  < l() of true -> maybe; false -> maybe_too end.
+test_l_le_l() -> case l() =< l() of true -> maybe; false -> maybe_too end.
+test_l_gg_l() -> case l()  > l() of true -> maybe; false -> maybe_too end.
+test_l_ge_l() -> case l() >= l() of true -> maybe; false -> maybe_too end.
+
+test_n_ll_na() -> case n()  < na() of true -> maybe; false -> maybe_too end.
+test_n_le_na() -> case n() =< na() of true -> maybe; false -> maybe_too end.
+test_n_gg_na() -> case n()  > na() of true -> maybe; false -> maybe_too end.
+test_n_ge_na() -> case n() >= na() of true -> maybe; false -> maybe_too end.
+test_n_ll_at() -> case n()  < at() of true -> always; false -> never end.
+test_n_le_at() -> case n() =< at() of true -> always; false -> never end.
+test_n_gg_at() -> case n()  > at() of true -> never; false -> always end.
+test_n_ge_at() -> case n() >= at() of true -> never; false -> always end.
+test_n_ll_tl() -> case n()  < tl() of true -> always; false -> never end.
+test_n_le_tl() -> case n() =< tl() of true -> always; false -> never end.
+test_n_gg_tl() -> case n()  > tl() of true -> never; false -> always end.
+test_n_ge_tl() -> case n() >= tl() of true -> never; false -> always end.
+
+test_a_ll_na() -> case a()  < na() of true -> maybe; false -> maybe_too end.
+test_a_le_na() -> case a() =< na() of true -> maybe; false -> maybe_too end.
+test_a_gg_na() -> case a()  > na() of true -> maybe; false -> maybe_too end.
+test_a_ge_na() -> case a() >= na() of true -> maybe; false -> maybe_too end.
+test_a_ll_at() -> case a()  < at() of true -> maybe; false -> maybe_too end.
+test_a_le_at() -> case a() =< at() of true -> maybe; false -> maybe_too end.
+test_a_gg_at() -> case a()  > at() of true -> maybe; false -> maybe_too end.
+test_a_ge_at() -> case a() >= at() of true -> maybe; false -> maybe_too end.
+test_a_ll_tl() -> case a()  < tl() of true -> always; false -> never end.
+test_a_le_tl() -> case a() =< tl() of true -> always; false -> never end.
+test_a_gg_tl() -> case a()  > tl() of true -> never; false -> always end.
+test_a_ge_tl() -> case a() >= tl() of true -> never; false -> always end.
+
+test_t_ll_na() -> case t()  < na() of true -> never; false -> always end.
+test_t_le_na() -> case t() =< na() of true -> never; false -> always end.
+test_t_gg_na() -> case t()  > na() of true -> always; false -> never end.
+test_t_ge_na() -> case t() >= na() of true -> always; false -> never end.
+test_t_ll_at() -> case t()  < at() of true -> maybe; false -> maybe_too end.
+test_t_le_at() -> case t() =< at() of true -> maybe; false -> maybe_too end.
+test_t_gg_at() -> case t()  > at() of true -> maybe; false -> maybe_too end.
+test_t_ge_at() -> case t() >= at() of true -> maybe; false -> maybe_too end.
+test_t_ll_tl() -> case t()  < tl() of true -> maybe; false -> maybe_too end.
+test_t_le_tl() -> case t() =< tl() of true -> maybe; false -> maybe_too end.
+test_t_gg_tl() -> case t()  > tl() of true -> maybe; false -> maybe_too end.
+test_t_ge_tl() -> case t() >= tl() of true -> maybe; false -> maybe_too end.
+
+test_l_ll_na() -> case l()  < na() of true -> never; false -> always end.
+test_l_le_na() -> case l() =< na() of true -> never; false -> always end.
+test_l_gg_na() -> case l()  > na() of true -> always; false -> never end.
+test_l_ge_na() -> case l() >= na() of true -> always; false -> never end.
+test_l_ll_at() -> case l()  < at() of true -> never; false -> always end.
+test_l_le_at() -> case l() =< at() of true -> never; false -> always end.
+test_l_gg_at() -> case l()  > at() of true -> always; false -> never end.
+test_l_ge_at() -> case l() >= at() of true -> always; false -> never end.
+test_l_ll_tl() -> case l()  < tl() of true -> maybe; false -> maybe_too end.
+test_l_le_tl() -> case l() =< tl() of true -> maybe; false -> maybe_too end.
+test_l_gg_tl() -> case l()  > tl() of true -> maybe; false -> maybe_too end.
+test_l_ge_tl() -> case l() >= tl() of true -> maybe; false -> maybe_too end.
+
+test_na_ll_n() -> case na()  < n() of true -> maybe; false -> maybe_too end.
+test_na_le_n() -> case na() =< n() of true -> maybe; false -> maybe_too end.
+test_na_gg_n() -> case na()  > n() of true -> maybe; false -> maybe_too end.
+test_na_ge_n() -> case na() >= n() of true -> maybe; false -> maybe_too end.
+test_na_ll_a() -> case na()  < a() of true -> maybe; false -> maybe_too end.
+test_na_le_a() -> case na() =< a() of true -> maybe; false -> maybe_too end.
+test_na_gg_a() -> case na()  > a() of true -> maybe; false -> maybe_too end.
+test_na_ge_a() -> case na() >= a() of true -> maybe; false -> maybe_too end.
+test_na_ll_t() -> case na()  < t() of true -> always; false -> never end.
+test_na_le_t() -> case na() =< t() of true -> always; false -> never end.
+test_na_gg_t() -> case na()  > t() of true -> never; false -> always end.
+test_na_ge_t() -> case na() >= t() of true -> never; false -> always end.
+test_na_ll_l() -> case na()  < l() of true -> always; false -> never end.
+test_na_le_l() -> case na() =< l() of true -> always; false -> never end.
+test_na_gg_l() -> case na()  > l() of true -> never; false -> always end.
+test_na_ge_l() -> case na() >= l() of true -> never; false -> always end.
+
+test_at_ll_n() -> case at()  < n() of true -> never; false -> always end.
+test_at_le_n() -> case at() =< n() of true -> never; false -> always end.
+test_at_gg_n() -> case at()  > n() of true -> always; false -> never end.
+test_at_ge_n() -> case at() >= n() of true -> always; false -> never end.
+test_at_ll_a() -> case at()  < a() of true -> maybe; false -> maybe_too end.
+test_at_le_a() -> case at() =< a() of true -> maybe; false -> maybe_too end.
+test_at_gg_a() -> case at()  > a() of true -> maybe; false -> maybe_too end.
+test_at_ge_a() -> case at() >= a() of true -> maybe; false -> maybe_too end.
+test_at_ll_t() -> case at()  < t() of true -> maybe; false -> maybe_too end.
+test_at_le_t() -> case at() =< t() of true -> maybe; false -> maybe_too end.
+test_at_gg_t() -> case at()  > t() of true -> maybe; false -> maybe_too end.
+test_at_ge_t() -> case at() >= t() of true -> maybe; false -> maybe_too end.
+test_at_ll_l() -> case at()  < l() of true -> always; false -> never end.
+test_at_le_l() -> case at() =< l() of true -> always; false -> never end.
+test_at_gg_l() -> case at()  > l() of true -> never; false -> always end.
+test_at_ge_l() -> case at() >= l() of true -> never; false -> always end.
+
+test_tl_ll_n() -> case tl()  < n() of true -> never; false -> always end.
+test_tl_le_n() -> case tl() =< n() of true -> never; false -> always end.
+test_tl_gg_n() -> case tl()  > n() of true -> always; false -> never end.
+test_tl_ge_n() -> case tl() >= n() of true -> always; false -> never end.
+test_tl_ll_a() -> case tl()  < a() of true -> never; false -> always end.
+test_tl_le_a() -> case tl() =< a() of true -> never; false -> always end.
+test_tl_gg_a() -> case tl()  > a() of true -> always; false -> never end.
+test_tl_ge_a() -> case tl() >= a() of true -> always; false -> never end.
+test_tl_ll_t() -> case tl()  < t() of true -> maybe; false -> maybe_too end.
+test_tl_le_t() -> case tl() =< t() of true -> maybe; false -> maybe_too end.
+test_tl_gg_t() -> case tl()  > t() of true -> maybe; false -> maybe_too end.
+test_tl_ge_t() -> case tl() >= t() of true -> maybe; false -> maybe_too end.
+test_tl_ll_l() -> case tl()  < l() of true -> maybe; false -> maybe_too end.
+test_tl_le_l() -> case tl() =< l() of true -> maybe; false -> maybe_too end.
+test_tl_gg_l() -> case tl()  > l() of true -> maybe; false -> maybe_too end.
+test_tl_ge_l() -> case tl() >= l() of true -> maybe; false -> maybe_too end.
+
+test_na_ll_na() -> case na()  < na() of true -> maybe; false -> maybe_too end.
+test_na_le_na() -> case na() =< na() of true -> maybe; false -> maybe_too end.
+test_na_gg_na() -> case na()  > na() of true -> maybe; false -> maybe_too end.
+test_na_ge_na() -> case na() >= na() of true -> maybe; false -> maybe_too end.
+test_na_ll_at() -> case na()  < at() of true -> maybe; false -> maybe_too end.
+test_na_le_at() -> case na() =< at() of true -> maybe; false -> maybe_too end.
+test_na_gg_at() -> case na()  > at() of true -> maybe; false -> maybe_too end.
+test_na_ge_at() -> case na() >= at() of true -> maybe; false -> maybe_too end.
+test_na_ll_tl() -> case na()  < tl() of true -> always; false -> never end.
+test_na_le_tl() -> case na() =< tl() of true -> always; false -> never end.
+test_na_gg_tl() -> case na()  > tl() of true -> never; false -> always end.
+test_na_ge_tl() -> case na() >= tl() of true -> never; false -> always end.
+
+test_at_ll_na() -> case at()  < na() of true -> maybe; false -> maybe_too end.
+test_at_le_na() -> case at() =< na() of true -> maybe; false -> maybe_too end.
+test_at_gg_na() -> case at()  > na() of true -> maybe; false -> maybe_too end.
+test_at_ge_na() -> case at() >= na() of true -> maybe; false -> maybe_too end.
+test_at_ll_at() -> case at()  < at() of true -> maybe; false -> maybe_too end.
+test_at_le_at() -> case at() =< at() of true -> maybe; false -> maybe_too end.
+test_at_gg_at() -> case at()  > at() of true -> maybe; false -> maybe_too end.
+test_at_ge_at() -> case at() >= at() of true -> maybe; false -> maybe_too end.
+test_at_ll_tl() -> case at()  < tl() of true -> maybe; false -> maybe_too end.
+test_at_le_tl() -> case at() =< tl() of true -> maybe; false -> maybe_too end.
+test_at_gg_tl() -> case at()  > tl() of true -> maybe; false -> maybe_too end.
+test_at_ge_tl() -> case at() >= tl() of true -> maybe; false -> maybe_too end.
+
+test_tl_ll_na() -> case tl()  < na() of true -> never; false -> always end.
+test_tl_le_na() -> case tl() =< na() of true -> never; false -> always end.
+test_tl_gg_na() -> case tl()  > na() of true -> always; false -> never end.
+test_tl_ge_na() -> case tl() >= na() of true -> always; false -> never end.
+test_tl_ll_at() -> case tl()  < at() of true -> maybe; false -> maybe_too end.
+test_tl_le_at() -> case tl() =< at() of true -> maybe; false -> maybe_too end.
+test_tl_gg_at() -> case tl()  > at() of true -> maybe; false -> maybe_too end.
+test_tl_ge_at() -> case tl() >= at() of true -> maybe; false -> maybe_too end.
+test_tl_ll_tl() -> case tl()  < tl() of true -> maybe; false -> maybe_too end.
+test_tl_le_tl() -> case tl() =< tl() of true -> maybe; false -> maybe_too end.
+test_tl_gg_tl() -> case tl()  > tl() of true -> maybe; false -> maybe_too end.
+test_tl_ge_tl() -> case tl() >= tl() of true -> maybe; false -> maybe_too end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/failing_funs.erl b/lib/dialyzer/test/small_SUITE_data/src/failing_funs.erl
new file mode 100644
index 0000000000..1784c4a494
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/failing_funs.erl
@@ -0,0 +1,250 @@
+-module(failing_funs).
+
+-compile(export_all).
+
+% Crashes with system call. No spec.
+foo1() -> halt().
+
+% Crashes with system call. With spec.
+-spec foo2() -> no_return().
+foo2() -> halt().
+
+% Crashes on its own. No spec.
+foo3() -> case a of b -> ok end.
+
+% Crashes on its own. With spec.
+-spec foo4() -> no_return().
+foo4() -> case a of b -> ok end.
+
+% Creates fun that crashes with system call. No spec.
+foo5() -> fun() -> halt() end.
+
+% Creates fun that crashes with system call. With spec.
+-spec foo6() -> fun(() -> no_return()).
+foo6() -> fun() -> halt() end.
+
+% Creates fun from named fun that will crash. Neither have spec.
+foo7() -> fun foo1/0.
+
+% Creates fun from named fun that will crash. Has spec.
+-spec foo8() -> fun(() -> no_return()).
+foo8() -> fun foo1/0.
+
+% Creates fun from named fun that will crash. Named has spec.
+foo9() -> fun foo2/0.
+
+% Creates fun from named fun that will crash. Both have specs.
+-spec foo10() -> fun(() -> no_return()).
+foo10() -> fun foo2/0.
+
+% Creates fun from named fun that will crash. Neither have spec.
+foo11() -> fun foo3/0.
+
+% Creates fun from named fun that will crash. Has spec.
+-spec foo12() -> fun(() -> no_return()).
+foo12() -> fun foo3/0.
+
+% Creates fun from named fun that will crash. Named has spec.
+foo13() -> fun foo4/0.
+
+% Creates fun from named fun that will crash. Both have specs.
+-spec foo14() -> fun(() -> no_return()).
+foo14() -> fun foo4/0.
+
+% Creates fun calling a named fun that will crash. Neither have spec.
+foo15() -> fun() -> foo1() end.
+
+% Creates fun calling a named fun that will crash. Has spec.
+-spec foo16() -> fun(() -> no_return()).
+foo16() -> fun() -> foo1() end.
+
+% Creates fun calling a named fun that will crash. Named has spec.
+foo17() -> fun() -> foo2() end.
+
+% Creates fun calling a named fun that will crash. Both have specs.
+-spec foo18() -> fun(() -> no_return()).
+foo18() -> fun() -> foo2() end.
+
+% Creates fun calling a named fun that will crash. Neither have spec.
+foo19() -> fun() -> foo3() end.
+
+% Creates fun calling a named fun that will crash. Has spec.
+-spec foo20() -> fun(() -> no_return()).
+foo20() -> fun() -> foo3() end.
+
+% Creates fun calling a named fun that will crash. Named has spec.
+foo21() -> fun() -> foo4() end.
+
+% Creates fun calling a named fun that will crash. Both have specs.
+-spec foo22() -> fun(() -> no_return()).
+foo22() -> fun() -> foo4() end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo23() ->
+    Bomb = fun() -> halt() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> halt() end
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo24() -> fun(() -> no_return()).
+foo24() ->
+    Bomb = fun() -> halt() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> halt() end
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo25() ->
+    Bomb = fun() -> foo1() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo1() end
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo26() -> fun(() -> no_return()).
+foo26() ->
+    Bomb = fun foo1/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo1/0
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo27() ->
+    Bomb = fun foo1/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo1/0
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo28() -> fun(() -> no_return()).
+foo28() ->
+    Bomb = fun() -> foo1() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo1() end
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo29() ->
+    Bomb = fun() -> foo2() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo2() end
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo30() -> fun(() -> no_return()).
+foo30() ->
+    Bomb = fun foo2/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo2/0
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo31() ->
+    Bomb = fun foo2/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo2/0
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo32() -> fun(() -> no_return()).
+foo32() ->
+    Bomb = fun() -> foo2() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo2() end
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo33() ->
+    Bomb = fun() -> foo3() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo3() end
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo34() -> fun(() -> no_return()).
+foo34() ->
+    Bomb = fun foo3/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo3/0
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo35() ->
+    Bomb = fun foo3/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo3/0
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo36() -> fun(() -> no_return()).
+foo36() ->
+    Bomb = fun() -> foo3() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo3() end
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo37() ->
+    Bomb = fun() -> foo4() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo4() end
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo38() -> fun(() -> no_return()).
+foo38() ->
+    Bomb = fun foo4/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo4/0
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo39() ->
+    Bomb = fun foo4/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo4/0
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo40() -> fun(() -> no_return()).
+foo40() ->
+    Bomb = fun() -> foo4() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo4() end
+    end.
+
+% Obtains two funs with no local return and will return one or die. No spec.
+foo41() ->
+    Bomb = foo5(),
+    case get(42) of
+	a -> Bomb();
+	b -> foo5()
+    end.
+
+% Obtains two funs with no local return and will return one or die. With spec.
+-spec foo42() -> fun(() -> no_return()).
+foo42() ->
+    Bomb = foo5(),
+    case get(42) of
+	a -> Bomb();
+	b -> foo5()
+    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/file_open_encoding.erl b/lib/dialyzer/test/small_SUITE_data/src/file_open_encoding.erl
index 4f1268eba8..086df3464b 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/file_open_encoding.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/file_open_encoding.erl
@@ -6,9 +6,7 @@
 
 -export([parse/1]).
 
--type proplist() :: [{atom(), any()}].
-
--spec parse(string()) -> proplist().
+-spec parse(string()) -> proplists:proplist().
 parse(FileName) ->
   {ok, IoDevice} = file:open(FileName, [read, binary, {encoding, utf8}]),
   do_parse(IoDevice, []).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl b/lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl
new file mode 100644
index 0000000000..109aa88f16
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl
@@ -0,0 +1,21 @@
+%%=====================================================================
+%% From: Ken Robinson
+%% Date: 28/04/2011, 17:26
+%%
+%% Program that produced bogus "Function has no local return" warnings
+%% due to erlang:list_to_bitstring/1 having erroneous hard coded type
+%% information, namely accepting iolist() instead of bitstrlist().
+%% Fixed 29/04/2011.
+%%=====================================================================
+
+-module(list_to_bitstring).
+
+-export([l2bs/0, l2bs_ok/0]).
+
+%% This function was producing a warning
+l2bs() ->
+    erlang:list_to_bitstring([<<42>>, <<42:13>>]).
+
+%% while this one was ok.
+l2bs_ok() ->
+    erlang:list_to_bitstring([<<42>>, <<42,42>>]).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/no_return_bug.erl b/lib/dialyzer/test/small_SUITE_data/src/no_return_bug.erl
new file mode 100644
index 0000000000..5c24902590
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/no_return_bug.erl
@@ -0,0 +1,42 @@
+%% Dialyzer couldn't infer that monitor_diskspace would go in an infinite loop
+%% instead of crashing due to the existence of list comprehensions that have a
+%% normal success typing. These were added to the monitor_diskspace's SCC and
+%% dialyzer_typesig didn't try to assign unit() to monitor_diskspace, as it
+%% required all the members of the SCC to return none().
+%%
+%% Testcase was submitted in erlang-questions mailing list by Prashanth Mundkur
+%% (http://erlang.org/pipermail/erlang-questions/2011-May/058063.html)
+
+-module(no_return_bug).
+-export([diskspace/1, monitor_diskspace/2, refresh_tags/1, monitor_launch/0]).
+
+-type diskinfo() :: {non_neg_integer(), non_neg_integer()}.
+
+-spec diskspace(nonempty_string()) -> {'ok', diskinfo()} | {'error', term()}.
+diskspace(Path) ->
+    case Path of
+        "a" -> {ok, {0,0}};
+        _ -> {error, error}
+    end.
+
+-spec monitor_diskspace(nonempty_string(),
+                        [{diskinfo(), nonempty_string()}]) ->
+                               no_return().
+monitor_diskspace(Root, Vols) ->
+    Df = fun(VolName) ->
+                 diskspace(filename:join([Root, VolName]))
+         end,
+    NewVols = [{Space, VolName}
+               || {VolName, {ok, Space}}
+                      <- [{VolName, Df(VolName)}
+                          || {_OldSpace, VolName} <- Vols]],
+    monitor_diskspace(Root, NewVols).
+
+-spec refresh_tags(nonempty_string()) -> no_return().
+refresh_tags(Root) ->
+    {ok, _} = diskspace(Root),
+    refresh_tags(Root).
+
+monitor_launch() ->
+    spawn_link(fun() -> refresh_tags("abc") end),
+    spawn_link(fun() -> monitor_diskspace("root", [{{0,0}, "a"}]) end).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/nowarnunused.erl b/lib/dialyzer/test/small_SUITE_data/src/nowarnunused.erl
new file mode 100644
index 0000000000..63daeee9e3
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/nowarnunused.erl
@@ -0,0 +1,7 @@
+-module(nowarnunused).
+
+-compile({nowarn_unused_function, return_error/2}).
+
+-spec return_error(integer(), any()) -> no_return().
+return_error(Line, Message) ->
+    throw({error, {Line, ?MODULE, Message}}).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/rebar_no_return.erl b/lib/dialyzer/test/small_SUITE_data/src/rebar_no_return.erl
new file mode 100644
index 0000000000..d3b504ae04
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/rebar_no_return.erl
@@ -0,0 +1,19 @@
+-module(rebar_no_return).
+
+-export([t/0]).
+
+-spec t() -> no_return().
+t() ->
+  F = log_and_halt("baz"),
+  F("foo", 123).
+
+-spec log_and_halt(string()) -> fun((string(),integer()) -> no_return()).
+log_and_halt(Msg) ->
+  fun(_, _) ->
+      abort(Msg)
+  end.
+
+-spec abort(string()) -> no_return().
+abort(Msg) ->
+  io:format("~s~n", [Msg]),
+  halt(1).
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index 10de07dfbb..a7e82b54ce 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 2.4.3
+DIALYZER_VSN = 2.4.4
diff --git a/lib/diameter/bin/diameterc b/lib/diameter/bin/diameterc
index f5cf3ebc10..c0e83ea1a4 100755
--- a/lib/diameter/bin/diameterc
+++ b/lib/diameter/bin/diameterc
@@ -33,19 +33,24 @@
 
 usage() ->
     io:format(
-      "~w [options] file~n"
+      "~w [options] dict~n"
       "~n"
       "  Compile a diameter dictionary file (.dia) to Erlang source (.erl)~n"
       "  and/or header (.hrl) files.~n"
       "~n"
       "  options:~n"
-      "      -h      = print this message~n"
-      "      -v      = verbose output~n"
-      "      -o dir  = set the output directory (default .)~n"
-      "      -i dir  = set an include directory for inherited beams~n"
-      "      -E      = no .erl output~n"
-      "      -H      = no .hrl output~n"
-      "      -d      = write intermediate files (.spec and .forms)~n",
+      "~n"
+      "      --name name       = set @name~n"
+      "      --prefix prefix   = set @prefix~n"
+      "      --inherits dict|- = set/clear @inherits~n"
+      "~n"
+      "      -h        = print this message~n"
+      "      -v        = verbose output~n"
+      "      -o dir    = set the output directory (default .)~n"
+      "      -i dir    = set an include directory for inherited beams~n"
+      "      -E        = no .erl output~n"
+      "      -H        = no .hrl output~n"
+      "      -d        = write intermediate files (.spec and .forms)~n",
       [?MODULE]).
 
 main(Args) ->
@@ -109,9 +114,17 @@ arg(["-o", Dir | Args], #argv{options = Opts} = A) ->
     arg(Args, A#argv{options = [{outdir, Dir} | Opts]});
 
 arg(["-i", Dir | Args], #argv{options = Opts} = A) ->
-    true = dir_exists(Dir),
     arg(Args, A#argv{options = Opts ++ [{include, Dir}]});
 
+arg(["--name", Name | Args], #argv{options = Opts} = A) ->
+    arg(Args, A#argv{options = [{name, Name} | Opts]});
+    
+arg(["--prefix", Name | Args], #argv{options = Opts} = A) ->
+    arg(Args, A#argv{options = [{prefix, Name} | Opts]});
+    
+arg(["--inherits", Dict | Args], #argv{options = Opts} = A) ->
+    arg(Args, A#argv{options = Opts ++ [{inherits, Dict}]});
+
 arg(["-E" | Args], #argv{output = Output} = A) ->
     arg(Args, A#argv{output = lists:delete(erl, Output)});
 
@@ -120,10 +133,10 @@ arg(["-H" | Args], #argv{output = Output} = A) ->
 
 arg(["-d" | Args], #argv{options = Opts, output = Output} = A) ->
     arg(Args, A#argv{options = [debug | Opts],
-                            output = [spec | Output]});
+                     output = [spec | Output]});
 
 arg([[$- = M, C, H | T] | Args], A)  %% clustered options
-  when C /= $i, C /= $o ->
+  when C /= $i, C /= $o, C /= $- ->
     arg([[M,C], [M,H|T] | Args], A);
 
 arg([File], A) ->
diff --git a/lib/diameter/configure.in b/lib/diameter/configure.in
index 9aca3859c5..8acfb28fed 100644
--- a/lib/diameter/configure.in
+++ b/lib/diameter/configure.in
@@ -132,7 +132,6 @@ dnl </STANDALONE DIAMETER>
 
 AC_OUTPUT(
 	Makefile:Makefile.in
-	src/app/diameter.mk:src/app/diameter.mk.in
 	make/$host/rules.mk:make/rules.mk.in
 	)
 
diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile
index 1453138cb6..bc3e649e6b 100644
--- a/lib/diameter/doc/src/Makefile
+++ b/lib/diameter/doc/src/Makefile
@@ -126,8 +126,6 @@ debug opt:
 info:
 	@echo "->Makefile<-"
 	@echo ""
-	@echo "DOCSUPPORT = $(DOCSUPPORT)"
-	@echo ""
 	@echo "INDEX_FILE   = $(INDEX_FILE)"
 	@echo "INDEX_SRC    = $(INDEX_SRC)"
 	@echo "INDEX_TARGET = $(INDEX_TARGET)"
@@ -141,10 +139,6 @@ info:
 	@echo ""
 	@echo "GIF_FILES             = $(GIF_FILES)"
 	@echo ""
-	@echo "TEX_FILES_USERS_GUIDE = $(TEX_FILES_USERS_GUIDE)"
-	@echo "TEX_FILES_REF_MAN     = $(TEX_FILES_REF_MAN)"
-	@echo "TEX_FILES_BOOK        = $(TEX_FILES_BOOK)"
-	@echo ""
 	@echo "MAN1_FILES            = $(MAN1_FILES)"
 	@echo "MAN3_FILES            = $(MAN3_FILES)"
 	@echo "MAN4_FILES            = $(MAN4_FILES)"
diff --git a/lib/diameter/doc/src/depend.sed b/lib/diameter/doc/src/depend.sed
index 5973c4586e..42de597f15 100644
--- a/lib/diameter/doc/src/depend.sed
+++ b/lib/diameter/doc/src/depend.sed
@@ -21,14 +21,18 @@
 # massaged in Makefile.
 #
 
-/^<com>\([^<]*\)<\/com>/b rf
-/^<module>\([^<]*\)<\/module>/b rf
+/^<com>/b c
+/^<module>/b c
 
 /^<chapter>/!d
 
+# Chapter: html basename is same as xml.
 s@@$(HTMLDIR)/%FILE%.html: %FILE%.xml@
 q
 
-:rf
-s@@$(HTMLDIR)/\1.html: %FILE%.xml@
+# Reference: html basename is from contents of com/module element.
+:c
+s@^[^>]*>@@
+s@<.*@@
+s@.*@$(HTMLDIR)/&.html: %FILE%.xml@
 q
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 36b6cbf0cf..43c497f50a 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -277,6 +277,10 @@ callback.</p>
 
 </taglist>
 
+<p>
+An invalid option will cause <seealso marker="#call">call/4</seealso>
+to fail.</p>
+
 <marker id="capability"/>
 </item>
 
@@ -363,6 +367,19 @@ capabilities exchange message.
 Optional, defaults to the empty list.</p>
 </item>
 
+<tag><c>{'Inband-Security-Id', [Unsigned32()]}</c></tag>
+<item>
+<p>
+Values of Inband-Security-Id AVPs sent in an outgoing
+capabilities exchange message.
+Optional, defaults to the empty list, which is equivalent to a
+list containing only 0 (= NO_INBAND_SECURITY).</p>
+
+<p>
+If 1 (= TLS) is specified then TLS is selected if the CER/CEA received
+from the peer offers it.</p>
+</item>
+
 <tag><c>{'Acct-Application-Id', [Unsigned32()]}</c></tag>
 <item>
 <p>
@@ -405,6 +422,8 @@ sense.</p>
 <code>
 eval([{M,F,A} | T]) ->
     apply(M, F, T ++ A);
+eval([[F|A] | T]) ->
+    eval([F | T ++ A]);
 eval([F|A]) ->
     apply(F, A);
 eval(F) ->
@@ -461,14 +480,14 @@ or any peer if the request does not contain
 a <c>Destination-Realm</c> AVP.</p>
 </item>
 
-<tag><c>{host, any|UTF8String()}</c></tag>
+<tag><c>{host, any|DiameterIdentity()}</c></tag>
 <item>
 <p>
 Matches only those peers whose <c>Origin-Host</c> has the
 specified value, or all peers if the atom <c>any</c>.</p>
 </item>
 
-<tag><c>{realm, any|UTF8String()</c></tag>
+<tag><c>{realm, any|DiameterIdentity()</c></tag>
 <item>
 <p>
 Matches only those peers whose <c>Origin-Realm</c> has the
@@ -478,8 +497,9 @@ value, or all peers if the atom <c>any</c>.</p>
 <tag><c>{eval, evaluable()}</c></tag>
 <item>
 <p>
-Matches only those peers for which the specified evaluable() evaluates
-to true on the peer's <c>diameter_caps</c> record.</p>
+Matches only those peers for which the specified evaluable() returns
+<c>true</c> on the connection's <c>diameter_caps</c> record.
+Any other return value or exception is equivalent to <c>false</c>.</p>
 </item>
 
 <tag><c>{neg, peer_filter()}</c></tag>
@@ -503,6 +523,21 @@ specified list.</p>
 
 </taglist>
 
+<p>
+Note that the <c>host</c> and <c>realm</c> filters examine the
+outgoing request as passed to <seealso marker="#call">call/4</seealso>,
+assuming that this is a record- or list-valued message() as documented
+in <seealso marker="diameter_app">diameter_app(3)</seealso>, and that
+the message contains at most one of each AVP.
+If this is not the case then the <c>{host|realm, DiameterIdentity()}</c>
+filters must be used to achieve the desired result.
+Note also that an empty host/realm (which should not be typical)
+is equivalent to an unspecified one for the purposes of filtering.</p>
+
+<p>
+An invalid filter is equivalent to <c>{any, []}</c>, a filter
+that matches no peer.</p>
+
 <marker id="service_event"/>
 </item>
 
@@ -661,6 +696,14 @@ in question.</p>
 AVP's used to construct outgoing CER/CEA messages.
 Any AVP specified takes precedence over a corresponding value specified
 for the service in question.</p>
+
+<p>
+Specifying a capability as a transport option
+may be particularly appropriate for Inband-Security-Id in case
+TLS is desired over TCP as implemented by
+<seealso marker="diameter_tcp">diameter_tcp(3)</seealso> but
+not over SCTP as implemented by
+<seealso marker="diameter_sctp">diameter_sctp(3)</seealso>.</p>
 </item>
 
 <tag><c>{watchdog_timer, TwInit}</c></tag>
@@ -787,7 +830,7 @@ transports.</p>
 <type>
 <v>SvcName = service_name()</v>
 <v>App = application_alias()</v>
-<v>Request = diameter_app:message()</v>
+<v>Request = diameter_app:message() | term()</v>
 <v>Answer = term()</v>
 <v>Options = [call_opt()]</v>
 </type>
@@ -819,9 +862,8 @@ If there are no suitable peers, or if
 <seealso marker="diameter_app#pick_peer">pick_peer/4</seealso>
 rejects them by returning 'false', then <c>{error, no_connection}</c>
 is returned.
-If <seealso marker="diameter_app#pick_peer">pick_peer/4</seealso>
-selects a candidate peer then a request process is spawned for the
-outgoing request, in which there is a
+Otherwise <seealso marker="diameter_app#pick_peer">pick_peer/4</seealso>
+is followed by a
 <seealso
 marker="diameter_app#prepare_request">prepare_request/3</seealso>
 callback, the message is encoded and sent.</p>
diff --git a/lib/diameter/doc/src/diameter_app.xml b/lib/diameter/doc/src/diameter_app.xml
index fc359b9d1d..a9ae0ebbec 100644
--- a/lib/diameter/doc/src/diameter_app.xml
+++ b/lib/diameter/doc/src/diameter_app.xml
@@ -269,7 +269,12 @@ The candidate peers list will only include those
 which are selected by any <c>filter</c> option specified in the call to
 <seealso marker="diameter#call">diameter:call/4</seealso>, and only
 those which have indicated support for the Diameter application in
-question.</p>
+question.
+The order of the elements is unspecified except that any
+peers whose Origin-Host and Origin-Realm matches that of the
+outgoing request (in the sense of a <c>{filter, {all, [host, realm]}}</c>
+option to <seealso marker="diameter#call">diameter:call/4</seealso>)
+will be placed at the head of the list.</p>
 
 <p>
 The return values <c>false</c> and <c>{false, State}</c> are
@@ -467,11 +472,11 @@ callback returned false.</p>
 <v>Packet  = packet()</v>
 <v>SvcName = term()</v>
 <v>Peer    = peer()</v>
-<v>Action  = Reply | {relay, Opts} | discard | {eval, Action, ContF}</v>
+<v>Action  = Reply | {relay, Opts} | discard | {eval, Action, PostF}</v>
 <v>Reply   = {reply, message()}
            | {protocol_error, 3000..3999}</v>
 <v>Opts    = diameter:call_opts()</v>
-<v>ContF   = diameter:evaluable()</v>
+<v>PostF   = diameter:evaluable()</v>
 </type>
 <desc>
 <p>
@@ -559,26 +564,28 @@ will cause the request process in question to fail.</p>
 <tag><c>{relay, Opts}</c></tag>
 <item>
 <p>
-Relay a request to another peer.
-The appropriate Route-Record AVP will be added to the relayed request
-by diameter and <seealso marker="#pick_peer">pick_peer/4</seealso>
-and <seealso marker="#prepare_request">prepare_request/3</seealso>
-callback will take place just as if <seealso
+Relay a request to another peer in the role of a Diameter relay agent.
+If a routing loop is detected then the request is answered with
+3005 (DIAMETER_LOOP_DETECTED).
+Otherwise a Route-Record AVP (containing the sending peer's Origin-Host) is
+added to the request and <seealso marker="#pick_peer">pick_peer/4</seealso>
+and subsequent callbacks take place just as if <seealso
 marker="diameter#call">diameter:call/4</seealso> had been called
 explicitly.
-However, returning a <c>relay</c> tuple also causes the End-to-End
-Identifier to be preserved in the header of the relayed request as
-required by RFC 3588.</p>
+The End-to-End Identifier of the incoming request is preserved in the
+header of the relayed request.</p>
 
 <p>
-The returned <c>Opts</c> should not specify <c>detach</c> and
-the <seealso marker="#handle_answer">handle_answer/4</seealso>
-callback following from a relayed request must return its first
+The returned <c>Opts</c> should not specify <c>detach</c>.
+A subsequent <seealso marker="#handle_answer">handle_answer/4</seealso>
+callback for the relayed request must return its first
 argument, the <c>diameter_packet</c> record containing the answer
 message.
 Note that the <c>extra</c> option can be specified to supply arguments
-that can distinguish the relay case from others if so desired,
-although the form of the request message may be sufficient.</p>
+that can distinguish the relay case from others if so desired.
+Any other return value (for example, from a
+<seealso marker="#handle_error">handle_error/4</seealso> callback)
+causes the request to be answered with 3002 (DIAMETER_UNABLE_TO_DELIVER).</p>
 </item>
 
 <tag><c>discard</c></tag>
@@ -587,18 +594,18 @@ although the form of the request message may be sufficient.</p>
 Discard the request.</p>
 </item>
 
-<tag><c>{eval, Action, ContF}</c></tag>
+<tag><c>{eval, Action, PostF}</c></tag>
 <item>
 <p>
 Handle the request as if <c>Action</c> has been returned and then
-evaluate <c>ContF</c> in the request process.</p>
+evaluate <c>PostF</c> in the request process.</p>
 </item>
 
 </taglist>
 
 <p>
-Note that diameter will respond to protocol errors in an incoming
-request without invoking <c>handle_request/3</c>.</p>
+Note that protocol errors detected by diameter will result in an
+answer message without <c>handle_request/3</c> being invoked.</p>
 
 </desc>
 </func>
diff --git a/lib/diameter/doc/src/diameter_compile.xml b/lib/diameter/doc/src/diameter_compile.xml
index 72bac30709..60e08d41da 100644
--- a/lib/diameter/doc/src/diameter_compile.xml
+++ b/lib/diameter/doc/src/diameter_compile.xml
@@ -64,9 +64,10 @@ Defaults to the current working directory.</p>
 <item>
 <p>
 Specifies a directory to add to the code path.
-Typically used to point at beam files corresponding to dictionaries
-included by the one being compiled (using the <c>@includes</c> directive):
-inclusion is a beam dependency, not an erl/hrl dependency.</p>
+Use to point at beam files corresponding to dictionaries
+inherited by the one being compiled using <c>@inherits</c> or
+<c>--inherits</c>.
+Inheritance is a beam dependency, not an erl/hrl dependency.</p>
 
 <p>
 Multiple <c>-i</c> options can be specified.</p>
@@ -84,6 +85,31 @@ Supresses erl generation.</p>
 Supresses hrl generation.</p>
 </item>
 
+<tag><![CDATA[--name <name>]]></tag>
+<item>
+<p>
+Set <c>@name</c> in the dictionary file.
+Overrides any setting in the file itself.</p>
+</item>
+
+<tag><![CDATA[--prefix <prefix>]]></tag>
+<item>
+<p>
+Set <c>@prefix</c> in the dictionary file.
+Overrides any setting in the file itself.</p>
+</item>
+
+<tag><![CDATA[--inherits <dict>]]></tag>
+<item>
+<p>
+Append an <c>@inherits</c> to the dictionary file.
+Specifying <c>'-'</c> as the dictionary has the effect of clearing
+any previous inherits, effectively ignoring previous inherits.</p>
+
+<p>
+Multiple <c>--inherits</c> options can be specified.</p>
+</item>
+
 </taglist>
 
 </item>
diff --git a/lib/diameter/doc/src/diameter_dict.xml b/lib/diameter/doc/src/diameter_dict.xml
index a87f59bad5..e7c530f1b8 100644
--- a/lib/diameter/doc/src/diameter_dict.xml
+++ b/lib/diameter/doc/src/diameter_dict.xml
@@ -105,7 +105,7 @@ quantity is insignificant.</p>
 <p>
 The tags, their arguments and the contents of each corresponding
 section are as follows.
-Each section can occur only once unless otherwise specified.
+Each section can occur at most once unless otherwise specified.
 The order in which sections are specified is unimportant.</p>
 
 <taglist>
@@ -115,6 +115,7 @@ The order in which sections are specified is unimportant.</p>
 <p>
 Defines the integer Number as the Diameter Application Id of the
 application in question.
+Required if the dictionary defines <c>@messages</c>.
 The section has empty content.</p>
 
 <p>
@@ -370,7 +371,11 @@ Integer values can be prefixed with 0x to be interpreted as
 hexidecimal.</p>
 
 <p>
-Can occur 0 or more times (with different values of Name).</p>
+Can occur 0 or more times (with different values of Name).
+The AVP in question can be defined in an inherited dictionary in order
+to introduce additional values.
+An AVP so extended must be referenced by in a <c>@messages</c> or
+<c>@grouped</c> section.</p>
 
 <p>
 Example:</p>
diff --git a/lib/diameter/doc/src/diameter_sctp.xml b/lib/diameter/doc/src/diameter_sctp.xml
index d0377f4b38..c1e839b8e1 100644
--- a/lib/diameter/doc/src/diameter_sctp.xml
+++ b/lib/diameter/doc/src/diameter_sctp.xml
@@ -74,11 +74,12 @@ marker="diameter_transport#start">diameter_transport(3)</seealso>.</p>
 <p>
 The only diameter_sctp-specific argument is the options list.
 Options <c>raddr</c> and <c>rport</c> specify the remote address
-and port for a connector and not valid for a listener.
+and port for a connecting transport and not valid for a listening
+transport.
 The former is required while latter defaults to 3868 if unspecified.
 More than one <c>raddr</c> option can be specified, in which case the
-connector in question attempts each in sequence until an association
-is established.
+connecting transport in question attempts each in sequence until
+an association is established.
 Remaining options are any accepted by gen_sctp:open/1, with the exception
 of options <c>mode</c>, <c>binary</c>, <c>list</c>, <c>active</c>
 and <c>sctp_events</c>.
@@ -89,7 +90,8 @@ and port respectively.</p>
 Multiple <c>ip</c> options can be specified for a multihomed peer.
 If none are specified then the values of Host-IP-Address
 on the service are used. (In particular, one of these must be specified.)
-Option <c>port</c> defaults to 3868 for a listener and 0 for a connector.</p>
+Option <c>port</c> defaults to 3868 for a listening transport and 0 for a
+connecting transport.</p>
 
 <p>
 diameter_sctp uses the <c>transport_data</c> field of
diff --git a/lib/diameter/doc/src/diameter_soc.xml b/lib/diameter/doc/src/diameter_soc.xml
index 4f8581a904..6b9ef9f756 100644
--- a/lib/diameter/doc/src/diameter_soc.xml
+++ b/lib/diameter/doc/src/diameter_soc.xml
@@ -57,9 +57,13 @@ including the P Flag in the AVP header.</p>
 
 <item>
 <p>
-There is no TLS support.
-It's unclear (aka uninvestigated) how TLS would impact
-diameter but IPsec can be used without it needing to know.</p>
+There is no TLS support over SCTP.
+RFC 3588 requires that a Diameter server support TLS but in
+practise this seems to mean TLS over SCTP since there are limitations
+with running over SCTP: see RFC 6083 (DTLS over SCTP), which is a
+response to RFC 3436 (TLS over SCTP).
+The current RFC 3588 draft acknowledges this by equating
+TLS with TLS/TCP and DTLS/SCTP but we do not yet support DTLS.</p>
 </item>
 
 <item>
diff --git a/lib/diameter/doc/src/diameter_tcp.xml b/lib/diameter/doc/src/diameter_tcp.xml
index 5d6e07b1b8..e6b53383c0 100644
--- a/lib/diameter/doc/src/diameter_tcp.xml
+++ b/lib/diameter/doc/src/diameter_tcp.xml
@@ -43,7 +43,14 @@ It can be specified as the value of a transport_module option to
 <seealso
 marker="diameter#add_transport">diameter:add_transport/2</seealso>
 and implements the behaviour documented in
-<seealso marker="diameter_transport">diameter_transport(3)</seealso>.</p>
+<seealso marker="diameter_transport">diameter_transport(3)</seealso>.
+TLS security is supported, both as an upgrade following
+capabilities exchange as specified by RFC 3588 and
+at connection establishment as in the current draft standard.</p>
+
+<p>
+Note that the ssl application is required for TLS and must be started
+before configuring TLS capability on diameter transports.</p>
 
 <marker id="start"/>
 </description>
@@ -60,10 +67,15 @@ and implements the behaviour documented in
 <v>Type = connect | accept</v>
 <v>Ref = reference()</v>
 <v>Svc = #diameter_service{}</v>
-<v>Opt = {raddr, ip_address()} | {rport, integer()} | term()</v>
+<v>Opt = OwnOpt | SslOpt | OtherOpt</v>
 <v>Pid = pid()</v>
 <v>LAddr = ip_address()</v>
 <v>Reason = term()</v>
+<v>OwnOpt = {raddr, ip_address()}
+          | {rport, integer()}
+          | {port, integer()}</v>
+<v>SslOpt = {ssl_options, true | list()}</v>
+<v>OtherOpt = term()</v>
 </type>
 <desc>
 
@@ -74,16 +86,42 @@ marker="diameter_transport#start">diameter_transport(3)</seealso>.</p>
 <p>
 The only diameter_tcp-specific argument is the options list.
 Options <c>raddr</c> and <c>rport</c> specify the remote address
-and port for a connector and not valid for a listener.
-Remaining options are any accepted by gen_tcp:connect/3 for
-a connector, or gen_tcp:listen/2 for a listener, with the exception
-of <c>binary</c>, <c>packet</c> and <c>active</c>.
-Also, option <c>port</c> can be specified for a listener to specify the
-local listening port, the default being the standardized 3868 if
-unspecified.
+and port for a connecting transport and are not valid for a listening
+transport.
+Option <c>ssl_options</c> must be specified for a transport
+that must be able to support TLS: a value of <c>true</c> results in a
+TLS handshake immediately upon connection establishment while
+list() specifies options to be passed to ssl:connect/2 of ssl:ssl_accept/2
+after capabilities exchange if TLS is negotiated.
+Remaining options are any accepted by ssl:connect/3 or gen_tcp:connect/3 for
+a connecting transport, or ssl:listen/3 or gen_tcp:listen/2 for
+a listening transport, depending on whether or not <c>{ssl_options, true}</c>
+has been specified.
+Options <c>binary</c>, <c>packet</c> and <c>active</c> cannot be specified.
+Also, option <c>port</c> can be specified for a listening transport
+to specify the local listening port, the default being the standardized
+3868 if unspecified.
 Note that option <c>ip</c> specifies the local address.</p>
 
 <p>
+An <c>ssl_options</c> list must be specified if and only if
+the transport in question has specified an Inband-Security-Id
+AVP with value TLS on the relevant call to
+<seealso
+marker="diameter#start_service">start_service/2</seealso> or
+<seealso
+marker="diameter#add_transport">add_transport/2</seealso>,
+so that the transport process will receive notification of
+whether or not to commence with a TLS handshake following capabilities
+exchange.
+Failing to specify an options list on a TLS-capable transport
+for which TLS is negotiated will cause TLS handshake to fail.
+Failing to specify TLS capability when <c>ssl_options</c> has been
+specified will cause the transport process to wait for a notification
+that will not be forthcoming, which will eventually cause the RFC 3539
+watchdog to take down the connection.</p>
+
+<p>
 If the service specifies more than one Host-IP-Address and
 option <c>ip</c> is unspecified then then the
 first of the service's addresses is used as the local address.</p>
@@ -103,6 +141,7 @@ The returned local address list has length one.</p>
 <title>SEE ALSO</title>
 
 <p>
+<seealso marker="diameter">diameter(3)</seealso>,
 <seealso marker="diameter_transport">diameter_transport(3)</seealso></p>
 
 </section>
diff --git a/lib/diameter/doc/src/diameter_transport.xml b/lib/diameter/doc/src/diameter_transport.xml
index 37cc871e75..087a90b099 100644
--- a/lib/diameter/doc/src/diameter_transport.xml
+++ b/lib/diameter/doc/src/diameter_transport.xml
@@ -143,6 +143,34 @@ connection.
 Pid is the pid() of the parent process.</p>
 </item>
 
+<tag><c>{diameter, {tls, Ref, Type, Bool}}</c></tag>
+<item>
+<p>
+Indication of whether or not capabilities exchange has selected
+inband security using TLS.
+Ref is a reference() that must be included in the
+<c>{diameter, {tls, Ref}}</c> reply message to the transport's
+parent process (see below).
+Type is either <c>connect</c> or <c>accept</c> depending on
+whether the process has been started for a connecting or listening
+transport respectively.
+Bool is a boolean() indicating whether or not the transport connection
+should be upgraded to TLS.</p>
+
+<p>
+If TLS is requested (Bool = true) then a connecting process should
+initiate a TLS handshake with the peer and an accepting process should
+prepare to accept a handshake.
+A successful handshake should be followed by a <c>{diameter, {tls, Ref}}</c>
+message to the parent process.
+A failed handshake should cause the process to exit.</p>
+
+<p>
+This message is only sent to a transport process over whose
+<c>Inband-Security-Id</c> configuration has indicated support for
+TLS.</p>
+</item>
+
 </taglist>
 
 <p>
@@ -184,6 +212,16 @@ How the <c>transport_data</c> is used/interpreted is up to the
 transport module.</p>
 </item>
 
+<tag><c>{diameter, {tls, Ref}}</c></tag>
+<item>
+<p>
+Acknowledgment of a successful TLS handshake.
+Ref is the reference() received in the
+<c>{diameter, {tls, Ref, Type, Bool}}</c> message in response
+to which the reply is sent.
+A transport must exit if a handshake is not successful.</p>
+</item>
+
 </taglist>
 
 </section>
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index eafddd7d1e..e2723f3e99 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -36,6 +36,135 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>Diameter 0.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Handle #sctp_paddr_change and #sctp_pdapi_event from
+	    gen_sctp.</p>
+          <p>
+	    The events are enabled by default but diameter_sctp
+	    neither disabled nor dealt with them. Reception of such
+	    an event caused a transport process to crash.</p>
+          <p>
+	    Own Id: OTP-9538</p>
+        </item>
+        <item>
+          <p>
+	    Fix header folding bug.</p>
+          <p>
+	    A prepare_request callback from diameter can return a
+	    diameter_header record in order to set values in the
+	    header of an outgoing request. A fault in
+	    diameter_lib:fold_tuple/3 caused the subsequent encode of
+	    the outgoing request to fail.</p>
+          <p>
+	    Own Id: OTP-9577</p>
+        </item>
+        <item>
+          <p>
+	    Fix bugs in sending of answer-message replies.</p>
+          <p>
+	    3001 (DIAMETER_COMMAND_UNSUPPORTED) was not sent since
+	    the decode placed the AVP list in the wrong field of the
+	    diameter_packet, causing the subsequent encode to fail.
+	    Session-Id was also set improperly, causing encode to
+	    fail even in this case.</p>
+          <p>
+	    Own Id: OTP-9578</p>
+        </item>
+        <item>
+          <p>
+	    Fix improper use of error_logger:info_report/2.</p>
+          <p>
+	    Function doesn't take a format string and arguments as it
+	    was called. Instead use error_logger:info_report/1 and
+	    use the same report format as used for warning and error
+	    reports.</p>
+          <p>
+	    Own Id: OTP-9579</p>
+        </item>
+        <item>
+          <p>
+	    Fix and clarify semantics of peer filters.</p>
+          <p>
+	    An eval filter returning a non-true value caused the call
+	    process to fail and the doc was vague on how an exception
+	    was treated. Clarify that the non-tuple host/realm
+	    filters assume messages of a certain form.</p>
+          <p>
+	    Own Id: OTP-9580</p>
+        </item>
+        <item>
+          <p>
+	    Fix and clarify relay behaviour.</p>
+          <p>
+	    Implicit filtering of the sending peer in relaying a
+	    request could cause loop detection to be preempted in a
+	    manner not specified by RFC3588. Reply with 3002
+	    (DIAMETER_UNABLE_TO_DELIVER) on anything but an answer to
+	    a relayed request.</p>
+          <p>
+	    Own Id: OTP-9583</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    @id required in dictionary files only when @messages is
+	    specified.</p>
+          <p>
+	    @id defines an application identifier and this is used
+	    only when sending or receiving messages. A dictionary can
+	    define only AVP's however, to be included by other
+	    dictionaries using @inherits, in which case it makes no
+	    sense to require @id.</p>
+          <p>
+	    Note that message definitions are not inherited with
+	    @inherits, only AVP's</p>
+          <p>
+	    Own Id: OTP-9467</p>
+        </item>
+        <item>
+          <p>
+	    Allow @enum when AVP is defined in an inherited
+	    dictionary.</p>
+          <p>
+	    3GPP standards (for one) extend the values allowed for
+	    RFC 3588 AVP's of type Enumerated. Previously, extending
+	    an AVP was only possible by completely redefining the
+	    AVP.</p>
+          <p>
+	    Own Id: OTP-9469</p>
+        </item>
+        <item>
+          <p>
+	    Migrate testsuites to pure common test and add both
+	    suites and testcases.</p>
+          <p>
+	    Own Id: OTP-9553</p>
+        </item>
+        <item>
+          <p>
+	    Requests of arbitrary form.</p>
+          <p>
+	    diameter:call/4 can be passed anything, as long as the
+	    subsequent prepare_request callback returns a term that
+	    can be encoded.</p>
+          <p>
+	    Own Id: OTP-9581</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section>
 <title>diameter 0.9</title>
 
diff --git a/lib/diameter/include/diameter_gen.hrl b/lib/diameter/include/diameter_gen.hrl
index 4c91954a21..d037e1044a 100644
--- a/lib/diameter/include/diameter_gen.hrl
+++ b/lib/diameter/include/diameter_gen.hrl
@@ -44,14 +44,14 @@ encode_avps(Name, Rec) ->
                              ?MODULE,
                              ?LINE,
                              {Reason, Name, Rec}),
-            erlang:error(list_to_tuple(Reason ++ [Name, Rec, ?MODULE]));
+            erlang:error(list_to_tuple(Reason ++ [Name]));
         error: Reason ->
             Stack = erlang:get_stacktrace(),
             diameter_dbg:log({encode, failure},
                              ?MODULE,
                              ?LINE,
                              {Reason, Name, Rec, Stack}),
-            erlang:error({encode_failure, Reason, Name, Rec, ?MODULE, Stack})
+            erlang:error({encode_failure, Reason, Name, Stack})
     end.
 
 %% encode/2
diff --git a/lib/diameter/make/rules.mk.in b/lib/diameter/make/rules.mk.in
index 4a1a55b8d3..cd3c297d75 100644
--- a/lib/diameter/make/rules.mk.in
+++ b/lib/diameter/make/rules.mk.in
@@ -112,8 +112,6 @@ $(EBIN)/%.beam: $(ESRC)/%.erl
 # ----------------------------------------------------
 # export VSN
 
-# DOCSUPPORT = 1
-
 # TOPDOCDIR=../../../../doc
 
 DOCDIR = ..
@@ -164,7 +162,7 @@ $(MAN3DIR)/%.3:: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
-# left for compatability
+# left for compatibility
 $(MAN4DIR)/%.4:: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
@@ -173,7 +171,7 @@ $(MAN4DIR)/%.5:: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
-# left for compatability
+# left for compatibility
 $(MAN6DIR)/%.6:: %_app.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
diff --git a/lib/diameter/src/compiler/.gitignore b/lib/diameter/src/.gitignore
index d9f072e262..feeb378fd8 100644
--- a/lib/diameter/src/compiler/.gitignore
+++ b/lib/diameter/src/.gitignore
@@ -1,3 +1,2 @@
 
 /depend.mk
-
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index 6935eb053e..a057632d15 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -16,28 +16,225 @@
 # 
 # %CopyrightEnd%
 
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-else
+ifeq ($(ERL_TOP),)
 include $(DIAMETER_TOP)/make/target.mk
 include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk
+else
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
 endif
 
 # ----------------------------------------------------
-# Common Macros
+# Application version
 # ----------------------------------------------------
 
-include subdirs.mk
+include ../vsn.mk
 
-SPECIAL_TARGETS =
+VSN = $(DIAMETER_VSN)
 
 # ----------------------------------------------------
-# Default Subdir Targets
+# Release directory specification
 # ----------------------------------------------------
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/otp_subdir.mk
+
+RELSYSDIR = $(RELEASE_PATH)/lib/diameter-$(VSN)
+
+# Where to put/find things.
+EBIN   = ../ebin
+INCDIR = ../include
+
+# Dumbed down to make 3.80. In 3.81 and later it's just $(realpath $(EBIN)).
+ABS_EBIN := $(shell cd $(EBIN) && pwd)
+
+# Where make should look for dependencies.
+VPATH = .:base:compiler:transport:gen
+
+# ----------------------------------------------------
+# Target specs
+# ----------------------------------------------------
+
+include modules.mk
+
+DICT_MODULES = $(DICTS:%=gen/diameter_gen_%)
+DICT_ERLS    = $(DICT_MODULES:%=%.erl)
+DICT_HRLS    = $(DICT_MODULES:%=%.hrl)
+
+# Modules to build before compiling dictionaries.
+COMPILER_MODULES = $(filter compiler/%, $(CT_MODULES))
+
+# All handwritten modules.
+MODULES = \
+	$(RT_MODULES) \
+	$(CT_MODULES)
+
+# Modules whose names are inserted into the app file.
+APP_MODULES = \
+	$(RT_MODULES) \
+	$(DICT_MODULES)
+
+# Modules for which to build beams.
+TARGET_MODULES = \
+	$(APP_MODULES) \
+	$(CT_MODULES)
+
+# What to build for the 'opt' target.
+TARGET_FILES = \
+	$(patsubst %,$(EBIN)/%.$(EMULATOR),$(notdir $(TARGET_MODULES))) \
+	$(APP_TARGET) \
+	$(APPUP_TARGET)
+
+# Subdirectories of src to release modules into.
+TARGET_DIRS = $(sort $(dir $(TARGET_MODULES)))
+
+APP_FILE   = diameter.app
+APP_SRC    = $(APP_FILE).src
+APP_TARGET = $(EBIN)/$(APP_FILE)
+
+APPUP_FILE   = diameter.appup
+APPUP_SRC    = $(APPUP_FILE).src
+APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
+
+# ----------------------------------------------------
+# Flags
+# ----------------------------------------------------
+
+ifeq ($(TYPE),debug)
+ERL_COMPILE_FLAGS += -Ddebug
+endif
+
+ERL_COMPILE_FLAGS += \
+	+'{parse_transform,sys_pre_attributes}' \
+	+'{attribute,insert,app_vsn,$(APP_VSN)}' \
+	+warn_export_vars \
+	+warn_unused_vars \
+	-pa $(ABS_EBIN) \
+	-I $(INCDIR) \
+	-I gen
+# -pa is to be able to include_lib from the include directory: the
+# path must contain the application name.
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+# erl/hrl from dictionary file.
+gen/diameter_gen_%.erl gen/diameter_gen_%.hrl: dict/%.dia
+	../bin/diameterc -o gen -i $(EBIN) $<
+
+opt: $(TARGET_FILES)
+
+debug:
+	@$(MAKE) TYPE=debug opt
+
+# Generate the app file.
+$(APP_TARGET): $(APP_SRC) ../vsn.mk modules.mk
+	M=`echo $(notdir $(APP_MODULES)) | tr ' ' ,`; \
+	sed -e 's;%VSN%;$(VSN);' \
+	    -e "s;%MODULES%;$$M;" \
+	  $< > $@
+
+$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+	sed -e 's;%VSN%;$(VSN);' $< > $@
+
+app:  $(APP_TARGET) $(APPUP_TARGET)
+dict: $(DICT_ERLS)
+
+docs:
+
+list = echo $(1):; echo $($(1)) | tr ' ' '\n' | sort | sed 's@^@  @'
+
+info:
+	@echo ========================================
+	@$(call list,DICTS)
+	@echo
+	@$(call list,RT_MODULES)
+	@echo
+	@$(call list,CT_MODULES)
+	@echo
+	@$(call list,TARGET_MODULES)
+	@echo
+	@$(call list,TARGET_DIRS)
+	@echo
+	@$(call list,EXTERNAL_HRLS)
+	@echo
+	@$(call list,INTERNAL_HRLS)
+	@echo
+	@$(call list,EXAMPLES)
+	@echo
+	@$(call list,BINS)
+	@echo ========================================
+
+clean:
+	rm -f $(TARGET_FILES) $(DICT_ERLS) $(DICT_HRLS)
+	rm -f depend.mk
+
+# ----------------------------------------------------
+# Release targets
+# ----------------------------------------------------
+
+ifeq ($(ERL_TOP),)
+include $(DIAMETER_TOP)/make/release_targets.mk
 else
-include $(DIAMETER_TOP)/make/subdir.mk
+include $(ERL_TOP)/make/otp_release_targets.mk
 endif
-#include ../make/subdir.mk
+
+# Can't $(INSTALL_DIR) more than on directory at a time on Solaris.
+
+release_spec: opt
+	for d in bin ebin examples include src/dict $(TARGET_DIRS:%/=src/%); do \
+	    $(INSTALL_DIR) $(RELSYSDIR)/$$d; \
+	done
+	$(INSTALL_SCRIPT) $(BINS:%=../bin/%) $(RELSYSDIR)/bin
+	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DATA) $(EXAMPLES:%=../examples/%) $(RELSYSDIR)/examples
+	$(INSTALL_DATA) $(EXTERNAL_HRLS:%=../include/%) $(DICT_HRLS) \
+	                $(RELSYSDIR)/include
+	$(INSTALL_DATA) $(DICTS:%=dict/%.dia) $(RELSYSDIR)/src/dict
+	$(MAKE) $(TARGET_DIRS:%/=release_src_%)
+
+$(TARGET_DIRS:%/=release_src_%): release_src_%:
+	$(INSTALL_DATA) $(filter $*/%,$(TARGET_MODULES:%=%.erl) \
+	                              $(INTERNAL_HRLS)) \
+	                $(RELSYSDIR)/src/$*
+
+release_docs_spec:
+
+# ----------------------------------------------------
+# Dependencies
+# ----------------------------------------------------
+
+gen/diameter_gen_base_accounting.erl gen/diameter_gen_relay.erl \
+gen/diameter_gen_base_accounting.hrl gen/diameter_gen_relay.hrl: \
+	$(EBIN)/diameter_gen_base_rfc3588.$(EMULATOR)
+
+gen/diameter_gen_base_rfc3588.erl gen/diameter_gen_base_rfc3588.hrl: \
+	$(COMPILER_MODULES:compiler/%=$(EBIN)/%.$(EMULATOR))
+
+$(DICT_MODULES:%=$(EBIN)/%.$(EMULATOR)): \
+	$(INCDIR)/diameter.hrl \
+	$(INCDIR)/diameter_gen.hrl
+
+depend: depend.mk
+
+# Generate dependencies makefile.
+depend.mk: depend.sed $(MODULES:%=%.erl) Makefile
+	(for f in $(MODULES); do \
+	     (echo $$f; cat $$f.erl) | sed -f $<; \
+	 done) \
+	> $@
+
+-include depend.mk
+
+.PRECIOUS: $(DICT_ERLS) $(DICT_HRLS)
+.PHONY: app clean depend dict info release_subdir
+.PHONY: debug opt release_docs_spec release_spec
+.PHONY: $(TARGET_DIRS:%/=%) $(TARGET_DIRS:%/=release_src_%)
+
+# ----------------------------------------------------
+# Targets using secondary expansion (make >= 3.81)
+# ----------------------------------------------------
+
+.SECONDEXPANSION:
+
+# Make beams from a subdirectory.
+$(TARGET_DIRS:%/=%): \
+  $$(patsubst $$@/%,$(EBIN)/%.$(EMULATOR),$$(filter $$@/%,$(TARGET_MODULES)))
diff --git a/lib/diameter/src/app/.gitignore b/lib/diameter/src/app/.gitignore
deleted file mode 100644
index d388e61877..0000000000
--- a/lib/diameter/src/app/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-
-/diameter_gen_*.erl
-/diameter_gen_*.hrl
-/depend.mk
-/diameter.mk
-
diff --git a/lib/diameter/src/app/Makefile b/lib/diameter/src/app/Makefile
deleted file mode 100644
index 6de220d282..0000000000
--- a/lib/diameter/src/app/Makefile
+++ /dev/null
@@ -1,199 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2010-2011. 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.
-#
-# %CopyrightEnd%
-#
-#
-
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/target.mk
-EBIN = ../../ebin
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-else
-include $(DIAMETER_TOP)/make/target.mk
-EBIN = ../../ebin
-include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk
-endif
-
-
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-
-include ../../vsn.mk
-
-VSN=$(DIAMETER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-
-RELSYSDIR = $(RELEASE_PATH)/lib/diameter-$(VSN)
-
-INCDIR = ../../include
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-include modules.mk
-
-SPEC_ERL_FILES = \
-	$(SPEC_FILES:%.dia=%.erl)
-
-SPEC_HRL_FILES = \
-	$(SPEC_FILES:%.dia=%.hrl)
-
-APP_MODULES = \
-	$(MODULES) \
-	$(SPEC_FILES:%.dia=%)
-
-TARGET_FILES = \
-	$(APP_MODULES:%=$(EBIN)/%.$(EMULATOR)) \
-	$(APP_TARGET) \
-	$(APPUP_TARGET)
-
-ESCRIPT_FILES = \
-	../../bin/diameterc
-
-APP_FILE   = diameter.app
-APP_SRC    = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-APPUP_FILE   = diameter.appup
-APPUP_SRC    = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug
-endif
-
-include diameter.mk
-
-ERL_COMPILE_FLAGS += \
-    $(DIAMETER_ERL_COMPILE_FLAGS) \
-    -I$(INCDIR)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug:
-	@$(MAKE) TYPE=debug opt
-
-opt: $(TARGET_FILES)
-
-clean:
-	rm -f $(TARGET_FILES) $(SPEC_ERL_FILES) $(SPEC_HRL_FILES)
-	rm -f $(APP_TARGET) $(APPUP_TARGET)
-	rm -f errs core *~ diameter_gen_*.forms diameter_gen_*.spec
-	rm -f depend.mk
-
-docs:
-
-info:
-	@echo ""
-	@echo "SPEC_FILES = $(FILES)"
-	@echo "MODULES    = $(MODULES)"
-	@echo ""
-	@echo "EXTERNAL_HRL_FILES = $(EXTERNAL_HRL_FILES)"
-	@echo "INTERNAL_HRL_FILES = $(INTERNAL_HRL_FILES)"
-	@echo ""
-	@echo "EXAMPLE_FILES = $(EXAMPLE_FILES)"
-	@echo ""
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-# Generate the app file and then modules into in. This shouldn't know
-# about ../{compiler,transport} but good enough for now.
-$(APP_TARGET): $(APP_SRC) \
-               ../../vsn.mk \
-               modules.mk \
-               ../compiler/modules.mk \
-               ../transport/modules.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
-	M=`echo $(APP_MODULES) | sed -e 's/^ *//' -e 's/ *$$//' -e 'y/ /,/'`; \
-	echo "/%APP_MODULES%/s//$$M/;w;q" | tr ';' '\n' \
-	| ed -s $@
-	$(MAKE) -C ../compiler  $(APP_TARGET) APP_TARGET=$(APP_TARGET)
-	$(MAKE) -C ../transport $(APP_TARGET) APP_TARGET=$(APP_TARGET)
-
-$(APPUP_TARGET): $(APPUP_SRC) ../../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
-
-compiler:
-	$(MAKE) -C ../$@
-
-app: $(APP_TARGET) $(APPUP_TARGET)
-
-# erl/hrl from application spec
-diameter_gen_%.erl diameter_gen_%.hrl: diameter_gen_%.dia
-	../../bin/diameterc -i $(EBIN) -o $(@D) $<
-
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/otp_release_targets.mk
-else
-include $(DIAMETER_TOP)/make/release_targets.mk
-endif
-
-release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/bin
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/app
-	$(INSTALL_DIR)  $(RELSYSDIR)/include
-	$(INSTALL_DIR)  $(RELSYSDIR)/examples
-	$(INSTALL_SCRIPT) $(ESCRIPT_FILES) $(RELSYSDIR)/bin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(MODULES:%=%.erl) $(SPEC_ERL_FILES) $(RELSYSDIR)/src/app
-	$(INSTALL_DATA) $(SPEC_FILES) $(RELSYSDIR)/src/app
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(SPEC_HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
-
-release_docs_spec:
-
-# ----------------------------------------------------
-# Dependencies
-# ----------------------------------------------------
-
-depend: depend.mk
-
-# Generate dependencies makefile. It's assumed that the compile target
-# has already been made since it's currently not smart enough to not
-# force a rebuild of those beams dependent on generated hrls, and this
-# is a no-no at make release.
-depend.mk: depend.sed $(MODULES:%=%.erl) Makefile
-	(for f in $(MODULES); do \
-	     sed -f $< $$f.erl | sed "s@/@/$$f@"; \
-	 done) \
-	> $@
-
--include depend.mk
-
-.PRECIOUS: $(SPEC_ERL_FILES) $(SPEC_HRL_FILES)
-.PHONY: app clean debug depend info opt compiler release_spec release_docs_spec
diff --git a/lib/diameter/src/app/diameter.mk.in b/lib/diameter/src/app/diameter.mk.in
deleted file mode 100644
index c161064303..0000000000
--- a/lib/diameter/src/app/diameter.mk.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2010-2011. 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.
-#
-# %CopyrightEnd%
-
-DIAMETER_TOP = @DIAMETER_TOP@
-
-# ifneq ($(PREFIX),)
-# ifeq ($(TESTROOT),)
-# TESTROOT = $(PREFIX)
-# endif
-# endif
-
-ifeq ($(USE_DIAMETER_TEST_CODE), true)
-ERL_COMPILE_FLAGS += -DDIAMETER_TEST_CODE=mona_lisa_spelar_doom
-endif
-
-ifeq ($(USE_DIAMETER_HIPE), true)
-ERL_COMPILE_FLAGS += +native
-endif
-
-ifeq ($(WARN_UNUSED_WARS), true)
-ERL_COMPILE_FLAGS += +warn_unused_vars
-endif
-
-DIAMETER_APP_VSN_COMPILE_FLAGS = \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,$(APP_VSN)}'
-
-DIAMETER_ERL_COMPILE_FLAGS += \
-	-pa $(DIAMETER_TOP)/ebin  \
-	$(DIAMETER_APP_VSN_COMPILE_FLAGS) 
-
diff --git a/lib/diameter/src/app/diameter_gen_base_accounting.dia b/lib/diameter/src/app/diameter_gen_base_accounting.dia
deleted file mode 100644
index 64e95dddb5..0000000000
--- a/lib/diameter/src/app/diameter_gen_base_accounting.dia
+++ /dev/null
@@ -1,68 +0,0 @@
-;;
-;; %CopyrightBegin%
-;;
-;; Copyright Ericsson AB 2010-2011. 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.
-;;
-;; %CopyrightEnd%
-;;
-
-@id 3
-@prefix diameter_base_accounting
-@vendor 0 IETF
-
-@inherits diameter_gen_base_rfc3588
-
-@messages
-
-      ACR  ::= < Diameter Header: 271, REQ, PXY >
-                < Session-Id >
-                { Origin-Host }
-                { Origin-Realm }
-                { Destination-Realm }
-                { Accounting-Record-Type }
-                { Accounting-Record-Number }
-                [ Acct-Application-Id ]
-                [ Vendor-Specific-Application-Id ]
-                [ User-Name ]
-                [ Accounting-Sub-Session-Id ]
-                [ Acct-Session-Id ]
-                [ Acct-Multi-Session-Id ]
-                [ Acct-Interim-Interval ]
-                [ Accounting-Realtime-Required ]
-                [ Origin-State-Id ]
-                [ Event-Timestamp ]
-              * [ Proxy-Info ]
-              * [ Route-Record ]
-              * [ AVP ]
-
-      ACA  ::= < Diameter Header: 271, PXY >
-                < Session-Id >
-                { Result-Code }
-                { Origin-Host }
-                { Origin-Realm }
-                { Accounting-Record-Type }
-                { Accounting-Record-Number }
-                [ Acct-Application-Id ]
-                [ Vendor-Specific-Application-Id ]
-                [ User-Name ]
-                [ Accounting-Sub-Session-Id ]
-                [ Acct-Session-Id ]
-                [ Acct-Multi-Session-Id ]
-                [ Error-Reporting-Host ]
-                [ Acct-Interim-Interval ]
-                [ Accounting-Realtime-Required ]
-                [ Origin-State-Id ]
-                [ Event-Timestamp ]
-              * [ Proxy-Info ]
-              * [ AVP ]
diff --git a/lib/diameter/src/app/diameter_gen_base_rfc3588.dia b/lib/diameter/src/app/diameter_gen_base_rfc3588.dia
deleted file mode 100644
index 4a12e21acd..0000000000
--- a/lib/diameter/src/app/diameter_gen_base_rfc3588.dia
+++ /dev/null
@@ -1,413 +0,0 @@
-;;
-;; %CopyrightBegin%
-;;
-;; Copyright Ericsson AB 2010-2011. 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.
-;;
-;; %CopyrightEnd%
-;;
-
-@id 0
-@prefix diameter_base
-@vendor 0 IETF
-
-@avp_types
-
-   Acct-Interim-Interval             85    Unsigned32    M
-   Accounting-Realtime-Required     483    Enumerated    M
-   Acct-Multi-Session-Id             50    UTF8String    M
-   Accounting-Record-Number         485    Unsigned32    M
-   Accounting-Record-Type           480    Enumerated    M
-   Acct-Session-Id                   44   OctetString    M
-   Accounting-Sub-Session-Id        287    Unsigned64    M
-   Acct-Application-Id              259    Unsigned32    M
-   Auth-Application-Id              258    Unsigned32    M
-   Auth-Request-Type                274    Enumerated    M
-   Authorization-Lifetime           291    Unsigned32    M
-   Auth-Grace-Period                276    Unsigned32    M
-   Auth-Session-State               277    Enumerated    M
-   Re-Auth-Request-Type             285    Enumerated    M
-   Class                             25   OctetString    M
-   Destination-Host                 293     DiamIdent    M
-   Destination-Realm                283     DiamIdent    M
-   Disconnect-Cause                 273    Enumerated    M
-   E2E-Sequence                     300       Grouped    M
-   Error-Message                    281    UTF8String    -
-   Error-Reporting-Host             294     DiamIdent    -
-   Event-Timestamp                   55          Time    M
-   Experimental-Result              297       Grouped    M
-   Experimental-Result-Code         298    Unsigned32    M
-   Failed-AVP                       279       Grouped    M
-   Firmware-Revision                267    Unsigned32    -
-   Host-IP-Address                  257       Address    M
-   Inband-Security-Id               299    Unsigned32    M
-   Multi-Round-Time-Out             272    Unsigned32    M
-   Origin-Host                      264     DiamIdent    M
-   Origin-Realm                     296     DiamIdent    M
-   Origin-State-Id                  278    Unsigned32    M
-   Product-Name                     269    UTF8String    -
-   Proxy-Host                       280     DiamIdent    M
-   Proxy-Info                       284       Grouped    M
-   Proxy-State                       33   OctetString    M
-   Redirect-Host                    292       DiamURI    M
-   Redirect-Host-Usage              261    Enumerated    M
-   Redirect-Max-Cache-Time          262    Unsigned32    M
-   Result-Code                      268    Unsigned32    M
-   Route-Record                     282     DiamIdent    M
-   Session-Id                       263    UTF8String    M
-   Session-Timeout                   27    Unsigned32    M
-   Session-Binding                  270    Unsigned32    M
-   Session-Server-Failover          271    Enumerated    M
-   Supported-Vendor-Id              265    Unsigned32    M
-   Termination-Cause                295    Enumerated    M
-   User-Name                          1    UTF8String    M
-   Vendor-Id                        266    Unsigned32    M
-   Vendor-Specific-Application-Id   260       Grouped    M
-
-@messages
-
-      CER  ::= < Diameter Header: 257, REQ >
-                { Origin-Host }
-                { Origin-Realm }
-             1* { Host-IP-Address }
-                { Vendor-Id }
-                { Product-Name }
-                [ Origin-State-Id ]
-              * [ Supported-Vendor-Id ]
-              * [ Auth-Application-Id ]
-              * [ Inband-Security-Id ]
-              * [ Acct-Application-Id ]
-              * [ Vendor-Specific-Application-Id ]
-                [ Firmware-Revision ]
-              * [ AVP ]
-
-      CEA  ::= < Diameter Header: 257 >
-                { Result-Code }
-                { Origin-Host }
-                { Origin-Realm }
-             1* { Host-IP-Address }
-                { Vendor-Id }
-                { Product-Name }
-                [ Origin-State-Id ]
-                [ Error-Message ]
-              * [ Failed-AVP ]
-              * [ Supported-Vendor-Id ]
-              * [ Auth-Application-Id ]
-              * [ Inband-Security-Id ]
-              * [ Acct-Application-Id ]
-              * [ Vendor-Specific-Application-Id ]
-                [ Firmware-Revision ]
-              * [ AVP ]
-
-      DPR   ::= < Diameter Header: 282, REQ >
-                 { Origin-Host }
-                 { Origin-Realm }
-                 { Disconnect-Cause }
-
-      DPA   ::= < Diameter Header: 282 >
-                 { Result-Code }
-                 { Origin-Host }
-                 { Origin-Realm }
-                 [ Error-Message ]
-               * [ Failed-AVP ]
-
-      DWR   ::= < Diameter Header: 280, REQ >
-                 { Origin-Host }
-                 { Origin-Realm }
-                 [ Origin-State-Id ]
-
-      DWA   ::= < Diameter Header: 280 >
-                 { Result-Code }
-                 { Origin-Host }
-                 { Origin-Realm }
-                 [ Error-Message ]
-               * [ Failed-AVP ]
-                 [ Origin-State-Id ]
-
-   answer-message  ::= < Diameter Header: code, ERR [PXY] >
-                     0*1< Session-Id >
-                        { Origin-Host }
-                        { Origin-Realm }
-                        { Result-Code }
-                        [ Origin-State-Id ]
-                        [ Error-Reporting-Host ]
-                        [ Proxy-Info ]
-                      * [ AVP ]
-
-      RAR   ::= < Diameter Header: 258, REQ, PXY >
-                 < Session-Id >
-                 { Origin-Host }
-                 { Origin-Realm }
-                 { Destination-Realm }
-                 { Destination-Host }
-                 { Auth-Application-Id }
-                 { Re-Auth-Request-Type }
-                 [ User-Name ]
-                 [ Origin-State-Id ]
-               * [ Proxy-Info ]
-               * [ Route-Record ]
-               * [ AVP ]
-
-      RAA   ::= < Diameter Header: 258, PXY >
-                 < Session-Id >
-                 { Result-Code }
-                 { Origin-Host }
-                 { Origin-Realm }
-                 [ User-Name ]
-                 [ Origin-State-Id ]
-                 [ Error-Message ]
-                 [ Error-Reporting-Host ]
-               * [ Failed-AVP ]
-               * [ Redirect-Host ]
-                 [ Redirect-Host-Usage ]
-                 [ Redirect-Max-Cache-Time ]
-               * [ Proxy-Info ]
-               * [ AVP ]
-
-      STR  ::= < Diameter Header: 275, REQ, PXY >
-                < Session-Id >
-                { Origin-Host }
-                { Origin-Realm }
-                { Destination-Realm }
-                { Auth-Application-Id }
-                { Termination-Cause }
-                [ User-Name ]
-                [ Destination-Host ]
-              * [ Class ]
-                [ Origin-State-Id ]
-              * [ Proxy-Info ]
-              * [ Route-Record ]
-              * [ AVP ]
-
-      STA   ::= < Diameter Header: 275, PXY >
-                 < Session-Id >
-                 { Result-Code }
-                 { Origin-Host }
-                 { Origin-Realm }
-                 [ User-Name ]
-               * [ Class ]
-                 [ Error-Message ]
-                 [ Error-Reporting-Host ]
-               * [ Failed-AVP ]
-                 [ Origin-State-Id ]
-               * [ Redirect-Host ]
-                 [ Redirect-Host-Usage ]
-                 [ Redirect-Max-Cache-Time ]
-               * [ Proxy-Info ]
-               * [ AVP ]
-
-      ASR   ::= < Diameter Header: 274, REQ, PXY >
-                 < Session-Id >
-                 { Origin-Host }
-                 { Origin-Realm }
-                 { Destination-Realm }
-                 { Destination-Host }
-                 { Auth-Application-Id }
-                 [ User-Name ]
-                 [ Origin-State-Id ]
-               * [ Proxy-Info ]
-               * [ Route-Record ]
-               * [ AVP ]
-
-      ASA   ::= < Diameter Header: 274, PXY >
-                 < Session-Id >
-                 { Result-Code }
-                 { Origin-Host }
-                 { Origin-Realm }
-                 [ User-Name ]
-                 [ Origin-State-Id ]
-                 [ Error-Message ]
-                 [ Error-Reporting-Host ]
-               * [ Failed-AVP ]
-               * [ Redirect-Host ]
-                 [ Redirect-Host-Usage ]
-                 [ Redirect-Max-Cache-Time ]
-               * [ Proxy-Info ]
-               * [ AVP ]
-
-      ACR  ::= < Diameter Header: 271, REQ, PXY >
-                < Session-Id >
-                { Origin-Host }
-                { Origin-Realm }
-                { Destination-Realm }
-                { Accounting-Record-Type }
-                { Accounting-Record-Number }
-                [ Acct-Application-Id ]
-                [ Vendor-Specific-Application-Id ]
-                [ User-Name ]
-                [ Accounting-Sub-Session-Id ]
-                [ Acct-Session-Id ]
-                [ Acct-Multi-Session-Id ]
-                [ Acct-Interim-Interval ]
-                [ Accounting-Realtime-Required ]
-                [ Origin-State-Id ]
-                [ Event-Timestamp ]
-              * [ Proxy-Info ]
-              * [ Route-Record ]
-              * [ AVP ]
-
-      ACA  ::= < Diameter Header: 271, PXY >
-                < Session-Id >
-                { Result-Code }
-                { Origin-Host }
-                { Origin-Realm }
-                { Accounting-Record-Type }
-                { Accounting-Record-Number }
-                [ Acct-Application-Id ]
-                [ Vendor-Specific-Application-Id ]
-                [ User-Name ]
-                [ Accounting-Sub-Session-Id ]
-                [ Acct-Session-Id ]
-                [ Acct-Multi-Session-Id ]
-                [ Error-Reporting-Host ]
-                [ Acct-Interim-Interval ]
-                [ Accounting-Realtime-Required ]
-                [ Origin-State-Id ]
-                [ Event-Timestamp ]
-              * [ Proxy-Info ]
-              * [ AVP ]
-
-@enum Disconnect-Cause
-
-   REBOOTING                         0
-   BUSY                              1
-   DO_NOT_WANT_TO_TALK_TO_YOU        2
-
-@enum Redirect-Host-Usage
-
-   DONT_CACHE                        0
-   ALL_SESSION                       1
-   ALL_REALM                         2
-   REALM_AND_APPLICATION             3
-   ALL_APPLICATION                   4
-   ALL_HOST                          5
-   ALL_USER                          6
-
-@enum Auth-Request-Type
-
-   AUTHENTICATE_ONLY          1
-   AUTHORIZE_ONLY             2
-   AUTHORIZE_AUTHENTICATE     3
-
-@enum Auth-Session-State
-
-   STATE_MAINTAINED              0
-   NO_STATE_MAINTAINED           1
-
-@enum Re-Auth-Request-Type
-
-   AUTHORIZE_ONLY             0
-   AUTHORIZE_AUTHENTICATE     1
-
-@enum Termination-Cause
-
-   DIAMETER_LOGOUT                   1
-   DIAMETER_SERVICE_NOT_PROVIDED     2
-   DIAMETER_BAD_ANSWER               3
-   DIAMETER_ADMINISTRATIVE           4
-   DIAMETER_LINK_BROKEN              5
-   DIAMETER_AUTH_EXPIRED             6
-   DIAMETER_USER_MOVED               7
-   DIAMETER_SESSION_TIMEOUT          8
-
-@enum Session-Server-Failover
-
-   REFUSE_SERVICE             0
-   TRY_AGAIN                  1
-   ALLOW_SERVICE              2
-   TRY_AGAIN_ALLOW_SERVICE    3
-
-@enum Accounting-Record-Type
-
-   EVENT_RECORD                    1
-   START_RECORD                    2
-   INTERIM_RECORD                  3
-   STOP_RECORD                     4
-
-@enum Accounting-Realtime-Required
-
-   DELIVER_AND_GRANT                           1
-   GRANT_AND_STORE                             2
-   GRANT_AND_LOSE                              3
-
-@result_code Result-Code
-
-;; 7.1.1.  Informational
-   DIAMETER_MULTI_ROUND_AUTH         1001
-
-;; 7.1.2.  Success
-   DIAMETER_SUCCESS                   2001
-   DIAMETER_LIMITED_SUCCESS           2002
-
-;; 7.1.3.  Protocol Errors
-   DIAMETER_COMMAND_UNSUPPORTED       3001
-   DIAMETER_UNABLE_TO_DELIVER         3002
-   DIAMETER_REALM_NOT_SERVED          3003
-   DIAMETER_TOO_BUSY                  3004
-   DIAMETER_LOOP_DETECTED             3005
-   DIAMETER_REDIRECT_INDICATION       3006
-   DIAMETER_APPLICATION_UNSUPPORTED   3007
-   DIAMETER_INVALID_HDR_BITS          3008
-   DIAMETER_INVALID_AVP_BITS          3009
-   DIAMETER_UNKNOWN_PEER              3010
-
-;; 7.1.4.  Transient Failures
-   DIAMETER_AUTHENTICATION_REJECTED   4001
-   DIAMETER_OUT_OF_SPACE              4002
-   ELECTION_LOST                      4003
-
-;; 7.1.5.  Permanent Failures
-   DIAMETER_AVP_UNSUPPORTED           5001
-   DIAMETER_UNKNOWN_SESSION_ID        5002
-   DIAMETER_AUTHORIZATION_REJECTED    5003
-   DIAMETER_INVALID_AVP_VALUE         5004
-   DIAMETER_MISSING_AVP               5005
-   DIAMETER_RESOURCES_EXCEEDED        5006
-   DIAMETER_CONTRADICTING_AVPS        5007
-   DIAMETER_AVP_NOT_ALLOWED           5008
-   DIAMETER_AVP_OCCURS_TOO_MANY_TIMES 5009
-   DIAMETER_NO_COMMON_APPLICATION     5010
-   DIAMETER_UNSUPPORTED_VERSION       5011
-   DIAMETER_UNABLE_TO_COMPLY          5012
-   DIAMETER_INVALID_BIT_IN_HEADER     5013
-   DIAMETER_INVALID_AVP_LENGTH        5014
-   DIAMETER_INVALID_MESSAGE_LENGTH    5015
-   DIAMETER_INVALID_AVP_BIT_COMBO     5016
-   DIAMETER_NO_COMMON_SECURITY        5017
-
-@grouped 
-
-      Proxy-Info ::= < AVP Header: 284 >
-                     { Proxy-Host }
-                     { Proxy-State }
-                   * [ AVP ]
-
-      Failed-AVP ::= < AVP Header: 279 >
-                    1* {AVP}
-
-      Experimental-Result ::= < AVP Header: 297 >
-                                 { Vendor-Id }
-                                 { Experimental-Result-Code }
-
-  Vendor-Specific-Application-Id ::= < AVP Header: 260 >
-                                     1* { Vendor-Id }
-                                        [ Auth-Application-Id ]
-                                        [ Acct-Application-Id ]
-
-;; The E2E-Sequence AVP is defined in RFC 3588 as Grouped, but 
-;; there is no definition of the group - only an informal text stating
-;; that there should be a nonce (an OctetString) and a counter
-;; (integer)
-;;
-      E2E-Sequence ::= <AVP Header: 300 >
-                   2* { AVP }
diff --git a/lib/diameter/src/app/modules.mk b/lib/diameter/src/app/modules.mk
deleted file mode 100644
index a7a78b1a9d..0000000000
--- a/lib/diameter/src/app/modules.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2010-2011. 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.
-# 
-# %CopyrightEnd%
-
-SPEC_FILES = \
-	diameter_gen_base_rfc3588.dia \
-	diameter_gen_base_accounting.dia \
-	diameter_gen_relay.dia
-
-MODULES = \
-	diameter \
-	diameter_app \
-	diameter_callback \
-	diameter_capx \
-	diameter_config \
-	diameter_dbg \
-	diameter_codec \
-	diameter_dict \
-	diameter_exprecs \
-	diameter_info \
-	diameter_lib \
-	diameter_misc_sup \
-	diameter_peer \
-	diameter_peer_fsm \
-	diameter_peer_fsm_sup \
-	diameter_reg \
-	diameter_service \
-	diameter_service_sup \
-	diameter_session \
-	diameter_stats \
-	diameter_sup \
-	diameter_sync \
-	diameter_types \
-	diameter_watchdog \
-	diameter_watchdog_sup
-
-INTERNAL_HRL_FILES = \
-	diameter_internal.hrl \
-	diameter_types.hrl
-
-EXTERNAL_HRL_FILES = \
-	../../include/diameter.hrl \
-	../../include/diameter_gen.hrl
-
-EXAMPLE_FILES = \
-	../../examples/GNUmakefile \
-	../../examples/peer.erl \
-	../../examples/client.erl \
-	../../examples/client_cb.erl \
-	../../examples/server.erl \
-	../../examples/server_cb.erl \
-	../../examples/relay.erl \
-	../../examples/relay_cb.erl
diff --git a/lib/diameter/src/app/diameter.app.src b/lib/diameter/src/base/diameter.app.src
index 119997953e..c092fdb022 100644
--- a/lib/diameter/src/app/diameter.app.src
+++ b/lib/diameter/src/base/diameter.app.src
@@ -20,7 +20,7 @@
 {application, diameter,
  [{description, "Diameter protocol"},
   {vsn, "%VSN%"},
-  {modules, [%APP_MODULES%,%COMPILER_MODULES%,%TRANSPORT_MODULES%]},
+  {modules, [%MODULES%]},
   {registered, []},
   {applications, [stdlib, kernel]},
   {env, []},
diff --git a/lib/diameter/src/base/diameter.appup.src b/lib/diameter/src/base/diameter.appup.src
new file mode 100644
index 0000000000..6d8ceadb92
--- /dev/null
+++ b/lib/diameter/src/base/diameter.appup.src
@@ -0,0 +1,47 @@
+%% This is an -*- erlang -*- file.
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+{"%VSN%",
+ [
+  {"0.9",
+   [
+    {load_module, diameter,           soft_purge, soft_purge, []},
+    {load_module, diameter_capx,      soft_purge, soft_purge, []},
+    {load_module, diameter_codec,     soft_purge, soft_purge, [diameter_lib]},
+    {load_module, diameter_lib,       soft_purge, soft_purge, []},
+    {load_module, diameter_types,     soft_purge, soft_purge, []},
+    {load_module, diameter_gen_base_accounting, soft_purge, soft_purge, []},
+    {load_module, diameter_gen_base_rfc3588,    soft_purge, soft_purge, []},
+    {load_module, diameter_gen_relay, soft_purge, soft_purge, []},
+    {update, diameter_service,  soft, soft_purge, soft_purge, [diameter_lib]},
+    {update, diameter_config,   soft, soft_purge, soft_purge, []},
+    {update, diameter_peer,     soft, soft_purge, soft_purge, []},
+    {update, diameter_peer_fsm, soft, soft_purge, soft_purge, [diameter_lib]},
+    {update, diameter_reg,      soft, soft_purge, soft_purge, []},
+    {update, diameter_sctp,     soft, soft_purge, soft_purge, []},
+    {update, diameter_stats,    soft, soft_purge, soft_purge, []},
+    {update, diameter_sync,     soft, soft_purge, soft_purge, []},
+    {update, diameter_watchdog, soft, soft_purge, soft_purge, [diameter_lib]}
+   ]
+  }
+ ],
+ [
+ ]
+}.
diff --git a/lib/diameter/src/app/diameter.erl b/lib/diameter/src/base/diameter.erl
index 2f721421d8..2f721421d8 100644
--- a/lib/diameter/src/app/diameter.erl
+++ b/lib/diameter/src/base/diameter.erl
diff --git a/lib/diameter/src/app/diameter_app.erl b/lib/diameter/src/base/diameter_app.erl
index 600f7ff04d..600f7ff04d 100644
--- a/lib/diameter/src/app/diameter_app.erl
+++ b/lib/diameter/src/base/diameter_app.erl
diff --git a/lib/diameter/src/app/diameter_callback.erl b/lib/diameter/src/base/diameter_callback.erl
index fcf9a8fc1e..6d5c8cdca1 100644
--- a/lib/diameter/src/app/diameter_callback.erl
+++ b/lib/diameter/src/base/diameter_callback.erl
@@ -60,28 +60,28 @@ pick_peer([Peer|_], _, _SvcName, _State) ->
 %%% ----------------------------------------------------------
 
 prepare_request(Pkt, _SvcName, _Peer) ->
-    Pkt.
+    {send, Pkt}.
 
 %%% ----------------------------------------------------------
 %%% # prepare_retransmit/3
 %%% ----------------------------------------------------------
 
 prepare_retransmit(Pkt, _SvcName, _Peer) ->
-    Pkt.
+    {send, Pkt}.
 
 %%% ----------------------------------------------------------
 %%% # handle_request/3
 %%% ----------------------------------------------------------
 
 handle_request(_Pkt, _SvcName, _Peer) ->
-    discard.
+    {protocol_error, 3001}.  %% DIAMETER_COMMAND_UNSUPPORTED
 
 %%% ----------------------------------------------------------
 %%% # handle_answer/4
 %%% ----------------------------------------------------------
 
 handle_answer(#diameter_packet{msg = Ans}, _Req, _SvcName, _Peer) ->
-    {ok, Ans}.
+    Ans.
 
 %%% ---------------------------------------------------------------------------
 %%% # handle_error/4
diff --git a/lib/diameter/src/app/diameter_capx.erl b/lib/diameter/src/base/diameter_capx.erl
index aa5318e79d..138e76411e 100644
--- a/lib/diameter/src/app/diameter_capx.erl
+++ b/lib/diameter/src/base/diameter_capx.erl
@@ -62,6 +62,7 @@
 -define(NOSECURITY, ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_NO_COMMON_SECURITY').
 
 -define(NO_INBAND_SECURITY, 0).
+-define(TLS, 1).
 
 %% ===========================================================================
 
@@ -80,7 +81,7 @@ recv_CER(CER, Svc) ->
     try_it([fun rCER/2, CER, Svc]).
 
 -spec recv_CEA(#diameter_base_CEA{}, #diameter_service{})
-   -> tried({['Unsigned32'()], #diameter_caps{}}).
+   -> tried({['Unsigned32'()], ['Unsigned32'()], #diameter_caps{}}).
 
 recv_CEA(CEA, Svc) ->
     try_it([fun rCEA/2, CEA, Svc]).
@@ -126,10 +127,11 @@ mk_caps(Caps0, Opts) ->
 set_cap({Key, _}, _) ->
     ?THROW({duplicate, Key}).
 
-cap(K, V) when K == 'Origin-Host';
-               K == 'Origin-Realm';
-               K == 'Vendor-Id';
-               K == 'Product-Name' ->
+cap(K, V)
+  when K == 'Origin-Host';
+       K == 'Origin-Realm';
+       K == 'Vendor-Id';
+       K == 'Product-Name' ->
     V;
 
 cap('Host-IP-Address', Vs)
@@ -139,11 +141,8 @@ cap('Host-IP-Address', Vs)
 cap('Firmware-Revision', V) ->
     [V];
 
-%% Not documented but accept it as long as it's what we support.
-cap('Inband-Security-Id', [0] = Vs) ->  %% NO_INBAND_SECURITY
-    Vs;
-
-cap(K, Vs) when K /= 'Inband-Security-Id', is_list(Vs) ->
+cap(_, Vs)
+  when is_list(Vs) ->
     Vs;
 
 cap(K, V) ->
@@ -161,28 +160,10 @@ ipaddr(A) ->
 %%
 %% Build a CER record to send to a remote peer.
 
-bCER(#diameter_caps{origin_host = Host,
-                    origin_realm = Realm,
-                    host_ip_address = Addrs,
-                    vendor_id = Vid,
-                    product_name = Name,
-                    origin_state_id = OSI,
-                    supported_vendor_id = SVid,
-                    auth_application_id = AuId,
-                    acct_application_id = AcId,
-                    vendor_specific_application_id = VSA,
-                    firmware_revision = Rev}) ->
-    #diameter_base_CER{'Origin-Host' = Host,
-                       'Origin-Realm' = Realm,
-                       'Host-IP-Address' = Addrs,
-                       'Vendor-Id' = Vid,
-                       'Product-Name' = Name,
-                       'Origin-State-Id' = OSI,
-                       'Supported-Vendor-Id' = SVid,
-                       'Auth-Application-Id' = AuId,
-                       'Acct-Application-Id' = AcId,
-                       'Vendor-Specific-Application-Id' = VSA,
-                       'Firmware-Revision' = Rev}.
+%% Use the fact that diameter_caps has the same field names as CER.
+bCER(#diameter_caps{} = Rec) ->
+    #diameter_base_CER{}
+        = list_to_tuple([diameter_base_CER | tl(tuple_to_list(Rec))]).
 
 %% rCER/2
 %%
@@ -219,19 +200,16 @@ bCER(#diameter_caps{origin_host = Host,
 %% That is, each side sends all of its capabilities and is responsible for
 %% not sending commands that the peer doesn't support.
 
-%% TODO: Make it an option to send only common applications in CEA to
-%%       allow backwards compatibility, and also because there are likely
-%%       servers that expect this. Or maybe a callback.
-
 %% 6.10.  Inband-Security-Id AVP
 %%
 %%   NO_INBAND_SECURITY                0
 %%      This peer does not support TLS.  This is the default value, if the
 %%      AVP is omitted.
+%%
+%%   TLS                               1
+%%      This node supports TLS security, as defined by [TLS].
 
 rCER(CER, #diameter_service{capabilities = LCaps} = Svc) ->
-    #diameter_base_CER{'Inband-Security-Id' = RIS}
-        = CER,
     #diameter_base_CEA{}
         = CEA
         = cea_from_cer(bCER(LCaps)),
@@ -241,56 +219,95 @@ rCER(CER, #diameter_service{capabilities = LCaps} = Svc) ->
 
     {SApps,
      RCaps,
-     build_CEA([] == SApps,
-               RIS,
-               lists:member(?NO_INBAND_SECURITY, RIS),
-               CEA#diameter_base_CEA{'Result-Code' = ?SUCCESS,
-                                     'Inband-Security-Id' = []})}.
+     build_CEA(SApps,
+               LCaps,
+               RCaps,
+               CEA#diameter_base_CEA{'Result-Code' = ?SUCCESS})}.
 
-%% TODO: 5.3 of RFC3588 says we MUST return DIAMETER_NO_COMMON_APPLICATION
+%% TODO: 5.3 of RFC 3588 says we MUST return DIAMETER_NO_COMMON_APPLICATION
 %%       in the CEA and SHOULD disconnect the transport. However, we have
 %%       no way to guarantee the send before disconnecting.
 
-build_CEA(true, _, _, CEA) ->
+build_CEA([], _, _, CEA) ->
     CEA#diameter_base_CEA{'Result-Code' = ?NOAPP};
-build_CEA(false, [_|_], false, CEA) ->
-    CEA#diameter_base_CEA{'Result-Code' = ?NOSECURITY};
-build_CEA(false, [_|_], true, CEA) ->
-    CEA#diameter_base_CEA{'Inband-Security-Id' = [?NO_INBAND_SECURITY]};
-build_CEA(false, [], false, CEA) ->
-    CEA.
+
+build_CEA(_, LCaps, RCaps, CEA) ->
+    case common_security(LCaps, RCaps) of
+        [] ->
+            CEA#diameter_base_CEA{'Result-Code' = ?NOSECURITY};
+        [_] = IS ->
+            CEA#diameter_base_CEA{'Inband-Security-Id' = IS}
+    end.
+
+%% common_security/2
+
+common_security(#diameter_caps{inband_security_id = LS},
+                #diameter_caps{inband_security_id = RS}) ->
+    cs(LS, RS).
+
+%% Unspecified is equivalent to NO_INBAND_SECURITY.
+cs([], RS) ->
+    cs([?NO_INBAND_SECURITY], RS);
+cs(LS, []) ->
+    cs(LS, [?NO_INBAND_SECURITY]);
+
+%% Agree on TLS if both parties support it. When sending CEA, this is
+%% to ensure the peer is clear that we will be expecting a TLS
+%% handshake since there is no ssl:maybe_accept that would allow the
+%% peer to choose between TLS or not upon reception of our CEA. When
+%% receiving CEA it deals with a server that isn't explicit about its choice.
+%% TODO: Make the choice configurable.
+cs(LS, RS) ->
+    Is = ordsets:to_list(ordsets:intersection(ordsets:from_list(LS),
+                                              ordsets:from_list(RS))),
+    case lists:member(?TLS, Is) of
+        true ->
+            [?TLS];
+        false when [] == Is ->
+            Is;
+        false ->
+            [hd(Is)]  %% probably NO_INBAND_SECURITY
+    end.
+%% The only two values defined by RFC 3588 are NO_INBAND_SECURITY and
+%% TLS but don't enforce this. In theory this allows some other
+%% security mechanism we don't have to know about, although in
+%% practice something there may be a need for more synchronization
+%% than notification by way of an event subscription offers.
 
 %% cea_from_cer/1
 
+%% CER is a subset of CEA, the latter adding Result-Code and a few
+%% more AVP's.
 cea_from_cer(#diameter_base_CER{} = CER) ->
     lists:foldl(fun(F,A) -> to_cea(CER, F, A) end,
                 #diameter_base_CEA{},
                 record_info(fields, diameter_base_CER)).
 
 to_cea(CER, Field, CEA) ->
-    try ?BASE:'#info-'(diameter_base_CEA, {index, Field}) of
-        N ->
-            setelement(N, CEA, ?BASE:'#get-'(Field, CER))
+    try ?BASE:'#get-'(Field, CER) of
+        V -> ?BASE:'#set-'({Field, V}, CEA)
     catch
-        error: _ ->
-            CEA
+        error: _ -> CEA
     end.
-
+        
 %% rCEA/2
 
-rCEA(CEA, #diameter_service{capabilities = LCaps} = Svc)
-  when is_record(CEA, diameter_base_CEA) ->
-    #diameter_base_CEA{'Result-Code' = RC}
-        = CEA,
-
+rCEA(#diameter_base_CEA{'Result-Code' = RC}
+     = CEA,
+     #diameter_service{capabilities = LCaps}
+     = Svc) ->
     RC == ?SUCCESS orelse ?THROW({'Result-Code', RC}),
 
     RCaps = capx_to_caps(CEA),
     SApps = common_applications(LCaps, RCaps, Svc),
 
-    [] == SApps andalso ?THROW({no_common_apps, LCaps, RCaps}),
+    [] == SApps andalso ?THROW(no_common_applications),
+
+    IS = common_security(LCaps, RCaps),
+
+    [] == IS andalso ?THROW(no_common_security),
 
-    {SApps, RCaps};
+    {SApps, IS, RCaps};
 
 rCEA(CEA, _Svc) ->
     ?THROW({invalid, CEA}).
diff --git a/lib/diameter/src/app/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl
index f6cbde5446..d88f42fb7c 100644
--- a/lib/diameter/src/app/diameter_codec.erl
+++ b/lib/diameter/src/base/diameter_codec.erl
@@ -140,10 +140,10 @@ make_flags(Flags0, #diameter_header{is_request       = R,
 mf(undefined, F, _) ->
     F;
 mf(B, F, N) ->  %% reset the affected bit
-    (F bxor (F band (1 bsl N))) bor (bit(B) bsl N).
+    (F bxor (F band (1 bsl N))) bor bit(B, N).
 
-bit(true)  -> 1;
-bit(false) -> 0.
+bit(true, N)  -> 1 bsl N;
+bit(false, _) -> 0.
 
 %% values/1
 
@@ -199,25 +199,16 @@ msg_header(Mod, MsgName, Header) ->
 
 p(Flags, #diameter_header{is_request = true,
                           is_proxiable = P}) ->
-    Flags bor choose(P, 2#01000000, 0);
+    Flags band (2#10110000 bor choose(P, 2#01000000, 0));
 p(Flags, _) ->
     Flags.
 
-%% The header below is that of the incoming request being answered,
-%% not of the answer (which hasn't been encoded yet).
-
 h(Mod, 'answer-message' = MsgName, Header) ->
     ?BASE = Mod,
-    #diameter_header{is_request = true,
-                     cmd_code = Code}
-        = Header,
+    #diameter_header{cmd_code = Code} = Header,
     {_, Flags, ApplId} = ?BASE:msg_header(MsgName),
     {Code, Flags, ApplId};
 
-h(Mod, MsgName, #diameter_header{is_request = true,
-                                 cmd_code = Code}) ->
-    {Code, _, _} = Mod:msg_header(MsgName); %% ensure Code
-
 h(Mod, MsgName, _) ->
     Mod:msg_header(MsgName).
 
@@ -290,7 +281,8 @@ decode_avps(MsgName, Mod, Pkt, {Bs, Avps}) ->  %% invalid avp bits ...
 
 decode_avps('', Mod, Pkt, Avps) ->  %% unknown message ...
     ?LOG(unknown, {Mod, Pkt#diameter_packet.header}),
-    Pkt#diameter_packet{errors = lists:reverse(Avps)};
+    Pkt#diameter_packet{avps = lists:reverse(Avps),
+                        errors = [3001]};   %% DIAMETER_COMMAND_UNSUPPORTED
 %% msg = undefined identifies this case.
 
 decode_avps(MsgName, Mod, Pkt, Avps) ->  %% ... or not
diff --git a/lib/diameter/src/app/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl
index 42c70890b3..a6b48fe65b 100644
--- a/lib/diameter/src/app/diameter_config.erl
+++ b/lib/diameter/src/base/diameter_config.erl
@@ -267,7 +267,7 @@ handle_call(uptime, _, #state{id = Time} = State) ->
     {reply, diameter_lib:now_diff(Time), State};
 
 handle_call(Req, From, State) ->
-    warning_msg("received unexpected request from ~p:~n~w", [From, Req]),
+    ?UNEXPECTED([Req, From]),
     Reply = {error, {bad_request, Req}},
     {reply, Reply, State}.
 
@@ -276,7 +276,7 @@ handle_call(Req, From, State) ->
 %%% ----------------------------------------------------------
 
 handle_cast(Msg, State) ->
-    warning_msg("received unexpected message:~n~w", [Msg]),
+    ?UNEXPECTED([Msg]),
     {noreply, State}.
 
 %%% ----------------------------------------------------------
@@ -309,7 +309,7 @@ handle_info(restart, State) ->
     {noreply, State};
 
 handle_info(Info, State) ->
-    warning_msg("received unknown info:~n~w", [Info]),
+    ?UNEXPECTED([Info]),
     {noreply, State}.
 
 %%--------------------------------------------------------------------
@@ -674,8 +674,3 @@ cb(M,F) ->
 
 call(Request) ->
     gen_server:call(?SERVER, Request, infinity).
-
-%% warning_msg/2
-
-warning_msg(F, A) ->
-    ?diameter_warning("~p: " ++ F, [?MODULE | A]).
diff --git a/lib/diameter/src/app/diameter_dbg.erl b/lib/diameter/src/base/diameter_dbg.erl
index b18f34e13d..5b0ac3a3b6 100644
--- a/lib/diameter/src/app/diameter_dbg.erl
+++ b/lib/diameter/src/base/diameter_dbg.erl
@@ -68,12 +68,6 @@
 
 -define(VALUES(Rec), tl(tuple_to_list(Rec))).
 
-%%% ----------------------------------------------------------
-%%% # log/4
-%%%
-%%% Called to have something to trace on for happenings of interest.
-%%% ----------------------------------------------------------
-
 log(_Slogan, _Mod, _Line, _Details) ->
     ok.
 
@@ -82,9 +76,6 @@ log(_Slogan, _Mod, _Line, _Details) ->
 %%% ----------------------------------------------------------
 
 help() ->
-    ?INFO:usage(usage()).
-
-usage() ->
     not_yet_implemented.
 
 %%% ----------------------------------------------------------
@@ -99,30 +90,23 @@ table(T)
   when (T == diameter_peer) orelse (T == diameter_reg) ->
     ?INFO:format(collect(T), fields(T), fun ?INFO:split/2);
 
-table(diameter_service = T) ->
-    Fs = [name, started] ++ fields(T) ++ [peerT,
-                                          connT,
-                                          share_peers,
-                                          use_shared_peers,
-                                          shared_peers,
-                                          local_peers,
-                                          monitor],
-    ?INFO:format(T,
-                 fun(R) ->
-                         [I,N,S|Vs] = ?VALUES(R),
-                         {Fs, [N,I] ++ ?VALUES(S) ++ Vs}
-                 end,
-                 fun ?INFO:split/2);
-
 table(Table)
   when is_atom(Table) ->
     case fields(Table) of
         undefined = No ->
             No;
         Fields ->
-            ?INFO:format(Table, Fields, fun ?INFO:split/2)
+            ?INFO:format(Table, Fields, fun split/2)
     end.
 
+split([started, name | Fs], [S, N | Vs]) ->
+    {name, [started | Fs], N, [S | Vs]};
+split([[F|FT]|Fs], [Rec|Vs]) ->
+    [_, V | VT] = tuple_to_list(Rec),
+    {F, FT ++ Fs, V, VT ++ Vs};
+split([F|Fs], [V|Vs]) ->
+    {F, Fs, V, Vs}.
+
 %%% ----------------------------------------------------------
 %%% # TableName()
 %%% ----------------------------------------------------------
@@ -146,14 +130,14 @@ table(Table)
 %%% ----------------------------------------------------------
 
 tables() ->
-    format_all(fun ?INFO:split/3).
-
-format_all(SplitFun) ->
-    ?INFO:format(field(?LOCAL), SplitFun, fun collect/1).
+    ?INFO:format(field(?LOCAL), fun split/3, fun collect/1).
 
 field(Tables) ->
     lists:map(fun(T) -> {T, fields(T)} end, lists:sort(Tables)).
 
+split(_, Fs, Vs) ->
+    split(Fs, Vs).
+
 %%% ----------------------------------------------------------
 %%% # modules()
 %%% ----------------------------------------------------------
@@ -396,76 +380,24 @@ stop() ->
 %% tp/1
 
 tpl(T) ->
-    dbg(tpl, dbg(T)).
+    dbg(tpl, T).
 
 tp(T) ->
-    dbg(tp, dbg(T)).
-
-%% dbg/1
-
-dbg(x) ->
-    [{M, x, []} || M <- [diameter_tcp,
-                         diameter_etcp,
-                         diameter_sctp,
-                         diameter_peer_fsm,
-                         diameter_watchdog]];
-
-dbg(log) ->
-    {?MODULE, log, 4};
-
-dbg({log = F, Mods})
-  when is_list(Mods) ->
-    {?MODULE, F, [{['_','$1','_','_'],
-                   [?ORCOND([{'==', '$1', M} || M <- Mods])],
-                   []}]};
-
-dbg({log = F, Mod}) ->
-    dbg({F, [Mod]});
-
-dbg(send) ->
-    {diameter_peer, send, 2};
-
-dbg(recv) ->
-    {diameter_peer, recv, 2};
-
-dbg(sendrecv) ->
-    [{diameter_peer, send, 2},
-     {diameter_peer, recv, 2}];
-
-dbg(decode) ->
-    [{diameter_codec,decode,2}];
-
-dbg(encode) ->
-    [{diameter_codec,encode,2,[]},
-     {diameter_codec,encode,3,[]},
-     {diameter_codec,encode,4}];
-
-dbg(transition = T) ->
-    [{?MODULE, log, [{[T,M,'_','_'],[],[]}]}
-     || M <- [diameter_watchdog, diameter_peer_fsm]];
-
-dbg(T) ->
-    T.
+    dbg(tp, T).
 
 %% dbg/2
 
-dbg(TF, L)
+dbg(F, L)
   when is_list(L) ->
-    {ok, lists:foldl(fun(T,A) -> {ok, X} = dbg(TF, T), [X|A] end, [], L)};
+    [dbg(F, X) || X <- L];
 
 dbg(F, M)
   when is_atom(M) ->
-    dbg(F, {M});
+    apply(dbg, F, [M, x]);
 
 dbg(F, T)
   when is_tuple(T) ->
-    [_|_] = A = tuple_to_list(T),
-    {ok,_} = apply(dbg, F, case is_list(lists:last(A)) of
-                               false ->
-                                   A ++ [[{'_',[],[{exception_trace}]}]];
-                               true ->
-                                   A
-                           end).
+    apply(dbg, F, tuple_to_list(T)).
 
 %% ===========================================================================
 %% ===========================================================================
@@ -493,15 +425,19 @@ peers(Name) ->
 
 peers(_, undefined) ->
     [];
-peers(Name, {Cs,As}) ->
-    mk_peer(Name, connector, Cs) ++ mk_peer(Name, acceptor, As).
-
-mk_peer(Name, T, Ts) ->
-    [[Name | mk_peer(T,Vs)] || Vs <- Ts].
-
-mk_peer(Type, Vs) ->
-    [Ref, State, Opts, WPid, TPid, SApps, Caps]
-        = get_values(Vs, [ref, state, options, watchdog, peer, apps, caps]),
+peers(Name, Ts) ->
+    lists:flatmap(fun(T) -> mk_peers(Name, T) end, Ts).
+
+mk_peers(Name, [_, {type, connect} | _] = Ts) ->
+    [[Name | mk_peer(Ts)]];
+mk_peers(Name, [R, {type, listen}, O, {accept = A, As}]) ->
+    [[Name | mk_peer([R, {type, A}, O | Ts])] || Ts <- As].
+%% This is a bit lame: service_info works to build this list and out
+%% of something like what we want here and then we take it apart.
+
+mk_peer(Vs) ->
+    [Type, Ref, State, Opts, WPid, TPid, SApps, Caps]
+        = get_values(Vs, [type,ref,state,options,watchdog,peer,apps,caps]),
     [Ref, State, [{type, Type} | Opts], s(WPid), s(TPid), SApps, Caps].
 
 get_values(Vs, Ks) ->
@@ -509,9 +445,13 @@ get_values(Vs, Ks) ->
 
 s(undefined = T) ->
     T;
+s({Pid, _Started, _State}) ->
+    state(Pid);
+s({Pid, _Started}) ->
+    state(Pid).
 
 %% Collect states from watchdog/transport pids.
-s(Pid) ->
+state(Pid) ->
     MRef = erlang:monitor(process, Pid),
     Pid ! {state, self()},
     receive
@@ -541,7 +481,18 @@ fields(diameter_stats) ->
             []
     end;
 
-?FIELDS(diameter_service);
+fields(diameter_service) ->
+    [started,
+     name,
+     record_info(fields, diameter_service),
+     peerT,
+     connT,
+     share_peers,
+     use_shared_peers,
+     shared_peers,
+     local_peers,
+     monitor];
+
 ?FIELDS(diameter_event);
 ?FIELDS(diameter_uri);
 ?FIELDS(diameter_avp);
diff --git a/lib/diameter/src/app/diameter_dict.erl b/lib/diameter/src/base/diameter_dict.erl
index 3b9ba00a3f..3b9ba00a3f 100644
--- a/lib/diameter/src/app/diameter_dict.erl
+++ b/lib/diameter/src/base/diameter_dict.erl
diff --git a/lib/diameter/src/app/diameter_info.erl b/lib/diameter/src/base/diameter_info.erl
index 39d32d07cd..39d32d07cd 100644
--- a/lib/diameter/src/app/diameter_info.erl
+++ b/lib/diameter/src/base/diameter_info.erl
diff --git a/lib/diameter/src/app/diameter_internal.hrl b/lib/diameter/src/base/diameter_internal.hrl
index 9de3914830..63b35550a8 100644
--- a/lib/diameter/src/app/diameter_internal.hrl
+++ b/lib/diameter/src/base/diameter_internal.hrl
@@ -37,13 +37,14 @@
 %% Failure reports always get a stack trace.
 -define(STACK, erlang:get_stacktrace()).
 
-%% Info report for anything unexpected.
--define(REPORT(Reason, Func, Args),
-        diameter_lib:report(Reason, {?MODULE, Func, Args})).
+%% Warning report for unexpected messages in various processes.
+-define(UNEXPECTED(F,A),
+        diameter_lib:warning_report(unexpected, {?MODULE, F, A})).
+-define(UNEXPECTED(A), ?UNEXPECTED(?FUNC, A)).
 
 %% Something to trace on.
 -define(LOG(Slogan, Details),
-	diameter_dbg:log(Slogan, ?MODULE, ?LINE, Details)).
+	diameter_lib:log(Slogan, ?MODULE, ?LINE, Details)).
 -define(LOGC(Bool, Slogan, Details), ((Bool) andalso ?LOG(Slogan, Details))).
 
 %% Compensate for no builtin ?FUNC for use in log reports.
@@ -77,19 +78,3 @@
          server_id,
          is_dynamic,
          expiration}).
-
-%%%----------------------------------------------------------------------
-%%% Error/warning/info message macro(s)
-%%%----------------------------------------------------------------------
-
--define(diameter_info(F, A),
-        (catch error_logger:info_msg("[ ~w : ~w : ~p ] ~n" ++ F ++ "~n",
-                                     [?APPLICATION, ?MODULE, self()|A]))).
-
--define(diameter_warning(F, A),
-        (catch error_logger:warning_msg("[ ~w : ~w : ~p ] ~n" ++ F ++ "~n",
-                                        [?APPLICATION, ?MODULE, self()|A]))).
-
--define(diameter_error(F, A),
-        (catch error_logger:error_msg("[ ~w : ~w : ~p ] ~n" ++ F ++ "~n",
-                                      [?APPLICATION, ?MODULE, self()|A]))).
diff --git a/lib/diameter/src/app/diameter_lib.erl b/lib/diameter/src/base/diameter_lib.erl
index b5c0e1bf6a..362d593b24 100644
--- a/lib/diameter/src/app/diameter_lib.erl
+++ b/lib/diameter/src/base/diameter_lib.erl
@@ -30,7 +30,8 @@
          ipaddr/1,
          spawn_opts/2,
          wait/1,
-         fold_tuple/3]).
+         fold_tuple/3,
+         log/4]).
 
 -include("diameter_internal.hrl").
 
@@ -46,14 +47,9 @@
 report(Reason, MFA) ->
     info_report(Reason, MFA).
 
-info_report(Reason, {M,F,A}) ->
-    error_logger:info_report("   Reason: ~p~n"
-			     "      Pid: ~p~n"
-			     "     Node: ~p~n"
-			     "   Module: ~p~n"
-			     " Function: ~p~n"
-			     "Arguments: ~p~n",
-			     [Reason, self(), node(), M, F, A]).
+info_report(Reason, MFA) ->
+    report(fun error_logger:info_report/1, Reason, MFA),
+    true.
 
 %%% ---------------------------------------------------------------------------
 %%% # error_report(Reason, MFA)
@@ -69,7 +65,7 @@ warning_report(Reason, MFA) ->
     report(fun error_logger:warning_report/1, Reason, MFA).
 
 report(Fun, Reason, MFA) ->
-    Fun([{reason, Reason}, {who, self()}, {where, node()}, {what, MFA}]),
+    Fun([{why, Reason}, {who, self()}, {what, MFA}]),
     false.
 
 %%% ---------------------------------------------------------------------------
@@ -255,12 +251,22 @@ w(L) ->
 fold_tuple(_, T, undefined) ->
     T;
 
-fold_tuple(N, T0, T) ->
-    element(2, lists:foldl(fun(X, {M,_} = A) -> {M+1, ft(X, A)} end,
-                           {N, T0},
-                           lists:nthtail(N-1, tuple_to_list(T)))).
+fold_tuple(N, T0, T1) ->
+    {_, T} = lists:foldl(fun(V, {I,_} = IT) -> {I+1, ft(V, IT)} end,
+                         {N, T0},
+                         lists:nthtail(N-1, tuple_to_list(T1))),
+    T.
 
-ft(undefined, T) ->
+ft(undefined, {_, T}) ->
     T;
-ft(X, {N, T}) ->
-    setelement(N, T, X).
+ft(Value, {Idx, T}) ->
+    setelement(Idx, T, Value).
+
+%%% ----------------------------------------------------------
+%%% # log(Slogan, Mod, Line, Details)
+%%%
+%%% Called to have something to trace on for happenings of interest.
+%%% ----------------------------------------------------------
+
+log(_, _, _, _) ->
+    ok.
diff --git a/lib/diameter/src/app/diameter_misc_sup.erl b/lib/diameter/src/base/diameter_misc_sup.erl
index 4e40476f14..4e40476f14 100644
--- a/lib/diameter/src/app/diameter_misc_sup.erl
+++ b/lib/diameter/src/base/diameter_misc_sup.erl
diff --git a/lib/diameter/src/app/diameter_peer.erl b/lib/diameter/src/base/diameter_peer.erl
index 6b8971b8ea..3e78c4caef 100644
--- a/lib/diameter/src/app/diameter_peer.erl
+++ b/lib/diameter/src/base/diameter_peer.erl
@@ -148,7 +148,7 @@ handle_call(uptime, _, #state{id = Time} = State) ->
     {reply, diameter_lib:now_diff(Time), State};
 
 handle_call(Req, From, State) ->
-    warning_msg("received unexpected request from ~p:~n~w", [From, Req]),
+    ?UNEXPECTED([Req, From]),
     {reply, nok, State}.
 
 %%% ----------------------------------------------------------
@@ -156,7 +156,7 @@ handle_call(Req, From, State) ->
 %%% ----------------------------------------------------------
 
 handle_cast(Msg, State) ->
-    warning_msg("received unexpected message:~n~w", [Msg]),
+    ?UNEXPECTED([Msg]),
     {noreply, State}.
 
 %%% ----------------------------------------------------------
@@ -169,7 +169,7 @@ handle_info({notify, SvcName, T}, S) ->
     {noreply, S};
 
 handle_info(Info, State) ->
-    warning_msg("received unexpected info:~n~w", [Info]),
+    ?UNEXPECTED([Info]),
     {noreply, State}.
 
 %% ----------------------------------------------------------
@@ -223,8 +223,3 @@ value([], V) ->
 
 call(Request) ->
     gen_server:call(?SERVER, Request, infinity).
-
-%% warning_msg/2
-
-warning_msg(F, A) ->
-    ?diameter_warning("~p: " ++ F, [?MODULE | A]).
diff --git a/lib/diameter/src/app/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 0252fb3809..282fa2742f 100644
--- a/lib/diameter/src/app/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -52,6 +52,9 @@
 -define(GOAWAY, ?'DIAMETER_BASE_DISCONNECT-CAUSE_DO_NOT_WANT_TO_TALK_TO_YOU').
 -define(REBOOT, ?'DIAMETER_BASE_DISCONNECT-CAUSE_REBOOTING').
 
+-define(NO_INBAND_SECURITY, 0).
+-define(TLS, 1).
+
 -define(LOOP_TIMEOUT, 2000).
 
 %% RFC 3588:
@@ -195,10 +198,8 @@ handle_info(T, #state{} = State) ->
             ?LOG(stop, T),
             x(T, State)
     catch
-        throw: {?MODULE, close = C, Reason} ->
-            ?LOG(C, {Reason, T}),
-            x(Reason, State);
-        throw: {?MODULE, abort, Reason}  ->
+        throw: {?MODULE, Tag, Reason}  ->
+            ?LOG(Tag, {Reason, T}),
             {stop, {shutdown, Reason}, State}
     end.
 
@@ -281,10 +282,9 @@ transition(shutdown, _) ->  %% DPR already send: ensure expected timeout
 
 %% Request to close the transport connection.
 transition({close = T, Pid}, #state{parent = Pid,
-                                    transport = TPid}
-                             = S) ->
+                                    transport = TPid}) ->
     diameter_peer:close(TPid),
-    close(T,S);
+    {stop, T};
 
 %% DPA reception has timed out.
 transition(dpa_timeout, _) ->
@@ -418,11 +418,11 @@ rcv('CER' = N, Pkt, #state{state = recv_CER} = S) ->
 
 %% Anything but CER/CEA in a non-Open state is an error, as is
 %% CER/CEA in anything but recv_CER/Wait-CEA.
-rcv(Name, _, #state{state = PS} = S)
+rcv(Name, _, #state{state = PS})
   when PS /= 'Open';
        Name == 'CER';
        Name == 'CEA' ->
-    close({Name, PS}, S);
+    {stop, {Name, PS}};
 
 rcv(N, Pkt, S)
   when N == 'DWR';
@@ -497,15 +497,20 @@ build_answer('CER',
     #diameter_service{capabilities = #diameter_caps{origin_host = OH}}
         = Svc,
 
-    {SupportedApps, #diameter_caps{origin_host = DH} = RCaps, CEA}
+    {SupportedApps,
+     #diameter_caps{origin_host = DH} = RCaps,
+     #diameter_base_CEA{'Result-Code' = RC}
+     = CEA}
         = recv_CER(CER, S),
 
     try
-        [] == SupportedApps
-            andalso ?THROW({no_common_application, 5010}),
+        2001 == RC  %% DIAMETER_SUCCESS
+            orelse ?THROW({sent_CEA, RC}),
         register_everywhere({?MODULE, connection, OH, DH})
             orelse ?THROW({election_lost, 4003}),
-        {CEA, [fun open/4, Pkt, SupportedApps, RCaps]}
+        #diameter_base_CEA{'Inband-Security-Id' = [IS]}
+            = CEA,
+        {CEA, [fun open/5, Pkt, SupportedApps, RCaps, {accept, IS}]}
     catch
         ?FAILURE({Reason, RC}) ->
             {answer('CER', S) ++ [{'Result-Code', RC}],
@@ -613,7 +618,7 @@ recv_CER(CER, #state{service = Svc}) ->
 handle_CEA(#diameter_packet{header = #diameter_header{version = V},
                             bin = Bin}
            = Pkt,
-           #state{service = Svc}
+           #state{service = #diameter_service{capabilities = LCaps}}
            = S)
   when is_binary(Bin) ->
     ?LOG(recv, 'CEA'),
@@ -626,7 +631,11 @@ handle_CEA(#diameter_packet{header = #diameter_header{version = V},
 
     [] == Errors orelse close({errors, Errors}, S),
 
-    {SApps, #diameter_caps{origin_host = DH} = RCaps} = recv_CEA(CEA, S),
+    {SApps, [IS], #diameter_caps{origin_host = DH} = RCaps}
+        = recv_CEA(CEA, S),
+
+    #diameter_caps{origin_host = OH}
+        = LCaps,
 
     %% Ensure that we don't already have a connection to the peer in
     %% question. This isn't the peer election of 3588 except in the
@@ -634,40 +643,62 @@ handle_CEA(#diameter_packet{header = #diameter_header{version = V},
     %% receive a CER/CEA, the first that arrives wins the right to a
     %% connection with the peer.
 
-    #diameter_service{capabilities = #diameter_caps{origin_host = OH}}
-        = Svc,
-
     register_everywhere({?MODULE, connection, OH, DH})
-        orelse
-        close({'CEA', DH}, S),
+        orelse close({'CEA', DH}, S),
 
-    open(DPkt, SApps, RCaps, S).
+    open(DPkt, SApps, RCaps, {connect, IS}, S).
 
 %% recv_CEA/2
 
 recv_CEA(CEA, #state{service = Svc} = S) ->
     case diameter_capx:recv_CEA(CEA, Svc) of
-        {ok, {[], _}} ->
+        {ok, {_,_}} -> %% return from old code
+            close({'CEA', update}, S);
+        {ok, {[], _, _}} ->
             close({'CEA', no_common_application}, S);
-        {ok, T} ->
+        {ok, {_, [], _}} ->
+            close({'CEA', no_common_security}, S);
+        {ok, {_,_,_} = T} ->
             T;
         {error, Reason} ->
             close({'CEA', Reason}, S)
     end.
 
-%% open/4
+%% open/5
 
-open(Pkt, SupportedApps, RCaps, #state{parent = Pid,
-                                       service = Svc}
-                                = S) ->
-    #diameter_service{capabilities = #diameter_caps{origin_host = OH}
+open(Pkt, SupportedApps, RCaps, {Type, IS}, #state{parent = Pid,
+                                                   service = Svc}
+                                            = S) ->
+    #diameter_service{capabilities = #diameter_caps{origin_host = OH,
+                                                    inband_security_id = LS}
                                    = LCaps}
         = Svc,
     #diameter_caps{origin_host = DH}
         = RCaps,
+
+    tls_ack(lists:member(?TLS, LS), Type, IS, S),
     Pid ! {open, self(), {OH,DH}, {capz(LCaps, RCaps), SupportedApps, Pkt}},
+
     S#state{state = 'Open'}.
 
+%% We've advertised TLS support: tell the transport the result
+%% and expect a reply when the handshake is complete.
+tls_ack(true, Type, IS, #state{transport = TPid} = S) ->
+    Ref = make_ref(),
+    MRef = erlang:monitor(process, TPid),
+    TPid ! {diameter, {tls, Ref, Type, IS == ?TLS}},
+    receive
+        {diameter, {tls, Ref}} ->
+            erlang:demonitor(MRef, [flush]);
+        {'DOWN', MRef, process, _, _} = T ->
+            close({tls_ack, T}, S)
+    end;
+
+%% Or not. Don't send anything to the transport so that transports
+%% not supporting TLS work as before without modification.
+tls_ack(false, _, _, _) ->
+    ok.
+
 capz(#diameter_caps{} = L, #diameter_caps{} = R) ->
     #diameter_caps{}
         = list_to_tuple([diameter_caps | lists:zip(tl(tuple_to_list(L)),
diff --git a/lib/diameter/src/app/diameter_peer_fsm_sup.erl b/lib/diameter/src/base/diameter_peer_fsm_sup.erl
index 995eaf74d0..995eaf74d0 100644
--- a/lib/diameter/src/app/diameter_peer_fsm_sup.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm_sup.erl
diff --git a/lib/diameter/src/app/diameter_reg.erl b/lib/diameter/src/base/diameter_reg.erl
index 8e5f34c2c3..882b9da238 100644
--- a/lib/diameter/src/app/diameter_reg.erl
+++ b/lib/diameter/src/base/diameter_reg.erl
@@ -243,7 +243,8 @@ handle_call(state, _, State) ->
 handle_call(uptime, _, #state{id = Time} = State) ->
     {reply, diameter_lib:now_diff(Time), State};
 
-handle_call(_Req, _From, State) ->
+handle_call(Req, From, State) ->
+    ?UNEXPECTED([Req, From]),
     {reply, nok, State}.
 
 %%% ----------------------------------------------------------
@@ -251,7 +252,7 @@ handle_call(_Req, _From, State) ->
 %%% ----------------------------------------------------------
 
 handle_cast(Msg, State)->
-    warning_msg("received unexpected message:~n~w", [Msg]),
+    ?UNEXPECTED([Msg]),
     {noreply, State}.
 
 %%% ----------------------------------------------------------
@@ -264,7 +265,7 @@ handle_info({'DOWN', MRef, process, Pid, _}, State) ->
     {noreply, State};
 
 handle_info(Info, State) ->
-    warning_msg("received unknown info:~n~w", [Info]),
+    ?UNEXPECTED([Info]),
     {noreply, State}.
 
 %%% ----------------------------------------------------------
@@ -324,8 +325,3 @@ repl([], _, _) ->
 
 call(Request) ->
     gen_server:call(?SERVER, Request, infinity).
-
-%% warning_msg/2
-
-warning_msg(F, A) ->
-    ?diameter_warning("~p: " ++ F, [?MODULE | A]).
diff --git a/lib/diameter/src/app/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 63b0649dc4..421e36ccf5 100644
--- a/lib/diameter/src/app/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -463,7 +463,7 @@ handle_call(stop, _From, S) ->
 %% stating a monitor that waits for DOWN before returning.
 
 handle_call(Req, From, S) ->
-    ?REPORT(unknown_request, ?FUNC, [Req, From]),
+    unexpected(handle_call, [Req, From], S),
     {reply, nok, S}.
 
 %%% ---------------------------------------------------------------------------
@@ -471,7 +471,7 @@ handle_call(Req, From, S) ->
 %%% ---------------------------------------------------------------------------
 
 handle_cast(Req, S) ->
-    ?REPORT(unknown_request, ?FUNC, [Req]),
+    unexpected(handle_cast, [Req], S),
     {noreply, S}.
 
 %%% ---------------------------------------------------------------------------
@@ -553,8 +553,8 @@ transition({failover, TRef, Seqs}, S) ->
     failover(TRef, Seqs, S),
     ok;
 
-transition(Req, _) ->
-    ?REPORT(unknown_request, ?FUNC, [Req]),
+transition(Req, S) ->
+    unexpected(handle_info, [Req], S),
     ok.
 
 %%% ---------------------------------------------------------------------------
@@ -591,6 +591,9 @@ code_change(FromVsn, SvcName, Extra, #diameter_app{alias = Alias} = A) ->
 %% ===========================================================================
 %% ===========================================================================
 
+unexpected(F, A, #state{service_name = Name}) ->
+    ?UNEXPECTED(F, A ++ [Name]).
+
 cb([_|_] = M, F, A) ->
     eval(M, F, A);
 cb(Rec, F, A) ->
@@ -1398,15 +1401,15 @@ recv_answer(Timeout,
     %% is, from the last peer to which we've transmitted.
 
     receive
-        {answer = A, Ref, Rq, Pkt} ->     %% Answer from peer.
+        {answer = A, Ref, Rq, Pkt} ->     %% Answer from peer
             {A, Rq, Pkt};
-        {timeout = Reason, TRef, _} ->       %% No timely reply
+        {timeout = Reason, TRef, _} ->    %% No timely reply
             {error, Req, Reason};
-        {failover = Reason, TRef, false} ->  %% No alternative peer.
+        {failover = Reason, TRef, false} ->  %% No alternate peer
             {error, Req, Reason};
-        {failover, TRef, Transport} ->       %% Resend to alternate peer.
+        {failover, TRef, Transport} ->    %% Resend to alternate peer
             try_retransmit(Timeout, SvcName, Req, Transport);
-        {failover, TRef} ->  %% May have missed failover notification.
+        {failover, TRef} ->  %% May have missed failover notification
             Seqs = diameter_codec:sequence_numbers(RPkt),
             Pid  = whois(SvcName),
             is_pid(Pid) andalso (Pid ! {failover, TRef, Seqs}),
@@ -1685,9 +1688,9 @@ recv_request({Id, Alias}, T, TPid, Apps, Caps, Pkt) ->
 %%   DIAMETER_APPLICATION_UNSUPPORTED   3007
 %%      A request was sent for an application that is not supported.
 
-recv_request(false, {_, OH, OR}, TPid, _, _, Pkt) ->
-    ?LOG({error, application}, Pkt),
-    reply(answer_message({OH, OR, 3007}, collect_avps(Pkt)), ?BASE, TPid, Pkt).
+recv_request(false, T, TPid, _, _, Pkt) ->
+    As = collect_avps(Pkt),
+    protocol_error(3007, T, TPid, Pkt#diameter_packet{avps = As}).
 
 collect_avps(Pkt) ->
     case diameter_codec:collect_avps(Pkt) of
@@ -1706,13 +1709,9 @@ collect_avps(Pkt) ->
 %%      set to an unrecognized value, or that is inconsistent with the
 %%      AVP's definition.
 %%
-recv_request({_, OH, OR}, {TPid, _}, _, #diameter_packet{errors = [Bs | _],
-                                                         bin = Bin,
-                                                         avps = Avps}
-                                        = Pkt)
+recv_request(T, {TPid, _}, _, #diameter_packet{errors = [Bs | _]} = Pkt)
   when is_bitstring(Bs) ->
-    ?LOG({error, invalid_avp_bits}, Bin),
-    reply(answer_message({OH, OR, 3009}, Avps), ?BASE, TPid, Pkt);
+    protocol_error(3009, T, TPid, Pkt);
 
 %% Either we support this application but don't recognize the command
 %% or we're a relay and the command isn't proxiable.
@@ -1722,18 +1721,15 @@ recv_request({_, OH, OR}, {TPid, _}, _, #diameter_packet{errors = [Bs | _],
 %%      recognize or support.  This MUST be used when a Diameter node
 %%      receives an experimental command that it does not understand.
 %%
-recv_request({_, OH, OR},
+recv_request(T,
              {TPid, _},
              #diameter_app{id = Id},
              #diameter_packet{header = #diameter_header{is_proxiable = P},
-                              msg = M,
-                              avps = Avps,
-                              bin = Bin}
+                              msg = M}
              = Pkt)
   when ?APP_ID_RELAY /= Id, undefined == M;
        ?APP_ID_RELAY == Id, not P ->
-    ?LOG({error, command_unsupported}, Bin),
-    reply(answer_message({OH, OR, 3001}, Avps), ?BASE, TPid, Pkt);
+    protocol_error(3001, T, TPid, Pkt);
 
 %% Error bit was set on a request.
 %%
@@ -1742,15 +1738,12 @@ recv_request({_, OH, OR},
 %%      either set to an invalid combination, or to a value that is
 %%      inconsistent with the command code's definition.
 %%
-recv_request({_, OH, OR},
+recv_request(T,
              {TPid, _},
              _,
-             #diameter_packet{header = #diameter_header{is_error = true},
-                              avps = Avps,
-                              bin = Bin}
+             #diameter_packet{header = #diameter_header{is_error = true}}
              = Pkt) ->
-    ?LOG({error, error_bit}, Bin),
-    reply(answer_message({OH, OR, 3008}, Avps), ?BASE, TPid, Pkt);
+    protocol_error(3008, T, TPid, Pkt);
 
 %% A message in a locally supported application or a proxiable message
 %% in the relay application. Don't distinguish between the two since
@@ -1878,7 +1871,7 @@ resend(true, _, _, T, {TPid, _}, Pkt) ->  %% Route-Record loop
 resend(false,
        Opts,
        App,
-       {SvcName, _, _},
+       {SvcName, _, _} = T,
        {TPid, #diameter_caps{origin_host = {_, OH}}},
        #diameter_packet{header = Hdr0,
                         avps = Avps}
@@ -1887,46 +1880,41 @@ resend(false,
     Seq = diameter_session:sequence(),
     Hdr = Hdr0#diameter_header{hop_by_hop_id = Seq},
     Msg = [Hdr, Route | Avps],
-    %% Filter sender as ineligible receiver.
-    reply(call(SvcName, App, Msg, [{filter, {neg, {host, OH}}} | Opts]),
-          TPid,
-          Pkt).
+    resend(call(SvcName, App, Msg, Opts), T, TPid, Pkt).
 %% The incoming request is relayed with the addition of a
-%% Route-Record. Note the requirement on the return from call/4.
-%% This places a requirement on the values returned by the
-%% handle_answer and handle_error callbacks of the application module
-%% in question.
+%% Route-Record. Note the requirement on the return from call/4 below,
+%% which places a requirement on the value returned by the
+%% handle_answer callback of the application module in question.
+%%
+%% Note that there's nothing stopping the request from being relayed
+%% back to the sender. A pick_peer callback may want to avoid this but
+%% a smart peer might recognize the potential loop and choose another
+%% route. A less smart one will probably just relay the request back
+%% again and force us to detect the loop. A pick_peer that wants to
+%% avoid this can specify filter to avoid the possibility.
+%% Eg. {neg, {host, OH} where #diameter_caps{origin_host = {OH, _}}.
 %%
 %% RFC 6.3 says that a relay agent does not modify Origin-Host but
 %% says nothing about a proxy. Assume it should behave the same way.
 
-%% reply/3
+%% resend/4
 %%
 %% Relay a reply to a relayed request.
 
 %% Answer from the peer: reset the hop by hop identifier and send.
-reply(#diameter_packet{bin = B}
-      = Pkt,
-      TPid,
-      #diameter_packet{header = #diameter_header{hop_by_hop_id = Id},
-                       transport_data = TD}) ->
+resend(#diameter_packet{bin = B}
+       = Pkt,
+       _,
+       TPid,
+       #diameter_packet{header = #diameter_header{hop_by_hop_id = Id},
+                        transport_data = TD}) ->
     send(TPid, Pkt#diameter_packet{bin = diameter_codec:hop_by_hop_id(Id, B),
                                    transport_data = TD});
 %% TODO: counters
 
-%% Not. Ignoring the error feels harsh but there is no appropriate
-%% Result-Code for a protocol error (which this isn't really anyway)
-%% and the RFC doesn't provide any guidance how to act. A weakness
-%% here is that we don't deal well with a decode error: the request
-%% will simply timeout on the peer's end. Better would be to just send
-%% the answer (with modified hop by hop identifier) on regardless, at
-%% least in the relay case in which there's no examination of the
-%% answer. In the proxy case it's not clear that the callback won't
-%% examine the answer. Just be quiet here since a decode error causes
-%% the request process to crash (or not depending on the error and
-%% config and/or handle_answer callback).
-reply(_, _, _) ->
-    ok.
+%% Or not: DIAMETER_UNABLE_TO_DELIVER.
+resend(_, T, TPid, Pkt) ->
+    protocol_error(3002, T, TPid, Pkt).
 
 %% is_loop/4
 %%
@@ -1971,24 +1959,20 @@ reply(Msg, Dict, TPid, #diameter_packet{errors = [H|_] = Es} = Pkt) ->
 
 %% make_reply_packet/2
 
+%% Binaries and header/avp lists are sent as-is.
 make_reply_packet(Bin, _)
   when is_binary(Bin) ->
     #diameter_packet{bin = Bin};
-
 make_reply_packet([#diameter_header{} | _] = Msg, _) ->
     #diameter_packet{msg = Msg};
 
+%% Otherwise a reply message clears the R and T flags and retains the
+%% P flag. The E flag will be set at encode.
 make_reply_packet(Msg, #diameter_packet{header = ReqHdr}) ->
-    #diameter_header{end_to_end_id = EId,
-                     hop_by_hop_id = Hid,
-                     is_proxiable = P}
-        = ReqHdr,
-
-    Hdr = #diameter_header{version = ?DIAMETER_VERSION,
-                           end_to_end_id = EId,
-                           hop_by_hop_id = Hid,
-                           is_proxiable = P,
-                           is_retransmitted = false},
+    Hdr = ReqHdr#diameter_header{version = ?DIAMETER_VERSION,
+                                 is_request = false,
+                                 is_error = undefined,
+                                 is_retransmitted = false},
     #diameter_packet{header = Hdr,
                      msg = Msg}.
 
@@ -2126,16 +2110,6 @@ answer_message({OH, OR, RC}, Avps) ->
 session_id(Code, Vid, Avps)
   when is_list(Avps) ->
     try
-        {value, #diameter_avp{} = Avp} = find_avp(Code, Vid, Avps),
-        Avp
-    catch
-        error: _ ->
-            []
-    end;
-
-session_id(Code, Vid, Avps)
-  when is_list(Avps) ->
-    try
         {value, #diameter_avp{data = D}} = find_avp(Code, Vid, Avps),
         [{'Session-Id', [?BASE:avp(decode, D, 'Session-Id')]}]
     catch
@@ -2482,6 +2456,7 @@ rpd(Pid, Alias, PDict) ->
 %%%
 %%% Output: {TransportPid, #diameter_caps{}, #diameter_app{}}
 %%%         | false
+%%%         | {error, Reason}
 %%% ---------------------------------------------------------------------------
 
 %% Initial call, from an arbitrary process.
@@ -2540,28 +2515,18 @@ get_destination(Msg, Dict) ->
     [str(get_avp_value(Dict, 'Destination-Realm', Msg)),
      str(get_avp_value(Dict, 'Destination-Host', Msg))].
 
-%% TODO:
-%%
-%% Should add some way of specifying destination directly so that the
-%% only requirement is that the prepare_request callback returns
-%% something specific. (eg. {host, DH}; that is, let the caller specify.)
-%%
-%% Also, there is no longer any need to call get_destination at all in
-%% the default case.
-
-str(T)
-  when T == undefined;
-       T == [] ->
+%% This is not entirely correct. The avp could have an arity 1, in
+%% which case an empty list is a DiameterIdentity of length 0 rather
+%% than the list of no values we treat it as by mapping to undefined.
+%% This behaviour is documented.
+str([]) ->
     undefined;
-str([X])
-  when is_list(X) ->
-    X;
 str(T) ->
     T.
 
 %% get_avp_value/3
 %%
-%% Support outgoing messages in one of three forms:
+%% Find an AVP in a message of one of three forms:
 %%
 %% - a message record (as generated from a .dia spec) or
 %% - a list of an atom message name followed by 2-tuple, avp name/value pairs.
@@ -2593,8 +2558,9 @@ get_avp_value(_, Name, [_MsgName | Avps]) ->
             undefined
     end;
 
-get_avp_value(Dict, Name, Rec)
-  when is_tuple(Rec) ->
+%% Message is typically a record but not necessarily: diameter:call/4
+%% can be passed an arbitrary term.
+get_avp_value(Dict, Name, Rec) ->
     try
         Dict:'#get-'(Name, Rec)
     catch
@@ -2690,7 +2656,8 @@ peers(Alias, RH, Filter, Peers) ->
     end.
 
 %% Place a peer whose Destination-Host/Realm matches those of the
-%% request at the front of the result list.
+%% request at the front of the result list. Could add some sort of
+%% 'sort' option to allow more control.
 
 ps([], _, _, {Ys, Ns}) ->
     lists:reverse(Ys, Ns);
@@ -2700,11 +2667,11 @@ ps([{_TPid, #diameter_caps{} = Caps} = TC | Rest], RH, Filter, Acc) ->
                               TC,
                               Acc)).
 
-pacc(true, true, TC, {Ts, Fs}) ->
-    {[TC|Ts], Fs};
-pacc(true, false, TC, {Ts, Fs}) ->
-    {Ts, [TC|Fs]};
-pacc(false, _, _, Acc) ->
+pacc(true, true, Peer, {Ts, Fs}) ->
+    {[Peer|Ts], Fs};
+pacc(true, false, Peer, {Ts, Fs}) ->
+    {Ts, [Peer|Fs]};
+pacc(_, _, _, Acc) ->
     Acc.
 
 %% caps_filter/3
@@ -2712,17 +2679,19 @@ pacc(false, _, _, Acc) ->
 caps_filter(C, RH, {neg, F}) ->
     not caps_filter(C, RH, F);
 
-caps_filter(C, RH, {all, L}) ->
+caps_filter(C, RH, {all, L})
+  when is_list(L) ->
     lists:all(fun(F) -> caps_filter(C, RH, F) end, L);
 
-caps_filter(C, RH, {any, L}) ->
+caps_filter(C, RH, {any, L})
+  when is_list(L) ->
     lists:any(fun(F) -> caps_filter(C, RH, F) end, L);
 
-caps_filter(#diameter_caps{origin_host = {_,H}}, [_,DH], host) ->
-    eq(undefined, DH, H);
+caps_filter(#diameter_caps{origin_host = {_,OH}}, [_,DH], host) ->
+    eq(undefined, DH, OH);
 
-caps_filter(#diameter_caps{origin_realm = {_,R}}, [DR,_], realm) ->
-    eq(undefined, DR, R);
+caps_filter(#diameter_caps{origin_realm = {_,OR}}, [DR,_], realm) ->
+    eq(undefined, DR, OR);
 
 caps_filter(C, _, Filter) ->
     caps_filter(C, Filter).
@@ -2738,6 +2707,9 @@ caps_filter(#diameter_caps{origin_host = {_,OH}}, {host, H}) ->
 caps_filter(#diameter_caps{origin_realm = {_,OR}}, {realm, R}) ->
     eq(any, R, OR);
 
+%% Anything else is expected to be an eval filter. Filter failure is
+%% documented as being equivalent to a non-matching filter.
+
 caps_filter(C, T) ->
     try
         {eval, F} = T,
@@ -2746,8 +2718,14 @@ caps_filter(C, T) ->
         _:_ -> false
     end.
 
-eq(X, A, B) ->
-    X == A orelse A == B.
+eq(Any, Id, PeerId) ->
+    Any == Id orelse try
+                         iolist_to_binary(Id) == iolist_to_binary(PeerId)
+                     catch
+                         _:_ -> false
+                     end.
+%% OctetString() can be specified as an iolist() so test for string
+%% rather then term equality.
 
 %% transports/1
 
diff --git a/lib/diameter/src/app/diameter_service_sup.erl b/lib/diameter/src/base/diameter_service_sup.erl
index 153fff902f..153fff902f 100644
--- a/lib/diameter/src/app/diameter_service_sup.erl
+++ b/lib/diameter/src/base/diameter_service_sup.erl
diff --git a/lib/diameter/src/app/diameter_session.erl b/lib/diameter/src/base/diameter_session.erl
index bb91e97f39..bb91e97f39 100644
--- a/lib/diameter/src/app/diameter_session.erl
+++ b/lib/diameter/src/base/diameter_session.erl
diff --git a/lib/diameter/src/app/diameter_stats.erl b/lib/diameter/src/base/diameter_stats.erl
index b52d4cdcfb..71479afa95 100644
--- a/lib/diameter/src/app/diameter_stats.erl
+++ b/lib/diameter/src/base/diameter_stats.erl
@@ -207,7 +207,7 @@ handle_call({flush, Contrib}, _From, State) ->
     {reply, fetch(Contrib), State};
 
 handle_call(Req, From, State) ->
-    warning_msg("received unexpected request from ~p:~n~w", [From, Req]),
+    ?UNEXPECTED([Req, From]),
     {reply, nok, State}.
 
 %% ----------------------------------------------------------
@@ -219,7 +219,7 @@ handle_cast({incr, Rec}, State) ->
     {noreply, State};
 
 handle_cast(Msg, State) ->
-    warning_msg("received unexpected message:~n~w", [Msg]),
+    ?UNEXPECTED([Msg]),
     {noreply, State}.
 
 %% ----------------------------------------------------------
@@ -231,7 +231,7 @@ handle_info({'DOWN', _MRef, process, Pid, _}, State) ->
     {noreply, State};
 
 handle_info(Info, State) ->
-    warning_msg("received unknown info:~n~w", [Info]),
+    ?UNEXPECTED([Info]),
     {noreply, State}.
 
 %% ----------------------------------------------------------
@@ -340,8 +340,3 @@ cast(Msg) ->
 
 call(Request) ->
     gen_server:call(?SERVER, Request, infinity).
-
-%% warning_msg/2
-
-warning_msg(F, A) ->
-    ?diameter_warning("~p: " ++ F, [?MODULE | A]).
diff --git a/lib/diameter/src/app/diameter_sup.erl b/lib/diameter/src/base/diameter_sup.erl
index e5afd23dcd..e5afd23dcd 100644
--- a/lib/diameter/src/app/diameter_sup.erl
+++ b/lib/diameter/src/base/diameter_sup.erl
diff --git a/lib/diameter/src/app/diameter_sync.erl b/lib/diameter/src/base/diameter_sync.erl
index f7777ae809..ce2db4b3a2 100644
--- a/lib/diameter/src/app/diameter_sync.erl
+++ b/lib/diameter/src/base/diameter_sync.erl
@@ -204,37 +204,37 @@ handle_call(?REQUEST(Type, Name, Req, Max, Timeout),
     T = find(Name, QD),
     nq(queued(T) =< Max, T, {Type, From}, Name, Req, Timeout, State);
 
-handle_call(Request, _From, State) ->
-    {reply, call(Request, State), State}.
+handle_call(Request, From, State) ->
+    {reply, call(Request, From, State), State}.
 
-%% call/2
+%% call/3
 
-call(?CARP(Name), #state{queue = QD}) ->
+call(?CARP(Name), _, #state{queue = QD}) ->
     pcar(find(Name, QD));
 
-call(state, State) ->
+call(state, _, State) ->
     State;
 
-call(uptime, #state{time = T}) ->
+call(uptime, _, #state{time = T}) ->
     diameter_lib:now_diff(T);
 
-call({flush, Name}, #state{queue = QD}) ->
+call({flush, Name}, _, #state{queue = QD}) ->
     cancel(find(Name, QD));
 
-call(pending, #state{pending = N}) ->
+call(pending, _, #state{pending = N}) ->
     N;
 
-call({pending, Name}, #state{queue = QD}) ->
+call({pending, Name}, _, #state{queue = QD}) ->
     queued(find(Name, QD));
 
-call(queues, #state{queue = QD}) ->
+call(queues, _, #state{queue = QD}) ->
     fetch_keys(QD);
 
-call({pids, Name}, #state{queue = QD}) ->
+call({pids, Name}, _, #state{queue = QD}) ->
     plist(find(Name, QD));
 
-call(Req, _State) ->  %% ignore
-    warning_msg("received unexpected request:~n~w", [Req]),
+call(Req, From, _State) ->  %% ignore
+    ?UNEXPECTED(handle_call, [Req, From]),
     nok.
 
 %%% ----------------------------------------------------------
@@ -242,7 +242,7 @@ call(Req, _State) ->  %% ignore
 %%% ----------------------------------------------------------
 
 handle_cast(Msg, State) ->
-    warning_msg("received unexpected message:~n~w", [Msg]),
+    ?UNEXPECTED([Msg]),
     {noreply, State}.
 
 %%% ----------------------------------------------------------
@@ -267,7 +267,7 @@ info({'DOWN', MRef, process, Pid, Info},
                 queue = dq(fetch(Name, QD), Pid, Info, Name, QD)};
 
 info(Info, State) ->
-    warning_msg("received unknown info:~n~w", [Info]),
+    ?UNEXPECTED(handle_info, [Info]),
     State.
 
 reply({call, From}, T) ->
@@ -548,8 +548,3 @@ gen_call(Server, Req, Timeout) ->
         exit: _ ->
             timeout
     end.
-
-%% warning_msg/2
-
-warning_msg(F, A) ->
-    ?diameter_warning("~p: " ++ F, [?MODULE | A]).
diff --git a/lib/diameter/src/app/diameter_types.erl b/lib/diameter/src/base/diameter_types.erl
index 6b1b1b8d39..6b1b1b8d39 100644
--- a/lib/diameter/src/app/diameter_types.erl
+++ b/lib/diameter/src/base/diameter_types.erl
diff --git a/lib/diameter/src/app/diameter_types.hrl b/lib/diameter/src/base/diameter_types.hrl
index 02bf8a74dd..02bf8a74dd 100644
--- a/lib/diameter/src/app/diameter_types.hrl
+++ b/lib/diameter/src/base/diameter_types.hrl
diff --git a/lib/diameter/src/app/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index b7c1491f4b..b7c1491f4b 100644
--- a/lib/diameter/src/app/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.erl
diff --git a/lib/diameter/src/app/diameter_watchdog_sup.erl b/lib/diameter/src/base/diameter_watchdog_sup.erl
index fc837fe4ef..fc837fe4ef 100644
--- a/lib/diameter/src/app/diameter_watchdog_sup.erl
+++ b/lib/diameter/src/base/diameter_watchdog_sup.erl
diff --git a/lib/diameter/src/compiler/Makefile b/lib/diameter/src/compiler/Makefile
deleted file mode 100644
index 3ab76064ac..0000000000
--- a/lib/diameter/src/compiler/Makefile
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2010-2011. 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.
-#
-# %CopyrightEnd%
-#
-#
-
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/target.mk
-EBIN = ../../ebin
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-else
-include $(DIAMETER_TOP)/make/target.mk
-EBIN = ../../ebin
-include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk
-endif
-
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(DIAMETER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-
-RELSYSDIR = $(RELEASE_PATH)/lib/diameter-$(VSN)
-
-INCDIR = ../../include
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-include modules.mk
-
-ERL_FILES = \
-	$(MODULES:%=%.erl)
-
-TARGET_FILES = \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug
-endif
-
-include ../app/diameter.mk
-
-ERL_COMPILE_FLAGS += \
-	$(DIAMETER_ERL_COMPILE_FLAGS) \
-	-I$(INCDIR)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug:
-	@${MAKE} TYPE=debug opt
-
-opt: $(TARGET_FILES)
-
-clean:
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-	rm -f depend.mk
-
-docs:
-
-info:
-	@echo ""
-	@echo "ERL_FILES = $(ERL_FILES)"
-	@echo "HRL_FILES = $(HRL_FILES)"
-	@echo ""
-	@echo "TARGET_FILES = $(TARGET_FILES)"
-	@echo ""
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-# Invoked from ../app to add modules to the app file.
-$(APP_TARGET): force
-	M=`echo $(MODULES) | sed -e 's/^ *//' -e 's/ *$$//' -e 'y/ /,/'`; \
-	echo "/%COMPILER_MODULES%/s//$$M/;w;q" | tr ';' '\n' \
-	| ed -s $@
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/otp_release_targets.mk
-else
-include $(DIAMETER_TOP)/make/release_targets.mk
-endif
-
-release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/compiler
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/compiler
-
-release_docs_spec:
-
-force:
-
-# ----------------------------------------------------
-# Dependencies
-# ----------------------------------------------------
-
-depend: depend.mk
-
-# Generate dependencies makefile.
-depend.mk: ../app/depend.sed $(ERL_FILES) Makefile
-	for f in $(MODULES); do \
-	    sed -f $< $$f.erl | sed "s@/@/$$f@"; \
-	done \
-	> $@
-
--include depend.mk
-
-.PHONY: clean debug depend docs force info opt release_docs_spec release_spec
diff --git a/lib/diameter/src/compiler/diameter_codegen.erl b/lib/diameter/src/compiler/diameter_codegen.erl
index 213ba0d22c..0fd4a0b301 100644
--- a/lib/diameter/src/compiler/diameter_codegen.erl
+++ b/lib/diameter/src/compiler/diameter_codegen.erl
@@ -37,7 +37,6 @@
          file/2,
          file/3]).
 
--include_lib("diameter/src/app/diameter_internal.hrl").
 -include("diameter_forms.hrl").
 
 %% Generated functions that could have no generated clauses will have
@@ -250,9 +249,14 @@ f_name(Name) ->
 %%% ------------------------------------------------------------------------
 
 f_id(Spec) ->
-    Id = orddict:fetch(id, Spec),
     {?function, id, 0,
-     [{?clause, [], [], [?INTEGER(Id)]}]}.
+     [c_id(orddict:find(id, Spec))]}.
+
+c_id({ok, Id}) ->
+    {?clause, [], [], [?INTEGER(Id)]};
+
+c_id(error) ->
+    ?UNEXPECTED(0).
 
 %%% ------------------------------------------------------------------------
 %%% # vendor_id/0
@@ -454,9 +458,10 @@ avp(Spec) ->
     Native   = get_value(avp_types, Spec),
     Custom   = get_value(custom_types, Spec),
     Imported = get_value(import_avps, Spec),
-    avp([{N,T} || {N,_,T,_,_} <- Native], Imported, Custom).
+    Enums    = get_value(enums, Spec),
+    avp([{N,T} || {N,_,T,_,_} <- Native], Imported, Custom, Enums).
 
-avp(Native, Imported, Custom) ->
+avp(Native, Imported, Custom, Enums) ->
     Dict = orddict:from_list(Native),
 
     report(native, Dict),
@@ -470,8 +475,8 @@ avp(Native, Imported, Custom) ->
                                    false == lists:member(N, CustomNames)
                            end,
                            Native))
-        ++ lists:flatmap(fun c_imported_avp/1, Imported)
-        ++ lists:flatmap(fun(C) -> c_custom_avp(C, Dict) end, Custom).
+        ++ lists:flatmap(fun(I) -> cs_imported_avp(I, Enums) end, Imported)
+        ++ lists:flatmap(fun(C) -> cs_custom_avp(C, Dict) end, Custom).
 
 c_base_avp({AvpName, T}) ->
     {?clause, [?VAR('T'), ?VAR('Data'), ?ATOM(AvpName)],
@@ -487,23 +492,35 @@ base_avp(AvpName, 'Grouped') ->
 base_avp(_, Type) ->
     ?APPLY(diameter_types, Type, [?VAR('T'), ?VAR('Data')]).
 
-c_imported_avp({Mod, Avps}) ->
-    lists:map(fun(A) -> imported_avp(Mod, A) end, Avps).
+cs_imported_avp({Mod, Avps}, Enums) ->
+    lists:map(fun(A) -> imported_avp(Mod, A, Enums) end, Avps).
 
-imported_avp(_Mod, {AvpName, _, 'Grouped' = T, _, _}) ->
+imported_avp(_Mod, {AvpName, _, 'Grouped' = T, _, _}, _) ->
     c_base_avp({AvpName, T});
 
-imported_avp(Mod, {AvpName, _, _, _, _}) ->
+imported_avp(Mod, {AvpName, _, 'Enumerated' = T, _, _}, Enums) ->
+    case lists:keymember(AvpName, 1, Enums) of
+        true ->
+            c_base_avp({AvpName, T});
+        false ->
+            c_imported_avp(Mod, AvpName)
+    end;
+
+imported_avp(Mod, {AvpName, _, _, _, _}, _) ->
+    c_imported_avp(Mod, AvpName).
+
+c_imported_avp(Mod, AvpName) ->
     {?clause, [?VAR('T'), ?VAR('Data'), ?ATOM(AvpName)],
      [],
      [?APPLY(Mod, avp, [?VAR('T'),
                         ?VAR('Data'),
                         ?ATOM(AvpName)])]}.
 
-c_custom_avp({Mod, Avps}, Dict) ->
-    lists:map(fun(N) -> custom_avp(Mod, N, orddict:fetch(N, Dict)) end, Avps).
+cs_custom_avp({Mod, Avps}, Dict) ->
+    lists:map(fun(N) -> c_custom_avp(Mod, N, orddict:fetch(N, Dict)) end,
+              Avps).
 
-custom_avp(Mod, AvpName, Type) ->
+c_custom_avp(Mod, AvpName, Type) ->
     {?clause, [?VAR('T'), ?VAR('Data'), ?ATOM(AvpName)],
      [],
      [?APPLY(Mod, AvpName, [?VAR('T'), ?ATOM(Type), ?VAR('Data')])]}.
@@ -516,9 +533,25 @@ f_enumerated_avp(Spec) ->
     {?function, enumerated_avp, 3, enumerated_avp(Spec) ++ [?UNEXPECTED(3)]}.
 
 enumerated_avp(Spec) ->
-    lists:flatmap(fun c_enumerated_avp/1, get_value(enums, Spec)).
+    Enums = get_value(enums, Spec),
+    lists:flatmap(fun cs_enumerated_avp/1, Enums)
+        ++ lists:flatmap(fun({M,Es}) -> enumerated_avp(M, Es, Enums) end,
+                         get_value(import_enums, Spec)).
+
+enumerated_avp(Mod, Es, Enums) ->
+    lists:flatmap(fun({N,_}) ->
+                          cs_enumerated_avp(lists:keymember(N, 1, Enums),
+                                            Mod,
+                                            N)
+                  end,
+                  Es).
 
-c_enumerated_avp({AvpName, Values}) ->
+cs_enumerated_avp(true, Mod, Name) ->
+    [c_imported_avp(Mod, Name)];
+cs_enumerated_avp(false, _, _) ->
+    [].
+
+cs_enumerated_avp({AvpName, Values}) ->
     lists:flatmap(fun(V) -> c_enumerated_avp(AvpName, V) end, Values).
 
 c_enumerated_avp(AvpName, {I,_}) ->
@@ -537,10 +570,14 @@ f_msg_header(Spec) ->
     {?function, msg_header, 1, msg_header(Spec) ++ [?UNEXPECTED(1)]}.
 
 msg_header(Spec) ->
+    msg_header(get_value(messages, Spec), Spec).
+
+msg_header([], _) ->
+    [];
+msg_header(Msgs, Spec) ->
     ApplId = orddict:fetch(id, Spec),
 
-    lists:map(fun({M,C,F,_,_}) -> c_msg_header(M, C, F, ApplId) end,
-              get_value(messages, Spec)).
+    lists:map(fun({M,C,F,_,_}) -> c_msg_header(M, C, F, ApplId) end, Msgs).
 
 %% Note that any application id in the message header spec is ignored.
 
@@ -616,10 +653,12 @@ f_empty_value(Spec) ->
     {?function, empty_value, 1, empty_value(Spec)}.
 
 empty_value(Spec) ->
+    Imported = lists:flatmap(fun avps/1, get_value(import_enums, Spec)),
     Groups = get_value(grouped, Spec)
         ++ lists:flatmap(fun avps/1, get_value(import_groups, Spec)),
-    Enums = get_value(enums, Spec)
-        ++ lists:flatmap(fun avps/1, get_value(import_enums, Spec)),
+    Enums = [T || {N,_} = T <- get_value(enums, Spec),
+                  not lists:keymember(N, 1, Imported)]
+        ++ Imported,
     lists:map(fun c_empty_value/1, Groups ++ Enums)
         ++ [{?clause, [?VAR('Name')], [], [?CALL(empty, [?VAR('Name')])]}].
 
@@ -668,9 +707,9 @@ gen_hrl(Path, Mod, Spec) ->
     write("ENUM Macros",
           Fd,
           m_enums(PREFIX, false, get_value(enums, Spec))),
-    write("RESULT CODE Macros",
+    write("DEFINE Macros",
           Fd,
-          m_enums(PREFIX, false, get_value(result_codes, Spec))),
+          m_enums(PREFIX, false, get_value(defines, Spec))),
 
     lists:foreach(fun({M,Es}) ->
                           write("ENUM Macros from " ++ atom_to_list(M),
diff --git a/lib/diameter/src/app/diameter_exprecs.erl b/lib/diameter/src/compiler/diameter_exprecs.erl
index 5e120d6f44..5e120d6f44 100644
--- a/lib/diameter/src/app/diameter_exprecs.erl
+++ b/lib/diameter/src/compiler/diameter_exprecs.erl
diff --git a/lib/diameter/src/compiler/diameter_make.erl b/lib/diameter/src/compiler/diameter_make.erl
index 4431b88c4d..5380ee56ca 100644
--- a/lib/diameter/src/compiler/diameter_make.erl
+++ b/lib/diameter/src/compiler/diameter_make.erl
@@ -18,103 +18,61 @@
 %%
 
 %%
-%% Driver for the encoder generator utility.
+%% Module alternative to diameterc for dictionary compilation.
+%%
+%% Eg. 1> diameter_make:dict("mydict.dia").
+%%
+%%     $ erl -noshell \
+%%           -boot start_clean \
+%%           -s diameter_make dict mydict.dia \
+%%           -s init stop
 %%
 
 -module(diameter_make).
 
--export([spec/0,
-         hrl/0,
-         erl/0]).
+-export([dict/1,
+         dict/2,
+         spec/1,
+         spec/2]).
 
--spec spec() -> no_return().
--spec hrl()  -> no_return().
--spec erl()  -> no_return().
+-type opt() :: {outdir|include|name|prefix|inherits, string()}
+             | verbose
+             | debug.
 
-spec() ->
-    make(spec).
+%% dict/1-2
 
-hrl() ->
-    make(hrl).
+-spec dict(string(), [opt()])
+   -> ok.
 
-erl() ->
-    make(erl).
+dict(File, Opts) ->
+    make(File,
+         Opts,
+         spec(File, Opts),
+         [spec || _ <- [1], lists:member(debug, Opts)] ++ [erl, hrl]).
 
-%% make/1
+dict(File) ->
+    dict(File, []).
 
-make(Mode) ->
-    Args = init:get_plain_arguments(),
-    Opts = try options(Args) catch throw: help -> help(Mode) end,
-    Files = proplists:get_value(files, Opts, []),
-    lists:foreach(fun(F) -> from_file(F, Mode, Opts) end, Files),
-    halt(0).
+%% spec/2
 
-%% from_file/3
-
-from_file(F, Mode, Opts) ->
-    try to_spec(F, Mode, Opts) of
-        Spec ->
-            from_spec(F, Spec, Mode, Opts)
-    catch
-        error: Reason ->
-            io:format("==> ~p parse failure:~n~p~n",
-                      [F, {Reason, erlang:get_stacktrace()}]),
-            halt(1)
-    end.
+-spec spec(string(), [opt()])
+   -> orddict:orddict().
 
-%% to_spec/2
+spec(File, Opts) ->
+    diameter_spec_util:parse(File, Opts).
 
-%% Try to read the input as an already parsed file or else parse it.
-to_spec(F, spec, Opts) ->
-    diameter_spec_util:parse(F, Opts);
-to_spec(F, _, _) ->
-    {ok, [Spec]} = file:consult(F),
-    Spec.
+spec(File) ->
+    spec(File, []).
 
-%% from_spec/4
+%% ===========================================================================
 
-from_spec(File, Spec, Mode, Opts) ->
-    try
-        diameter_codegen:from_spec(File, Spec, Opts, Mode)
+make(_, _, _, []) ->
+    ok;
+make(File, Opts, Spec, [Mode | Rest]) ->
+    try diameter_codegen:from_spec(File, Spec, Opts, Mode) of
+        ok ->
+            make(File, Opts, Spec, Rest)
     catch
         error: Reason ->
-            io:format("==> ~p codegen failure:~n~p~n~p~n",
-                      [Mode, File, {Reason, erlang:get_stacktrace()}]),
-            halt(1)
+            {error, {Reason, Mode, erlang:get_stacktrace()}}
     end.
-
-%% options/1
-
-options(["-v" | Rest]) ->
-    [verbose | options(Rest)];
-
-options(["-o", Outdir | Rest]) ->
-    [{outdir, Outdir} | options(Rest)];
-
-options(["-i", Incdir | Rest]) ->
-    [{include, Incdir} | options(Rest)];
-
-options(["-h" | _]) ->
-    throw(help);
-
-options(["--" | Fs]) ->
-    [{files, Fs}];
-
-options(["-" ++ _ = Opt | _]) ->
-    io:fwrite("==> unknown option: ~s~n", [Opt]),
-    throw(help);
-
-options(Fs) ->  %% trailing arguments
-    options(["--" | Fs]).
-
-%% help/1
-
-help(M) ->
-    io:fwrite("Usage: ~p ~p [Options] [--] File ...~n"
-              "Options:~n"
-              " -v              verbose output~n"
-              " -h              shows this help message~n"
-              " -o OutDir       where to put the output files~n"
-              " -i IncludeDir   where to search for beams to import~n",
-              [?MODULE, M]),
-    halt(1).
diff --git a/lib/diameter/src/compiler/diameter_spec_util.erl b/lib/diameter/src/compiler/diameter_spec_util.erl
index 322d53a199..62536bf06d 100644
--- a/lib/diameter/src/compiler/diameter_spec_util.erl
+++ b/lib/diameter/src/compiler/diameter_spec_util.erl
@@ -34,19 +34,38 @@
 %%
 %% Output: orddict()
 
-parse(Path, Options) ->
-    put({?MODULE, verbose}, lists:member(verbose, Options)),
+parse(Path, Opts) ->
+    put({?MODULE, verbose}, lists:member(verbose, Opts)),
     {ok, B} = file:read_file(Path),
     Chunks = chunk(B),
-    Spec = make_spec(Chunks),
-    true = enums_defined(Spec),   %% sanity checks
-    true = groups_defined(Spec),  %%
+    Spec = reset(make_spec(Chunks), Opts, [name, prefix, inherits]),
+    true = groups_defined(Spec),  %% sanity checks
     true = customs_defined(Spec), %%
-    Full = import_enums(import_groups(import_avps(insert_codes(Spec),
-                                                  Options))),
+    Full = import_enums(import_groups(import_avps(insert_codes(Spec), Opts))),
+    true = enums_defined(Full),   %% sanity checks
     true = v_flags_set(Spec),
     Full.
 
+reset(Spec, Opts, Keys) ->
+    lists:foldl(fun(K,S) ->
+                        reset([{A,?ATOM(V)} || {A,V} <- Opts, A == K], S)
+                end,
+                Spec,
+                Keys).
+
+reset(L, Spec)
+  when is_list(L) ->
+    lists:foldl(fun reset/2, Spec, L);
+
+reset({inherits = Key, '-'}, Spec) ->
+    orddict:erase(Key, Spec);
+reset({inherits = Key, Dict}, Spec) ->
+    orddict:append(Key, Dict, Spec);
+reset({Key, Atom}, Spec) ->
+    orddict:store(Key, Atom, Spec);
+reset(_, Spec) ->
+    Spec.
+    
 %% Optional reports when running verbosely.
 report(What, Data) ->
     report(get({?MODULE, verbose}), What, Data).
@@ -204,9 +223,11 @@ chunk({avp_vendor_id = T, [{number, I}], Body}, Dict) ->
 chunk({enum, [N], Str}, Dict) ->
     append(enums, {atomize(N), parse_enums(Str)}, Dict);
 
-%% result_codes -> [{ResultName, [{Value, Name}, ...]}, ...]
-chunk({result_code, [N], Str}, Dict) ->
-    append(result_codes, {atomize(N), parse_enums(Str)}, Dict);
+%% defines -> [{DefineName, [{Value, Name}, ...]}, ...]
+chunk({define, [N], Str}, Dict) ->
+    append(defines, {atomize(N), parse_enums(Str)}, Dict);
+chunk({result_code, [_] = N, Str}, Dict) ->  %% backwards compatibility
+    chunk({define, N, Str}, Dict);
 
 %% commands -> [{Name, Abbrev}, ...]
 chunk({commands = T, [], Body}, Dict) ->
@@ -243,35 +264,48 @@ get_value(Key, Spec) ->
 %% with an appropriate type.
 
 enums_defined(Spec) ->
-    is_defined(Spec, 'Enumerated', enums).
+    Avps = get_value(avp_types, Spec),
+    Import = get_value(import_enums, Spec),
+    lists:all(fun({N,_}) ->
+                      true = enum_defined(N, Avps, Import)
+              end,
+              get_value(enums, Spec)).
 
-groups_defined(Spec) ->
-    is_defined(Spec, 'Grouped', grouped).
+enum_defined(Name, Avps, Import) ->
+    case lists:keyfind(Name, 1, Avps) of
+        {Name, _, 'Enumerated', _, _} ->
+            true;
+        {Name, _, T, _, _} ->
+            ?ERROR({avp_has_wrong_type, Name, 'Enumerated', T});
+        false ->
+            lists:any(fun({_,Is}) -> lists:keymember(Name, 1, Is) end, Import)
+                orelse ?ERROR({avp_not_defined, Name, 'Enumerated'})
+    end.
+%% Note that an AVP is imported only if referenced by a message or
+%% grouped AVP, so the final branch will fail if an enum definition is
+%% extended without this being the case.
 
-is_defined(Spec, Type, Key) ->
+groups_defined(Spec) ->
     Avps = get_value(avp_types, Spec),
-    lists:all(fun(T) -> true = is_local(name(Key, T), Type, Avps) end,
-              get_value(Key, Spec)).
+    lists:all(fun({N,_,_,_}) -> true = group_defined(N, Avps) end,
+              get_value(grouped, Spec)).
 
-name(enums,   {N,_})     -> N;
-name(grouped, {N,_,_,_}) -> N.
-
-is_local(Name, Type, Avps) ->
+group_defined(Name, Avps) ->
     case lists:keyfind(Name, 1, Avps) of
-        {Name, _, Type, _, _} ->
+        {Name, _, 'Grouped', _, _} ->
             true;
         {Name, _, T, _, _} ->
-            ?ERROR({avp_has_wrong_type, Name, Type, T});
+            ?ERROR({avp_has_wrong_type, Name, 'Grouped', T});
         false ->
-            ?ERROR({avp_not_defined, Name, Type})
+            ?ERROR({avp_not_defined, Name, 'Grouped'})
     end.
 
 customs_defined(Spec) ->
     Avps = get_value(avp_types, Spec),
-    lists:all(fun(A) -> true = is_local(A, Avps) end,
+    lists:all(fun(A) -> true = custom_defined(A, Avps) end,
               lists:flatmap(fun last/1, get_value(custom_types, Spec))).
 
-is_local(Name, Avps) ->
+custom_defined(Name, Avps) ->
     case lists:keyfind(Name, 1, Avps) of
         {Name, _, T, _, _} when T == 'Grouped';
                                 T == 'Enumerated' ->
@@ -510,6 +544,9 @@ choose(false, _, X) -> X.
 %% ------------------------------------------------------------------------
 %% import_groups/1
 %% import_enums/1
+%%
+%% For each inherited module, store the content of imported AVP's of
+%% type grouped/enumerated in a new key.
 
 import_groups(Spec) ->
     orddict:store(import_groups, import(grouped, Spec), Spec).
diff --git a/lib/diameter/src/compiler/modules.mk b/lib/diameter/src/compiler/modules.mk
deleted file mode 100644
index 17a311dacf..0000000000
--- a/lib/diameter/src/compiler/modules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2010-2011. 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.
-# 
-# %CopyrightEnd%
-
-MODULES = \
-	diameter_codegen \
-	diameter_spec_scan \
-	diameter_spec_util
-
-HRL_FILES = \
-	diameter_forms.hrl
-
diff --git a/lib/diameter/src/depend.sed b/lib/diameter/src/depend.sed
new file mode 100644
index 0000000000..8f999f646f
--- /dev/null
+++ b/lib/diameter/src/depend.sed
@@ -0,0 +1,51 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2010-2011. 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.
+#
+# %CopyrightEnd%
+#
+
+#
+# Extract include dependencies from .erl files. First line of input
+# is the path to the module in question (minus the .erl extension),
+# the rest is the contents of the module.
+#
+
+1{
+  s@^[^/]*/@@
+  h
+  d
+}
+
+# Only interested in includes of diameter hrls.
+/^-include/!d
+/"diameter/!d
+
+# Extract the name of the included files in one of two forms:
+#
+#   $(INCDIR)/diameter.hrl
+#   diameter_internal.hrl
+
+s@^-include_lib(".*/@$(INCDIR)/@
+s@^-include("@@
+s@".*@@
+
+# Retrieve the path to our module from the hold space, morph it
+# into a beam path and turn it into a dependency like this:
+#
+#   $(EBIN)/diameter_service.$(EMULATOR): $(INCDIR)/diameter.hrl
+
+G
+s@^\(.*\)\n\(.*\)@$(EBIN)/\2.$(EMULATOR): \1@
diff --git a/lib/diameter/src/dict/base_accounting.dia b/lib/diameter/src/dict/base_accounting.dia
new file mode 100644
index 0000000000..ced324078c
--- /dev/null
+++ b/lib/diameter/src/dict/base_accounting.dia
@@ -0,0 +1,69 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Ericsson AB 2010-2011. 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.
+;;
+;; %CopyrightEnd%
+;;
+
+@id 3
+@name   diameter_gen_base_accounting
+@prefix diameter_base_accounting
+@vendor 0 IETF
+
+@inherits diameter_gen_base_rfc3588
+
+@messages
+
+      ACR ::= < Diameter Header: 271, REQ, PXY >
+              < Session-Id >
+              { Origin-Host }
+              { Origin-Realm }
+              { Destination-Realm }
+              { Accounting-Record-Type }
+              { Accounting-Record-Number }
+              [ Acct-Application-Id ]
+              [ Vendor-Specific-Application-Id ]
+              [ User-Name ]
+              [ Accounting-Sub-Session-Id ]
+              [ Acct-Session-Id ]
+              [ Acct-Multi-Session-Id ]
+              [ Acct-Interim-Interval ]
+              [ Accounting-Realtime-Required ]
+              [ Origin-State-Id ]
+              [ Event-Timestamp ]
+            * [ Proxy-Info ]
+            * [ Route-Record ]
+            * [ AVP ]
+
+      ACA ::= < Diameter Header: 271, PXY >
+              < Session-Id >
+              { Result-Code }
+              { Origin-Host }
+              { Origin-Realm }
+              { Accounting-Record-Type }
+              { Accounting-Record-Number }
+              [ Acct-Application-Id ]
+              [ Vendor-Specific-Application-Id ]
+              [ User-Name ]
+              [ Accounting-Sub-Session-Id ]
+              [ Acct-Session-Id ]
+              [ Acct-Multi-Session-Id ]
+              [ Error-Reporting-Host ]
+              [ Acct-Interim-Interval ]
+              [ Accounting-Realtime-Required ]
+              [ Origin-State-Id ]
+              [ Event-Timestamp ]
+            * [ Proxy-Info ]
+            * [ AVP ]
diff --git a/lib/diameter/src/dict/base_rfc3588.dia b/lib/diameter/src/dict/base_rfc3588.dia
new file mode 100644
index 0000000000..f7a0b717cd
--- /dev/null
+++ b/lib/diameter/src/dict/base_rfc3588.dia
@@ -0,0 +1,414 @@
+;;
+;; %CopyrightBegin%
+;;
+;; Copyright Ericsson AB 2010-2011. 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.
+;;
+;; %CopyrightEnd%
+;;
+
+@id 0
+@name   diameter_gen_base_rfc3588
+@prefix diameter_base
+@vendor 0 IETF
+
+@avp_types
+
+   Acct-Interim-Interval             85    Unsigned32    M
+   Accounting-Realtime-Required     483    Enumerated    M
+   Acct-Multi-Session-Id             50    UTF8String    M
+   Accounting-Record-Number         485    Unsigned32    M
+   Accounting-Record-Type           480    Enumerated    M
+   Acct-Session-Id                   44   OctetString    M
+   Accounting-Sub-Session-Id        287    Unsigned64    M
+   Acct-Application-Id              259    Unsigned32    M
+   Auth-Application-Id              258    Unsigned32    M
+   Auth-Request-Type                274    Enumerated    M
+   Authorization-Lifetime           291    Unsigned32    M
+   Auth-Grace-Period                276    Unsigned32    M
+   Auth-Session-State               277    Enumerated    M
+   Re-Auth-Request-Type             285    Enumerated    M
+   Class                             25   OctetString    M
+   Destination-Host                 293     DiamIdent    M
+   Destination-Realm                283     DiamIdent    M
+   Disconnect-Cause                 273    Enumerated    M
+   E2E-Sequence                     300       Grouped    M
+   Error-Message                    281    UTF8String    -
+   Error-Reporting-Host             294     DiamIdent    -
+   Event-Timestamp                   55          Time    M
+   Experimental-Result              297       Grouped    M
+   Experimental-Result-Code         298    Unsigned32    M
+   Failed-AVP                       279       Grouped    M
+   Firmware-Revision                267    Unsigned32    -
+   Host-IP-Address                  257       Address    M
+   Inband-Security-Id               299    Unsigned32    M
+   Multi-Round-Time-Out             272    Unsigned32    M
+   Origin-Host                      264     DiamIdent    M
+   Origin-Realm                     296     DiamIdent    M
+   Origin-State-Id                  278    Unsigned32    M
+   Product-Name                     269    UTF8String    -
+   Proxy-Host                       280     DiamIdent    M
+   Proxy-Info                       284       Grouped    M
+   Proxy-State                       33   OctetString    M
+   Redirect-Host                    292       DiamURI    M
+   Redirect-Host-Usage              261    Enumerated    M
+   Redirect-Max-Cache-Time          262    Unsigned32    M
+   Result-Code                      268    Unsigned32    M
+   Route-Record                     282     DiamIdent    M
+   Session-Id                       263    UTF8String    M
+   Session-Timeout                   27    Unsigned32    M
+   Session-Binding                  270    Unsigned32    M
+   Session-Server-Failover          271    Enumerated    M
+   Supported-Vendor-Id              265    Unsigned32    M
+   Termination-Cause                295    Enumerated    M
+   User-Name                          1    UTF8String    M
+   Vendor-Id                        266    Unsigned32    M
+   Vendor-Specific-Application-Id   260       Grouped    M
+
+@messages
+
+      CER ::= < Diameter Header: 257, REQ >
+              { Origin-Host }
+              { Origin-Realm }
+           1* { Host-IP-Address }
+              { Vendor-Id }
+              { Product-Name }
+              [ Origin-State-Id ]
+            * [ Supported-Vendor-Id ]
+            * [ Auth-Application-Id ]
+            * [ Inband-Security-Id ]
+            * [ Acct-Application-Id ]
+            * [ Vendor-Specific-Application-Id ]
+              [ Firmware-Revision ]
+            * [ AVP ]
+
+      CEA ::= < Diameter Header: 257 >
+              { Result-Code }
+              { Origin-Host }
+              { Origin-Realm }
+           1* { Host-IP-Address }
+              { Vendor-Id }
+              { Product-Name }
+              [ Origin-State-Id ]
+              [ Error-Message ]
+            * [ Failed-AVP ]
+            * [ Supported-Vendor-Id ]
+            * [ Auth-Application-Id ]
+            * [ Inband-Security-Id ]
+            * [ Acct-Application-Id ]
+            * [ Vendor-Specific-Application-Id ]
+              [ Firmware-Revision ]
+            * [ AVP ]
+
+      DPR ::= < Diameter Header: 282, REQ >
+              { Origin-Host }
+              { Origin-Realm }
+              { Disconnect-Cause }
+
+      DPA ::= < Diameter Header: 282 >
+              { Result-Code }
+              { Origin-Host }
+              { Origin-Realm }
+              [ Error-Message ]
+            * [ Failed-AVP ]
+
+      DWR ::= < Diameter Header: 280, REQ >
+              { Origin-Host }
+              { Origin-Realm }
+              [ Origin-State-Id ]
+
+      DWA ::= < Diameter Header: 280 >
+              { Result-Code }
+              { Origin-Host }
+              { Origin-Realm }
+              [ Error-Message ]
+            * [ Failed-AVP ]
+              [ Origin-State-Id ]
+
+   answer-message ::= < Diameter Header: code, ERR [PXY] >
+                  0*1 < Session-Id >
+                      { Origin-Host }
+                      { Origin-Realm }
+                      { Result-Code }
+                      [ Origin-State-Id ]
+                      [ Error-Reporting-Host ]
+                      [ Proxy-Info ]
+                    * [ AVP ]
+
+      RAR ::= < Diameter Header: 258, REQ, PXY >
+              < Session-Id >
+              { Origin-Host }
+              { Origin-Realm }
+              { Destination-Realm }
+              { Destination-Host }
+              { Auth-Application-Id }
+              { Re-Auth-Request-Type }
+              [ User-Name ]
+              [ Origin-State-Id ]
+            * [ Proxy-Info ]
+            * [ Route-Record ]
+            * [ AVP ]
+
+      RAA ::= < Diameter Header: 258, PXY >
+              < Session-Id >
+              { Result-Code }
+              { Origin-Host }
+              { Origin-Realm }
+              [ User-Name ]
+              [ Origin-State-Id ]
+              [ Error-Message ]
+              [ Error-Reporting-Host ]
+            * [ Failed-AVP ]
+            * [ Redirect-Host ]
+              [ Redirect-Host-Usage ]
+              [ Redirect-Max-Cache-Time ]
+            * [ Proxy-Info ]
+            * [ AVP ]
+
+      STR ::= < Diameter Header: 275, REQ, PXY >
+              < Session-Id >
+              { Origin-Host }
+              { Origin-Realm }
+              { Destination-Realm }
+              { Auth-Application-Id }
+              { Termination-Cause }
+              [ User-Name ]
+              [ Destination-Host ]
+            * [ Class ]
+              [ Origin-State-Id ]
+            * [ Proxy-Info ]
+            * [ Route-Record ]
+            * [ AVP ]
+
+      STA ::= < Diameter Header: 275, PXY >
+              < Session-Id >
+              { Result-Code }
+              { Origin-Host }
+              { Origin-Realm }
+              [ User-Name ]
+            * [ Class ]
+              [ Error-Message ]
+              [ Error-Reporting-Host ]
+            * [ Failed-AVP ]
+              [ Origin-State-Id ]
+            * [ Redirect-Host ]
+              [ Redirect-Host-Usage ]
+              [ Redirect-Max-Cache-Time ]
+            * [ Proxy-Info ]
+            * [ AVP ]
+
+      ASR ::= < Diameter Header: 274, REQ, PXY >
+              < Session-Id >
+              { Origin-Host }
+              { Origin-Realm }
+              { Destination-Realm }
+              { Destination-Host }
+              { Auth-Application-Id }
+              [ User-Name ]
+              [ Origin-State-Id ]
+            * [ Proxy-Info ]
+            * [ Route-Record ]
+            * [ AVP ]
+
+      ASA ::= < Diameter Header: 274, PXY >
+              < Session-Id >
+              { Result-Code }
+              { Origin-Host }
+              { Origin-Realm }
+              [ User-Name ]
+              [ Origin-State-Id ]
+              [ Error-Message ]
+              [ Error-Reporting-Host ]
+            * [ Failed-AVP ]
+            * [ Redirect-Host ]
+              [ Redirect-Host-Usage ]
+              [ Redirect-Max-Cache-Time ]
+            * [ Proxy-Info ]
+            * [ AVP ]
+
+      ACR ::= < Diameter Header: 271, REQ, PXY >
+              < Session-Id >
+              { Origin-Host }
+              { Origin-Realm }
+              { Destination-Realm }
+              { Accounting-Record-Type }
+              { Accounting-Record-Number }
+              [ Acct-Application-Id ]
+              [ Vendor-Specific-Application-Id ]
+              [ User-Name ]
+              [ Accounting-Sub-Session-Id ]
+              [ Acct-Session-Id ]
+              [ Acct-Multi-Session-Id ]
+              [ Acct-Interim-Interval ]
+              [ Accounting-Realtime-Required ]
+              [ Origin-State-Id ]
+              [ Event-Timestamp ]
+            * [ Proxy-Info ]
+            * [ Route-Record ]
+            * [ AVP ]
+
+      ACA ::= < Diameter Header: 271, PXY >
+              < Session-Id >
+              { Result-Code }
+              { Origin-Host }
+              { Origin-Realm }
+              { Accounting-Record-Type }
+              { Accounting-Record-Number }
+              [ Acct-Application-Id ]
+              [ Vendor-Specific-Application-Id ]
+              [ User-Name ]
+              [ Accounting-Sub-Session-Id ]
+              [ Acct-Session-Id ]
+              [ Acct-Multi-Session-Id ]
+              [ Error-Reporting-Host ]
+              [ Acct-Interim-Interval ]
+              [ Accounting-Realtime-Required ]
+              [ Origin-State-Id ]
+              [ Event-Timestamp ]
+            * [ Proxy-Info ]
+            * [ AVP ]
+
+@enum Disconnect-Cause
+
+   REBOOTING                      0
+   BUSY                           1
+   DO_NOT_WANT_TO_TALK_TO_YOU     2
+
+@enum Redirect-Host-Usage
+
+   DONT_CACHE                     0
+   ALL_SESSION                    1
+   ALL_REALM                      2
+   REALM_AND_APPLICATION          3
+   ALL_APPLICATION                4
+   ALL_HOST                       5
+   ALL_USER                       6
+
+@enum Auth-Request-Type
+
+   AUTHENTICATE_ONLY              1
+   AUTHORIZE_ONLY                 2
+   AUTHORIZE_AUTHENTICATE         3
+
+@enum Auth-Session-State
+
+   STATE_MAINTAINED               0
+   NO_STATE_MAINTAINED            1
+
+@enum Re-Auth-Request-Type
+
+   AUTHORIZE_ONLY                 0
+   AUTHORIZE_AUTHENTICATE         1
+
+@enum Termination-Cause
+
+   DIAMETER_LOGOUT                1
+   DIAMETER_SERVICE_NOT_PROVIDED  2
+   DIAMETER_BAD_ANSWER            3
+   DIAMETER_ADMINISTRATIVE        4
+   DIAMETER_LINK_BROKEN           5
+   DIAMETER_AUTH_EXPIRED          6
+   DIAMETER_USER_MOVED            7
+   DIAMETER_SESSION_TIMEOUT       8
+
+@enum Session-Server-Failover
+
+   REFUSE_SERVICE                 0
+   TRY_AGAIN                      1
+   ALLOW_SERVICE                  2
+   TRY_AGAIN_ALLOW_SERVICE        3
+
+@enum Accounting-Record-Type
+
+   EVENT_RECORD                   1
+   START_RECORD                   2
+   INTERIM_RECORD                 3
+   STOP_RECORD                    4
+
+@enum Accounting-Realtime-Required
+
+   DELIVER_AND_GRANT              1
+   GRANT_AND_STORE                2
+   GRANT_AND_LOSE                 3
+
+@define Result-Code
+
+;; 7.1.1.  Informational
+   DIAMETER_MULTI_ROUND_AUTH          1001
+
+;; 7.1.2.  Success
+   DIAMETER_SUCCESS                   2001
+   DIAMETER_LIMITED_SUCCESS           2002
+
+;; 7.1.3.  Protocol Errors
+   DIAMETER_COMMAND_UNSUPPORTED       3001
+   DIAMETER_UNABLE_TO_DELIVER         3002
+   DIAMETER_REALM_NOT_SERVED          3003
+   DIAMETER_TOO_BUSY                  3004
+   DIAMETER_LOOP_DETECTED             3005
+   DIAMETER_REDIRECT_INDICATION       3006
+   DIAMETER_APPLICATION_UNSUPPORTED   3007
+   DIAMETER_INVALID_HDR_BITS          3008
+   DIAMETER_INVALID_AVP_BITS          3009
+   DIAMETER_UNKNOWN_PEER              3010
+
+;; 7.1.4.  Transient Failures
+   DIAMETER_AUTHENTICATION_REJECTED   4001
+   DIAMETER_OUT_OF_SPACE              4002
+   ELECTION_LOST                      4003
+
+;; 7.1.5.  Permanent Failures
+   DIAMETER_AVP_UNSUPPORTED           5001
+   DIAMETER_UNKNOWN_SESSION_ID        5002
+   DIAMETER_AUTHORIZATION_REJECTED    5003
+   DIAMETER_INVALID_AVP_VALUE         5004
+   DIAMETER_MISSING_AVP               5005
+   DIAMETER_RESOURCES_EXCEEDED        5006
+   DIAMETER_CONTRADICTING_AVPS        5007
+   DIAMETER_AVP_NOT_ALLOWED           5008
+   DIAMETER_AVP_OCCURS_TOO_MANY_TIMES 5009
+   DIAMETER_NO_COMMON_APPLICATION     5010
+   DIAMETER_UNSUPPORTED_VERSION       5011
+   DIAMETER_UNABLE_TO_COMPLY          5012
+   DIAMETER_INVALID_BIT_IN_HEADER     5013
+   DIAMETER_INVALID_AVP_LENGTH        5014
+   DIAMETER_INVALID_MESSAGE_LENGTH    5015
+   DIAMETER_INVALID_AVP_BIT_COMBO     5016
+   DIAMETER_NO_COMMON_SECURITY        5017
+
+@grouped 
+
+      Proxy-Info ::= < AVP Header: 284 >
+                     { Proxy-Host }
+                     { Proxy-State }
+                   * [ AVP ]
+
+      Failed-AVP ::= < AVP Header: 279 >
+                  1* {AVP}
+
+      Experimental-Result ::= < AVP Header: 297 >
+                              { Vendor-Id }
+                              { Experimental-Result-Code }
+
+  Vendor-Specific-Application-Id ::= < AVP Header: 260 >
+                                  1* { Vendor-Id }
+                                     [ Auth-Application-Id ]
+                                     [ Acct-Application-Id ]
+
+;; The E2E-Sequence AVP is defined in RFC 3588 as Grouped, but 
+;; there is no definition of the group - only an informal text stating
+;; that there should be a nonce (an OctetString) and a counter
+;; (integer)
+;;
+      E2E-Sequence ::= <AVP Header: 300 >
+                   2* { AVP }
diff --git a/lib/diameter/src/app/diameter_gen_relay.dia b/lib/diameter/src/dict/relay.dia
index d86446e368..c22293209b 100644
--- a/lib/diameter/src/app/diameter_gen_relay.dia
+++ b/lib/diameter/src/dict/relay.dia
@@ -18,6 +18,7 @@
 ;;
 
 @id 0xFFFFFFFF
+@name   diameter_gen_relay
 @prefix diameter_relay
 @vendor 0 IETF
 
diff --git a/lib/diameter/src/gen/.gitignore b/lib/diameter/src/gen/.gitignore
new file mode 100644
index 0000000000..d490642eb7
--- /dev/null
+++ b/lib/diameter/src/gen/.gitignore
@@ -0,0 +1,2 @@
+
+/diameter_gen*rl
diff --git a/lib/diameter/src/modules.mk b/lib/diameter/src/modules.mk
new file mode 100644
index 0000000000..c7cbe598af
--- /dev/null
+++ b/lib/diameter/src/modules.mk
@@ -0,0 +1,93 @@
+#-*-makefile-*-   ; force emacs to enter makefile-mode
+
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2010-2011. 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.
+#
+# %CopyrightEnd%
+
+# Runtime dictionary files in ./dict. Modules will be generated from
+# these are included in the app file.
+DICTS = \
+	base_rfc3588 \
+	base_accounting \
+	relay
+
+# Handwritten (runtime) modules included in the app file.
+RT_MODULES = \
+	base/diameter \
+	base/diameter_app \
+	base/diameter_capx \
+	base/diameter_config \
+	base/diameter_codec \
+	base/diameter_dict \
+	base/diameter_lib \
+	base/diameter_misc_sup \
+	base/diameter_peer \
+	base/diameter_peer_fsm \
+	base/diameter_peer_fsm_sup \
+	base/diameter_reg \
+	base/diameter_service \
+	base/diameter_service_sup \
+	base/diameter_session \
+	base/diameter_stats \
+	base/diameter_sup \
+	base/diameter_sync \
+	base/diameter_types \
+	base/diameter_watchdog \
+	base/diameter_watchdog_sup \
+	transport/diameter_etcp \
+	transport/diameter_etcp_sup \
+	transport/diameter_tcp \
+	transport/diameter_tcp_sup \
+	transport/diameter_sctp \
+	transport/diameter_sctp_sup \
+	transport/diameter_transport_sup
+
+# Handwritten (compile time) modules not included in the app file.
+CT_MODULES = \
+	base/diameter_callback \
+	base/diameter_dbg \
+	base/diameter_info \
+	compiler/diameter_codegen \
+	compiler/diameter_exprecs \
+	compiler/diameter_spec_scan \
+	compiler/diameter_spec_util \
+	compiler/diameter_make
+
+# Released hrl files in ../include intended for public consumption.
+EXTERNAL_HRLS = \
+	diameter.hrl \
+	diameter_gen.hrl
+
+# Released hrl files intended for private use.
+INTERNAL_HRLS = \
+	base/diameter_internal.hrl \
+	base/diameter_types.hrl \
+	compiler/diameter_forms.hrl
+
+# Released files relative to ../bin.
+BINS = \
+	diameterc
+
+# Released files relative to ../examples.
+EXAMPLES = \
+	GNUmakefile \
+	peer.erl \
+	client.erl \
+	client_cb.erl \
+	server.erl \
+	server_cb.erl \
+	relay.erl \
+	relay_cb.erl
diff --git a/lib/diameter/src/subdirs.mk b/lib/diameter/src/subdirs.mk
deleted file mode 100644
index 3e12d935bc..0000000000
--- a/lib/diameter/src/subdirs.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2010-2011. 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.
-#
-# %CopyrightEnd%
-
-SUB_DIRS = compiler app transport
-SUB_DIRECTORIES = $(SUB_DIRS)
\ No newline at end of file
diff --git a/lib/diameter/src/transport/Makefile b/lib/diameter/src/transport/Makefile
deleted file mode 100644
index 4b53100fd2..0000000000
--- a/lib/diameter/src/transport/Makefile
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2010-2011. 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.
-#
-# %CopyrightEnd%
-#
-#
-
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/target.mk
-EBIN = ../../ebin
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-else
-include $(DIAMETER_TOP)/make/target.mk
-EBIN = ../../ebin
-include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk
-endif
-
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-
-include ../../vsn.mk
-VSN=$(DIAMETER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-
-RELSYSDIR = $(RELEASE_PATH)/lib/diameter-$(VSN)
-
-INCDIR = ../../include
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-include modules.mk
-
-ERL_FILES = \
-	$(MODULES:%=%.erl) 
-
-TARGET_FILES = \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug
-endif
-
-include ../app/diameter.mk
-
-ERL_COMPILE_FLAGS += \
-	$(DIAMETER_ERL_COMPILE_FLAGS) \
-	-I$(INCDIR)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug:
-	@${MAKE} TYPE=debug opt
-
-opt: $(TARGET_FILES) 
-
-clean:
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-	rm -f depend.mk
-
-docs:
-
-info:
-	@echo ""
-	@echo "ERL_FILES = $(ERL_FILES)"
-	@echo "HRL_FILES = $(HRL_FILES)"
-	@echo ""
-	@echo "TARGET_FILES = $(TARGET_FILES)"
-	@echo ""
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-# Invoked from ../app to add modules to the app file.
-$(APP_TARGET): force
-	M=`echo $(MODULES) | sed -e 's/^ *//' -e 's/ *$$//' -e 'y/ /,/'`; \
-	echo "/%TRANSPORT_MODULES%/s//$$M/;w;q" | tr ';' '\n' \
-	| ed -s $@
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/otp_release_targets.mk
-else
-include $(DIAMETER_TOP)/make/release_targets.mk
-endif
-
-release_spec: opt
-	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-	$(INSTALL_DIR)  $(RELSYSDIR)/src/transport
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/transport
-
-release_docs_spec:
-
-force:
-
-# ----------------------------------------------------
-# Dependencies
-# ----------------------------------------------------
-
-depend: depend.mk
-
-# Generate dependencies makefile.
-depend.mk: ../app/depend.sed $(ERL_FILES) Makefile
-	for f in $(MODULES); do \
-	    sed -f $< $$f.erl | sed "s@/@/$$f@"; \
-	done \
-	> $@
-
--include depend.mk
-
-.PHONY: clean debug depend docs force info opt release_docs_spec release_spec
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl
index 92aa8488a0..209f8c01c1 100644
--- a/lib/diameter/src/transport/diameter_sctp.erl
+++ b/lib/diameter/src/transport/diameter_sctp.erl
@@ -37,6 +37,9 @@
          code_change/3,
          terminate/2]).
 
+-export([ports/0,
+         ports/1]).
+
 -include_lib("kernel/include/inet_sctp.hrl").
 -include_lib("diameter/include/diameter.hrl").
 
@@ -118,8 +121,8 @@ s({accept, Ref} = A, Addrs, Opts) ->
 %% gen_sctp in order to be able to accept a new association only
 %% *after* an accepting transport has been spawned.
 
-s({connect = C, _}, Addrs, Opts) ->
-    diameter_sctp_sup:start_child({C, self(), Opts, Addrs}).
+s({connect = C, Ref}, Addrs, Opts) ->
+    diameter_sctp_sup:start_child({C, self(), Opts, Addrs, Ref}).
 
 %% start_link/1
 
@@ -149,28 +152,36 @@ i({listen, Ref, {Opts, Addrs}}) ->
                           socket = Sock});
 
 %% A connecting transport.
-i({connect, Pid, Opts, Addrs}) ->
+i({connect, Pid, Opts, Addrs, Ref}) ->
     {[As, Ps], Rest} = proplists:split(Opts, [raddr, rport]),
     RAs  = [diameter_lib:ipaddr(A) || {raddr, A} <- As],
     [RP] = [P || {rport, P} <- Ps] ++ [P || P <- [?DEFAULT_PORT], [] == Ps],
     {LAs, Sock} = open(Addrs, Rest, 0),
+    putr(ref, Ref),
     proc_lib:init_ack({ok, self(), LAs}),
     erlang:monitor(process, Pid),
     #transport{parent = Pid,
                mode = {connect, connect(Sock, RAs, RP, [])},
                socket = Sock};
+i({connect, _, _, _} = T) ->  %% from old code
+    x(T);
 
 %% An accepting transport spawned by diameter.
-i({accept, Pid, LPid, Sock}) ->
+i({accept, Pid, LPid, Sock, Ref})
+  when is_pid(Pid) ->
+    putr(ref, Ref),
     proc_lib:init_ack({ok, self()}),
     erlang:monitor(process, Pid),
     erlang:monitor(process, LPid),
     #transport{parent = Pid,
                mode = {accept, LPid},
                socket = Sock};
+i({accept, _, _, _} = T) ->  %% from old code
+    x(T);
 
 %% An accepting transport spawned at association establishment.
 i({accept, Ref, LPid, Sock, Id}) ->
+    putr(ref, Ref),
     proc_lib:init_ack({ok, self()}),
     MRef = erlang:monitor(process, LPid),
     %% Wait for a signal that the transport has been started before
@@ -250,13 +261,33 @@ gen_opts(Opts) ->
     [binary, {active, once} | Opts].
 
 %% ---------------------------------------------------------------------------
+%% # ports/0-1
+%% ---------------------------------------------------------------------------
+
+ports() ->
+    Ts = diameter_reg:match({?MODULE, '_', '_'}),
+    [{type(T), N, Pid} || {{?MODULE, T, {_, {_, S}}}, Pid} <- Ts,
+                          {ok, N} <- [inet:port(S)]].
+    
+ports(Ref) ->
+    Ts = diameter_reg:match({?MODULE, '_', {Ref, '_'}}),
+    [{type(T), N, Pid} || {{?MODULE, T, {R, {_, S}}}, Pid} <- Ts,
+                          R == Ref,
+                          {ok, N} <- [inet:port(S)]].
+
+type(listener) ->
+    listen;
+type(T) ->
+    T.
+
+%% ---------------------------------------------------------------------------
 %% # handle_call/3
 %% ---------------------------------------------------------------------------
 
 handle_call({{accept, Ref}, Pid}, _, #listener{ref = Ref,
                                                count = N}
                                      = S) ->
-    {TPid, NewS} = accept(Pid, S),
+    {TPid, NewS} = accept(Ref, Pid, S),
     {reply, {ok, TPid}, NewS#listener{count = N+1}};
 
 handle_call(_, _, State) ->
@@ -306,6 +337,12 @@ terminate(_, #listener{socket = Sock}) ->
 
 %% ---------------------------------------------------------------------------
 
+putr(Key, Val) ->
+    put({?MODULE, Key}, Val).
+
+getr(Key) ->
+    get({?MODULE, Key}).
+
 %% start_timer/1
 
 start_timer(#listener{count = 0} = S) ->
@@ -411,27 +448,41 @@ transition({diameter, {send, Msg}}, S) ->
 transition({diameter, {close, Pid}}, #transport{parent = Pid}) ->
     stop;
 
+%% TLS over SCTP is described in RFC 3436 but has limitations as
+%% described in RFC 6083. The latter describes DTLS over SCTP, which
+%% addresses these limitations, DTLS itself being described in RFC
+%% 4347. TLS is primarily used over TCP, which the current RFC 3588
+%% draft acknowledges by equating TLS with TLS/TCP and DTLS/SCTP.
+transition({diameter, {tls, _Ref, _Type, _Bool}}, _) ->
+    stop;
+
 %% Listener process has died.
 transition({'DOWN', _, process, Pid, _}, #transport{mode = {accept, Pid}}) ->
     stop;
 
 %% Parent process has died.
 transition({'DOWN', _, process, Pid, _}, #transport{parent = Pid}) ->
-    stop.
+    stop;
+
+%% Request for the local port number.
+transition({resolve_port, Pid}, #transport{socket = Sock})
+  when is_pid(Pid) ->
+    Pid ! inet:port(Sock),
+    ok.
 
 %% Crash on anything unexpected.
 
-%% accept/2
+%% accept/3
 %%
 %% Start a new transport process or use one that's already been
 %% started as a consequence of association establishment.
 
 %% No pending associations: spawn a new transport.
-accept(Pid, #listener{socket = Sock,
-                      tmap = T,
-                      pending = {0,_} = Q}
-            = S) ->
-    Arg = {accept, Pid, self(), Sock},
+accept(Ref, Pid, #listener{socket = Sock,
+                           tmap = T,
+                           pending = {0,_} = Q}
+                 = S) ->
+    Arg = {accept, Pid, self(), Sock, Ref},
     {ok, TPid} = diameter_sctp_sup:start_child(Arg),
     MRef = erlang:monitor(process, TPid),
     ets:insert(T, [{MRef, TPid}, {TPid, MRef}]),
@@ -442,12 +493,12 @@ accept(Pid, #listener{socket = Sock,
 
 %% Accepting transport has died. This can happen if a new transport is
 %% started before the DOWN has arrived.
-accept(Pid, #listener{pending = [TPid | {0,_} = Q]} = S) ->
+accept(Ref, Pid, #listener{pending = [TPid | {0,_} = Q]} = S) ->
     false = is_process_alive(TPid),  %% assert
-    accept(Pid, S#listener{pending = Q});
+    accept(Ref, Pid, S#listener{pending = Q});
 
 %% Pending associations: attach to the first in the queue.
-accept(Pid, #listener{ref = Ref, pending = {N,Q}} = S) ->
+accept(_, Pid, #listener{ref = Ref, pending = {N,Q}} = S) ->
     TPid = ets:first(Q),
     TPid ! {Ref, Pid},
     ets:delete(Q, TPid),
@@ -499,8 +550,14 @@ recv({[], #sctp_assoc_change{state = comm_up,
                              outbound_streams = OS,
                              inbound_streams = IS,
                              assoc_id = Id}},
-     #transport{assoc_id = undefined}
+     #transport{assoc_id = undefined,
+                mode = {T, _},
+                socket = Sock}
      = S) ->
+    Ref = getr(ref),
+    is_reference(Ref)  %% started in new code
+        andalso
+        (true = diameter_reg:add_new({?MODULE, T, {Ref, {Id, Sock}}})),
     up(S#transport{assoc_id = Id,
                    streams = {IS, OS}});
 
@@ -525,7 +582,22 @@ recv({[#sctp_sndrcvinfo{stream = Id}], Bin}, #transport{parent = Pid})
 
 recv({[], #sctp_shutdown_event{assoc_id = Id}},
      #transport{assoc_id = Id}) ->
-    stop.
+    stop;
+
+%% Note that diameter_sctp(3) documents that sctp_events cannot be
+%% specified in the list of options passed to gen_sctp and that
+%% gen_opts/1 guards against this. This is to ensure that we know what
+%% events to expect and also to ensure that we receive
+%% #sctp_sndrcvinfo{} with each incoming message (data_io_event =
+%% true). Adaptation layer events (ie. #sctp_adaptation_event{}) are
+%% disabled by default so don't handle it. We could simply disable
+%% events we don't react to but don't.
+
+recv({[], #sctp_paddr_change{}}, _) ->
+    ok;
+
+recv({[], #sctp_pdapi_event{}}, _) ->
+    ok.
 
 %% up/1
 
@@ -591,7 +663,7 @@ f([], _, _) ->
 
 %% assoc_id/1
 
-assoc_id(#sctp_shutdown_event{assoc_id = Id}) ->  %% undocumented
+assoc_id(#sctp_shutdown_event{assoc_id = Id}) ->
     Id;
 assoc_id(#sctp_assoc_change{assoc_id = Id}) ->
     Id;
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl
index 653c114471..78dbda6888 100644
--- a/lib/diameter/src/transport/diameter_tcp.erl
+++ b/lib/diameter/src/transport/diameter_tcp.erl
@@ -37,6 +37,9 @@
          code_change/3,
          terminate/2]).
 
+-export([ports/0,
+         ports/1]).
+
 -include_lib("diameter/include/diameter.hrl").
 
 -define(ERROR(T), erlang:error({T, ?MODULE, ?LINE})).
@@ -45,6 +48,9 @@
 -define(LISTENER_TIMEOUT, 30000).
 -define(FRAGMENT_TIMEOUT, 1000).
 
+%% cb_info passed to ssl.
+-define(TCP_CB(Mod), {Mod, tcp, tcp_closed, tcp_error}).
+
 %% The same gen_server implementation supports three different kinds
 %% of processes: an actual transport process, one that will club it to
 %% death should the parent die before a connection is established, and
@@ -71,8 +77,8 @@
         {socket  :: inet:socket(),  %% accept or connect socket
          parent  :: pid(),          %% of process that started us
          module  :: module(),       %% gen_tcp-like module
-         frag = <<>> :: binary() | {tref(), frag()}}). %% message fragment
-
+         frag = <<>> :: binary() | {tref(), frag()},  %% message fragment
+         ssl     :: boolean() | [term()]}). %% ssl options
 %% The usual transport using gen_tcp can be replaced by anything
 %% sufficiently gen_tcp-like by passing a 'module' option as the first
 %% (for simplicity) transport option. The transport_module diameter_etcp
@@ -122,12 +128,18 @@ i({T, Ref, Mod, Pid, Opts, Addrs})
     %% that does nothing but kill us with the parent until call
     %% returns.
     {ok, MPid} = diameter_tcp_sup:start_child(#monitor{parent = Pid}),
-    Sock = i(T, Ref, Mod, Pid, Opts, Addrs),
+    {SslOpts, Rest} = ssl(Opts),
+    Sock = i(T, Ref, Mod, Pid, SslOpts, Rest, Addrs),
     MPid ! {stop, self()},  %% tell the monitor to die
-    setopts(Mod, Sock),
+    M = if SslOpts -> ssl; true -> Mod end,
+    setopts(M, Sock),
+    putr(ref, Ref),
     #transport{parent = Pid,
-               module = Mod,
-               socket = Sock};
+               module = M,
+               socket = Sock,
+               ssl = SslOpts};
+%% Put the reference in the process dictionary since we now use it
+%% advertise the ssl socket after TLS upgrade.
 
 %% A monitor process to kill the transport if the parent dies.
 i(#monitor{parent = Pid, transport = TPid} = S) ->
@@ -146,27 +158,51 @@ i({listen, LRef, APid, {Mod, Opts, Addrs}}) ->
     LAddr = get_addr(LA, Addrs),
     LPort = get_port(LP),
     {ok, LSock} = Mod:listen(LPort, gen_opts(LAddr, Rest)),
+    true = diameter_reg:add_new({?MODULE, listener, {LRef, {LAddr, LSock}}}),
     proc_lib:init_ack({ok, self(), {LAddr, LSock}}),
     erlang:monitor(process, APid),
-    true = diameter_reg:add_new({?MODULE, listener, {LRef, {LAddr, LSock}}}),
     start_timer(#listener{socket = LSock}).
 
-%% i/6
+ssl(Opts) ->
+    {[SslOpts], Rest} = proplists:split(Opts, [ssl_options]),
+    {ssl_opts(SslOpts), Rest}.
+
+ssl_opts([]) ->
+    false;
+ssl_opts([{ssl_options, true}]) ->
+    true;
+ssl_opts([{ssl_options, Opts}])
+  when is_list(Opts) ->
+    Opts;
+ssl_opts(L) ->
+    ?ERROR({ssl_options, L}).
+
+%% i/7
+
+%% Establish a TLS connection before capabilities exchange ...
+i(Type, Ref, Mod, Pid, true, Opts, Addrs) ->
+    i(Type, Ref, ssl, Pid, [{cb_info, ?TCP_CB(Mod)} | Opts], Addrs);
+
+%% ... or not.
+i(Type, Ref, Mod, Pid, _, Opts, Addrs) ->
+    i(Type, Ref, Mod, Pid, Opts, Addrs).
 
-i(accept, Ref, Mod, Pid, Opts, Addrs) ->
+i(accept = T, Ref, Mod, Pid, Opts, Addrs) ->
     {LAddr, LSock} = listener(Ref, {Mod, Opts, Addrs}),
     proc_lib:init_ack({ok, self(), [LAddr]}),
     Sock = ok(accept(Mod, LSock)),
+    true = diameter_reg:add_new({?MODULE, T, {Ref, Sock}}),
     diameter_peer:up(Pid),
     Sock;
 
-i(connect, _, Mod, Pid, Opts, Addrs) ->
+i(connect = T, Ref, Mod, Pid, Opts, Addrs) ->
     {[LA, RA, RP], Rest} = proplists:split(Opts, [ip, raddr, rport]),
     LAddr = get_addr(LA, Addrs),
     RAddr = get_addr(RA, []),
     RPort = get_port(RP),
     proc_lib:init_ack({ok, self(), [LAddr]}),
     Sock = ok(connect(Mod, RAddr, RPort, gen_opts(LAddr, Rest))),
+    true = diameter_reg:add_new({?MODULE, T, {Ref, Sock}}),
     diameter_peer:up(Pid, {RAddr, RPort}),
     Sock.
 
@@ -227,6 +263,43 @@ gen_opts(LAddr, Opts) ->
      | Opts].
 
 %% ---------------------------------------------------------------------------
+%% # ports/1
+%% ---------------------------------------------------------------------------
+
+ports() ->
+    Ts = diameter_reg:match({?MODULE, '_', '_'}),
+    [{type(T), resolve(T,S), Pid} || {{?MODULE, T, {_,S}}, Pid} <- Ts].
+
+ports(Ref) ->
+    Ts = diameter_reg:match({?MODULE, '_', {Ref, '_'}}),
+    [{type(T), resolve(T,S), Pid} || {{?MODULE, T, {R,S}}, Pid} <- Ts,
+                                     R == Ref].
+
+type(listener) ->
+    listen;
+type(T) ->
+    T.
+
+sock(listener, {_LAddr, Sock}) ->
+    Sock;
+sock(_, Sock) ->
+    Sock.
+
+resolve(Type, S) ->
+    Sock = sock(Type, S),
+    try
+        ok(portnr(Sock))
+    catch
+        _:_ -> Sock
+    end.
+
+portnr(Sock)
+  when is_port(Sock) ->
+    portnr(gen_tcp, Sock);
+portnr(Sock) ->
+    portnr(ssl, Sock).
+
+%% ---------------------------------------------------------------------------
 %% # handle_call/3
 %% ---------------------------------------------------------------------------
 
@@ -258,6 +331,8 @@ handle_info(T, #monitor{} = S) ->
 %% # code_change/3
 %% ---------------------------------------------------------------------------
 
+code_change(_, {transport, _, _, _, _} = S, _) ->
+    {ok, #transport{} = list_to_tuple(tuple_to_list(S) ++ [false])};
 code_change(_, State, _) ->
     {ok, State}.
 
@@ -270,6 +345,12 @@ terminate(_, _) ->
 
 %% ---------------------------------------------------------------------------
 
+putr(Key, Val) ->
+    put({?MODULE, Key}, Val).
+
+getr(Key) ->
+    get({?MODULE, Key}).
+
 %% start_timer/1
 
 start_timer(#listener{count = 0} = S) ->
@@ -332,17 +413,56 @@ t(T,S) ->
 
 %% transition/2
 
+%% Initial incoming message when we might need to upgrade to TLS:
+%% don't request another message until we know.
+transition({tcp, Sock, Bin}, #transport{socket = Sock,
+                                        parent = Pid,
+                                        frag = Head,
+                                        module = M,
+                                        ssl = Opts}
+                             = S)
+  when is_list(Opts) ->
+    case recv1(Head, Bin) of
+        {Msg, B} when is_binary(Msg) ->
+            diameter_peer:recv(Pid, Msg),
+            S#transport{frag = B};
+        Frag ->
+            setopts(M, Sock),
+            S#transport{frag = Frag}
+    end;
+
 %% Incoming message.
-transition({tcp, Sock, Data}, #transport{socket = Sock,
-                                         module = M}
-                              = S) ->
+transition({P, Sock, Bin}, #transport{socket = Sock,
+                                      module = M,
+                                      ssl = B}
+                           = S)
+  when P == tcp, not B;
+       P == ssl, B ->
+    setopts(M, Sock),
+    recv(Bin, S);
+
+%% Capabilties exchange has decided on whether or not to run over TLS.
+transition({diameter, {tls, Ref, Type, B}}, #transport{parent = Pid}
+                                            = S) ->
+    #transport{socket = Sock,
+               module = M}
+        = NS
+        = tls_handshake(Type, B, S),
+    Pid ! {diameter, {tls, Ref}},
     setopts(M, Sock),
-    recv(Data, S);
+    NS#transport{ssl = B};
 
-transition({tcp_closed, Sock}, #transport{socket = Sock}) ->
+transition({C, Sock}, #transport{socket = Sock,
+                                 ssl = B})
+  when C == tcp_closed, not B;
+       C == ssl_closed, B ->
     stop;
 
-transition({tcp_error, Sock, _Reason} = T, #transport{socket = Sock} = S) ->
+transition({E, Sock, _Reason} = T, #transport{socket = Sock,
+                                              ssl = B}
+                                   = S)
+  when E == tcp_error, not B;
+       E == ssl_error, B ->
     ?ERROR({T,S});
 
 %% Outgoing message.
@@ -367,10 +487,10 @@ transition({timeout, TRef, flush}, S) ->
     flush(TRef, S);
 
 %% Request for the local port number.
-transition({resolve_port, RPid}, #transport{socket = Sock,
-                                            module = M})
-  when is_pid(RPid) ->
-    RPid ! lport(M, Sock),
+transition({resolve_port, Pid}, #transport{socket = Sock,
+                                           module = M})
+  when is_pid(Pid) ->
+    Pid ! portnr(M, Sock),
     ok;
 
 %% Parent process has died.
@@ -379,80 +499,122 @@ transition({'DOWN', _, process, Pid, _}, #transport{parent = Pid}) ->
 
 %% Crash on anything unexpected.
 
+%% tls_handshake/3
+%%
+%% In the case that no tls message is received (eg. the service hasn't
+%% been configured to advertise TLS support) we will simply never ask
+%% for another TCP message, which will force the watchdog to
+%% eventually take us down.
+
+%% TLS has already been established with the connection.
+tls_handshake(_, _, #transport{ssl = true} = S) ->
+    S;
+
+%% Capabilities exchange negotiated TLS but transport was not
+%% configured with an options list.
+tls_handshake(_, true, #transport{ssl = false}) ->
+    ?ERROR(no_ssl_options);
+
+%% Capabilities exchange negotiated TLS: upgrade the connection.
+tls_handshake(Type, true, #transport{socket = Sock,
+                                     module = M,
+                                     ssl = Opts}
+                          = S) ->
+    {ok, SSock} = tls(Type, Sock, [{cb_info, ?TCP_CB(M)} | Opts]),
+    Ref = getr(ref),
+    is_reference(Ref)  %% started in new code
+        andalso
+        (true = diameter_reg:add_new({?MODULE, Type, {Ref, SSock}})),
+    S#transport{socket = SSock,
+                module = ssl};
+
+%% Capabilities exchange has not negotiated TLS.
+tls_handshake(_, false, S) ->
+    S.
+
+tls(connect, Sock, Opts) ->
+    ssl:connect(Sock, Opts);
+tls(accept, Sock, Opts) ->
+    ssl:ssl_accept(Sock, Opts).
+
 %% recv/2
 %%
 %% Reassemble fragmented messages and extract multple message sent
 %% using Nagle.
 
 recv(Bin, #transport{parent = Pid, frag = Head} = S) ->
-    S#transport{frag = recv(Pid, Head, Bin)}.
+    case recv1(Head, Bin) of
+        {Msg, B} when is_binary(Msg) ->
+            diameter_peer:recv(Pid, Msg),
+            recv(B, S#transport{frag = <<>>});
+        Frag ->
+            S#transport{frag = Frag}
+    end.
 
-%% recv/3
+%% recv1/2
 
 %% No previous fragment.
-recv(Pid, <<>>, Bin) ->
-    rcv(Pid, Bin);
+recv1(<<>>, Bin) ->
+    rcv(Bin);
 
-recv(Pid, {TRef, Head}, Bin) ->
+recv1({TRef, Head}, Bin) ->
     erlang:cancel_timer(TRef),
-    rcv(Pid, Head, Bin).
+    rcv(Head, Bin).
 
-%% rcv/3
+%% rcv/2
 
 %% Not even the first four bytes of the header.
-rcv(Pid, Head, Bin)
+rcv(Head, Bin)
   when is_binary(Head) ->
-    rcv(Pid, <<Head/binary, Bin/binary>>);
+    rcv(<<Head/binary, Bin/binary>>);
 
 %% Or enough to know how many bytes to extract.
-rcv(Pid, {Len, N, Head, Acc}, Bin) ->
-    rcv(Pid, Len, N + size(Bin), Head, [Bin | Acc]).
+rcv({Len, N, Head, Acc}, Bin) ->
+    rcv(Len, N + size(Bin), Head, [Bin | Acc]).
 
-%% rcv/5
+%% rcv/4
 
 %% Extract a message for which we have all bytes.
-rcv(Pid, Len, N, Head, Acc)
+rcv(Len, N, Head, Acc)
   when Len =< N ->
-    rcv(Pid, rcv1(Pid, Len, bin(Head, Acc)));
+    rcv1(Len, bin(Head, Acc));
 
 %% Wait for more packets.
-rcv(_, Len, N, Head, Acc) ->
+rcv(Len, N, Head, Acc) ->
     {start_timer(), {Len, N, Head, Acc}}.
 
 %% rcv/2
 
 %% Nothing left.
-rcv(_, <<>> = Bin) ->
+rcv(<<>> = Bin) ->
     Bin;
 
 %% Well, this isn't good. Chances are things will go south from here
 %% but if we're lucky then the bytes we have extend to an intended
 %% message boundary and we can recover by simply discarding them,
 %% which is the result of receiving them.
-rcv(Pid, <<_:1/binary, Len:24, _/binary>> = Bin)
+rcv(<<_:1/binary, Len:24, _/binary>> = Bin)
   when Len < 20 ->
-    diameter_peer:recv(Pid, Bin),
-    <<>>;
+    {Bin, <<>>};
 
 %% Enough bytes to extract a message.
-rcv(Pid, <<_:1/binary, Len:24, _/binary>> = Bin)
+rcv(<<_:1/binary, Len:24, _/binary>> = Bin)
   when Len =< size(Bin) ->
-    rcv(Pid, rcv1(Pid, Len, Bin));
+    rcv1(Len, Bin);
 
 %% Or not: wait for more packets.
-rcv(_, <<_:1/binary, Len:24, _/binary>> = Head) ->
+rcv(<<_:1/binary, Len:24, _/binary>> = Head) ->
     {start_timer(), {Len, size(Head), Head, []}};
 
 %% Not even 4 bytes yet.
-rcv(_, Head) ->
+rcv(Head) ->
     {start_timer(), Head}.
 
-%% rcv1/3
+%% rcv1/2
 
-rcv1(Pid, Len, Bin) ->
+rcv1(Len, Bin) ->
     <<Msg:Len/binary, Rest/binary>> = Bin,
-    diameter_peer:recv(Pid, Msg),
-    Rest.
+    {Msg, Rest}.
 
 %% bin/[12]
 
@@ -489,15 +651,18 @@ flush(_, S) ->
 
 %% accept/2
 
-accept(gen_tcp, LSock) ->
-    gen_tcp:accept(LSock);
+accept(ssl, LSock) ->
+    case ssl:transport_accept(LSock) of
+        {ok, Sock} ->
+            {ssl:ssl_accept(Sock), Sock};
+        {error, _} = No ->
+            No
+    end;
 accept(Mod, LSock) ->
     Mod:accept(LSock).
 
 %% connect/4
 
-connect(gen_tcp, Host, Port, Opts) ->
-    gen_tcp:connect(Host, Port, Opts);
 connect(Mod, Host, Port, Opts) ->
     Mod:connect(Host, Port, Opts).
 
@@ -505,6 +670,8 @@ connect(Mod, Host, Port, Opts) ->
 
 send(gen_tcp, Sock, Bin) ->
     gen_tcp:send(Sock, Bin);
+send(ssl, Sock, Bin) ->
+    ssl:send(Sock, Bin);
 send(M, Sock, Bin) ->
     M:send(Sock, Bin).
 
@@ -512,6 +679,8 @@ send(M, Sock, Bin) ->
 
 setopts(gen_tcp, Sock, Opts) ->
     inet:setopts(Sock, Opts);
+setopts(ssl, Sock, Opts) ->
+    ssl:setopts(Sock, Opts);
 setopts(M, Sock, Opts) ->
     M:setopts(Sock, Opts).
 
@@ -523,9 +692,16 @@ setopts(M, Sock) ->
         X  -> x({setopts, M, Sock, X})  %% possibly on peer disconnect
     end.
 
-%% lport/2
+%% portnr/2
 
-lport(gen_tcp, Sock) ->
+portnr(gen_tcp, Sock) ->
     inet:port(Sock);
-lport(M, Sock) ->
+portnr(ssl, Sock) ->
+    case ssl:sockname(Sock) of
+        {ok, {_Addr, PortNr}} ->
+            {ok, PortNr};
+        {error, _} = No ->
+            No
+    end;
+portnr(M, Sock) ->
     M:port(Sock).
diff --git a/lib/diameter/src/transport/modules.mk b/lib/diameter/src/transport/modules.mk
deleted file mode 100644
index a0dc3cf2c0..0000000000
--- a/lib/diameter/src/transport/modules.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2010-2011. 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.
-# 
-# %CopyrightEnd%
-
-MODULES = \
-	diameter_etcp \
-	diameter_etcp_sup \
-	diameter_tcp \
-	diameter_tcp_sup \
-	diameter_sctp \
-	diameter_sctp_sup \
-	diameter_transport_sup
-
-HRL_FILES =
diff --git a/lib/diameter/src/transport/.gitignore b/lib/diameter/test/.gitignore
index d9f072e262..df38dfc5e3 100644
--- a/lib/diameter/src/transport/.gitignore
+++ b/lib/diameter/test/.gitignore
@@ -1,3 +1,3 @@
 
+/log
 /depend.mk
-
diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index 823e2f0311..69bcabbfbb 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -16,40 +16,27 @@
 #
 # %CopyrightEnd%
 
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-else
+ifeq ($(ERL_TOP),)
 include $(DIAMETER_TOP)/make/target.mk
 include $(DIAMETER_TOP)/make/$(TARGET)/rules.mk
+else
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
 endif
 
 # ----------------------------------------------------
 # Application version
 # ----------------------------------------------------
+
 include ../vsn.mk
-VSN=$(DIAMETER_VSN)
 
+VSN = $(DIAMETER_VSN)
 
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/diameter_test
-
-ifeq ($(findstring win32,$(TARGET)),win32)
-
-MAKEFILE_SRC = Makefile.win32.src
-
-else
-
-MAKEFILE_SRC = Makefile.src
-
-endif
-
-ifeq ($(TT_DIR),)
-TT_DIR = /tmp
-endif
 
+RELSYSDIR = $(RELEASE_PATH)/diameter_test
 
 # ----------------------------------------------------
 # Target Specs
@@ -57,352 +44,129 @@ endif
 
 include modules.mk
 
-EBIN = .
-
-HRL_FILES = diameter_test_lib.hrl
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-SOURCE = $(HRL_FILES) $(ERL_FILES) 
-
+ERL_FILES    = $(MODULES:%=%.erl)
 TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
 
-APP_CASES   = app appup
-
-TRANSPORT_CASES = tcp
-
-ALL_CASES   = \
-	$(APP_CASES) \
-	compiler conf sync session stats reg peer \
-	$(TRANSPORT_CASES)
-
-
-EMAKEFILE  = Emakefile
-ifneq ($(ERL_TOP),)
-MAKE_EMAKE = $(wildcard $(ERL_TOP)/make/make_emakefile)
-else
-MAKE_EMAKE = $(wildcard $(DIAMETER_TOP)/make/make_emakefile)
-endif
-
-ifeq ($(MAKE_EMAKE),)
-BUILDTARGET   = $(TARGET_FILES)
-RELTEST_FILES = $(TEST_SPEC_FILE) $(COVER_SPEC_FILE) $(SOURCE)
-else
-BUILDTARGET   = emakebuild
-RELTEST_FILES = $(EMAKEFILE) $(TEST_SPEC_FILE) $(COVER_SPEC_FILE) $(SOURCE)
-endif
-
+SUITE_MODULES = $(filter diameter_%_SUITE, $(MODULES))
+SUITES        = $(SUITE_MODULES:diameter_%_SUITE=%)
 
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
 
-include ../src/app/diameter.mk 
-
-ifeq ($(USE_DIAMETER_TEST_CODE),true)
-ERL_COMPILE_FLAGS += -DDIAMETER_TEST_CODE=mona_lisa_spelar_doom
-endif
-
-ifeq ($(USE_DIAMETER_HIPE),true)
-ERL_COMPILE_FLAGS += +native -DDIAMETER_hipe_special=true
-endif
-
-ifneq ($(ERL_TOP),)
-ERL_COMPILE_FLAGS += \
-	$(DIAMETER_ERL_COMPILE_FLAGS)       \
-	-pa $(ERL_TOP)/lib/test_server/ebin \
-	-I$(ERL_TOP)/lib/test_server/include
-else
-ERL_COMPILE_FLAGS += \
-	$(DIAMETER_ERL_COMPILE_FLAGS)       \
-	-pa $(TEST_SERVER_DIR)/ebin \
-	-I$(TEST_SERVER_DIR)/include
-endif
-
-ERL_PATH = \
-	-pa ../../$(APPLICATION)/ebin \
-	-pa ../../et/ebin
-
-ifndef SUITE
-SUITE = diameter_SUITE
-endif
-
-ESTOP = -s init stop
-
-ifeq ($(DONT_STOP),true)
-MAYBE_ESTOP =
-else
-MAYBE_ESTOP = $(ESTOP)
-endif
-
-ETVIEW = -s et_viewer
-ifeq ($(USE_ET_VIEWER),true)
-MAYBE_ETVIEW =
-else
-MAYBE_ETVIEW = $(ETVIEW)
-endif
-
-ifeq ($(MERL),)
-MERL = $(ERL)
-endif
-
-ARGS += -noshell
-
-ifeq ($(DISABLE_TC_TIMEOUT),true)
-ARGS += -diameter_test_timeout
-endif
-
-
-DIAMETER_TEST_SERVER = diameter_test_server
-
+# This is only used to compile suite locally when running with a
+# target like 'all' below. Target release_tests only installs source.
+ERL_COMPILE_FLAGS += +warn_export_vars \
+                     +warn_unused_vars \
+                     -DDIAMETER_CT=true \
+                     -I ../src/gen
 
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
 
-tests debug opt: $(BUILDTARGET)
+all: $(SUITES)
 
-targets: $(TARGET_FILES)
-
-.PHONY: emakebuild
-
-emakebuild: $(EMAKEFILE)
-
-$(EMAKEFILE): 
-	$(MAKE_EMAKE) $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' | grep -v Warning > $(EMAKEFILE)
-	$(MAKE_EMAKE) $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) | grep -v Warning >> $(EMAKEFILE)
+beam tests debug opt: $(TARGET_FILES)
 
 clean:
-	rm -f $(EMAKEFILE)
 	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
+	rm -f depend.mk
+
+realclean: clean
+	rm -rf log
 
 docs:
 
+list = echo $(1):; echo $($(1)) | tr ' ' '\n' | sort | sed 's@^@  @'
+
 info:
-	@echo "MAKE_EMAKE        = $(MAKE_EMAKE)"
-	@echo "EMAKEFILE         = $(EMAKEFILE)"
-	@echo "BUILDTARGET       = $(BUILDTARGET)"
-	@echo ""
-	@echo "ERL_COMPILE_FLAGS = $(ERL_COMPILE_FLAGS)"
-	@echo "ERL  = $(ERL)"
-	@echo "ERLC = $(ERLC)"
-	@echo "MERL = $(MERL)"
-	@echo ""
-	@echo "ARGS = $(ARGS)"
-	@echo ""
-	@echo "HRL_FILES    = $(HRL_FILES)"
-	@echo "ERL_FILES    = $(ERL_FILES)"
-	@echo "TARGET_FILES = $(TARGET_FILES)"
-	@echo ""
+	@echo ========================================
+	@$(call list,MODULES)
+	@echo
+	@$(call list,HRL_FILES)
+	@echo
+	@$(call list,SUITES)
+	@echo ========================================
 
 help:
-	@echo ""
-	@echo "This Makefile controls the test of the $(APPLICATION) application. "
-	@echo ""
-	@echo "There are two separate ways to perform the test of $(APPLICATION)."
-	@echo ""
-	@echo "  a) Run the official OTP test-server (which we do not describe here)"
-	@echo ""
-	@echo "  b) Run the test-server provided with this application. "
-	@echo "     There are a number of targets to run the entire or parts"
-	@echo "     of this applications ($(APPLICATION)) test-suite"
-	@echo ""
-	@echo "Targets:"
-	@echo ""
-	@echo "    help"
-	@echo "      Print this info"
-	@echo ""
-	@echo "    info"
-	@echo "      Prints various environment variables. "
-	@echo "      May be useful when debugging the Makefile. "
-	@echo ""
-	@echo "    tests | debug | opt "
-	@echo "      Compile all test-code. "
-	@echo ""
-	@echo "    clean "
-	@echo "      Remove all targets. "
-	@echo ""
-	@echo "    test"
-	@echo "      Run the entire $(APPLICATION) test-suite. "
-	@echo ""
-	@echo "    app"
-	@echo "      Run the $(APPLICATION) application sub-test-suite. "
-	@echo ""
-	@echo "    appup"
-	@echo "      Run the $(APPLICATION) application upgrade (appup) sub-test-suite. "
-	@echo ""
-	@echo "    compiler"
-	@echo "      Run the $(APPLICATION) compiler sub-test-suite(s). "
-	@echo ""
-	@echo "    conf"
-	@echo "      Run the $(APPLICATION) config sub-test-suite. "
-	@echo "      Checks various aspects of the $(APPLICATION) configuration. "
-	@echo ""
-	@echo "    sync"
-	@echo "      Run the $(APPLICATION) sync sub-test-suite. "
-	@echo ""
-	@echo "    session"
-	@echo "      Run the $(APPLICATION) session sub-test-suite. "
-	@echo ""
-	@echo "    stats"
-	@echo "      Run the $(APPLICATION) stats sub-test-suite. "
-	@echo ""
-	@echo "    reg"
-	@echo "      Run the $(APPLICATION) reg sub-test-suite. "
-	@echo ""
-	@echo "    peer"
-	@echo "      Run the $(APPLICATION) peer sub-test-suite"
-	@echo ""
-	@echo "    ptab"
-	@echo "      Run the $(APPLICATION) persistent-table sub-test-suite"
-	@echo ""
-	@echo "    tcp"
-	@echo "      Run the $(APPLICATION) tcp sub-test-suite"
-	@echo ""
-	@echo ""
-
+	@echo ========================================
+	@echo "Useful targets:"
+	@echo
+	@echo "    all:"
+	@echo "        Compile and run all test suites."
+	@echo
+	@echo "    $(SUITES):"
+	@echo "        Compile and run a specific test suite."
+	@echo
+	@echo "    beam:"
+	@echo "        Compile all test-code."
+	@echo
+	@echo "    clean | realclean:"
+	@echo "        Remove generated files."
+	@echo
+	@echo "    info:"
+	@echo "        Echo some interesting variables."
+	@echo ========================================
+
+.PHONY: all beam clean debug docs help info opt realclean tests
 
 # ----------------------------------------------------
 # Special Targets
 # ----------------------------------------------------
 
-all: make
-	@echo "make sure epmd is new"
-	@epmd -kill > /dev/null
-	@echo "Running all sub-suites separatelly"
-	@for i in $(ALL_CASES); do \
-            echo "SUITE: $$i"; \
-            clearmake -V $$i > $$i.log; \
-        done
-
-aall: make
-	@echo "make sure epmd is new"
-	@epmd -kill > /dev/null
-	@echo "Running all app sub-suites separatelly"
-	@for i in $(APP_CASES); do \
-            echo "SUITE: $$i"; \
-            clearmake -V $$i > $$i.log; \
-        done
-	echo "done"
-
-tall: make
-	@echo "make sure epmd is new"
-	@epmd -kill > /dev/null
-	@echo "Running all transport sub-suites separatelly"
-	@for i in $(TRANSPORT_CASES); do \
-            echo "SUITE: $$i"; \
-            clearmake -V $$i > $$i.log; \
-        done
-
-make: targets
-
-test: make
-	$(MERL) $(ARGS) -sname diameter_test $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t $(SUITE) \
-            $(MAYBE_ESTOP)
-
-utest: make
-	$(MERL) $(ARGS) -sname diameter_utest $(ERL_PATH) \
-            $(MAYBE_ETVIEW) \
-            -s $(DIAMETER_TEST_SERVER) t $(SUITE) \
-            $(ESTOP)
-
-# ftest: make
-# 	$(MERL) $(ARGS) -sname diameter_ftest $(ERL_PATH) \
-#             -s diameter_filter \
-#             -s $(DIAMETER_TEST_SERVER) t $(SUITE) \
-#             $(ESTOP)
-# 
-
-##########################
-
-# tickets: make
-# 	$(MERL) $(ARGS) -sname diameter_tickets $(ERL_PATH) \
-#             -s $(DIAMETER_TEST_SERVER) tickets $(SUITE) \
-#             $(ESTOP)
-# 
-
-app: make
-	$(MERL) $(ARGS) -sname diameter_app $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t diameter_app_test \
-            $(ESTOP)
+# Exit with a non-zero status if the output looks to indicate failure.
+# diameter_ct:run/1 itself can't tell (it seems). The absolute -pa is
+# because ct will change directories.
+$(SUITES): log tests
+	$(ERL) -noshell \
+	        -pa $(realpath ../ebin) \
+	        -sname diameter_test_$@ \
+	        -s diameter_ct run diameter_$@_SUITE \
+	        -s init stop \
+	| awk '1{rc=0} {print} / FAILED /{rc=1} END{exit rc}'
+# Shorter in sed but requires a GNU extension (ie. Q).
 
-appup: make
-	$(MERL) $(ARGS) -sname diameter_appup $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t diameter_appup_test \
-            $(ESTOP)
-
-compiler: make
-	$(MERL) $(ARGS) -sname diameter_compiler $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t diameter_compiler_test \
-            $(ESTOP)
-
-conf: make
-	$(MERL) $(ARGS) -sname diameter_config $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t diameter_config_test \
-            $(ESTOP)
-
-sync: make
-	$(MERL) $(ARGS) -sname diameter_sync $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t diameter_sync_test \
-            $(ESTOP)
-
-session: make
-	$(MERL) $(ARGS) -sname diameter_session $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t diameter_session_test \
-            $(ESTOP)
-
-stats: make
-	$(MERL) $(ARGS) -sname diameter_stats $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t diameter_stats_test \
-            $(ESTOP)
-
-reg: make
-	$(MERL) $(ARGS) -sname diameter_reg $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t diameter_reg_test \
-            $(ESTOP)
-
-peer: make
-	$(MERL) $(ARGS) -sname diameter_peer $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t diameter_peer_test \
-            $(ESTOP)
-
-ptab: make
-	$(MERL) $(ARGS) -sname diameter_persistent_table $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t diameter_persistent_table_test \
-            $(ESTOP)
-
-tcp: make
-	$(MERL) $(ARGS) -sname diameter_tcp $(ERL_PATH) \
-            -s $(DIAMETER_TEST_SERVER) t diameter_tcp_test \
-            $(ESTOP)
-
-
-node:
-	$(MERL) -sname diameter $(ERL_PATH)
+log:
+	mkdir $@
 
+.PHONY: $(SUITES)
 
 # ----------------------------------------------------
 # Release Targets
 # ---------------------------------------------------- 
 
-ifneq ($(ERL_TOP),)
-include $(ERL_TOP)/make/otp_release_targets.mk
-else
+ifeq ($(ERL_TOP),)
 include $(DIAMETER_TOP)/make/release_targets.mk
+else
+include $(ERL_TOP)/make/otp_release_targets.mk
 endif
 
 release_spec: 
 
 release_docs_spec:
 
-release_tests_spec: tests
+release_tests_spec:
 	$(INSTALL_DIR)  $(RELSYSDIR)
-	$(INSTALL_DATA) $(RELTEST_FILES) $(RELSYSDIR)
-#	$(INSTALL_DATA) $(TEST_SPEC_FILE) $(COVER_SPEC_FILE) \
-#                        $(HRL_FILES) $(ERL_FILES) \
-#                        $(RELSYSDIR)
-#
-	chmod -f -R u+w $(RELSYSDIR)
+	$(INSTALL_DATA) $(TEST_SPEC_FILE) \
+	                $(COVER_SPEC_FILE) \
+	                $(HRL_FILES) \
+	                $(ERL_FILES) \
+	                $(RELSYSDIR)
+
+.PHONY: release_spec release_docs_spec release_test_specs
+
+# ----------------------------------------------------
+
+depend: depend.mk
+
+# Generate dependencies makefile.
+depend.mk: depend.sed $(MODULES:%=%.erl) Makefile
+	(for f in $(MODULES); do \
+	     sed -f $< $$f.erl | sed "s@/@/$$f@"; \
+	 done) \
+	> $@
+
+-include depend.mk
 
+.PHONY: depend
diff --git a/lib/diameter/src/app/depend.sed b/lib/diameter/test/depend.sed
index 9df0133960..a399eb45f0 100644
--- a/lib/diameter/src/app/depend.sed
+++ b/lib/diameter/test/depend.sed
@@ -18,14 +18,14 @@
 #
 
 #
-# Extract include dependencies from .erl files. The output is massaged
+# Extract local include dependencies from .erl files. The output is massaged
 # further in Makefile.
 #
 
 /^-include/!d
-/"diameter/!d
+/^-include_lib/d
+/diameter_gen/d
 
-s@^-include_lib("[^/]*@$(DIAMETER_TOP)@
 s@^-include("@@
 s@".*@@
 s@^@$(EBIN)/.$(EMULATOR): @
diff --git a/lib/diameter/test/diameter.spec b/lib/diameter/test/diameter.spec
index a6e71762eb..fae7863bec 100644
--- a/lib/diameter/test/diameter.spec
+++ b/lib/diameter/test/diameter.spec
@@ -1,9 +1 @@
 {suites, "../diameter_test", all}.
-%%{skip, {diameter_compiler_test, all, "Not yet implemented"}}.
-%%{skip, {diameter_config_test, all,   "Not yet implemented"}}.
-%%{skip, {diameter_peer_test, all,     "Not yet implemented"}}.
-%%{skip, {diameter_reg_test, all,      "Not yet implemented"}}.
-%%{skip, {diameter_session_test, all,  "Not yet implemented"}}.
-%%{skip, {diameter_stats_test, all,    "Not yet implemented"}}.
-%%{skip, {diameter_sync_test, all,     "Not yet implemented"}}.
-%%{skip, {diameter_tcp_test, all,      "Not yet implemented"}}.
diff --git a/lib/diameter/test/diameter_SUITE.erl b/lib/diameter/test/diameter_SUITE.erl
deleted file mode 100644
index 443cf90e92..0000000000
--- a/lib/diameter/test/diameter_SUITE.erl
+++ /dev/null
@@ -1,108 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Test application config
-%%----------------------------------------------------------------------
-
--module(diameter_SUITE).
-
--export([
-	 suite/0, 
-	 all/0,
-	 groups/0, 
-
-	 init_per_testcase/2,
-	 fin_per_testcase/2,
-
-	 init_per_suite/1, 
-	 end_per_suite/1, 
-
-	 init_per_group/2, 
-	 end_per_group/2, 
-
-	 init/0
-	]).
-
--export([t/0, t/1]).
-
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-init() ->
-    process_flag(trap_exit, true),
-    ?FLUSH().
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Top test case
-
-suite() -> 
-    [{ct_hooks, [{ts_install_cth, [{nodenames,1}]}]}].
-
-all() ->
-    [
-     {group, app},
-     {group, appup},
-     {group, compiler}, 
-     {group, config},
-     {group, sync}, 
-     {group, session},
-     {group, stats},
-     {group, reg},
-     {group, peer}, 
-     {group, tcp}
-    ].
-
-groups() ->
-    [{app,      [], [{diameter_app_test,      all}]},
-     {appup,    [], [{diameter_appup_test,    all}]},
-     {compiler, [], [{diameter_compiler_test, all}]},
-     {config,   [], [{diameter_config_test,   all}]}, 
-     {sync,     [], [{diameter_sync_test,     all}]},
-     {session,  [], [{diameter_session_test,  all}]}, 
-     {stats,    [], [{diameter_stats_test,    all}]}, 
-     {reg,      [], [{diameter_reg_test,      all}]}, 
-     {peer,     [], [{diameter_peer_test,     all}]}, 
-     {tcp,      [], [{diameter_tcp_test,      all}]}].
-
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
diff --git a/lib/diameter/test/diameter_app_SUITE.erl b/lib/diameter/test/diameter_app_SUITE.erl
new file mode 100644
index 0000000000..d5ecdea291
--- /dev/null
+++ b/lib/diameter/test/diameter_app_SUITE.erl
@@ -0,0 +1,264 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests based on the contents of the diameter app file.
+%%
+
+-module(diameter_app_SUITE).
+
+-export([suite/0,
+         all/0,
+	 init_per_suite/1,
+         end_per_suite/1]).
+
+%% testcases
+-export([keys/1,
+         vsn/1,
+	 modules/1,
+	 exports/1,
+         release/1,
+	 xref/1,
+         relup/1]).
+
+-include("diameter_ct.hrl").
+
+-define(A, list_to_atom).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 10}}].
+
+all() ->
+    [keys,
+     vsn,
+     modules,
+     exports,
+     release,
+     xref,
+     relup].
+
+init_per_suite(Config) ->
+    [{application, ?APP, App}] = diameter_util:consult(?APP, app),
+    [{app, App} | Config].
+
+end_per_suite(_Config) ->
+    ok.
+
+%% ===========================================================================
+%% # keys/1
+%%
+%% Ensure that the app file contains selected keys. Some of these would
+%% also be caught by other testcases.
+%% ===========================================================================
+
+keys(Config) ->
+    App = fetch(app, Config),
+    [] = lists:filter(fun(K) -> not lists:keymember(K, 1, App) end,
+                      [vsn, description, modules, registered, applications]).
+
+%% ===========================================================================
+%% # vsn/1
+%%
+%% Ensure that our app version sticks to convention.
+%% ===========================================================================
+
+vsn(Config) ->
+    true = is_vsn(fetch(vsn, fetch(app, Config))).
+
+%% ===========================================================================
+%% # modules/1
+%%
+%% Ensure that the app file modules and installed modules differ by
+%% compiler/help modules.
+%% ===========================================================================
+
+modules(Config) ->
+    Mods = fetch(modules, fetch(app, Config)),
+    Installed = code_mods(),
+    Help = [diameter_callback,
+            diameter_codegen,
+            diameter_dbg,
+            diameter_exprecs,
+            diameter_info,
+            diameter_make,
+            diameter_spec_scan,
+            diameter_spec_util],
+    {[], Help} = {Mods -- Installed, lists:sort(Installed -- Mods)}.
+
+code_mods() ->
+    Dir  = code:lib_dir(?APP, ebin),
+    {ok, Files} = file:list_dir(Dir),
+    [?A(lists:reverse(R)) || N <- Files, "maeb." ++ R <- [lists:reverse(N)]].
+
+%% ===========================================================================
+%% # exports/1
+%%
+%% Ensure that no module does export_all.
+%% ===========================================================================
+
+exports(Config) ->
+    Mods = fetch(modules, fetch(app, Config)),
+    [] = [M || M <- Mods, exports_all(M)].
+
+exports_all(Mod) ->
+    Opts = fetch(options, Mod:module_info(compile)),
+
+    is_list(Opts) andalso lists:member(export_all, Opts).
+
+%% ===========================================================================
+%% # release/1
+%%
+%% Ensure that it's possible to build a minimal release with our app file.
+%% ===========================================================================
+
+release(Config) ->
+    App = fetch(app, Config),
+    Rel = {release,
+           {"diameter test release", fetch(vsn, App)},
+           {erts, erlang:system_info(version)},
+           [{A, appvsn(A)} || A <- fetch(applications, App)]},
+    Dir = fetch(priv_dir, Config),
+    ok = write_file(filename:join([Dir, "diameter_test.rel"]), Rel),
+    {ok, _, []} = systools:make_script("diameter_test", [{path, [Dir]},
+                                                         {outdir, Dir},
+                                                         silent]).
+
+appvsn(Name) ->
+    [{application, Name, App}] = diameter_util:consult(Name, app),
+    fetch(vsn, App).
+
+%% ===========================================================================
+%% # xref/1
+%%
+%% Ensure that no function in our application calls an undefined function
+%% or one in an application we haven't specified as a dependency. (Almost.)
+%% ===========================================================================
+
+xref(Config) ->
+    App = fetch(app, Config),
+    Mods = fetch(modules, App),
+
+    {ok, XRef} = xref:start(make_name(xref_test_name)),
+    ok = xref:set_default(XRef, [{verbose, false}, {warnings, false}]),
+
+    %% Only add our application and those it's dependent on according
+    %% to the app file. Well, almost. erts beams are also required to
+    %% stop xref from complaining about calls to module erlang, which
+    %% was previously in kernel. Erts isn't an application however, in
+    %% the sense that there's no .app file, and isn't listed in
+    %% applications. Seems less than ideal. Also, diameter_tcp does
+    %% call ssl despite ssl not being listed as a dependency in the
+    %% app file since ssl is only required for TLS security: it's up
+    %% to a client who wants TLS it to start ssl.
+    ok = lists:foreach(fun(A) -> add_application(XRef, A) end,
+                       [?APP, erts | fetch(applications, App)]),
+
+    {ok, Undefs} = xref:analyze(XRef, undefined_function_calls),
+
+    xref:stop(XRef),
+
+    %% Only care about calls from our own application.
+    [] = lists:filter(fun({{F,_,_},{T,_,_}}) ->
+                              lists:member(F, Mods)
+                                  andalso {F,T} /= {diameter_tcp, ssl}
+                      end,
+                      Undefs).
+
+add_application(XRef, App) ->
+    add_application(XRef, App, code:lib_dir(App)).
+
+%% erts will not be in the lib directory before installation.
+add_application(XRef, erts, {error, _}) ->
+    Dir = filename:join([code:root_dir(), "erts", "preloaded", "ebin"]),
+    {ok, _} = xref:add_directory(XRef, Dir, []);
+add_application(XRef, App, Dir)
+  when is_list(Dir) ->
+    {ok, App} = xref:add_application(XRef, Dir, []).
+
+make_name(Suf) ->
+    list_to_atom(atom_to_list(?APP) ++ "_" ++ atom_to_list(Suf)).
+
+%% ===========================================================================
+%% # relup/1
+%%
+%% Ensure that we can generate release upgrade files using our appup file.
+%% ===========================================================================
+
+relup(Config) ->
+    [{Vsn, Up, Down}] = diameter_util:consult(?APP, appup),
+    true = is_vsn(Vsn),
+
+    App = fetch(app, Config),
+    Rel = [{erts, erlang:system_info(version)}
+           | [{A, appvsn(A)} || A <- fetch(applications, App)]],
+
+    Dir = fetch(priv_dir, Config),
+
+    Name = write_rel(Dir, Rel, Vsn),
+    UpFrom = acc_rel(Dir, Rel, Up),
+    DownTo = acc_rel(Dir, Rel, Down),
+
+    {[Name], [Name], UpFrom, DownTo}  %% no intersections
+        = {[Name] -- UpFrom,
+           [Name] -- DownTo,
+           UpFrom -- DownTo,
+           DownTo -- UpFrom},
+
+    {ok, _, _, []} = systools:make_relup(Name, UpFrom, DownTo, [{path, [Dir]},
+                                                                {outdir, Dir},
+                                                                silent]).
+
+acc_rel(Dir, Rel, List) ->
+    lists:foldl(fun(T,A) -> acc_rel(Dir, Rel, T, A) end,
+                [],
+                List).
+
+acc_rel(Dir, Rel, {Vsn, _}, Acc) ->
+    [write_rel(Dir, Rel, Vsn) | Acc].
+
+%% Write a rel file and return its name.
+write_rel(Dir, [Erts | Apps], Vsn) ->
+    true = is_vsn(Vsn),
+    Name = "diameter_test_" ++ Vsn,
+    ok = write_file(filename:join([Dir, Name ++ ".rel"]),
+                    {release,
+                     {"diameter " ++ Vsn ++ " test release", Vsn},
+                     Erts,
+                     Apps}),
+    Name.
+
+%% ===========================================================================
+%% ===========================================================================
+
+fetch(Key, List) ->
+    {Key, {Key, Val}} = {Key, lists:keyfind(Key, 1, List)}, %% useful badmatch
+    Val.
+
+write_file(Path, T) ->
+    file:write_file(Path, io_lib:format("~p.", [T])).
+
+%% Is a version string of the expected form? Return the argument
+%% itself for 'false' for a useful badmatch.
+is_vsn(V) ->
+    is_list(V)
+        andalso length(V) == string:span(V, "0123456789.")
+        andalso V == string:join(string:tokens(V, [$.]), ".")  %% no ".."
+        orelse {error, V}.
diff --git a/lib/diameter/test/diameter_app_test.erl b/lib/diameter/test/diameter_app_test.erl
deleted file mode 100644
index 7173c39caf..0000000000
--- a/lib/diameter/test/diameter_app_test.erl
+++ /dev/null
@@ -1,393 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the application specifics of the Diameter application
-%%----------------------------------------------------------------------
--module(diameter_app_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2, 
-
-	 fields/1, 
-	 modules/1,
-	 exportall/1,
-	 app_depend/1,
-	 undef_funcs/1
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(undef_funcs = Case, Config) ->
-    NewConfig = [{tc_timeout, ?MINUTES(10)} | Config], 
-    diameter_test_server:init_per_testcase(Case, NewConfig);
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [
-     fields,
-     modules,
-     exportall,
-     app_depend,
-     undef_funcs
-    ].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-    
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    io:format("~w:init_per_suite -> entry with"
-	      "~n   Config: ~p"
-	      "~n", [?MODULE, Config]),    
-    case is_app(diameter) of
-	{ok, AppFile} ->
-	    io:format("AppFile: ~n~p~n", [AppFile]),
-	    %% diameter:print_version_info(),
-	    [{app_file, AppFile}|Config];
-	{error, Reason} ->
-	    ?FAIL(Reason)
-    end.
-
-is_app(App) ->
-    LibDir = code:lib_dir(App),
-    File = filename:join([LibDir, "ebin", atom_to_list(App) ++ ".app"]),
-    case file:consult(File) of
-	{ok, [{application, App, AppFile}]} ->
-	    {ok, AppFile};
-	Error ->
-	    {error, {invalid_format, Error}}
-    end.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-fields(suite) ->
-    [];
-fields(doc) ->
-    [];
-fields(Config) when is_list(Config) ->
-    AppFile = ?KEY1SEARCH(app_file, Config),
-    Fields = [vsn, description, modules, registered, applications],
-    case check_fields(Fields, AppFile, []) of
-	[] ->
-	    ok;
-	Missing ->
-	    ?FAIL({missing_fields, Missing})
-    end.
-
-check_fields([], _AppFile, Missing) ->
-    Missing;
-check_fields([Field|Fields], AppFile, Missing) ->
-    check_fields(Fields, AppFile, check_field(Field, AppFile, Missing)).
-
-check_field(Name, AppFile, Missing) ->
-    io:format("checking field: ~p~n", [Name]),
-    case lists:keymember(Name, 1, AppFile) of
-	true ->
-	    Missing;
-	false ->
-	    [Name|Missing]
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-modules(suite) ->
-    [];
-modules(doc) ->
-    [];
-modules(Config) when is_list(Config) ->
-    AppFile  = ?KEY1SEARCH(app_file, Config),
-    Mods     = ?KEY1SEARCH(modules, AppFile),
-    EbinList = get_ebin_mods(diameter),
-    case missing_modules(Mods, EbinList, []) of
-	[] ->
-	    ok;
-	Missing ->
-	    throw({error, {missing_modules, Missing}})
-    end,
-    Allowed = [diameter_codegen,
-	       diameter_make,
-	       diameter_spec_scan,
-	       diameter_spec_util],    
-    case extra_modules(Mods, EbinList, Allowed, []) of
-	[] ->
-	    ok;
-	Extra ->
-	    throw({error, {extra_modules, Extra}})
-    end,
-    {ok, Mods}.
-	    
-get_ebin_mods(App) ->
-    LibDir  = code:lib_dir(App),
-    EbinDir = filename:join([LibDir,"ebin"]),
-    {ok, Files0} = file:list_dir(EbinDir),
-    Files1 = [lists:reverse(File) || File <- Files0],
-    [list_to_atom(lists:reverse(Name)) || [$m,$a,$e,$b,$.|Name] <- Files1].
-    
-
-missing_modules([], _Ebins, Missing) ->
-    Missing;
-missing_modules([Mod|Mods], Ebins, Missing) ->
-    case lists:member(Mod, Ebins) of
-	true ->
-	    missing_modules(Mods, Ebins, Missing);
-	false ->
-	    io:format("missing module: ~p~n", [Mod]),
-	    missing_modules(Mods, Ebins, [Mod|Missing])
-    end.
-
-
-extra_modules(_Mods, [], Allowed, Extra) ->
-    Extra--Allowed;
-extra_modules(Mods, [Mod|Ebins], Allowed, Extra) ->
-    case lists:member(Mod, Mods) of
-	true ->
-	    extra_modules(Mods, Ebins, Allowed, Extra);
-	false ->
-	    io:format("supefluous module: ~p~n", [Mod]),
-	    extra_modules(Mods, Ebins, Allowed, [Mod|Extra])
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-exportall(suite) ->
-    [];
-exportall(doc) ->
-    [];
-exportall(Config) when is_list(Config) ->
-    AppFile = ?KEY1SEARCH(app_file, Config),
-    Mods    = ?KEY1SEARCH(modules, AppFile),
-    check_export_all(Mods).
-
-
-check_export_all([]) ->
-    ok;
-check_export_all([Mod|Mods]) ->
-    case (catch apply(Mod, module_info, [compile])) of
-	{'EXIT', {undef, _}} ->
-	    check_export_all(Mods);
-	O ->
-            case lists:keysearch(options, 1, O) of
-                false ->
-                    check_export_all(Mods);
-                {value, {options, List}} ->
-                    case lists:member(export_all, List) of
-                        true ->
-			    throw({error, {export_all, Mod}});
-			false ->
-			    check_export_all(Mods)
-                    end
-            end
-    end.
-
-	    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-app_depend(suite) ->
-    [];
-app_depend(doc) ->
-    [];
-app_depend(Config) when is_list(Config) ->
-    AppFile = ?KEY1SEARCH(app_file, Config),
-    Apps    = ?KEY1SEARCH(applications, AppFile),
-    check_apps(Apps).
-
-
-check_apps([]) ->
-    ok;
-check_apps([App|Apps]) ->
-    case is_app(App) of
-	{ok, _} ->
-	    check_apps(Apps);
-	Error ->
-	    throw({error, {missing_app, {App, Error}}})
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-undef_funcs(suite) ->
-    [];
-undef_funcs(doc) ->
-    [];
-undef_funcs(Config) when is_list(Config) ->
-    ?SKIP(diameter_not_known_by_xref),
-    App            = diameter,
-    AppFile        = ?KEY1SEARCH(app_file, Config),
-    Mods           = ?KEY1SEARCH(modules, AppFile),
-    Root           = code:root_dir(),
-    LibDir         = code:lib_dir(App),
-    EbinDir        = filename:join([LibDir,"ebin"]),
-    XRefTestName   = undef_funcs_make_name(App, xref_test_name),
-    try
-	begin
-	    XRef     = xref_start(XRefTestName),
-	    xref_set_defaults(XRef, [{verbose,false},{warnings,false}]),
-	    XRefName = undef_funcs_make_name(App, xref_name),
-	    XRefName = xref_add_release(XRef, Root, XRefName), 
-	    xref_replace_application(XRef, App, EbinDir),
-	    Undefs   = xref_analyze(XRef),
-	    xref_stop(XRef),
-	    analyze_undefined_function_calls(Undefs, Mods, [])
-	end
-    catch
-	throw:{error, Reason} ->
-	    ?FAIL(Reason)
-    end.
-
-
-xref_start(XRefTestName) ->
-    case (catch xref:start(XRefTestName)) of
-	{ok, XRef} ->
-	    XRef;
-	{error, Reason} ->
-	    throw({error, {failed_starting_xref, Reason}});
-	Error ->
-	    throw({error, {failed_starting_xref, Error}})
-    end.
-
-xref_set_defaults(XRef, Defs) ->
-    case (catch xref:set_default(XRef, Defs)) of
-	ok ->
-	    ok;
-	Error ->
-	    throw({error, {failed_setting_defaults, Defs, Error}})
-    end.
-
-xref_add_release(XRef, Root, Name) ->
-    case (catch xref:add_release(XRef, Root, {name, Name})) of
-	{ok, XRefName} ->
-	    XRefName;
-	{error, Reason} ->
-	    throw({error, {failed_adding_release, Reason}});
-	Error ->
-	    throw({error, {failed_adding_release, Error}})
-    end.
-
-xref_replace_application(XRef, App, EbinDir) ->
-    case (catch xref:replace_application(XRef, App, EbinDir)) of
-	{ok, App} ->
-	    ok;
-	{error, XRefMod, Reason} ->
-	    throw({error, {failed_replacing_app, XRefMod, Reason}});
-	Error ->
-	    throw({error, {failed_replacing_app, Error}})
-    end.
-
-xref_analyze(XRef) ->
-    case (catch xref:analyze(XRef, undefined_function_calls)) of
-	{ok, Undefs} ->
-	    Undefs;
-	{error, Reason} ->
-	    throw({error, {failed_detecting_func_calls, Reason}});
-	Error ->
-	    throw({error, {failed_detecting_func_calls, Error}})
-    end.
-
-xref_stop(XRef) ->
-    xref:stop(XRef).
-
-analyze_undefined_function_calls([], _, []) ->
-    ok;
-analyze_undefined_function_calls([], _, AppUndefs) ->
-    exit({suite_failed, {undefined_function_calls, AppUndefs}});
-analyze_undefined_function_calls([{{Mod, _F, _A}, _C} = AppUndef|Undefs],
-                                 AppModules, AppUndefs) ->
-    %% Check that this module is our's
-    case lists:member(Mod,AppModules) of
-        true ->
-            {Calling,Called} = AppUndef,
-            {Mod1,Func1,Ar1} = Calling,
-            {Mod2,Func2,Ar2} = Called,
-            io:format("undefined function call: "
-                      "~n   ~w:~w/~w calls ~w:~w/~w~n",
-                      [Mod1,Func1,Ar1,Mod2,Func2,Ar2]),
-            analyze_undefined_function_calls(Undefs, AppModules,
-                                             [AppUndef|AppUndefs]);
-        false ->
-            io:format("dropping ~p~n", [Mod]),
-            analyze_undefined_function_calls(Undefs, AppModules, AppUndefs)
-    end.
-
-%% This function is used simply to avoid cut-and-paste errors later...
-undef_funcs_make_name(App, PostFix) ->
-    list_to_atom(atom_to_list(App) ++ "_" ++ atom_to_list(PostFix)).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-%% fail(Reason) ->
-%%     exit({suite_failed, Reason}).
-
-%% ?KEY1SEARCH(Key, L) ->
-%%     case lists:keysearch(Key, 1, L) of
-%% 	undefined ->
-%% 	    fail({not_found, Key, L});
-%% 	{value, {Key, Value}} ->
-%% 	    Value
-%%     end.
diff --git a/lib/diameter/test/diameter_appup_test.erl b/lib/diameter/test/diameter_appup_test.erl
deleted file mode 100644
index 97a089e01a..0000000000
--- a/lib/diameter/test/diameter_appup_test.erl
+++ /dev/null
@@ -1,539 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the application specifics of the Diameter application
-%%----------------------------------------------------------------------
--module(diameter_appup_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2, 
-
-	 appup/1
-	]).
-
--export([t/0, t/1]).
-
--compile({no_auto_import,[error/1]}).
-
--include("diameter_test_lib.hrl").
-
--define(APPLICATION, diameter).
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [appup].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    AppFile   = file_name(?APPLICATION, ".app"),
-    AppupFile = file_name(?APPLICATION, ".appup"),
-    [{app_file, AppFile}, {appup_file, AppupFile}|Config].
-    
-
-file_name(App, Ext) ->
-    LibDir = code:lib_dir(App),
-    filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-appup(suite) ->
-    [];
-appup(doc) ->
-    "perform a simple check of the appup file";
-appup(Config) when is_list(Config) ->
-    AppupFile = key1search(appup_file, Config),
-    AppFile   = key1search(app_file, Config),
-    Modules   = modules(AppFile),
-    check_appup(AppupFile, Modules).
-
-modules(File) ->
-    case file:consult(File) of
-        {ok, [{application,diameter,Info}]} ->
-            case lists:keysearch(modules,1,Info) of
-                {value, {modules, Modules}} ->
-                    Modules;
-                false ->
-                    fail({bad_appinfo, Info})
-            end;
-        Error ->
-            fail({bad_appfile, Error})
-    end.
-
-    
-check_appup(AppupFile, Modules) ->
-    case file:consult(AppupFile) of
-	{ok, [{V, UpFrom, DownTo}]} ->
-	    check_appup(V, UpFrom, DownTo, Modules);
-	Else ->
-	    fail({bad_appupfile, Else})
-    end.
-
-
-check_appup(V, UpFrom, DownTo, Modules) ->
-    check_version(V),
-    check_depends(up,   UpFrom, Modules),
-    check_depends(down, DownTo, Modules),
-    check_module_subset(UpFrom),
-    check_module_subset(DownTo),
-    ok.
-
-
-check_depends(_, [], _) ->
-    ok;
-check_depends(UpDown, [Dep|Deps], Modules) ->
-    check_depend(UpDown, Dep, Modules),
-    check_depends(UpDown, Deps, Modules).
-
-
-check_depend(up = UpDown, {add_application, ?APPLICATION} = Instr, Modules) ->
-     d("check_instructions(~w) -> entry with"
-       "~n   Instruction: ~p"
-       "~n   Modules:     ~p", [UpDown, Instr, Modules]),
-     ok;
-check_depend(down = UpDown, {remove_application, ?APPLICATION} = Instr, 
-	     Modules) ->
-     d("check_instructions(~w) -> entry with"
-       "~n   Instruction: ~p"
-       "~n   Modules:     ~p", [UpDown, Instr, Modules]),
-     ok;
-check_depend(UpDown, {V, Instructions}, Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   V:       ~p"
-      "~n   Modules: ~p", [UpDown, V, Modules]),
-    check_version(V),
-    case check_instructions(UpDown, 
-			    Instructions, Instructions, [], [], Modules) of
-	{_Good, []} ->
-	    ok;
-	{_, Bad} ->
-	    fail({bad_instructions, Bad, UpDown})
-    end.
-
-
-check_instructions(_, [], _, Good, Bad, _) ->
-    {lists:reverse(Good), lists:reverse(Bad)};
-check_instructions(UpDown, [Instr|Instrs], AllInstr, Good, Bad, Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   Instr: ~p", [UpDown,Instr]),
-    case (catch check_instruction(UpDown, Instr, AllInstr, Modules)) of
-        ok ->
-            check_instructions(UpDown, Instrs, AllInstr, 
-			       [Instr|Good], Bad, Modules);
-        {error, Reason} ->
-	    d("check_instructions(~w) -> bad instruction: "
-	      "~n   Reason: ~p", [UpDown,Reason]),
-            check_instructions(UpDown, Instrs, AllInstr, Good, 
-                               [{Instr, Reason}|Bad], Modules)
-    end.
-
-%% A new module is added
-check_instruction(up, {add_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    d("check_instruction -> entry when up-add_module instruction with"
-      "~n   Module: ~p", [Module]),
-    check_module(Module, Modules);
-
-%% An old module is re-added
-check_instruction(down, {add_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    d("check_instruction -> entry when down-add_module instruction with"
-      "~n   Module: ~p", [Module]),
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    ok;
-	ok ->
-	    error({existing_readded_module, Module})
-    end;
-
-%% Removing a module on upgrade: 
-%% - the module has been removed from the app-file.
-%% - check that no module depends on this (removed) module
-check_instruction(up, {remove, {Module, Pre, Post}}, _, Modules) 
-  when is_atom(Module) andalso is_atom(Pre) andalso is_atom(Post) ->
-    d("check_instruction -> entry when up-remove instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p", [Module, Pre, Post]),
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    check_purge(Pre),
-	    check_purge(Post);
-	ok ->
-	    error({existing_removed_module, Module})
-    end;
-
-%% Removing a module on downgrade: the module exist
-%% in the app-file.
-check_instruction(down, {remove, {Module, Pre, Post}}, AllInstr, Modules) 
-  when is_atom(Module) andalso is_atom(Pre) andalso is_atom(Post) ->
-    d("check_instruction -> entry when down-remove instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p", [Module, Pre, Post]),
-    case (catch check_module(Module, Modules)) of
-	ok ->
-	    check_purge(Pre),
-	    check_purge(Post),
-	    check_no_remove_depends(Module, AllInstr);
-	{error, {unknown_module, Module, Modules}} ->
-	    error({nonexisting_removed_module, Module})
-    end;
-
-check_instruction(_, {load_module, Module, Pre, Post, Depend}, 
-		  AllInstr, Modules) 
-  when is_atom(Module) andalso is_atom(Pre) andalso is_atom(Post) andalso is_list(Depend) ->
-    d("check_instruction -> entry when load_module instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p"
-      "~n   Depend: ~p", [Module, Pre, Post, Depend]),
-    check_module(Module, Modules),
-    check_module_depend(Module, Depend, Modules),
-    check_module_depend(Module, Depend, updated_modules(AllInstr, [])),
-    check_purge(Pre),
-    check_purge(Post);
-
-check_instruction(_, {update, Module, Change, Pre, Post, Depend}, 
-		  AllInstr, Modules) 
-  when is_atom(Module) andalso is_atom(Pre) andalso is_atom(Post) andalso is_list(Depend) ->
-    d("check_instruction -> entry when update instruction with"
-      "~n   Module: ~p"
-      "~n   Change: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p"
-      "~n   Depend: ~p", [Module, Change, Pre, Post, Depend]),
-    check_module(Module, Modules),
-    check_module_depend(Module, Depend, Modules),
-    check_module_depend(Module, Depend, updated_modules(AllInstr, [])),
-    check_change(Change),
-    check_purge(Pre),
-    check_purge(Post);
-
-check_instruction(_, {update, Module, supervisor}, _, Modules) 
-  when is_atom(Module) ->
-    check_module(Module, Modules);
-
-check_instruction(_, {apply, {Module, Function, Args}}, _, Modules)
-   when is_atom(Module) andalso is_atom(Function) andalso is_list(Args) ->
-     d("check_instruction -> entry when down-apply instruction with"
-       "~n   Module:   ~p"
-       "~n   Function: ~p"
-       "~n   Args:     ~p", [Module, Function, Args]),
-     check_module(Module, Modules),
-     check_apply(Module, Function, Args);
-
-check_instruction(_, {restart_application, ?APPLICATION}, _AllInstr, _Modules) ->
-    ok;
-
-check_instruction(_, Instr, _AllInstr, _Modules) ->
-    d("check_instruction -> entry when unknown instruction with"
-      "~n   Instr: ~p", [Instr]),
-    error({error, {unknown_instruction, Instr}}).
-
-
-%% If Module X depends on Module Y, then module Y must have an update
-%% instruction of some sort (otherwise the depend is faulty).
-updated_modules([], Modules) ->
-    d("update_modules -> entry when done with"
-      "~n   Modules: ~p", [Modules]),
-    Modules;
-updated_modules([Instr|Instrs], Modules) ->
-    d("update_modules -> entry with"
-      "~n   Instr:   ~p"
-      "~n   Modules: ~p", [Instr,Modules]),
-    Module = instruction_module(Instr),
-    d("update_modules -> Module: ~p", [Module]),
-    updated_modules(Instrs, [Module|Modules]).
-    
-instruction_module({add_module, Module}) ->
-    Module;
-instruction_module({remove, {Module, _, _}}) ->
-    Module;
-instruction_module({load_module, Module, _, _, _}) ->
-    Module;
-instruction_module({update, Module, _, _, _, _}) ->
-    Module;
-instruction_module({apply, {Module, _, _}}) ->
-     Module;
-instruction_module(Instr) ->
-    d("instruction_module -> entry when unknown instruction with"
-      "~n   Instr: ~p", [Instr]),
-    error({error, {unknown_instruction, Instr}}).
-
-    
-%% Check that the modules handled in an instruction set for version X
-%% is a subset of the instruction set for version X-1.
-check_module_subset(Instructions) ->
-    do_check_module_subset(modules_of(Instructions)).
- 
-do_check_module_subset([]) ->
-    ok;
-do_check_module_subset([_]) ->
-    ok;
-do_check_module_subset([{_V1, Mods1}|T]) ->
-    {V2, Mods2} = hd(T),
-    %% Check that the modules in V1 is a subset of V2
-    case do_check_module_subset2(Mods1, Mods2) of
-        ok ->
-            do_check_module_subset(T);
-        {error, Modules} ->
-            fail({subset_missing_instructions, V2, Modules})
-    end.
- 
-do_check_module_subset2(Mods1, Mods2) ->
-    do_check_module_subset2(Mods1, Mods2, []).
- 
-do_check_module_subset2([], _, []) ->
-    ok;
-do_check_module_subset2([], _, Acc) ->
-    {error, lists:reverse(Acc)};
-do_check_module_subset2([Mod|Mods], Mods2, Acc) ->
-    case lists:member(Mod, Mods2) of
-        true ->
-            do_check_module_subset2(Mods, Mods2, Acc);
-        false ->
-            do_check_module_subset2(Mods, Mods2, [Mod|Acc])
-    end.
-     
- 
-modules_of(Instructions) ->
-    modules_of(Instructions, []).
- 
-modules_of([], Acc) ->
-    lists:reverse(Acc);
-modules_of([{V,Instructions}|T], Acc) ->
-    Mods = modules_of2(Instructions, []),
-    modules_of(T, [{V, Mods}|Acc]).
- 
-modules_of2([], Acc) ->
-    lists:reverse(Acc);
-modules_of2([Instr|Instructions], Acc) ->
-    case module_of(Instr) of
-        {value, Mod} ->
-            modules_of2(Instructions, [Mod|Acc]);
-        false ->
-            modules_of2(Instructions, Acc)
-    end.
- 
-module_of({add_module, Module}) ->
-    {value, Module};
-module_of({remove, {Module, _Pre, _Post}}) ->
-    {value, Module};
-module_of({load_module, Module, _Pre, _Post, _Depend}) ->
-    {value, Module};
-module_of({update, Module, _Change, _Pre, _Post, _Depend}) ->
-    {value, Module};
-module_of(_) ->
-    false.
- 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% The version is a string consting of numbers separated by dots: "."
-%% Example: "3.3.3"
-%% 
-check_version(V) when is_list(V) ->
-    case do_check_version(string:tokens(V, [$.])) of
-	ok ->
-	    ok;
-	{error, BadVersionPart} ->
-	    throw({error, {bad_version, V, BadVersionPart}})
-    end;
-check_version(V) ->
-    error({bad_version, V}).
-
-do_check_version([]) ->
-    ok;
-do_check_version([H|T]) ->
-    case (catch list_to_integer(H)) of
-	I when is_integer(I) ->
-	    do_check_version(T);
-	_ ->
-	    {error, H}
-    end.
-	    
-check_module(M, Modules) when is_atom(M) ->
-    case lists:member(M,Modules) of
-        true ->
-            ok;
-        false ->
-            error({unknown_module, M, Modules})
-    end;
-check_module(M, _) ->
-    error({bad_module, M}).
-
-
-check_module_depend(M, [], _) when is_atom(M) ->
-    d("check_module_depend -> entry with"
-      "~n   M: ~p", [M]),    
-    ok;
-check_module_depend(M, Deps, Modules) when is_atom(M) andalso is_list(Deps) ->
-    d("check_module_depend -> entry with"
-      "~n   M: ~p"
-      "~n   Deps: ~p"
-      "~n   Modules: ~p", [M, Deps, Modules]),    
-    case [Dep || Dep <- Deps, lists:member(Dep, Modules) == false] of
-        [] ->
-            ok;
-        Unknown ->
-            error({unknown_depend_modules, Unknown})
-    end;
-check_module_depend(_M, D, _Modules) ->
-    d("check_module_depend -> entry when bad depend with"
-      "~n   D: ~p", [D]),    
-    error({bad_depend, D}).
-
-
-check_no_remove_depends(_Module, []) ->
-    ok;
-check_no_remove_depends(Module, [Instr|Instrs]) ->
-    check_no_remove_depend(Module, Instr),
-    check_no_remove_depends(Module, Instrs).
-
-check_no_remove_depend(Module, {load_module, Mod, _Pre, _Post, Depend}) ->
-    case lists:member(Module, Depend) of
-	true ->
-	    error({removed_module_in_depend, load_module, Mod, Module});
-	false ->
-	    ok
-    end;
-check_no_remove_depend(Module, {update, Mod, _Change, _Pre, _Post, Depend}) ->
-    case lists:member(Module, Depend) of
-	true ->
-	    error({removed_module_in_depend, update, Mod, Module});
-	false ->
-	    ok
-    end;
-check_no_remove_depend(_, _) ->
-    ok.
-    
-
-check_change(soft) ->
-    ok;
-check_change({advanced, _Something}) ->
-    ok;
-check_change(Change) ->
-    error({bad_change, Change}).
-
-
-check_purge(soft_purge) ->
-    ok;
-check_purge(brutal_purge) ->
-    ok;
-check_purge(Purge) ->
-    error({bad_purge, Purge}).
-
-
-check_apply(Module, Function, Args) ->
-     case (catch Module:module_info()) of
-	Info when is_list(Info) ->
-	    check_exported(Function, Args, Info);
-	{'EXIT', {undef, _}} ->
-	    error({not_existing_module, Module})
-     end.
-
-check_exported(Function, Args, Info) ->
-     case lists:keysearch(exports, 1, Info) of
-	{value, {exports, FuncList}} ->
-	     Arity   = length(Args), 
-	     Arities = [A || {F, A} <- FuncList, F == Function],
-	     case lists:member(Arity, Arities) of
-		 true ->
-		     ok;
-		 false ->
-		     error({not_exported_function, Function, Arity})
-	     end;
-	 _ ->
-	     error({bad_export, Info})
-     end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-error(Reason) ->
-    throw({error, Reason}).
-
-fail(Reason) ->
-    exit({suite_failed, Reason}).
-
-key1search(Key, L) ->
-    case lists:keysearch(Key, 1, L) of
-	undefined ->
-	    fail({not_found, Key, L});
-	{value, {Key, Value}} ->
-	    Value
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-d(F, A) ->
-    d(false, F, A).
-
-d(true, F, A) ->
-    io:format(F ++ "~n", A);
-d(_, _, _) ->
-    ok.
-
-    
diff --git a/lib/diameter/test/diameter_codec_SUITE.erl b/lib/diameter/test/diameter_codec_SUITE.erl
new file mode 100644
index 0000000000..30c60be8e9
--- /dev/null
+++ b/lib/diameter/test/diameter_codec_SUITE.erl
@@ -0,0 +1,76 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Test encode/decode of dictionary-related modules. Each test case
+%% runs multiple tests in parallel since many of the tests are just
+%% the same code with different in-data: implementing each test as a
+%% single testcase would make for much duplication with ct's current
+%% requirement of one function per testcase.
+%%
+
+-module(diameter_codec_SUITE).
+
+-export([suite/0,
+         all/0,
+         init_per_testcase/2,
+         end_per_testcase/2]).
+
+%% testcases
+-export([base/1,
+         gen/1,
+         lib/1]).
+
+-include("diameter_ct.hrl").
+
+-define(L, atom_to_list).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 10}}].
+
+all() ->
+    [base, gen, lib].
+
+init_per_testcase(gen, Config) ->
+    [{application, ?APP, App}] = diameter_util:consult(?APP, app),
+    {modules, Ms} = lists:keyfind(modules, 1, App),
+    [_|_] = Gs = lists:filter(fun(M) ->
+                                      lists:prefix("diameter_gen_", ?L(M))
+                              end,
+                              Ms),
+    [{dicts, Gs} | Config];
+
+init_per_testcase(_Name, Config) ->
+    Config.
+
+end_per_testcase(_, _) ->
+    ok.
+
+%% ===========================================================================
+
+base(_Config) ->
+    diameter_codec_test:base().
+
+gen([{dicts, Ms} | _]) ->
+    lists:foreach(fun diameter_codec_test:gen/1, Ms).
+
+lib(_Config) ->
+    diameter_codec_test:lib().
diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl
new file mode 100644
index 0000000000..aab7ab35cc
--- /dev/null
+++ b/lib/diameter/test/diameter_codec_test.erl
@@ -0,0 +1,500 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(diameter_codec_test).
+
+-compile(export_all).
+
+%%
+%% Test encode/decode of dictionary-related modules.
+%%
+
+-include_lib("diameter/include/diameter.hrl").
+
+-define(BASE, diameter_gen_base_rfc3588).
+-define(BOOL, [true, false]).
+
+%% ===========================================================================
+%% Interface.
+
+base() ->
+    [] = run([{?MODULE, [base, T]} || T <- [zero, decode]]).
+
+gen(Mod) ->
+    Fs = [{Mod, F, []} || F <- [name, id, vendor_id, vendor_name]],
+    [] = run(Fs ++ [{?MODULE, [gen, Mod, T]} || T <- [messages,
+                                                      command_codes,
+                                                      avp_types,
+                                                      grouped,
+                                                      enums,
+                                                      import_avps,
+                                                      import_groups,
+                                                      import_enums]]).
+
+lib() ->
+    Vs = {_,_} = values('Address'),
+    [] = run([[fun lib/2, N, Vs] || N <- [1,2]]).
+
+%% ===========================================================================
+%% Internal functions.
+
+lib(N, {_,_} = T) ->
+    B = 1 == N rem 2,
+    [] = run([[fun lib/2, A, B] || A <- element(N,T)]);
+
+lib(IP, B) ->
+    LA = tuple_to_list(IP),
+    {SA,Fun} = ip(LA),
+    [] = run([[fun lib/4, IP, B, Fun, A] || A <- [IP, LA, SA]]).
+
+lib(IP, B, Fun, A) ->
+    try Fun(A) of
+        IP when B ->
+            ok
+    catch
+        error:_ when not B ->
+            ok
+    end.
+
+ip([_,_,_,_] = A) ->
+    [$.|S] = lists:append(["." ++ integer_to_list(N) || N <- A]),
+    {S, fun diameter_lib:ip4address/1};
+ip([_,_,_,_,_,_,_,_] = A) ->
+    [$:|S] = lists:flatten([":" ++ io_lib:format("~.16B", [N]) || N <- A]),
+    {S, fun diameter_lib:ip6address/1}.
+
+%% ------------------------------------------------------------------------
+%% base/1
+%%
+%% Test of diameter_types.
+%% ------------------------------------------------------------------------
+
+base(T) ->
+    [] = run([{?MODULE, [base, T, F]} || F <- types()]).
+
+%% Ensure that 'zero' values encode only zeros.
+base(zero = T, F) ->
+    B = diameter_types:F(encode, T),
+    B = z(B);
+
+%% Ensure that we can decode what we encode and vice-versa, and that
+%% we can't decode invalid values.
+base(decode, F) ->
+    {Eq, Vs, Ns} = b(values(F)),
+    [] = run([{?MODULE, [base_decode, F, Eq, V]}  || V <- Vs]),
+    [] = run([{?MODULE, [base_invalid, F, Eq, V]} || V <- Ns]).
+
+base_decode(F, Eq, Value) ->
+    d(fun(X,V) -> diameter_types:F(X,V) end, Eq, Value).
+
+base_invalid(F, Eq, Value) ->
+    try
+        base_decode(F, Eq, Value),
+        exit(nok)
+    catch
+        error: _ ->
+            ok
+    end.
+
+b({_,_,_} = T) ->
+    T;
+b({B,Vs})
+  when is_atom(B) ->
+    {B,Vs,[]};
+b({Vs,Ns}) ->
+    {true, Vs, Ns};
+b(Vs) ->
+    {true, Vs, []}.
+
+types() ->
+    [F || {F,2} <- diameter_types:module_info(exports)].
+
+%% ------------------------------------------------------------------------
+%% gen/2
+%%
+%% Test of generated encode/decode module.
+%% ------------------------------------------------------------------------
+
+gen(M, T) ->
+    [] = run(lists:map(fun(X) -> {?MODULE, [gen, M, T, X]} end,
+                       fetch(T, M:dict()))).
+
+fetch(T, Spec) ->
+    case orddict:find(T, Spec) of
+        {ok, L} ->
+            L;
+        error ->
+            []
+    end.
+
+gen(M, messages, {Name, Code, Flags, _, _}) ->
+    Rname = M:msg2rec(Name),
+    Name = M:rec2msg(Rname),
+    {Code, F, _} = M:msg_header(Name),
+    0 = F band 2#00001111,
+    Name = case M:msg_name(Code, lists:member('REQ', Flags)) of
+               N when Name /= 'answer-message' ->
+                   N;
+               '' when Name == 'answer-message', M == ?BASE ->
+                   Name
+           end,
+    [] = arity(M, Name, Rname);
+
+gen(M, command_codes = T, {Code, {Req, Abbr}, Ans}) ->
+    Rname = M:msg2rec(Req),
+    Rname = M:msg2rec(Abbr),
+    gen(M, T, {Code, Req, Ans});
+
+gen(M, command_codes = T, {Code, Req, {Ans, Abbr}}) ->
+    Rname = M:msg2rec(Ans),
+    Rname = M:msg2rec(Abbr),
+    gen(M, T, {Code, Req, Ans});
+
+gen(M, command_codes, {Code, Req, Ans}) ->
+    Msgs = orddict:fetch(messages, M:dict()),
+    {_, Code, _, _, _} = lists:keyfind(Req, 1, Msgs),
+    {_, Code, _, _, _} = lists:keyfind(Ans, 1, Msgs);
+
+gen(M, avp_types, {Name, Code, Type, _Flags, _Encr}) ->
+    {Code, Flags, VendorId} = M:avp_header(Name),
+    0 = Flags band 2#00011111,
+    V = undefined /= VendorId,
+    V = 0 /= Flags band 2#10000000,
+    {Name, Type} = M:avp_name(Code, VendorId),
+    B = M:empty_value(Name),
+    B = z(B),
+    [] = avp_decode(M, Type, Name);
+
+gen(M, grouped, {Name, _, _, _}) ->
+    Rname = M:name2rec(Name),
+    [] = arity(M, Name, Rname);
+
+gen(M, enums, {Name, ED}) ->
+    [] = run([{?MODULE, [enum, M, Name, T]} || T <- ED]);
+
+gen(M, Tag, {_Mod, L}) ->
+    T = retag(Tag),
+    [] = run([{?MODULE, [gen, M, T, I]} || I <- L]).
+
+%% avp_decode/3
+
+avp_decode(Mod, Type, Name) ->
+    {Eq, Vs, _} = b(values(Type, Name, Mod)),
+    [] = run([{?MODULE, [avp_decode, Mod, Name, Type, Eq, V]}
+              || V <- v(Vs)]).
+
+avp_decode(Mod, Name, Type, Eq, Value) ->
+    d(fun(X,V) -> avp(Mod, X, V, Name, Type) end, Eq, Value).
+
+avp(Mod, decode = X, V, Name, 'Grouped') ->
+    {Rec, _} = Mod:avp(X, V, Name),
+    Rec;
+avp(Mod, X, V, Name, _) ->
+    Mod:avp(X, V, Name).
+
+%% v/1
+
+%% List of values ...
+v(Vs)
+  when is_list(Vs) ->
+    Vs;
+
+%% .. or enumeration for grouped avps. This could be quite large
+%% (millions of values) but since the avps are also tested
+%% individually don't bother trying everything. Instead, choose a
+%% reasonable number of values at random.
+v(E) ->
+    v(2000, E(0), E).
+
+v(Max, Ord, E)
+  when Ord =< Max ->
+    diameter_enum:to_list(E);
+v(Max, Ord, E) ->
+    {M,S,U} = now(),
+    random:seed(M,S,U),
+    v(Max, Ord, E, []).
+
+v(0, _, _, Acc) ->
+    Acc;
+v(N, Ord, E, Acc) ->
+    v(N-1, Ord, E, [E(random:uniform(Ord)) | Acc]).
+
+%% arity/3
+
+arity(M, Name, Rname) ->
+    Rec = M:'#new-'(Rname),
+    [] = run([{?MODULE, [arity, M, Name, F, Rec]}
+              || F <- M:'#info-'(Rname, fields)]).
+
+arity(M, Name, AvpName, Rec) ->
+    Def = M:'#get-'(AvpName, Rec),
+    Def = case M:avp_arity(Name, AvpName) of
+              1 ->
+                  undefined;
+              A when 0 /= A ->
+                  []
+          end.
+
+%% enum/3
+
+enum(M, Name, {E,_}) ->
+    B = <<E:32/integer>>,
+    B = M:avp(encode, E, Name),
+    E = M:avp(decode, B, Name).
+
+retag(import_avps)   -> avp_types;
+retag(import_groups) -> grouped;
+retag(import_enums)  -> enums;
+
+retag(avp_types) -> import_avps;
+retag(enums)     -> import_enums.
+
+%% ===========================================================================
+
+d(F, Eq, V) ->
+    B = F(encode, V),
+    D = F(decode, B),
+    V = if Eq ->    %% test for value equality ...
+                D;
+           true ->  %% ... or that encode/decode is idempotent
+                D = F(decode, F(encode, D)),
+                V
+        end.
+
+z(B) ->
+    << <<0>> || <<_>> <= B >>.
+
+%% values/1
+%%
+%% Return a list of base type values. Can also be wrapped in a tuple
+%% with 'false' to indicate that encode followed by decode may not be
+%% the identity map. (Although that this composition is idempotent is
+%% tested.)
+
+values('OctetString' = T) ->
+    {["", atom_to_list(T)], [-1, 256]};
+
+values('Integer32') ->
+    Mx = (1 bsl 31) - 1,
+    Mn = -1*Mx,
+    {[Mn, 0, random(Mn,Mx), Mx], [Mn - 1, Mx + 1]};
+
+values('Integer64') ->
+    Mx = (1 bsl 63) - 1,
+    Mn = -1*Mx,
+    {[Mn, 0, random(Mn,Mx), Mx], [Mn - 1, Mx + 1]};
+
+values('Unsigned32') ->
+    M = (1 bsl 32) - 1,
+    {[0, random(M), M], [-1, M + 1]};
+
+values('Unsigned64') ->
+    M = (1 bsl 64) - 1,
+    {[0, random(M), M], [-1, M + 1]};
+
+values('Float32') ->
+    E = (1 bsl  8) - 2,
+    F = (1 bsl 23) - 1,
+    <<Mx:32/float>> = <<0:1/integer, E:8/integer, F:23/integer>>,
+    <<Mn:32/float>> = <<1:1/integer, E:8/integer, F:23/integer>>,
+    {[0.0, infinity, '-infinity', Mx, Mn], [0]};
+
+values('Float64') ->
+    E = (1 bsl 11) - 2,
+    F = (1 bsl 52) - 1,
+    <<Mx:64/float>> = <<0:1/integer, E:11/integer, F:52/integer>>,
+    <<Mn:64/float>> = <<1:1/integer, E:11/integer, F:52/integer>>,
+    {[0.0, infinity, '-infinity', Mx, Mn], [0]};
+
+values('Address') ->
+    {[{255,0,random(16#FF),1}, {65535,0,0,random(16#FFFF),0,0,0,1}],
+     [{256,0,0,1}, {65536,0,0,0,0,0,0,1}]};
+
+values('DiameterIdentity') ->
+    {["x", "diameter.com"], [""]};
+
+values('DiameterURI') ->
+    {false, ["aaa" ++ S ++ "://diameter.se" ++ P ++ Tr ++ Pr
+             || S  <- ["", "s"],
+                P  <- ["", ":1234"],
+                Tr <- ["" | [";transport=" ++ X
+                             || X <- ["tcp", "sctp", "udp"]]],
+                Pr <- ["" | [";protocol=" ++ X
+                             || X <- ["diameter","radius","tacacs+"]]]]};
+
+values(T)
+  when T == 'IPFilterRule';
+       T == 'QoSFilterRule' ->
+    ["deny in 0 from 127.0.0.1 to 10.0.0.1"];
+
+%% RFC 3629 defines the UTF-8 encoding of U+0000 through U+10FFFF with the
+%% exception of U+D800 through U+DFFF.
+values('UTF8String') ->
+    {[[],
+      lists:seq(0,16#1FF),
+      [0,16#D7FF,16#E000,16#10FFFF],
+      [random(16#D7FF), random(16#E000,16#10FFFF)]],
+     [[-1],
+      [16#D800],
+      [16#DFFF],
+      [16#110000]]};
+
+values('Time') ->
+    {[{{1968,1,20},{3,14,8}},    %% 19000101T000000 + 1 bsl 31
+      {date(), time()},
+      {{2036,2,7},{6,28,15}},
+      {{2036,2,7},{6,28,16}},    %% 19000101T000000 + 2 bsl 31
+      {{2104,2,26},{9,42,23}}],
+     [{{1968,1,20},{3,14,7}},
+      {{2104,2,26},{9,42,24}}]}. %% 19000101T000000 + 3 bsl 31
+
+%% values/3
+%%
+%% Return list or enumerations of values for a given AVP. Can be
+%% wrapped as for values/1.
+
+values('Enumerated', Name, Mod) ->
+    {_Name, Vals} = lists:keyfind(Name, 1, types(enums, Mod)),
+    lists:map(fun({N,_}) -> N end, Vals);
+
+values('Grouped', Name, Mod) ->
+    Rname = Mod:name2rec(Name),
+    Rec = Mod:'#new-'(Rname),
+    Avps = Mod:'#info-'(Rname, fields),
+    Enum = diameter_enum:combine(lists:map(fun({_,Vs,_}) -> to_enum(Vs) end,
+                                           [values(F, Mod) || F <- Avps])),
+    {false, diameter_enum:append(group(Mod, Name, Rec, Avps, Enum))};
+
+values(_, 'Framed-IP-Address', _) ->
+    [{127,0,0,1}];
+
+values(Type, _, _) ->
+    values(Type).
+
+to_enum(Vs)
+  when is_list(Vs) ->
+    diameter_enum:new(Vs);
+to_enum(E) ->
+    E.
+
+%% values/2
+
+values('AVP', _) ->
+    {true, [#diameter_avp{code = 0, data = <<0>>}], []};
+
+values(Name, Mod) ->
+    Avps = types(avp_types, Mod),
+    {Name, _Code, Type, _Flags, _Encr} = lists:keyfind(Name, 1, Avps),
+    b(values(Type, Name, Mod)).
+
+%% group/5
+%%
+%% Pack four variants of group values: tagged list containing all
+%% values, the corresponding record, a minimal tagged list and the
+%% coresponding record.
+
+group(Mod, Name, Rec, Avps, Enum) ->
+    lists:map(fun(B) -> group(Mod, Name, Rec, Avps, Enum, B) end,
+              [{A,R} || A <- ?BOOL, R <- ?BOOL]).
+
+group(Mod, Name, Rec, Avps, Enum, B) ->
+    diameter_enum:map(fun(Vs) -> g(Mod, Name, Rec, Avps, Vs, B) end, Enum).
+
+g(Mod, Name, Rec, Avps, Values, {All, AsRec}) ->
+    {Tagged, []}
+        = lists:foldl(fun(N, {A, [V|Vs]}) ->
+                              {pack(All, Mod:avp_arity(Name, N), N, V, A), Vs}
+                      end,
+                      {[], Values},
+                      Avps),
+    g(AsRec, Mod, Tagged, Rec).
+
+g(true, Mod, Vals, Rec) ->
+    Mod:'#set-'(Vals, Rec);
+g(false, _, Vals, _) ->
+    Vals.
+
+pack(true, Arity, Avp, Value, Acc) ->
+    [all(Arity, Avp, Value) | Acc];
+pack(false, Arity, Avp, Value, Acc) ->
+    min(Arity, Avp, Value, Acc).
+
+all(Mod, Name, Avp, V) ->
+    all(Mod:avp_arity(Name, Avp), Avp, V).
+
+all(1, Avp, V) ->
+    {Avp, V};
+all({0,'*'}, Avp, V) ->
+    a(1, Avp, V);
+all({N,'*'}, Avp, V) ->
+    a(N, Avp, V);
+all({_,N}, Avp, V) ->
+    a(N, Avp, V).
+
+a(N, Avp, V)
+  when N /= 0 ->
+    {Avp, lists:duplicate(N,V)}.
+
+min(Mod, Name, Avp, V, Acc) ->
+    min(Mod:avp_arity(Name, Avp), Avp, V, Acc).
+
+min(1, Avp, V, Acc) ->
+    [{Avp, V} | Acc];
+min({0,_}, _, _, Acc) ->
+    Acc;
+min({N,_}, Avp, V, Acc) ->
+    [{Avp, lists:duplicate(N,V)} | Acc].
+
+%% types/2
+
+types(T, Mod) ->
+    types(T, retag(T), Mod).
+
+types(T, IT, Mod) ->
+    Dict = Mod:dict(),
+    fetch(T, Dict) ++ lists:flatmap(fun({_,As}) -> As end, fetch(IT, Dict)).
+
+%% random/[12]
+
+random(M) ->
+    random(0,M).
+
+random(Mn,Mx) ->
+    seed(get({?MODULE, seed})),
+    Mn + random:uniform(Mx - Mn + 1) - 1.
+
+seed(undefined) ->
+    put({?MODULE, seed}, true),
+    random:seed(now());
+
+seed(true) ->
+    ok.
+
+%% run/1
+%%
+%% Unravel nested badmatches resulting from [] matches on calls to
+%% run/1 to make for more readable failures.
+
+run(L) ->
+    lists:flatmap(fun flatten/1, diameter_util:run(L)).
+
+flatten({_, {{badmatch, [{_, {{badmatch, _}, _}} | _] = L}, _}}) ->
+    L;
+flatten(T) ->
+    [T].
diff --git a/lib/diameter/test/diameter_compiler_test.erl b/lib/diameter/test/diameter_compiler_test.erl
deleted file mode 100644
index ae4c9c668d..0000000000
--- a/lib/diameter/test/diameter_compiler_test.erl
+++ /dev/null
@@ -1,104 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the dia compiler of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_compiler_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2
-
-	 %% foo/1
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case example
-%% 
-
-%% foo(suite) ->
-%%     [];
-%% foo(doc) ->
-%%     [];
-%% foo(Config) when is_list(Config) ->
-%%     ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
diff --git a/lib/diameter/test/diameter_config_test.erl b/lib/diameter/test/diameter_config_test.erl
deleted file mode 100644
index c44fb654ab..0000000000
--- a/lib/diameter/test/diameter_config_test.erl
+++ /dev/null
@@ -1,105 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the config server of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_config_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2
-
-	 %% foo/1
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case example
-%% 
-
-%% foo(suite) ->
-%%     [];
-%% foo(doc) ->
-%%     [];
-%% foo(Config) when is_list(Config) ->
-%%     ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
diff --git a/lib/diameter/test/diameter_ct.erl b/lib/diameter/test/diameter_ct.erl
new file mode 100644
index 0000000000..f8ee3dc1d7
--- /dev/null
+++ b/lib/diameter/test/diameter_ct.erl
@@ -0,0 +1,55 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(diameter_ct).
+
+%%
+%% Module used to run suites from Makefile.
+%%
+
+-export([run/1]).
+
+%% ct:run_test/1 is currently documented as returning a list of test
+%% results ... but no. Instead it returns 'ok' regardless of whether
+%% or not the suite in question has failed testcases.
+
+run([Suite]) ->
+    Start = info(),
+    ok = ct:run_test([{suite, Suite},
+                      {logdir, "./log"},
+                      {auto_compile, false}]),
+    info(Start , info()).
+
+info() ->
+    [{time, now()},
+     {process_count, erlang:system_info(process_count)}
+     | erlang:memory()].
+
+info(L0, L1) ->
+    [T, C | M]
+        = lists:zipwith(fun({T,N0}, {T,N1}) -> {T, N1, diff(T, N0, N1)} end,
+                        L0,
+                        L1),
+    Diff = [T, C, {memory, M}],
+    ct:pal("INFO: ~p~n", [Diff]).
+
+diff(time, T0, T1) ->
+    timer:now_diff(T1, T0);
+diff(_, N0, N1) ->
+    N1 - N0.
diff --git a/lib/diameter/src/app/diameter.appup.src b/lib/diameter/test/diameter_ct.hrl
index 2b96153575..b6bd2ca9da 100644
--- a/lib/diameter/src/app/diameter.appup.src
+++ b/lib/diameter/test/diameter_ct.hrl
@@ -1,4 +1,3 @@
-%% This is an -*- erlang -*- file.
 %%
 %% %CopyrightBegin%
 %%
@@ -18,10 +17,5 @@
 %% %CopyrightEnd%
 %%
 
-{"%VSN%",
- [
- ],
- [
- ]
-}.
-
+-define(APP, diameter).
+-define(ERROR(T), erlang:error({?MODULE, ?LINE, T})).
diff --git a/lib/diameter/test/diameter_dict_SUITE.erl b/lib/diameter/test/diameter_dict_SUITE.erl
new file mode 100644
index 0000000000..87bb9727fe
--- /dev/null
+++ b/lib/diameter/test/diameter_dict_SUITE.erl
@@ -0,0 +1,151 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of the dict-like diameter_dict.
+%%
+
+-module(diameter_dict_SUITE).
+
+-export([suite/0,
+         all/0,
+         groups/0,
+         init_per_group/2,
+         end_per_group/2]).
+
+%% testcases
+-export([append/1,
+         fetch/1,
+         fetch_keys/1,
+         filter/1,
+         find/1,
+         fold/1,
+         is_key/1,
+         map/1,
+         merge/1,
+         update/1,
+         update_counter/1]).
+
+-include("diameter_ct.hrl").
+
+-define(dict, diameter_dict).
+-define(util, diameter_util).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 10}}].
+
+all() ->
+    [{group, all} | tc()].
+
+groups() ->
+    [{all, [parallel], tc()}].
+
+tc() ->
+    [append,
+     fetch,
+     fetch_keys,
+     filter,
+     find,
+     fold,
+     is_key,
+     map,
+     merge,
+     update,
+     update_counter].
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_, _) ->
+    ok.
+
+%% ===========================================================================
+
+-define(KV100, [{N,[N]} || N <- lists:seq(1,100)]).
+
+append(_) ->
+    D = ?dict:append(k, v, ?dict:new()),
+    [{k,[v,v]}] = ?dict:to_list(?dict:append(k, v, D)).
+
+fetch(_) ->
+    D = ?dict:from_list(?KV100),
+    [50] = ?dict:fetch(50, D),
+    Ref = make_ref(),
+    Ref = try ?dict:fetch(Ref, D) catch _:_ -> Ref end.
+
+fetch_keys(_) ->
+    L = ?KV100,
+    D = ?dict:from_list(L),
+    L = [{N,[N]} || N <- lists:sort(?dict:fetch_keys(D))].
+
+filter(_) ->
+    L = ?KV100,
+    F = fun(K,[_]) -> 0 == K rem 2 end,
+    D = ?dict:filter(F, ?dict:from_list(L)),
+    true = [T || {K,V} = T <- L, F(K,V)] == lists:sort(?dict:to_list(D)).
+
+find(_) ->
+    D = ?dict:from_list(?KV100),
+    {ok, [50]} = ?dict:find(50, D),
+    error = ?dict:find(make_ref(), D).
+
+fold(_) ->
+    L = ?KV100,
+    S = lists:sum([N || {N,_} <- L]),
+    S = ?dict:fold(fun(K,[_],A) -> K + A end, 0, ?dict:from_list(L)).
+
+is_key(_) ->
+    L = ?KV100,
+    D = ?dict:from_list(L),
+    true = lists:all(fun({N,_}) -> ?dict:is_key(N,D) end, L),
+    false = ?dict:is_key(make_ref(), D).
+
+map(_) ->
+    L = ?KV100,
+    F = fun(_,V) -> [N] = V, N*2 end,
+    D = ?dict:map(F, ?dict:from_list(L)),
+    M = [{K, F(K,V)} || {K,V} <- L],
+    M = lists:sort(?dict:to_list(D)).
+
+merge(_) ->
+    L = ?KV100,
+    F = fun(_,V1,V2) -> V1 ++ V2 end,
+    D = ?dict:merge(F, ?dict:from_list(L), ?dict:from_list(L)),
+    M = [{K, F(K,V,V)} || {K,V} <- L],
+    M = lists:sort(?dict:to_list(D)).
+
+update(_) ->
+    L = ?KV100,
+    F = fun([V]) -> 2*V end,
+    D = ?dict:update(50, F, ?dict:from_list(L)),
+    100 = ?dict:fetch(50, D),
+    Ref = make_ref(),
+    Ref = try ?dict:update(Ref, F, D) catch _:_ -> Ref end,
+    [Ref] = ?dict:fetch(Ref, ?dict:update(Ref,
+                                          fun(_,_) -> ?ERROR(i_think_not) end,
+                                          [Ref],
+                                          D)).
+
+update_counter(_) ->
+    L = [{N,2*N} || {N,_} <- ?KV100],
+    D = ?dict:update_counter(50, 20, ?dict:from_list(L)),
+    120 = ?dict:fetch(50,D),
+    2 = ?dict:fetch(1,D).
diff --git a/lib/diameter/test/diameter_enum.erl b/lib/diameter/test/diameter_enum.erl
new file mode 100644
index 0000000000..dfb6d04e3c
--- /dev/null
+++ b/lib/diameter/test/diameter_enum.erl
@@ -0,0 +1,406 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(diameter_enum).
+
+%%
+%% This module constructs finite enumerations.
+%%
+%% An enumeration is represented as a function on integers, 0 mapping
+%% to the number of values enumerated and successive integers mapping
+%% to enumerated values. The function will fail on anything but 0 and
+%% positive integers less then or equal to the value of the function
+%% at 0.
+%%
+%% The purpose of this is to provide a way of stepping through a large
+%% number of values without explicitly constructing the list of all
+%% possible values. For example, consider the following function that
+%% given a list of lists constructs the list of all possible lists
+%% constructed by choosing one element from each sublist.
+%%
+%%   combine([H]) ->
+%%       [[X] || X <- H];
+%%   combine([H|T]) ->
+%%       Ys = combine(T),
+%%       [[X|Y] || X <- H, Y <- Ys].
+%%
+%% Eg. [[1,2],[3,4,5]] -> [[1,3],[1,4],[1,5],[2,3],[2,4],[2,5]]
+%%
+%% If L is a list of three 1000 element lists then combine(L) would
+%% construct a list of length 10^9 which will likely exhaust available
+%% memory. (Which is how this module came into being. A tail-recursive
+%% implementation doesn't fare much better.) By contrast,
+%%
+%%   F = enum:combine([enum:new(L) || L <- Lists])
+%%
+%% only maps existing lists. It may still be undesirable to step
+%% through a very large number of values but it's possible, and easy
+%% to step through a selection of values as an alternative.
+%%
+
+%% Functions that return enumerations.
+-export([new/1,
+         combine/1,
+         reverse/1,
+         map/2,
+         append/1,
+         duplicate/2,
+         nthtail/2,
+         seq/2,
+         seq/3,
+         zip/1,
+         zip/2,
+         slice/3,
+         split/2]).
+
+%% Functions that operate on existing enumerations.
+-export([foreach/2,
+         foldl/3,
+         foldr/3,
+         all/2,
+         any/2,
+         member/2,
+         last/1,
+         nth/2,
+         to_list/1]).
+
+%% ------------------------------------------------------------------------
+%% new/1
+%%
+%% Turn a list/tuple of values into an enumeration that steps through
+%% each element. Turn anything else into an enumeration of that single
+%% value.
+%% ------------------------------------------------------------------------
+
+new(L)
+  when is_list(L) ->
+    new(list_to_tuple(L));
+
+new(T)
+  when is_tuple(T) ->
+    enum(size(T), fun(N) -> element(N,T) end);
+
+new(T) ->
+    fun(0) -> 1; (1) -> T end.
+
+enum(Ord, F) ->
+    fun(0) -> Ord; (N) when 0 < N, N =< Ord -> F(N) end.
+
+%% ------------------------------------------------------------------------
+%% combine/1
+%%
+%% Map a list/tuple of enumerations to the enumeration of all
+%% lists/tuples constructed by choosing one value from each
+%% enumeration in the list/tuple.
+%% ------------------------------------------------------------------------
+
+combine(T)
+  when is_tuple(T) ->
+    F = combine(tuple_to_list(T)),
+    enum(F(0), fun(N) -> list_to_tuple(F(N)) end);
+
+combine([]) ->
+    fun(0) -> 0 end;
+
+%% Given positive integers n_1,...,n_k, construct a bijection from
+%% {0,...,\prod_{i=1}^k} n_i - 1} to {0,...,n_1} x ... x {0,...,n_k}
+%% that maps N to (N_1,...,N_k) where:
+%%
+%%   N_1 = (N div 1) rem n_1
+%%   ...
+%%   N_k = (N div n_1*...*n_{k-1}) rem n_k
+%%
+%% That is:
+%%
+%%   N_i = (N div \prod_{j=1}^{i-1} n_j) rem n_i
+%%
+%% This corresponds to looping through N_1, incrementing N_2 as N_1
+%% loops, and so on up through N_k. The inverse map is as follows.
+%%
+%%   (N_1,...,N_k) -> N = N_1 + N_2*n_1 + ... + N_k*n_{k-1}*...*n_1
+%%
+%%                      = \sum_{i=1}^k N_i*\prod_{j=i}^{i-1} n_j
+%%
+%% [Proof: Induction on k. For k=1 we have the identity map. If
+%%         g_k : (N_1,...,N_k) |-> N above is bijective then consider
+%%         the bijection
+%%
+%%           G : (t,n) |--> t + n*K,  K = n_k*...*n_1
+%%
+%%         from {0,...,K-1} x {0,...,n_{k+1}-1} onto {0,...,n_{k+1}*K - 1}
+%%         with inverse F : n |--> (n rem K, n div K). Since
+%%
+%%           g_{k+1}(N_1,...,N_{k+1}) = g_k(N_1,...,N_K) + N_{k+1}*K
+%%                                    = G(g_k(N_1,...,N_K), N_{k+1})
+%%
+%%         and G, g_k and ((N-1,...,N_k),N_{k+1}) -> (N_1,...,N_{k+1})
+%%         are all bijections, so is g_{k+1}.]
+
+combine([_|_] = L) ->
+    [Ord | Divs] = lists:foldl(fun(F,[D|_] = A) -> [F(0)*D | A] end, [1], L),
+    RL = lists:reverse(L),
+    enum(Ord, fun(N) -> combine(N, Ord, Divs, RL) end).
+
+%% Since we use 0 to return the number of elements enumerated, use
+%% bijections from {1,...,N} rather than {0,...,N-1}.
+
+combine(N, Ord, Divs, L)
+  when 0 < N, N =< Ord ->
+    {Vs, []} = lists:foldl(fun(F, {A, [D|Ds]}) ->
+                                   {[F(1 + (((N-1) div D) rem F(0))) | A], Ds}
+                           end,
+                           {[], Divs},
+                           L),
+    Vs.
+
+%% ------------------------------------------------------------------------
+%% reverse/1
+%%
+%% Construct the enumeration that reverses the order in which values
+%% are traversed.
+%% ------------------------------------------------------------------------
+
+reverse(E) ->
+    Ord = E(0),
+    enum(Ord, fun(N) -> E(Ord + 1 - N) end).
+
+%% ------------------------------------------------------------------------
+%% map/2
+%%
+%% Construct an enumeration that maps enumerated values.
+%% ------------------------------------------------------------------------
+
+map(Fun, E) ->
+    enum(E(0), fun(N) -> Fun(E(N)) end).
+
+%% ------------------------------------------------------------------------
+%% append/2
+%%
+%% Construct an enumeration that successively steps through each of a
+%% list of enumerations.
+%% ------------------------------------------------------------------------
+
+append(Es) ->
+    [Ord | Os] = lists:foldl(fun(E, [N|_] = A) -> [N+E(0)|A] end, [0], Es),
+    Rev = lists:reverse(Es),
+    enum(Ord, fun(N) -> append(N, Os, Rev) end).
+
+append(N, [Ord | _], [E | _])
+  when N > Ord ->
+    E(N - Ord);
+append(N, [_|Os], [_|Es]) ->
+    append(N, Os, Es).
+
+%% ------------------------------------------------------------------------
+%% duplicate/2
+%%
+%% Construct an enumeration that traverses an enumeration multiple
+%% times. Equivalent to append(lists:duplicate(N, E)).
+%% ------------------------------------------------------------------------
+
+duplicate(N, E) ->
+    Ord = E(0),
+    enum(N*Ord, fun(M) -> E(1 + ((M-1) rem Ord)) end).
+
+%% ------------------------------------------------------------------------
+%% nthtail/2
+%%
+%% Construct an enumeration that omits values at the head of an
+%% existing enumeration.
+%% ------------------------------------------------------------------------
+
+nthtail(N, E)
+  when 0 =< N ->
+    nthtail(E(0) - N, N, E).
+
+nthtail(Ord, N, E)
+  when 0 =< Ord ->
+    enum(Ord, fun(M) -> E(M+N) end).
+
+%% ------------------------------------------------------------------------
+%% seq/[23]
+%%
+%% Construct an enumeration that steps through a sequence of integers.
+%% ------------------------------------------------------------------------
+
+seq(From, To) ->
+    seq(From, To, 1).
+
+seq(From, To, Incr)
+  when From =< To ->
+    enum((To - From + Incr) div Incr, fun(N) -> From + (N-1)*Incr end).
+
+%% ------------------------------------------------------------------------
+%% zip/[12]
+%%
+%% Construct an enumeration whose nth value is the list of nth values
+%% of a list of enumerations.
+%% ------------------------------------------------------------------------
+
+zip(Es) ->
+    zip(fun(T) -> T end, Es).
+
+zip(_, []) ->
+    [];
+zip(Fun, Es) ->
+    enum(lists:min([E(0) || E <- Es]), fun(N) -> Fun([E(N) || E <- Es]) end).
+
+%% ------------------------------------------------------------------------
+%% slice/3
+%%
+%% Construct an enumeration of a given length from a given starting point.
+%% ------------------------------------------------------------------------
+
+slice(N, Len, E)
+  when is_integer(N), N > 0, is_integer(Len), Len >= 0 ->
+    slice(N, Len, E(0) - (N - 1), E).
+
+slice(_, _, Tail, _)
+  when Tail < 1 ->
+    fun(0) -> 0 end;
+
+slice(N, Len, Tail, E) ->
+    enum(lists:min([Len, Tail]), fun(M) -> E(N-1+M) end).
+
+%% ------------------------------------------------------------------------
+%% split/2
+%%
+%% Split an enumeration into a list of enumerations of the specified
+%% length. The last enumeration of the list may have order less than
+%% this length.
+%% ------------------------------------------------------------------------
+
+split(Len, E)
+  when is_integer(Len), Len > 0 ->
+    split(1, E(0), Len, E, []).
+
+split(N, Ord, _, _, Acc)
+  when N > Ord ->
+    lists:reverse(Acc);
+
+split(N, Ord, Len, E, Acc) ->
+    split(N+Len, Ord, Len, E, [slice(N, Len, E) | Acc]).
+
+%% ------------------------------------------------------------------------
+%% foreach/2
+%%
+%% Apply a fun to each value of an enumeration.
+%% ------------------------------------------------------------------------
+
+foreach(Fun, E) ->
+    foldl(fun(N,ok) -> Fun(N), ok end, ok, E).
+
+%% ------------------------------------------------------------------------
+%% foldl/3
+%% foldr/3
+%%
+%% Fold through values in an enumeration.
+%% ------------------------------------------------------------------------
+
+foldl(Fun, Acc, E) ->
+    foldl(E(0), 1, Fun, Acc, E).
+
+foldl(M, N, _, Acc, _)
+  when N == M+1 ->
+    Acc;
+foldl(M, N, Fun, Acc, E) ->
+    foldl(M, N+1, Fun, Fun(E(N), Acc), E).
+
+foldr(Fun, Acc, E) ->
+    foldl(Fun, Acc, reverse(E)).
+
+%% ------------------------------------------------------------------------
+%% all/2
+%%
+%% Do all values of an enumeration satisfy a predicate?
+%% ------------------------------------------------------------------------
+
+all(Pred, E) ->
+    all(E(0), 1, Pred, E).
+
+all(M, N, _, _)
+  when N == M+1 ->
+    true;
+all(M, N, Pred, E) ->
+    Pred(E(N)) andalso all(M, N+1, Pred, E).
+
+%% Note that andalso/orelse are tail-recusive as of R13A.
+
+%% ------------------------------------------------------------------------
+%% any/2
+%%
+%% Does any value of an enumeration satisfy a predicate?
+%% ------------------------------------------------------------------------
+
+any(Pred, E) ->
+    any(E(0), 1, Pred, E).
+
+any(M, N, _, _)
+  when N == M+1 ->
+    false;
+any(M, N, Pred, E) ->
+    Pred(E(N)) orelse any(M, N+1, Pred, E).
+
+%% ------------------------------------------------------------------------
+%% member/2
+%%
+%% Does a value match any in an enumeration?
+%% ------------------------------------------------------------------------
+
+member(X, E) ->
+    member(E(0), 1, X, E).
+
+member(M, N, _, _)
+  when N == M+1 ->
+    false;
+member(M, N, X, E) ->
+    match(E(N), X) orelse member(M, N+1, X, E).
+
+match(X, X) ->
+    true;
+match(_, _) ->
+    false.
+
+%% ------------------------------------------------------------------------
+%% last/1
+%%
+%% Return the last value of an enumeration.
+%% ------------------------------------------------------------------------
+
+last(E) ->
+    E(E(0)).
+
+%% ------------------------------------------------------------------------
+%% nth/2
+%%
+%% Return a selected value of an enumeration.
+%% ------------------------------------------------------------------------
+
+nth(N, E) ->
+    E(N).
+
+%% ------------------------------------------------------------------------
+%% to_list/1
+%%
+%% Turn an enumeration into a list. Not good if the very many values
+%% are enumerated.
+%% ------------------------------------------------------------------------
+
+to_list(E) ->
+    foldr(fun(X,A) -> [X|A] end, [], E).
diff --git a/lib/diameter/test/diameter_etcp_test.beam b/lib/diameter/test/diameter_etcp_test.beam
deleted file mode 100644
index efaaec69d5..0000000000
--- a/lib/diameter/test/diameter_etcp_test.beam
+++ /dev/null
diff --git a/lib/diameter/test/diameter_failover_SUITE.erl b/lib/diameter/test/diameter_failover_SUITE.erl
new file mode 100644
index 0000000000..c25e9682f0
--- /dev/null
+++ b/lib/diameter/test/diameter_failover_SUITE.erl
@@ -0,0 +1,262 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of traffic between six Diameter nodes in three realms,
+%% connected as follows.
+%%
+%%                  ----- SERVER1.REALM2
+%%                /
+%%               /  ----- SERVER2.REALM2
+%%              | /
+%%   CLIENT.REALM1 ------ SERVER3.REALM2
+%%              | \
+%%              |  \
+%%               \   ---- SERVER1.REALM3
+%%                \
+%%                  ----- SERVER2.REALM3
+%%
+
+-module(diameter_failover_SUITE).
+
+-export([suite/0,
+         all/0]).
+
+%% testcases
+-export([start/1,
+         start_services/1,
+         connect/1,
+         send_ok/1,
+         send_nok/1,
+         stop_services/1,
+         stop/1]).
+
+%% diameter callbacks
+-export([peer_up/3,
+         peer_down/3,
+         pick_peer/4,
+         prepare_request/3,
+         prepare_retransmit/3,
+         handle_answer/4,
+         handle_error/4,
+         handle_request/3]).
+
+-ifdef(DIAMETER_CT).
+-include("diameter_gen_base_rfc3588.hrl").
+-else.
+-include_lib("diameter/include/diameter_gen_base_rfc3588.hrl").
+-endif.
+
+-include_lib("diameter/include/diameter.hrl").
+-include("diameter_ct.hrl").
+
+%% ===========================================================================
+
+-define(util, diameter_util).
+
+-define(ADDR, {127,0,0,1}).
+
+-define(CLIENT,  "CLIENT.REALM1").
+-define(SERVER1, "SERVER1.REALM2").
+-define(SERVER2, "SERVER2.REALM2").
+-define(SERVER3, "SERVER3.REALM2").
+-define(SERVER4, "SERVER1.REALM3").
+-define(SERVER5, "SERVER2.REALM3").
+
+-define(SERVICES, [?CLIENT, ?SERVER1, ?SERVER2, ?SERVER3, ?SERVER4, ?SERVER5]).
+
+-define(DICT_COMMON,  ?DIAMETER_DICT_COMMON).
+
+-define(APP_ALIAS, the_app).
+-define(APP_ID, ?DICT_COMMON:id()).
+
+%% Config for diameter:start_service/2.
+-define(SERVICE(Host, Dict),
+        [{'Origin-Host', Host},
+         {'Origin-Realm', realm(Host)},
+         {'Host-IP-Address', [?ADDR]},
+         {'Vendor-Id', 12345},
+         {'Product-Name', "OTP/diameter"},
+         {'Acct-Application-Id', [Dict:id()]},
+         {application, [{alias, ?APP_ALIAS},
+                        {dictionary, Dict},
+                        {module, ?MODULE},
+                        {answer_errors, callback}]}]).
+
+-define(SUCCESS, 2001).
+
+-define(LOGOUT, ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 10}}].
+
+all() ->
+    [start,
+     start_services,
+     connect,
+     send_ok,
+     send_nok,
+     stop_services,
+     stop].
+
+%% ===========================================================================
+%% start/stop testcases
+
+start(_Config) ->
+    ok = diameter:start().
+
+start_services(_Config) ->
+    S = [server(N, ?DICT_COMMON) || N <- tl(?SERVICES)],
+
+    ok = diameter:start_service(?CLIENT, ?SERVICE(?CLIENT, ?DICT_COMMON)),
+
+    {save_config, [{?CLIENT, S}]}.
+
+connect(Config) ->
+    {_, Conns} = proplists:get_value(saved_config, Config),
+
+    lists:foreach(fun({CN,Ss}) -> connect(CN, Ss) end, Conns).
+
+stop_services(_Config) ->
+    [] = [{H,T} || H <- ?SERVICES,
+                   T <- [diameter:stop_service(H)],
+                   T /= ok].
+
+stop(_Config) ->
+    ok = diameter:stop().
+
+%% ----------------------------------------
+
+server(Name, Dict) ->
+    ok = diameter:start_service(Name, ?SERVICE(Name, Dict)),
+    {Name, ?util:listen(Name, tcp)}.
+
+connect(Name, Refs) ->
+    [{{Name, ?util:connect(Name, tcp, LRef)}, T} || {_, LRef} = T <- Refs].
+
+%% ===========================================================================
+%% traffic testcases
+
+%% Send an STR and expect success after SERVER3 answers after a couple
+%% of failovers.
+send_ok(_Config) ->
+    Req = ['STR', {'Destination-Realm', realm(?SERVER1)},
+                  {'Termination-Cause', ?LOGOUT},
+                  {'Auth-Application-Id', ?APP_ID}],
+    #diameter_base_STA{'Result-Code' = ?SUCCESS,
+                       'Origin-Host' = ?SERVER3}
+        = call(Req, [{filter, realm}]).
+
+%% Send an STR and expect failure when both servers fail.
+send_nok(_Config) ->
+    Req = ['STR', {'Destination-Realm', realm(?SERVER4)},
+                  {'Termination-Cause', ?LOGOUT},
+                  {'Auth-Application-Id', ?APP_ID}],
+    {error, failover} = call(Req, [{filter, realm}]).
+
+%% ===========================================================================
+
+realm(Host) ->
+    tl(lists:dropwhile(fun(C) -> C /= $. end, Host)).
+
+call(Req, Opts) ->
+    diameter:call(?CLIENT, ?APP_ALIAS, Req, Opts).
+    
+set([H|T], Vs) ->
+    [H | Vs ++ T].
+
+%% ===========================================================================
+%% diameter callbacks
+
+%% peer_up/3
+
+peer_up(_SvcName, _Peer, State) ->
+    State.
+
+%% peer_down/3
+
+peer_down(_SvcName, _Peer, State) ->
+    State.
+
+%% pick_peer/4
+
+%% Choose a server other than SERVER3 or SERVER5 if possible.
+pick_peer(Peers, _, ?CLIENT, _State) ->
+    case lists:partition(fun({_, #diameter_caps{origin_host = {_, OH}}}) ->
+                                 OH /= ?SERVER3 andalso OH /= ?SERVER5
+                         end,
+                         Peers)
+    of
+        {[], [Peer]} ->
+            {ok, Peer};
+        {[Peer | _], _} ->
+            {ok, Peer}
+    end.
+
+%% prepare_request/3
+
+prepare_request(Pkt, ?CLIENT, {_Ref, Caps}) ->
+    {send, prepare(Pkt, Caps)}.
+
+prepare(#diameter_packet{msg = Req}, Caps) ->
+    #diameter_caps{origin_host  = {OH, _},
+                   origin_realm = {OR, _}}
+        = Caps,
+    set(Req, [{'Session-Id', diameter:session_id(OH)},
+              {'Origin-Host',  OH},
+              {'Origin-Realm', OR}]).
+
+%% prepare_retransmit/3
+
+prepare_retransmit(Pkt, ?CLIENT, _Peer) ->
+    {send, Pkt}.
+
+%% handle_answer/4
+
+handle_answer(Pkt, _Req, ?CLIENT, _Peer) ->
+    #diameter_packet{msg = Rec, errors = []} = Pkt,
+    Rec.
+
+%% handle_error/4
+
+handle_error(Reason, _Req, ?CLIENT, _Peer) ->
+    {error, Reason}.
+
+%% handle_request/3
+
+%% Only SERVER3 actually answers.
+handle_request(Pkt, ?SERVER3, {_, Caps}) ->
+    #diameter_packet{msg = #diameter_base_STR{'Session-Id' = SId,
+                                              'Origin-Host' = ?CLIENT}}
+        = Pkt,
+    #diameter_caps{origin_host  = {OH, _},
+                   origin_realm = {OR, _}}
+        = Caps,
+
+    {reply, #diameter_base_STA{'Result-Code' = ?SUCCESS,
+                               'Session-Id' = SId,
+                               'Origin-Host' = OH,
+                               'Origin-Realm' = OR}};
+
+%% Others kill the transport to force failover.
+handle_request(_, _, {TPid, _}) ->
+    exit(TPid, kill),
+    discard.
diff --git a/lib/diameter/test/diameter_peer_test.erl b/lib/diameter/test/diameter_peer_test.erl
deleted file mode 100644
index 27e75e26ef..0000000000
--- a/lib/diameter/test/diameter_peer_test.erl
+++ /dev/null
@@ -1,104 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the peer component of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_peer_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2
-
-	 %% foo/1
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case example
-%% 
-
-%% foo(suite) ->
-%%     [];
-%% foo(doc) ->
-%%     [];
-%% foo(Config) when is_list(Config) ->
-%%     ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
diff --git a/lib/diameter/test/diameter_reg_SUITE.erl b/lib/diameter/test/diameter_reg_SUITE.erl
new file mode 100644
index 0000000000..ade824c9dd
--- /dev/null
+++ b/lib/diameter/test/diameter_reg_SUITE.erl
@@ -0,0 +1,119 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of the server implemented by diameter_reg.erl.
+%%
+
+-module(diameter_reg_SUITE).
+
+-export([suite/0,
+         all/0,
+         groups/0,
+         init_per_group/2,
+         end_per_group/2,
+         init_per_suite/1,
+         end_per_suite/1]).
+
+%% testcases
+-export([add/1,
+         add_new/1,
+         del/1,
+         repl/1,
+         terms/1,
+         pids/1]).
+
+-define(reg,  diameter_reg).
+-define(util, diameter_util).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 10}}].
+
+all() ->
+    [{group, all} | tc()].
+
+groups() ->
+    [{all, [parallel], tc()}].
+
+tc() ->
+    [add,
+     add_new,
+     del,
+     repl,
+     terms,
+     pids].
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_, _) ->
+    ok.
+
+init_per_suite(Config) ->
+    ok = diameter:start(),
+    Config.
+
+end_per_suite(_Config) ->
+    ok = diameter:stop().
+
+%% ===========================================================================
+
+add(_) ->
+    Ref = make_ref(),
+    true = ?reg:add(Ref),
+    true = ?reg:add(Ref),
+    [{Ref, Pid}] = ?reg:match(Ref),
+    Pid = self().
+
+add_new(_) ->
+    Ref = make_ref(),
+    true = ?reg:add_new(Ref),
+    false = ?reg:add_new(Ref).
+
+del(_) ->
+    Ref = make_ref(),
+    true = ?reg:add_new(Ref),
+    true = ?reg:add_new({Ref}),
+    true = ?reg:del({Ref}),
+    [{Ref, Pid}] = ?reg:match(Ref),
+    Pid = self().
+
+repl(_) ->
+    Ref = make_ref(),
+    true = ?reg:add_new({Ref}),
+    true = ?reg:repl({Ref}, Ref),
+    false = ?reg:add_new(Ref),
+    false = ?reg:repl({Ref}, Ref),
+    [{Ref, Pid}] = ?reg:match(Ref),
+    Pid = self().
+
+terms(_) ->
+    Ref = make_ref(),
+    true = ?reg:add_new(Ref),
+    [[Pid]] = [L || {T,L} <- ?reg:terms(), T == Ref],
+    Pid = self().
+
+pids(_) ->
+    Ref = make_ref(),
+    true = ?reg:add_new(Ref),
+    %% Don't match [[Ref]] since this will only necessarily be the
+    %% case when the test is run in its own process.
+    [_|_] = [L || {P,L} <- ?reg:pids(), P == self()].
diff --git a/lib/diameter/test/diameter_reg_test.erl b/lib/diameter/test/diameter_reg_test.erl
deleted file mode 100644
index a2638d6712..0000000000
--- a/lib/diameter/test/diameter_reg_test.erl
+++ /dev/null
@@ -1,104 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011_2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the reg component of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_reg_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2
-
-	 %% foo/1
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case example
-%% 
-
-%% foo(suite) ->
-%%     [];
-%% foo(doc) ->
-%%     [];
-%% foo(Config) when is_list(Config) ->
-%%     ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
diff --git a/lib/diameter/test/diameter_relay_SUITE.erl b/lib/diameter/test/diameter_relay_SUITE.erl
new file mode 100644
index 0000000000..03f1115496
--- /dev/null
+++ b/lib/diameter/test/diameter_relay_SUITE.erl
@@ -0,0 +1,368 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of traffic between seven Diameter nodes connected as follows.
+%%
+%%                                     --- SERVER1.REALM2
+%%                                   /
+%%                  ---- RELAY.REALM2 ---- SERVER2.REALM2
+%%                /        |
+%%   CLIENT.REALM1         |
+%%                \        |
+%%                  ---- RELAY.REALM3 ---- SERVER1.REALM3
+%%                                   \
+%%                                     --- SERVER2.REALM3
+%%
+
+-module(diameter_relay_SUITE).
+
+-export([suite/0,
+         all/0,
+         groups/0,
+         init_per_group/2,
+         end_per_group/2]).
+
+%% testcases
+-export([start/1,
+         start_services/1,
+         connect/1,
+         send1/1,
+         send2/1,
+         send3/1,
+         send4/1,
+         send_loop/1,
+         send_timeout_1/1,
+         send_timeout_2/1,
+         disconnect/1,
+         stop_services/1,
+         stop/1]).
+
+%% diameter callbacks
+-export([peer_up/3,
+         peer_down/3,
+         pick_peer/4,
+         prepare_request/3,
+         prepare_retransmit/3,
+         handle_answer/4,
+         handle_error/4,
+         handle_request/3]).
+
+-ifdef(DIAMETER_CT).
+-include("diameter_gen_base_rfc3588.hrl").
+-else.
+-include_lib("diameter/include/diameter_gen_base_rfc3588.hrl").
+-endif.
+
+-include_lib("diameter/include/diameter.hrl").
+-include("diameter_ct.hrl").
+
+%% ===========================================================================
+
+-define(util, diameter_util).
+
+-define(ADDR, {127,0,0,1}).
+
+-define(CLIENT,  "CLIENT.REALM1").
+-define(RELAY1,  "RELAY.REALM2").
+-define(SERVER1, "SERVER1.REALM2").
+-define(SERVER2, "SERVER2.REALM2").
+-define(RELAY2,  "RELAY.REALM3").
+-define(SERVER3, "SERVER1.REALM3").
+-define(SERVER4, "SERVER2.REALM3").
+
+-define(SERVICES, [?CLIENT,
+                   ?RELAY1, ?RELAY2,
+                   ?SERVER1, ?SERVER2, ?SERVER3, ?SERVER4]).
+
+-define(DICT_COMMON,  ?DIAMETER_DICT_COMMON).
+-define(DICT_RELAY,   ?DIAMETER_DICT_RELAY).
+
+-define(APP_ALIAS, the_app).
+-define(APP_ID, ?DICT_COMMON:id()).
+
+%% Config for diameter:start_service/2.
+-define(SERVICE(Host, Dict),
+        [{'Origin-Host', Host},
+         {'Origin-Realm', realm(Host)},
+         {'Host-IP-Address', [?ADDR]},
+         {'Vendor-Id', 12345},
+         {'Product-Name', "OTP/diameter"},
+         {'Acct-Application-Id', [Dict:id()]},
+         {application, [{alias, ?APP_ALIAS},
+                        {dictionary, Dict},
+                        {module, ?MODULE},
+                        {answer_errors, callback}]}]).
+
+-define(SUCCESS, 2001).
+-define(LOOP_DETECTED, 3005).
+-define(UNABLE_TO_DELIVER, 3002).
+
+-define(LOGOUT, ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
+-define(AUTHORIZE_ONLY, ?'DIAMETER_BASE_RE-AUTH-REQUEST-TYPE_AUTHORIZE_ONLY').
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 10}}].
+
+all() ->
+    [start, start_services, connect]
+        ++ tc()
+        ++ [{group, all},
+            disconnect,
+            stop_services,
+            stop].
+
+groups() ->
+    [{all, [parallel], tc()}].
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_, _) ->
+    ok.
+
+%% Traffic cases run when services are started and connections
+%% established.
+tc() ->
+    [send1,
+     send2,
+     send3,
+     send4,
+     send_loop,
+     send_timeout_1,
+     send_timeout_2].
+
+%% ===========================================================================
+%% start/stop testcases
+
+start(_Config) ->
+    ok = diameter:start().
+
+start_services(_Config) ->
+    [S1,S2,S3,S4] = [server(N, ?DICT_COMMON) || N <- [?SERVER1,
+                                                      ?SERVER2,
+                                                      ?SERVER3,
+                                                      ?SERVER4]],
+    [R1,R2] = [server(N, ?DICT_RELAY) || N <- [?RELAY1, ?RELAY2]],
+
+    ok = diameter:start_service(?CLIENT, ?SERVICE(?CLIENT, ?DICT_COMMON)),
+
+    {save_config, [{?RELAY1, [S1,S2,R2]},
+                   {?RELAY2, [S3,S4]},
+                   {?CLIENT, [R1,R2]}]}.
+
+connect(Config) ->
+    {_, Conns} = proplists:get_value(saved_config, Config),
+
+    ?util:write_priv(Config,
+                     "cfg",
+                     lists:flatmap(fun({CN,Ss}) -> connect(CN, Ss) end,
+                                   Conns)).
+
+disconnect(Config) ->
+    lists:foreach(fun({{CN,CR},{SN,SR}}) -> ?util:disconnect(CN,CR,SN,SR) end,
+                  ?util:read_priv(Config, "cfg")).
+
+stop_services(_Config) ->
+    [] = [{H,T} || H <- ?SERVICES,
+                   T <- [diameter:stop_service(H)],
+                   T /= ok].
+
+stop(_Config) ->
+    ok = diameter:stop().
+
+%% ----------------------------------------
+
+server(Name, Dict) ->
+    ok = diameter:start_service(Name, ?SERVICE(Name, Dict)),
+    {Name, ?util:listen(Name, tcp)}.
+
+connect(Name, Refs) ->
+    [{{Name, ?util:connect(Name, tcp, LRef)}, T} || {_, LRef} = T <- Refs].
+
+%% ===========================================================================
+%% traffic testcases
+
+%% Send an STR intended for a specific server and expect success.
+send1(_Config) ->
+    call(?SERVER1).
+send2(_Config) ->
+    call(?SERVER2).
+send3(_Config) ->
+    call(?SERVER3).
+send4(_Config) ->
+    call(?SERVER4).
+
+%% Send an ASR that loops between the relays and expect the loop to
+%% be detected.
+send_loop(_Config) ->
+    Req = ['ASR', {'Destination-Realm', realm(?SERVER1)},
+                  {'Destination-Host', ?SERVER1},
+                  {'Auth-Application-Id', ?APP_ID}],
+    #'diameter_base_answer-message'{'Result-Code' = ?LOOP_DETECTED}
+        = call(Req, [{filter, realm}]).
+
+%% Send a RAR that is incorrectly routed and then discarded and expect
+%% different results depending on whether or not we or the relay
+%% timeout first.
+send_timeout_1(_Config) ->
+    #'diameter_base_answer-message'{'Result-Code' = ?UNABLE_TO_DELIVER}
+        = send_timeout(7000).
+send_timeout_2(_Config) ->
+    {error, timeout} = send_timeout(3000).
+
+send_timeout(Tmo) ->
+    Req = ['RAR', {'Destination-Realm', realm(?SERVER1)},
+                  {'Destination-Host', ?SERVER1},
+                  {'Auth-Application-Id', ?APP_ID},
+                  {'Re-Auth-Request-Type', ?AUTHORIZE_ONLY}],
+    call(Req, [{filter, realm}, {timeout, Tmo}]).
+
+%% ===========================================================================
+
+realm(Host) ->
+    tl(lists:dropwhile(fun(C) -> C /= $. end, Host)).
+
+call(Server) ->
+    Realm = realm(Server),
+    Req = ['STR', {'Destination-Realm', Realm},
+                  {'Destination-Host', [Server]},
+                  {'Termination-Cause', ?LOGOUT},
+                  {'Auth-Application-Id', ?APP_ID}],
+    #diameter_base_STA{'Result-Code' = ?SUCCESS,
+                       'Origin-Host' = Server,
+                       'Origin-Realm' = Realm}
+        = call(Req, [{filter, realm}]).
+
+call(Req, Opts) ->
+    diameter:call(?CLIENT, ?APP_ALIAS, Req, Opts).
+    
+set([H|T], Vs) ->
+    [H | Vs ++ T].
+
+%% ===========================================================================
+%% diameter callbacks
+
+%% peer_up/3
+
+peer_up(_SvcName, _Peer, State) ->
+    State.
+
+%% peer_down/3
+
+peer_down(_SvcName, _Peer, State) ->
+    State.
+
+%% pick_peer/4
+
+pick_peer([Peer | _], _, Svc, _State)
+  when Svc == ?RELAY1;
+       Svc == ?RELAY2;
+       Svc == ?CLIENT ->
+    {ok, Peer}.
+
+%% prepare_request/3
+
+prepare_request(Pkt, Svc, _Peer)
+  when Svc == ?RELAY1;
+       Svc == ?RELAY2 ->
+    {send, Pkt};
+
+prepare_request(Pkt, ?CLIENT, {_Ref, Caps}) ->
+    {send, prepare(Pkt, Caps)}.
+
+prepare(#diameter_packet{msg = Req}, Caps) ->
+    #diameter_caps{origin_host  = {OH, _},
+                   origin_realm = {OR, _}}
+        = Caps,
+    set(Req, [{'Session-Id', diameter:session_id(OH)},
+              {'Origin-Host',  OH},
+              {'Origin-Realm', OR}]).
+
+%% prepare_retransmit/3
+
+prepare_retransmit(_Pkt, false, _Peer) ->
+    discard.
+
+%% handle_answer/4
+
+%% A relay must return Pkt.
+handle_answer(Pkt, _Req, Svc, _Peer)
+  when Svc == ?RELAY1;
+       Svc == ?RELAY2 ->
+    Pkt;
+
+handle_answer(Pkt, _Req, ?CLIENT, _Peer) ->
+    #diameter_packet{msg = Rec, errors = []} = Pkt,
+    Rec.
+
+%% handle_error/4
+
+handle_error(Reason, _Req, _Svc, _Peer) ->
+    {error, Reason}.
+
+%% handle_request/3
+
+handle_request(Pkt, OH, {_Ref, #diameter_caps{origin_host = {OH,_}} = Caps})
+  when OH /= ?CLIENT ->
+    request(Pkt, Caps).
+
+%% RELAY1 routes any ASR or RAR to RELAY2 ...
+request(#diameter_packet{header = #diameter_header{cmd_code = C}},
+        #diameter_caps{origin_host = {?RELAY1, _}})
+  when C == 274;   %% ASR
+       C == 258 -> %% RAR
+    {relay, [{filter, {realm, realm(?RELAY2)}}]};
+
+%% ... which in turn routes it back. Expect diameter to either answer
+%% either with DIAMETER_LOOP_DETECTED/DIAMETER_UNABLE_TO_COMPLY.
+request(#diameter_packet{header = #diameter_header{cmd_code = 274}},
+        #diameter_caps{origin_host = {?RELAY2, _}}) ->
+    {relay, [{filter, {host, ?RELAY1}}]};
+request(#diameter_packet{header = #diameter_header{cmd_code = 258}},
+        #diameter_caps{origin_host = {?RELAY2, _}}) ->
+    discard;
+
+%% Other request to a relay: send on to one of the servers in the
+%% same realm.
+request(_Pkt, #diameter_caps{origin_host = {OH, _}})
+  when OH == ?RELAY1;
+       OH == ?RELAY2 ->
+    {relay, [{filter, {all, [host, realm]}}]};
+
+%% Request received by a server: answer.
+request(#diameter_packet{msg = #diameter_base_STR{'Session-Id' = SId,
+                                                  'Origin-Host' = Host,
+                                                  'Origin-Realm' = Realm,
+                                                  'Route-Record' = Route}},
+        #diameter_caps{origin_host  = {OH, _},
+                       origin_realm = {OR, _}}) ->
+    %% The request should have the Origin-Host/Realm of the original
+    %% sender.
+    R = realm(?CLIENT),
+    {?CLIENT, R} = {Host, Realm},
+    %% A relay appends the identity of the peer that a request was
+    %% received from to the Route-Record avp.
+    [?CLIENT] = Route,
+    {reply, #diameter_base_STA{'Result-Code' = ?SUCCESS,
+                               'Session-Id' = SId,
+                               'Origin-Host' = OH,
+                               'Origin-Realm' = OR}}.
diff --git a/lib/diameter/test/diameter_session_test.erl b/lib/diameter/test/diameter_session_test.erl
deleted file mode 100644
index a32647d83d..0000000000
--- a/lib/diameter/test/diameter_session_test.erl
+++ /dev/null
@@ -1,104 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the session component of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_session_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2
-
-	 %% foo/1
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case example
-%% 
-
-%% foo(suite) ->
-%%     [];
-%% foo(doc) ->
-%%     [];
-%% foo(Config) when is_list(Config) ->
-%%     ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
diff --git a/lib/diameter/test/diameter_stats_SUITE.erl b/lib/diameter/test/diameter_stats_SUITE.erl
new file mode 100644
index 0000000000..e50a0050a6
--- /dev/null
+++ b/lib/diameter/test/diameter_stats_SUITE.erl
@@ -0,0 +1,92 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of the server implemented by diameter_stats.erl.
+%%
+
+-module(diameter_stats_SUITE).
+
+-export([suite/0,
+         all/0,
+         groups/0,
+         init_per_group/2,
+         end_per_group/2,
+         init_per_suite/1,
+         end_per_suite/1]).
+
+%% testcases
+-export([an/1,
+         twa/1]).
+
+-define(stat, diameter_stats).
+-define(util, diameter_util).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 10}}].
+
+all() ->
+    [{group, all} | tc()].
+
+groups() ->
+    [{all, [parallel], tc()}].
+
+tc() ->
+    [an,
+     twa].
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_, _) ->
+    ok.
+
+init_per_suite(Config) ->
+    ok = diameter:start(),
+    Config.
+
+end_per_suite(_Config) ->
+    ok = diameter:stop().
+
+%% ===========================================================================
+
+an(_) ->
+    Ref = {'_', make_ref()},
+    true = ?stat:reg(Ref),
+    true = ?stat:reg(Ref),  %% duplicate
+    ok = ?stat:incr(x),
+    ok = ?stat:incr(x, Ref),
+    ok = ?stat:incr(y, 2),
+    ok = ?stat:incr(y, Ref),
+    %% Flushing a pid flushes even stats on the registered reference.
+    [{x,2},{y,3}] = lists:sort(?stat:flush()),
+    [] = ?stat:flush(Ref),
+    [] = ?stat:flush().
+
+twa(_) ->
+    Ref = make_ref(),
+    ok = ?stat:incr(x, 8),
+    ok = ?stat:incr(x, Ref, 7),
+    %% Flushing a reference doesn't affect registered pids.
+    [{x,7}] = ?stat:flush(Ref),
+    [] = ?stat:flush(Ref),
+    [{x,8}] = ?stat:flush(),
+    [] = ?stat:flush().
diff --git a/lib/diameter/test/diameter_stats_test.erl b/lib/diameter/test/diameter_stats_test.erl
deleted file mode 100644
index 8b666edf50..0000000000
--- a/lib/diameter/test/diameter_stats_test.erl
+++ /dev/null
@@ -1,104 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the stats component of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_stats_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2
-
-	 %% foo/1
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case example
-%% 
-
-%% foo(suite) ->
-%%     [];
-%% foo(doc) ->
-%%     [];
-%% foo(Config) when is_list(Config) ->
-%%     ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
diff --git a/lib/diameter/test/diameter_sync_SUITE.erl b/lib/diameter/test/diameter_sync_SUITE.erl
new file mode 100644
index 0000000000..84f77b6066
--- /dev/null
+++ b/lib/diameter/test/diameter_sync_SUITE.erl
@@ -0,0 +1,139 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of the server implemented by diameter_sync.erl.
+%%
+
+-module(diameter_sync_SUITE).
+
+-export([suite/0,
+         all/0,
+         groups/0,
+         init_per_group/2,
+         end_per_group/2,
+         init_per_suite/1,
+         end_per_suite/1]).
+
+%% testcases
+-export([call/1,
+         cast/1,
+         timeout/1,
+         flush/1]).
+
+-define(sync, diameter_sync).
+-define(util, diameter_util).
+
+-define(TIMEOUT, infinity).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 10}}].
+
+all() ->
+    [{group, all} | tc()].
+
+groups() ->
+    [{all, [parallel], tc()}].
+
+tc() ->
+    [call,
+     cast,
+     timeout,
+     flush].
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_, _) ->
+    ok.
+
+init_per_suite(Config) ->
+    ok = diameter:start(),
+    Config.
+
+end_per_suite(_Config) ->
+    ok = diameter:stop().
+
+%% ===========================================================================
+
+call(_) ->
+    Ref = make_ref(),
+    Q = {q, Ref},
+    F = fun() -> Ref end,
+    Ref = ?sync:call(Q, F, infinity, ?TIMEOUT),
+    Ref = ?sync:call(Q, F, 0, infinity),
+    Ref = call(Q, F),
+    Ref = call(Q, {fun(_) -> Ref end, x}),
+    timeout = call(Q, fun() -> exit(unexpected) end),
+    {_,_,_} = call(Q, {erlang, now, []}),
+    {_,_,_} = call(Q, [fun erlang:now/0]).
+
+cast(_) ->
+    Ref = make_ref(),
+    Q = {q, Ref},
+    false = ?sync:carp(Q),
+    [] = ?sync:pids(Q),
+    %% Queue a request that blocks until we send it Ref and another
+    %% that exits with Ref.
+    ok = cast(Q, fun() -> receive Ref -> ok end end),
+    ok = cast(Q, fun() -> exit(Ref) end),
+    [_,Pid] = ?sync:pids(Q),
+    %% Ensure some expected truths ...
+    2 = ?sync:pending(Q),
+    true = 2 =< ?sync:pending(),
+    true = lists:member(Q, ?sync:queues()),
+    %% ... and that the max number of requests is respected.
+    rejected = ?sync:call(Q, {erlang, now, []}, 1, ?TIMEOUT),
+    rejected = ?sync:cast(Q, {erlang, now, []}, 1, ?TIMEOUT),
+    %% Monitor on the identifiable request and see that exits when we
+    %% let the blocking request finish.
+    MRef = erlang:monitor(process, Pid),
+    {value, P} = ?sync:carp(Q),
+    P ! Ref,
+    Ref = receive
+              {'DOWN', MRef, process, _, Reason} ->
+                  Reason
+          after ?TIMEOUT ->
+                  false
+          end.
+
+timeout(_) ->
+    Q = make_ref(),
+    ok = ?sync:cast(Q, {timer, sleep, [2000]}, infinity, 2000),
+    timeout = ?sync:call(Q, fun() -> ok end, infinity, 1000).
+
+flush(_) ->
+    Q = make_ref(),
+    F = {timer, sleep, [2000]},
+    ok = cast(Q, F),
+    ok = cast(Q, F),
+    1 = ?sync:flush(Q).
+
+%% ===========================================================================
+
+call(Q, Req) ->
+    sync(call, Q, Req).
+
+cast(Q, Req) ->
+    sync(cast, Q, Req).
+
+sync(F, Q, Req) ->
+    ?sync:F(Q, Req, infinity, infinity).
diff --git a/lib/diameter/test/diameter_sync_test.erl b/lib/diameter/test/diameter_sync_test.erl
deleted file mode 100644
index 618fa5021b..0000000000
--- a/lib/diameter/test/diameter_sync_test.erl
+++ /dev/null
@@ -1,104 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the sync component of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_sync_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2
-
-	 %% foo/1
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case example
-%% 
-
-%% foo(suite) ->
-%%     [];
-%% foo(doc) ->
-%%     [];
-%% foo(Config) when is_list(Config) ->
-%%     ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
diff --git a/lib/diameter/test/diameter_tcp_test.erl b/lib/diameter/test/diameter_tcp_test.erl
deleted file mode 100644
index b002a3d289..0000000000
--- a/lib/diameter/test/diameter_tcp_test.erl
+++ /dev/null
@@ -1,482 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2010-2011. 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.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the tcp transport component of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_tcp_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2, 
-
-	 start_and_stop_transport_plain/1,
-	 start_and_listen/1, 
-	 simple_connect/1,
-	 simple_send_and_recv/1
-
-	]).
-
--export([t/0, t/1]).
-
-%% diameter_peer (internal) callback API
--export([up/1, up/3, recv/2]).
-
--include("diameter_test_lib.hrl").
--include_lib("diameter/include/diameter.hrl").
-%% -include_lib("diameter/src/tcp/diameter_tcp.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [
-     {group, start}, 
-     {group, simple}
-    ].
-
-groups() ->
-    [
-     {start,  [], [start_and_stop_transport_plain, start_and_listen]}, 
-     {simple, [], [simple_connect, simple_send_and_recv]}
-    ].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case(s) 
-%% 
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Plain start and stop of TCP transport
-%% 
-
-start_and_stop_transport_plain(suite) ->
-    [];
-start_and_stop_transport_plain(doc) ->
-    [];
-start_and_stop_transport_plain(Config) when is_list(Config) ->
-
-    ?SKIP(not_yet_implemented),
-
-    %% This has been changed *a lot* since it was written...
-
-    process_flag(trap_exit, true),
-    Transport = ensure_transport_started(),
-    TcpTransport = ensure_tcp_transport_started(),
-    ensure_tcp_transport_stopped(TcpTransport),
-    ensure_transport_stopped(Transport),
-    i("done"),
-    ok.
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Start TCP transport and then create a listen socket
-%% 
-
-start_and_listen(suite) ->
-    [];
-start_and_listen(doc) ->
-    [];
-start_and_listen(Config) when is_list(Config) ->
-
-    ?SKIP(not_yet_implemented),
-
-    %% This has been changed *a lot* since it was written...
-
-    process_flag(trap_exit, true),
-    Transport = ensure_transport_started(),
-    TcpTransport = ensure_tcp_transport_started(),
-
-    case listen([{port, 0}]) of
-	{ok, Acceptor} when is_pid(Acceptor) ->
-	    Ref = erlang:monitor(process, Acceptor),
-	    [{Acceptor, Info}] = diameter_tcp:which_listeners(),
-	    case lists:keysearch(socket, 1, Info) of
-		{value, {_, Listen}} ->
-		    i("Listen socket: ~p"
-		      "~n   Opts:  ~p"
-		      "~n   Stats: ~p"
-		      "~n   Name:  ~p", 
-		      [Listen, 
-		       ok(inet:getopts(Listen, [keepalive, delay_send])),
-		       ok(inet:getstat(Listen)),
-		       ok(inet:sockname(Listen))
-		      ]),
-		    ok;
-		_ ->
-		    ?FAIL({bad_listener_info, Acceptor, Info})
-	    end,
-	    Crash = simulate_crash, 
-	    exit(Acceptor, Crash), 
-	    receive
-		{'DOWN', Ref, process, Acceptor, Crash} ->
-		    ?SLEEP(1000),
-		    case diameter_tcp:which_listeners() of
-			[{NewAcceptor, _NewInfo}] ->
-			    diameter_tcp_accept:stop(NewAcceptor),
-			    ?SLEEP(1000),
-			    case diameter_tcp:which_listeners() of
-				[] ->
-				    ok;
-				UnexpectedListeners ->
-				    ?FAIL({unexpected_listeners, empty, UnexpectedListeners})
-			    end;
-			UnexpectedListeners ->
-			    ?FAIL({unexpected_listeners, non_empty, UnexpectedListeners})
-		    end
-	    after 5000 ->
-		    ?FAIL({failed_killing, Acceptor})
-	    end;
-	Error ->
-	    ?FAIL({failed_creating_acceptor, Error})
-    end,
-    ensure_tcp_transport_stopped(TcpTransport),
-    ensure_transport_stopped(Transport),
-    i("done"),
-    ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% TCP transport connecting
-%% 
-
-simple_connect(suite) ->
-    [];
-simple_connect(doc) ->
-    [];
-simple_connect(Config) when is_list(Config) ->
-
-    ?SKIP(not_yet_implemented),
-
-    %% This has been changed *a lot* since it was written...
-
-    process_flag(trap_exit, true),
-    Transport = ensure_transport_started(),
-    TcpTransport = ensure_tcp_transport_started(),
-    {_Acceptor, Port} = ensure_tcp_listener(),
-    
-    {ok, Hostname} = inet:gethostname(),
-    
-    i("try connect"),
-    Opts = [{host, Hostname}, {port, Port}, {module, ?MODULE}], 
-    Conn = case connect(Opts) of
-	       {ok, C} ->
-		   C;
-	       Error ->
-		   ?FAIL({failed_connecting, Error})
-	   end,
-    i("connected: ~p", [Conn]),
-    
-    %% Up for connect
-    receive
-	{diameter, {up, Host, Port}} ->
-	    i("Received expected connect up (~p:~p)", [Host, Port]),
-	    ok
-    after 5000 ->
-	    ?FAIL(connect_up_confirmation_timeout)
-    end,
-
-    %% Up for accept
-    receive
-	{diameter, {up, _ConnPid}} ->
-	    i("Received expected accept up"),
-	    ok
-    after 5000 ->
-	    ?FAIL(acceptor_up_confirmation_timeout)
-    end,
-
-    i("try disconnect"),
-    diameter_tcp:disconnect(Conn),
-    ensure_tcp_transport_stopped(TcpTransport),
-    ensure_transport_stopped(Transport),
-    i("done"),
-    ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Plain start and stop of TCP transport
-%% 
-
-simple_send_and_recv(suite) ->
-    [];
-simple_send_and_recv(doc) ->
-    [];
-simple_send_and_recv(Config) when is_list(Config) ->
-
-    ?SKIP(not_yet_implemented),
-
-    %% This has been changed *a lot* since it was written...
-
-    process_flag(trap_exit, true),
-    %% --------------------------------------------------
-    %% Start the TCP transport sub-system
-    %% 
-
-    Transport = ensure_transport_started(),
-    TcpTransport = ensure_tcp_transport_started(),
-
-    {_Acceptor, Port} = ensure_tcp_listener(),
-    
-    {ok, Hostname} = inet:gethostname(),
-    
-    i("try connect"),
-    Opts = [{host, Hostname}, {port, Port}, {module, ?MODULE}], 
-    Conn = case connect(Opts) of
-	       {ok, C1} ->
-		   C1;
-	       Error ->
-		   ?FAIL({failed_connecting, Error})
-	   end,
-    i("connected: ~p", [Conn]),
-    
-    %% Up for connect
-    receive
-	{diameter, {up, Host, Port}} ->
-	    i("Received expected connect up (~p:~p)", [Host, Port]),
-	    ok
-    after 5000 ->
-	    ?FAIL(connect_up_confirmation_timeout)
-    end,
-
-    %% Up for accept
-    APid = 
-	receive
-	    {diameter, {up, C2}} ->
-		i("Received expected accept up"),
-		C2
-	after 5000 ->
-		?FAIL(acceptor_up_confirmation_timeout)
-	end,
- 
-    %% --------------------------------------------------
-    %% Start some stuff needed for the codec to run
-    %% 
-
-    i("start persistent table"),
-    {ok, _Pers}    = diameter_persistent_table:start_link(),
-
-    i("start session"),
-    {ok, _Session} = diameter_session:start_link(),
-
-    i("try decode a (DWR) message"),
-    Base = diameter_gen_base_rfc3588,
-    DWR  = ['DWR', 
-	    {'Origin-Host',     Hostname}, 
-	    {'Origin-Realm',    "whatever-realm"}, 
-	    {'Origin-State-Id', [10]}],
-
-    #diameter_packet{msg = Msg} = diameter_codec:encode(Base, DWR),
-
-
-    %% --------------------------------------------------
-    %% Now try to send the message
-    %% 
-    %% This is not the codec-test suite, so we dont really care what we 
-    %% send, as long as it encoded/decodes correctly in the transport
-    %% 
-
-    i("try send from connect side"),
-    ok = diameter_tcp:send_message(Conn, Msg),
-
-    %% Wait for data on Accept side
-    APkt = 
-	receive
-	    {diameter, {recv, A}} ->
-		i("[accept] Received expected data message: ~p", [A]),
-		A
-	after 5000 ->
-		?FAIL(acceptor_up_confirmation_timeout)
-	end,
-    
-    %% Send the same message back, just to have something to send...
-    i("try send (\"reply\") from accept side"),
-    ok = diameter_tcp:send_message(APid, APkt),
-
-    %% Wait for data on Connect side
-    receive
-	{diameter, {recv, B}} ->
-	    i("[connect] Received expected data message: ~p", [B]),
-	    ok
-    after 5000 ->
-	    ?FAIL(acceptor_up_confirmation_timeout)
-    end,  
-
-    i("we are done - now close shop"),
-    diameter_session:stop(),
-    diameter_persistent_table:stop(),
-
-    ensure_tcp_transport_stopped(TcpTransport),
-    ensure_transport_stopped(Transport),
-    i("done"),
-    ok.
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-ensure_transport_started() ->
-%%     i("start diameter transport (top) supervisor"),
-    case diameter_transport_sup:start_link() of
-	{ok, TransportSup} ->
-	    TransportSup;
-	Error ->
-	    ?FAIL({failed_starting_transport_sup, Error})
-    end.
-
-ensure_transport_stopped(Pid) when is_pid(Pid) ->
-%%     i("stop diameter transport (top) supervisor"),
-    Stop = fun(P) -> exit(P, kill) end,
-    ensure_stopped(Pid, Stop, failed_stopping_transport_sup).
-
-ensure_tcp_transport_started() ->
-%%     i("start diameter TCP transport"),
-    case diameter_tcp:start_transport() of
-	{ok, TcpTransport} when is_pid(TcpTransport) ->
-	    TcpTransport;
-	Error ->
-	    ?FAIL({failed_starting_transport, Error})
-    end.
-
-ensure_tcp_transport_stopped(Pid) when is_pid(Pid) ->
-%%     i("stop diameter TCP transport supervisor"),
-    Stop = fun(P) -> diameter_tcp:stop_transport(P) end,
-    ensure_stopped(Pid, Stop, failed_stopping_tcp_transport).
-
-
-ensure_tcp_listener() ->
-%%     i("create diameter TCP transport listen socket"),
-    case listen([{port, 0}]) of
-	{ok, Acceptor} ->
-	    [{Acceptor, Info}] = diameter_tcp:which_listeners(),
-	    case lists:keysearch(socket, 1, Info) of
-		{value, {_, Listen}} ->
-		    {ok, Port} = inet:port(Listen),
-		    {Acceptor, Port};
-		_ ->
-		    ?FAIL({failed_retrieving_listen_socket, Info})
-	    end;
-	Error ->
-	    ?FAIL({failed_creating_listen_socket, Error})
-    end.
-
-
-ensure_stopped(Pid, Stop, ReasonTag) when is_pid(Pid) ->
-%%     i("ensure_stopped -> create monitor to ~p", [Pid]),
-    Ref = erlang:monitor(process, Pid),
-%%     i("ensure_stopped -> try stop"),
-    Stop(Pid), 
-%%     i("ensure_stopped -> await DOWN message"),
-    receive
-	{'DOWN', Ref, process, Pid, _} ->
-%% 	    i("ensure_stopped -> received DOWN message"),
-	    ok
-    after 5000 ->
-%% 	    i("ensure_stopped -> timeout"),
-	    ?FAIL({ReasonTag, Pid})
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-listen(Opts) ->
-    diameter_tcp:listen([{module, ?MODULE} | Opts]).
-
-connect(Opts) ->
-    diameter_tcp:connect([{module, ?MODULE} | Opts]).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-up(Pid, Host, Port) ->
-    Pid ! {diameter, {up, Host, Port}},
-    ok.
-
-up(Pid) ->
-    Pid ! {diameter, {up, self()}},
-    ok.
-
-recv(Pid, Pkt) ->
-    Pid ! {diameter, {recv, Pkt}}.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-i(F) ->
-    i(F, []).
-
-i(F, A) ->
-    io:format(F ++ "~n", A).
-
-
-ok({ok, Whatever}) ->
-    Whatever;
-ok(Crap) ->
-    Crap.
-
-
diff --git a/lib/diameter/test/diameter_test_lib.erl b/lib/diameter/test/diameter_test_lib.erl
deleted file mode 100644
index 3d46236526..0000000000
--- a/lib/diameter/test/diameter_test_lib.erl
+++ /dev/null
@@ -1,478 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2011. 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.
-%% 
-%% %CopyrightEnd%
-%%
-
-%% 
-%%----------------------------------------------------------------------
-%% Purpose: Lightweight test server
-%%----------------------------------------------------------------------
-%% 
-
--module(diameter_test_lib).
-
--export([
-	 sleep/1,
-	 
-	 hours/1,
-	 minutes/1,
-	 seconds/1,
-
-	 key1search/2, 
-
-	 non_pc_tc_maybe_skip/4,
-	 os_based_skip/1,
-
-	 fail/3, 
-	 skip/3, 
-	 fatal_skip/3,
-	 
-	 log/4, 
-	 error/3,
-
-	 flush/0,
-
-	 proxy_start/1, proxy_start/2, 
-	 proxy_init/2,
-
-	 still_alive/1, 
-
-	 prepare_test_case/5,
-	 lookup_config/2, 
-
-	 mk_nodes/2, start_nodes/3,
-
-	 display_system_info/1, display_system_info/2, display_system_info/3, 
-	 display_alloc_info/0,
-	 alloc_info/0,
-
-	 report_event/3
-	 
-	]).
-
--include("diameter_test_lib.hrl").
-
--record('REASON', {mod, line, desc}).
-
-
-%% ----------------------------------------------------------------
-%% Time related function
-%%
-
-sleep(infinity) ->
-    receive
-    after infinity ->
-            ok
-    end;
-sleep(MSecs) ->
-    receive
-    after trunc(MSecs) ->
-            ok
-    end,
-    ok.
-
-
-hours(N)   -> trunc(N * 1000 * 60 * 60).
-minutes(N) -> trunc(N * 1000 * 60).
-seconds(N) -> trunc(N * 1000).
-
-
-%% ----------------------------------------------------------------
-
-key1search(Key, L) ->
-    case lists:keysearch(Key, 1, L) of
-	undefined ->
-	    fail({not_found, Key, L}, ?MODULE, ?LINE);
-	{value, {Key, Value}} ->
-	    Value
-    end.
-
-
-%% ----------------------------------------------------------------
-%% Conditional skip of testcases
-%%
-
-non_pc_tc_maybe_skip(Config, Condition, File, Line) 
-  when is_list(Config) andalso is_function(Condition) ->
-    %% Check if we shall skip the skip
-    case os:getenv("TS_OS_BASED_SKIP") of
-	"false" ->
-	    ok;
-	_ ->
-	    case lists:keysearch(ts, 1, Config) of
-		{value, {ts, megaco}} ->
-		    %% Always run the testcase if we are using our own 
-		    %% test-server...
-		    ok;
-		_ ->
-		    case (catch Condition()) of
-			true ->
-			    skip(non_pc_testcase, File, Line);
-			_ ->
-			    ok
-		    end
-	    end
-    end.
-
-
-os_based_skip(any) ->
-    true;
-os_based_skip(Skippable) when is_list(Skippable) ->
-    {OsFam, OsName} = 
-	case os:type() of
-	    {_Fam, _Name} = FamAndName ->
-		FamAndName;
-	    Fam ->
-		{Fam, undefined}
-	end,
-    case lists:member(OsFam, Skippable) of
-	true ->
-	    true;
-	false ->
-	    case lists:keysearch(OsFam, 1, Skippable) of
-		{value, {OsFam, OsName}} ->
-		    true;
-		{value, {OsFam, OsNames}} when is_list(OsNames) ->
-		    lists:member(OsName, OsNames);
-		_ ->
-		    false
-	    end
-    end;
-os_based_skip(_) ->
-    false.
-    
-	    
-%%----------------------------------------------------------------------
-
-error(Actual, Mod, Line) ->
-    global:send(megaco_global_logger, {failed, Mod, Line}),
-    log("<ERROR> Bad result: ~p~n", [Actual], Mod, Line),
-    Label = lists:concat([Mod, "(", Line, ") unexpected result"]),
-    report_event(60, Label, [{line, Mod, Line}, {error, Actual}]),
-    case global:whereis_name(megaco_test_case_sup) of
-	undefined -> 
-	    ignore;
-	Pid -> 
-	    Fail = #'REASON'{mod = Mod, line = Line, desc = Actual},
-	    Pid ! {fail, self(), Fail}
-    end,
-    Actual.
-
-log(Format, Args, Mod, Line) ->
-    case global:whereis_name(megaco_global_logger) of
-	undefined ->
-	    io:format(user, "~p~p(~p): " ++ Format, 
-		      [self(), Mod, Line] ++ Args);
-	Pid ->
-	    io:format(Pid, "~p~p(~p): " ++ Format, 
-		      [self(), Mod, Line] ++ Args)
-    end.
-
-skip(Actual, File, Line) ->
-    log("Skipping test case~n", [], File, Line),
-    String = lists:flatten(io_lib:format("Skipping test case ~p(~p): ~p~n",
-					 [File, Line, Actual])),
-    exit({skipped, String}).
-
-fatal_skip(Actual, File, Line) ->
-    error(Actual, File, Line),
-    exit(shutdown).
-
-
-fail(Actual, File, Line) ->
-    log("Test case failing~n", [], File, Line),
-    String = lists:flatten(io_lib:format("Test case failing ~p (~p): ~p~n",
-					 [File, Line, Actual])),
-    exit({suite_failed, String}).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Flush the message queue and return its messages
-
-flush() ->
-    receive
-	Msg ->
-	    [Msg | flush()]
-    after 1000 ->
-	    []
-    end.
-	    
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The proxy process
-
-proxy_start(ProxyId) ->
-    spawn_link(?MODULE, proxy_init, [ProxyId, self()]).
-
-proxy_start(Node, ProxyId) ->
-    spawn_link(Node, ?MODULE, proxy_init, [ProxyId, self()]).
-
-proxy_init(ProxyId, Controller) ->
-    process_flag(trap_exit, true),
-    ?LOG("[~p] proxy started by ~p~n",[ProxyId, Controller]),
-    proxy_loop(ProxyId, Controller).
-
-proxy_loop(OwnId, Controller) ->
-    receive
-	{'EXIT', Controller, Reason} ->
-	    p("proxy_loop -> received exit from controller"
-	      "~n   Reason: ~p"
-	      "~n", [Reason]),
-	    exit(Reason);
-	{apply, Fun} ->
-	    p("proxy_loop -> received apply request~n", []),
-	    Res = Fun(),
-	    p("proxy_loop -> apply result: "
-	      "~n   ~p"
-	      "~n", [Res]),
-	    Controller ! {res, OwnId, Res},
-	    proxy_loop(OwnId, Controller);
-	OtherMsg ->
-	    p("proxy_loop -> received unknown message: "
-	      "~n  OtherMsg: ~p"
-	      "~n", [OtherMsg]),
-	    Controller ! {msg, OwnId, OtherMsg},
-	    proxy_loop(OwnId, Controller)
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Check if process is alive and kicking
-still_alive(Pid) ->   
-    case catch erlang:is_process_alive(Pid) of % New BIF in Erlang/OTP R5
-	true -> 
-	    true;
-	false -> 
-	    false;
-	{'EXIT', _} -> % Pre R5 backward compatibility 
-	    case process_info(Pid, message_queue_len) of
-		undefined -> false;
-		_ -> true
-	    end 
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-mk_nodes(0, Nodes) ->
-    Nodes;
-mk_nodes(N, []) ->
-    mk_nodes(N - 1, [node()]);
-mk_nodes(N, Nodes) when N > 0 ->
-    Head = hd(Nodes),
-    [Name, Host] = node_to_name_and_host(Head),
-    Nodes ++ [mk_node(I, Name, Host) || I <- lists:seq(1, N)].
-
-mk_node(N, Name, Host) ->
-    list_to_atom(lists:concat([Name ++ integer_to_list(N) ++ "@" ++ Host])).
-    
-%% Returns [Name, Host]    
-node_to_name_and_host(Node) ->
-    string:tokens(atom_to_list(Node), [$@]).
-
-start_nodes([Node | Nodes], File, Line) ->
-    case net_adm:ping(Node) of
-	pong ->
-	    start_nodes(Nodes, File, Line);
-	pang ->
-	    [Name, Host] = node_to_name_and_host(Node),
-	    case slave:start_link(Host, Name) of
-		{ok, NewNode} when NewNode =:= Node ->
-		    Path = code:get_path(),
-		    {ok, Cwd} = file:get_cwd(),
-		    true = rpc:call(Node, code, set_path, [Path]),
-		    ok = rpc:call(Node, file, set_cwd, [Cwd]),
-		    true = rpc:call(Node, code, set_path, [Path]),
-		    {_, []} = rpc:multicall(global, sync, []),
-		    start_nodes(Nodes, File, Line);
-		Other ->
-		    fatal_skip({cannot_start_node, Node, Other}, File, Line)
-	    end
-    end;
-start_nodes([], _File, _Line) ->
-    ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-display_alloc_info() ->
-    io:format("Allocator memory information:~n", []),
-    AllocInfo = alloc_info(),
-    display_alloc_info(AllocInfo).
-
-display_alloc_info([]) ->
-    ok;
-display_alloc_info([{Alloc, Mem}|AllocInfo]) ->
-    io:format("  ~15w: ~10w~n", [Alloc, Mem]),
-    display_alloc_info(AllocInfo).
-    
-alloc_info() ->
-    case erlang:system_info(allocator) of
-	{_Allocator, _Version, Features, _Settings} ->
-	    alloc_info(Features);
-	_ ->
-	    []
-    end.
-
-alloc_info(Allocators) ->
-    Allocs = [temp_alloc, sl_alloc, std_alloc, ll_alloc, eheap_alloc, 
-	      ets_alloc, binary_alloc, driver_alloc], 
-    alloc_info(Allocators, Allocs, []).
-
-alloc_info([], _, Acc) ->
-    lists:reverse(Acc);
-alloc_info([Allocator | Allocators], Allocs, Acc) ->
-    case lists:member(Allocator, Allocs) of
-	true ->
-	    Instances0 = erlang:system_info({allocator, Allocator}),
-	    Instances = 
-		if 
-		    is_list(Instances0) ->
-			[Instance || Instance <- Instances0, 
-				     element(1, Instance) =:= instance];
-		    true ->
-			[]
-		end,
-	    AllocatorMem = alloc_mem_info(Instances),
-	    alloc_info(Allocators, Allocs, [{Allocator, AllocatorMem} | Acc]);
-
-	false ->
-	    alloc_info(Allocators, Allocs, Acc)
-    end.
-    
-alloc_mem_info(Instances) ->
-    alloc_mem_info(Instances, []).
-
-alloc_mem_info([], Acc) ->
-    lists:sum([Mem || {instance, _, Mem} <- Acc]);
-alloc_mem_info([{instance, N, Info}|Instances], Acc) ->
-    InstanceMemInfo = alloc_instance_mem_info(Info),
-    alloc_mem_info(Instances, [{instance, N, InstanceMemInfo} | Acc]).
-
-alloc_instance_mem_info(InstanceInfo) ->
-    MBCS = alloc_instance_mem_info(mbcs, InstanceInfo),
-    SBCS = alloc_instance_mem_info(sbcs, InstanceInfo),
-    MBCS + SBCS.
-
-alloc_instance_mem_info(Key, InstanceInfo) ->
-    case lists:keysearch(Key, 1, InstanceInfo) of
-	{value, {Key, Info}} ->
-	    case lists:keysearch(blocks_size, 1, Info) of
-		{value, {blocks_size, Mem, _, _}} ->
-		    Mem;
-		_ ->
-		    0
-	    end;
-	_ ->
-	    0
-    end.
-
-
-display_system_info(WhenStr) ->
-    display_system_info(WhenStr, undefined, undefined).
-
-display_system_info(WhenStr, undefined, undefined) ->
-    display_system_info(WhenStr, "");
-display_system_info(WhenStr, Mod, Func) ->
-    ModFuncStr = lists:flatten(io_lib:format(" ~w:~w", [Mod, Func])),
-    display_system_info(WhenStr, ModFuncStr).
-
-display_system_info(WhenStr, ModFuncStr) ->
-    Fun = fun(F) -> case (catch F()) of
-			{'EXIT', _} ->
-			    undefined;
-			Res ->
-			    Res
-		    end
-	  end,
-    ProcCount    = Fun(fun() -> erlang:system_info(process_count) end),
-    ProcLimit    = Fun(fun() -> erlang:system_info(process_limit) end),
-    ProcMemAlloc = Fun(fun() -> erlang:memory(processes) end),
-    ProcMemUsed  = Fun(fun() -> erlang:memory(processes_used) end),
-    ProcMemBin   = Fun(fun() -> erlang:memory(binary) end),
-    ProcMemTot   = Fun(fun() -> erlang:memory(total) end),
-    %% error_logger:info_msg(
-    io:format("~n"
-	      "~n*********************************************"
-	      "~n"
-	      "System info ~s~s => "
-	      "~n   Process count:        ~w"
-              "~n   Process limit:        ~w"
-              "~n   Process memory alloc: ~w"
-              "~n   Process memory used:  ~w"
-              "~n   Memory for binaries:  ~w"
-              "~n   Memory total:         ~w"
-	      "~n"
-	      "~n*********************************************"
-	      "~n"
-	      "~n", [WhenStr, ModFuncStr, 
-		     ProcCount, ProcLimit, ProcMemAlloc, ProcMemUsed, 
-		     ProcMemBin, ProcMemTot]),
-    ok.
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-prepare_test_case(Actions, N, Config, File, Line) ->
-    OrigNodes = lookup_config(nodes, Config),
-    TestNodes = lookup_config(nodenames, Config), %% For testserver
-    This = node(),
-    SomeNodes = OrigNodes ++ (TestNodes -- OrigNodes),
-    AllNodes = [This | (SomeNodes -- [This])],
-    Nodes = pick_n_nodes(N, AllNodes, File, Line),
-    start_nodes(Nodes, File, Line),
-    do_prepare_test_case(Actions, Nodes, Config, File, Line).
-
-do_prepare_test_case([init | Actions], Nodes, Config, File, Line) ->
-    process_flag(trap_exit, true),
-    megaco_test_lib:flush(),
-    do_prepare_test_case(Actions, Nodes, Config, File, Line);
-do_prepare_test_case([{stop_app, App} | Actions], Nodes, Config, File, Line) ->
-    _Res = rpc:multicall(Nodes, application, stop, [App]),
-    do_prepare_test_case(Actions, Nodes, Config, File, Line);
-do_prepare_test_case([], Nodes, _Config, _File, _Line) ->
-    Nodes.
-
-pick_n_nodes(all, AllNodes, _File, _Line) ->
-    AllNodes;
-pick_n_nodes(N, AllNodes, _File, _Line)
-  when is_integer(N) andalso (length(AllNodes) >= N) ->
-    AllNodes -- lists:nthtail(N, AllNodes);
-pick_n_nodes(N, AllNodes, File, Line) ->
-    fatal_skip({too_few_nodes, N, AllNodes}, File, Line).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-lookup_config(Key, Config) ->
-    case lists:keysearch(Key, 1, Config) of
-	{value, {Key, Val}} ->
-	    Val;
-	_ ->
-	    []
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-report_event(_Severity, _Label, _Content) ->
-    %% diameter:report_event(Severity, Label, Content).
-    hopefully_traced.
-
-
-p(F,A) ->
-    io:format("~p" ++ F ++ "~n", [self()|A]).
diff --git a/lib/diameter/test/diameter_test_lib.hrl b/lib/diameter/test/diameter_test_lib.hrl
deleted file mode 100644
index 0b86f38de7..0000000000
--- a/lib/diameter/test/diameter_test_lib.hrl
+++ /dev/null
@@ -1,106 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Define common macros for testing
-%%----------------------------------------------------------------------
-%% 
-
--define(FLUSH(),        diameter_test_lib:flush()).
-
--define(SLEEP(MSEC),    diameter_test_lib:sleep(MSEC)).
--define(M(),            diameter_test_lib:millis()).
--define(MDIFF(A,B),     diameter_test_lib:millis_diff(A,B)).
-
--define(HOURS(T),       diameter_test_lib:hours(T)).
--define(MINUTES(T),     diameter_test_lib:minutes(T)).
--define(SECONDS(T),     diameter_test_lib:seconds(T)).
-
--define(KEY1SEARCH(Key, L), diameter_test_lib:key1search(Key, L)).
-
-
--define(APPLY(Proxy, Fun),
-	Proxy ! {apply, Fun}).
-
--define(LOG(Format, Args),
-	diameter_test_lib:log(Format, Args, ?MODULE, ?LINE)).
-
--define(ERROR(Reason),
-	diameter_test_lib:error(Reason, ?MODULE, ?LINE)).
-
--define(OS_BASED_SKIP(Skippable),
-	diameter_test_lib:os_based_skip(Skippable)).
-
--define(NON_PC_TC_MAYBE_SKIP(Config, Condition),
-	diameter_test_lib:non_pc_tc_maybe_skip(Config, Condition, ?MODULE, ?LINE)).
-
--define(FAIL(Reason),
-	diameter_test_lib:fail(Reason, ?MODULE, ?LINE)).
-
--define(SKIP(Reason),
-	diameter_test_lib:skip(Reason, ?MODULE, ?LINE)).
-
--define(VERIFYL(Expected, Expr),
-	fun(A,B) when list(A), list(B) ->
-		A1 = lists:sort(A),
-		B1 = lists:sort(B),
-		case A1 of
-		    B1 -> ?LOG("Ok, ~p~n", [B]);
-		    _  -> ?ERROR(B)
-		end,
-		B;
-	   (A,A) ->
-		?LOG("Ok, ~p~n", [A]),
-		A;
-	   (A,B) ->
-		?ERROR(B),
-		B
-	end(Expected, (catch Expr))).
-
--define(VERIFY(Expected, Expr),
-	fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Expected -> ?LOG("Ok, ~p~n", [AcTuAlReS]);
-		    _        ->	?ERROR(AcTuAlReS)
-		end,
-		AcTuAlReS
-	end()).
-
--define(RECEIVE(Expected),
-	?VERIFY(Expected, ?FLUSH())).
-
--define(MULTI_RECEIVE(Expected),
-	?VERIFY(lists:sort(Expected), lists:sort(?FLUSH()))).
-
--define(ACQUIRE_NODES(N, Config),
-	diameter_test_lib:prepare_test_case([init, {stop_app, diameter}],
-					    N, Config, ?FILE, ?LINE)).
-
-
--define(REPORT_IMPORTANT(Label, Content), ?REPORT_EVENT(20, Label, Content)).
--define(REPORT_VERBOSE(Label, Content),   ?REPORT_EVENT(40, Label, Content)).
--define(REPORT_DEBUG(Label, Content),     ?REPORT_EVENT(60, Label, Content)).
--define(REPORT_TRACE(Label, Content),     ?REPORT_EVENT(80, Label, Content)).
-
--define(REPORT_EVENT(Severity, Label, Content),
-	diameter_test_lib:report_event(Severity, Label, 
-				       [{line, ?MODULE, ?LINE} | Content])).
-
diff --git a/lib/diameter/test/diameter_test_server.erl b/lib/diameter/test/diameter_test_server.erl
deleted file mode 100644
index e2ff73fb8e..0000000000
--- a/lib/diameter/test/diameter_test_server.erl
+++ /dev/null
@@ -1,551 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Lightweight test server
-%%----------------------------------------------------------------------
-
--module(diameter_test_server).
-
--export([
-	 t/1, t/2,
-
-	 init_per_testcase/2, 
-	 fin_per_testcase/2
-	]).
-
--include("diameter_test_lib.hrl").
-
-
--define(GLOGGER, diameter_global_logger).
-
-
-%% ----------------------------------------------------------------
-%%
-
-t([Case]) when is_atom(Case) ->
-    t(Case);
-t(Case) ->
-    process_flag(trap_exit, true),
-    MEM = fun() -> case (catch erlang:memory()) of
-			{'EXIT', _} ->
-			    [];
-			Res ->
-			    Res
-		    end
-	  end,
-    Alloc1 = diameter_test_lib:alloc_info(),
-    Mem1   = MEM(),
-    Res    = lists:flatten(t(Case, default_config())),
-    Alloc2 = diameter_test_lib:alloc_info(),
-    Mem2   = MEM(),
-    %% io:format("Res: ~p~n", [Res]),
-    display_result(Res, Alloc1, Mem1, Alloc2, Mem2),
-    Res.
-
-
-groups(Mod) when is_atom(Mod) ->
-    try Mod:groups() of
-        Groups when is_list(Groups) ->
-            Groups;
-        BadGroups ->
-            exit({bad_groups, Mod, BadGroups})
-    catch
-        _:_ ->
-            []
-    end.
-
-init_suite(Mod, Config) ->
-    io:format("~w:init_suite -> entry with"
-	      "~n   Mod:    ~p"
-	      "~n   Config: ~p"
-	      "~n", [?MODULE, Mod, Config]),
-    Mod:init_per_suite(Config).
-
-end_suite(Mod, Config) ->
-    Mod:end_per_suite(Config).
-
-init_group(Mod, Group, Config) ->
-    Mod:init_per_group(Group, Config).
-
-end_group(Mod, Group, Config) ->
-    Mod:init_per_group(Group, Config).
-
-%% This is for sub-SUITEs
-t({_Mod, {NewMod, all}, _Groups}, _Config) when is_atom(NewMod) ->
-    io:format("~w:t(all) -> entry with"
-	      "~n   NewMod: ~p"
-	      "~n", [?MODULE, NewMod]),
-    t(NewMod);
-t({Mod, {group, Name} = Group, Groups}, Config)
-  when is_atom(Mod) andalso is_atom(Name) andalso is_list(Groups) ->
-    io:format("~w:t(group) -> entry with"
-	      "~n   Mod:    ~p"
-	      "~n   Name:   ~p"
-	      "~n   Groups: ~p"
-	      "~n   Config: ~p"
-	      "~n", [?MODULE, Mod, Name, Groups, Config]),
-    case lists:keysearch(Name, 1, Groups) of
-        {value, {Name, _Props, GroupsAndCases}} ->
-            try init_group(Mod, Name, Config) of
-                Config2 when is_list(Config2) ->
-                    Res = [t({Mod, Case, Groups}, Config2) ||
-                              Case <- GroupsAndCases],
-                    (catch end_group(Mod, Name, Config2)),
-                    Res;
-                Error ->
-                    io:format(" => group (~w) init failed: ~p~n",
-                              [Name, Error]),
-                    [{failed, {Mod, Group}, Error}]
-            catch
-                exit:{skipped, SkipReason} ->
-                    io:format(" => skipping group: ~p~n", [SkipReason]),
-                    [{skipped, {Mod, Group}, SkipReason, 0}];
-                exit:{undef, _} ->
-                    [t({Mod, Case, Groups}, Config) ||
-			Case <- GroupsAndCases];
-                T:E ->
-                    [{failed, {Mod, Group}, {T,E}, 0}]
-            end;
-        false ->
-            exit({unknown_group, Mod, Name, Groups})
-    end;
-t({Mod, Fun, _}, Config)
-  when is_atom(Mod) andalso is_atom(Fun) ->
-    io:format("~w:t -> entry with"
-	      "~n   Mod:    ~p"
-	      "~n   Fun:    ~p"
-	      "~n   Config: ~p"
-	      "~n", [?MODULE, Mod, Fun, Config]),
-    case catch apply(Mod, Fun, [suite]) of
-        [] ->
-            io:format("Eval:   ~p:", [{Mod, Fun}]),
-            Res = eval(Mod, Fun, Config),
-            {R, _, _, _} = Res,
-            io:format(" ~p~n", [R]),
-            Res;
-
-        Cases when is_list(Cases) ->
-            io:format("Expand: ~p ...~n", [{Mod, Fun}]),
-            Map = fun(Case) when is_atom(Case) -> {Mod, Case};
-                     (Case) -> Case
-                  end,
-            t(lists:map(Map, Cases), Config);
-
-        {'EXIT', {undef, _}} ->
-            io:format("Undefined:   ~p~n", [{Mod, Fun}]),
-            [{nyi, {Mod, Fun}, ok, 0}];
-
-        Error ->
-            io:format("Ignoring:   ~p: ~p~n", [{Mod, Fun}, Error]),
-            [{failed, {Mod, Fun}, Error, 0}]
-    end;
-t(Mod, Config) when is_atom(Mod) ->
-    io:format("~w:t -> entry with"
-	      "~n   Mod:    ~p"
-	      "~n   Config: ~p"
-	      "~n", [?MODULE, Mod, Config]),
-    %% This is assumed to be a test suite, so we start by calling
-    %% the top test suite function(s) (all/0 and groups/0).
-    case (catch Mod:all()) of
-        Cases when is_list(Cases) ->
-            %% The list may contain atoms (actual test cases) and
-            %% group-tuples (a tuple naming a group of test cases).
-            %% A group is defined by the (optional) groups/0 function.
-	    io:format("~w:t -> suite all ok"
-		      "~n   Cases: ~p"
-		      "~n", [?MODULE, Cases]),
-            Groups = groups(Mod),
-	    io:format("~w:t -> "
-		      "~n   Groups: ~p"
-		      "~n", [?MODULE, Groups]),
-            try init_suite(Mod, Config) of
-                Config2 when is_list(Config2) ->
-		    io:format("~w:t -> suite init ok"
-			      "~n   Config2: ~p"
-			      "~n", [?MODULE, Config2]),
-                    Res = [t({Mod, Case, Groups}, Config2) || Case <- Cases],
-                    (catch end_suite(Mod, Config2)),
-                    Res;
-                Error ->
-                    io:format(" => suite init failed: ~p~n", [Error]),
-                    [{failed, {Mod, init_per_suite}, Error}]
-            catch
-                exit:{skipped, SkipReason} ->
-                    io:format(" => skipping suite: ~p~n", [SkipReason]),
-                    [{skipped, {Mod, init_per_suite}, SkipReason, 0}];
-                exit:{undef, _} ->
-                    io:format("~w:t -> suite init failed. exit undef(1)~n", [?MODULE]),
-                    [t({Mod, Case, Groups}, Config) || Case <- Cases];
-                exit:undef ->
-                    io:format("~w:t -> suite init failed. exit undef(2)~n", [?MODULE]),
-                    [t({Mod, Case, Groups}, Config) || Case <- Cases];
-                T:E ->
-                    io:format("~w:t -> suite init failed. "
-			      "~n   T: ~p"
-			      "~n   E: ~p"
-			      "~n", [?MODULE, T,E]),
-                    [{failed, {Mod, init_per_suite}, {T,E}, 0}]
-            end;
-        {'EXIT', {undef, _}} ->
-            io:format("Undefined:   ~p~n", [{Mod, all}]),
-            [{nyi, {Mod, all}, ok, 0}];
-
-        Crap ->
-	    io:format("~w:t -> suite all failed: "
-		      "~n   Crap: ~p"
-		      "~n", [?MODULE, Crap]),
-            Crap
-    end;
-t(Bad, _Config) ->
-    io:format("~w:t -> entry with"
-	      "~n   Bad: ~p"
-	      "~n", [?MODULE, Bad]),
-    [{badarg, Bad, ok, 0}].
-
-eval(Mod, Fun, Config) ->
-    TestCase = {?MODULE, Mod, Fun},
-    Label = lists:concat(["TEST CASE: ", Fun]),
-    ?REPORT_VERBOSE(Label ++ " started", [TestCase, Config]),
-    global:register_name(diameter_test_case_sup, self()),
-    Flag = process_flag(trap_exit, true),
-    put(diameter_test_server, true),
-    Config2 = Mod:init_per_testcase(Fun, Config),
-    Self = self(), 
-    Pid = spawn_link(fun() -> do_eval(Self, Mod, Fun, Config2) end),
-    R = wait_for_evaluator(Pid, Mod, Fun, Config2, []),
-    Mod:fin_per_testcase(Fun, Config2),
-    erase(diameter_test_server),    
-    global:unregister_name(diameter_test_case_sup),
-    process_flag(trap_exit, Flag),
-    R.
-
-wait_for_evaluator(Pid, Mod, Fun, Config, Errors) ->
-    wait_for_evaluator(Pid, Mod, Fun, Config, Errors, 0).
-wait_for_evaluator(Pid, Mod, Fun, Config, Errors, AccTime) ->
-    TestCase = {?MODULE, Mod, Fun},
-    Label = lists:concat(["TEST CASE: ", Fun]),
-    receive
-	{done, Pid, ok, Time} when Errors =:= [] ->
-	    ?REPORT_VERBOSE(Label ++ " ok", 
-			    [{test_case, TestCase}, {config, Config}]),
-	    {ok, {Mod, Fun}, Errors, Time};
-	{done, Pid, ok, Time} ->
-	    ?REPORT_VERBOSE(Label ++ " failed", 
-			    [{test_case, TestCase}, {config, Config}]),
-	    {failed, {Mod, Fun}, Errors, Time};
-	{done, Pid, {ok, _}, Time} when Errors =:= [] ->
-	    ?REPORT_VERBOSE(Label ++ " ok",
-			    [{test_case, TestCase}, {config, Config}]),
-	    {ok, {Mod, Fun}, Errors, Time};
-	{done, Pid, {ok, _}, Time} ->
-	    ?REPORT_VERBOSE(Label ++ " failed",
-			    [{test_case, TestCase}, {config, Config}]),
-	    {failed, {Mod, Fun}, Errors, Time};
-	{done, Pid, Fail, Time} ->
-	    ?REPORT_IMPORTANT(Label ++ " failed",
-			      [{test_case, TestCase}, 
-			       {config,    Config}, 
-			       {return,    Fail}, 
-			       {errors,    Errors}]),
-	    {failed, {Mod, Fun}, Fail, Time};
-	{'EXIT', Pid, {skipped, Reason}, Time} -> 
-	    ?REPORT_IMPORTANT(Label ++ " skipped",
-			      [{test_case, TestCase}, 
-			       {config,    Config}, 
-			       {skipped,   Reason}]),
-	    {skipped, {Mod, Fun}, Errors, Time};
-	{'EXIT', Pid, Reason, Time} -> 
-	    ?REPORT_IMPORTANT(Label ++ " crashed",
-			      [{test_case, TestCase}, 
-			       {config,    Config}, 
-			       {'EXIT',    Reason}]),
-	    {crashed, {Mod, Fun}, [{'EXIT', Reason} | Errors], Time};
-	{fail, Pid, Reason, Time} ->
-	    wait_for_evaluator(Pid, Mod, Fun, Config, 
-			       Errors ++ [Reason], AccTime + Time)
-    end.
-
-do_eval(ReplyTo, Mod, Fun, Config) ->
-    diameter_test_lib:display_system_info("before", Mod, Fun),
-    case timer:tc(Mod, Fun, [Config]) of
-	{Time, {'EXIT', {skipped, Reason}}} ->
-	    display_tc_time(Time),
-	    diameter_test_lib:display_system_info("after (skipped)", Mod, Fun),
-	    ReplyTo ! {'EXIT', self(), {skipped, Reason}, Time};
-	{Time, {'EXIT', Reason}} ->
-	    display_tc_time(Time),
-	    diameter_test_lib:display_system_info("after (crashed)", Mod, Fun),
-	    ReplyTo ! {'EXIT', self(), Reason, Time};
-	{Time, Other} ->
-	    display_tc_time(Time),
-	    diameter_test_lib:display_system_info("after", Mod, Fun),
-	    ReplyTo ! {done, self(), Other, Time}
-    end,
-    unlink(ReplyTo),
-    exit(shutdown).
-
-
-display_tc_time(Time) ->
-    io:format("~n"
-	      "~n*********************************************"
-	      "~n"
-	      "~nTest case completion time: ~.3f sec (~w)"
-	      "~n", [(Time / 1000000), Time]),
-    ok.
-
-
-display_result(Res, Alloc1, Mem1, Alloc2, Mem2) ->
-    io:format("~nAllocator info: ~n", []),
-    display_alloc(Alloc1, Alloc2),
-    io:format("~nMemory info: ~n", []),
-    display_memory(Mem1, Mem2),
-    display_result(Res).
-
-display_alloc([], []) ->
-    io:format("-~n", []),
-    ok;
-display_alloc(A1, A2) ->
-    do_display_alloc(A1, A2).
-
-do_display_alloc([], _) ->
-    ok;
-do_display_alloc([{Alloc, Mem1}|AllocInfo1], AllocInfo2) ->
-    Mem2 = 
-	case lists:keysearch(Alloc, 1, AllocInfo2) of
-	    {value, {_, Val}} ->
-		Val;
-	    false ->
-		undefined
-	end,
-    io:format("~15w: ~10w -> ~w~n", [Alloc, Mem1, Mem2]),
-    do_display_alloc(AllocInfo1, AllocInfo2).
-
-display_memory([], []) ->
-    io:format("-~n", []),
-    ok;
-display_memory(Mem1, Mem2) ->
-    do_display_memory(Mem1, Mem2).
-
-
-do_display_memory([], _) ->
-    ok;
-do_display_memory([{Key, Mem1}|MemInfo1], MemInfo2) ->
-    Mem2 = 
-	case lists:keysearch(Key, 1, MemInfo2) of
-	    {value, {_, Val}} ->
-		Val;
-	    false ->
-		undefined
-	end,
-    io:format("~15w: ~10w -> ~w~n", [Key, Mem1, Mem2]),
-    do_display_memory(MemInfo1, MemInfo2).
-
-display_result([]) ->    
-    io:format("OK~n", []);
-display_result(Res) when is_list(Res) ->
-    Ok      = [{MF, Time} || {ok,  MF, _, Time}  <- Res],
-    Nyi     = [MF || {nyi, MF, _, _Time} <- Res],
-    Skipped = [{MF, Reason} || {skipped, MF, Reason, _Time} <- Res],
-    Failed  = [{MF, Reason} || {failed,  MF, Reason, _Time} <- Res],
-    Crashed = [{MF, Reason} || {crashed, MF, Reason, _Time} <- Res],
-    display_summery(Ok, Nyi, Skipped, Failed, Crashed),
-    display_ok(Ok),
-    display_skipped(Skipped),
-    display_failed(Failed),
-    display_crashed(Crashed).
-
-display_summery(Ok, Nyi, Skipped, Failed, Crashed) ->
-    io:format("~nTest case summery:~n", []),
-    display_summery(Ok,      "successfull"),
-    display_summery(Nyi,     "not yet implemented"),
-    display_summery(Skipped, "skipped"),
-    display_summery(Failed,  "failed"),
-    display_summery(Crashed, "crashed"),
-    io:format("~n", []).
-   
-display_summery(Res, Info) ->
-    io:format("  ~w test cases ~s~n", [length(Res), Info]).
-    
-display_ok([]) ->
-    ok;
-display_ok(Ok) ->
-    io:format("Ok test cases:~n", []),
-    F = fun({{M, F}, Time}) -> 
-		io:format("  ~w : ~w => ~.2f sec~n", [M, F, Time / 1000000]) 
-	end,
-    lists:foreach(F, Ok),
-    io:format("~n", []).
-
-display_skipped([]) ->
-    ok;
-display_skipped(Skipped) ->
-    io:format("Skipped test cases:~n", []),
-    F = fun({MF, Reason}) -> io:format("  ~p => ~p~n", [MF, Reason]) end,
-    lists:foreach(F, Skipped),
-    io:format("~n", []).
-
-
-display_failed([]) ->
-    ok;
-display_failed(Failed) ->
-    io:format("Failed test cases:~n", []),
-    F = fun({MF, Reason}) -> io:format("  ~p => ~p~n", [MF, Reason]) end,
-    lists:foreach(F, Failed),
-    io:format("~n", []).
-
-display_crashed([]) ->
-    ok;
-display_crashed(Crashed) ->
-    io:format("Crashed test cases:~n", []),
-    F = fun({MF, Reason}) -> io:format("  ~p => ~p~n", [MF, Reason]) end,
-    lists:foreach(F, Crashed),
-    io:format("~n", []).
-        
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Test server callbacks
-init_per_testcase(_Case, Config) ->
-    Pid = group_leader(),
-    Name = ?GLOGGER, 
-    case global:whereis_name(Name) of
-	undefined ->
-	    global:register_name(?GLOGGER, Pid);
-	Pid ->
-	    io:format("~w:init_per_testcase -> "
-		      "already registered to ~p~n", [?MODULE, Pid]),
-	    ok;
-	OtherPid when is_pid(OtherPid) ->
-	    io:format("~w:init_per_testcase -> "
-		      "already registered to other ~p (~p)~n", 
-		      [?MODULE, OtherPid, Pid]),
-	    exit({already_registered, {?GLOGGER, OtherPid, Pid}})
-    end,
-    set_kill_timer(Config).
-
-fin_per_testcase(_Case, Config) ->
-    Name = ?GLOGGER, 
-    case global:whereis_name(Name) of
-	undefined ->
-	    io:format("~w:fin_per_testcase -> already un-registered~n", 
-		      [?MODULE]),
-	    ok;
-	Pid when is_pid(Pid) ->
-	    global:unregister_name(?GLOGGER),
-	    ok
-    end,
-    reset_kill_timer(Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Set kill timer
-
-set_kill_timer(Config) ->
-    case init:get_argument(diameter_test_timeout) of
-	{ok, _} -> 
-	    Config;
-	_ ->
-	    Time = 
-		case lookup_config(tc_timeout, Config) of
-		    [] ->
-			timer:minutes(5);
-		    ConfigTime when is_integer(ConfigTime) ->
-			ConfigTime
-		end,
-	    Dog = 
-		case get(diameter_test_server) of
-		    true ->
-			Self = self(), 
-			spawn_link(fun() -> watchdog(Self, Time) end);
-		    _ ->
-			test_server:timetrap(Time)
-		end,
-	    [{kill_timer, Dog}|Config]
-		    
-	    
-    end.
-
-reset_kill_timer(Config) ->
-    DogKiller = 
-	case get(diameter_test_server) of
-	    true ->
-		fun(P) when is_pid(P) -> P ! stop;
-		   (_) -> ok 
-		end;
-	    _ ->
-		fun(Ref) -> test_server:timetrap_cancel(Ref) end
-	end,
-    case lists:keysearch(kill_timer, 1, Config) of
-	{value, {kill_timer, Dog}} ->
-	    DogKiller(Dog), 
-	    lists:keydelete(kill_timer, 1, Config);
-	_ ->
-	    Config
-    end.
-
-watchdog(Pid, Time) ->
-    erlang:now(),
-    receive
-	stop ->
-	    ok
-    after Time ->
-	    case (catch process_info(Pid)) of
-		undefined ->
-		    ok;
-		Info ->
-		    ?LOG("<ERROR> Watchdog in test case timed out "
-			"for ~p after ~p min"
-			 "~n~p"
-			 "~n",
-		    [Pid, Time div (1000*60), Info]),
-		    exit(Pid, kill)
-	    end
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-lookup_config(Key, Config) ->
-    diameter_test_lib:lookup_config(Key, Config).
-
-default_config() ->
-    [{nodes, default_nodes()}, {ts, diameter}].
-
-default_nodes() ->    
-    mk_nodes(2, []).
-
-mk_nodes(0, Nodes) ->
-    Nodes;
-mk_nodes(N, []) ->
-    mk_nodes(N - 1, [node()]);
-mk_nodes(N, Nodes) when N > 0 ->
-    Head = hd(Nodes),
-    [Name, Host] = node_to_name_and_host(Head),
-    Nodes ++ [mk_node(I, Name, Host) || I <- lists:seq(1, N)].
-
-mk_node(N, Name, Host) ->
-    list_to_atom(lists:concat([Name ++ integer_to_list(N) ++ "@" ++ Host])).
-    
-%% Returns [Name, Host]    
-node_to_name_and_host(Node) ->
-    string:tokens(atom_to_list(Node), [$@]).
-
-
-
-
diff --git a/lib/diameter/test/diameter_tls_SUITE.erl b/lib/diameter/test/diameter_tls_SUITE.erl
new file mode 100644
index 0000000000..99f92ca0e0
--- /dev/null
+++ b/lib/diameter/test/diameter_tls_SUITE.erl
@@ -0,0 +1,411 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of traffic between six Diameter nodes connected as follows.
+%%
+%%                  ---- SERVER.REALM1  (TLS after capabilities exchange)
+%%                /
+%%               /  ---- SERVER.REALM2  (ditto)
+%%              | /
+%%   CLIENT.REALM0 ----- SERVER.REALM3  (no security)
+%%              | \
+%%               \  ---- SERVER.REALM4  (TLS at connection establishment)
+%%                \
+%%                  ---- SERVER.REALM5  (ditto)
+%%
+
+-module(diameter_tls_SUITE).
+
+-export([suite/0,
+         all/0,
+         groups/0,
+         init_per_group/2,
+         end_per_group/2,
+         init_per_suite/1,
+         end_per_suite/1]).
+
+%% testcases
+-export([start_ssl/1,
+         start_diameter/1,
+         make_certs/1, make_certs/0,
+         start_services/1,
+         add_transports/1,
+         send1/1,
+         send2/1,
+         send3/1,
+         send4/1,
+         send5/1,
+         remove_transports/1,
+         stop_services/1,
+         stop_diameter/1,
+         stop_ssl/1]).
+
+%% diameter callbacks
+-export([peer_up/3,
+         peer_down/3,
+         pick_peer/4,
+         prepare_request/3,
+         prepare_retransmit/3,
+         handle_answer/4,
+         handle_error/4,
+         handle_request/3]).
+
+-ifdef(DIAMETER_CT).
+-include("diameter_gen_base_rfc3588.hrl").
+-else.
+-include_lib("diameter/include/diameter_gen_base_rfc3588.hrl").
+-endif.
+
+-include_lib("diameter/include/diameter.hrl").
+-include("diameter_ct.hrl").
+
+%% ===========================================================================
+
+-define(util, diameter_util).
+
+-define(ADDR, {127,0,0,1}).
+
+-define(CLIENT,  "CLIENT.REALM0").
+-define(SERVER1, "SERVER.REALM1").
+-define(SERVER2, "SERVER.REALM2").
+-define(SERVER3, "SERVER.REALM3").
+-define(SERVER4, "SERVER.REALM4").
+-define(SERVER5, "SERVER.REALM5").
+
+-define(SERVERS, [?SERVER1, ?SERVER2, ?SERVER3, ?SERVER4, ?SERVER5]).
+
+-define(DICT_COMMON,  ?DIAMETER_DICT_COMMON).
+
+-define(APP_ALIAS, the_app).
+-define(APP_ID, ?DICT_COMMON:id()).
+
+-define(NO_INBAND_SECURITY, 0).
+-define(TLS, 1).
+
+%% Config for diameter:start_service/2.
+-define(SERVICE(Host, Dict),
+        [{'Origin-Host', Host},
+         {'Origin-Realm', realm(Host)},
+         {'Host-IP-Address', [?ADDR]},
+         {'Vendor-Id', 12345},
+         {'Product-Name', "OTP/diameter"},
+         {'Inband-Security-Id', [?NO_INBAND_SECURITY]},
+         {'Auth-Application-Id', [Dict:id()]},
+         {application, [{alias, ?APP_ALIAS},
+                        {dictionary, Dict},
+                        {module, ?MODULE},
+                        {answer_errors, callback}]}]).
+
+%% Config for diameter:add_transport/2. In the listening case, listen
+%% on a free port that we then lookup using the implementation detail
+%% that diameter_tcp registers the port with diameter_reg.
+-define(CONNECT(PortNr, Caps, Opts),
+        {connect, [{transport_module, diameter_tcp},
+                   {transport_config, [{raddr, ?ADDR},
+                                       {rport, PortNr},
+                                       {ip, ?ADDR},
+                                       {port, 0}
+                                       | Opts]},
+                   {capabilities, Caps}]}).
+-define(LISTEN(Caps, Opts),
+        {listen, [{transport_module, diameter_tcp},
+                  {transport_config, [{ip, ?ADDR}, {port, 0} | Opts]},
+                  {capabilities, Caps}]}).
+
+-define(SUCCESS, 2001).
+-define(LOGOUT, ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 10}}].
+
+all() ->
+    [start_ssl,
+     start_diameter,
+     make_certs,
+     start_services,
+     add_transports]
+        ++ [{group, N} || {N, _, _} <- groups()]
+        ++ [remove_transports, stop_services, stop_diameter, stop_ssl].
+
+groups() ->
+    Ts = tc(),
+    [{all, [], Ts},
+     {p, [parallel], Ts}].
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_, _) ->
+    ok.
+
+init_per_suite(Config) ->
+    case os:find_executable("openssl") of
+        false ->
+            {skip, no_openssl};
+        _ ->
+            Config
+    end.
+
+end_per_suite(_Config) ->
+    ok.
+
+%% Testcases to run when services are started and connections
+%% established.
+tc() ->
+    [send1,
+     send2,
+     send3,
+     send4,
+     send5].
+
+%% ===========================================================================
+%% testcases
+
+start_ssl(_Config) ->
+    ok = ssl:start().
+
+start_diameter(_Config) ->
+    ok = diameter:start().
+
+make_certs() ->
+    [{timetrap, {seconds, 30}}].
+
+make_certs(Config) ->
+    Dir = proplists:get_value(priv_dir, Config),
+
+    [] = ?util:run([[fun make_cert/2, Dir, B] || B <- ["server1",
+                                                       "server2",
+                                                       "server4",
+                                                       "server5",
+                                                       "client"]]).
+
+start_services(Config) ->
+    Dir = proplists:get_value(priv_dir, Config),
+    Servers = [server(S, sopts(S, Dir)) || S <- ?SERVERS],
+
+    ok = diameter:start_service(?CLIENT, ?SERVICE(?CLIENT, ?DICT_COMMON)),
+
+    {save_config, [Dir | Servers]}.
+
+add_transports(Config) ->
+    {_, [Dir | Servers]} = proplists:get_value(saved_config, Config),
+
+    true = diameter:subscribe(?CLIENT),
+
+    Opts = ssl_options(Dir, "client"),
+    Connections = [connect(?CLIENT, S, copts(N, Opts))
+                   || {S,N} <- lists:zip(Servers, ?SERVERS)],
+
+    ?util:write_priv(Config, "cfg", lists:zip(Servers, Connections)).
+
+
+%% Remove the client transports and expect the corresponding server
+%% transport to go down.
+remove_transports(Config) ->
+    Ts = ?util:read_priv(Config, "cfg"),
+    [] = [T || S <- ?SERVERS, T <- [diameter:subscribe(S)], T /= true],
+    lists:map(fun disconnect/1, Ts).
+
+stop_services(_Config) ->
+    [] = [{H,T} || H <- [?CLIENT | ?SERVERS],
+                   T <- [diameter:stop_service(H)],
+                   T /= ok].
+
+stop_diameter(_Config) ->
+    ok = diameter:stop().
+
+stop_ssl(_Config) ->
+    ok = ssl:stop().
+
+%% Send an STR intended for a specific server and expect success.
+send1(_Config) ->
+    call(?SERVER1).
+send2(_Config) ->
+    call(?SERVER2).
+send3(_Config) ->
+    call(?SERVER3).
+send4(_Config) ->
+    call(?SERVER4).
+send5(_Config) ->
+    call(?SERVER5).
+
+%% ===========================================================================
+%% diameter callbacks
+
+%% peer_up/3
+
+peer_up(_SvcName, _Peer, State) ->
+    State.
+
+%% peer_down/3
+
+peer_down(_SvcName, _Peer, State) ->
+    State.
+
+%% pick_peer/4
+
+pick_peer([Peer], _, ?CLIENT, _State) ->
+    {ok, Peer}.
+
+%% prepare_request/3
+
+prepare_request(#diameter_packet{msg = Req},
+                ?CLIENT,
+                {_Ref, Caps}) ->
+    #diameter_caps{origin_host  = {OH, _},
+                   origin_realm = {OR, _}}
+        = Caps,
+
+    {send, set(Req, [{'Session-Id', diameter:session_id(OH)},
+                     {'Origin-Host',  OH},
+                     {'Origin-Realm', OR}])}.
+
+%% prepare_retransmit/3
+
+prepare_retransmit(_Pkt, false, _Peer) ->
+    discard.
+
+%% handle_answer/4
+
+handle_answer(Pkt, _Req, ?CLIENT, _Peer) ->
+    #diameter_packet{msg = Rec, errors = []} = Pkt,
+    Rec.
+
+%% handle_error/4
+
+handle_error(Reason, _Req, ?CLIENT, _Peer) ->
+    {error, Reason}.
+
+%% handle_request/3
+
+handle_request(#diameter_packet{msg = #diameter_base_STR{'Session-Id' = SId}},
+               OH,
+               {_Ref, #diameter_caps{origin_host = {OH,_},
+                                     origin_realm = {OR, _}}})
+  when OH /= ?CLIENT ->
+    {reply, #diameter_base_STA{'Result-Code' = ?SUCCESS,
+                               'Session-Id' = SId,
+                               'Origin-Host' = OH,
+                               'Origin-Realm' = OR}}.
+
+%% ===========================================================================
+%% support functions
+
+call(Server) ->
+    Realm = realm(Server),
+    Req = ['STR', {'Destination-Realm', Realm},
+                  {'Termination-Cause', ?LOGOUT},
+                  {'Auth-Application-Id', ?APP_ID}],
+    #diameter_base_STA{'Result-Code' = ?SUCCESS,
+                       'Origin-Host' = Server,
+                       'Origin-Realm' = Realm}
+        = call(Req, [{filter, realm}]).
+
+call(Req, Opts) ->
+    diameter:call(?CLIENT, ?APP_ALIAS, Req, Opts).
+
+set([H|T], Vs) ->
+    [H | Vs ++ T].
+
+disconnect({{LRef, _PortNr}, CRef}) ->
+    ok = diameter:remove_transport(?CLIENT, CRef),
+    ok = receive #diameter_event{info = {down, LRef, _, _}} -> ok
+         after 2000 -> false
+         end.
+
+realm(Host) ->
+    tl(lists:dropwhile(fun(C) -> C /= $. end, Host)).
+
+inband_security(Ids) ->
+    [{'Inband-Security-Id', Ids}].
+
+ssl_options(Dir, Base) ->
+    Root = filename:join([Dir, Base]),
+    [{ssl_options, [{certfile, Root ++ "_ca.pem"},
+                    {keyfile,  Root ++ "_key.pem"}]}].
+
+make_cert(Dir, Base) ->
+    make_cert(Dir, Base ++ "_key.pem", Base ++ "_ca.pem").
+
+make_cert(Dir, Keyfile, Certfile) ->
+    [K,C] = Paths = [filename:join([Dir, F]) || F <- [Keyfile, Certfile]],
+
+    KCmd = join(["openssl genrsa -out", K, "2048"]),
+    CCmd = join(["openssl req -new -x509 -key", K, "-out", C, "-days 7",
+                 "-subj /C=SE/ST=./L=Stockholm/CN=www.erlang.org"]),
+
+    %% Hope for the best and only check that files are written.
+    os:cmd(KCmd),
+    os:cmd(CCmd),
+
+    [_,_] = [T || P <- Paths, {ok, T} <- [file:read_file_info(P)]],
+
+    {K,C}.
+
+join(Strs) ->
+    string:join(Strs, " ").
+
+%% server/2
+
+server(Host, {Caps, Opts}) ->
+    ok = diameter:start_service(Host, ?SERVICE(Host, ?DICT_COMMON)),
+    {ok, LRef} = diameter:add_transport(Host, ?LISTEN(Caps, Opts)),
+    {LRef, hd([_] = ?util:lport(tcp, LRef, 20))}.
+
+sopts(?SERVER1, Dir) ->
+    {inband_security([?TLS]),
+     ssl_options(Dir, "server1")};
+sopts(?SERVER2, Dir) ->
+    {inband_security([?NO_INBAND_SECURITY, ?TLS]),
+     ssl_options(Dir, "server2")};
+sopts(?SERVER3, _) ->
+    {[], []};
+sopts(?SERVER4, Dir) ->
+    {[], ssl(ssl_options(Dir, "server4"))};
+sopts(?SERVER5, Dir) ->
+    {[], ssl(ssl_options(Dir, "server5"))}.
+
+ssl([{ssl_options = T, Opts}]) ->
+    [{T, true} | Opts].
+
+%% connect/3
+
+connect(Host, {_LRef, PortNr}, {Caps, Opts}) ->
+    {ok, Ref} = diameter:add_transport(Host, ?CONNECT(PortNr, Caps, Opts)),
+    ok = receive
+             #diameter_event{service = Host,
+                             info = {up, Ref, _, _, #diameter_packet{}}} ->
+                 ok
+         after 2000 ->
+                 false
+         end,
+    Ref.
+
+copts(S, Opts)
+  when S == ?SERVER1;
+       S == ?SERVER2;
+       S == ?SERVER3 ->
+    {inband_security([?NO_INBAND_SECURITY, ?TLS]), Opts};
+copts(S, Opts)
+  when S == ?SERVER4;
+       S == ?SERVER5 ->
+    {[], ssl(Opts)}.
diff --git a/lib/ssl/c_src/Makefile b/lib/diameter/test/diameter_tls_SUITE_data/Makefile.ca
index 52d9140153..3f2645add0 100644
--- a/lib/ssl/c_src/Makefile
+++ b/lib/diameter/test/diameter_tls_SUITE_data/Makefile.ca
@@ -1,26 +1,43 @@
-#
+# -*- makefile -*-
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2011. 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.
-# 
-# %CopyrightEnd%
-#
-
 #
+# %CopyrightEnd%
 
 #
-# Invoke with GNU make or clearmake -C gnu.
+# Certificates are now generated from the suite itself but the
+# makefile itself is still useful.
 #
 
-include $(ERL_TOP)/make/run_make.mk
+KEYS  = $(HOSTS:%=%_key.pem)
+CERTS = $(HOSTS:%=%_ca.pem)
+
+all: $(CERTS)
+
+%_ca.pem: %_key.pem
+	openssl req -new -x509 -key $< -out $@ -days 1095 \
+	            -subj '/C=SE/ST=./L=Stockholm/CN=www.erlang.org'
+
+%_key.pem:
+	openssl genrsa -out $@ 2048
+
+clean:
+	rm -f $(CERTS)
+
+realclean: clean
+	rm -f $(KEYS)
+
+.PRECIOUS: $(KEYS)
+.PHONY: all clean realclean
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
new file mode 100644
index 0000000000..6704f24532
--- /dev/null
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -0,0 +1,754 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of traffic between two Diameter nodes, one client, one server.
+%%
+
+-module(diameter_traffic_SUITE).
+
+-export([suite/0,
+         all/0,
+         groups/0,
+         init_per_group/2,
+         end_per_group/2,
+         init_per_testcase/2,
+         end_per_testcase/2]).
+
+%% testcases
+-export([start/1,
+         start_services/1,
+         add_transports/1,
+         result_codes/1,
+         send_ok/1,
+         send_arbitrary/1,
+         send_unknown/1,
+         send_unknown_mandatory/1,
+         send_noreply/1,
+         send_unsupported/1,
+         send_unsupported_app/1,
+         send_error_bit/1,
+         send_unsupported_version/1,
+         send_long/1,
+         send_nopeer/1,
+         send_noapp/1,
+         send_discard/1,
+         send_any_1/1,
+         send_any_2/1,
+         send_all_1/1,
+         send_all_2/1,
+         send_timeout/1,
+         send_error/1,
+         send_detach/1,
+         send_encode_error/1,
+         send_destination_1/1,
+         send_destination_2/1,
+         send_destination_3/1,
+         send_destination_4/1,
+         send_destination_5/1,
+         send_destination_6/1,
+         send_bad_option_1/1,
+         send_bad_option_2/1,
+         send_bad_filter_1/1,
+         send_bad_filter_2/1,
+         send_bad_filter_3/1,
+         send_bad_filter_4/1,
+         send_multiple_filters_1/1,
+         send_multiple_filters_2/1,
+         send_multiple_filters_3/1,
+         send_anything/1,
+         remove_transports/1,
+         stop_services/1,
+         stop/1]).
+
+%% diameter callbacks
+-export([peer_up/3,
+         peer_down/3,
+         pick_peer/5, pick_peer/6,
+         prepare_request/4, prepare_request/5,
+         prepare_retransmit/4,
+         handle_answer/5, handle_answer/6,
+         handle_error/5,
+         handle_request/3]).
+
+-ifdef(DIAMETER_CT).
+-include("diameter_gen_base_rfc3588.hrl").
+-else.
+-include_lib("diameter/include/diameter_gen_base_rfc3588.hrl").
+-endif.
+
+-include_lib("diameter/include/diameter.hrl").
+-include("diameter_ct.hrl").
+
+%% ===========================================================================
+
+-define(util, diameter_util).
+
+-define(ADDR, {127,0,0,1}).
+
+-define(CLIENT, "CLIENT").
+-define(SERVER, "SERVER").
+-define(REALM, "erlang.org").
+-define(HOST(Host, Realm), Host ++ [$.|Realm]).
+
+-define(APP_ALIAS, base).
+-define(EXTRA, an_extra_argument).
+-define(ENCODINGS, [list, record]).
+
+-define(DICT,   ?DIAMETER_DICT_COMMON).
+-define(APP_ID, ?DIAMETER_APP_ID_COMMON).
+
+%% Config for diameter:start_service/2.
+-define(SERVICE(Name),
+        [{'Origin-Host', Name ++ "." ++ ?REALM},
+         {'Origin-Realm', ?REALM},
+         {'Host-IP-Address', [?ADDR]},
+         {'Vendor-Id', 12345},
+         {'Product-Name', "OTP/diameter"},
+         {'Acct-Application-Id', [?DIAMETER_APP_ID_COMMON]},
+         {application, [{alias, ?APP_ALIAS},
+                        {dictionary, ?DIAMETER_DICT_COMMON},
+                        {module, ?MODULE},
+                        {answer_errors, callback}]}]).
+
+-define(SUCCESS,
+        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_SUCCESS').
+-define(COMMAND_UNSUPPORTED,
+        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_COMMAND_UNSUPPORTED').
+-define(TOO_BUSY,
+        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_TOO_BUSY').
+-define(APPLICATION_UNSUPPORTED,
+        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_APPLICATION_UNSUPPORTED').
+-define(INVALID_HDR_BITS,
+        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_INVALID_HDR_BITS').
+-define(AVP_UNSUPPORTED,
+        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_AVP_UNSUPPORTED').
+-define(UNSUPPORTED_VERSION,
+        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_UNSUPPORTED_VERSION').
+-define(REALM_NOT_SERVED,
+        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_REALM_NOT_SERVED').
+-define(UNABLE_TO_DELIVER,
+        ?'DIAMETER_BASE_RESULT-CODE_DIAMETER_UNABLE_TO_DELIVER').
+
+-define(EVENT_RECORD,
+        ?'DIAMETER_BASE_ACCOUNTING-RECORD-TYPE_EVENT_RECORD').
+-define(AUTHORIZE_ONLY,
+        ?'DIAMETER_BASE_RE-AUTH-REQUEST-TYPE_AUTHORIZE_ONLY').
+-define(AUTHORIZE_AUTHENTICATE,
+        ?'DIAMETER_BASE_RE-AUTH-REQUEST-TYPE_AUTHORIZE_AUTHENTICATE').
+
+-define(LOGOUT,
+        ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_LOGOUT').
+-define(BAD_ANSWER,
+        ?'DIAMETER_BASE_TERMINATION-CAUSE_DIAMETER_BAD_ANSWER').
+
+-define(A, list_to_atom).
+-define(L, atom_to_list).
+-define(P(N), ?A("p_" ++ ?L(N))).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 10}}].
+
+all() ->
+    [start, start_services, add_transports, result_codes
+     | [{group, N} || {N, _, _} <- groups()]]
+        ++ [remove_transports, stop_services, stop].
+
+groups() ->
+    Ts = tc(),
+    [{grp(E,P), P, Ts} || E <- ?ENCODINGS, P <- [[], [parallel]]].
+
+grp(E, []) ->
+    E;
+grp(E, [parallel]) ->
+    ?P(E).
+
+init_per_group(Name, Config) ->
+    E = case ?L(Name) of
+            "p_" ++ Rest ->
+                ?A(Rest);
+            _ ->
+                Name
+        end,
+    [{encode, E} | Config].
+
+end_per_group(_, _) ->
+    ok.
+
+init_per_testcase(Name, Config) ->
+    [{testcase, Name} | Config].
+
+end_per_testcase(_, _) ->
+    ok.
+
+%% Testcases to run when services are started and connections
+%% established.
+tc() ->
+    [send_ok,
+     send_arbitrary,
+     send_unknown,
+     send_unknown_mandatory,
+     send_noreply,
+     send_unsupported,
+     send_unsupported_app,
+     send_error_bit,
+     send_unsupported_version,
+     send_long,
+     send_nopeer,
+     send_noapp,
+     send_discard,
+     send_any_1,
+     send_any_2,
+     send_all_1,
+     send_all_2,
+     send_timeout,
+     send_error,
+     send_detach,
+     send_encode_error,
+     send_destination_1,
+     send_destination_2,
+     send_destination_3,
+     send_destination_4,
+     send_destination_5,
+     send_destination_6,
+     send_bad_option_1,
+     send_bad_option_2,
+     send_bad_filter_1,
+     send_bad_filter_2,
+     send_bad_filter_3,
+     send_bad_filter_4,
+     send_multiple_filters_1,
+     send_multiple_filters_2,
+     send_multiple_filters_3,
+     send_anything].
+
+%% ===========================================================================
+%% start/stop testcases
+
+start(_Config) ->
+    ok = diameter:start().
+
+start_services(_Config) ->
+    ok = diameter:start_service(?SERVER, ?SERVICE(?SERVER)),
+    ok = diameter:start_service(?CLIENT, ?SERVICE(?CLIENT)).
+
+add_transports(Config) ->
+    LRef = ?util:listen(?SERVER, tcp),
+    CRef = ?util:connect(?CLIENT, tcp, LRef),
+    ?util:write_priv(Config, "transport", {LRef, CRef}).
+
+remove_transports(Config) ->
+    {LRef, CRef} = ?util:read_priv(Config, "transport"),
+    ?util:disconnect(?CLIENT, CRef, ?SERVER, LRef).
+
+stop_services(_Config) ->
+    ok = diameter:stop_service(?CLIENT),
+    ok = diameter:stop_service(?SERVER).
+
+stop(_Config) ->
+    ok = diameter:stop().
+
+%% ===========================================================================
+
+%% Ensure that result codes have the expected values.
+result_codes(_Config) ->
+    {2001, 3001, 3002, 3003, 3004, 3007, 3008, 5001, 5011}
+        = {?SUCCESS,
+           ?COMMAND_UNSUPPORTED,
+           ?UNABLE_TO_DELIVER,
+           ?REALM_NOT_SERVED,
+           ?TOO_BUSY,
+           ?APPLICATION_UNSUPPORTED,
+           ?INVALID_HDR_BITS,
+           ?AVP_UNSUPPORTED,
+           ?UNSUPPORTED_VERSION}.
+
+%% Send an ACR and expect success.
+send_ok(Config) ->
+    Req = ['ACR', {'Accounting-Record-Type', ?EVENT_RECORD},
+                  {'Accounting-Record-Number', 1}],
+    #diameter_base_ACA{'Result-Code' = ?SUCCESS}
+        = call(Config, Req).
+
+%% Send an ASR with an arbitrary AVP and expect success and the same
+%% AVP in the reply.
+send_arbitrary(Config) ->
+    Req = ['ASR', {'AVP', [#diameter_avp{name = 'Class', value = "XXX"}]}],
+    #diameter_base_ASA{'Result-Code' = ?SUCCESS,
+                       'AVP' = Avps}
+        = call(Config, Req),
+    [#diameter_avp{name = 'Class',
+                   value = "XXX"}]
+        = Avps.
+
+%% Send an unknown AVP (to some client) and check that it comes back.
+send_unknown(Config) ->
+    Req = ['ASR', {'AVP', [#diameter_avp{code = 999,
+                                         is_mandatory = false,
+                                         data = <<17>>}]}],
+    #diameter_base_ASA{'Result-Code' = ?SUCCESS,
+                       'AVP' = Avps}
+        = call(Config, Req),
+    [#diameter_avp{code = 999,
+                   is_mandatory = false,
+                   data = <<17>>}]
+        = Avps.
+
+%% Ditto but set the M flag.
+send_unknown_mandatory(Config) ->
+    Req = ['ASR', {'AVP', [#diameter_avp{code = 999,
+                                         is_mandatory = true,
+                                         data = <<17>>}]}],
+    #diameter_base_ASA{'Result-Code' = ?AVP_UNSUPPORTED,
+                       'Failed-AVP' = Failed}
+        = call(Config, Req),
+    [#'diameter_base_Failed-AVP'{'AVP' = Avps}] = Failed,
+    [#diameter_avp{code = 999,
+                   is_mandatory = true,
+                   data = <<17>>}]
+        = Avps.
+
+%% Send an STR that the server ignores.
+send_noreply(Config) ->
+    Req = ['STR', {'Termination-Cause', ?BAD_ANSWER}],
+    {error, timeout} = call(Config, Req).
+
+%% Send an unsupported command and expect 3001.
+send_unsupported(Config) ->
+    Req = ['STR', {'Termination-Cause', ?BAD_ANSWER}],
+    #'diameter_base_answer-message'{'Result-Code' = ?COMMAND_UNSUPPORTED}
+        = call(Config, Req).
+
+%% Send an unsupported command and expect 3007.
+send_unsupported_app(Config) ->
+    Req = ['STR', {'Termination-Cause', ?BAD_ANSWER}],
+    #'diameter_base_answer-message'{'Result-Code' = ?APPLICATION_UNSUPPORTED}
+        = call(Config, Req).
+
+%% Send a request with the E bit set and expect 3008.
+send_error_bit(Config) ->
+    Req = ['STR', {'Termination-Cause', ?BAD_ANSWER}],
+    #'diameter_base_answer-message'{'Result-Code' = ?INVALID_HDR_BITS}
+        = call(Config, Req).
+
+%% Send a bad version and check that we get 5011.
+send_unsupported_version(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    #diameter_base_STA{'Result-Code' = ?UNSUPPORTED_VERSION}
+        = call(Config, Req).
+
+%% Send something long that will be fragmented by TCP.
+send_long(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT},
+                  {'User-Name', [lists:duplicate(1 bsl 20, $X)]}],
+    #diameter_base_STA{'Result-Code' = ?SUCCESS}
+        = call(Config, Req).
+
+%% Send something for which pick_peer finds no suitable peer.
+send_nopeer(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    {error, no_connection} = call(Config, Req, [{extra, [?EXTRA]}]).
+
+%% Send something on an unconfigured application.
+send_noapp(_Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    {error, no_connection} = diameter:call(?CLIENT, unknown_alias, Req).
+
+%% Send something that's discarded by prepare_request.
+send_discard(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    {error, unprepared} = call(Config, Req).
+
+%% Send with a disjunctive filter.
+send_any_1(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    {error, no_connection} = call(Config, Req, [{filter, {any, []}}]).
+send_any_2(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT},
+                  {'Destination-Host', [?HOST(?SERVER, "unknown.org")]}],
+    #'diameter_base_answer-message'{'Result-Code' = ?UNABLE_TO_DELIVER}
+        = call(Config, Req, [{filter, {any, [host, realm]}}]).
+
+%% Send with a conjunctive filter.
+send_all_1(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    Realm = lists:foldr(fun(C,A) -> [C,A] end, [], ?REALM),
+    #diameter_base_STA{'Result-Code' = ?SUCCESS}
+        = call(Config, Req, [{filter, {all, [{host, any},
+                                             {realm, Realm}]}}]).
+send_all_2(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT},
+                  {'Destination-Host', [?HOST(?SERVER, "unknown.org")]}],
+    {error, no_connection}
+        = call(Config, Req, [{filter, {all, [host, realm]}}]).
+
+%% Timeout before the server manages an answer.
+send_timeout(Config) ->
+    Req = ['RAR', {'Re-Auth-Request-Type', ?AUTHORIZE_ONLY}],
+    {error, timeout} = call(Config, Req, [{timeout, 1000}]).
+
+%% Explicitly answer with an answer-message and ensure that we
+%% received the Session-Id.
+send_error(Config) ->
+    Req = ['RAR', {'Re-Auth-Request-Type', ?AUTHORIZE_AUTHENTICATE}],
+    #'diameter_base_answer-message'{'Result-Code' = ?TOO_BUSY,
+                                    'Session-Id' = SId}
+        = call(Config, Req),
+    undefined /= SId.
+
+%% Send a request with the detached option and receive it as a message
+%% from handle_answer instead.
+send_detach(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    Ref = make_ref(),
+    ok = call(Config, Req, [{extra, [{self(), Ref}]}, detach]),
+    #diameter_packet{msg = Rec, errors = []}
+        = receive {Ref, T} -> T after 2000 -> false end,
+    #diameter_base_STA{'Result-Code' = ?SUCCESS}
+        = Rec.
+
+%% Send a request which can't be encoded and expect {error, encode}.
+send_encode_error(Config) ->
+    {error, encode} = call(Config, ['STR']).  %% No Termination-Cause
+
+%% Send with filtering and expect success.
+send_destination_1(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT},
+                  {'Destination-Host', [?HOST(?SERVER, ?REALM)]}],
+    #diameter_base_STA{'Result-Code' = ?SUCCESS}
+        = call(Config, Req, [{filter, {all, [host, realm]}}]).
+send_destination_2(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    #diameter_base_STA{'Result-Code' = ?SUCCESS}
+        = call(Config, Req, [{filter, {all, [host, realm]}}]).
+
+%% Send with filtering on and expect failure when specifying an
+%% unknown host or realm.
+send_destination_3(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT},
+                  {'Destination-Realm', "unknown.org"}],
+    {error, no_connection}
+        = call(Config, Req, [{filter, {all, [host, realm]}}]).
+send_destination_4(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT},
+                  {'Destination-Host', [?HOST(?SERVER, "unknown.org")]}],
+    {error, no_connection}
+        = call(Config, Req, [{filter, {all, [host, realm]}}]).
+
+%% Send without filtering and expect an error answer when specifying
+%% an unknown host or realm.
+send_destination_5(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT},
+                  {'Destination-Realm', "unknown.org"}],
+    #'diameter_base_answer-message'{'Result-Code' = ?REALM_NOT_SERVED}
+        = call(Config, Req).
+send_destination_6(Config) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT},
+                  {'Destination-Host', [?HOST(?SERVER, "unknown.org")]}],
+    #'diameter_base_answer-message'{'Result-Code' = ?UNABLE_TO_DELIVER}
+        = call(Config, Req).
+
+%% Specify an invalid option and expect failure.
+send_bad_option_1(Config) ->
+    send_bad_option(Config, x).
+send_bad_option_2(Config) ->
+    send_bad_option(Config, {extra, false}).
+
+send_bad_option(Config, Opt) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    try call(Config, Req, [Opt]) of
+        T -> erlang:error({?MODULE, ?LINE, T})
+    catch
+        error: _ -> ok
+    end.
+
+%% Specify an invalid filter and expect no matching peers.
+send_bad_filter_1(Config) ->
+    send_bad_filter(Config, {all, none}).
+send_bad_filter_2(Config) ->
+    send_bad_filter(Config, {host, x}).
+send_bad_filter_3(Config) ->
+    send_bad_filter(Config, {eval, fun() -> true end}).
+send_bad_filter_4(Config) ->
+    send_bad_filter(Config, {eval, {?MODULE, not_exported, []}}).
+
+send_bad_filter(Config, F) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    {error, no_connection} = call(Config, Req, [{filter, F}]).
+
+%% Specify multiple filter options and expect them be conjunctive.
+send_multiple_filters_1(Config) ->
+    Fun = fun(#diameter_caps{}) -> true end,
+    #diameter_base_STA{'Result-Code' = ?SUCCESS}
+        = send_multiple_filters(Config, [host, {eval, Fun}]).
+send_multiple_filters_2(Config) ->
+    E = {erlang, is_tuple, []},
+    {error, no_connection}
+        = send_multiple_filters(Config, [realm, {neg, {eval, E}}]).
+send_multiple_filters_3(Config) ->
+    E1 = [fun(#diameter_caps{}, ok) -> true end, ok],
+    E2 = {erlang, is_tuple, []},
+    E3 = {erlang, is_record, [diameter_caps]},
+    E4 = [{erlang, is_record, []}, diameter_caps],
+    #diameter_base_STA{'Result-Code' = ?SUCCESS}
+        = send_multiple_filters(Config, [{eval, E} || E <- [E1,E2,E3,E4]]).
+
+send_multiple_filters(Config, Fs) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    call(Config, Req, [{filter, F} || F <- Fs]).
+
+%% Ensure that we can pass a request in any form to diameter:call/4,
+%% only the return value from the prepare_request callback being
+%% significant.
+send_anything(Config) ->    
+    #diameter_base_STA{'Result-Code' = ?SUCCESS}
+        = call(Config, anything).
+    
+%% ===========================================================================
+
+call(Config, Req) ->
+    call(Config, Req, []).
+
+call(Config, Req, Opts) ->
+    Name = proplists:get_value(testcase, Config),
+    Enc = proplists:get_value(encode, Config),
+    diameter:call(?CLIENT,
+                  ?APP_ALIAS,
+                  msg(Req, Enc),
+                  [{extra, [Name]} | Opts]).
+
+msg([_|_] = L, list) ->
+    L;
+msg([H|T], record) ->
+    ?DICT:'#new-'(?DICT:msg2rec(H), T);
+msg(T, _) ->
+    T.
+
+%% Set only values that aren't already.
+set([H|T], Vs) ->
+    [H | Vs ++ T];
+set(Rec, Vs) ->
+    lists:foldl(fun({F,_} = FV, A) -> set(?DICT:'#get-'(F, A), FV, A) end,
+                Rec,
+                Vs).
+
+set(E, FV, Rec)
+  when E == undefined;
+       E == [] ->
+    ?DICT:'#set-'(FV, Rec);
+set(_, _, Rec) ->
+    Rec.
+
+%% ===========================================================================
+%% diameter callbacks
+
+%% peer_up/3
+
+peer_up(_SvcName, _Peer, State) ->
+    State.
+
+%% peer_down/3
+
+peer_down(_SvcName, _Peer, State) ->
+    State.
+
+%% pick_peer/5/6
+
+pick_peer([Peer], _, ?CLIENT, _State, Name)
+  when Name /= send_detach ->
+    {ok, Peer}.
+
+pick_peer([_Peer], _, ?CLIENT, _State, send_nopeer, ?EXTRA) ->
+    false;
+
+pick_peer([Peer], _, ?CLIENT, _State, send_detach, {_,_}) ->
+    {ok, Peer}.
+
+%% prepare_request/4/5
+
+prepare_request(_Pkt, ?CLIENT, {_Ref, _Caps}, send_discard) ->
+    {discard, unprepared};
+
+prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, Name) ->
+    {send, prepare(Pkt, Caps, Name)}.
+
+prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, send_detach, _) ->
+    {send, prepare(Pkt, Caps)}.
+
+prepare(Pkt, Caps, send_unsupported) ->
+    Req = prepare(Pkt, Caps),
+    #diameter_packet{bin = <<H:5/binary, _CmdCode:3/binary, T/binary>>}
+        = E
+        = diameter_codec:encode(?DICT, Pkt#diameter_packet{msg = Req}),
+    E#diameter_packet{bin = <<H/binary, 42:24/integer, T/binary>>};
+
+prepare(Pkt, Caps, send_unsupported_app) ->
+    Req = prepare(Pkt, Caps),
+    #diameter_packet{bin = <<H:8/binary, _ApplId:4/binary, T/binary>>}
+        = E
+        = diameter_codec:encode(?DICT, Pkt#diameter_packet{msg = Req}),
+    E#diameter_packet{bin = <<H/binary, 42:32/integer, T/binary>>};
+
+prepare(Pkt, Caps, send_error_bit) ->
+    #diameter_packet{header = Hdr} = Pkt,
+    Pkt#diameter_packet{header = Hdr#diameter_header{is_error = true},
+                        msg = prepare(Pkt, Caps)};
+
+prepare(Pkt, Caps, send_unsupported_version) ->
+    #diameter_packet{header = Hdr} = Pkt,
+    Pkt#diameter_packet{header = Hdr#diameter_header{version = 42},
+                        msg = prepare(Pkt, Caps)};
+
+prepare(Pkt, Caps, send_anything) ->
+    Req = ['STR', {'Termination-Cause', ?LOGOUT}],
+    prepare(Pkt#diameter_packet{msg = Req}, Caps);
+
+prepare(Pkt, Caps, _Name) ->
+    prepare(Pkt, Caps).
+
+prepare(#diameter_packet{msg = Req}, Caps)
+  when is_record(Req, diameter_base_ACR);
+       'ACR' == hd(Req) ->
+    #diameter_caps{origin_host  = {OH, _},
+                   origin_realm = {OR, DR}}
+        = Caps,
+
+    set(Req, [{'Session-Id', diameter:session_id(OH)},
+              {'Origin-Host',  OH},
+              {'Origin-Realm', OR},
+              {'Destination-Realm', DR}]);
+
+prepare(#diameter_packet{msg = Req}, Caps)
+  when is_record(Req, diameter_base_ASR);
+       'ASR' == hd(Req) ->
+    #diameter_caps{origin_host  = {OH, DH},
+                   origin_realm = {OR, DR}}
+        = Caps,
+    set(Req, [{'Session-Id', diameter:session_id(OH)},
+              {'Origin-Host',  OH},
+              {'Origin-Realm', OR},
+              {'Destination-Host',  DH},
+              {'Destination-Realm', DR},
+              {'Auth-Application-Id', ?APP_ID}]);
+
+prepare(#diameter_packet{msg = Req}, Caps)
+  when is_record(Req, diameter_base_STR);
+       'STR' == hd(Req) ->
+    #diameter_caps{origin_host  = {OH, _},
+                   origin_realm = {OR, DR}}
+        = Caps,
+    set(Req, [{'Session-Id', diameter:session_id(OH)},
+              {'Origin-Host',  OH},
+              {'Origin-Realm', OR},
+              {'Destination-Realm', DR},
+              {'Auth-Application-Id', ?APP_ID}]);
+
+prepare(#diameter_packet{msg = Req}, Caps)
+  when is_record(Req, diameter_base_RAR);
+       'RAR' == hd(Req) ->
+    #diameter_caps{origin_host  = {OH, DH},
+                   origin_realm = {OR, DR}}
+        = Caps,
+    set(Req, [{'Session-Id', diameter:session_id(OH)},
+              {'Origin-Host',  OH},
+              {'Origin-Realm', OR},
+              {'Destination-Host',  DH},
+              {'Destination-Realm', DR},
+              {'Auth-Application-Id', ?APP_ID}]).
+
+%% prepare_retransmit/4
+
+prepare_retransmit(_Pkt, false, _Peer, _Name) ->
+    discard.
+
+%% handle_answer/5/6
+
+handle_answer(Pkt, Req, ?CLIENT, Peer, Name) ->
+    answer(Pkt, Req, Peer, Name).
+
+handle_answer(Pkt, _Req, ?CLIENT, _Peer, send_detach, {Pid, Ref}) ->
+    Pid ! {Ref, Pkt}.
+
+answer(#diameter_packet{msg = Rec, errors = []}, _Req, _Peer, _) ->
+    Rec.
+
+%% handle_error/5
+
+handle_error(Reason, _Req, ?CLIENT, _Peer, _Name) ->
+    {error, Reason}.
+
+%% handle_request/3
+
+%% Note that diameter will set Result-Code and Failed-AVPs if
+%% #diameter_packet.errors is non-null.
+
+handle_request(Pkt, ?SERVER, {_Ref, Caps}) ->
+    request(Pkt, Caps).
+
+request(#diameter_packet{msg
+                         = #diameter_base_ACR{'Session-Id' = SId,
+                                              'Accounting-Record-Type' = RT,
+                                              'Accounting-Record-Number' = RN}},
+        #diameter_caps{origin_host = {OH, _},
+                       origin_realm = {OR, _}}) ->
+    {reply, ['ACA', {'Result-Code', ?SUCCESS},
+                    {'Session-Id', SId},
+                    {'Origin-Host', OH},
+                    {'Origin-Realm', OR},
+                    {'Accounting-Record-Type', RT},
+                    {'Accounting-Record-Number', RN}]};
+
+request(#diameter_packet{msg = #diameter_base_ASR{'Session-Id' = SId,
+                                                  'AVP' = Avps}},
+        #diameter_caps{origin_host = {OH, _},
+                       origin_realm = {OR, _}}) ->
+    {reply, #diameter_base_ASA{'Result-Code' = ?SUCCESS,
+                               'Session-Id' = SId,
+                               'Origin-Host' = OH,
+                               'Origin-Realm' = OR,
+                               'AVP' = Avps}};
+
+request(#diameter_packet{msg = #diameter_base_STR{'Termination-Cause' = T}},
+        _Caps)
+  when T /= ?LOGOUT ->
+    discard;
+
+request(#diameter_packet{msg = #diameter_base_STR{'Destination-Realm'= R}},
+        #diameter_caps{origin_realm = {OR, _}})
+  when R /= undefined, R /= OR ->
+    {protocol_error, ?REALM_NOT_SERVED};
+
+request(#diameter_packet{msg = #diameter_base_STR{'Destination-Host'= [H]}},
+        #diameter_caps{origin_host = {OH, _}})
+  when H /= OH ->
+    {protocol_error, ?UNABLE_TO_DELIVER};
+
+request(#diameter_packet{msg = #diameter_base_STR{'Session-Id' = SId}},
+        #diameter_caps{origin_host  = {OH, _},
+                       origin_realm = {OR, _}}) ->
+    {reply, #diameter_base_STA{'Result-Code' = ?SUCCESS,
+                               'Session-Id' = SId,
+                               'Origin-Host' = OH,
+                               'Origin-Realm' = OR}};
+
+request(#diameter_packet{msg = #diameter_base_RAR{}}, _Caps) ->
+    receive after 2000 -> ok end,
+    {protocol_error, ?TOO_BUSY}.
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl
new file mode 100644
index 0000000000..a9520ef5bd
--- /dev/null
+++ b/lib/diameter/test/diameter_transport_SUITE.erl
@@ -0,0 +1,436 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of diameter_tcp/sctp as implementations of the diameter
+%% transport interface.
+%%
+
+-module(diameter_transport_SUITE).
+
+-export([suite/0,
+         all/0,
+         groups/0,
+         init_per_group/2,
+         end_per_group/2,
+         init_per_suite/1,
+         end_per_suite/1]).
+
+%% testcases
+-export([start/1,
+         tcp_accept/1,
+         tcp_connect/1,
+         sctp_accept/1,
+         sctp_connect/1,
+         stop/1]).
+
+-export([accept/1,
+         connect/1,
+         init/2]).
+
+-include_lib("kernel/include/inet_sctp.hrl").
+-include_lib("diameter/include/diameter.hrl").
+-include("diameter_ct.hrl").
+
+-define(util, diameter_util).
+
+%% Corresponding to diameter_* transport modules.
+-define(TRANSPORTS, [tcp, sctp]).
+
+%% Receive a message.
+-define(RECV(Pat, Ret), receive Pat -> Ret end).
+-define(RECV(Pat), ?RECV(Pat, now())).
+
+%% Or not.
+-define(WAIT(Ms), receive after Ms -> now() end).
+
+%% Sockets are opened on the loopback address.
+-define(ADDR, {127,0,0,1}).
+
+%% diameter_tcp doesn't use anything but host_ip_address, and that
+%% only is a local address isn't configured as at transport start.
+-define(SVC(Addrs), #diameter_service{capabilities
+                                      = #diameter_caps{host_ip_address
+                                                       = Addrs}}).
+
+%% The term we register after open a listening port with gen_tcp.
+-define(TEST_LISTENER(Ref, PortNr),
+        {?MODULE, listen, Ref, PortNr}).
+
+%% Message over the transport interface.
+-define(TMSG(T), {diameter, T}).
+
+%% Options for gen_tcp/gen_sctp.
+-define(TCP_OPTS,  [binary, {active, true}, {packet, 0}]).
+-define(SCTP_OPTS, [binary, {active, true}, {sctp_initmsg, ?SCTP_INIT}]).
+
+%% Request a specific number of streams just because we can.
+-define(SCTP_INIT, #sctp_initmsg{num_ostreams = 5,
+                                 max_instreams = 5}).
+
+%% Messages from gen_sctp.
+-define(SCTP(Sock, Data), {sctp, Sock, _, _, Data}).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {minutes, 2}}].
+
+all() ->
+    [start | tc()] ++ [{group, all}, stop].
+
+groups() ->
+    [{all, [parallel], tc()}].
+
+tc() ->
+    [tcp_accept,
+     tcp_connect,
+     sctp_accept,
+     sctp_connect].
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_, _) ->
+    ok.
+
+init_per_suite(Config) ->
+    [{sctp, have_sctp()} | Config].
+
+end_per_suite(_Config) ->
+    ok.
+
+%% ===========================================================================
+
+start(_Config) ->
+    ok = diameter:start().
+
+stop(_Config) ->
+    ok = diameter:stop().
+
+%% ===========================================================================
+%% tcp_accept/1
+%% sctp_accept/1
+%%
+%% diameter transport accepting, test code connecting.
+
+tcp_accept(_) ->
+    accept(tcp).
+
+sctp_accept(Config) ->
+    if_sctp(fun accept/1, Config).
+
+%% Start multiple accepting transport processes that are connected to
+%% with an equal number of connecting processes using gen_tcp/sctp
+%% directly.
+
+-define(PEER_COUNT, 8).
+
+accept(Prot) ->
+    T = {Prot, make_ref()},
+    [] = ?util:run(?util:scramble(acc(2*?PEER_COUNT, T, []))).
+
+acc(0, _, Acc) ->
+    Acc;
+acc(N, T, Acc) ->
+    acc(N-1, T, [{?MODULE, [init,
+                            element(1 + N rem 2, {accept, gen_connect}),
+                            T]}
+                 | Acc]).
+
+%% ===========================================================================
+%% tcp_connect/1
+%% sctp_connect/1
+%%
+%% Test code accepting, diameter transport connecting.
+
+tcp_connect(_) ->
+    connect(tcp).
+
+sctp_connect(Config) ->
+    if_sctp(fun connect/1, Config).
+
+connect(Prot) ->
+    T = {Prot, make_ref()},
+    [] = ?util:run([{?MODULE, [init, X, T]} || X <- [gen_accept, connect]]).
+
+%% ===========================================================================
+%% ===========================================================================
+
+%% have_sctp/0
+
+have_sctp() ->
+    try gen_sctp:open() of
+        {ok, Sock} ->
+            gen_sctp:close(Sock),
+            true;
+        {error, eprotonosupport} ->  %% fail on any other reason
+            false
+    catch
+        error: badarg ->
+            false
+    end.
+
+%% if_sctp/2
+
+if_sctp(F, Config) ->
+    case proplists:get_value(sctp, Config) of
+        true ->
+            F(sctp);
+        false ->
+            {skip, no_sctp}
+    end.
+
+%% init/2
+
+init(accept, {Prot, Ref}) ->
+    %% Start an accepting transport and receive notification of a
+    %% connection.
+    TPid = start_accept(Prot, Ref),
+
+    %% Receive a message and send it back.
+    <<_:8, Len:24, _/binary>> = Bin = bin(Prot, ?RECV(?TMSG({recv, P}), P)),
+
+    Len = size(Bin),
+    TPid ! ?TMSG({send, Bin}),
+
+    %% Expect the transport process to die as a result of the peer
+    %% closing the connection.
+    MRef = erlang:monitor(process, TPid),
+    ?RECV({'DOWN', MRef, process, _, _});
+
+init(gen_connect, {Prot, Ref}) ->
+    %% Lookup the peer's listening socket.
+    [PortNr] = ?util:lport(Prot, Ref, 20),
+
+    %% Connect, send a message and receive it back.
+    {ok, Sock} = gen_connect(Prot, PortNr, Ref),
+    Bin = make_msg(),
+    ok = gen_send(Prot, Sock, Bin),
+    Bin = gen_recv(Prot, Sock);
+
+init(gen_accept, {Prot, Ref}) ->
+    %% Open a listening socket and publish the port number.
+    {ok, LSock} = gen_listen(Prot),
+    {ok, PortNr} = inet:port(LSock),
+    true = diameter_reg:add_new(?TEST_LISTENER(Ref, PortNr)),
+
+    %% Accept a connection, receive a message and send it back.
+    {ok, Sock} = gen_accept(Prot, LSock),
+    Bin = gen_recv(Prot, Sock),
+    ok = gen_send(Prot, Sock, Bin);
+
+init(connect, {Prot, Ref}) ->
+    %% Lookup the peer's listening socket.
+    [{?TEST_LISTENER(_, PortNr), _}] = match(?TEST_LISTENER(Ref, '_')),
+
+    %% Start a connecting transport and receive notification of
+    %% the connection.
+    TPid = start_connect(Prot, PortNr, Ref),
+
+    %% Send a message and receive it back.
+    Bin = make_msg(),
+    TPid ! ?TMSG({send, Bin}),
+    Bin = bin(Prot, ?RECV(?TMSG({recv, P}), P)),
+
+    %% Expect the transport process to die as a result of the peer
+    %% closing the connection.
+    MRef = erlang:monitor(process, TPid),
+    ?RECV({'DOWN', MRef, process, _, _}).
+
+match(Pat) ->
+    match(Pat, 20).
+
+match(Pat, T) ->
+    L = diameter_reg:match(Pat),
+    if [] /= L orelse 1 == T ->
+            L;
+       true ->
+            ?WAIT(50),
+            match(Pat, T-1)
+    end.
+
+bin(sctp, #diameter_packet{bin = Bin}) ->
+    Bin;
+bin(tcp, Bin) ->
+    Bin.
+
+%% make_msg/0
+%%
+%% A valid Diameter message in as far as diameter_tcp examines it,
+%% the module examining the length in the Diameter header to locate
+%% message boundaries.
+
+make_msg() ->
+    N = 1024,
+    Bin = rand_bytes(4*N),
+    Len = 4*(N+1),
+    <<1:8, Len:24, Bin/binary>>.
+
+%% crypto:rand_bytes/1 isn't available on all platforms (since openssl
+%% isn't) so roll our own.
+rand_bytes(N) ->
+    random:seed(now()),
+    rand_bytes(N, <<>>).
+
+rand_bytes(0, Bin) ->
+    Bin;
+rand_bytes(N, Bin) ->
+    Oct = random:uniform(256) - 1,
+    rand_bytes(N-1, <<Oct, Bin/binary>>).
+
+%% ===========================================================================
+
+%% start_connect/3
+
+start_connect(Prot, PortNr, Ref) ->
+    {ok, TPid, [?ADDR]} = start_connect(Prot,
+                                        {connect, Ref},
+                                        ?SVC([]),
+                                        [{raddr, ?ADDR},
+                                         {rport, PortNr},
+                                         {ip, ?ADDR},
+                                         {port, 0}]),
+    ?RECV(?TMSG({TPid, connected, _})),
+    TPid.
+
+start_connect(sctp, T, Svc, Opts) ->
+    diameter_sctp:start(T, Svc, [{sctp_initmsg, ?SCTP_INIT} | Opts]);
+start_connect(tcp, T, Svc, Opts) ->
+    diameter_tcp:start(T, Svc, Opts).
+
+%% start_accept/2
+%%
+%% Start transports sequentially by having each wait for a message
+%% from a job in a queue before commencing. Only one transport with
+%% a pending accept is started at a time since diameter_sctp currently
+%% assumes (and diameter currently implements) this.
+
+start_accept(Prot, Ref) ->
+    Pid = sync(accept, Ref),
+
+    %% Configure the same port number for transports on the same
+    %% reference.
+    [PortNr | _] = ?util:lport(Prot, Ref) ++ [0],
+    {Mod, Opts} = tmod(Prot),
+
+    try
+        {ok, TPid, [?ADDR]} = Mod:start({accept, Ref},
+                                        ?SVC([?ADDR]),
+                                        [{port, PortNr} | Opts]),
+        ?RECV(?TMSG({TPid, connected})),
+        TPid
+    after
+        Pid ! Ref
+    end.
+
+sync(What, Ref) ->
+    ok = diameter_sync:cast({?MODULE, What, Ref},
+                            [fun lock/2, Ref, self()],
+                            infinity,
+                            infinity),
+    receive {start, Ref, Pid} -> Pid end.
+
+lock(Ref, Pid) ->
+    Pid ! {start, Ref, self()},
+    erlang:monitor(process, Pid),
+    Ref = receive T -> T end.
+
+tmod(sctp) ->
+    {diameter_sctp, [{sctp_initmsg, ?SCTP_INIT}]};
+tmod(tcp) ->
+    {diameter_tcp, []}.
+
+%% ===========================================================================
+
+%% gen_connect/3
+
+gen_connect(Prot, PortNr, Ref) ->
+    Pid = sync(connect, Ref),
+
+    %% Stagger connect attempts to avoid the situation that no
+    %% transport process is accepting yet.
+    receive after 250 -> ok end,
+
+    try
+        gen_connect(Prot, PortNr)
+    after
+        Pid ! Ref
+    end.
+
+gen_connect(sctp = P, PortNr) ->
+    {ok, Sock} = Ok = gen_sctp:open([{ip, ?ADDR}, {port, 0} | ?SCTP_OPTS]),
+    ok = gen_sctp:connect_init(Sock, ?ADDR, PortNr, []),
+    Ok = gen_accept(P, Sock);
+gen_connect(tcp, PortNr) ->
+    gen_tcp:connect(?ADDR, PortNr, ?TCP_OPTS).
+
+%% gen_listen/1
+
+gen_listen(sctp) ->
+    {ok, Sock} = gen_sctp:open([{ip, ?ADDR}, {port, 0} | ?SCTP_OPTS]),
+    {gen_sctp:listen(Sock, true), Sock};
+gen_listen(tcp) ->
+    gen_tcp:listen(0, [{ip, ?ADDR} | ?TCP_OPTS]).
+
+%% gen_accept/2
+
+gen_accept(sctp, Sock) ->
+    Assoc = ?RECV(?SCTP(Sock, {_, #sctp_assoc_change{state = comm_up,
+                                                     outbound_streams = O,
+                                                     inbound_streams = I,
+                                                     assoc_id = A}}),
+                  {O, I, A}),
+    putr(assoc, Assoc),
+    {ok, Sock};
+gen_accept(tcp, LSock) ->
+    gen_tcp:accept(LSock).
+
+%% gen_send/3
+
+gen_send(sctp, Sock, Bin) ->
+    {OS, _IS, Id} = getr(assoc),
+    {_, _, Us} = now(),
+    gen_sctp:send(Sock, Id, Us rem OS, Bin);
+gen_send(tcp, Sock, Bin) ->
+    gen_tcp:send(Sock, Bin).
+
+%% gen_recv/2
+
+gen_recv(sctp, Sock) ->
+    {_OS, _IS, Id} = getr(assoc),
+    ?RECV(?SCTP(Sock, {[#sctp_sndrcvinfo{assoc_id = Id}], Bin}), Bin);
+gen_recv(tcp, Sock) ->
+    tcp_recv(Sock, <<>>).
+
+tcp_recv(_, <<_:8, Len:24, _/binary>> = Bin)
+  when Len =< size(Bin) ->
+    Bin;
+tcp_recv(Sock, B) ->
+    receive {tcp, Sock, Bin} -> tcp_recv(Sock, <<B/binary, Bin/binary>>) end.
+
+%% putr/2
+
+putr(Key, Val) ->
+    put({?MODULE, Key}, Val).
+
+%% getr/1
+
+getr(Key) ->
+    get({?MODULE, Key}).
diff --git a/lib/diameter/test/diameter_util.erl b/lib/diameter/test/diameter_util.erl
new file mode 100644
index 0000000000..3fe8ea5363
--- /dev/null
+++ b/lib/diameter/test/diameter_util.erl
@@ -0,0 +1,316 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(diameter_util).
+
+%%
+%% Utility functions.
+%%
+
+%% generic
+-export([consult/2,
+         run/1,
+         fold/3,
+         foldl/3,
+         scramble/1]).
+
+%% diameter-specific
+-export([lport/2,
+         lport/3,
+         listen/2,
+         connect/3,
+         disconnect/4]).
+
+%% common_test-specific
+-export([write_priv/3,
+         read_priv/2,
+         map_priv/3]).
+
+-define(L, atom_to_list).
+
+%% ---------------------------------------------------------------------------
+%% consult/2
+%%
+%% Extract info from the app/appup file (presumably) of the named
+%% application.
+
+consult(Name, Suf)
+  when is_atom(Name), is_atom(Suf) ->
+    case code:lib_dir(Name, ebin) of
+        {error = E, Reason} ->
+            {E, {Name, Reason}};
+        Dir ->
+            consult(filename:join([Dir, ?L(Name) ++ "." ++ ?L(Suf)]))
+    end.
+
+consult(Path) ->
+    case file:consult(Path) of
+        {ok, Terms} ->
+            Terms;
+        {error, Reason} ->
+            {error, {Path, Reason}}
+    end.
+%% Name/Path in the return value distinguish the errors and allow for
+%% a useful badmatch.
+
+%% ---------------------------------------------------------------------------
+%% run/1
+%%
+%% Evaluate functions in parallel and return a list of those that
+%% failed to return. The fun takes a boolean (did the function return
+%% or not), the function that was evaluated, the return value or exit
+%% reason and the prevailing accumulator.
+
+run(L) ->
+    fold(fun cons/4, [], L).
+
+cons(true, _, _, Acc) ->
+    Acc;
+cons(false, F, RC, Acc) ->
+    [{F, RC} | Acc].
+
+%% ---------------------------------------------------------------------------
+%% fold/3
+%%
+%% Parallel fold. Results are folded in the order received.
+
+fold(Fun, Acc0, L)
+  when is_function(Fun, 4) ->
+    Ref = make_ref(),
+    %% Spawn a middleman to collect down messages from processes
+    %% spawned for each function so as not to assume that all DOWN
+    %% messages are ours.
+    MRef = run1([fun fold/4, Ref, Fun, Acc0, L], Ref),
+    {Ref, RC} = down(MRef),
+    RC.
+
+fold(Ref, Fun, Acc0, L) ->
+    recv(run(Ref, L), Ref, Fun, Acc0).
+
+run(Ref, L) ->
+    [{run1(F, Ref), F} || F <- L].
+
+run1(F, Ref) ->
+    {_, MRef} = spawn_monitor(fun() -> exit({Ref, eval(F)}) end),
+    MRef.
+
+recv([], _, _, Acc) ->
+    Acc;
+recv(L, Ref, Fun, Acc) ->
+    {MRef, R} = down(),
+    {MRef, F} = lists:keyfind(MRef, 1, L),
+    recv(lists:keydelete(MRef, 1, L),
+         Ref,
+         Fun,
+         acc(R, Ref, F, Fun, Acc)).
+
+acc({Ref, RC}, Ref, F, Fun, Acc) ->
+    Fun(true, F, RC, Acc);
+acc(Reason, _, F, Fun, Acc) ->
+    Fun(false, F, Reason, Acc).
+
+down(MRef) ->
+    receive {'DOWN', MRef, process, _, Reason} -> Reason end.
+
+down() ->
+    receive {'DOWN', MRef, process, _, Reason} -> {MRef, Reason} end.
+
+%% ---------------------------------------------------------------------------
+%% foldl/3
+%%
+%% Parallel fold. Results are folded in order of the function list.
+
+foldl(Fun, Acc0, L)
+  when is_function(Fun, 4) ->
+    Ref = make_ref(),
+    recvl(run(Ref, L), Ref, Fun, Acc0).
+
+recvl([], _, _, Acc) ->
+    Acc;
+recvl([{MRef, F} | L], Ref, Fun, Acc) ->
+    R = down(MRef),
+    recvl(L, Ref, Fun, acc(R, Ref, F, Fun, Acc)).
+
+%% ---------------------------------------------------------------------------
+%% scramble/1
+%%
+%% Sort a list into random order.
+
+scramble(L) ->
+    foldl(fun(true, _, S, false) -> S end,
+          false,
+          [[fun s/1, L]]).
+
+s(L) ->
+    random:seed(now()),
+    s([], L).
+
+s(Acc, []) ->
+    Acc;
+s(Acc, L) ->
+    {H, [T|Rest]} = lists:split(random:uniform(length(L)) - 1, L),
+    s([T|Acc], H ++ Rest).
+
+%% ---------------------------------------------------------------------------
+%% eval/1
+%%
+%% Evaluate a function in one of a number of forms.
+
+eval({M,[F|A]})
+  when is_atom(F) ->
+    apply(M,F,A);
+
+eval({M,F,A}) ->
+    apply(M,F,A);
+
+eval([F|A])
+  when is_function(F) ->
+    apply(F,A);
+
+eval(L)
+  when is_list(L) ->
+    run(L);
+
+eval(F)
+  when is_function(F,0) ->
+    F().
+
+%% ---------------------------------------------------------------------------
+%% write_priv/3
+%%
+%% Write an arbitrary term to a named file.
+
+write_priv(Config, Name, Term) ->
+    write(path(Config, Name), Term).
+
+write(Path, Term) ->
+    ok = file:write_file(Path, term_to_binary(Term)).
+
+%% read_priv/2
+%%
+%% Read a term from a file.
+
+read_priv(Config, Name) ->
+    read(path(Config, Name)).
+
+read(Path) ->
+    {ok, Bin} = file:read_file(Path),
+    binary_to_term(Bin).
+    
+%% map_priv/3
+%%
+%% Modify a term in a file and return both old and new values.
+
+map_priv(Config, Name, Fun1) ->
+    map(path(Config, Name), Fun1).
+
+map(Path, Fun1) ->
+    T0 = read(Path),
+    T1 = Fun1(T0),
+    write(Path, T1),
+    {T0, T1}.
+
+path(Config, Name)
+  when is_atom(Name) ->
+    path(Config, ?L(Name));
+path(Config, Name) ->
+    Dir = proplists:get_value(priv_dir, Config),
+    filename:join([Dir, Name]).
+
+%% ---------------------------------------------------------------------------
+%% lport/2-3
+%%
+%% Lookup the port number of a tcp/sctp listening transport.
+
+lport(M, Ref) ->
+    lport(M, Ref, 1).
+
+lport(M, Ref, Tries) ->
+    lp(tmod(M), Ref, Tries).
+
+lp(M, Ref, T) ->
+    L = [N || {listen, N, _} <- M:ports(Ref)],
+    if [] /= L orelse T =< 1 ->
+            L;
+       true ->
+            receive after 50 -> ok end,
+            lp(M, Ref, T-1)
+    end.
+
+%% ---------------------------------------------------------------------------
+%% listen/2
+%%
+%% Add a listening transport on the loopback address and a free port.
+
+listen(SvcName, Prot) ->
+    add_transport(SvcName, {listen, opts(Prot, listen)}).
+
+%% ---------------------------------------------------------------------------
+%% connect/3
+%%
+%% Add a connecting transport on and connect to a listening transport
+%% with the specified reference.
+
+connect(Client, Prot, LRef) ->
+    [PortNr] = lport(Prot, LRef, 20),
+    Ref = add_transport(Client, {connect, opts(Prot, PortNr)}),
+    true = diameter:subscribe(Client),
+    ok = receive
+             {diameter_event, Client, {up, Ref, _, _, _}} -> ok
+         after 2000 ->
+                 {Client, Prot, PortNr, process_info(self(), messages)}
+         end,
+    Ref.
+
+%% ---------------------------------------------------------------------------
+%% disconnect/4
+%%
+%% Remove the client transport and expect the server transport to go
+%% down.
+
+disconnect(Client, Ref, Server, LRef) ->
+    true = diameter:subscribe(Server),
+    ok = diameter:remove_transport(Client, Ref),
+    ok = receive
+             {diameter_event, Server, {down, LRef, _, _}} -> ok
+         after 2000 ->
+                 {Client, Ref, Server, LRef, process_info(self(), messages)}
+         end.
+
+%% ---------------------------------------------------------------------------
+
+-define(ADDR, {127,0,0,1}).
+
+add_transport(SvcName, T) ->
+    {ok, Ref} = diameter:add_transport(SvcName, T),
+    Ref.
+
+tmod(tcp) ->
+    diameter_tcp;
+tmod(sctp) ->
+    diameter_sctp.
+
+opts(Prot, T) ->
+    [{transport_module, tmod(Prot)},
+     {transport_config, [{ip, ?ADDR}, {port, 0} | opts(T)]}].
+
+opts(listen) ->
+    [];
+opts(PortNr) ->
+    [{raddr, ?ADDR}, {rport, PortNr}].
diff --git a/lib/diameter/test/diameter_watchdog_SUITE.erl b/lib/diameter/test/diameter_watchdog_SUITE.erl
new file mode 100644
index 0000000000..dec307529a
--- /dev/null
+++ b/lib/diameter/test/diameter_watchdog_SUITE.erl
@@ -0,0 +1,540 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Tests of the RFC3539 watchdog state machine as implemented by
+%% module diameter_watchdog.
+%%
+
+-module(diameter_watchdog_SUITE).
+
+-export([suite/0,
+         all/0,
+         init_per_suite/1,
+         end_per_suite/1]).
+
+%% testcases
+-export([reopen/1, reopen/4]).
+
+-export([start/3, %% diameter_transport callback
+         id/1,    %% jitter callback
+         run/1]).
+
+-include_lib("diameter/include/diameter.hrl").
+-include("diameter_ct.hrl").
+
+%% ===========================================================================
+
+-define(util, diameter_util).
+
+-define(BASE,    diameter_gen_base_rfc3588).
+-define(APPL_ID, diameter_gen_base_rfc3588:id()).
+-define(SUCCESS, 2001).  %% DIAMETER_SUCCESS
+
+%% Addresses for the local and remote diameter nodes. The values don't
+%% matter since we're faking transport.
+-define(LOCALHOST, {127,0,0,1}).
+-define(REMOTEHOST, {10,0,0,1}).
+
+-define(CAPS, #diameter_caps{origin_host = "node.innan.com",
+                             origin_realm = "innan.com",
+                             host_ip_address = [?LOCALHOST],
+                             vendor_id = 1022,
+                             product_name = "remote",
+                             auth_application_id = [?APPL_ID]}).
+
+-define(APPL, #diameter_app{alias = ?MODULE,
+                            dictionary = ?BASE,
+                            module = [?MODULE],
+                            init_state = now(),
+                            id = ?APPL_ID,
+                            mutable = false}).
+
+%% Service record maintained by our faked service process.
+-define(SERVICE, #diameter_service{pid = self(),
+                                   capabilities = ?CAPS,
+                                   applications = [?APPL]}).
+
+%% Watchdog timer as a callback.
+-define(WD(T), {?MODULE, id, [T]}).
+
+%% Watchdog timers used by the testcases. Note that the short timeout
+%% with random jitter is excluded since the reopen/1 isn't smart
+%% enough to deal with it: see ONE_WD below.
+-define(WD_TIMERS, [?WD(6000)
+                    | [F_(T_) || T_ <- [10000, 20000, 30000],
+                                 F_ <- [fun(T__) -> T__ end,
+                                        fun(T__) -> ?WD(T__) end]]]).
+
+%% Transport types.
+-define(TRANSPORTS, [connect, accept]).
+
+%% Message over the transport interface.
+-define(TMSG(T), {diameter, T}).
+
+%% Receive a message within a specified time.
+-define(RECV(T, Timeout),
+        receive T -> now()
+        after Timeout -> ?ERROR({timeout, Timeout})
+        end).
+
+%% Receive a message in a given number of watchdogs, plus or minus
+%% half. Note that the call to now_diff assumes left to right
+%% evaluation order.
+-define(RECV(T, N, WdL, WdH),
+        [?ERROR({received, _Elapsed_, _LowerBound_, N, WdL})
+         || _UpperBound_ <- [(N)*(WdH) + (WdH) div 2],
+            _Elapsed_    <- [now_diff(now(), ?RECV(T, _UpperBound_))],
+            _LowerBound_ <- [(N)*(WdL) - (WdL) div 2],
+            _Elapsed_ =< _LowerBound_*1000]).
+
+%% A timeout that ensures one watchdog. The ensure only one watchdog
+%% requires (Wd + 2000) + 1000 < 2*(Wd - 2000) ==> 7000 < Wd for the
+%% case with random jitter.
+-define(ONE_WD(Wd), jitter(Wd,2000) + 1000).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {minutes, 6}}].%% enough for 11 watchdogs @ 30 sec plus jitter
+
+all() ->
+    [reopen].
+
+init_per_suite(Config) ->
+    ok = diameter:start(),
+    Config.
+
+end_per_suite(_Config) ->
+    ok = diameter:stop().
+
+%% ===========================================================================
+%% # reopen/1
+%% ===========================================================================
+
+%% Test the watchdog state machine for the required failover, failback
+%% and reopen behaviour. Do this by having the testcase replace
+%% diameter_service and start watchdogs, and having this module
+%% implement a transport process that plays the role of the peer
+%% Diameter node.
+
+reopen(_) ->
+    [] = ?util:run([{?MODULE, [run, [reopen, Wd, T, N, M]]}
+                    || Wd <- ?WD_TIMERS,
+                       T <- ?TRANSPORTS,
+                       N <- [0,1,2],
+                       M <- ['DWR', 'DWA', other]]).
+
+reopen(Wd, Type, N, What) ->
+    Ref = make_ref(),
+
+    %% The maker of transport processes.
+    TPid = start({N, Wd, What, Ref}),
+
+    %% Act like diameter_service and start the watchdog process, which
+    %% in turn starts a peer_fsm process, which in turn starts a
+    %% transport process by way of start/3. Messages received by the
+    %% testcase are those sent by diameter_watchdog to the service
+    %% process (= process starting the watchdog).
+    WPid1 = watchdog(Type, Ref, TPid, Wd),
+
+    %% Low/high watchdog timeouts.
+    WdL = jitter(Wd, -2000),
+    WdH = jitter(Wd, 2000),
+
+    %% Connection should come up immediately as a consequence of
+    %% starting the watchdog process. In the accepting case this
+    %% results in a new watchdog on a transport waiting for a new
+    %% connection.
+    ?RECV({connection_up, WPid1, _}, 1000),
+
+    WPid2 = case Type of
+                connect ->
+                    WPid1;
+                accept ->
+                    watchdog(Type, Ref, TPid, Wd)
+            end,
+
+    %%   OKAY          Timer expires &      Failover()
+    %%                 Pending              SetWatchdog()        SUSPECT
+    %%
+    %% Since our transport is replying to N DWR's before becoming
+    %% silent, we should go down after N+2 watchdog_timer expirations:
+    %% that is, after the first unanswered DWR. Knowing the min/max
+    %% watchdog timeout values gives the time interval in which the
+    %% down message is expected.
+    ?RECV({connection_down, WPid1}, N+2, WdL, WdH),
+
+    %%   SUSPECT       Receive DWA          Pending = FALSE
+    %%                                      Failback()
+    %%                                      SetWatchdog()        OKAY
+    %%
+    %%   SUSPECT       Receive non-DWA      Failback()
+    %%                                      SetWatchdog()        OKAY
+    %%
+    %% The transport receives a message before the expiry of another
+    %% watchdog to induce failback.
+    ?RECV({connection_up, WPid1}, WdH),
+
+    %%   OKAY          Timer expires &      SendWatchdog()
+    %%                 !Pending             SetWatchdog()
+    %%                                      Pending = TRUE       OKAY
+    %%
+    %%   OKAY          Timer expires &      Failover()
+    %%                 Pending              SetWatchdog()        SUSPECT
+    %%
+    %% The transport is still not responding to watchdogs so the
+    %% connection should go back down after either one or two watchdog
+    %% expiries, depending on whether or not DWA restored the connection.
+    F = choose(What == 'DWA', 2, 1),
+    ?RECV({connection_down, WPid1}, F, WdL, WdH),
+
+    %%   SUSPECT       Timer expires        CloseConnection()
+    %%                                      SetWatchdog()        DOWN
+    %%
+    %%   DOWN          Timer expires        AttemptOpen()
+    %%                                      SetWatchdog()        DOWN
+    %%
+    %% Our transport tells us when the fake connection is
+    %% reestablished, which should happen after another couple of
+    %% watchdog expiries, the first bringing the watchdog to state
+    %% DOWN, the second triggering an attempt to reopen the
+    %% connection.
+    ?RECV({reopen, Ref}, 2, WdL, WdH),
+
+    %%   DOWN          Connection up        NumDWA = 0
+    %%                                      SendWatchdog()
+    %%                                      SetWatchdog()
+    %%                                      Pending = TRUE       REOPEN
+    %%
+    %%   REOPEN        Receive DWA &        Pending = FALSE
+    %%                 NumDWA < 2           NumDWA++             REOPEN
+    %%
+    %%   REOPEN        Receive DWA &        Pending = FALSE
+    %%                 NumDWA == 2          NumDWA++
+    %%                                      Failback()           OKAY
+    %%
+    %% Now the watchdog should require three received DWA's before
+    %% taking the connection back up. The first DWR is sent directly
+    %% after capabilities exchange so it should take no more than two
+    %% watchdog expiries.
+    ?RECV({connection_up, WPid2, _}, 2, WdL, WdH).
+
+%% ===========================================================================
+
+%% Start the fake transport process. From diameter's point of view
+%% it's started when diameter calls start/3. We start it before this
+%% happens since we use the same fake transport each time diameter
+%% calls start/3. The process lives and dies with the test case.
+start(Config) ->
+    Pid = self(),
+    spawn(fun() -> loop(init(Pid, Config)) end).
+
+%% Transport start from diameter. This may be called multiple times
+%% depending on the testcase.
+start({Type, _Ref}, #diameter_service{}, Pid) ->
+    Ref = make_ref(),
+    MRef = erlang:monitor(process, Pid),
+    Pid ! {start, self(), Type, Ref},
+    {Ref, TPid} = receive
+                      {Ref, _} = T ->
+                          T;
+                      {'DOWN', MRef, process, _, _} = T ->
+                          T
+                  end,
+    erlang:demonitor(MRef, [flush]),
+    {ok, TPid}.
+
+%% id/1
+
+id(T) ->
+    T.
+
+%% ===========================================================================
+
+choose(true, X, _)  -> X;
+choose(false, _, X) -> X.
+
+%% run/1
+%%
+%% A more useful badmatch in case of failure.
+
+run([F|A]) ->
+    ok = try
+             apply(?MODULE, F, A),
+             ok
+         catch
+             E:R ->
+                 {A, E, R, erlang:get_stacktrace()}
+         end.
+
+%% now_diff/2
+
+now_diff(T1, T2) ->
+    timer:now_diff(T2, T1).
+
+%% jitter/2
+
+jitter(?WD(T), _) ->
+    T;
+jitter(T,D) ->
+    T+D.
+
+%% watchdog/4
+%%
+%% Fake the call from diameter_service. The watchdog process will send
+%% messages to the calling "service" process so our tests are that the
+%% watchdog responds as expected.
+
+watchdog(Type, Ref, TPid, Wd) ->
+    Opts = [{transport_module, ?MODULE},
+            {transport_config, TPid},
+            {watchdog_timer, Wd}],
+    monitor(diameter_watchdog:start({Type, Ref},
+                                    {false, Opts, false, ?SERVICE})).
+
+monitor(Pid) ->
+    erlang:monitor(process, Pid),
+    Pid.
+
+%% ===========================================================================
+
+%% Transport process implmentation. Fakes reception of messages by
+%% sending fakes to the parent (peer fsm) process that called start/3.
+
+-record(transport,
+        {type,    %% connect | accept | manager
+         parent,  %% pid() of peer_fsm/ervice process
+         open = false,  %% done with capabilities exchange?
+         config}).%% testcase-specific config
+
+%% init/2
+
+%% Testcase starting the manager.
+init(SvcPid, {_,_,_,_} = Config) ->
+    putr(peer, [{'Origin-Host', hostname() ++ ".utan.com"},
+                {'Origin-Realm', "utan.com"}]),
+    #transport{type = manager,
+               parent = monitor(SvcPid),
+               config = Config};
+
+%% Manager starting a transport.
+init(_, {Type, ParentPid, SvcPid, TwinPid, Peer, {N,_,_,_} = Config}) ->
+    putr(peer, Peer),
+    putr(service, SvcPid),
+    putr(count, init(Type, ParentPid, TwinPid, N)),%% number of DWR's to answer
+    #transport{type = Type,
+               parent = monitor(ParentPid),
+               config = Config}.
+
+init(Type, ParentPid, undefined, N) ->
+    connected(ParentPid, Type),
+    N;
+init(_, _, TPid, _) ->
+    monitor(TPid),
+    3.
+
+%% Generate a unique hostname for the faked peer.
+hostname() ->
+    lists:flatten(io_lib:format("~p-~p-~p", tuple_to_list(now()))).
+
+%% loop/1
+
+loop(S) ->
+    loop(msg(receive T -> T end, S)).
+
+msg(T,S) ->
+    case transition(T,S) of
+        ok ->
+            S;
+        #transport{} = NS ->
+            NS;
+        {stop, Reason} ->
+            x(Reason)
+    end.
+
+x(Reason) ->
+    exit(Reason).
+
+%% transition/2
+
+%% Manager is being asked for a new transport process.
+transition({start, Pid, Type, Ref}, #transport{type = manager,
+                                               parent = SvcPid,
+                                               config = Config}) ->
+    TPid = start({Type, Pid, SvcPid, getr(transport), getr(peer), Config}),
+    Pid ! {Ref, TPid},
+    putr(transport, TPid),
+    ok;
+
+%% Peer fsm or testcase process has died.
+transition({'DOWN', _, process, Pid, _} = T, #transport{parent = Pid}) ->
+    {stop, T};
+
+%% Twin transport process has gone down. In the connect case, the
+%% transport isn't started until this happens in the first place so
+%% connect immediately. In the accept case, fake the peer reconnecting
+%% only after another watchdog expiry.
+transition({'DOWN', _, process, _, _}, #transport{type = Type,
+                                                  config = {_, Wd, _, _}}) ->
+    Tmo = case Type of
+              connect ->
+                  0;
+              accept ->
+                  ?ONE_WD(Wd)
+          end,
+    erlang:send_after(Tmo, self(), reconnect),
+    ok;
+
+transition(reconnect, #transport{type = Type,
+                                 parent = Pid,
+                                 config = {_,_,_,Ref}}) ->
+    getr(service) ! {reopen, Ref},
+    connected(Pid, Type),
+    ok;
+
+%% Peer fsm process is sending CER: fake the peer's CEA.
+transition(?TMSG({send, Bin}), #transport{type = connect,
+                                          open = false,
+                                          parent = Pid}
+                               = S) ->
+    {Code, Flags, _} = ?BASE:msg_header('CER'),
+    <<_:32, Flags:8, Code:24, _:96, _/binary>> = Bin,
+    Hdr = make_header(Bin),
+    recv(Pid, {Hdr, make_cea()}),
+    S#transport{open = true};
+
+%% Peer fsm process is sending CEA.
+transition(?TMSG({send, Bin}), #transport{type = accept,
+                                          open = false}
+                               = S) ->
+    {Code, Flags, _} = ?BASE:msg_header('CEA'),
+    <<_:32, Flags:8, Code:24, _:96, _/binary>> = Bin,
+    S#transport{open = true};
+
+%% Watchdog is sending DWR or DWA.
+transition(?TMSG({send, Bin}), #transport{open = true} = S) ->
+    {Code, _, _} = ?BASE:msg_header('DWR'),
+    {Code, _, _} = ?BASE:msg_header('DWA'),
+    <<_:32, R:1, 0:7, Code:24, _:96, _/binary>> = Bin,
+    Hdr = make_header(Bin),
+    dwa(1 == R, S, Hdr),
+    ok;
+
+%% We're telling ourselves to fake a received message.
+transition({recv, Msg}, #transport{parent = Pid}) ->
+    recv(Pid, Msg),
+    ok;
+
+%% We're telling ourselves to receive a message to induce failback.
+transition(failback = T, #transport{parent = Pid}) ->
+    recv(Pid, eraser(T)),
+    ok.
+
+make_header(Bin) ->
+    #diameter_header{end_to_end_id = E,
+                     hop_by_hop_id = H}
+        = diameter_codec:decode_header(Bin),
+    #diameter_header{end_to_end_id = E,
+                     hop_by_hop_id = H}.
+
+recv(Pid, Msg) ->
+    Pid ! ?TMSG({recv, encode(Msg)}).
+
+%% Replace the end-to-end/hop-by-hop identifiers with those from an
+%% incoming request to which we're constructing a reply.
+encode({Hdr, [_|_] = Msg}) ->
+    #diameter_header{hop_by_hop_id = HBH,
+                     end_to_end_id = E2E}
+        = Hdr,
+    #diameter_packet{bin = Bin} = diameter_codec:encode(?BASE, Msg),
+    <<H:12/binary, _:64, T/binary>> = Bin,
+    <<H/binary, HBH:32, E2E:32, T/binary>>;
+
+encode([_|_] = Msg) ->
+    #diameter_packet{bin = Bin} = diameter_codec:encode(?BASE, Msg),
+    Bin.
+
+connected(Pid, connect) ->
+    Pid ! ?TMSG({self(), connected, make_ref()});
+connected(Pid, accept) ->
+    Pid ! ?TMSG({self(), connected}),
+    recv(Pid, make_cer()).
+
+make_cer() ->
+    ['CER' | getr(peer)] ++ [{'Host-IP-Address', [?REMOTEHOST]},
+                             {'Vendor-Id', 1028},
+                             {'Product-Name', "Utan"},
+                             {'Auth-Application-Id', [?APPL_ID]}].
+
+make_cea() ->
+    ['CER' | Rest] = make_cer(),
+    ['CEA', {'Result-Code', ?SUCCESS} | Rest].
+
+make_dwr() ->
+    ['DWR' | getr(peer)].
+
+make_dwa() ->
+    ['DWR' | Rest] = make_dwr(),
+    ['DWA', {'Result-Code', ?SUCCESS} | Rest].
+
+dwa(false, _, _) ->  %% outgoing was DWA ...
+    ok;
+dwa(true, S, Hdr) -> %% ... or DWR
+    dwa(getr(count), Hdr, S);
+
+%% React to the DWR only after another watchdog expiry. We shouldn't
+%% get another DWR while the answer is pending.
+dwa(0, Hdr, #transport{config = {_, Wd, What, _}}) ->
+    erlang:send_after(?ONE_WD(Wd), self(), failback),
+    putr(failback, make_msg(What, Hdr)),
+    eraser(count);
+
+dwa(undefined, _, _) ->
+    undefined = getr(failback),  %% ensure this is after failback
+    ok;
+
+%% Reply with DWA.
+dwa(N, Hdr, #transport{parent = Pid}) ->
+    putr(count, N-1),
+    recv(Pid, {Hdr, make_dwa()}).
+
+%% Answer to received DWR.
+make_msg('DWA', Hdr) ->
+    {Hdr, make_dwa()};
+
+%% DWR from peer.
+make_msg('DWR', _) ->
+    make_dwr();
+
+%% An unexpected answer is discarded after passing through the
+%% watchdog state machine.
+make_msg(other, _) ->
+    ['RAA', {'Session-Id', diameter:session_id("abc")},
+            {'Result-Code', 2001}
+          | getr(peer)].
+
+putr(Key, Val) ->
+    put({?MODULE, Key}, Val).
+
+getr(Key) ->
+    get({?MODULE, Key}).
+
+eraser(Key) ->
+    erase({?MODULE, Key}).
diff --git a/lib/diameter/test/modules.mk b/lib/diameter/test/modules.mk
index ddc720d0c1..75fdd0bd1d 100644
--- a/lib/diameter/test/modules.mk
+++ b/lib/diameter/test/modules.mk
@@ -17,31 +17,26 @@
 #
 # %CopyrightEnd%
 
-TEST_SPEC_FILE = diameter.spec
-
+TEST_SPEC_FILE  = diameter.spec
 COVER_SPEC_FILE = diameter.cover
 
-BEHAVIOUR_MODULES = 
-
 MODULES = \
-	$(BEHAVIOUR_MODULES) \
-	diameter_SUITE \
-	diameter_app_test \
-	diameter_appup_test \
-	diameter_compiler_test \
-	diameter_config_test \
-	diameter_peer_test \
-	diameter_reg_test \
-	diameter_session_test \
-	diameter_stats_test \
-	diameter_sync_test \
-	diameter_tcp_test \
-	diameter_test_lib \
-	diameter_test_server
-
-
-INTERNAL_HRL_FILES = \
-	diameter_test_lib.hrl
-
-
-
+	diameter_ct \
+	diameter_util \
+	diameter_enum \
+	diameter_codec_SUITE \
+	diameter_codec_test \
+	diameter_app_SUITE \
+	diameter_dict_SUITE \
+	diameter_reg_SUITE \
+	diameter_sync_SUITE \
+	diameter_stats_SUITE \
+	diameter_watchdog_SUITE \
+	diameter_transport_SUITE \
+	diameter_traffic_SUITE \
+	diameter_relay_SUITE \
+	diameter_tls_SUITE \
+	diameter_failover_SUITE
+
+HRL_FILES = \
+	diameter_ct.hrl
diff --git a/lib/diameter/test/slask/diameter_persistent_table_test.erl b/lib/diameter/test/slask/diameter_persistent_table_test.erl
deleted file mode 100644
index bb907a5777..0000000000
--- a/lib/diameter/test/slask/diameter_persistent_table_test.erl
+++ /dev/null
@@ -1,495 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the persistent-table component of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_persistent_table_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/1,
-	 suite_init/1, suite_fin/1,
-
-	 simple_start_and_stop/1, 
-	 table_create_and_delete/1
-
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
--record(command, {id, desc, cmd, verify}).
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all(suite) ->
-    Cases = 
-	[
-	 simple_start_and_stop,
-	 table_create_and_delete
-	],
-    {req, [], {conf, suite_init, Cases, suite_fin}}.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(suite) -> [];
-suite_init(doc) -> [];
-suite_init(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(suite) -> [];
-suite_fin(doc) -> [];
-suite_fin(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case(s)
-%% 
-
-simple_start_and_stop(suite) ->
-    [];
-simple_start_and_stop(doc) ->
-    [];
-simple_start_and_stop(Config) when is_list(Config) ->
-    diameter:enable_trace(100, io),
-    case diameter_persistent_table:start_link() of
-	{ok, Pid} ->
-	    unlink(Pid);
-	{error, Reason} ->
-	    exit({failed_starting, Reason})
-    end,
-
-    ok = diameter_persistent_table:stop(),
-    ok.
-
-
-table_create_and_delete(suite) ->
-    [];
-table_create_and_delete(doc) ->
-    [];
-table_create_and_delete(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    
-    %% Command range values
-    Initial        = 100,
-    ClientCreation = 200,
-    Nice           = 300,
-    Evil           = 400,
-    End            = 500,
-
-    Verbosity = min, 
-    %% Verbosity = max, 
-
-    Data01 = lists:sort([{a, 10},  {b, 20},  {c, 30}]), 
-    Data02 = lists:sort([{x, 100}, {y, 200}, {z, 300}]),
-
-    Commands = 
-	[
-	 %% Initial commands
-	 initial_command( Initial + 0,
-			  "enable trace", 
-			  fun() -> diameter:enable_trace(Verbosity, io) end, 
-			  ok),
-	 initial_command( Initial + 1,
-                          "start persistent-table process",
-                          fun() -> 
-				  case diameter_persistent_table:start_link() of
-				      {ok, Pid} when is_pid(Pid) ->
-					  ok;
-				      Error ->
-					  Error
-				  end
-			  end,
-			  ok),
-
-	 client_create_command( ClientCreation + 1,
-				"1",
-				client01), 
-				  
-	 client_create_command( ClientCreation + 2,
-				"2",
-				client02),
-
-	 nice_command( Nice + 1,
-		       "client 1 create table 1",
-		       fun() -> 
-			       create_table(client01, tab01, []),
-			       diameter_persistent_table:which_tables()
-		       end,
-		       fun([tab01] = Tabs) ->
-			       {ok, Tabs};
-			  (Unexpected) ->
-			       {error, {bad_tables, Unexpected}}
-		       end),
-
-	 nice_command( Nice + 2,
-		       "client 1 create table 2",
-		       fun() -> 
-			       create_table(client01, tab02, []),
-			       diameter_persistent_table:which_tables()
-		       end,
-		       fun([tab01, tab02] = Tabs) ->
-			       {ok, Tabs};
-			  ([tab02, tab01] = Tabs) ->
-			       {ok, Tabs};
-			  (Unexpected) ->
-			       {error, {bad_tables, Unexpected}}
-		       end),
-
-	 nice_command( Nice + 3,
-		       "client 2 create table 1",
-		       fun() -> 
-			       create_table(client02, tab03, []),
-			       diameter_persistent_table:which_tables(whereis(client02))
-		       end,
-		       fun([tab03] = Tabs) ->
-			       {ok, Tabs}; 
-			  (Unexpected) ->
-			       {error, {bad_tables, Unexpected}}
-		       end), 
-
-	 nice_command( Nice + 4,
-		       "client 1 delete table 1",
-		       fun() -> 
-			       delete_table(client01, tab01),
-			       diameter_persistent_table:which_tables(whereis(client01))
-		       end,
-		       fun([tab02] = Tabs) ->
-			       {ok, Tabs}; 
-			  (Unexpected) ->
-			       {error, {bad_tables, Unexpected}}
-		       end), 
-
-	 nice_command( Nice + 5,
-		       "client 1 fill in some data in tab02",
-		       fun() ->
-			       populate_table(client01, tab02, Data01),
-			       lists:sort(ets:tab2list(tab02))
-		       end,
-		       fun(Data) when Data =:= Data01 ->
-			       {ok, Data}; 
-			  (Unexpected) ->
-			       {error, {bad_data, Unexpected}}
-		       end), 
-
-	 nice_command( Nice + 6,
-		       "client 2 fill in some data in tab03",
-		       fun() ->
-			       populate_table(client02, tab03, Data02),
-			       lists:sort(ets:tab2list(tab03))
-		       end,
-		       fun(Data) when Data =:= Data02 ->
-			       {ok, Data}; 
-			  (Unexpected) ->
-			       {error, {bad_data, Unexpected}}
-		       end), 
-
-	 nice_command( Nice + 7,
-		       "simulate client 1 crash",
-		       fun() ->
-			       simulate_crash(client01)
-		       end,
-		       fun(ok) ->
-			       {ok, crashed}; 
-			  (Unexpected) ->
-			       {error, {bad_simulation_result, Unexpected}}
-		       end), 
-
-	 client_create_command( Nice + 8,
-				"1 restarted",
-				client01),
-
-	 nice_command( Nice + 9,
-		       "client 1 create tab02 - verify data",
-		       fun() -> 
-			       create_table(client01, tab02, []),
-			       lists:sort(ets:tab2list(tab02))
-		       end,
-		       fun(Data) when Data =:= Data01 ->
-			       {ok, Data}; 
-			  (Unexpected) ->
-			       {error, {bad_data, Unexpected}}
-		       end),
-
-	 evil_command( Evil + 1,
-		       "try (and fail) to delete the non-existing table tab04",
-		       fun() ->
-			       delete_table(client02, tab04)
-		       end,
-		       fun({error, {unknown_table, tab04}}) ->
-			       {ok, tab04};
-			  (X) ->
-			       {error, {bad_result, X}}
-		       end),
-
-	 evil_command( Evil + 2,
-		       "try (and fail) to delete a not owned table tab02",
-		       fun() ->
-			       delete_table(client02, tab02)
-		       end,
-		       fun({error, {not_owner, tab02}}) ->
-			       {ok, tab02};
-			  (X) ->
-			       {error, {bad_result, X}}
-		       end),
-
-	 evil_command( Evil + 3,
-		       "try (and fail) to create an already existing *and* owned table - tab03",
-		       fun() ->
-			       create_table(client02, tab03, [])
-		       end,
-		       fun({error, {already_owner, tab03}}) ->
-			       {ok, tab03};
-			  (X) ->
-			       {error, {bad_result, X}}
-		       end), 
-				  
-	 evil_command( Evil + 4,
-		       "try (and fail) to create an already existing not owned table - tab02",
-		       fun() ->
-			       create_table(client02, tab02, [])
-		       end,
-		       fun({error, {not_owner, _Owner, tab02}}) ->
-			       {ok, tab02};
-			  (X) ->
-			       {error, {bad_result, X}}
-		       end),
-
-	 end_command( End + 1,
-		      "stop client01",
-		      fun() -> stop_client(client01) end),
-
-	 end_command( End + 2,
-		      "stop client02",
-		      fun() -> stop_client(client02) end),
-
-	 end_command( End + 2,
-		      "stop persistent-table",
-		      fun() -> diameter_persistent_table:stop() end), 
-
-	 evil_command( Evil + 5,
-		       "try (and fail) to stop a not running persistent-table process",
-		       fun() ->
-			       diameter_persistent_table:stop()
-		       end,
-		       fun({'EXIT', {noproc, _}}) ->
-			       {ok, not_running};
-			  (X) ->
-			       {error, {bad_result, X}}
-		       end)
-				  
-	],
-    
-    exec(Commands).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% 
-%% Command engine
-%% 
-
-exec([]) ->
-    ok;
-exec([#command{id     = No,
-               desc   = Desc,
-               cmd    = Cmd,
-               verify = Verify}|Commands]) ->
-    io:format("Executing command ~2w: ~s: ", [No, Desc]),
-    case (catch Verify((catch Cmd()))) of
-        {ok, OK} ->
-            io:format("ok => ~p~n", [OK]),
-            exec(Commands);
-        {error, Reason} ->
-            io:format("error => ~p~n", [Reason]),
-            {error, {bad_result, No, Reason}};
-        Error ->
-            io:format("exit => ~p~n", [Error]),
-            {error, {unexpected_result, No, Error}}
-    end.
-
-initial_command(No, Desc0, Cmd, VerifyVal) when is_function(Cmd) ->
-    Desc = lists:flatten(io_lib:format("Initial - ~s", [Desc0])),
-    command(No, Desc, Cmd, VerifyVal).
-
-client_create_command(No, Desc0, Name) ->
-    Desc = lists:flatten(io_lib:format("Client create - ~s", [Desc0])),
-    Self = self(), 
-    Cmd  = fun() -> start_client(Self, Name) end,
-    command(No, Desc, Cmd, ok).
-
-nice_command(No, Desc0, Cmd, Verify) 
-  when is_function(Cmd) andalso is_function(Verify) ->
-    Desc = lists:flatten(io_lib:format("Nice - ~s", [Desc0])),
-    command(No, Desc, Cmd, Verify).
-
-evil_command(No, Desc0, Cmd, Verify) 
-  when is_function(Cmd) andalso is_function(Verify) ->
-    Desc = lists:flatten(io_lib:format("Evil - ~s", [Desc0])),
-    command(No, Desc, Cmd, Verify).
-
-end_command(No, Desc0, Cmd) when is_function(Cmd) ->
-    Desc = lists:flatten(io_lib:format("End - ~s", [Desc0])),
-    command(No, Desc, Cmd, ok).
-
-command(No, Desc, Cmd, Verify) 
-  when (is_integer(No) andalso 
-	is_list(Desc) andalso
-	is_function(Cmd) andalso 
-	is_function(Verify)) ->
-    #command{id     = No,
-             desc   = Desc,
-             cmd    = Cmd,
-             verify = Verify};
-command(No, Desc, Cmd, VerifyVal) 
-  when (is_integer(No) andalso 
-	is_list(Desc) andalso
-	is_function(Cmd)) ->
-    Verify = 
-	fun(Val) ->
-		case Val of
-		    VerifyVal ->
-			{ok, Val};
-		    _ ->
-			{error, Val}
-		end
-	end,
-    #command{id     = No,
-             desc   = Desc,
-             cmd    = Cmd,
-             verify = Verify}.
-
-
-start_client(Parent, Name) ->
-    ClientPid = spawn_link(fun() -> client_init(Parent, Name) end),
-    receive
-	{ClientPid, started} ->
-	    ClientPid,
-	    ok;
-	{'EXIT', ClientPid, Reason} ->
-	    {error, {failed_starting_client, Reason}}
-    end.
-
-stop_client(Client) ->
-    Pid = whereis(Client),
-    Pid ! stop,
-    receive
-	{'EXIT', Pid, normal} ->
-	    ok
-    end.
-
-create_table(Client, Tab, Opts) ->
-    Self = self(),
-    Pid = whereis(Client),
-    Pid ! {create_table, Tab, Opts, Self},
-    receive
-	{Pid, created} ->
-	    ok;
-	{Pid, {create_failed, Error}} ->
-	    Error
-    end.
-
-delete_table(Client, Tab) ->
-    Self = self(),
-    Pid = whereis(Client),
-    Pid ! {delete_table, Tab, Self},
-    receive
-	{Pid, deleted} ->
-	    ok;
-	{Pid, {delete_failed, Error}} ->
-	    Error
-    end.
-
-populate_table(Client, Tab, Data) ->
-    Self = self(),
-    Pid = whereis(Client),
-    Pid ! {populate_table, Tab, Data, Self},
-    receive
-	{Pid, populated} ->
-	    ok
-    end.
-
-simulate_crash(Client) ->
-    Pid = whereis(Client),
-    Pid ! simulate_crash, 
-    receive
-	{'EXIT', Pid, simulated_crash} ->
-	    ok
-    end.
-
-client_init(Parent, Name) ->
-    erlang:register(Name, self()),
-    process_flag(trap_exit, true),
-    Parent ! {self(), started}, 
-    client_loop().
-
-client_loop() ->
-    receive
-	stop ->
-	    exit(normal);
-
-	{create_table, T, Opts, From} when is_atom(T) andalso is_list(Opts) ->
-	    case diameter_persistent_table:create(T, Opts) of
-		ok ->
-		    From ! {self(), created};
-		Error ->
-		    From ! {self(), {create_failed, Error}}
-	    end,
-	    client_loop();
-
-	{delete_table, T, From} ->
-	    case diameter_persistent_table:delete(T) of
-		ok ->
-		    From ! {self(), deleted};
-		Error ->
-		    From ! {self(), {delete_failed, Error}}
-	    end,
-	    client_loop();
-	
-	{populate_table, Tab, Data, From} ->
-	    ets:insert(Tab, Data),
-	    From ! {self(), populated},
-	    client_loop();	
-	
-	simulate_crash ->
-	    exit(simulated_crash)
-    end.
-
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 9f822e4e85..c783450c9f 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 0.9
+DIAMETER_VSN = 0.10
 PRE_VSN      =
 APP_VSN      = "$(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)"
 
diff --git a/lib/docbuilder/doc/src/notes.xml b/lib/docbuilder/doc/src/notes.xml
index d04c8dd839..95f24ea9ca 100644
--- a/lib/docbuilder/doc/src/notes.xml
+++ b/lib/docbuilder/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2010</year>
+      <year>2007</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,22 @@
   <p>This document describes the changes made to the DocBuilder
      application.</p>
 
+<section><title>Docbuilder 0.9.8.11</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The docbuilder application has been deprecated and will
+	    be removed in the R15 release.</p>
+          <p>
+	    Own Id: OTP-9509</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Docbuilder 0.9.8.10</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/docbuilder/src/docb_gen.erl b/lib/docbuilder/src/docb_gen.erl
index 0d8d640324..75494314f1 100644
--- a/lib/docbuilder/src/docb_gen.erl
+++ b/lib/docbuilder/src/docb_gen.erl
@@ -18,6 +18,10 @@
 -module(docb_gen).
 
 -export([module/1, module/2, users_guide/1, users_guide/2]).
+-deprecated([{module,1,next_major_release},
+	     {module,2,next_major_release},
+	     {users_guide,1,next_major_release},
+	     {users_guide,2,next_major_release}]).
 
 -record(args, {suffix=".xml",
 	       layout=docb_edoc_xml_cb,
diff --git a/lib/docbuilder/src/docb_main.erl b/lib/docbuilder/src/docb_main.erl
index 4f5f035a65..c20cfc8e67 100644
--- a/lib/docbuilder/src/docb_main.erl
+++ b/lib/docbuilder/src/docb_main.erl
@@ -436,11 +436,11 @@ transform(From, To, Opts, File, Tree) ->
     case catch Filter:transform(File, Tree, Opts) of
 
 	%% R5C
-	{'EXIT', {undef, [{Filter, transform, [File, Tree, Opts]}|_]}}->
+	{'EXIT', {undef, [{Filter, transform, [File, Tree, Opts],_}|_]}}->
 	    %% No transformation defined
 	    finish_transform(Tree, File, Opts, Filter);
 	
-	{'EXIT', {undef, {Filter, transform, [File, Tree, Opts]}}} ->
+	{'EXIT', {undef, {Filter, transform, [File, Tree, Opts],_}}} ->
 	    %% No transformation defined
 	    finish_transform(Tree, File, Opts, Filter);
 
@@ -507,16 +507,16 @@ pp({Tag, Optional, Args}, TagPath, Level, Filter, Opts) ->
     Rule_3_result =
 	case catch Filter:rule(TagPath1, {Level,Optional1,Args},Opts) of
 	    %% R5C
-	    {'EXIT', {undef, [{_, rule, _}|_]}} -> % No rule/3 defined
+	    {'EXIT', {undef, [{_, rule, _, _}|_]}} -> % No rule/3 defined
 		failed;
 
-	    {'EXIT', {undef, {_, rule, _}}} -> % No rule/3 defined
+	    {'EXIT', {undef, {_, rule, _, _}}} -> % No rule/3 defined
 		failed;
 	    %% R5C
-	    {'EXIT', {function_clause, [{_, rule, _}|_]}} -> % No MATCHING rule/3
+	    {'EXIT', {function_clause, [{_, rule, _, _}|_]}} -> % No MATCHING rule/3
 		failed;
 
-	    {'EXIT', {function_clause, {_, rule, _}}} -> % No MATCHING rule/3
+	    {'EXIT', {function_clause, {_, rule, _, _}}} -> % No MATCHING rule/3
 		failed;
 
 	    {'EXIT', What} ->
diff --git a/lib/docbuilder/src/docb_transform.erl b/lib/docbuilder/src/docb_transform.erl
index 9c7561b07b..736ac92274 100644
--- a/lib/docbuilder/src/docb_transform.erl
+++ b/lib/docbuilder/src/docb_transform.erl
@@ -18,6 +18,8 @@
 -module(docb_transform).
 
 -export([file/1, file/2]).
+-deprecated([{file,1,next_major_release},
+	     {file,2,next_major_release}]).
 
 %% file(File) -> ok | {error, Reason}
 %% file(File, Opts) -> ok | {error, Reason}
diff --git a/lib/docbuilder/src/docb_xml_check.erl b/lib/docbuilder/src/docb_xml_check.erl
index 8ae5cd2eac..5912e22e7b 100644
--- a/lib/docbuilder/src/docb_xml_check.erl
+++ b/lib/docbuilder/src/docb_xml_check.erl
@@ -18,6 +18,7 @@
 -module(docb_xml_check).
 
 -export([validate/1]).
+-deprecated([{validate,1,next_major_release}]).
 
 %% validate(File) -> ok | error | {error, badfile}
 %%   File = string(), file name with or without ".xml" extension
diff --git a/lib/docbuilder/vsn.mk b/lib/docbuilder/vsn.mk
index 2475966ec2..6df438a537 100644
--- a/lib/docbuilder/vsn.mk
+++ b/lib/docbuilder/vsn.mk
@@ -1 +1 @@
-DOCB_VSN = 0.9.8.10
+DOCB_VSN = 0.9.8.11
diff --git a/lib/edoc/Makefile b/lib/edoc/Makefile
index e512e390e3..1add669398 100644
--- a/lib/edoc/Makefile
+++ b/lib/edoc/Makefile
@@ -13,8 +13,6 @@
 # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 # AB. All Rights Reserved.''
 # 
-#     $Id$
-#
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
diff --git a/lib/edoc/doc/Makefile b/lib/edoc/doc/Makefile
index a0f6484382..7a59809d9b 100644
--- a/lib/edoc/doc/Makefile
+++ b/lib/edoc/doc/Makefile
@@ -13,8 +13,6 @@
 # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 # AB. All Rights Reserved.''
 # 
-#     $Id: Makefile,v 1.1.1.1 2004/10/04 13:53:33 richardc Exp $
-#
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
@@ -80,12 +78,3 @@ release_docs_spec: docs
 
 
 release_spec:
-
-
-
-# ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-#-include make.dep
-
-
diff --git a/lib/edoc/doc/overview.edoc b/lib/edoc/doc/overview.edoc
index bd603b7a13..2af425272e 100644
--- a/lib/edoc/doc/overview.edoc
+++ b/lib/edoc/doc/overview.edoc
@@ -3,7 +3,7 @@
 	EDoc overview page
 
 
-@author Richard Carlsson <[email protected]>
+@author Richard Carlsson <[email protected]>
 @copyright 2003-2006 Richard Carlsson
 @version {@version}
 @title Welcome to EDoc
@@ -277,12 +277,12 @@ The following tags can be used before a module declaration:
       Examples:
 ```%% @author Richard Carlsson'''
 
-```%% @author Richard Carlsson <[email protected]>
+```%% @author Richard Carlsson <[email protected]>
    %%   [http://user.it.uu.se/~richardc/]'''
 
-```%% @author <[email protected]>'''
+```%% @author <[email protected]>'''
 
-```%% @author [email protected] [http://user.it.uu.se/~richardc/]'''
+```%% @author [email protected] [http://user.it.uu.se/~richardc/]'''
       </dd>
 
 <dt><a name="mtag-copyright">`@copyright'</a></dt>
@@ -1084,10 +1084,11 @@ Details:
       the Erlang programming language.</li>
   <li>`boolean()' is the subset of `atom()' consisting
       of the atoms `true' and `false'.</li>
-  <li>`char()' is a subset of
-      `integer()' representing character codes.</li>
+  <li>`char()' is the subset of `integer()' representing
+      Unicode character codes: hex 000000-10FFFF.</li>
   <li>`tuple()' is the set of all tuples `{...}'.</li>
-  <li>`list(T)' is just an alias for `[T]'.</li>
+  <li>`list(T)' is just an alias for `[T]'; list() is an alias
+      for `list(any())', i.e., `[any()]'.</li>
   <li>`nil()' is an alias for the empty list `[]'.</li>
   <li>`cons(H,T)' is the list constructor. This is usually not
       used directly. It is possible to recursively define `list(T)
diff --git a/lib/edoc/doc/src/Makefile b/lib/edoc/doc/src/Makefile
index 5ee0096f0f..b933094464 100644
--- a/lib/edoc/doc/src/Makefile
+++ b/lib/edoc/doc/src/Makefile
@@ -13,8 +13,6 @@
 # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 # AB. All Rights Reserved.''
 # 
-#     $Id$
-#
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
diff --git a/lib/edoc/doc/src/make.dep b/lib/edoc/doc/src/make.dep
deleted file mode 100644
index b46e36314f..0000000000
--- a/lib/edoc/doc/src/make.dep
+++ /dev/null
@@ -1,21 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex chapter.tex edoc.tex edoc_doclet.tex \
-		edoc_extract.tex edoc_layout.tex edoc_lib.tex \
-		edoc_run.tex part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index 31a54788e5..b220067bbe 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -31,6 +31,57 @@
   <p>This document describes the changes made to the EDoc
     application.</p>
 
+<section><title>Edoc 0.7.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p><c>no_return</c> is a new built-in type. </p>
+          <p>
+	    Own Id: OTP-9350</p>
+        </item>
+        <item>
+          <p>
+	    synchronized with edoc development version</p>
+          <p>
+	    forgot to ensure that xmerl is found in path for
+	    include_lib to work</p>
+          <p>
+	    fix -spec declaration that doesn't work in R13B04</p>
+          <p>
+	    eliminate warnings about unused imports</p>
+          <p>
+	    removed CVS-keywords from source files (Thanks to Richard
+	    Carlsson )</p>
+          <p>
+	    Own Id: OTP-9463</p>
+        </item>
+        <item>
+          <p>
+	    Add a proplist() type</p>
+          <p>
+	    Recently I was adding specs to an API and found that
+	    there is no canonical proplist() type defined. (Thanks to
+	    Ryan Zezeski)</p>
+          <p>
+	    Own Id: OTP-9499</p>
+        </item>
+        <item>
+          <p>
+	    Removed some never-matching clauses reported by dialyzer
+	    Fix macro expansion in comments following Erlang types
+	    URI-escape bytes as two hex digits always (reported by
+	    Alfonso De Gregorio) Updated author e-mail Recognize some
+	    more URI schemas in wiki text, in particular https
+	    (Thanks to Richard Carlsson)</p>
+          <p>
+	    Own Id: OTP-9590</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Edoc 0.7.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/edoc/include/Makefile b/lib/edoc/include/Makefile
index 0533c27567..5b2ad38c9d 100644
--- a/lib/edoc/include/Makefile
+++ b/lib/edoc/include/Makefile
@@ -13,8 +13,6 @@
 # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 # AB. All Rights Reserved.''
 # 
-#     $Id$
-#
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
diff --git a/lib/edoc/include/edoc_doclet.hrl b/lib/edoc/include/edoc_doclet.hrl
index a99ff1fbab..60ec7f44e4 100644
--- a/lib/edoc/include/edoc_doclet.hrl
+++ b/lib/edoc/include/edoc_doclet.hrl
@@ -18,7 +18,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% Author contact: [email protected]
+%% Author contact: [email protected]
 %% =====================================================================
 
 -define(NO_APP, []).
diff --git a/lib/edoc/priv/edoc_generate.src b/lib/edoc/priv/edoc_generate.src
index e87fdbc902..7ec89207b0 100644
--- a/lib/edoc/priv/edoc_generate.src
+++ b/lib/edoc/priv/edoc_generate.src
@@ -14,9 +14,6 @@
 # Portions created by Ericsson are Copyright 1999-2000, Ericsson 
 # Utvecklings AB. All Rights Reserved.''
 # 
-#     $Id$
-#
-#
 
 #EDOC_DIR=/clearcase/otp/internal_tools/edoc
 EDOC_DIR=/home/otp/sgml/edoc-%EDOC_VSN%
diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile
index 9c5a9d30d1..fcb0b61292 100644
--- a/lib/edoc/src/Makefile
+++ b/lib/edoc/src/Makefile
@@ -23,7 +23,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/edoc-$(VSN)
 
 EBIN = ../ebin
 XMERL = ../../xmerl
-ERL_COMPILE_FLAGS += -I../include -I$(XMERL)/include +warn_unused_vars +nowarn_shadow_vars +warn_unused_import +warn_deprecated_guard
+ERL_COMPILE_FLAGS += -pa $(XMERL) -I../include -I$(XMERL)/include +warn_unused_vars +nowarn_shadow_vars +warn_unused_import +warn_deprecated_guard
 
 SOURCES= \
 	edoc.erl edoc_data.erl edoc_doclet.erl edoc_extract.erl \
diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl
index 360f2dbc9e..544465b14a 100644
--- a/lib/edoc/src/edoc.erl
+++ b/lib/edoc/src/edoc.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 2001-2007 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @version {@version}
 %% @end
 %% =====================================================================
@@ -60,8 +58,6 @@
 
 -compile({no_auto_import,[error/1]}).
 
--import(edoc_report, [report/2, report/3, error/1, error/3]).
-
 -include("edoc.hrl").
 
 
@@ -179,8 +175,8 @@ application(App, Options) when is_atom(App) ->
  	Dir when is_list(Dir) ->
  	    application(App, Dir, Options);
  	_ ->
- 	    report("cannot find application directory for '~s'.",
- 		   [App]),
+	    edoc_report:report("cannot find application directory for '~s'.",
+                               [App]),
  	    exit(error)
     end.
 
@@ -663,8 +659,8 @@ read_source(Name, Opts0) ->
 	    check_forms(Forms, Name),
 	    Forms;
 	{error, R} ->
-	    error({"error reading file '~s'.",
-		   [edoc_lib:filename(Name)]}),
+	    edoc_report:error({"error reading file '~s'.",
+                               [edoc_lib:filename(Name)]}),
 	    exit({error, R})
     end.
 
@@ -688,11 +684,10 @@ check_forms(Fs, Name) ->
 		 error_marker ->
 		     case erl_syntax:error_marker_info(F) of
 			 {L, M, D} ->
-			     error(L, Name, {format_error, M, D});
-
+			     edoc_report:error(L, Name, {format_error, M, D});
 			 Other ->
-			     report(Name, "unknown error in "
-				    "source code: ~w.", [Other])
+			     edoc_report:report(Name, "unknown error in "
+                                                "source code: ~w.", [Other])
 		     end,
 		     exit(error);
 		 _ ->
diff --git a/lib/edoc/src/edoc.hrl b/lib/edoc/src/edoc.hrl
index 31cf45ade9..98debba4ab 100644
--- a/lib/edoc/src/edoc.hrl
+++ b/lib/edoc/src/edoc.hrl
@@ -18,7 +18,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% Author contact: [email protected]
+%% Author contact: [email protected]
 %% =====================================================================
 
 %% Note: Documentation in this file is included by edoc_extract.erl
diff --git a/lib/edoc/src/edoc_data.erl b/lib/edoc/src/edoc_data.erl
index 27f43dca5a..aad0b14371 100644
--- a/lib/edoc/src/edoc_data.erl
+++ b/lib/edoc/src/edoc_data.erl
@@ -14,11 +14,9 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @private
 %% @copyright 2003 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @end
 %% =====================================================================
diff --git a/lib/edoc/src/edoc_doclet.erl b/lib/edoc/src/edoc_doclet.erl
index 30eef3e63a..385d20e9ae 100644
--- a/lib/edoc/src/edoc_doclet.erl
+++ b/lib/edoc/src/edoc_doclet.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 2003-2006 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @end
 %% =====================================================================
@@ -52,7 +50,7 @@
 -define(IMAGE, "erlang.png").
 -define(NL, "\n").
 
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 %% Sources is the list of inputs in the order they were found.  Packages
 %% and Modules are sorted lists of atoms without duplicates. (They
diff --git a/lib/edoc/src/edoc_extract.erl b/lib/edoc/src/edoc_extract.erl
index 5e28762c53..5a79e127f6 100644
--- a/lib/edoc/src/edoc_extract.erl
+++ b/lib/edoc/src/edoc_extract.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: $
-%%
 %% @copyright 2001-2003 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @end
 %% =====================================================================
@@ -77,7 +75,7 @@ source(Forms, Comments, File, Env, Opts) when is_list(Forms) ->
     source(Forms1, Comments, File, Env, Opts);
 source(Forms, Comments, File, Env, Opts) ->
     Tree = erl_recomment:quick_recomment_forms(Forms, Comments),
-    TypeDocs = find_type_docs(Forms, Comments),
+    TypeDocs = find_type_docs(Forms, Comments, Env, File),
     source1(Tree, File, Env, Opts, TypeDocs).
 
 %% @spec source(Forms, File::filename(), Env::edoc_env(),
@@ -113,7 +111,7 @@ source(Forms, Comments, File, Env, Opts) ->
 source(Forms, File, Env, Opts) when is_list(Forms) ->
     source(erl_syntax:form_list(Forms), File, Env, Opts);
 source(Tree, File0, Env, Opts) ->
-    TypeDocs = find_type_docs(Tree, []),
+    TypeDocs = find_type_docs(Tree, [], Env, File0),
     source1(Tree, File0, Env, Opts, TypeDocs).
 
 %% Forms0 and Comments is used for extracting Erlang type documentation.
@@ -238,8 +236,8 @@ file(File, Context, Env, Opts) ->
     case file:read_file(File) of
 	{ok, Bin} ->
 	    {ok, text(binary_to_list(Bin), Context, Env, Opts, File)};
-	{error, _R} = Error ->
-	    Error
+        {error, _} = Error ->
+            Error
     end.
 
 
@@ -298,8 +296,8 @@ get_module_info(Forms, File) ->
     {Name, Vars} = case lists:keyfind(module, 1, L) of
 		       {module, N} when is_atom(N) ->
 			   {N, none};
-		       {module, {N, _Vs} = NVs} when is_atom(N) ->
-			   NVs;
+		       {module, {N, _}=Mod} when is_atom(N) ->
+			   Mod;
 		       _ ->
 			   report(File, "module name missing.", []),
 			   exit(error)
@@ -637,14 +635,17 @@ file_macros(_Context, Env) ->
 %% The same thing using -type:
 %%   -type t() :: t1(). % Some docs of t/0;
 %%   Further docs of t/0.
-find_type_docs(Forms0, Comments) ->
+find_type_docs(Forms0, Comments, Env, File) ->
     Tree = erl_recomment:recomment_forms(Forms0, Comments),
     Forms = preprocess_forms(Tree),
-    edoc_specs:docs(Forms, fun find_fun/2).
+    Env1 = add_macro_defs(edoc_macros:std_macros(Env), [], Env),
+    F = fun(C, Line) -> find_fun(C, Line, Env1, File) end,
+    edoc_specs:docs(Forms, F).
 
-find_fun(C0, Line) ->
+find_fun(C0, Line, Env, File) ->
     C1 = comment_text(C0),
     Text = lists:append([C#comment.text || C <- C1]),
     Comm = #comment{line = Line, text = Text},
     [Tag | _] = scan_tags([Comm]),
-    Tag.
+    [Tag1] = edoc_macros:expand_tags([Tag], Env, File),
+    Tag1.
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index 3ec87b7060..951cec121c 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -14,9 +14,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: $
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2001-2006 Richard Carlsson
 %% @see edoc
 %% @end
@@ -33,7 +31,7 @@
 
 -import(edoc_report, [report/2]).
 
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 -define(HTML_EXPORT, xmerl_html).
 -define(DEFAULT_XML_EXPORT, ?HTML_EXPORT).
@@ -959,12 +957,16 @@ local_label(R) ->
 
 xhtml(Title, CSS, Body) ->
     [{html, [?NL,
-	    {head, [?NL,
-		    {title, Title},
-		    ?NL] ++ CSS},
-	    ?NL,
-	    {body, [{bgcolor, "white"}], Body},
-	    ?NL]
+	     {head, [?NL,
+		     {meta, [{'http-equiv',"Content-Type"},
+			     {content, "text/html; charset=ISO-8859-1"}],
+		      []},
+		     ?NL,
+		     {title, Title},
+		     ?NL] ++ CSS},
+	     ?NL,
+	     {body, [{bgcolor, "white"}], Body},
+	     ?NL]
      },
      ?NL].
 
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl
index 585e30a2d2..7fd8358add 100644
--- a/lib/edoc/src/edoc_lib.erl
+++ b/lib/edoc/src/edoc_lib.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 2001-2003 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @end
 %% =====================================================================
@@ -40,7 +38,7 @@
 -import(edoc_report, [report/2, warning/2]).
 
 -include("edoc.hrl").
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 -define(FILE_BASE, "/").
 
@@ -405,8 +403,13 @@ escape_uri([C | Cs]) ->
 escape_uri([]) ->
     [].
 
-escape_byte(C) ->
-    "%" ++ hex_octet(C).
+escape_byte(C) when C >= 0, C =< 255 ->
+    [$%, hex_digit(C bsr 4), hex_digit(C band 15)].
+
+hex_digit(N) when N >= 0, N =< 9 ->
+    N + $0;
+hex_digit(N) when N > 9, N =< 15 ->
+    N + $a - 10.
 
 % utf8([C | Cs]) when C > 16#7f ->
 %     [((C band 16#c0) bsr 6) + 16#c0, C band 16#3f ++ 16#80 | utf8(Cs)];
@@ -415,13 +418,6 @@ escape_byte(C) ->
 % utf8([]) ->
 %     [].
 
-hex_octet(N) when N =< 9 ->
-    [$0 + N];
-hex_octet(N) when N > 15 ->
-    hex_octet(N bsr 4) ++ hex_octet(N band 15);
-hex_octet(N) ->
-    [N - 10 + $a].
-
 %% Please note that URI are *not* file names. Don't use the stdlib
 %% 'filename' module for operations on (any parts of) URI.
 
@@ -494,7 +490,7 @@ uri_get_file(File0) ->
 uri_get_http(URI) ->
     %% Try using option full_result=false
     case catch {ok, httpc:request(get, {URI,[]}, [],
-				 [{full_result, false}])} of
+				  [{full_result, false}])} of
 	{'EXIT', _} ->
 	    uri_get_http_r10(URI);
 	Result ->
diff --git a/lib/edoc/src/edoc_macros.erl b/lib/edoc/src/edoc_macros.erl
index 5b512cb53a..70fb38bf0a 100644
--- a/lib/edoc/src/edoc_macros.erl
+++ b/lib/edoc/src/edoc_macros.erl
@@ -16,7 +16,7 @@
 %%
 %% @private
 %% @copyright 2001-2005 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @end
 %% =====================================================================
diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl
index 6943f1bdb8..4d6428f75b 100644
--- a/lib/edoc/src/edoc_parser.yrl
+++ b/lib/edoc/src/edoc_parser.yrl
@@ -22,10 +22,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% Author contact: [email protected]
-%%
-%% $Id $
-%%
+%% Author contact: [email protected]
 %% =====================================================================
 
 Nonterminals
@@ -258,7 +255,7 @@ throws -> etype where_defs:
 %% "%% USA"
 %% "%%"
 %% "%% @private"
-%% "%% @author Richard Carlsson <[email protected]>"
+%% "%% @author Richard Carlsson <[email protected]>"
 %% "%% ===================================================================="
 %% .
 
@@ -362,10 +359,10 @@ parse_spec(S, L) ->
 		{ok, Spec} ->
 		    Spec;
 		{error, E} ->
-		    throw_error(E, L)
+		    throw_error({parse_spec, E}, L)
 	    end;
 	{error, E, _} ->
-	    throw_error(E, L)
+	    throw_error({parse_spec, E}, L)
     end.
 
 %% ---------------------------------------------------------------------
@@ -458,8 +455,6 @@ parse_throws(S, L) ->
 
 -spec throw_error(term(), erl_scan:line()) -> no_return().
 
-throw_error({L, M, D}, _L0) ->
-    throw({error,L,{format_error,M,D}});
 throw_error({parse_spec, E}, L) ->
     throw_error({"specification", E}, L);
 throw_error({parse_typedef, E}, L) ->
@@ -471,7 +466,4 @@ throw_error({parse_throws, E}, L) ->
 throw_error(parse_param, L) ->
     throw({error, L, "missing parameter name"});
 throw_error({Where, E}, L) when is_list(Where) ->
-    throw({error,L,{"unknown error parsing ~s: ~P.",[Where,E,15]}});
-throw_error(E, L) ->
-    %% Just in case.
-    throw({error,L,{"unknown parse error: ~P.",[E,15]}}).
+    throw({error,L,{"unknown error parsing ~s: ~P.",[Where,E,15]}}).
diff --git a/lib/edoc/src/edoc_refs.erl b/lib/edoc/src/edoc_refs.erl
index b974cf77c1..1f578a3b83 100644
--- a/lib/edoc/src/edoc_refs.erl
+++ b/lib/edoc/src/edoc_refs.erl
@@ -16,7 +16,7 @@
 %%
 %% @private
 %% @copyright 2003 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @see edoc_parse_ref
 %% @end
diff --git a/lib/edoc/src/edoc_report.erl b/lib/edoc/src/edoc_report.erl
index ee54c60c90..9bec08ab97 100644
--- a/lib/edoc/src/edoc_report.erl
+++ b/lib/edoc/src/edoc_report.erl
@@ -14,11 +14,9 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%% 
 %% @private
 %% @copyright 2001-2003 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @end 
 %% =====================================================================
diff --git a/lib/edoc/src/edoc_run.erl b/lib/edoc/src/edoc_run.erl
index 96e5ea4631..48b6137ac1 100644
--- a/lib/edoc/src/edoc_run.erl
+++ b/lib/edoc/src/edoc_run.erl
@@ -14,10 +14,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @copyright 2003 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @end 
 %% =====================================================================
diff --git a/lib/edoc/src/edoc_scanner.erl b/lib/edoc/src/edoc_scanner.erl
index 9d2e6f3aed..754fcef643 100644
--- a/lib/edoc/src/edoc_scanner.erl
+++ b/lib/edoc/src/edoc_scanner.erl
@@ -13,12 +13,10 @@
 %% AB. Portions created by Ericsson are Copyright 1999, Ericsson
 %% Utvecklings AB. All Rights Reserved.''
 %%
-%% $Id: $
-%%
 %% @private
 %% @copyright Richard Carlsson 2001-2003. Portions created by Ericsson
 %% are Copyright 1999, Ericsson Utvecklings AB. All Rights Reserved.
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @end
 
diff --git a/lib/edoc/src/edoc_specs.erl b/lib/edoc/src/edoc_specs.erl
index 79a5d142bc..5acf8ac0d5 100644
--- a/lib/edoc/src/edoc_specs.erl
+++ b/lib/edoc/src/edoc_specs.erl
@@ -27,7 +27,6 @@
 -include("edoc.hrl").
 -include("edoc_types.hrl").
 
--type proplist() :: [proplists:property()].
 -type syntaxTree() :: erl_syntax:syntaxTree().
 
 -define(TOP_TYPE, term).
@@ -87,8 +86,9 @@ dummy_spec(Form) ->
     #tag{name = spec, line = element(2, hd(TypeSpecs)),
          origin = code, data = S}.
 
--spec docs(Forms::[syntaxTree()], CommentFun) -> dict() when
-      CommentFun :: fun(([syntaxTree()], Line :: term()) -> #tag{}).
+-spec docs(Forms::[syntaxTree()],
+           CommentFun :: fun( ([syntaxTree()], Line :: term()) -> #tag{} ))
+          -> dict().
 
 %% @doc Find comments after -type/-opaque declarations.
 %% Postcomments "inside" the type are skipped.
@@ -98,7 +98,7 @@ docs(Forms, CommentFun) ->
 -type entry() :: #entry{}.
 -type module_info() :: #module{}.
 -type entries() :: [entry()].
--spec add_data(Entries::entries(), Options::proplist(),
+-spec add_data(Entries::entries(), Options::proplists:proplist(),
                File::file:filename(), Module::module_info()) -> entries().
 
 %% @doc Create tags a la EDoc for Erlang specifications and types.
diff --git a/lib/edoc/src/edoc_tags.erl b/lib/edoc/src/edoc_tags.erl
index 8ee8f87b5f..2d986988c2 100644
--- a/lib/edoc/src/edoc_tags.erl
+++ b/lib/edoc/src/edoc_tags.erl
@@ -14,11 +14,9 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @private
 %% @copyright 2001-2003 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @end
 %% =====================================================================
diff --git a/lib/edoc/src/edoc_types.erl b/lib/edoc/src/edoc_types.erl
index e784b3359a..60c6cecb97 100644
--- a/lib/edoc/src/edoc_types.erl
+++ b/lib/edoc/src/edoc_types.erl
@@ -14,11 +14,9 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @private
 %% @copyright 2001-2003 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @end
 %% =====================================================================
@@ -34,13 +32,13 @@
 %% @headerfile "edoc_types.hrl"
 
 -include("edoc_types.hrl").
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 
 is_predefined(any, 0) -> true;
 is_predefined(atom, 0) -> true;
 is_predefined(binary, 0) -> true;
-is_predefined(bool, 0) -> true;
+is_predefined(bool, 0) -> true;    % kept for backwards compatibility
 is_predefined(char, 0) -> true;
 is_predefined(cons, 2) -> true;
 is_predefined(deep_string, 0) -> true;
diff --git a/lib/edoc/src/edoc_types.hrl b/lib/edoc/src/edoc_types.hrl
index 1353bfb93a..05c61d70ff 100644
--- a/lib/edoc/src/edoc_types.hrl
+++ b/lib/edoc/src/edoc_types.hrl
@@ -18,7 +18,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% Author contact: [email protected]
+%% Author contact: [email protected]
 %% =====================================================================
 
 %% Type specification data structures
diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl
index ba33198787..5c71658af5 100644
--- a/lib/edoc/src/edoc_wiki.erl
+++ b/lib/edoc/src/edoc_wiki.erl
@@ -14,11 +14,9 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @private
 %% @copyright 2001-2003 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @see edoc
 %% @end
 %% =====================================================================
@@ -70,7 +68,7 @@
 -export([parse_xml/2, expand_text/2]).
 
 -include("edoc.hrl").
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 -define(BASE_HEADING, 3).
 
@@ -82,8 +80,8 @@ parse_xml(Data, Line) ->
 
 parse_xml_1(Text, Line) ->
     Text1 = "<doc>" ++ Text ++ "</doc>",
-    Options = [{line, Line}, {encoding, "iso-8859-1"}],
-    case catch {ok, xmerl_scan:string(Text1, Options)} of
+    Opts = [{line, Line}, {encoding, 'iso-8859-1'}],
+    case catch {ok, xmerl_scan:string(Text1, Opts)} of
 	{ok, {E, _}} ->
 	    E#xmlElement.content;
 	{'EXIT', {fatal, {Reason, L, _C}}} ->
@@ -251,10 +249,20 @@ expand_triple([], L, _, L0) ->
 
 expand_uri("http:/" ++ Cs, L, As) ->
     expand_uri(Cs, L, "/:ptth", As);
+expand_uri("https:/" ++ Cs, L, As) ->
+    expand_uri(Cs, L, "/:sptth", As);
 expand_uri("ftp:/" ++ Cs, L, As) ->
     expand_uri(Cs, L, "/:ptf", As);
 expand_uri("file:/" ++ Cs, L, As) ->
     expand_uri(Cs, L, "/:elif", As);
+expand_uri("mailto:/" ++ Cs, L, As) ->
+    expand_uri(Cs, L, "/:otliam", As);
+expand_uri("nfs:/" ++ Cs, L, As) ->
+    expand_uri(Cs, L, "/:sfn", As);
+expand_uri("shttp:/" ++ Cs, L, As) ->
+    expand_uri(Cs, L, "/:ptths", As);
+expand_uri("xmpp:/" ++ Cs, L, As) ->
+    expand_uri(Cs, L, "/:ppmx", As);
 expand_uri(Cs, L, As) ->
     expand(Cs, L, [$[ | As]).
 
diff --git a/lib/edoc/src/otpsgml_layout.erl b/lib/edoc/src/otpsgml_layout.erl
index 45f74b299e..2c4cd919bb 100644
--- a/lib/edoc/src/otpsgml_layout.erl
+++ b/lib/edoc/src/otpsgml_layout.erl
@@ -14,9 +14,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @author Kenneth Lundin <[email protected]>
 %% @copyright 2001-2004 Richard Carlsson
 %% @see edoc_layout
@@ -34,7 +32,7 @@
 
 -import(edoc_report, [report/2]).
 
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 -define(SGML_EXPORT, xmerl_otpsgml).
 -define(DEFAULT_XML_EXPORT, ?SGML_EXPORT).
diff --git a/lib/edoc/test/edoc_SUITE.erl b/lib/edoc/test/edoc_SUITE.erl
index 0d57591e3e..5b95c35756 100644
--- a/lib/edoc/test/edoc_SUITE.erl
+++ b/lib/edoc/test/edoc_SUITE.erl
@@ -13,8 +13,6 @@
 %% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 %% AB. All Rights Reserved.''
 %% 
-%%     $Id$
-%%
 -module(edoc_SUITE).
 
 -include_lib("test_server/include/test_server.hrl").
diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk
index 30cf191ffc..22f225dd9b 100644
--- a/lib/edoc/vsn.mk
+++ b/lib/edoc/vsn.mk
@@ -1 +1 @@
-EDOC_VSN = 0.7.8
+EDOC_VSN = 0.7.9
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index f79639769f..6a0eece56d 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -30,7 +30,51 @@
   </header>
   <p>This document describes the changes made to the erl_docgen application.</p>
 
-  <section><title>Erl_Docgen 0.2.5</title>
+  <section><title>Erl_Docgen 0.2.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Bug fixes. </p>
+          <p>
+	    Own Id: OTP-9360</p>
+        </item>
+        <item>
+	    <p> The manpage generation has been improved. </p>
+          <p>
+	    Own Id: OTP-9541 Aux Id: OTP-9550 </p>
+        </item>
+        <item>
+	    <p> Fix eix file generation for new function spec
+	    references. </p>
+          <p>
+	    Own Id: OTP-9562</p>
+        </item>
+        <item>
+	    <p> The function signatures in the pdf files was not in a
+	    fixed font. </p>
+          <p>
+	    Own Id: OTP-9563</p>
+        </item>
+        <item>
+	    <p> The parts level in the system documentation was
+	    missing in the bookmarks menu for the pdf and the
+	    copyright year generation for PDF was not correct. </p>
+          <p>
+	    Own Id: OTP-9576</p>
+        </item>
+        <item>
+	    <p> The indentation after <c>Warning:</c> and
+	    <c>Note:</c> in manpages has been improved. </p>
+          <p>
+	    Own Id: OTP-9588</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.2.5</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/erl_docgen/priv/xsl/db_eix.xsl b/lib/erl_docgen/priv/xsl/db_eix.xsl
index 4545322bc2..7a648ddfd7 100644
--- a/lib/erl_docgen/priv/xsl/db_eix.xsl
+++ b/lib/erl_docgen/priv/xsl/db_eix.xsl
@@ -22,10 +22,16 @@
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:exsl="http://exslt.org/common"
+  extension-element-prefixes="exsl"
   xmlns:fn="http://www.w3.org/2005/02/xpath-functions"> 
 
   <xsl:output method="text" encoding="UTF-8" indent="no"/>
 
+  <xsl:param name="specs_file" select="''"/>
+  <xsl:variable name="i" select="document($specs_file)"></xsl:variable>
+
+
   <!-- Book -->
   <xsl:template match="/book">
     <xsl:text>%% &#10;%% Search data file for </xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/>
@@ -50,9 +56,7 @@
   <xsl:template match="erlref">
     <xsl:text>{"</xsl:text><xsl:value-of select="module"/><xsl:text>.html", {function, {"</xsl:text><xsl:value-of select="$appname"/>
     <xsl:text>", "</xsl:text><xsl:value-of select="module"/><xsl:text>"}},&#10;[&#10;</xsl:text>
-    <xsl:apply-templates select="funcs">  
-      <xsl:with-param name="mod" select="module"/>
-    </xsl:apply-templates>  
+    <xsl:apply-templates select="funcs"/>  
     <xsl:text>]}.&#10;</xsl:text>
     <xsl:text>{"</xsl:text><xsl:value-of select="module"/><xsl:text>.html", {module, "</xsl:text>
     <xsl:value-of select="$appname"/><xsl:text>"}, ["</xsl:text><xsl:value-of select="module"/><xsl:text>"]}.&#10;</xsl:text>
@@ -62,9 +66,7 @@
   <xsl:template match="cref">
     <xsl:text>{"</xsl:text><xsl:value-of select="lib"/><xsl:text>.html", {function, {"</xsl:text><xsl:value-of select="$appname"/>
     <xsl:text>", "</xsl:text><xsl:value-of select="lib"/><xsl:text>"}}, [&#10;</xsl:text>
-    <xsl:apply-templates select="funcs">  
-      <xsl:with-param name="mod" select="lib"/>
-    </xsl:apply-templates>  
+    <xsl:apply-templates select="funcs"/>  
     <xsl:text>]}.&#10;</xsl:text>
     <xsl:text>{"</xsl:text><xsl:value-of select="lib"/><xsl:text>.html", {clib, "</xsl:text>
     <xsl:value-of select="$appname"/><xsl:text>"}, ["</xsl:text><xsl:value-of select="lib"/><xsl:text>"]}.&#10;</xsl:text>
@@ -91,69 +93,157 @@
 
   <!-- Funcs -->
   <xsl:template match="funcs">
-    <xsl:param name="mod"/>
     <xsl:variable name="lastfuncsblock">
       <xsl:value-of select="position() = last()"/>
     </xsl:variable>         
     <xsl:apply-templates select="func/name">
-      <xsl:with-param name="mod" select="$mod"/>
       <xsl:with-param name="lastfuncsblock" select="$lastfuncsblock"/>
     </xsl:apply-templates>
   </xsl:template>
 
+  <xsl:template match="name">
+    <xsl:param name="lastfuncsblock"/>
+    <xsl:choose>
+      <!-- @arity is mandatory when referring to a specification -->
+      <xsl:when test="string-length(@arity) > 0">
+        <xsl:call-template name="spec_name"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="name"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 
+  <xsl:template name="err">
+    <xsl:param name="f"/>
+    <xsl:param name="m"/>
+    <xsl:param name="n"/>
+    <xsl:param name="a"/>
+    <xsl:param name="s"/>
+    <xsl:message terminate="yes">
+  Error <xsl:if test="$f != ''">in <xsl:value-of select ="$f"/>:</xsl:if>
+        <xsl:if test="$m != ''"><xsl:value-of select ="$m"/>:</xsl:if>
+        <xsl:value-of select="$n"/>
+        <xsl:if test="$a != ''">/<xsl:value-of
+             select ="$a"/></xsl:if>: <xsl:value-of select="$s"/>
+    </xsl:message>
+  </xsl:template>
 
+  <xsl:template name="find_spec">
+    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
+    <xsl:variable name="mod" select="@mod"/>
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="clause_i" select="@clause_i"/>
+    <xsl:variable name="spec0" select=
+        "$i/specs/module[@name=$curModule]/spec
+             [name=$name and arity=$arity
+              and (string-length($mod) = 0 or module = $mod)]"/>
+    <xsl:variable name="spec" select="$spec0[string-length($clause_i) = 0
+                                             or position() = $clause_i]"/>
 
-  <xsl:template match="name">
-    <xsl:param name="mod"/>
+    <xsl:if test="count($spec) != 1">
+      <xsl:variable name="why">
+        <xsl:choose>
+          <xsl:when test="count($spec) > 1">ambiguous spec</xsl:when>
+          <xsl:when test="count($spec) = 0">unknown spec</xsl:when>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:call-template name="err">
+        <xsl:with-param name="f" select="$curModule"/>
+	<xsl:with-param name="m" select="$mod"/>
+	<xsl:with-param name="n" select="$name"/>
+	<xsl:with-param name="a" select="$arity"/>
+        <xsl:with-param name="s" select="$why"/>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:copy-of select="$spec"/>
+  </xsl:template>
+
+
+  <xsl:template name="spec_name">
+    <xsl:param name="lastfuncsblock"/>
+    <xsl:variable name="fname" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="spec0">
+      <xsl:call-template name="find_spec"/>
+    </xsl:variable>
+    <xsl:variable name="spec" select="exsl:node-set($spec0)/spec"/>
+
+    <xsl:variable name="tmpstring">
+      <xsl:value-of select="substring-before($spec/contract/clause/head, ' ->')"/>
+    </xsl:variable>
+
+    <xsl:text>  {"</xsl:text><xsl:value-of select="$fname"/>
+    <xsl:text>", "</xsl:text><xsl:value-of select="$tmpstring"/>
+    <xsl:text>", "</xsl:text><xsl:value-of select="$fname"/>
+    <xsl:text>-</xsl:text><xsl:value-of select="$arity"/><xsl:text>"}</xsl:text>
+    
+    <xsl:choose>
+      <xsl:when test="($lastfuncsblock = 'true') and (position() = last())">
+        <xsl:text>&#10;</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>,&#10;</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+
+  </xsl:template>
+
+
+  <xsl:template name="name">
     <xsl:param name="lastfuncsblock"/>
 
     <xsl:variable name="tmpstring">
       <xsl:value-of select="substring-before(substring-after(., '('), '->')"/>
-    </xsl:variable>     
+    </xsl:variable>
+
     <xsl:variable name="ustring">
       <xsl:choose>
-        <xsl:when test="string-length($tmpstring) > 0">
-          <xsl:call-template name="remove-paren">
-            <xsl:with-param name="string" select="$tmpstring"/>
-          </xsl:call-template>            
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="remove-paren">
-            <xsl:with-param name="string" select="substring-after(., '(')"/>
-          </xsl:call-template>                      
-        </xsl:otherwise>
+	<xsl:when test="string-length($tmpstring) > 0">
+	  <xsl:call-template name="remove-paren">
+	    <xsl:with-param name="string" select="$tmpstring"/>
+	  </xsl:call-template>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:call-template name="remove-paren">
+	    <xsl:with-param name="string" select="substring-after(., '(')"/>
+	  </xsl:call-template>
+	</xsl:otherwise>
       </xsl:choose>
-    </xsl:variable>       
+    </xsl:variable>
+
     <xsl:variable name="arity">
       <xsl:call-template name="calc-arity">
-        <xsl:with-param name="string" select="substring-before($ustring, ')')"/>
-        <xsl:with-param name="no-of-pars" select="0"/> 
+	<xsl:with-param name="string" select="substring-before($ustring, ')')"/>
+	<xsl:with-param name="no-of-pars" select="0"/>
       </xsl:call-template>
-    </xsl:variable> 
+    </xsl:variable>
+
     <xsl:variable name="fname">
       <xsl:choose>
-        <xsl:when test="ancestor::cref">
-          <xsl:value-of select="substring-before(nametext, '(')"/>
-        </xsl:when>
-        <xsl:when test="ancestor::erlref">
-          <xsl:variable name="fname1">
-            <xsl:value-of select="substring-before(., '(')"/>
-          </xsl:variable>
-          <xsl:variable name="fname2">
-            <xsl:value-of select="substring-after($fname1, 'erlang:')"/>
-          </xsl:variable>
-          <xsl:choose>
-            <xsl:when test="string-length($fname2) > 0">   
-              <xsl:value-of select="$fname2"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$fname1"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
+	<xsl:when test="ancestor::cref">
+	  <xsl:value-of select="substring-before(nametext, '(')"/>
+	</xsl:when>
+	<xsl:when test="ancestor::erlref">
+	  <xsl:variable name="fname1">
+	    <xsl:value-of select="substring-before(., '(')"/>
+	  </xsl:variable>
+	  <xsl:variable name="fname2">
+	    <xsl:value-of select="substring-after($fname1, 'erlang:')"/>
+	  </xsl:variable>
+	  <xsl:choose>
+	    <xsl:when test="string-length($fname2) > 0">
+	      <xsl:value-of select="$fname2"/>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <xsl:value-of select="$fname1"/>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:when>
       </xsl:choose>
-    </xsl:variable>     
+    </xsl:variable>
+    
     <xsl:text>  {"</xsl:text><xsl:value-of select="$fname"/>
     <xsl:text>", "</xsl:text><xsl:value-of select="$fname"/>
     <xsl:text>(</xsl:text><xsl:value-of select="normalize-space($tmpstring)"/>
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index 8db4714249..0aca74bc97 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -25,12 +25,12 @@
   xmlns:exsl="http://exslt.org/common"
   extension-element-prefixes="exsl">
 
-  <xsl:preserve-space elements="code pre"/>
+  <xsl:preserve-space elements="code pre p"/>
   <xsl:strip-space elements="*"/>
   <xsl:output method="text" encoding="UTF-8" indent="no"/>
 
   <!-- Start of Dialyzer type/spec tags. See also the templates
-        matching "name" and "seealso"
+        matching "name", "seealso" and "br"
   -->
 
   <!-- Note: specs data for *one* module (as opposed to html and pdf) -->
@@ -137,8 +137,9 @@
          (there is no spec with more than one clause) -->
     <xsl:if test="count($clause/guard) > 0 or count($type) > 0">
       <xsl:text>&#10;.RS</xsl:text>
-      <xsl:text>&#10;.TP</xsl:text>
-      <xsl:text>&#10;Types</xsl:text>
+      <xsl:text>&#10;.LP</xsl:text>
+      <xsl:text>&#10;Types:&#10;</xsl:text>
+      <xsl:text>&#10;.RS 3</xsl:text>
 
         <xsl:choose>
           <xsl:when test="$output_subtypes">
@@ -164,6 +165,8 @@
           <xsl:with-param name="type_desc" select="$type_desc"/>
           <xsl:with-param name="local_types" select="$local_types"/>
         </xsl:call-template>
+        <xsl:text>&#10;.RE</xsl:text>
+
       <xsl:text>&#10;.RE</xsl:text>
 
     </xsl:if>
@@ -223,10 +226,13 @@
 
     <xsl:for-each select="$subtype">
       <xsl:variable name="tname" select="typename"/>
-      <xsl:text>&#10;</xsl:text>
-      <xsl:apply-templates select="string"/>
-      <xsl:text>&#10;.br</xsl:text>
-      <xsl:apply-templates select="$type_desc[@variable = $tname]"/>
+      <xsl:variable name="string" select="string"/>
+      <xsl:if test="string-length($string) > 0">
+	<xsl:text>&#10;</xsl:text>
+	<xsl:apply-templates select="$string"/>
+	<xsl:text>&#10;.br</xsl:text>
+	<xsl:apply-templates select="$type_desc[@variable = $tname]"/>
+      </xsl:if>
     </xsl:for-each>
   </xsl:template>
 
@@ -254,8 +260,8 @@
 
   <!-- Similar to <d> -->
   <xsl:template match="type_desc">
-    <xsl:text>&#10;</xsl:text><xsl:apply-templates/>
-    <xsl:text>&#10;.br</xsl:text>
+    <xsl:text>&#10;.RS 2&#10;</xsl:text><xsl:apply-templates/>
+    <xsl:text>&#10;.RE</xsl:text>
   </xsl:template>
 
   <!-- Datatypes -->
@@ -319,8 +325,7 @@
   </xsl:template>
 
   <xsl:template match="typehead">
-    <xsl:text>&#10;.nf&#10;</xsl:text>
-    <xsl:text>&#10;.B&#10;</xsl:text>
+    <xsl:text>&#10;.nf&#10;&#10;</xsl:text>
     <xsl:apply-templates/>
     <xsl:text>&#10;.br</xsl:text>
     <xsl:text>&#10;.fi</xsl:text>
@@ -345,6 +350,13 @@
     <xsl:text>&#10;.br</xsl:text>
   </xsl:template>
 
+  <!-- The name of data types -->
+  <xsl:template match="marker">
+    <xsl:if test="string-length(.) != 0">
+      <xsl:text>\fB</xsl:text><xsl:apply-templates/><xsl:text>\fR\&amp;</xsl:text>
+    </xsl:if>
+  </xsl:template>
+
   <!-- Used both in <datatype> and in <func>! -->
   <xsl:template match="anno">
     <xsl:variable name="curModule" select="ancestor::erlref/module"/>
@@ -465,13 +477,13 @@
     <xsl:text>&#10;.TP 2&#10;</xsl:text>
     <xsl:text>*&#10;</xsl:text>
     <xsl:apply-templates/>
-    <xsl:text>&#10;.LP&#10;</xsl:text>
+    <xsl:text>&#10;.LP</xsl:text>
   </xsl:template>
 
   <xsl:template match="taglist">
     <xsl:text>&#10;.RS 2</xsl:text>
     <xsl:apply-templates select="tag|item"/>
-    <xsl:text>&#10;.RE&#10;</xsl:text>
+    <xsl:text>&#10;.RE</xsl:text>
   </xsl:template>
 
   <xsl:template match="taglist/tag">
@@ -494,7 +506,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:text>&#10;.RS 2</xsl:text>
-        <xsl:text>&#10;.LP&#10;&#10;.LP&#10;</xsl:text>
+        <xsl:text>&#10;.LP&#10;</xsl:text>
         <xsl:value-of select="$content"/>
         <xsl:text>&#10;.RE</xsl:text>
       </xsl:otherwise>
@@ -503,18 +515,42 @@
 
   <!-- Note -->
   <xsl:template match="note">
-    <xsl:text>&#10;.SS Note:</xsl:text>
+    <xsl:text>&#10;.LP&#10;</xsl:text>
+    <xsl:text>&#10;.RS -4</xsl:text>
+    <xsl:text>&#10;.B&#10;</xsl:text>
+    <xsl:text>Note:</xsl:text>
+    <xsl:text>&#10;.RE</xsl:text>
     <xsl:apply-templates/>
     <xsl:text>&#10;</xsl:text>
   </xsl:template>
 
   <!-- Warning -->
   <xsl:template match="warning">
-    <xsl:text>&#10;.SS Warning:</xsl:text>
+    <xsl:text>&#10;.LP&#10;</xsl:text>
+    <xsl:text>&#10;.RS -4</xsl:text>
+    <xsl:text>&#10;.B&#10;</xsl:text>
+    <xsl:text>Warning:</xsl:text>
+    <xsl:text>&#10;.RE</xsl:text>
     <xsl:apply-templates/>
     <xsl:text>&#10;</xsl:text>
   </xsl:template>
 
+  <xsl:template match="warning/p | note/p">
+    <xsl:variable name="content">
+      <xsl:text>&#10;</xsl:text>
+      <xsl:apply-templates/>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="position() = 1">
+        <xsl:value-of select="$content"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>&#10;.LP</xsl:text>
+        <xsl:value-of select="$content"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
  <!-- Paragraph -->
   <xsl:template match="p">
     <xsl:text>&#10;.LP&#10;</xsl:text>
@@ -529,7 +565,16 @@
   </xsl:template>
 
   <xsl:template match="br">
-    <xsl:text>&#10;.br&#10;</xsl:text>
+    <xsl:choose>
+      <xsl:when test="ancestor::head">
+        <!-- The header of Dialyzer specs.
+             .B makes next line appear in bold face -->
+        <xsl:text>&#10;.B&#10;</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>&#10;.br&#10;</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
   <xsl:template match="c">
@@ -547,17 +592,17 @@
   <!-- Code -->
   <xsl:template match="code">
     <xsl:text>&#10;.LP&#10;</xsl:text>
-    <xsl:text>&#10;.nf&#10;</xsl:text>
+    <xsl:text>.nf&#10;</xsl:text>
     <xsl:apply-templates/>
-    <xsl:text>&#10;.fi&#10;</xsl:text>
+    <xsl:text>&#10;.fi</xsl:text>
   </xsl:template>
 
   <!-- Pre -->
   <xsl:template match="pre">
     <xsl:text>&#10;.LP&#10;</xsl:text>
-    <xsl:text>&#10;.nf&#10;</xsl:text>
+    <xsl:text>.nf&#10;</xsl:text>
     <xsl:apply-templates/>
-    <xsl:text>&#10;.fi&#10;</xsl:text>
+    <xsl:text>&#10;.fi</xsl:text>
   </xsl:template>
 
 
@@ -715,24 +760,26 @@
     <!-- The case where @name != 0 is taken care of in "type_name" -->
     <xsl:if test="string-length(@name) = 0 and string-length(@variable) = 0">
       <xsl:text>&#10;.RS</xsl:text>
-      <xsl:text>&#10;.TP</xsl:text>
-      <xsl:text>&#10;Types</xsl:text>
+      <xsl:text>&#10;.LP</xsl:text>
+      <xsl:text>&#10;Types:&#10;</xsl:text>
+      <xsl:text>&#10;.RS 3</xsl:text>
       <xsl:apply-templates/>
       <xsl:text>&#10;.RE</xsl:text>
+      <xsl:text>&#10;.RE</xsl:text>
     </xsl:if>
   </xsl:template>
 
 
   <!-- V -->
   <xsl:template match="v">
-    <xsl:text>&#10;</xsl:text><xsl:value-of select="normalize-space(text())"/>
+    <xsl:text>&#10;</xsl:text><xsl:apply-templates/>
     <xsl:text>&#10;.br</xsl:text>
   </xsl:template>
 
   <!-- D -->
   <xsl:template match="d">
-    <xsl:text>&#10;</xsl:text><xsl:apply-templates/>
-    <xsl:text>&#10;.br</xsl:text>
+    <xsl:text>&#10;.RS 2&#10;</xsl:text><xsl:apply-templates/>
+    <xsl:text>&#10;.RE</xsl:text>
   </xsl:template>
 
   <!-- Desc -->
@@ -788,7 +835,36 @@
   <!-- Replace ' by \&' ans . by \&. -->
   <xsl:template match="text()">
     <xsl:variable name="startstring">
-      <xsl:value-of select="normalize-space()"/><xsl:text> </xsl:text>
+      <xsl:value-of select="normalize-space()"/>
+    </xsl:variable>
+    <!-- 'C' is just any character but whitespace -->
+    <xsl:variable name="tmp" select="normalize-space(concat('C',.,'C'))"/>
+    <xsl:variable name="space_before">
+      <xsl:choose>
+         <!-- '<p>A<marker id="swamp"/> swamp</p>' does not work; instead:
+              '<p>A <marker id="swamp"/>swamp</p>' -->
+         <xsl:when test="starts-with($tmp, 'C ')
+                and not (string(preceding-sibling::*[position()=1]) = ''
+                         and parent::p)">
+           <!-- and not (position() = 1 and parent::p)"> -->
+           <xsl:text> </xsl:text>
+         </xsl:when>
+         <xsl:otherwise>
+           <xsl:text/>
+         </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="space_after">
+      <xsl:choose>
+         <xsl:when test="substring($tmp, string-length($tmp)-1,1) = ' '
+                         and $startstring != ''
+                         and not (position() = last() and parent::p)">
+           <xsl:text> </xsl:text>
+         </xsl:when>
+         <xsl:otherwise>
+           <xsl:text/>
+         </xsl:otherwise>
+      </xsl:choose>
     </xsl:variable>
     <xsl:variable name="rep1">
       <xsl:call-template name="replace-string">
@@ -804,11 +880,16 @@
         <xsl:with-param name="with" select="&quot;\&amp;&apos;&quot;" />
       </xsl:call-template>
     </xsl:variable>
-    <xsl:call-template name="replace-string">
-      <xsl:with-param name="text" select="$rep2" />
-      <xsl:with-param name="replace" select="&quot;.&quot;" />
-      <xsl:with-param name="with" select="&quot;\&amp;.&quot;" />
-    </xsl:call-template>
+    <xsl:variable name="reply">
+      <xsl:call-template name="replace-string">
+        <xsl:with-param name="text" select="$rep2" />
+        <xsl:with-param name="replace" select="&quot;.&quot;" />
+        <xsl:with-param name="with" select="&quot;\&amp;.&quot;" />
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:value-of select="$space_before"/>
+    <xsl:value-of select="$reply"/>
+    <xsl:value-of select="$space_after"/>
   </xsl:template>
 
   <!-- Template replace-string is borrowed at http://www.dpawson.co.uk/xsl/sect2/replace.html -->
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index a3d601d861..48a7a026c1 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -732,22 +732,23 @@
   <xsl:template name="bookmarks1">
     <xsl:param name="entries"/>
     <xsl:if test="$entries != ''">
+      <xsl:for-each select="$entries">
 
-      <fo:bookmark internal-destination="{generate-id(/book/parts/part)}"
-        starting-state="hide">
-        <fo:bookmark-title>User's Guide</fo:bookmark-title>
-
-        <xsl:for-each select="$entries">
+        <fo:bookmark internal-destination="{generate-id(header/title)}"
+          starting-state="hide">
+          <fo:bookmark-title><xsl:value-of select="header/title"/></fo:bookmark-title>
+          
           <xsl:call-template name="bookmarks2">
             <xsl:with-param name="entries"
               select="chapter[header/title]"/>
           </xsl:call-template>
-        </xsl:for-each>
-
-      </fo:bookmark>
+          
+        </fo:bookmark>
+      </xsl:for-each>
     </xsl:if>
   </xsl:template>
 
+
   <xsl:template name="bookmarks2">
     <xsl:param name="entries"/>
     <xsl:for-each select="$entries">
@@ -934,9 +935,9 @@
   <xsl:template match="part">
     <xsl:variable name="partnum"><xsl:number level="any" from="book" count="part|application"/></xsl:variable>
 
-    <fo:block xsl:use-attribute-sets="h1" id="{generate-id()}">
+    <fo:block xsl:use-attribute-sets="h1" id="{generate-id(header/title)}">
       <xsl:value-of select="$partnum"/>&#160;&#160;&#160;
-      <xsl:text>User's Guide</xsl:text>
+      <xsl:value-of select="header/title"/>
     </fo:block>
 
     <xsl:apply-templates select="description">
@@ -1382,16 +1383,15 @@
   <!-- Func -->
   <xsl:template match="func">
     <xsl:param name="partnum"/>
-
-    <xsl:apply-templates select="name"/>
-    <xsl:apply-templates
-        select="name[string-length(@arity) > 0 and position()=last()]"
-        mode="types"/>
-
-    <xsl:apply-templates select="fsummary|type|desc">
-      <xsl:with-param name="partnum" select="$partnum"/>
-    </xsl:apply-templates>
-
+    <fo:block space-before="1.5em">
+      <xsl:apply-templates select="name"/>
+      <xsl:apply-templates
+	  select="name[string-length(@arity) > 0 and position()=last()]"
+	  mode="types"/>
+      <xsl:apply-templates select="fsummary|type|desc">
+	<xsl:with-param name="partnum" select="$partnum"/>
+      </xsl:apply-templates>
+    </fo:block>
   </xsl:template>
 
 
@@ -1424,14 +1424,10 @@
     <xsl:param name="partnum"/>
     <xsl:choose>
       <xsl:when test="ancestor::cref">
-        <fo:block id="{generate-id(nametext)}">
-          <xsl:value-of select="ret"/><xsl:text> </xsl:text><xsl:value-of select="nametext"/>
-        </fo:block>
+        <fo:block id="{generate-id(nametext)}"><xsl:value-of select="ret"/><xsl:text></xsl:text><xsl:value-of select="nametext"/></fo:block>
       </xsl:when>
       <xsl:otherwise>
-        <fo:block id="{generate-id(.)}">
-          <xsl:value-of select="."/>
-        </fo:block>
+        <fo:block id="{generate-id(.)}"><xsl:value-of select="."/></fo:block>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -1468,7 +1464,7 @@
         </fo:block>
       </fo:list-item-label>
       <fo:list-item-body start-indent="body-start()" format="justify">
-        <fo:block font-weight="bold">
+        <fo:block font-weight="bold" font-family="monospace" >
           <xsl:apply-templates>
             <xsl:with-param name="partnum" select="$partnum"/>
           </xsl:apply-templates>
diff --git a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
index 7de20f2092..4d9c08d0c3 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
@@ -3,7 +3,7 @@
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2010. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2011. 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
@@ -29,7 +29,7 @@
 
  <!-- Fixed strings -->
  <xsl:variable name="companyname"><xsl:value-of select="/book/header/copyright/holder"/></xsl:variable>
-  <xsl:variable name="copyright">Copyright &#169; <xsl:value-of select="/book/header/copyright/year[1]"/><xsl:text>-</xsl:text><xsl:value-of select="substring-after(substring-after($gendate, ' '), ' ')"/></xsl:variable>
+  <xsl:variable name="copyright">Copyright &#169; <xsl:value-of select="/book/header/copyright/year[1]"/><xsl:text>-</xsl:text><xsl:value-of select="substring-after(normalize-space(substring-after($gendate, ' ')), ' ')"/></xsl:variable>
 
   <!-- FIXME: remove when appendix creation has been fixed -->
   <!-- xsl:variable name="appendix_title"-->
@@ -316,8 +316,8 @@
     <xsl:attribute name="font-family">monospace</xsl:attribute>
     <!-- xsl:attribute name="font-size">0.8em</xsl:attribute -->
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
-    <xsl:attribute name="space-after">0.3em</xsl:attribute>
-    <xsl:attribute name="space-before">1.5em</xsl:attribute>
+    <xsl:attribute name="space-after">0.25em</xsl:attribute>
+    <!-- xsl:attribute name="space-before">1.5em</xsl:attribute -->
   </xsl:attribute-set> 
 
   <xsl:attribute-set name="type-listblock">
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index cafb5287de..79c8c570bf 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1,2 +1,2 @@
-ERL_DOCGEN_VSN = 0.2.5
+ERL_DOCGEN_VSN = 0.2.6
 
diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml
index de4e4b4301..539e16d837 100644
--- a/lib/erl_interface/doc/src/ei.xml
+++ b/lib/erl_interface/doc/src/ei.xml
@@ -4,7 +4,7 @@
 <cref>
   <header>
     <copyright>
-      <year>2001</year><year>2010</year>
+      <year>2001</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -581,9 +581,9 @@ ei_x_encode_empty_list(&amp;x);
           <c><![CDATA[term]]></c> union, it is decoded, and the appropriate field
           in <c><![CDATA[term->value]]></c> is set, and <c><![CDATA[*index]]></c> is
           incremented by the term size.</p>
-        <p>The function returns 0 on successful decoding, -1 on error,
-          and 1 if the term seems alright, but does not fit in the
-          <c><![CDATA[term]]></c> structure. If it returns 0, the <c><![CDATA[index]]></c>
+        <p>The function returns 1 on successful decoding, -1 on error,
+          and 0 if the term seems alright, but does not fit in the
+          <c><![CDATA[term]]></c> structure. If it returns 1, the <c><![CDATA[index]]></c>
           will be incremented, and the <c><![CDATA[term]]></c> contains the
           decoded term.</p>
         <p>The <c><![CDATA[term]]></c> structure will contain the arity for a tuple
diff --git a/lib/erl_interface/doc/src/erl_format.xml b/lib/erl_interface/doc/src/erl_format.xml
index 5699485845..f036b12879 100644
--- a/lib/erl_interface/doc/src/erl_format.xml
+++ b/lib/erl_interface/doc/src/erl_format.xml
@@ -4,7 +4,7 @@
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -105,7 +105,7 @@ erl_format("[{name,~a},{age,~i},{data,~w}]",
           values in <c><![CDATA[Term]]></c>. </p>
         <p>If <c><![CDATA[Term]]></c> and <c><![CDATA[Pattern]]></c> can be matched, the
           function returns a non-zero value and binds any unbound
-          variables in <c><![CDATA[Pattern]]></c>. If <c><![CDATA[Term]]></c><c><![CDATA[Pattern]]></c> do
+          variables in <c><![CDATA[Pattern]]></c>. If <c><![CDATA[Term]]></c> <c><![CDATA[Pattern]]></c> do
           not match, the function returns 0. For example:</p>
         <code type="none"><![CDATA[
 ETERM *term, *pattern, *pattern2;
diff --git a/lib/erl_interface/doc/src/make.dep b/lib/erl_interface/doc/src/make.dep
deleted file mode 100644
index 3f43cf64fe..0000000000
--- a/lib/erl_interface/doc/src/make.dep
+++ /dev/null
@@ -1,24 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin//docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex ei.tex ei_connect.tex ei_users_guide.tex \
-		erl_call.tex erl_connect.tex erl_error.tex \
-		erl_eterm.tex erl_format.tex erl_global.tex \
-		erl_malloc.tex erl_marshal.tex part_ei.tex \
-		ref_man.tex ref_man_ei.tex ref_man_erl_interface.tex \
-		registry.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml ref_man_ei.xml ref_man_erl_interface.xml
-
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 7055fcd5c9..9a42ebfddf 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -30,6 +30,53 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.7.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Align ei buffer according to size of pointers</p>
+          <p>
+	    Own Id: OTP-9390</p>
+        </item>
+        <item>
+	    <p> XML files have been corrected. </p>
+          <p>
+	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
+        </item>
+        <item>
+          <p>
+	    Make comment and documentation reflect code in
+	    erl_interface/src/misc/ei_decode_term.c (Thanks to Anneli
+	    Cuss)</p>
+          <p>
+	    Own Id: OTP-9559</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    ei: integer overflow in string/atom encoding</p>
+          <p>
+	    ei_encode_atom() and ei_encode_string() use strlen() to
+	    get the length of the buffer. As strlen() returns an
+	    unsigned long long and both ei functions take a signed
+	    integer, the length fields may overflow.</p>
+          <p>
+	    Check so that the results of strlen can be held in a
+	    signed integer. (Thanks to Michael Santos)</p>
+          <p>
+	    Own Id: OTP-9530</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.7.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
index 8ff142a366..0d841cfa48 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -143,7 +143,6 @@ BINDIR     = $(ERL_TOP)/lib/erl_interface/bin/$(TARGET)
 
 vpath %.c connect:encode:decode:misc:epmd:legacy:registry
 
-
 ###########################################################################
 #  List targets
 ###########################################################################
@@ -202,11 +201,6 @@ ifeq ($(USING_VC),yes)
 # Windows targets
 
 TARGETS = \
-	$(BINDIR) \
-	$(OBJDIR) \
-	$(MT_OBJDIR) \
-	$(MD_OBJDIR) \
-	$(MDD_OBJDIR) \
 	$(OBJ_TARGETS) \
 	$(EXE_TARGETS)
 
@@ -236,9 +230,6 @@ else
 
 ifeq ($USING_MINGW,yes)
 TARGETS = \
-	$(BINDIR) \
-	$(OBJDIR) \
-	$(MD_OBJDIR) \
 	$(OBJ_TARGETS) \
 	$(EXE_TARGETS)
 
@@ -257,10 +248,6 @@ else
 ifdef THR_DEFS
 
 TARGETS = \
-	$(BINDIR) \
-	$(OBJDIR) \
-	$(ST_OBJDIR) \
-	$(MT_OBJDIR) \
 	$(OBJ_TARGETS) \
 	$(EXE_TARGETS)
 
@@ -283,9 +270,6 @@ FAKE_TARGETS = \
 else
 
 TARGETS = \
-	$(BINDIR) \
-	$(OBJDIR) \
-	$(ST_OBJDIR) \
 	$(OBJ_TARGETS) \
 	$(EXE_TARGETS)
 
@@ -601,23 +585,7 @@ $(MDD_OBJDIR)/%.o: %.c
 #  Create directories
 ###########################################################################
 
-$(BINDIR):
-	mkdir -p $(BINDIR)
-
-$(OBJDIR):
-	mkdir -p $(OBJDIR)
-
-$(ST_OBJDIR):
-	mkdir -p $(ST_OBJDIR)
-
-$(MT_OBJDIR):
-	mkdir -p $(MT_OBJDIR)
-
-$(MD_OBJDIR):
-	mkdir -p $(MD_OBJDIR)
-
-$(MDD_OBJDIR):
-	mkdir -p $(MDD_OBJDIR)
+_create_dirs := $(shell mkdir -p $(BINDIR) $(OBJDIR) $(ST_OBJDIR) $(MT_OBJDIR) $(MD_OBJDIR) $(MDD_OBJDIR))
 
 ###########################################################################
 #  Special rules
diff --git a/lib/erl_interface/src/encode/encode_atom.c b/lib/erl_interface/src/encode/encode_atom.c
index 69f2d1451c..6f41f045e0 100644
--- a/lib/erl_interface/src/encode/encode_atom.c
+++ b/lib/erl_interface/src/encode/encode_atom.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2011. 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
@@ -17,13 +17,17 @@
  * %CopyrightEnd%
  */
 #include <string.h>
+#include <limits.h>
 #include "eidef.h"
 #include "eiext.h"
 #include "putget.h"
 
 int ei_encode_atom(char *buf, int *index, const char *p)
 {
-    return ei_encode_atom_len(buf, index, p, strlen(p));
+    size_t len = strlen(p);
+
+    if (len >= INT_MAX) return -1;
+    return ei_encode_atom_len(buf, index, p, len);
 }
 
 int ei_encode_atom_len(char *buf, int *index, const char *p, int len)
diff --git a/lib/erl_interface/src/encode/encode_string.c b/lib/erl_interface/src/encode/encode_string.c
index 1d342cb605..d00d2f3e81 100644
--- a/lib/erl_interface/src/encode/encode_string.c
+++ b/lib/erl_interface/src/encode/encode_string.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2011. 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
@@ -17,6 +17,7 @@
  * %CopyrightEnd%
  */
 #include <string.h>
+#include <limits.h>
 #include "eidef.h"
 #include "eiext.h"
 #include "putget.h"
@@ -24,7 +25,10 @@
 
 int ei_encode_string(char *buf, int *index, const char *p)
 {
-    return ei_encode_string_len(buf, index, p, strlen(p));
+    size_t len = strlen(p);
+
+    if (len >= INT_MAX) return -1;
+    return ei_encode_string_len(buf, index, p, len);
 }
 
 int ei_encode_string_len(char *buf, int *index, const char *p, int len)
diff --git a/lib/erl_interface/src/legacy/erl_fix_alloc.c b/lib/erl_interface/src/legacy/erl_fix_alloc.c
index 20f3024e41..2ed0dd1470 100644
--- a/lib/erl_interface/src/legacy/erl_fix_alloc.c
+++ b/lib/erl_interface/src/legacy/erl_fix_alloc.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -109,6 +109,10 @@ void *erl_eterm_alloc (void)
 	erl_eterm_state->freed--;      
     } else if ((b = malloc(sizeof(*b))) == NULL) {
 	erl_errno = ENOMEM;
+#ifdef _REENTRANT
+	ei_mutex_unlock(erl_eterm_state->lock);
+#endif /* _REENTRANT */
+	return NULL;
     }
     erl_eterm_state->allocated++;
     b->free = 0;
diff --git a/lib/erl_interface/src/misc/ei_decode_term.c b/lib/erl_interface/src/misc/ei_decode_term.c
index bfb4571337..0b82ef0e35 100644
--- a/lib/erl_interface/src/misc/ei_decode_term.c
+++ b/lib/erl_interface/src/misc/ei_decode_term.c
@@ -25,8 +25,8 @@
 #include "ei_decode_term.h"
 #include "putget.h"
 
-/* Returns 0 on successful encoding, -1 on error, and 1 if the term seems
-   alright, but does not fit in the term structure. If it returns 0, the
+/* Returns 1 on successful encoding, -1 on error, and 0 if the term seems
+   alright, but does not fit in the term structure. If it returns 1, the
    index will be incremented, and the term contains the decoded term. */
 
 int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
@@ -111,10 +111,10 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 	break;
     case ERL_SMALL_TUPLE_EXT:
 	term->arity = get8(s);
-	break; /*return 0;*/
+	break;
     case ERL_LARGE_TUPLE_EXT:
 	term->arity = get32be(s);
-	break; /*return 0;*/
+	break;
     case ERL_NIL_EXT:
 	term->arity = 0;
 	break;
@@ -123,7 +123,7 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 	return 0;
     case ERL_LIST_EXT:
 	term->arity = get32be(s);
-	break; /*return 0;*/
+	break;
     case ERL_BINARY_EXT:
 	term->size = get32be(s);
 	return 0;
diff --git a/lib/erl_interface/src/registry/reg_dump.c b/lib/erl_interface/src/registry/reg_dump.c
index 1e640fb506..d2854c10b5 100644
--- a/lib/erl_interface/src/registry/reg_dump.c
+++ b/lib/erl_interface/src/registry/reg_dump.c
@@ -215,6 +215,7 @@ static int mn_send_write(int fd, erlang_pid *mnesia, const char *key, ei_reg_obj
     else ei_encode_long(msgbuf,&index,(long)(obj->val.p));  /* just the pointer */
     break;
   default:
+    if (dbuf) free(dbuf);
     return -1;
   }
 
diff --git a/lib/erl_interface/src/registry/reg_restore.c b/lib/erl_interface/src/registry/reg_restore.c
index 765c3f4314..7bc1c758af 100644
--- a/lib/erl_interface/src/registry/reg_restore.c
+++ b/lib/erl_interface/src/registry/reg_restore.c
@@ -303,6 +303,9 @@ int ei_reg_restore(int fd, ei_reg *reg, const char *mntab)
     if (mn_decode_insert(reg,msgbuf,&index,keybuf)) goto restore_failure;
   }
   
+  if (keybuf) free(keybuf);
+  if (dbuf) free(dbuf);
+
   /* wait for unlink */
   if (mn_unlink(fd)) return -1;
 
@@ -310,8 +313,6 @@ int ei_reg_restore(int fd, ei_reg *reg, const char *mntab)
   ei_hash_foreach(reg->tab,clean_obj);
 
   /* success */
-  if (keybuf) free(keybuf);
-  if (dbuf) free(dbuf);
   return 0;
 
 restore_failure:
diff --git a/lib/erl_interface/test/all_SUITE_data/Makefile.src b/lib/erl_interface/test/all_SUITE_data/Makefile.src
index 9be2360656..42d4c6f27f 100644
--- a/lib/erl_interface/test/all_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/all_SUITE_data/Makefile.src
@@ -30,6 +30,8 @@ CHMOD=chmod
 
 all: $(ALL_OBJS)
 
+$(EI_COMMON_OBJS): gccifier@exe@
+
 @IFEQ@ (@erl_interface_cross_compile@, true)
 gccifier@exe@:
 	$(CP) gccifier.sh gccifier@exe@
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 8157d590fc..8db4667bf9 100644
--- a/lib/erl_interface/test/all_SUITE_data/init_tc.erl
+++ b/lib/erl_interface/test/all_SUITE_data/init_tc.erl
@@ -40,23 +40,11 @@ run([]) ->
 run1(Name) ->
     CFile = Name ++ ".c",
     {ok, Bin} = file:read_file(CFile),
-    String = binary_to_list(Bin),
-
-    %% This ConstPart stuff is because you can't retrieve part of a match.
-    %% Long live Perl!  
-    
-    ConstPart = "\nTESTCASE\\(",
-    ConstPartLen = 10,
-    {match, Matches} = regexp:matches(String, ConstPart++"[_a-zA-Z]*"),
-    Cases = get_names(Matches, ConstPartLen, Bin, []),
+    RE = "\nTESTCASE\\(([_a-zA-Z]*)\\)",
+    {match, Cases0} = re:run(Bin, RE, [{capture,all_but_first,list},global]),
+    Cases = lists:concat(Cases0),
     generate(Name, Cases).
 
-get_names([{Start, Length}|Rest], Skip, Bin, Result) ->
-    Name = binary_to_list(Bin, Start+Skip, Start+Length-1),
-    get_names(Rest, Skip, Bin, [Name|Result]);
-get_names([], _Skip, _Bin, Result) ->
-    lists:reverse(Result).
-
 generate(TcName, Cases) ->
     Hrl = TcName ++ "_cases.hrl",
     {ok, HrlFile} = file:open(Hrl, write),
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 dc7385ba32..a512494aa3 100644
--- a/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2011. 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
@@ -26,7 +26,7 @@ LIBPATH = @erl_interface_libpath@
 LIBERL = $(LIBPATH)/@erl_interface_lib_drv@
 LIBEI = $(LIBPATH)/@erl_interface_eilib_drv@
 
-SHLIB_EXTRA_LDLIBS = $(LIBERL) $(LIBEI) 
+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/vsn.mk b/lib/erl_interface/vsn.mk
index 75f2b7101b..601958579c 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1 +1 @@
-EI_VSN = 3.7.4
+EI_VSN = 3.7.5
diff --git a/lib/et/doc/src/notes.xml b/lib/et/doc/src/notes.xml
index e3be8422c8..acc6120fcd 100644
--- a/lib/et/doc/src/notes.xml
+++ b/lib/et/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -36,6 +36,20 @@
   one section in this document. The title of each section is the
   version number of <c>Event Tracer (ET)</c>.</p>
 
+<section><title>ET 1.4.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Dialyzer warnings have been fixed. </p>
+          <p>
+	    Own Id: OTP-9470</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>ET 1.4.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/et/src/et_wx_viewer.erl b/lib/et/src/et_wx_viewer.erl
index 7d4286ed9d..386f8fc86b 100644
--- a/lib/et/src/et_wx_viewer.erl
+++ b/lib/et/src/et_wx_viewer.erl
@@ -257,10 +257,10 @@ parse_opt([H | T], S, CollectorOpt) ->
             Actors = [create_actor(Name) || Name <- ActorNames2],
             parse_opt(T, S#state{actors = Actors}, CollectorOpt);
         {include, ActorNames} when is_list(ActorNames) ->
-            Actors = [opt_create_actor(Name, include, S#state.actors) || Name <- ActorNames],
+            Actors = [opt_create_actor(Name, include, S) || Name <- ActorNames],
             parse_opt(T, S#state{actors = Actors}, CollectorOpt);
         {exclude, ActorNames} when is_list(ActorNames) ->
-            Actors = [opt_create_actor(Name, exclude, S#state.actors) || Name <- ActorNames],
+            Actors = [opt_create_actor(Name, exclude, S) || Name <- ActorNames],
             parse_opt(T, S#state{actors = Actors}, CollectorOpt);
         {first_event, _FirstKey} ->
 	    %% NYI
diff --git a/lib/et/vsn.mk b/lib/et/vsn.mk
index ea98aeba11..239a72ad73 100644
--- a/lib/et/vsn.mk
+++ b/lib/et/vsn.mk
@@ -1 +1 @@
-ET_VSN  = 1.4.3
+ET_VSN  = 1.4.4
diff --git a/lib/eunit/AUTHORS b/lib/eunit/AUTHORS
deleted file mode 100644
index b7c1426aff..0000000000
--- a/lib/eunit/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Richard Carlsson <[email protected]>
-Micka�l R�mond <[email protected]>
diff --git a/lib/eunit/Makefile b/lib/eunit/Makefile
index ee69d5e8e0..cd85dff06a 100644
--- a/lib/eunit/Makefile
+++ b/lib/eunit/Makefile
@@ -13,8 +13,6 @@
 # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 # AB. All Rights Reserved.''
 # 
-#     $Id$
-#
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
diff --git a/lib/eunit/doc/.gitignore b/lib/eunit/doc/.gitignore
new file mode 100644
index 0000000000..7fcda5db42
--- /dev/null
+++ b/lib/eunit/doc/.gitignore
@@ -0,0 +1,4 @@
+*.html
+stylesheet.css
+erlang.png
+edoc-info
diff --git a/lib/eunit/doc/edoc-info b/lib/eunit/doc/edoc-info
deleted file mode 100644
index 1c04b2ed1a..0000000000
--- a/lib/eunit/doc/edoc-info
+++ /dev/null
@@ -1,3 +0,0 @@
-{application,eunit}.
-{packages,[]}.
-{modules,[eunit,eunit_surefire]}.
diff --git a/lib/eunit/doc/erlang.png b/lib/eunit/doc/erlang.png
deleted file mode 100644
index 987a618e24..0000000000
--- a/lib/eunit/doc/erlang.png
+++ /dev/null
diff --git a/lib/eunit/doc/eunit.html b/lib/eunit/doc/eunit.html
deleted file mode 100644
index a181d12ce3..0000000000
--- a/lib/eunit/doc/eunit.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Module eunit</title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="EDoc">
-</head>
-<body bgcolor="white">
-<div class="navbar"><a name="#navbar_top"></a><table width="100%" border="0" cellspacing="0" cellpadding="2" summary="navigation bar"><tr><td><a href="overview-summary.html" target="overviewFrame">Overview</a></td><td><a href="http://www.erlang.org/"><img src="erlang.png" align="right" border="0" alt="erlang logo"></a></td></tr></table></div>
-<hr>
-
-<h1>Module eunit</h1>
-<ul class="index"><li><a href="#description">Description</a></li><li><a href="#index">Function Index</a></li><li><a href="#functions">Function Details</a></li></ul>This module is the main EUnit user interface.
-<p>Copyright � 2004-2009 Micka�l R�mond, Richard Carlsson</p>
-
-<p><b>Version:</b> 2.1.1, Apr 22 2009 22:37:19</p>
-<p><b>Authors:</b> Micka�l R�mond (<a href="mailto:[email protected]"><tt>[email protected]</tt></a>) [<em>web site:</em> <tt><a href="http://www.process-one.net/" target="_top">http://www.process-one.net/</a></tt>], Richard Carlsson (<a href="mailto:[email protected]"><tt>[email protected]</tt></a>) [<em>web site:</em> <tt><a href="http://user.it.uu.se/~richardc/" target="_top">http://user.it.uu.se/~richardc/</a></tt>].</p>
-
-<h2><a name="description">Description</a></h2>This module is the main EUnit user interface.
-<h2><a name="index">Function Index</a></h2>
-<table width="100%" border="1" cellspacing="0" cellpadding="2" summary="function index"><tr><td valign="top"><a href="#start-0">start/0</a></td><td>Starts the EUnit server.</td></tr>
-<tr><td valign="top"><a href="#stop-0">stop/0</a></td><td>Stops the EUnit server.</td></tr>
-<tr><td valign="top"><a href="#test-1">test/1</a></td><td>Equivalent to <a href="#test-2"><tt>test(Tests, [])</tt></a>.
-</td></tr>
-<tr><td valign="top"><a href="#test-2">test/2</a></td><td>Runs a set of tests.</td></tr>
-</table>
-
-<h2><a name="functions">Function Details</a></h2>
-
-<h3 class="function"><a name="start-0">start/0</a></h3>
-<div class="spec">
-<p><tt>start() -&gt; any()</tt></p>
-</div><p>Starts the EUnit server. Normally, you don't need to call this
-  function; it is started automatically.</p>
-
-<h3 class="function"><a name="stop-0">stop/0</a></h3>
-<div class="spec">
-<p><tt>stop() -&gt; any()</tt></p>
-</div><p>Stops the EUnit server. Normally, you don't need to call this
-  function.</p>
-
-<h3 class="function"><a name="test-1">test/1</a></h3>
-<div class="spec">
-<p><tt>test(Tests) -&gt; any()</tt></p>
-</div><p>Equivalent to <a href="#test-2"><tt>test(Tests, [])</tt></a>.</p>
-
-
-<h3 class="function"><a name="test-2">test/2</a></h3>
-<div class="spec">
-<p><tt>test(Tests::term(), Options::[term()]) -&gt; ok | {error, term()}</tt></p>
-</div><p><p>Runs a set of tests. The format of <code>Tests</code> is described in the
-  section <a href="overview-summary.html#EUnit_test_representation">EUnit test
-  representation</a> of the overview.</p>
- 
-  Example: <pre>  eunit:test(fred)</pre><p> runs all tests in the module <code>fred</code>
-  and also any tests in the module <code>fred_tests</code>, if that module exists.</p>
- 
-  Options:
-  <dl>
-  <dt><code>verbose</code></dt>
-  <dd>Displays more details about the running tests.</dd>
-  </dl>
- 
-  Options in the environment variable EUNIT are also included last in
-  the option list, i.e., have lower precedence than those in <code>Options</code>.</p>
-<p><b>See also:</b> <a href="#test-1">test/1</a>.</p>
-<hr>
-
-<div class="navbar"><a name="#navbar_bottom"></a><table width="100%" border="0" cellspacing="0" cellpadding="2" summary="navigation bar"><tr><td><a href="overview-summary.html" target="overviewFrame">Overview</a></td><td><a href="http://www.erlang.org/"><img src="erlang.png" align="right" border="0" alt="erlang logo"></a></td></tr></table></div>
-<p><i>Generated by EDoc, Apr 22 2009, 22:37:19.</i></p>
-</body>
-</html>
diff --git a/lib/eunit/doc/eunit_surefire.html b/lib/eunit/doc/eunit_surefire.html
deleted file mode 100644
index f2ecbae572..0000000000
--- a/lib/eunit/doc/eunit_surefire.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Module eunit_surefire</title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="EDoc">
-</head>
-<body bgcolor="white">
-<div class="navbar"><a name="#navbar_top"></a><table width="100%" border="0" cellspacing="0" cellpadding="2" summary="navigation bar"><tr><td><a href="overview-summary.html" target="overviewFrame">Overview</a></td><td><a href="http://www.erlang.org/"><img src="erlang.png" align="right" border="0" alt="erlang logo"></a></td></tr></table></div>
-<hr>
-
-<h1>Module eunit_surefire</h1>
-<ul class="index"><li><a href="#description">Description</a></li><li><a href="#index">Function Index</a></li><li><a href="#functions">Function Details</a></li></ul>Surefire reports for EUnit (Format used by Maven and Atlassian  
-Bamboo for example to integrate test results).
-<p>Copyright � 2009 Micka�l R�mond, Paul Guyot</p>
-
-<p><b>Behaviours:</b> <a href="eunit_listener.html"><tt>eunit_listener</tt></a>.</p>
-<p><b>Authors:</b> Micka�l R�mond (<a href="mailto:[email protected]"><tt>[email protected]</tt></a>).</p>
-<p><b>See also:</b> <a href="eunit.html">eunit</a>.</p>
-
-<h2><a name="description">Description</a></h2><p>Surefire reports for EUnit (Format used by Maven and Atlassian  
-Bamboo for example to integrate test results). Based on initial code  
-from Paul Guyot.</p>
- 
-  Example: Generate XML result file in the current directory:
-  <pre>     eunit:test([fib, eunit_examples],
-                [{report,{eunit_surefire,[{dir,"."}]}}]).</pre>
-<h2><a name="index">Function Index</a></h2>
-<table width="100%" border="1" cellspacing="0" cellpadding="2" summary="function index"><tr><td valign="top"><a href="#handle_begin-3">handle_begin/3</a></td><td></td></tr>
-<tr><td valign="top"><a href="#handle_cancel-3">handle_cancel/3</a></td><td></td></tr>
-<tr><td valign="top"><a href="#handle_end-3">handle_end/3</a></td><td></td></tr>
-<tr><td valign="top"><a href="#init-1">init/1</a></td><td></td></tr>
-<tr><td valign="top"><a href="#start-0">start/0</a></td><td></td></tr>
-<tr><td valign="top"><a href="#start-1">start/1</a></td><td></td></tr>
-<tr><td valign="top"><a href="#terminate-2">terminate/2</a></td><td></td></tr>
-</table>
-
-<h2><a name="functions">Function Details</a></h2>
-
-<h3 class="function"><a name="handle_begin-3">handle_begin/3</a></h3>
-<div class="spec">
-<p><tt>handle_begin(X1, Data, St) -&gt; any()</tt></p>
-</div>
-
-<h3 class="function"><a name="handle_cancel-3">handle_cancel/3</a></h3>
-<div class="spec">
-<p><tt>handle_cancel(X1, Data, St) -&gt; any()</tt></p>
-</div>
-
-<h3 class="function"><a name="handle_end-3">handle_end/3</a></h3>
-<div class="spec">
-<p><tt>handle_end(X1, Data, St) -&gt; any()</tt></p>
-</div>
-
-<h3 class="function"><a name="init-1">init/1</a></h3>
-<div class="spec">
-<p><tt>init(Options) -&gt; any()</tt></p>
-</div>
-
-<h3 class="function"><a name="start-0">start/0</a></h3>
-<div class="spec">
-<p><tt>start() -&gt; any()</tt></p>
-</div>
-
-<h3 class="function"><a name="start-1">start/1</a></h3>
-<div class="spec">
-<p><tt>start(Options) -&gt; any()</tt></p>
-</div>
-
-<h3 class="function"><a name="terminate-2">terminate/2</a></h3>
-<div class="spec">
-<p><tt>terminate(X1, St) -&gt; any()</tt></p>
-</div>
-<hr>
-
-<div class="navbar"><a name="#navbar_bottom"></a><table width="100%" border="0" cellspacing="0" cellpadding="2" summary="navigation bar"><tr><td><a href="overview-summary.html" target="overviewFrame">Overview</a></td><td><a href="http://www.erlang.org/"><img src="erlang.png" align="right" border="0" alt="erlang logo"></a></td></tr></table></div>
-<p><i>Generated by EDoc, Apr 22 2009, 22:37:19.</i></p>
-</body>
-</html>
diff --git a/lib/eunit/doc/index.html b/lib/eunit/doc/index.html
deleted file mode 100644
index 9bd8e8cf6b..0000000000
--- a/lib/eunit/doc/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>The eunit application</title>
-</head>
-<frameset cols="20%,80%">
-<frame src="modules-frame.html" name="modulesFrame" title="">
-
-<frame src="overview-summary.html" name="overviewFrame" title="">
-<noframes>
-<h2>This page uses frames</h2>
-<p>Your browser does not accept frames.
-<br>You should go to the <a href="overview-summary.html">non-frame version</a> instead.
-</p>
-</noframes>
-</frameset>
-</html>
\ No newline at end of file
diff --git a/lib/eunit/doc/modules-frame.html b/lib/eunit/doc/modules-frame.html
deleted file mode 100644
index a484e99d4c..0000000000
--- a/lib/eunit/doc/modules-frame.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>The eunit application</title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="EDoc">
-</head>
-<body bgcolor="white">
-<h2 class="indextitle">Modules</h2>
-<table width="100%" border="0" summary="list of modules">
-<tr><td><a href="eunit.html" target="overviewFrame" class="module">eunit</a></td></tr>
-<tr><td><a href="eunit_surefire.html" target="overviewFrame" class="module">eunit_surefire</a></td></tr></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/lib/eunit/doc/overview-summary.html b/lib/eunit/doc/overview-summary.html
deleted file mode 100644
index ea7beba8b3..0000000000
--- a/lib/eunit/doc/overview-summary.html
+++ /dev/null
@@ -1,1032 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>EUnit - a Lightweight Unit Testing Framework for Erlang
-</title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="EDoc">
-</head>
-<body bgcolor="white">
-<div class="navbar"><a name="#navbar_top"></a><table width="100%" border="0" cellspacing="0" cellpadding="2" summary="navigation bar"><tr><td><a href="overview-summary.html" target="overviewFrame">Overview</a></td><td><a href="http://www.erlang.org/"><img src="erlang.png" align="right" border="0" alt="erlang logo"></a></td></tr></table></div>
-<h1>EUnit - a Lightweight Unit Testing Framework for Erlang
-</h1>
-<p>Copyright � 2004-2007 Micka�l R�mond, Richard Carlsson</p>
-<p><b>Version:</b> 2.1.1, Apr 22 2009 22:37:19
-</p>
-<p><b>Authors:</b> Richard Carlsson (<a href="mailto:[email protected]"><tt>[email protected]</tt></a>) [<em>web site:</em> <tt><a href="http://user.it.uu.se/~richardc/" target="_top">http://user.it.uu.se/~richardc/</a></tt>], Micka�l R�mond (<a href="mailto:[email protected]"><tt>[email protected]</tt></a>) [<em>web site:</em> <tt><a href="http://www.process-one.net/" target="_top">http://www.process-one.net/</a></tt>].</p>
-<p>EUnit is a unit testing framework for Erlang. It is very powerful
-and flexible, is easy to use, and has small syntactical overhead.</p>
-
-<ul>
-<li><a href="#Unit_testing">Unit testing</a></li>
-<li><a href="#Terminology">Terminology</a></li>
-<li><a href="#Getting_started">Getting started</a></li>
-<li><a href="#EUnit_macros">EUnit macros</a></li>
-<li><a href="#EUnit_test_representation">EUnit test representation</a></li>
-</ul>
-
-<p>EUnit builds on ideas from the family of unit testing frameworks for
-Object Oriented languages that originated with JUnit by Beck and Gamma
-(and Beck's previous framework SUnit for Smalltalk). However, EUnit uses
-techniques more adapted to functional and concurrent programming, and is
-typically less verbose than its relatives.</p>
-
-<p>Although EUnit uses many preprocessor macros, they have been designed to
-be as nonintrusive as possible, and should not cause conflicts with
-existing code. Adding EUnit tests to a module should thus not normally
-require changing existing code. Furthermore, tests that only exercise
-the exported functions of a module can always be placed in a completely
-separate module, avoiding any conflicts entirely.</p>
-
-<h3><a name="Unit_testing">Unit testing</a></h3>
-
-<p>Unit Testing is testing of individual program "units" in relative
-isolation. There is no particular size requirement: a unit can be a
-function, a module, a process, or even a whole application, but the most
-typical testing units are individual functions or modules. In order to
-test a unit, you specify a set of individual tests, set up the smallest
-necessary environment for being able to run those tests (often, you
-don't need to do any setup at all), you run the tests and collect the
-results, and finally you do any necessary cleanup so that the test can
-be run again later. A Unit Testing Framework tries to help you in each
-stage of this process, so that it is easy to write tests, easy to run
-them, and easy to see which tests failed (so you can fix the bugs).</p>
-
-<h4><a name="Advantages_of_unit_testing">Advantages of unit testing</a></h4>
-
-<dl>
-  <dt>Reduces the risks of changing the program</dt>
-  <dd>Most programs will be modified during their lifetime: bugs will be
-  fixed, features will be added, optimizations may become necessary, or
-  the code will need to be refactored or cleaned up in other ways to
-  make it easier to work with. But every change to a working program is
-  a risk of introducing new bugs - or reintroducing bugs that had
-  previously been fixed. Having a set of unit tests that you can run
-  with very little effort makes it easy to know that the code still
-  works as it should (this use is called <em>regression testing</em>;
-  see <a href="#Terminology">Terminology</a>). This goes a long way to reduce the
-  resistance to changing and refactoring code.</dd>
-  <dt>Helps guide and speed up the development process</dt>
-  <dd>By focusing on getting the code to pass the tests, the programmer
-  can become more productive, not overspecify or get lost in premature
-  optimizations, and create code that is correct from the very beginning
-  (so-called <em>test-driven development</em>; see <a href="#Terminology">Terminology</a>).</dd>
-  <dt>Helps separate interface from implementation</dt>
-  <dd>When writing tests, the programmer may discover dependencies
-  (in order to get the tests to run) that ought not to be there, and
-  which need to be abstracted away to get a cleaner design. This helps
-  eliminate bad dependencies before they spread throughout the
-  code.</dd>
-  <dt>Makes component integration easier</dt>
-  <dd>By testing in a bottom-up fashion, beginning with the smallest
-  program units and creating a confidence in that they work as they
-  should, it becomes easier to test that a higher-level component,
-  consisting of several such units, also behaves according to
-  specification (known as <em>integration testing</em>; see <a href="#Terminology">Terminology</a>).</dd>
-  <dt>Is self-documenting</dt>
-  <dd>The tests can be read as documentation, typically showing both
-  examples of correct and incorrect usage, along with the expected
-  consequences.</dd>
-</dl>
-
-<h3><a name="Terminology">Terminology</a></h3>
-
-<dl>
-  <dt>Unit testing</dt>
-  <dd>Testing that a program unit behaves as it is supposed to do (in
-  itself), according to its specifications. Unit tests have an important
-  function as regression tests, when the program later is modified for
-  some reason, since they check that the program still behaves according
-  to specification.</dd>
-  <dt>Regression testing</dt>
-  <dd>Running a set of tests after making changes to a program, to check
-  that the program behaves as it did before the changes (except, of
-  course, for any intentional changes in behaviour). Unit tests are
-  important as regression tests, but regression testing can involve more
-  than just unit testing, and may also test behaviour that might not be
-  part of the normal specification (such as bug-for-bug-compatibility).
-  </dd>
-  <dt>Integration testing</dt>
-  <dd>Testing that a number of individually developed program units
-  (assumed to already have been separately unit tested) work together as
-  expected. Depending on the system being developed, integration testing
-  may be as simple as "just another level of unit testing", but might
-  also involve other kinds of tests (compare <em>system testing</em>).
-</dd>
-  <dt>System testing</dt>
-  <dd>Testing that a complete system behaves according to its
-  specification. Specifically, system testing should not require knowing
-  any details about the implementation. It typically involves testing
-  many different aspects of the system behaviour apart from the basic
-  functionality, such as performance, usability, and reliability.</dd>
-  <dt>Test-driven development</dt>
-  <dd>A program development technique where you continuously write tests
-  <em>before</em> you implement the code that is supposed to pass those
-  tests. This can help you focus on solving the right problems, and not
-  make a more complicated implementation than necessary, by letting the
-  unit tests determine when a program is "done": if it fulfils its
-  specifications, there is no need to keep adding functionality.</dd>
-  <dt>Mock object</dt>
-  <dd>Sometimes, testing some unit <code>A</code> (e.g., a function) requires that
-  it collaborates somehow with some other unit <code>B</code> (perhaps being passed
-  as an argument, or by reference) - but <code>B</code> has not been implemented
-  yet. A "mock object" - an object which, for the purposes of testing
-  <code>A</code>, looks and behaves like a real <code>B</code> - might then be used instead.
-  (This is of course only useful if it would be significantly more work
-  to implement a real <code>B</code> than to create a mock object.)</dd>
-  <dt>Test case</dt>
-  <dd>A single, well-defined test, that somehow can be uniquely
-  identified. When executed, the test case either <em>passes</em> or
-  <em>fails</em>; the test report should identify exactly which test
-  cases failed.</dd>
-  <dt>Test suite</dt>
-  <dd>A collection of test cases, generally with a specific, common
-  target for testing, such as a single function, module, or subsystem. A
-  test suite may also be recursively composed by smaller test
-  suites.</dd>
-</dl>
-
-<h3><a name="Getting_started">Getting started</a></h3>
-<ul>
-  <li><a href="#Including_the_EUnit_header_file">Including the EUnit header file</a></li>
-  <li><a href="#Writing_simple_test_functions">Writing simple test functions</a></li>
-  <li><a href="#Running_EUnit">Running EUnit</a></li>
-  <li><a href="#Writing_test_generating_functions">Writing test generating functions</a></li>
-  <li><a href="#An_example">An example</a></li>
-  <li><a href="#Disabling_testing">Disabling testing</a></li>
-  <li><a href="#Avoiding_compile-time_dependency_on_EUnit">Avoiding compile-time dependency on EUnit</a></li>
-</ul>
-
-<h4><a name="Including_the_EUnit_header_file">Including the EUnit header file</a></h4>
-
-The simplest way to use EUnit in an Erlang module is to add the
-following line at the beginning of the module (after the <code>-module</code>
-declaration, but before any function definitions):
-<pre>   -include_lib("eunit/include/eunit.hrl").</pre>
-
-This will have the following effect:
-<ul>
-  <li>Creates an exported function <code>test()</code> (unless testing is turned
-  off, and the module does not already contain a test() function), that
-  can be used to run all the unit tests defined in the module</li>
-  <li>Causes all functions whose names match <code>..._test()</code> or <code>..._test_()</code>
-  to be automatically exported from the module (unless testing is
-  turned off, or the <code>EUNIT_NOAUTO</code> macro is defined)</li>
-  <li>Makes all the preprocessor macros of EUnit available, to help
-  writing tests</li>
-</ul>
-
-<strong>Note:</strong> For <code>-include_lib(...)</code> to work, the Erlang
-module search path <em>must</em> contain a directory whose name ends in
-<code>eunit/ebin</code> (pointing to the <code>ebin</code> subdirectory of the EUnit
-installation directory). If EUnit is installed as <code>lib/eunit</code> under your
-Erlang/OTP system directory, its <code>ebin</code> subdirectory will be
-automatically added to the search path when Erlang starts. Otherwise,
-you need to add the directory explicitly, by passing a <code>-pa</code> flag to the
-<code>erl</code> or <code>erlc</code> command. For example, a Makefile could contain the
-following action for compiling <code>.erl</code> files:
-<pre>   erlc -pa "path/to/eunit/ebin" $(ERL_COMPILE_FLAGS) -o$(EBIN) $&lt;</pre>
-or if you want Eunit to always be available when you run Erlang
-interactively, you can add a line like the following to your
-<code>$HOME/.erlang</code> file:
-<pre>   code:add_path("/path/to/eunit/ebin").</pre>
-
-<h4><a name="Writing_simple_test_functions">Writing simple test functions</a></h4>
-
-<p>The EUnit framework makes it extremely easy to write unit tests in
-Erlang. There are a few different ways of writing them, though, so we
-start with the simplest:</p>
-
-<p>A function with a name ending in <code>..._test()</code> is recognized by EUnit as
-a simple test function - it takes no arguments, and its execution either
-succeeds (returning some arbitrary value that EUnit will throw away), or
-fails by throwing an exception of some kind (or by not terminating, in
-which case it will be aborted after a while).</p>
-
-An example of a simple test function could be the following:
-<pre>   reverse_test() -&gt; lists:reverse([1,2,3]).</pre><p>
-This just tests that the function <code>lists:reverse(List)</code> does not crash
-when <code>List</code> is <code>[1,2,3]</code>. It is not a great test, but many people write
-simple functions like this one to test the basic functionality of their
-code, and those tests can be used directly by EUnit, without changes,
-as long as their function names match.</p>
-
-<h5><a name="Use_exceptions_to_signal_failure">Use exceptions to signal failure</a></h5>
-
-To write more interesting tests, we need to make them crash (throw an
-exception) when they don't get the result they expect. A simple way of
-doing this is to use pattern matching with <code>=</code>, as in the following
-examples:
-<pre>   reverse_nil_test() -&gt; [] = lists:reverse([]).
-   reverse_one_test() -&gt; [1] = lists:reverse([1]).
-   reverse_two_test() -&gt; [2,1] = lists:reverse([1,2]).</pre><p>
-If there was some bug in <code>lists:reverse/1</code> that made it return something
-other than <code>[2,1]</code> when it got <code>[1,2]</code> as input, then the last test
-above would throw a <code>badmatch</code> error. The first two (we assume they do
-not get a <code>badmatch</code>) would simply return <code>[]</code> and <code>[1]</code>, respectively,
-so both succeed. (Note that EUnit is not psychic: if you write a test
-that returns a value, even if it is the wrong value, EUnit will consider
-it a success. You must make sure that the test is written so that it
-causes a crash if the result is not what it should be.)</p>
-
-<h5><a name="Using_assert_macros">Using assert macros</a></h5>
-
-If you want to use Boolean operators for your tests, the <code>assert</code>
-macro comes in handy (see <a href="#EUnit_macros">EUnit macros</a> for details):
-<pre>   length_test() -&gt; ?assert(length([1,2,3]) =:= 3).</pre><p>
-The <code>?assert(Expression)</code> macro will evaluate <code>Expression</code>, and if that
-does not evaluate to <code>true</code>, it will throw an exception; otherwise it
-just returns <code>ok</code>. In the above example, the test will thus fail if the
-call to <code>length</code> does not return 3.</p>
-
-<h4><a name="Running_EUnit">Running EUnit</a></h4>
-
-<p>If you have added the declaration
-<code>-include_lib("eunit/include/eunit.hrl")</code> to your module, as described
-above, you only need to compile the module, and run the automatically
-exported function <code>test()</code>. For example, if your module was named <code>m</code>,
-then calling <code>m:test()</code> will run EUnit on all the tests defined in the
-module. You do not need to write <code>-export</code> declarations for the test
-functions. This is all done by magic.</p>
-
-<p>You can also use the function <a href="eunit.html#test-1"><code>eunit:test/1</code></a> to run arbitrary
-tests, for example to try out some more advanced test descriptors (see
-<a href="#EUnit_test_representation">EUnit test representation</a>). For example, running
-<code>eunit:test(m)</code> does the same thing as the auto-generated function
-<code>m:test()</code>, while <code>eunit:test({inparallel, m})</code> runs the same test
-cases but executes them all in parallel.</p>
-
-<h5><a name="Putting_tests_in_separate_modules">Putting tests in separate modules</a></h5>
-
-<p>If you want to separate your test code from your normal code (at least
-for testing the exported functions), you can simply write the test
-functions in a module named <code>m_tests</code> (note: not <code>m_test</code>), if your
-module is named <code>m</code>. Then, whenever you ask EUnit to test the module
-<code>m</code>, it will also look for the module <code>m_tests</code> and run those tests as
-well. See <code>ModuleName</code> in the section <a href="#Primitives">Primitives</a> for details.</p>
-
-<h5><a name="EUnit_captures_standard_output">EUnit captures standard output</a></h5>
-
-<p>If your test code writes to the standard output, you may be surprised to
-see that the text does not appear on the console when the tests are
-running. This is because EUnit captures all standard output from test
-functions (this also includes setup and cleanup functions, but not
-generator functions), so that it can be included in the test report if
-errors occur. To bypass EUnit and print text directly to the console
-while testing, you can write to the <code>user</code> output stream, as in
-<code>io:format(user, "~w", [Term])</code>. The recommended way of doing this is to
-use the EUnit <a href="#Debugging_macros">Debugging macros</a>, which make it much simpler.</p>
-
-<h4><a name="Writing_test_generating_functions">Writing test generating functions</a></h4>
-
-<p>A drawback of simple test functions is that you must write a separate
-function (with a separate name) for each test case. A more compact way
-of writing tests (and much more flexible, as we shall see), is to write
-functions that <em>return</em> tests, instead of <em>being</em> tests.</p>
-
-<p>A function with a name ending in <code>..._test_()</code> (note the final
-underscore) is recognized by EUnit as a <em>test generator</em>
-function. Test generators return a <em>representation</em> of a <em>set
-of tests</em> to be executed by EUnit.</p>
-
-<h5><a name="Representing_a_test_as_data">Representing a test as data</a></h5>
-
-The most basic representation of a test is a single fun-expression that
-takes no arguments. For example, the following test generator:
-<pre>   basic_test_() -&gt;
-       fun () -&gt; ?assert(1 + 1 =:= 2) end.</pre>
-will have the same effect as the following simple test:
-<pre>   simple_test() -&gt;
-       ?assert(1 + 1 =:= 2).</pre><p>
-(in fact, EUnit will handle all simple tests just like it handles
-fun-expressions: it will put them in a list, and run them one by one).</p>
-
-<h5><a name="Using_macros_to_write_tests">Using macros to write tests</a></h5>
-
-To make tests more compact and readable, as well as automatically add
-information about the line number in the source code where a test
-occurred (and reduce the number of characters you have to type), you can
-use the <code>_test</code> macro (note the initial underscore character), like
-this:
-<pre>   basic_test_() -&gt;
-       ?_test(?assert(1 + 1 =:= 2)).</pre><p>
-The <code>_test</code> macro takes any expression (the "body") as argument, and
-places it within a fun-expression (along with some extra information).
-The body can be any kind of test expression, just like the body of a
-simple test function.</p>
-
-<h5><a name="Underscore-prefixed_macros_create_test_objects">Underscore-prefixed macros create test objects</a></h5>
-
-But this example can be made even shorter! Most test macros, such as the
-family of <code>assert</code> macros, have a corresponding form with an initial
-underscore character, which automatically adds a <code>?_test(...)</code> wrapper.
-The above example can then simply be written:
-<pre>   basic_test_() -&gt;
-       ?_assert(1 + 1 =:= 2).</pre><p>
-which has exactly the same meaning (note the <code>_assert</code> instead of
-<code>assert</code>). You can think of the initial underscore as signalling
-<em>test object</em>.</p>
-
-<h4><a name="An_example">An example</a></h4>
-
-Sometimes, an example says more than a thousand words. The following
-small Erlang module shows how EUnit can be used in practice.
-<pre>   -module(fib).
-   -export([fib/1]).
-   -include_lib("eunit/include/eunit.hrl").
-
-   fib(0) -&gt; 1;
-   fib(1) -&gt; 1;
-   fib(N) when N &gt; 1 -&gt; fib(N-1) + fib(N-2).
-
-   fib_test_() -&gt;
-       [?_assert(fib(0) =:= 1),
-	?_assert(fib(1) =:= 1),
-	?_assert(fib(2) =:= 2),
-	?_assert(fib(3) =:= 3),
-	?_assert(fib(4) =:= 5),
-	?_assert(fib(5) =:= 8),
-	?_assertException(error, function_clause, fib(-1)),
-	?_assert(fib(31) =:= 2178309)
-       ].</pre>
-
-<p>(Author's note: When I first wrote this example, I happened to write a
-<code>*</code> instead of <code>+</code> in the <code>fib</code> function. Of course, this showed up
-immediately when I ran the tests.)</p>
-
-<p>See <a href="#EUnit_test_representation">EUnit test representation</a> for a full list of all the ways
-you can specify test sets in EUnit.</p>
-
-<h4><a name="Disabling_testing">Disabling testing</a></h4>
-
-Testing can be turned off by defining the <code>NOTEST</code> macro when compiling,
-for example as an option to <code>erlc</code>, as in:
-<pre>   erlc -DNOTEST my_module.erl</pre>
-or by adding a macro definition to the code, <em>before the EUnit header
-file is included</em>:
-<pre>   -define(NOTEST, 1).</pre><p>
-(the value is not important, but should typically be 1 or <code>true</code>).
-Note that unless the <code>EUNIT_NOAUTO</code> macro is defined, disabling testing
-will also automatically strip all test functions from the code, except
-for any that are explicitly declared as exported.</p>
-
-For instance, to use EUnit in your application, but with testing turned
-off by default, put the following lines in a header file:
-<pre>   -define(NOTEST, true).
-   -include_lib("eunit/include/eunit.hrl").</pre>
-and then make sure that every module of your application includes that
-header file. This means that you have a only a single place to modify in
-order to change the default setting for testing. To override the <code>NOTEST</code>
-setting without modifying the code, you can define <code>TEST</code> in a compiler
-option, like this:
-<pre>   erlc -DTEST my_module.erl</pre>
-
-<p>See <a href="#Compilation_control_macros">Compilation control macros</a> for details about these
-macros.</p>
-
-<h4><a name="Avoiding_compile-time_dependency_on_EUnit">Avoiding compile-time dependency on EUnit</a></h4>
-
-If you are distributing the source code for your application for other
-people to compile and run, you probably want to ensure that the code
-compiles even if EUnit is not available. Like the example in the
-previous section, you can put the following lines in a common header
-file:
-<pre>   -ifdef(TEST).
-   -include_lib("eunit/include/eunit.hrl").
-   -endif.</pre><p>
-and, of course, also make sure that you place all test code that uses
-EUnit macros within <code>-ifdef(TEST)</code> or <code>-ifdef(EUNIT)</code> sections.</p>
-
-
-<h3><a name="EUnit_macros">EUnit macros</a></h3>
-
-<p>Although all the functionality of EUnit is avaliable even without the
-use of preprocessor macros, the EUnit header file defines a number of
-such macros in order to make it as easy as possible to write unit tests
-as compactly as possible and without getting too many details in the
-way.</p>
-
-<p>Except where explicitly stated, using EUnit macros will never introduce
-run-time dependencies on the EUnit library code, regardless of whether
-your code is compiled with testing enabled or disabled.</p>
-
-<ul>
-<li><a href="#Basic_macros">Basic macros</a></li>
-<li><a href="#Compilation_control_macros">Compilation control macros</a></li>
-<li><a href="#Utility_macros">Utility macros</a></li>
-<li><a href="#Assert_macros">Assert macros</a></li>
-<li><a href="#Macros_for_running_external_commands">Macros for running external commands</a></li>
-<li><a href="#Debugging_macros">Debugging macros</a></li>
-</ul>
-
-<h4><a name="Basic_macros">Basic macros</a></h4>
-
-<dl>
-<dt><code>_test(Expr)</code></dt>
-<dd>Turns <code>Expr</code> into a "test object", by wrapping it in a
-fun-expression and a source line number. Technically, this is the same
-as <code>{?LINE, fun () -&gt; (Expr) end}</code>.
-</dd>
-</dl>
-
-<h4><a name="Compilation_control_macros">Compilation control macros</a></h4>
-
-<dl>
-<dt><code>EUNIT</code></dt>
-<dd>This macro is always defined to <code>true</code> whenever EUnit is enabled at
-compile time. This is typically used to place testing code within
-conditional compilation, as in:
-<pre>   -ifdef(EUNIT).
-       % test code here
-       ...
-   -endif.</pre>
-e.g., to ensure that the code can be compiled without including the
-EUnit header file, when testing is disabled. See also the macros <code>TEST</code>
-and <code>NOTEST</code>.
-</dd>
-
-<dt><code>EUNIT_NOAUTO</code></dt>
-<dd>If this macro is defined, the automatic exporting or stripping of
-test functions will be disabled.
-</dd>
-
-<dt><code>TEST</code></dt>
-<dd><p>This macro is always defined (to <code>true</code>, unless previously defined
-by the user to have another value) whenever EUnit is enabled at compile
-time. This can be used to place testing code within conditional
-compilation; see also the macros <code>NOTEST</code> and <code>EUNIT</code>.</p>
-
-<p>For testing code that is strictly dependent on EUnit, it may be
-preferable to use the <code>EUNIT</code> macro for this purpose, while for code
-that uses more generic testing conventions, using the <code>TEST</code> macro may
-be preferred.</p>
-
-The <code>TEST</code> macro can also be used to override the <code>NOTEST</code> macro. If
-<code>TEST</code> is defined <em>before</em> the EUnit header file is
-included (even if <code>NOTEST</code> is also defined), then the code will be
-compiled with EUnit enabled.
-</dd>
-
-<dt><code>NOTEST</code></dt>
-<dd><p>This macro is always defined (to <code>true</code>, unless previously defined
-by the user to have another value) whenever EUnit is <em>disabled</em>
-at compile time. (Compare the <code>TEST</code> macro.)</p>
-
-This macro can also be used for conditional compilation, but is more
-typically used to disable testing: If <code>NOTEST</code> is defined
-<em>before</em> the EUnit header file is included, and <code>TEST</code>
-is <em>not</em> defined, then the code will be compiled with EUnit
-disabled. See also <a href="#Disabling_testing">Disabling testing</a>.
-</dd>
-
-<dt><code>NOASSERT</code></dt>
-<dd>If this macro is defined, the assert macros will have no effect,
-when testing is also disabled. See <a href="#Assert_macros">Assert macros</a>. When
-testing is enabled, the assert macros are always enabled automatically
-and cannot be disabled.
-</dd>
-
-<dt><code>ASSERT</code></dt>
-<dd>If this macro is defined, it overrides the NOASSERT macro, forcing
-the assert macros to always be enabled regardless of other settings.
-</dd>
-
-<dt><code>NODEBUG</code></dt>
-<dd>If this macro is defined, the debugging macros will have no effect.
-See <a href="#Debugging_macros">Debugging macros</a>. <code>NODEBUG</code> also implies <code>NOASSERT</code>,
-unless testing is enabled.
-</dd>
-
-<dt><code>DEBUG</code></dt>
-<dd>If this macro is defined, it overrides the NODEBUG macro, forcing
-the debugging macros to be enabled.
-</dd>
-</dl>
-
-<h4><a name="Utility_macros">Utility macros</a></h4>
-
-<p>The following macros can make tests more compact and readable:</p>
-
-<dl>
-<dt><code>LET(Var,Arg,Expr)</code></dt>
-<dd>Creates a local binding <code>Var = Arg</code> in <code>Expr</code>. (This is the same as
-<code>(fun(Var)-&gt;(Expr)end)(Arg)</code>.) Note that the binding is not exported
-outside of <code>Expr</code>, and that within <code>Expr</code>, this binding of <code>Var</code> will
-shadow any binding of <code>Var</code> in the surrounding scope.
-</dd>
-<dt><code>IF(Cond,TrueCase,FalseCase)</code></dt>
-<dd>Evaluates <code>TrueCase</code> if <code>Cond</code> evaluates to <code>true</code>, or otherwise
-evaluates <code>FalseCase</code> if <code>Cond</code> evaluates to <code>false</code>. (This is the same
-as <code>(case (Cond) of true-&gt;(TrueCase); false-&gt;(FalseCase) end)</code>.) Note
-that it is an error if <code>Cond</code> does not yield a boolean value.
-</dd>
-</dl>
-
-<h4><a name="Assert_macros">Assert macros</a></h4>
-
-<p>(Note that these macros also have corresponding forms which start with
-an "<code>_</code>" (underscore) character, as in <code>?_assert(BoolExpr)</code>, that create
-a "test object" instead of performing the test immediately. This is
-equivalent to writing <code>?_test(assert(BoolExpr))</code>, etc.)</p>
-
-<p>If the macro <code>NOASSERT</code> is defined before the EUnit header file is
-included, these macros have no effect when testing is also disabled; see
-<a href="#Compilation_control_macros">Compilation control macros</a> for details.</p>
-
-<dl>
-<dt><code>assert(BoolExpr)</code></dt>
-<dd><p>Evaluates the expression <code>BoolExpr</code>, if testing is enabled. Unless
-the result is <code>true</code>, an informative exception will be generated. If
-there is no exception, the result of the macro expression is the atom
-<code>ok</code>, and the value of <code>BoolExpr</code> is discarded. If testing is disabled,
-the macro will not generate any code except the atom <code>ok</code>, and
-<code>BoolExpr</code> will not be evaluated.</p>
-
-Typical usage:
-<pre>   ?assert(f(X, Y) =:= [])</pre>
-
-The <code>assert</code> macro can be used anywhere in a program, not just in unit
-tests, to check pre/postconditions and invariants. For example:
-<pre>   some_recursive_function(X, Y, Z) -&gt;
-       ?assert(X + Y &gt; Z),
-       ...</pre>
-</dd>
-<dt><code>assertNot(BoolExpr)</code></dt>
-<dd>Equivalent to <code>assert(not (BoolExpr))</code>.
-</dd>
-<dt><code>assertMatch(GuardedPattern, Expr)</code></dt>
-<dd><p>Evaluates <code>Expr</code> and matches the result against <code>GuardedPattern</code>, if
-testing is enabled. If the match fails, an informative exception will be
-generated; see the <code>assert</code> macro for further details. <code>GuardedPattern</code>
-can be anything that you can write on the left hand side of the <code>-&gt;</code>
-symbol in a case-clause, except that it cannot contain comma-separated
-guard tests.</p>
-
-<p>The main reason for using <code>assertMatch</code> also for simple matches, instead
-of matching with <code>=</code>, is that it produces more detailed error messages.</p>
-
-Examples:
-<pre>   ?assertMatch({found, {fred, _}}, lookup(bloggs, Table))</pre>
-<pre>   ?assertMatch([X|_] when X &gt; 0, binary_to_list(B))</pre>
-</dd>
-<dt><code>assertEqual(Expect, Expr)</code></dt>
-<dd><p>Evaluates the expressions <code>Expect</code> and <code>Expr</code> and compares the
-results for equality, if testing is enabled. If the values are not
-equal, an informative exception will be generated; see the <code>assert</code>
-macro for further details.</p>
-
-<p><code>assertEqual</code> is more suitable than than <code>assertMatch</code> when the
-left-hand side is a computed value rather than a simple pattern, and
-gives more details than <code>?assert(Expect =:= Expr)</code>.</p>
-
-Examples:
-<pre>   ?assertEqual("b" ++ "a", lists:reverse("ab"))</pre>
-<pre>   ?assertEqual(foo(X), bar(Y))</pre>
-</dd>
-<dt><code>assertException(ClassPattern, TermPattern, Expr)</code></dt>
-<dt><code>assertError(TermPattern, Expr)</code></dt>
-<dt><code>assertExit(TermPattern, Expr)</code></dt>
-<dt><code>assertThrow(TermPattern, Expr)</code></dt>
-<dd><p>Evaluates <code>Expr</code>, catching any exception and testing that it matches
-the expected <code>ClassPattern:TermPattern</code>. If the match fails, or if no
-exception is thrown by <code>Expr</code>, an informative exception will be
-generated; see the <code>assert</code> macro for further details. The
-<code>assertError</code>, <code>assertExit</code>, and <code>assertThrow</code> macros, are equivalent to
-using <code>assertException</code> with a <code>ClassPattern</code> of <code>error</code>, <code>exit</code>, or
-<code>throw</code>, respectively.</p>
-
-Examples:
-<pre>   ?assertError(badarith, X/0)</pre>
-<pre>   ?assertExit(normal, exit(normal))</pre>
-<pre>   ?assertException(throw, {not_found,_}, throw({not_found,42}))</pre>
-</dd>
-</dl>
-
-<h4><a name="Macros_for_running_external_commands">Macros for running external commands</a></h4>
-
-<p>Keep in mind that external commands are highly dependent on the
-operating system. You can use the standard library function <code>os:type()</code>
-in test generator functions, to produce different sets of tests
-depending on the current operating system.</p>
-
-<p>Note: these macros introduce a run-time dependency on the EUnit library
-code, if compiled with testing enabled.</p>
-
-<dl>
-<dt><code>assertCmd(CommandString)</code></dt>
-<dd><p>Runs <code>CommandString</code> as an external command, if testing is enabled.
-Unless the returned status value is 0, an informative exception will be
-generated. If there is no exception, the result of the macro expression
-is the atom <code>ok</code>. If testing is disabled, the macro will not generate
-any code except the atom <code>ok</code>, and the command will not be executed.</p>
-
-Typical usage:
-<pre>   ?assertCmd("mkdir foo")</pre>
-</dd>
-<dt><code>assertCmdStatus(N, CommandString)</code></dt>
-<dd>Like the <code>assertCmd(CommandString)</code> macro, but generates an
-exception unless the returned status value is <code>N</code>.
-</dd>
-<dt><code>assertCmdOutput(Text, CommandString)</code></dt>
-<dd>Runs <code>CommandString</code> as an external command, if testing is enabled.
-Unless the output produced by the command exactly matches the specified
-string <code>Text</code>, an informative exception will be generated. (Note that
-the output is normalized to use a single LF character as line break on
-all platforms.) If there is no exception, the result of the macro
-expression is the atom <code>ok</code>. If testing is disabled, the macro will not
-generate any code except the atom <code>ok</code>, and the command will not be
-executed.
-</dd>
-<dt><code>cmd(CommandString)</code></dt>
-<dd><p>Runs <code>CommandString</code> as an external command. Unless the returned
-status value is 0 (indicating success), an informative exception will be
-generated; otherwise, the result of the macro expression is the output
-produced by the command, as a flat string. The output is normalized to
-use a single LF character as line break on all platforms.</p>
-
-<p>This macro is useful in the setup and cleanup sections of fixtures,
-e.g., for creating and deleting files or perform similar operating
-system specific tasks, to make sure that the test system is informed of
-any failures.</p>
-
-A Unix-specific example:
-<pre>   {setup,
-    fun () -&gt; ?cmd("mktemp") end,
-    fun (FileName) -&gt; ?cmd("rm " ++ FileName) end,
-    ...}</pre>
-</dd>
-</dl>
-
-<h4><a name="Debugging_macros">Debugging macros</a></h4>
-
-<p>To help with debugging, EUnit defines several useful macros for printing
-messages directly to the console (rather than to the standard output).
-Furthermore, these macros all use the same basic format, which includes
-the file and line number where they occur, making it possible in some
-development environments (e.g., when running Erlang in an Emacs buffer)
-to simply click on the message and jump directly to the corresponding
-line in the code.</p>
-
-<p>If the macro <code>NODEBUG</code> is defined before the EUnit header file is
-included, these macros have no effect; see
-<a href="#Compilation_control_macros">Compilation control macros</a> for details.</p>
-
-<dl>
-<dt><code>debugHere</code></dt>
-<dd>Just prints a marker showing the current file and line number. Note
-that this is an argument-less macro. The result is always <code>ok</code>.</dd>
-<dt><code>debugMsg(Text)</code></dt>
-<dd>Outputs the message <code>Text</code> (which can be a plain string, an IO-list,
-or just an atom). The result is always <code>ok</code>.</dd>
-<dt><code>debugFmt(FmtString, Args)</code></dt>
-<dd>This formats the text like <code>io:format(FmtString, Args)</code> and outputs
-it like <code>debugMsg</code>. The result is always <code>ok</code>.</dd>
-<dt><code>debugVal(Expr)</code></dt>
-<dd>Prints both the source code for <code>Expr</code> and its current value. E.g.,
-<code>?debugVal(f(X))</code> might be displayed as "<code>f(X) = 42</code>". (Large terms are
-shown truncated.) The result is always the value of <code>Expr</code>, so this
-macro can be wrapped around any expression to display its value when
-the code is compiled with debugging enabled.</dd>
-<dt><code>debugTime(Text,Expr)</code></dt>
-<dd>Prints <code>Text</code> and the wall clock time for evaluation of <code>Expr</code>. The
-result is always the value of <code>Expr</code>, so this macro can be wrapped
-around any expression to show its run time when the code is compiled
-with debugging enabled. For example, <code>List1 = ?debugTime("sorting",
-lists:sort(List))</code> might show as "<code>sorting: 0.015 s</code>".</dd>
-
-</dl>
-
-
-<h3><a name="EUnit_test_representation">EUnit test representation</a></h3>
-
-<p>The way EUnit represents tests and test sets as data is flexible,
-powerful, and concise. This section describes the representation in
-detail.</p>
-
-<ul>
-<li><a href="#Simple_test_objects">Simple test objects</a></li>
-<li><a href="#Test_sets_and_deep_lists">Test sets and deep lists</a></li>
-<li><a href="#Titles">Titles</a></li>
-<li><a href="#Primitives">Primitives</a></li>
-<li><a href="#Control">Control</a></li>
-<li><a href="#Fixtures">Fixtures</a></li>
-<li><a href="#Lazy_generators">Lazy generators</a></li>
-</ul>
-
-<h4><a name="Simple_test_objects">Simple test objects</a></h4>
-
-A <em>simple test object</em> is one of the following:
-<ul>
-  <li>A nullary functional value (i.e., a fun that takes zero
-      arguments). Examples:
-<pre>   fun () -&gt; ... end</pre>
-<pre>   fun some_function/0</pre>
-<pre>   fun some_module:some_function/0</pre>
-  </li>
-  <li>A pair of atoms <code>{ModuleName, FunctionName}</code>, referring to the
-      function <code>ModuleName:FunctionName/0</code></li>
-  <li>A pair <code>{LineNumber, SimpleTest}</code>, where <code>LineNumber</code> is a
-      nonnegative integer and <code>SimpleTest</code> is another simple test
-      object. <code>LineNumber</code> should indicate the source line of the test.
-      Pairs like this are usually only created via <code>?_test(...)</code> macros;
-      see <a href="#Basic_macros">Basic macros</a>.</li>
-</ul><p>
-In brief, a simple test object consists of a single function that takes
-no arguments (possibly annotated with some additional metadata, i.e., a
-line number). Evaluation of the function either <em>succeeds</em>, by
-returning some value (which is ignored), or <em>fails</em>, by throwing
-an exception.</p>
-
-<h4><a name="Test_sets_and_deep_lists">Test sets and deep lists</a></h4>
-
-<p>A test set can be easily created by placing a sequence of test objects
-in a list. If <code>T_1</code>, ..., <code>T_N</code> are individual test objects, then <code>[T_1,
-..., T_N]</code> is a test set consisting of those objects (in that order).</p>
-
-<p>Test sets can be joined in the same way: if <code>S_1</code>, ..., <code>S_K</code> are test
-sets, then <code>[S_1, ..., S_K]</code> is also a test set, where the tests of
-<code>S_i</code> are ordered before those of <code>S_(i+1)</code>, for each subset <code>S_i</code>.</p>
-
-<p>Thus, the main representation of test sets is <em>deep lists</em>, and
-a simple test object can be viewed as a test set containing only a
-single test; there is no difference between <code>T</code> and <code>[T]</code>.</p>
-
-<p>A module can also be used to represent a test set; see <code>ModuleName</code>
-under <a href="#Primitives">Primitives</a> below.</p>
-
-<h4><a name="Titles">Titles</a></h4>
-
-<p>Any test or test set <code>T</code> can be annotated with a title, by wrapping it
-in a pair <code>{Title, T}</code>, where <code>Title</code> is a string. For convenience, any
-test which is normally represented using a tuple can simply be given a
-title string as the first element, i.e., writing <code>{"The Title", ...}</code>
-instead of adding an extra tuple wrapper as in <code>{"The Title", {...}}</code>.</p>
-
-
-<h4><a name="Primitives">Primitives</a></h4>
-
-The following are primitives, which do not contain other test sets as
-arguments:
-<dl>
-<dt><code>ModuleName::atom()</code>
-</dt>
-<dd>A single atom represents a module name, and is equivalent to
-<code>{module, ModuleName}</code>. This is often used as in the call
-<code>eunit:test(some_module)</code>.
-</dd>
-<dt><code>{module, ModuleName::atom()}</code>
-</dt>
-<dd><p>This composes a test set from the exported test functions of the
-named module, i.e., those functions with arity zero whose names end
-with <code>_test</code> or <code>_test_</code>. Basically, the <code>..._test()</code> functions become
-simple tests, while the <code>..._test_()</code> functions become generators.</p>
-
-In addition, EUnit will also look for another module whose name is
-<code>ModuleName</code> plus the suffix <code>_tests</code>, and if it exists, all the tests
-from that module will also be added. (If <code>ModuleName</code> already contains
-the suffix <code>_tests</code>, this is not done.) E.g., the specification
-<code>{module, mymodule}</code> will run all tests in the modules <code>mymodule</code> and
-<code>mymodule_tests</code>. Typically, the <code>_tests</code> module should only contain
-test cases that use the public interface of the main module (and no
-other code).
-</dd>
-<dt><code>{application, AppName::atom(), Info::list()}</code>
-</dt>
-<dd>This is a normal Erlang/OTP application descriptor, as found in an
- <code>.app</code> file. The resulting test set consists of the modules listed in
- the <code>modules</code> entry in <code>Info</code>.
-</dd>
-<dt><code>{application, AppName::atom()}</code>
-</dt>
-<dd>This creates a test set from all the modules belonging to the
-specified application, by consulting the application's <code>.app</code> file
-(see <code>{file, FileName}</code>), or if no such file exists, by testing all
-object files in the application's <tt>ebin</tt>-directory (see <code>{dir,
-Path}</code>); if that does not exist, the <code>code:lib_dir(AppName)</code> directory
-is used.
-</dd>
-<dt><code>Path::string()</code>
-</dt>
-<dd>A single string represents the path of a file or directory, and is
-equivalent to <code>{file, Path}</code>, or <code>{dir, Path}</code>, respectively, depending
-on what <code>Path</code> refers to in the file system.
-</dd>
-<dt><code>{file, FileName::string()}</code>
-</dt>
-<dd><p>If <code>FileName</code> has a suffix that indicates an object file (<code>.beam</code>),
-EUnit will try to reload the module from the specified file and test it.
-Otherwise, the file is assumed to be a text file containing test
-specifications, which will be read using the standard library function
-<code>file:path_consult/2</code>.</p>
-
-Unless the file name is absolute, the file is first searched for
-relative to the current directory, and then using the normal search path
-(<code>code:get_path()</code>). This means that the names of typical "app" files
-can be used directly, without a path, e.g., <code>"mnesia.app"</code>.
-</dd>
-<dt><code>{dir, Path::string()}</code>
-</dt>
-<dd>This tests all object files in the specified directory, as if they
-had been individually specified using <code>{file, FileName}</code>.
-</dd>
-<dt><code>{generator, GenFun::(() -&gt; Tests)}</code>
-</dt>
-<dd>The generator function <code>GenFun</code> is called to produce a test
-set.
-</dd>
-<dt><code>{generator, ModuleName::atom(), FunctionName::atom()}</code>
-</dt>
-<dd>The function <code>ModuleName:FunctionName()</code> is called to produce a test
-set.
-</dd>
-<dt><code>{with, X::any(), [AbstractTestFun::((any()) -&gt; any())]}</code>
-</dt>
-<dd>Distributes the value <code>X</code> over the unary functions in the list,
-turning them into nullary test functions. An <code>AbstractTestFun</code> is like
-an ordinary test fun, but takes one argument instead of zero - it's
-basically missing some information before it can be a proper test. In
-practice, <code>{with, X, [F_1, ..., F_N]}</code> is equivalent to <code>[fun () -&gt;
-F_1(X) end, ..., fun () -&gt; F_N(X) end]</code>. This is particularly useful if
-your abstract test functions are already implemented as proper
-functions: <code>{with, FD, [fun filetest_a/1, fun filetest_b/1, fun
-filetest_c/1]}</code> is equivalent to <code>[fun () -&gt; filetest_a(FD) end, fun ()
--&gt; filetest_b(FD) end, fun () -&gt; filetest_c(FD) end]</code>, but much more
-compact. See also <a href="#Fixtures">Fixtures</a>, below.
-</dd>
-</dl>
-
-<h4><a name="Control">Control</a></h4>
-
-The following representations control how and where tests are executed:
-<dl>
-<dt><code>{spawn, Tests}</code></dt>
-<dd>Runs the specified tests in a separate subprocess, while the current
-test process waits for it to finish. This is useful for tests that need
-a fresh, isolated process state. (Note that EUnit always starts at least
-one such a subprocess automatically; tests are never executed by the
-caller's own process.)</dd>
-<dt><code>{spawn, Node::atom(), Tests}</code></dt>
-<dd>Like <code>{spawn, Tests}</code>, but runs the specified tests on the given
-Erlang node.</dd>
-<dt><code>{timeout, Time::number(), Tests}</code></dt>
-<dd>Runs the specified tests under the given timeout. Time is in
-seconds; e.g., 60 means one minute and 0.1 means 1/10th of a second. If
-the timeout is exceeded, the unfinished tests will be forced to
-terminate. Note that if a timeout is set around a fixture, it includes
-the time for setup and cleanup, and if the timeout is triggered, the
-entire fixture is abruptly terminated (without running the
-cleanup).</dd>
-<dt><code>{inorder, Tests}</code></dt>
-<dd>Runs the specified tests in strict order. Also see <code>{inparallel,
-Tests}</code>. By default, tests are neither marked as <code>inorder</code> or
-<code>inparallel</code>, but may be executed as the test framework chooses.</dd>
-<dt><code>{inparallel, Tests}</code></dt>
-<dd>Runs the specified tests in parallel (if possible). Also see
-<code>{inorder, Tests}</code>.</dd>
-<dt><code>{inparallel, N::integer(), Tests}</code></dt>
-<dd>Like <code>{inparallel, Tests}</code>, but running no more than <code>N</code> subtests
-simultaneously.</dd>
-</dl>
-
-<h4><a name="Fixtures">Fixtures</a></h4>
-
-<p>A "fixture" is some state that is necessary for a particular set of
-tests to run. EUnit's support for fixtures makes it easy to set up such
-state locally for a test set, and automatically tear it down again when
-the test set is finished, regardless of the outcome (success, failures,
-timeouts, etc.).</p>
-
-<p>To make the descriptions simpler, we first list some definitions:
-<center>
-<table border="0" cellspacing="4">
-<tr>
-<td><code>Setup</code></td><td><code>() -&gt; (R::any())</code></td>
-</tr>
-<tr>
-<td><code>SetupX</code></td><td><code>(X::any()) -&gt; (R::any())</code></td>
-</tr>
-<tr>
-<td><code>Cleanup</code></td><td><code>(R::any()) -&gt; any()</code></td>
-</tr>
-<tr>
-<td><code>CleanupX</code></td><td><code>(X::any(), R::any()) -&gt; any()</code></td>
-</tr>
-<tr>
-<td><code>Instantiator</code></td><td><code>((R::any()) -&gt; Tests) | {with, [AbstractTestFun::((any()) -&gt; any())]}</code></td>
-</tr>
-<tr>
-<td><code>Where</code></td><td><code>local | spawn | {spawn, Node::atom()}</code></td>
-</tr>
-</table>
-</center>
-(these are explained in more detail further below.)</p>
-
-The following representations specify fixture handling for test sets:
-<dl>
-<dt><code>{setup, Setup, Tests | Instantiator}</code></dt>
-<dt><code>{setup, Setup, Cleanup, Tests | Instantiator}</code></dt>
-<dt><code>{setup, Where, Setup, Tests | Instantiator}</code></dt>
-<dt><code>{setup, Where, Setup, Cleanup, Tests | Instantiator}</code></dt>
-<dd><code>setup</code> sets up a single fixture for running all of the specified
-tests, with optional teardown afterwards. The arguments are described in
-detail below.
-</dd>
-<dt><code>{node, Node::atom(), Tests | Instantiator}</code></dt>
-<dt><code>{node, Node::atom(), Args::string(), Tests | Instantiator}</code></dt>
-<dd><code>node</code> is like <code>setup</code>, but with a built-in behaviour: it starts a
-slave node for the duration of the tests. The atom <code>Node</code> should have
-the format <code>[email protected]</code>, and <code>Args</code> are the optional
-arguments to the new node; see <code>slave:start_link/3</code> for details.
-</dd>
-<dt><code>{foreach, Where, Setup, Cleanup, [Tests | Instantiator]}</code></dt>
-<dt><code>{foreach, Setup, Cleanup, [Tests | Instantiator]}</code></dt>
-<dt><code>{foreach, Where, Setup, [Tests | Instantiator]}</code></dt>
-<dt><code>{foreach, Setup, [Tests | Instantiator]}</code></dt>
-<dd><code>foreach</code> is used to set up a fixture and optionally tear it down
-afterwards, repeated for each single one of the specified test sets.
-</dd>
-<dt><code>{foreachx, Where, SetupX, CleanupX,
-      Pairs::[{X::any(), ((X::any(), R::any()) -&gt; Tests)}]}</code></dt>
-<dt><code>{foreachx, SetupX, CleanupX, Pairs}</code></dt>
-<dt><code>{foreachx, Where, SetupX, Pairs}</code></dt>
-<dt><code>{foreachx, SetupX, Pairs}</code></dt>
-<dd><code>foreachx</code> is like <code>foreach</code>, but uses a list of pairs, each
-containing an extra argument <code>X</code> and an extended instantiator function.
-</dd>
-</dl>
-
-<p>A <code>Setup</code> function is executed just before any of the specified tests
-are run, and a <code>Cleanup</code> function is executed when no more of the
-specified tests will be run, regardless of the reason. A <code>Setup</code>
-function takes no argument, and returns some value which will be passed
-as it is to the <code>Cleanup</code> function. A <code>Cleanup</code> function should do
-whatever necessary and return some arbitrary value, such as the atom
-<code>ok</code>. (<code>SetupX</code> and <code>CleanupX</code> functions are similar, but receive one
-additional argument: some value <code>X</code>, which depends on the context.) When
-no <code>Cleanup</code> function is specified, a dummy function is used which has
-no effect.</p>
-
-<p>An <code>Instantiator</code> function receives the same value as the <code>Cleanup</code>
-function, i.e., the value returned by the <code>Setup</code> function. It should
-then behave much like a generator (see <a href="#Primitives">Primitives</a>), and
-return a test set whose tests have been <em>instantiated</em> with the
-given value. A special case is the syntax <code>{with, [AbstractTestFun]}</code>
-which represents an instantiator function that distributes the value
-over a list of unary functions; see <a href="#Primitives">Primitives</a>: <code>{with, X,
-[...]}</code> for more details.</p>
-
-A <code>Where</code> term controls how the specified tests are executed. The
-default is <code>spawn</code>, which means that the current process handles the
-setup and teardown, while the tests are executed in a subprocess.
-<code>{spawn, Node}</code> is like <code>spawn</code>, but runs the subprocess on the
-specified node. <code>local</code> means that the current process will handle both
-setup/teardown and running the tests - the drawback is that if a test
-times out so that the process is killed, the <em>cleanup will not be
-performed</em>; hence, avoid this for persistent fixtures such as file
-operations. In general, 'local' should only be used when:
-<ul>
-  <li>the setup/teardown needs to be executed by the process that will
-  run the tests;</li>
-  <li>no further teardown needs to be done if the process is killed
-  (i.e., no state outside the process was affected by the setup)</li>
-</ul>
-
-<h4><a name="Lazy_generators">Lazy generators</a></h4>
-
-<p>Sometimes, it can be convenient not to produce the whole set of test
-descriptions before the testing begins; for example, if you want to
-generate a huge amount of tests that would take up too much space to
-keep in memory all at once.</p>
-
-<p>It is fairly easy to write a generator which, each time it is called,
-either produces an empty list if it is done, or otherwise produces a
-list containing a single test case plus a new generator which will
-produce the rest of the tests. This demonstrates the basic pattern:</p>
-
-<pre>   lazy_test_() -&gt;
-       lazy_gen(10000).
-
-   lazy_gen(N) -&gt;
-       {generator,
-        fun () -&gt;
-            if N &gt; 0 -&gt;
-                   [?_test(...)
-                    | lazy_gen(N-1)];
-               true -&gt;
-                   []
-            end
-        end}.</pre>
-
-<p>When EUnit traverses the test representation in order to run the tests,
-the new generator will not be called to produce the next test until the
-previous test has been executed.</p>
-
-Note that it is easiest to write this kind of recursive generator using
-a help function, like the <code>lazy_gen/1</code> function above. It can also be
-written using a recursive fun, if you prefer to not clutter your
-function namespace and are comfortable with writing that kind of code.
-
-<hr>
-<div class="navbar"><a name="#navbar_bottom"></a><table width="100%" border="0" cellspacing="0" cellpadding="2" summary="navigation bar"><tr><td><a href="overview-summary.html" target="overviewFrame">Overview</a></td><td><a href="http://www.erlang.org/"><img src="erlang.png" align="right" border="0" alt="erlang logo"></a></td></tr></table></div>
-<p><i>Generated by EDoc, Apr 22 2009, 22:37:19.</i></p>
-</body>
-</html>
diff --git a/lib/eunit/doc/overview.edoc b/lib/eunit/doc/overview.edoc
index be05a13fba..ad449cb6fc 100644
--- a/lib/eunit/doc/overview.edoc
+++ b/lib/eunit/doc/overview.edoc
@@ -5,8 +5,7 @@
 
 @title EUnit - a Lightweight Unit Testing Framework for Erlang
 
-@author Richard Carlsson <[email protected]>
-        [http://user.it.uu.se/~richardc/]
+@author Richard Carlsson <[email protected]>
 @author Micka�l R�mond <[email protected]> 
         [http://www.process-one.net/]
 @copyright 2004-2007 Micka�l R�mond, Richard Carlsson
@@ -913,7 +912,7 @@ To make the descriptions simpler, we first list some definitions:
 <td>`CleanupX'</td><td>`(X::any(), R::any()) -> any()'</td>
 </tr>
 <tr>
-<td>`Instantiator'</td><td>`((R::any()) -> Tests | {with, [AbstractTestFun::((any()) -> any())]}'</td>
+<td>`Instantiator'</td><td>`((R::any()) -> Tests) | {with, [AbstractTestFun::((any()) -> any())]}'</td>
 </tr>
 <tr>
 <td>`Where'</td><td>`local | spawn | {spawn, Node::atom()}'</td>
diff --git a/lib/eunit/doc/packages-frame.html b/lib/eunit/doc/packages-frame.html
deleted file mode 100644
index 52b45534f5..0000000000
--- a/lib/eunit/doc/packages-frame.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>The eunit application</title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="EDoc">
-</head>
-<body bgcolor="white">
-<h2 class="indextitle">Packages</h2>
-<table width="100%" border="0" summary="list of packages"></table>
-</body>
-</html>
\ No newline at end of file
diff --git a/lib/eunit/doc/src/make.dep b/lib/eunit/doc/src/make.dep
deleted file mode 100644
index d68f888403..0000000000
--- a/lib/eunit/doc/src/make.dep
+++ /dev/null
@@ -1,19 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex chapter.tex eunit.tex part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml
index a02d76c5b9..e68330482c 100644
--- a/lib/eunit/doc/src/notes.xml
+++ b/lib/eunit/doc/src/notes.xml
@@ -32,6 +32,63 @@
   </header>
   <p>This document describes the changes made to the EUnit application.</p>
 
+<section><title>Eunit 2.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Generate separate surefire XMLs for each test suite</p>
+          <p>
+	    Previously the test cases of all test suites (=modules)
+	    were put in one and the same surefire report XML thereby
+	    breaking the principle of least astonishment and making
+	    post analysis harder. Assume the following layout:</p>
+          <p>
+	    src/x.erl src/y.erl test/x_tests.erl test/y_tests.erl</p>
+          <p>
+	    The results for both x_tests and y_tests were written to
+	    only one report grouped under either module x or y
+	    (seemingly randomly).</p>
+          <p>
+	    Now two reports, one for module x and one for y are
+	    generated. (Thanks to Klas Johansson)</p>
+          <p>
+	    Own Id: OTP-9465</p>
+        </item>
+        <item>
+          <p>
+	    Updated to EUnit version 2.2.0</p>
+          <p>
+	    New macros assertNotMatch(Guard, Expr),
+	    assertNotEqual(Unexpected, Expr), and
+	    assertNotException(Class, Term, Expr). </p>
+          <p>
+	    The debugMsg macro now also prints the pid of the current
+	    process.</p>
+          <p>
+	    When testing all modules in a directory, tests in
+	    Module_tests.erl are no longer executed twice.</p>
+          <p>
+	    The use of regexp internally has been replaced with re.
+	    (Thanks to Richard Carlsson)</p>
+          <p>
+	    Own Id: OTP-9505</p>
+        </item>
+        <item>
+          <p>
+	    Removed some never-matching clauses reported by dialyzer
+	    Updated author e-mails and homepages Removed cvs keywords
+	    from files Removed files that should not be checked in
+	    (Thanks to Richard Carlsson)</p>
+          <p>
+	    Own Id: OTP-9591</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eunit 2.1.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/eunit/doc/stylesheet.css b/lib/eunit/doc/stylesheet.css
deleted file mode 100644
index e426a90483..0000000000
--- a/lib/eunit/doc/stylesheet.css
+++ /dev/null
@@ -1,55 +0,0 @@
-/* standard EDoc style sheet */
-body {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-      	margin-left: .25in;
-       	margin-right: .2in;
-       	margin-top: 0.2in;
-       	margin-bottom: 0.2in;
-       	color: #000000;
-       	background-color: #ffffff;
-}
-h1,h2 {
- 	margin-left: -0.2in;
-}
-div.navbar {
-	background-color: #add8e6;
-	padding: 0.2em;
-}
-h2.indextitle {
-	padding: 0.4em;
-	background-color: #add8e6;
-}
-h3.function,h3.typedecl {
-	background-color: #add8e6;
- 	padding-left: 1em;
-}
-div.spec {
- 	margin-left: 2em;
-	background-color: #eeeeee;
-}
-a.module,a.package {
-	text-decoration:none
-}
-a.module:hover,a.package:hover {
-	background-color: #eeeeee;
-}
-ul.definitions {
-	list-style-type: none;
-}
-ul.index {
-	list-style-type: none;
-	background-color: #eeeeee;
-}
-
-/*
- * Minor style tweaks
- */
-ul {
-	list-style-type: square;
-}
-table {
-	border-collapse: collapse;
-}
-td {
-	padding: 3
-}
diff --git a/lib/eunit/examples/Makefile b/lib/eunit/examples/Makefile
index d1b5bac224..48ec2ebf2b 100644
--- a/lib/eunit/examples/Makefile
+++ b/lib/eunit/examples/Makefile
@@ -13,8 +13,6 @@
 # Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
 # AB. All Rights Reserved.''
 # 
-#     $Id$
-#
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
diff --git a/lib/eunit/include/eunit.hrl b/lib/eunit/include/eunit.hrl
index 82ba982f03..db68d8ae60 100644
--- a/lib/eunit/include/eunit.hrl
+++ b/lib/eunit/include/eunit.hrl
@@ -13,8 +13,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit.hrl 337 2009-03-09 08:38:28Z rcarlsson $
-%%
 %% Copyright (C) 2004-2006 Micka�l R�mond, Richard Carlsson
 
 %% Including this file turns on testing and defines TEST, unless NOTEST
@@ -39,6 +37,7 @@
 -ifndef(EUNIT_HRL).
 -define(EUNIT_HRL, true).
 
+
 %% allow defining TEST to override NOTEST
 -ifdef(TEST).
 -undef(NOTEST).
@@ -164,7 +163,7 @@
 %% This is mostly a convenience which gives more detailed reports.
 %% Note: Guard is a guarded pattern, and can not be used for value.
 -ifdef(NOASSERT).
--define(assertMatch(Guard,Expr),ok).
+-define(assertMatch(Guard, Expr), ok).
 -else.
 -define(assertMatch(Guard, Expr),
 	((fun () ->
@@ -174,17 +173,37 @@
 				      [{module, ?MODULE},
 				       {line, ?LINE},
 				       {expression, (??Expr)},
-				       {expected, (??Guard)},
+				       {pattern, (??Guard)},
 				       {value, __V}]})
 	    end
 	  end)())).
 -endif.
 -define(_assertMatch(Guard, Expr), ?_test(?assertMatch(Guard, Expr))).
 
+%% This is the inverse case of assertMatch, for convenience.
+-ifdef(NOASSERT).
+-define(assertNotMatch(Guard, Expr), ok).
+-else.
+-define(assertNotMatch(Guard, Expr),
+	((fun () ->
+	    __V = (Expr),
+	    case __V of
+		Guard -> .erlang:error({assertNotMatch_failed,
+					[{module, ?MODULE},
+					 {line, ?LINE},
+					 {expression, (??Expr)},
+					 {pattern, (??Guard)},
+					 {value, __V}]});
+		_ -> ok
+	    end
+	  end)())).
+-endif.
+-define(_assertNotMatch(Guard, Expr), ?_test(?assertNotMatch(Guard, Expr))).
+
 %% This is a convenience macro which gives more detailed reports when
 %% the expected LHS value is not a pattern, but a computed value
 -ifdef(NOASSERT).
--define(assertEqual(Expect,Expr),ok).
+-define(assertEqual(Expect, Expr), ok).
 -else.
 -define(assertEqual(Expect, Expr),
 	((fun (__X) ->
@@ -201,9 +220,29 @@
 -endif.
 -define(_assertEqual(Expect, Expr), ?_test(?assertEqual(Expect, Expr))).
 
+%% This is the inverse case of assertEqual, for convenience.
+-ifdef(NOASSERT).
+-define(assertNotEqual(Unexpected, Expr), ok).
+-else.
+-define(assertNotEqual(Unexpected, Expr),
+	((fun (__X) ->
+	    case (Expr) of
+		__X -> .erlang:error({assertNotEqual_failed,
+				      [{module, ?MODULE},
+				       {line, ?LINE},
+				       {expression, (??Expr)},
+				       {value, __X}]});
+		_ -> ok
+	    end
+	  end)(Unexpected))).
+-endif.
+-define(_assertNotEqual(Unexpected, Expr),
+	?_test(?assertNotEqual(Unexpected, Expr))).
+
 %% Note: Class and Term are patterns, and can not be used for value.
+%% Term can be a guarded pattern, but Class cannot.
 -ifdef(NOASSERT).
--define(assertException(Class, Term, Expr),ok).
+-define(assertException(Class, Term, Expr), ok).
 -else.
 -define(assertException(Class, Term, Expr),
 	((fun () ->
@@ -212,7 +251,7 @@
 				      [{module, ?MODULE},
 				       {line, ?LINE},
 				       {expression, (??Expr)},
-				       {expected,
+				       {pattern,
 					"{ "++(??Class)++" , "++(??Term)
 					++" , [...] }"},
 				       {unexpected_success, __V}]})
@@ -223,7 +262,7 @@
 				   [{module, ?MODULE},
 				    {line, ?LINE},
 				    {expression, (??Expr)},
-				    {expected,
+				    {pattern,
 				     "{ "++(??Class)++" , "++(??Term)
 				     ++" , [...] }"},
 				    {unexpected_exception,
@@ -243,6 +282,43 @@
 -define(_assertExit(Term, Expr), ?_assertException(exit, Term, Expr)).
 -define(_assertThrow(Term, Expr), ?_assertException(throw, Term, Expr)).
 
+%% This is the inverse case of assertException, for convenience.
+%% Note: Class and Term are patterns, and can not be used for value.
+%% Both Class and Term can be guarded patterns.
+-ifdef(NOASSERT).
+-define(assertNotException(Class, Term, Expr), ok).
+-else.
+-define(assertNotException(Class, Term, Expr),
+	((fun () ->
+	    try (Expr) of
+	        _ -> ok
+	    catch
+		__C:__T ->
+		    case __C of
+			Class ->
+			    case __T of
+				Term ->
+				    .erlang:error({assertNotException_failed,
+						   [{module, ?MODULE},
+						    {line, ?LINE},
+						    {expression, (??Expr)},
+						    {pattern,
+						     "{ "++(??Class)++" , "
+						     ++(??Term)++" , [...] }"},
+						    {unexpected_exception,
+						     {__C, __T,
+						      .erlang:get_stacktrace()
+						     }}]});
+				_ -> ok
+			    end;
+			_ -> ok
+		    end
+	    end
+	  end)())).
+-endif.
+-define(_assertNotException(Class, Term, Expr),
+	?_test(?assertNotException(Class, Term, Expr))).
+
 %% Macros for running operating system commands. (Note that these
 %% require EUnit to be present at runtime, or at least eunit_lib.)
 
@@ -267,7 +343,7 @@
 %% these are only used for testing; they always return 'ok' on success,
 %% and have no effect if debugging/testing is turned off
 -ifdef(NOASSERT).
--define(assertCmdStatus(N, Cmd),ok).
+-define(assertCmdStatus(N, Cmd), ok).
 -else.
 -define(assertCmdStatus(N, Cmd),
  	((fun () ->
@@ -285,7 +361,7 @@
 -define(assertCmd(Cmd), ?assertCmdStatus(0, Cmd)).
 
 -ifdef(NOASSERT).
--define(assertCmdOutput(T, Cmd),ok).
+-define(assertCmdOutput(T, Cmd), ok).
 -else.
 -define(assertCmdOutput(T, Cmd),
  	((fun () ->
@@ -313,11 +389,12 @@
 -define(debugHere, ok).
 -define(debugFmt(S, As), ok).
 -define(debugVal(E), (E)).
--define(debugTime(S,E), (E)).
+-define(debugTime(S, E), (E)).
 -else.
 -define(debugMsg(S),
 	(begin
-	     .io:fwrite(user, <<"~s:~w: ~s\n">>, [?FILE, ?LINE, S]),
+	     .io:fwrite(user, <<"~s:~w:~w: ~s\n">>,
+                        [?FILE, ?LINE, self(), S]),
 	     ok
 	 end)).
 -define(debugHere, (?debugMsg("<-"))).
@@ -327,7 +404,7 @@
 		  ?debugFmt(<<"~s = ~P">>, [(??E), __V, 15]),
 		  __V
 	  end)(E))).
--define(debugTime(S,E),
+-define(debugTime(S, E),
 	((fun () ->
 		  {__T0, _} = statistics(wall_clock),
 		  __V = (E),
@@ -337,4 +414,5 @@
 	  end)())).
 -endif.
 
+
 -endif. % EUNIT_HRL
diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
index 4897c20ec1..bec2fdbe0b 100644
--- a/lib/eunit/src/Makefile
+++ b/lib/eunit/src/Makefile
@@ -26,8 +26,9 @@ INCLUDE=../include
 
 ERL_COMPILE_FLAGS += -pa $(EBIN) -I$(INCLUDE) +warn_unused_vars +nowarn_shadow_vars +warn_unused_import +warn_obsolete_guard
 
+PARSE_TRANSFORM = eunit_autoexport.erl
+
 SOURCES= \
-	eunit_autoexport.erl \
 	eunit_striptests.erl \
 	eunit.erl \
 	eunit_tests.erl \
@@ -43,6 +44,8 @@ SOURCES= \
 
 INCLUDE_FILES = eunit.hrl
 
+PARSE_TRANSFORM_BIN = $(PARSE_TRANSFORM:%.erl=$(EBIN)/%.$(EMULATOR))
+
 OBJECTS=$(SOURCES:%.erl=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
 
 INCLUDE_DELIVERABLES = $(INCLUDE_FILES:%=$(INCLUDE)/%)
@@ -59,7 +62,7 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(OBJECTS)
+debug opt: $(PARSE_TRANSFORM_BIN) $(OBJECTS)
 
 docs:
 
@@ -86,6 +89,8 @@ realclean: clean
 $(EBIN)/%.$(EMULATOR):%.erl
 	erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
+$(OBJECTS): $(PARSE_TRANSFORM_BIN)
+
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
@@ -103,9 +108,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin
+	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) $(RELSYSDIR)/ebin
 	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(SOURCES) $(RELSYSDIR)/src
+	$(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) $(RELSYSDIR)/src
 	$(INSTALL_DIR) $(RELSYSDIR)/include
 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) $(RELSYSDIR)/include
 
diff --git a/lib/eunit/src/eunit.app.src b/lib/eunit/src/eunit.app.src
index 4fd76588c3..5e16dfa2ce 100644
--- a/lib/eunit/src/eunit.app.src
+++ b/lib/eunit/src/eunit.app.src
@@ -5,17 +5,17 @@
   {vsn, "%VSN%"},
   {modules, [eunit,
 	     eunit_autoexport,
-	     eunit_striptests,
-	     eunit_server,
+	     eunit_data,
+	     eunit_lib,
+	     eunit_listener,
 	     eunit_proc,
 	     eunit_serial,
+	     eunit_server,
+	     eunit_striptests,
+	     eunit_surefire,
 	     eunit_test,
 	     eunit_tests,
-	     eunit_lib,
-	     eunit_listener,
-	     eunit_data,
-	     eunit_tty,
-	     eunit_surefire]},
+	     eunit_tty]},
   {registered,[]},
-  {applications, [stdlib]},
+  {applications, [kernel,stdlib]},
   {env, []}]}.
diff --git a/lib/eunit/src/eunit.erl b/lib/eunit/src/eunit.erl
index da35c5c2ec..95857e83c8 100644
--- a/lib/eunit/src/eunit.erl
+++ b/lib/eunit/src/eunit.erl
@@ -13,13 +13,10 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit.erl 339 2009-04-05 14:10:47Z rcarlsson $
-%%
 %% @copyright 2004-2009 Micka�l R�mond, Richard Carlsson
-%% @author Micka&euml;l R&eacute;mond <[email protected]>
+%% @author Micka�l R�mond <[email protected]>
 %%   [http://www.process-one.net/]
-%% @author Richard Carlsson <[email protected]>
-%%   [http://user.it.uu.se/~richardc/]
+%% @author Richard Carlsson <[email protected]>
 %% @version {@version}, {@date} {@time}
 %% @doc This module is the main EUnit user interface.
 
diff --git a/lib/eunit/src/eunit_autoexport.erl b/lib/eunit/src/eunit_autoexport.erl
index 7b153c1194..099bcb222e 100644
--- a/lib/eunit/src/eunit_autoexport.erl
+++ b/lib/eunit/src/eunit_autoexport.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_autoexport.erl 329 2009-03-01 11:23:32Z rcarlsson $ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_data.erl b/lib/eunit/src/eunit_data.erl
index 0543b6c543..392d378a0e 100644
--- a/lib/eunit/src/eunit_data.erl
+++ b/lib/eunit/src/eunit_data.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
@@ -146,8 +144,10 @@ iter_next(I = #iter{next = [T | Ts]}) ->
 
 iter_prev(#iter{prev = []}) ->
     none;
-iter_prev(#iter{prev = [T | Ts], next = Next, pos = Pos} = I) ->
-    {T, I#iter{prev = Ts, next = [T | Next], pos = Pos - 1}}.
+iter_prev(#iter{prev = [T | Ts]} = I) ->
+    {T, I#iter{prev = Ts,
+	       next = [T | I#iter.next],
+		       pos = I#iter.pos - 1}}.
 
 
 %% ---------------------------------------------------------------------
@@ -363,7 +363,8 @@ parse({file, F} = T) when is_list(F) ->
 parse({dir, D}=T) when is_list(D) ->
     case eunit_lib:is_string(D) of
 	true ->
-	    {data, {"directory \"" ++ D ++ "\"", get_directory_modules(D)}};
+	    {data, {"directory \"" ++ D ++ "\"",
+		    get_directory_module_tests(D)}};
 	false ->
 	    bad_test(T)
     end;
@@ -385,10 +386,10 @@ parse({S, T1} = T) when is_list(S) ->
     end;
 parse({S, T1}) when is_binary(S) ->
     group(#group{tests = T1, desc = S});
-parse(T) when tuple_size(T) > 2, is_list(element(1, T)) ->
+parse(T) when is_tuple(T), size(T) > 2, is_list(element(1, T)) ->
     [S | Es] = tuple_to_list(T),
     parse({S, list_to_tuple(Es)});
-parse(T) when tuple_size(T) > 2, is_binary(element(1, T)) ->
+parse(T) when is_tuple(T), size(T) > 2, is_binary(element(1, T)) ->
     [S | Es] = tuple_to_list(T),
     parse({S, list_to_tuple(Es)});
 parse(M) when is_atom(M) ->
@@ -596,7 +597,7 @@ testfuns(Es, M, TestSuffix, GeneratorSuffix) ->
 
 
 %% ---------------------------------------------------------------------
-%% Getting a test set from a file
+%% Getting a test set from a file (text file or object file)
 
 %% @throws {file_read_error, {Reason::atom(), Message::string(),
 %%                            fileName()}}
@@ -625,17 +626,23 @@ get_file_tests(F) ->
 is_module_filename(F) ->
     filename:extension(F) =:= code:objfile_extension().
 
+objfile_test({M, File}) ->
+    {setup,
+     fun () ->
+	     %% TODO: better error/stacktrace for this internal fun
+	     code:purge(M),
+	     {module,M} = code:load_abs(filename:rootname(File)),
+	     ok
+     end,
+     {module, M}};
 objfile_test(File) ->
+    objfile_test({objfile_module(File), File}).
+
+objfile_module(File) ->
     try
-	{module, M} = lists:keyfind(module, 1, beam_lib:info(File)),
-	{setup,
-	 fun () ->
-		 %% TODO: better error/stacktrace for this internal fun
-		 code:purge(M),
-		 {module,M} = code:load_abs(filename:rootname(File)),
-		 ok
-	 end,
-	 {module, M}}
+	{value, {module, M}} = lists:keysearch(module, 1,
+					       beam_lib:info(File)),
+	M
     catch
 	_:_ ->
 	    throw({file_read_error,
@@ -644,15 +651,34 @@ objfile_test(File) ->
 
 
 %% ---------------------------------------------------------------------
-%% Getting a list of module names from object files in a directory
-
-%% @throws {file_read_error, {Reason::atom(), Message::string(),
-%%                            fileName()}}
+%% Getting a set of module tests from the object files in a directory
+
+%% @throws {file_read_error,
+%%          {Reason::atom(), Message::string(), fileName()}}
+
+get_directory_module_tests(D) ->
+    Ms = get_directory_modules(D),
+    %% for all 'm' in the set, remove 'm_tests' if present
+    F = fun ({M,_}, S) ->
+		Name = atom_to_list(M),
+		case lists:suffix(?DEFAULT_TESTMODULE_SUFFIX, Name) of
+		    false ->
+			Name1 = Name ++ ?DEFAULT_TESTMODULE_SUFFIX,
+			M1 = list_to_atom(Name1),
+			dict:erase(M1, S);
+		    true ->
+			S
+		end
+	end,
+    [objfile_test(Obj)
+     || Obj <- dict:to_list(lists:foldl(F, dict:from_list(Ms), Ms))].
 
 %% TODO: handle packages (recursive search for files)
-
 get_directory_modules(D) ->
-    [objfile_test(filename:join(D, F))
+    [begin
+	 F1 = filename:join(D, F),
+	 {objfile_module(F1), F1}
+     end
      || F <- eunit_lib:list_dir(D), is_module_filename(F)].
 
 
diff --git a/lib/eunit/src/eunit_internal.hrl b/lib/eunit/src/eunit_internal.hrl
index 8d0ac30bd7..92694ec39b 100644
--- a/lib/eunit/src/eunit_internal.hrl
+++ b/lib/eunit/src/eunit_internal.hrl
@@ -1,11 +1,7 @@
 %% -------------------------------------------------------------------
 %% File: eunit_internal.hrl
 %%
-%% $Id: eunit_internal.hrl 329 2009-03-01 11:23:32Z rcarlsson $ 
-%%
-%% @author Richard Carlsson <[email protected]>
-%% @copyright 2006 Richard Carlsson
-%% @doc 
+%% Copyright (C) 2006 Richard Carlsson <[email protected]>
 
 -define(SERVER, eunit_server).
 -define(DEFAULT_TEST_SUFFIX, "_test").
diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl
index 45d2387e7b..1c41e229c5 100644
--- a/lib/eunit/src/eunit_lib.erl
+++ b/lib/eunit/src/eunit_lib.erl
@@ -13,13 +13,10 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_lib.erl 339 2009-04-05 14:10:47Z rcarlsson $
-%%
 %% @copyright 2004-2007 Micka�l R�mond, Richard Carlsson
 %% @author Micka�l R�mond <[email protected]>
 %%   [http://www.process-one.net/]
-%% @author Richard Carlsson <[email protected]>
-%%   [http://user.it.uu.se/~richardc/]
+%% @author Richard Carlsson <[email protected]>
 %% @private
 %% @see eunit
 %% @doc Utility functions for eunit
diff --git a/lib/eunit/src/eunit_listener.erl b/lib/eunit/src/eunit_listener.erl
index 20faecbf01..ecaac424a2 100644
--- a/lib/eunit/src/eunit_listener.erl
+++ b/lib/eunit/src/eunit_listener.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2009 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl
index e2d51d8bd5..ec7d93fd48 100644
--- a/lib/eunit/src/eunit_proc.erl
+++ b/lib/eunit/src/eunit_proc.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_serial.erl b/lib/eunit/src/eunit_serial.erl
index d9ccae86f9..80e79116e3 100644
--- a/lib/eunit/src/eunit_serial.erl
+++ b/lib/eunit/src/eunit_serial.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_server.erl b/lib/eunit/src/eunit_server.erl
index bf1bb9bcef..2002930abb 100644
--- a/lib/eunit/src/eunit_server.erl
+++ b/lib/eunit/src/eunit_server.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_server.erl 267 2008-10-19 18:48:03Z rcarlsson $
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
@@ -59,8 +57,9 @@ watch(Server, Module, Opts) when is_atom(Module) ->
 watch_path(Server, Path, Opts) ->
     command(Server, {watch, {path, filename:flatten(Path)}, Opts}).
 
+%% note that the user must use $ at the end to match whole paths only
 watch_regexp(Server, Regex, Opts) ->
-    case regexp:parse(Regex) of
+    case re:compile(Regex,[anchored]) of
 	{ok, R} ->
 	    command(Server, {watch, {regexp, R}, Opts});
 	{error, _}=Error ->
@@ -278,8 +277,8 @@ is_watched(Path, St) ->
 	match_any(sets:to_list(St#state.regexps), Path).
 
 match_any([R | Rs], Str) ->
-    case regexp:first_match(Str, R) of
-	{match, _, _} -> true;
+    case re:run(Str, R, [{capture,none}]) of
+	match -> true;
 	_ -> match_any(Rs, Str)
     end;
 match_any([], _Str) -> false.
diff --git a/lib/eunit/src/eunit_striptests.erl b/lib/eunit/src/eunit_striptests.erl
index 606e44b286..c6ade389ba 100644
--- a/lib/eunit/src/eunit_striptests.erl
+++ b/lib/eunit/src/eunit_striptests.erl
@@ -13,10 +13,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_striptests.erl 329 2009-03-01 11:23:32Z rcarlsson $ 
-%%
-%% @author Richard Carlsson <[email protected]>
-%% @author Eric Merritt <[email protected]>
+%% @author Richard Carlsson <[email protected]>
+%% @author Eric Merritt <[email protected]>
 %% @copyright 2006 Richard Carlsson, Eric Merritt
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl
index dfb08c90b2..2a6cbca14d 100644
--- a/lib/eunit/src/eunit_surefire.erl
+++ b/lib/eunit/src/eunit_surefire.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: $
-%%
-%% @author Micka&euml;l R&eacute;mond <[email protected]>
+%% @author Micka�l R�mond <[email protected]>
 %% @copyright 2009 Micka�l R�mond, Paul Guyot
 %% @see eunit
 %% @doc Surefire reports for EUnit (Format used by Maven and Atlassian
@@ -58,12 +56,13 @@
 	{
 	  name :: chars(),
 	  description :: chars(),
-	  result :: ok | {failed, tuple()} | {aborted, tuple()} | {skipped, tuple()},
+	  result :: ok | {failed, tuple()} | {aborted, tuple()} | {skipped, term()},
 	  time :: integer(),
 	  output :: binary()
 	 }).
 -record(testsuite,
 	{
+          id = 0 :: integer(),
 	  name = <<>> :: binary(),
 	  time = 0 :: integer(),
 	  output = <<>> :: binary(),
@@ -76,7 +75,7 @@
 -record(state, {verbose = false,
 		indent = 0,
 		xmldir = ".",
-		testsuite = #testsuite{}
+		testsuites = [] :: [#testsuite{}]
 	       }).
 
 start() ->
@@ -89,55 +88,60 @@ init(Options) ->
     XMLDir = proplists:get_value(dir, Options, ?XMLDIR),
     St = #state{verbose = proplists:get_bool(verbose, Options),
 		xmldir = XMLDir,
-		testsuite = #testsuite{}},
+		testsuites = []},
     receive
 	{start, _Reference} ->
 	    St
     end.
 
 terminate({ok, _Data}, St) ->
-    TestSuite = St#state.testsuite,
+    TestSuites = St#state.testsuites,
     XmlDir = St#state.xmldir,
-    write_report(TestSuite, XmlDir),
+    write_reports(TestSuites, XmlDir),
     ok;
 terminate({error, _Reason}, _St) ->
     %% Don't report any errors here, since eunit_tty takes care of that.
     %% Just terminate.
     ok.
 
-handle_begin(group, Data, St) ->
+handle_begin(Kind, Data, St) when Kind == group; Kind == test ->
+    %% Run this code both for groups and tests; test is a bit
+    %% surprising: This is a workaround for the fact that we don't get
+    %% a group (handle_begin(group, ...) for testsuites (modules)
+    %% which only have one test case.  In that case we get a test case
+    %% with an id comprised of just one integer - the group id.
     NewId = proplists:get_value(id, Data),
     case NewId of
 	[] ->
 	    St;
-	[_GroupId] ->
+	[GroupId] ->
 	    Desc = proplists:get_value(desc, Data),
-	    TestSuite = St#state.testsuite,
-	    NewTestSuite = TestSuite#testsuite{name = Desc},
-	    St#state{testsuite=NewTestSuite};
+            TestSuite = #testsuite{id = GroupId, name = Desc},
+	    St#state{testsuites=store_suite(TestSuite, St#state.testsuites)};
 	%% Surefire format is not hierarchic: Ignore subgroups:
 	_ ->
 	    St
-    end;
-handle_begin(test, _Data, St) ->
-    St.
+    end.
 handle_end(group, Data, St) ->
     %% Retrieve existing test suite:
     case proplists:get_value(id, Data) of
 	[] ->
 	    St;
-	[_GroupId|_] ->
-	    TestSuite = St#state.testsuite,
+	[GroupId|_] ->
+            TestSuites = St#state.testsuites,
+	    TestSuite = lookup_suite_by_group_id(GroupId, TestSuites),
 
 	    %% Update TestSuite data:
 	    Time = proplists:get_value(time, Data),
 	    Output = proplists:get_value(output, Data),
 	    NewTestSuite = TestSuite#testsuite{ time = Time, output = Output },
-	    St#state{testsuite=NewTestSuite}
+	    St#state{testsuites=store_suite(NewTestSuite, TestSuites)}
     end;
 handle_end(test, Data, St) ->
     %% Retrieve existing test suite:
-    TestSuite = St#state.testsuite,
+    [GroupId|_] = proplists:get_value(id, Data),
+    TestSuites = St#state.testsuites,
+    TestSuite = lookup_suite_by_group_id(GroupId, TestSuites),
 
     %% Create test case:
     Name = format_name(proplists:get_value(source, Data),
@@ -149,7 +153,7 @@ handle_end(test, Data, St) ->
     TestCase = #testcase{name = Name, description = Desc,
 			 time = Time,output = Output},
     NewTestSuite = add_testcase_to_testsuite(Result, TestCase, TestSuite),
-    St#state{testsuite=NewTestSuite}.
+    St#state{testsuites=store_suite(NewTestSuite, TestSuites)}.
 
 %% Cancel group does not give information on the individual cancelled test case
 %% We ignore this event
@@ -157,7 +161,9 @@ handle_cancel(group, _Data, St) ->
     St;
 handle_cancel(test, Data, St) ->
     %% Retrieve existing test suite:
-    TestSuite = St#state.testsuite,
+    [GroupId|_] = proplists:get_value(id, Data),
+    TestSuites = St#state.testsuites,
+    TestSuite = lookup_suite_by_group_id(GroupId, TestSuites),
 
     %% Create test case:
     Name = format_name(proplists:get_value(source, Data),
@@ -171,7 +177,7 @@ handle_cancel(test, Data, St) ->
     NewTestSuite = TestSuite#testsuite{
 		     skipped = TestSuite#testsuite.skipped+1,
 		     testcases=[TestCase|TestSuite#testsuite.testcases] },
-    St#state{testsuite=NewTestSuite}.
+    St#state{testsuites=store_suite(NewTestSuite, TestSuites)}.
 
 format_name({Module, Function, Arity}, Line) ->
     lists:flatten([atom_to_list(Module), ":", atom_to_list(Function), "/",
@@ -183,6 +189,12 @@ format_desc(Desc) when is_binary(Desc) ->
 format_desc(Desc) when is_list(Desc) ->
     Desc.
 
+lookup_suite_by_group_id(GroupId, TestSuites) ->
+    #testsuite{} = lists:keyfind(GroupId, #testsuite.id, TestSuites).
+
+store_suite(#testsuite{id=GroupId} = TestSuite, TestSuites) ->
+    lists:keystore(GroupId, #testsuite.id, TestSuites, TestSuite).
+
 %% Add testcase to testsuite depending on the result of the test.
 add_testcase_to_testsuite(ok, TestCaseTmp, TestSuite) ->
     TestCase = TestCaseTmp#testcase{ result = ok },
@@ -214,6 +226,10 @@ add_testcase_to_testsuite({error, Exception}, TestCaseTmp, TestSuite) ->
 %% Write a report to the XML directory.
 %% This function opens the report file, calls write_report_to/2 and closes the file.
 %% ----------------------------------------------------------------------------
+write_reports(TestSuites, XmlDir) ->
+    lists:foreach(fun(TestSuite) -> write_report(TestSuite, XmlDir) end,
+                  TestSuites).
+
 write_report(#testsuite{name = Name} = TestSuite, XmlDir) ->
     Filename = filename:join(XmlDir, lists:flatten(["TEST-", escape_suitename(Name)], ".xml")),
     case file:open(Filename, [write, raw]) of
@@ -293,7 +309,6 @@ write_testcase(
             output = Output},
         FileDescriptor) ->
     DescriptionAttr = case Description of
-			  <<>> -> [];
 			  [] -> [];
 			  _ -> [<<" description=\"">>, escape_attr(Description), <<"\"">>]
 		      end,
@@ -302,7 +317,6 @@ write_testcase(
         <<"\" name=\"">>, escape_attr(Name), <<"\"">>,
         DescriptionAttr],
     ContentAndEndTag = case {Result, Output} of
-        {ok, []} -> [<<"/>">>, ?NEWLINE];
         {ok, <<>>} -> [<<"/>">>, ?NEWLINE];
         _ -> [<<">">>, ?NEWLINE, format_testcase_result(Result), format_testcase_output(Output), ?INDENT, <<"</testcase>">>, ?NEWLINE]
     end,
@@ -351,7 +365,6 @@ format_testcase_result({skipped, Term}) ->
 %% Empty output is simply the empty string.
 %% Other output is inside a <system-out> xml tag.
 %% ----------------------------------------------------------------------------
-format_testcase_output([]) -> [];
 format_testcase_output(Output) ->
     [?INDENT, ?INDENT, <<"<system-out>">>, escape_text(Output), ?NEWLINE, ?INDENT, ?INDENT, <<"</system-out>">>, ?NEWLINE].
 
@@ -369,8 +382,6 @@ format_time_s([Digit1, Digit2, Digit3 | Tail]) -> [lists:reverse(Tail), $., Digi
 %% Escape a suite's name to generate the filename.
 %% Remark: we might overwrite another testsuite's file.
 %% ----------------------------------------------------------------------------
-escape_suitename([Head | _T] = List) when is_list(Head) ->
-    escape_suitename(lists:flatten(List));
 escape_suitename(Binary) when is_binary(Binary) ->
     escape_suitename(binary_to_list(Binary));
 escape_suitename("module '" ++ String) ->
@@ -378,7 +389,6 @@ escape_suitename("module '" ++ String) ->
 escape_suitename(String) ->
     escape_suitename(String, []).
 
-escape_suitename(Binary, Acc) when is_binary(Binary) -> escape_suitename(binary_to_list(Binary), Acc);
 escape_suitename([], Acc) -> lists:reverse(Acc);
 escape_suitename([$  | Tail], Acc) -> escape_suitename(Tail, [$_ | Acc]);
 escape_suitename([$' | Tail], Acc) -> escape_suitename(Tail, Acc);
diff --git a/lib/eunit/src/eunit_test.erl b/lib/eunit/src/eunit_test.erl
index d322c4b420..bca49ae626 100644
--- a/lib/eunit/src/eunit_test.erl
+++ b/lib/eunit/src/eunit_test.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_test.erl 336 2009-03-06 14:43:21Z rcarlsson $ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
@@ -131,12 +129,27 @@ macro_test_() ->
 				[{module,_},
 				 {line,_},
 				 {expression,_},
-				 {expected,"[ _ ]"},
+				 {pattern,"[ _ ]"},
 				 {value,[]}]},
 			 _}}
 		     = run_testfun(F)
  	     end),
       ?_test(begin
+		 {?LINE, F} = ?_assertNotMatch(ok, error),
+		 {ok, ok} = run_testfun(F)
+	     end),
+      ?_test(begin
+		 {?LINE, F} = ?_assertNotMatch([_], [42]),
+		 {error,{error,{assertNotMatch_failed,
+				[{module,_},
+				 {line,_},
+				 {expression,_},
+				 {pattern,"[ _ ]"},
+				 {value,[42]}]},
+			 _}}
+		     = run_testfun(F)
+	     end),
+      ?_test(begin
  		 {?LINE, F} = ?_assertEqual(ok, ok),
  		 {ok, ok} = run_testfun(F)
  	     end),
@@ -152,6 +165,20 @@ macro_test_() ->
 		     = run_testfun(F)
  	     end),
       ?_test(begin
+		 {?LINE, F} = ?_assertNotEqual(1, 0),
+		 {ok, ok} = run_testfun(F)
+	     end),
+      ?_test(begin
+		 {?LINE, F} = ?_assertNotEqual(2, 1+1),
+		 {error,{error,{assertNotEqual_failed,
+				[{module,_},
+				 {line,_},
+				 {expression,_},
+				 {value,2}]},
+			 _}}
+		     = run_testfun(F)
+	     end),
+      ?_test(begin
  		 {?LINE, F} = ?_assertException(error, badarith,
  						erlang:error(badarith)),
  		 {ok, ok} = run_testfun(F)
@@ -162,7 +189,7 @@ macro_test_() ->
 				[{module,_},
 				 {line,_},
 				 {expression,_},
-				 {expected,_},
+				 {pattern,_},
 				 {unexpected_success,ok}]},
 			 _}}
 		     = run_testfun(F)
@@ -174,15 +201,48 @@ macro_test_() ->
 				[{module,_},
 				 {line,_},
 				 {expression,_},
-				 {expected,_},
+				 {pattern,_},
+				 {unexpected_exception,
+				  {error,badarith,_}}]},
+			 _}}
+		     = run_testfun(F)
+	     end),
+      ?_test(begin
+		 {?LINE, F} = ?_assertError(badarith,
+					    erlang:error(badarith)),
+		 {ok, ok} = run_testfun(F)
+	     end),
+      ?_test(begin
+		 {?LINE, F} = ?_assertExit(normal, exit(normal)),
+		 {ok, ok} = run_testfun(F)
+	     end),
+      ?_test(begin
+		 {?LINE, F} = ?_assertThrow(foo, throw(foo)),
+		 {ok, ok} = run_testfun(F)
+	     end),
+      ?_test(begin
+		 {?LINE, F} = ?_assertNotException(error, badarith, 42),
+		 {ok, ok} = run_testfun(F)
+	     end),
+      ?_test(begin
+		 {?LINE, F} = ?_assertNotException(error, badarith,
+						   erlang:error(badarg)),
+		 {ok, ok} = run_testfun(F)
+	     end),
+      ?_test(begin
+		 {?LINE, F} = ?_assertNotException(error, badarith,
+						   erlang:error(badarith)),
+		 {error,{error,{assertNotException_failed,
+				[{module,_},
+				 {line,_},
+				 {expression,_},
+				 {pattern,_},
 				 {unexpected_exception,
 				  {error,badarith,_}}]},
 			 _}}
 		     = run_testfun(F)
  	     end)
      ]}.
-
-under_eunit_test() -> ?assert(?UNDER_EUNIT).
 -endif.
 
 
diff --git a/lib/eunit/src/eunit_tests.erl b/lib/eunit/src/eunit_tests.erl
index 37c0b4d6ae..47ea0aaf46 100644
--- a/lib/eunit/src/eunit_tests.erl
+++ b/lib/eunit/src/eunit_tests.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_tests.erl 238 2007-11-15 10:23:54Z mremond $ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2007 Richard Carlsson
 %% @private
 %% @see eunit
@@ -26,17 +24,17 @@
 -include("eunit.hrl").
 
 -ifdef(TEST).
-%% Cause all the other modules to be tested as well as this one.
-full_test_() ->
-    %%{application, eunit}.    % this currently causes a loop
-    %% We use the below until loop detection is implemented
-    [eunit_autoexport,
-     eunit_striptests,
-     eunit_server,
-     eunit_proc,
-     eunit_serial,
-     eunit_test,
-     eunit_lib,
-     eunit_data,
-     eunit_tty].
+id(X) -> X.  % for suppressing compiler warnings
 -endif.
+
+under_eunit_test() -> ?assert(?UNDER_EUNIT).
+
+let_test() -> ?assertEqual(42, ?LET(X, 17, X+25)).
+
+if_test_() ->
+    [?_assertEqual(17, ?IF(id(1) > 0, 17, 42)),
+     ?_assertEqual(42, ?IF(id(1) < 0, 17, 42))].
+
+matches_test_() ->
+    [?_assert(?MATCHES("hel"++_, "hello")),
+     ?_assertNot(?MATCHES("hal"++_, "hello"))].
diff --git a/lib/eunit/src/eunit_tty.erl b/lib/eunit/src/eunit_tty.erl
index 5fe0140559..e3e7b710b2 100644
--- a/lib/eunit/src/eunit_tty.erl
+++ b/lib/eunit/src/eunit_tty.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_tty.erl 330 2009-03-01 16:28:02Z rcarlsson $ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006-2009 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk
index d7edd7977b..b0a77a225b 100644
--- a/lib/eunit/vsn.mk
+++ b/lib/eunit/vsn.mk
@@ -1 +1 @@
-EUNIT_VSN = 2.1.7
+EUNIT_VSN = 2.2.1
diff --git a/lib/gs/contribs/bonk/sounder.erl b/lib/gs/contribs/bonk/sounder.erl
index 11ab03d167..e6f69a1616 100644
--- a/lib/gs/contribs/bonk/sounder.erl
+++ b/lib/gs/contribs/bonk/sounder.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -72,13 +72,13 @@ stop() ->
     sounder ! {stop},
     ok end.
 
-new(File) when list(File) -> new(list_to_atom(File));
-new(File) when atom(File) ->
+new(File) when is_list(File) -> new(list_to_atom(File));
+new(File) when is_atom(File) ->
     catch begin check(),
     sounder ! {new,File,self()},
     wait_for_ack(sounder) end.
 
-play(No) when integer(No) ->
+play(No) when is_integer(No) ->
     catch begin check(),
     sounder ! {play, No, self()},
     wait_for_ack(sounder) end.
@@ -94,14 +94,14 @@ go()  ->
 
 loop(Port) ->
     receive
-	{new, File, From} when atom(File) ->
+	{new, File, From} when is_atom(File) ->
 	    Port ! {self(),{command,lists:append([0],atom_to_list(File))}},
 	    From ! {sounder,wait_for_ack(Port)},
 	    loop(Port);
 	{play,silent,From} ->
 	    From ! {sounder,false},
 	    loop(Port);
-	{play,No,From} when integer(No) ->
+	{play,No,From} when is_integer(No) ->
 	    Port ! {self(),{command,[No]}},
 	    From ! {sounder,wait_for_ack(Port)},
 	    loop(Port);
@@ -118,13 +118,13 @@ loop(Port) ->
 
 nosound() ->
     receive
-	{new,File,From} when atom(File) ->
+	{new,File,From} when is_atom(File) ->
 	    From ! {sounder,{ok,silent}},
 	    nosound();
 	{play,silent,From} ->
 	    From ! {sounder,true},
 	    nosound();
-	{play,No,From} when integer(No) ->
+	{play,No,From} when is_integer(No) ->
 	    From ! {sounder,{error,no_audio_cap}},
 	    nosound();
 	{stop} ->
@@ -135,7 +135,7 @@ nosound() ->
 
 wait_for_ack(sounder) ->
     receive {sounder,Res} -> Res end;
-wait_for_ack(Port) when port(Port) ->
+wait_for_ack(Port) when is_port(Port) ->
     receive
 	{Port,{data,"ok"}} ->
 	    ok;
@@ -149,7 +149,7 @@ wait_for_ack(Port) when port(Port) ->
 
 check() ->
     case whereis(sounder) of
-	Pid when pid(Pid) -> 
+	Pid when is_pid(Pid) -> 
 	    ok;
 	undefined ->
 	    throw({error,sounder_not_started})
diff --git a/lib/gs/contribs/cols/cols.erl b/lib/gs/contribs/cols/cols.erl
index 67b46d0dfb..111c9a58f1 100644
--- a/lib/gs/contribs/cols/cols.erl
+++ b/lib/gs/contribs/cols/cols.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -278,7 +278,7 @@ fall_column([], _X, _Y, ColumnAcc, ChecksAcc) ->
 fall_column([black|Colors], X, Y, ColumnAcc, ChecksAcc) ->
     case find_box(Colors) of
 	false -> {ColumnAcc, ChecksAcc};
-	NewColors when list(NewColors) ->
+	NewColors when is_list(NewColors) ->
 		fall_one_step(NewColors, X, Y, ColumnAcc, ChecksAcc)
     end;
 fall_column([Color|Colors], X, Y, ColumnAcc, ChecksAcc) ->
@@ -330,7 +330,7 @@ new_column_list([], _, _) -> [].
 %%----------------------------------------------------------------------
 %% Returns: a reversed list of colors.
 %%----------------------------------------------------------------------
-columntuple_to_list(ColumnTuple) when tuple(ColumnTuple) ->
+columntuple_to_list(ColumnTuple) when is_tuple(ColumnTuple) ->
     columntuple_to_list(tuple_to_list(ColumnTuple),[]).
 
 columntuple_to_list([],Acc) -> Acc;
diff --git a/lib/gs/contribs/mandel/mandel.erl b/lib/gs/contribs/mandel/mandel.erl
index d4d2452463..0f1df5c665 100644
--- a/lib/gs/contribs/mandel/mandel.erl
+++ b/lib/gs/contribs/mandel/mandel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -119,7 +119,7 @@ start_client(Opts,Nodes) ->
 
 try_random(random,Low,High) ->
     random:uniform()*(High-Low)+Low;
-try_random(Float,_Low,_High) when number(Float) -> Float.
+try_random(Float,_Low,_High) when is_number(Float) -> Float.
     
 
 %%-----------------------------------------------------------------
diff --git a/lib/gs/contribs/othello/othello_board.erl b/lib/gs/contribs/othello/othello_board.erl
index 0206ba2ded..212ba9bfe1 100644
--- a/lib/gs/contribs/othello/othello_board.erl
+++ b/lib/gs/contribs/othello/othello_board.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -147,7 +147,7 @@ but_pressed("Help",_ButtId,_User,GamePid,_Shell,_Wids,_Op) ->
 but_pressed("Newgame",_ButtId,_User,GamePid,_Shell,Wids,Options) ->
     new_game(GamePid,Wids,Options);
 but_pressed([],ButtId,User,GamePid,_Shell,_Wids,_Op) 
-					when pid(GamePid),User == player ->
+					when is_pid(GamePid),User == player ->
     [C,R] = atom_to_list(ButtId),
     GamePid ! {self(),position,othello_adt:pos(C-96,translate(R-48))},
     GamePid;
@@ -243,7 +243,7 @@ game_msg(Msg,User,GamePid,Shell,Wids,Options) ->
     end.
     
 
-new_game(GamePid,Wids,Options) when pid(GamePid) ->
+new_game(GamePid,Wids,Options) when is_pid(GamePid) ->
     exit(GamePid,kill),
     new_game(Wids,Options);
 new_game(_,Wids,Options) ->
diff --git a/lib/gs/doc/src/make.dep b/lib/gs/doc/src/make.dep
deleted file mode 100644
index b33ed3b2de..0000000000
--- a/lib/gs/doc/src/make.dep
+++ /dev/null
@@ -1,58 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex gs.tex gs_chapter1.tex gs_chapter2.tex \
-		gs_chapter3.tex gs_chapter4.tex gs_chapter5.tex \
-		gs_chapter6.tex gs_chapter7.tex gs_chapter8.tex \
-		part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-gs_chapter2.tex: examples/ex1.erl examples/ex2.erl
-
-gs_chapter4.tex: examples/ex3.erl examples/ex4.erl examples/ex5.erl \
-		examples/ex6.erl
-
-gs_chapter5.tex: examples/ex15.erl
-
-gs_chapter6.tex: examples/ex16.erl
-
-gs_chapter7.tex: examples/ex17.erl
-
-gs_chapter8.tex: examples/ex10.erl examples/ex11.erl examples/ex12.erl \
-		examples/ex13.erl examples/ex14.erl examples/ex7.erl \
-		examples/ex8.erl examples/ex9.erl
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: pics/gs1-1-image-1.ps pics/gs1-1-image-2.ps \
-		pics/gs1-1-image-3.ps
-
-book.dvi: pics/ex1.ps pics/gs1-1-image-4.ps
-
-book.dvi: pics/ex15.ps
-
-book.dvi: pics/ex16.ps
-
-book.dvi: pics/packer1.ps pics/packer2.ps
-
-book.dvi: pics/arc.ps pics/buttons.ps pics/ex10.ps pics/ex11.ps \
-		pics/ex12.ps pics/ex13.ps pics/ex14.ps pics/ex8.ps \
-		pics/ex9.ps pics/image.ps pics/line.ps pics/oval.ps \
-		pics/polygon.ps pics/rectangle.ps pics/text.ps \
-		pics/window.ps
-
diff --git a/lib/gs/doc/src/notes.xml b/lib/gs/doc/src/notes.xml
index 744efbd4fc..c32db495a1 100644
--- a/lib/gs/doc/src/notes.xml
+++ b/lib/gs/doc/src/notes.xml
@@ -30,7 +30,21 @@
   </header>
   <p>This document describes the changes made to the GS application.</p>
 
-  <section><title>GS 1.5.13</title>
+  <section><title>GS 1.5.14</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Remove misc. compiler warnings</p>
+          <p>
+	    Own Id: OTP-9542</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>GS 1.5.13</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/gs/examples/calc2.erl b/lib/gs/examples/calc2.erl
index d28780de01..0e841397f6 100644
--- a/lib/gs/examples/calc2.erl
+++ b/lib/gs/examples/calc2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -54,7 +54,7 @@ calc() ->
 
 calc_loop(Lbl,M,V,Op) ->
     receive
-	{gs,_,click,D,_} when integer(D) -> 
+	{gs,_,click,D,_} when is_integer(D) -> 
 	    digit_press(Lbl,M,V*10+D,Op);
 	{gs,_,click,'C',_} -> 
 	    c(Lbl,M,V,Op);
diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile
index a648d3cf13..964966ba00 100644
--- a/lib/gs/src/Makefile
+++ b/lib/gs/src/Makefile
@@ -90,7 +90,7 @@ clean:
 # Special Build Targets
 # ----------------------------------------------------
 
-gstk_generic.hrl: gs_make.erl
+gstk_generic.hrl: gs_make.erl ../ebin/gs_make.$(EMULATOR) ../ebin/gs.$(EMULATOR)
 	$(ERL) -pa $(EBIN) -s gs_make -s erlang halt -noshell
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
@@ -99,6 +99,8 @@ $(APP_TARGET): $(APP_SRC) ../vsn.mk
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 	sed -e 's;%VSN%;$(VSN);' $< > $@
 
+$(GSTK_GENERIC_TARGET): gstk_generic.hrl
+
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
diff --git a/lib/gs/src/gstk_editor.erl b/lib/gs/src/gstk_editor.erl
index 3e0c8240e4..8cc7021cc6 100644
--- a/lib/gs/src/gstk_editor.erl
+++ b/lib/gs/src/gstk_editor.erl
@@ -243,14 +243,14 @@ option(Option, Gstkid, _MainW, DB, Editor) ->
 		 Editor, " ins ",AI," ", gstk:to_ascii(Text)]};
 	clear       -> {c, [Editor, " delete 1.0 end"]};
 	{load,        File} ->
-	    {ok, F2,_} = regexp:gsub(File, [92,92], "/"),
+	    F2 = re:replace(File, [92,92], "/", [global,{return,list}]),
 	    case gstk:call(["ed_load ", Editor, " ", gstk:to_ascii(F2)]) of
 		{result,    _} -> none;
 		{bad_result,Re} -> 
 		    {error,{no_such_file,editor,load,F2,Re}}
 	    end;
 	{save, File} ->
-	    {ok, F2,_} = regexp:gsub(File, [92,92], "/"),
+	    F2 = re:replace(File, [92,92], "/", [global,{return,list}]),
 	    case gstk:call(["ed_save ",Editor," ",gstk:to_ascii(F2)]) of
 		{result,    _} -> none;
 		{bad_result,Re} -> 
diff --git a/lib/gs/src/gstk_generic.erl b/lib/gs/src/gstk_generic.erl
index 3ddb69efc5..2cc6c4c2d3 100644
--- a/lib/gs/src/gstk_generic.erl
+++ b/lib/gs/src/gstk_generic.erl
@@ -414,7 +414,7 @@ gen_font(_Opt,Gstkid,_TkW,DB,_ExtraArg) ->
 gen_label({text,Text},Opts,Gstkid,TkW,DB,ExtraArg,S,P,C) ->
     out_opts(Opts,Gstkid,TkW,DB,ExtraArg,[" -text ", gstk:to_ascii(Text), " -bi {}"|S],P,C);
 gen_label({image,Img},Opts,Gstkid,TkW,DB,ExtraArg,S,P,C) ->
-    {ok, I2,_} = regexp:gsub(Img, [92,92], "/"),
+    I2 = re:replace(Img, [92,92], "/", [global,{return,list}]),
     out_opts(Opts,Gstkid,TkW,DB,ExtraArg,[" -bi \"@", I2, "\" -text {}"|S],P,C).
 gen_label(_Opt,_Gstkid,TkW,_DB,_ExtraArg) ->
     case gstk:call([TkW, " cg -bit"]) of
diff --git a/lib/gs/src/gstk_image.erl b/lib/gs/src/gstk_image.erl
index 5ad37cf6de..9adbe42386 100644
--- a/lib/gs/src/gstk_image.erl
+++ b/lib/gs/src/gstk_image.erl
@@ -227,10 +227,10 @@ event(DB, Gstkid, Etype, Edata, Args) ->
 option(Option, Gstkid, _Canvas, _DB, _AItem) ->
     case Option of
 	{bitmap,     Bitmap} ->
-	    {ok, BF,_} = regexp:gsub(Bitmap, [92,92], "/"),
+	    BF = re:replace(Bitmap, [92,92], "/", [global,{return,list}]),
 	    {s, [" -bi @", BF]};
 	{load_gif,       File} -> 
-	    {ok, F2,_} = regexp:gsub(File, [92,92], "/"),
+	    F2 = re:replace(File, [92,92], "/", [global,{return,list}]),
 	    {Photo_item, _item} = Gstkid#gstkid.widget_data,
 	    {c,[Photo_item, " configure -file ", gstk:to_ascii(F2)]};
 	{pix_val,  {Coords,Color}} ->
diff --git a/lib/gs/src/tool_utils.erl b/lib/gs/src/tool_utils.erl
index b07e92c4f0..d09af5f22f 100644
--- a/lib/gs/src/tool_utils.erl
+++ b/lib/gs/src/tool_utils.erl
@@ -98,7 +98,8 @@ open_help_default(Parent, File) ->
                                _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\""
 			  end;
 		      {win32,_AnyType} ->
-			  "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/");
+			  "netscape.exe -h " ++
+			      re:replace(File,"\\\\","/",[global,{return,list}]);
 		      _Other ->
 			  unknown
 		  end;
diff --git a/lib/gs/vsn.mk b/lib/gs/vsn.mk
index 4c91857572..4894c6c13a 100644
--- a/lib/gs/vsn.mk
+++ b/lib/gs/vsn.mk
@@ -1,2 +1,2 @@
-GS_VSN = 1.5.13
+GS_VSN = 1.5.14
 
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index f1be658054..1483b2aee1 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -366,7 +366,7 @@ type(erlang, '>', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMax), is_integer(RhsMin), RhsMin >= LhsMax -> F;
 	  true -> t_boolean()
 	end;
-      false -> t_boolean()
+      false -> compare('>', Lhs, Rhs)
     end,
   strict(Xs, Ans);
 type(erlang, '>=', 2, Xs = [Lhs, Rhs]) ->
@@ -384,7 +384,7 @@ type(erlang, '>=', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMax), is_integer(RhsMin), RhsMin > LhsMax -> F;
 	  true -> t_boolean()
 	end;
-      false -> t_boolean()
+      false -> compare('>=', Lhs, Rhs)
     end,
   strict(Xs, Ans);
 type(erlang, '<', 2, Xs = [Lhs, Rhs]) ->
@@ -402,7 +402,7 @@ type(erlang, '<', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMin), is_integer(RhsMax), RhsMax =< LhsMin -> F;
 	  true -> t_boolean()
 	end;
-      false -> t_boolean()
+      false -> compare('<', Lhs, Rhs)
     end,
   strict(Xs, Ans);
 type(erlang, '=<', 2, Xs = [Lhs, Rhs]) ->
@@ -420,7 +420,7 @@ type(erlang, '=<', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMin), is_integer(RhsMax), RhsMax < LhsMin -> F;
 	  true -> t_boolean()
 	end;
-      false -> t_boolean()
+      false -> compare('=<', Lhs, Rhs)
     end,
   strict(Xs, Ans);
 type(erlang, '+', 1, Xs) ->
@@ -672,11 +672,12 @@ type(erlang, call_on_load_function, 1, Xs) ->
 type(erlang, cancel_timer, 1, Xs) ->
   strict(arg_types(erlang, cancel_timer, 1), Xs,
 	 fun (_) -> t_sup(t_integer(), t_atom('false')) end);
+type(erlang, check_old_code, 1, Xs) ->
+  strict(arg_types(erlang, check_old_code, 1), Xs,
+	 fun (_) -> t_boolean() end);
 type(erlang, check_process_code, 2, Xs) ->
   strict(arg_types(erlang, check_process_code, 2), Xs,
 	 fun (_) -> t_boolean() end);
-type(erlang, concat_binary, 1, Xs) ->
-  strict(arg_types(erlang, concat_binary, 1), Xs, fun (_) -> t_binary() end);
 type(erlang, crc32, 1, Xs) ->
   strict(arg_types(erlang, crc32, 1), Xs, fun (_) -> t_crc32() end);
 type(erlang, crc32, 2, Xs) ->
@@ -736,6 +737,7 @@ type(erlang, element, 2, Xs) ->
 type(erlang, erase, 0, _) -> t_any();
 type(erlang, erase, 1, _) -> t_any();
 type(erlang, external_size, 1, _) -> t_integer();
+type(erlang, external_size, 2, _) -> t_integer();
 type(erlang, finish_after_on_load, 2, Xs) ->
   %% Internal BIF used by on_load.
   strict(arg_types(erlang, finish_after_on_load, 2), Xs,
@@ -797,7 +799,8 @@ type(erlang, get_module_info, 2, Xs) ->
 	     end
 	 end);
 type(erlang, get_stacktrace, 0, _) ->
-  t_list(t_tuple([t_atom(), t_atom(), t_sup([t_arity(), t_list()])]));
+  t_list(t_tuple([t_atom(), t_atom(), t_sup([t_arity(), t_list()]),
+		  t_list()]));
 type(erlang, group_leader, 0, _) -> t_pid();
 type(erlang, group_leader, 2, Xs) ->
   strict(arg_types(erlang, group_leader, 2), Xs,
@@ -1199,6 +1202,7 @@ type(erlang, process_flag, 2, Xs) ->
 		 case t_atom_vals(Flag) of
 		   ['error_handler'] -> t_atom();
 		   ['min_heap_size'] -> t_non_neg_integer();
+		   ['scheduler'] -> t_non_neg_integer();
 		   ['monitor_nodes'] -> t_boolean();
 		   ['priority'] -> t_process_priority_level();
 		   ['save_calls'] -> t_non_neg_integer();
@@ -1899,7 +1903,7 @@ type(prim_file, internal_native2name, 1, Xs) ->
 	 fun (_) -> t_prim_file_name() end);
 type(prim_file, internal_normalize_utf8, 1, Xs) ->
   strict(arg_types(prim_file, internal_normalize_utf8, 1), Xs,  
-	 fun (_) -> t_binary() end);
+	 fun (_) -> t_unicode_string() end);
 %%-- gen_tcp ------------------------------------------------------------------
 %% NOTE: All type information for this module added to avoid loss of precision
 type(gen_tcp, accept, 1, Xs) ->
@@ -2324,10 +2328,7 @@ type(lists, keyfind, 3, Xs) ->
 		     case t_tuple_subtypes(Tuple) of
 		       unknown -> Ret;
 		       List ->
-			 Keys = [type(erlang, element, 2, [Y, S])
-				 || S <- List],
-			 Infs = [t_inf(Key, X) || Key <- Keys],
-			 case all_is_none(Infs) of
+			 case key_comparisons_fail(X, Y, List) of
 			   true -> t_atom('false');
 			   false -> Ret
 			 end
@@ -2357,9 +2358,7 @@ type(lists, keymember, 3, Xs) ->
 		     case t_tuple_subtypes(Tuple) of
 		       unknown -> t_boolean();
 		       List ->
-			 Keys = [type(erlang, element, 2, [Y,S]) || S <- List],
-			 Infs = [t_inf(Key, X) || Key <- Keys],
-			 case all_is_none(Infs) of
+			 case key_comparisons_fail(X, Y, List) of
 			   true -> t_atom('false');
 			   false -> t_boolean()
 			 end
@@ -2389,10 +2388,7 @@ type(lists, keysearch, 3, Xs) ->
 		     case t_tuple_subtypes(Tuple) of
 		       unknown -> Ret;
 		       List ->
-			 Keys = [type(erlang, element, 2, [Y, S])
-				 || S <- List],
-			 Infs = [t_inf(Key, X) || Key <- Keys],
-			 case all_is_none(Infs) of
+			 case key_comparisons_fail(X, Y, List) of
 			   true -> t_atom('false');
 			   false -> Ret
 			 end
@@ -2820,9 +2816,6 @@ list_replace(1, E, [_X | Xs]) ->
 any_is_none_or_unit(Ts) ->
   lists:any(fun erl_types:t_is_none_or_unit/1, Ts).
 
-all_is_none(Ts) ->
-  lists:all(fun erl_types:t_is_none/1, Ts).
-
 check_guard([X], Test, Type) ->
   check_guard_single(X, Test, Type).
 
@@ -3175,6 +3168,59 @@ arith(Op, X1, X2) ->
   end.
 
 %%=============================================================================
+%% Comparison of terms
+%%=============================================================================
+
+compare(Op, Lhs, Rhs) ->
+  case t_is_none(t_inf(Lhs, Rhs)) of
+    false -> t_boolean();
+    true ->
+      case Op of
+	'<' -> always_smaller(Lhs, Rhs);
+	'>' -> always_smaller(Rhs, Lhs);
+	'=<' -> always_smaller(Lhs, Rhs);
+	'>=' -> always_smaller(Rhs, Lhs)
+      end
+  end.
+
+always_smaller(Type1, Type2) ->
+  {Min1, Max1} = type_ranks(Type1),
+  {Min2, Max2} = type_ranks(Type2),
+  if Max1 < Min2 -> t_atom('true');
+     Min1 > Max2 -> t_atom('false');
+     true        -> t_boolean()
+  end.
+
+type_ranks(Type) ->
+  type_ranks(Type, 1, 0, 0, type_order()).
+
+type_ranks(_Type, _I, Min, Max, []) -> {Min, Max};
+type_ranks(Type, I, Min, Max, [TypeClass|Rest]) ->
+  {NewMin, NewMax} =
+    case t_is_none(t_inf(Type, TypeClass)) of
+      true  -> {Min, Max};
+      false -> case Min of
+		 0 -> {I, I};
+		 _ -> {Min, I}
+	       end
+    end,
+  type_ranks(Type, I+1, NewMin, NewMax, Rest).
+
+type_order() ->
+  [t_number(), t_atom(), t_reference(), t_fun(), t_port(), t_pid(), t_tuple(),
+   t_list(), t_binary()].
+
+key_comparisons_fail(X0, KeyPos, TupleList) ->
+  X = case t_is_number(t_inf(X0, t_number())) of
+	false -> X0;
+	true -> t_number()
+      end,
+  lists:all(fun(Tuple) ->
+		Key = type(erlang, element, 2, [KeyPos, Tuple]),
+		t_is_none(t_inf(Key, X))
+	    end, TupleList).
+
+%%=============================================================================
 
 -spec arg_types(atom(), atom(), arity()) -> [erl_types:erl_type()] | 'unknown'.
 
@@ -3395,10 +3441,10 @@ arg_types(erlang, call_on_load_function, 1) ->
   [t_atom()];
 arg_types(erlang, cancel_timer, 1) ->
   [t_reference()];
+arg_types(erlang, check_old_code, 1) ->
+  [t_atom()];
 arg_types(erlang, check_process_code, 2) ->
   [t_pid(), t_atom()];
-arg_types(erlang, concat_binary, 1) ->
-  [t_list(t_binary())];
 arg_types(erlang, crc32, 1) ->
   [t_iodata()];
 arg_types(erlang, crc32, 2) ->
@@ -3441,6 +3487,8 @@ arg_types(erlang, exit, 2) ->
   [t_sup(t_pid(), t_port()), t_any()];
 arg_types(erlang, external_size, 1) ->
   [t_any()]; % takes any term as input
+arg_types(erlang, external_size, 2) ->
+  [t_any(), t_list()]; % takes any term as input and a list of options
 arg_types(erlang, finish_after_on_load, 2) ->
   [t_atom(), t_boolean()];
 arg_types(erlang, float, 1) ->
@@ -3695,6 +3743,7 @@ arg_types(erlang, process_display, 2) ->
 arg_types(erlang, process_flag, 2) ->
   [t_sup([t_atom('trap_exit'), t_atom('error_handler'),
 	  t_atom('min_heap_size'), t_atom('priority'), t_atom('save_calls'),
+	  t_atom('scheduler'),                             % undocumented
 	  t_atom('monitor_nodes'), 			  % undocumented
 	  t_tuple([t_atom('monitor_nodes'), t_list()])]), % undocumented
    t_sup([t_boolean(), t_atom(), t_non_neg_integer()])];
@@ -3711,7 +3760,10 @@ arg_types(erlang, purge_module, 1) ->
 arg_types(erlang, put, 2) ->
   [t_any(), t_any()];
 arg_types(erlang, raise, 3) ->
-  [t_raise_errorclass(), t_any(), type(erlang, get_stacktrace, 0, [])];
+  OldStyleType = t_list(t_tuple([t_atom(), t_atom(),
+				 t_sup([t_arity(), t_list()])])),
+  NewStyleType = type(erlang, get_stacktrace, 0, []),
+  [t_raise_errorclass(), t_any(), t_sup(OldStyleType, NewStyleType)];
 arg_types(erlang, read_timer, 1) ->
   [t_reference()];
 arg_types(erlang, ref_to_list, 1) ->
@@ -3733,7 +3785,7 @@ arg_types(erlang, send, 3) ->
 arg_types(erlang, send_after, 3) ->
   [t_non_neg_integer(), t_sup(t_pid(), t_atom()), t_any()];
 arg_types(erlang, seq_trace, 2) ->
-  [t_atom(), t_sup([t_boolean(), t_tuple([t_fixnum(), t_fixnum()]), t_nil()])];
+  [t_atom(), t_sup([t_boolean(), t_tuple([t_fixnum(), t_fixnum()]), t_fixnum(), t_nil()])];
 arg_types(erlang, seq_trace_info, 1) ->
   [t_seq_trace_info()];
 arg_types(erlang, seq_trace_print, 1) ->
@@ -3982,7 +4034,7 @@ arg_types(ets, match_object, 3) ->
 arg_types(ets, match_spec_compile, 1) ->
   [t_matchspecs()];
 arg_types(ets, match_spec_run_r, 3) ->
-  [t_matchspecs(), t_any(), t_list()];
+  [t_list(t_tuple()),t_matchspecs(), t_list()];
 arg_types(ets, member, 2) ->
   [t_tab(), t_any()];
 arg_types(ets, new, 2) ->
@@ -4014,8 +4066,12 @@ arg_types(ets, select_reverse, 3) ->
 arg_types(ets, slot, 2) ->
   [t_tab(), t_non_neg_fixnum()]; % 2nd arg can be 0
 arg_types(ets, setopts, 2) ->
-  Opt = t_sup(t_tuple([t_atom('heir'), t_pid(), t_any()]),
-	      t_tuple([t_atom('heir'), t_atom('none')])),
+  Opt = t_sup([t_tuple([t_atom('heir'), t_pid(), t_any()]),
+	       t_tuple([t_atom('heir'), t_atom('none')]),
+	       t_tuple([t_atom('protection'),
+			t_sup([t_atom('protected'),
+			       t_atom('private'),
+			       t_atom('public')])])]),
   [t_tab(), t_sup(Opt, t_list(Opt))];
 arg_types(ets, update_counter, 3) ->
   Int = t_integer(),
@@ -4807,6 +4863,9 @@ t_ets_info_items() ->
 	 t_atom('owner'),
 	 t_atom('protection'),
 	 t_atom('size'),
+	 t_atom('compressed'),
+	 t_atom('heir'),
+	 t_atom('stats'),
 	 t_atom('type')]).
 
 %% =====================================================================
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 1748c1cc16..0ff827ac37 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -211,7 +211,8 @@
 	 record_field_diffs_to_string/2,
 	 subst_all_vars_to_any/1,
 	 lift_list_to_pos_empty/1,
-	 is_erl_type/1
+	 is_erl_type/1,
+	 atom_to_string/1
 	]).
 
 %%-define(DO_ERL_TYPES_TEST, true).
@@ -242,12 +243,11 @@
 -define(REC_TYPE_LIMIT, 2).
 
 -define(TUPLE_TAG_LIMIT, 5).
--define(TUPLE_ARITY_LIMIT, 10).
+-define(TUPLE_ARITY_LIMIT, 8).
 -define(SET_LIMIT, 13).
 -define(MAX_BYTE, 255).
 -define(MAX_CHAR, 16#10ffff).
 
--define(WIDENING_LIMIT, 7).
 -define(UNIT_MULTIPLIER, 8).
 
 -define(TAG_IMMED1_SIZE, 4).
@@ -3360,14 +3360,14 @@ t_to_string(?var(Id), _RecDict) when is_integer(Id) ->
 
 record_to_string(Tag, [_|Fields], FieldNames, RecDict) ->
   FieldStrings = record_fields_to_string(Fields, FieldNames, RecDict, []),
-  "#" ++ atom_to_list(Tag) ++ "{" ++ string:join(FieldStrings, ",") ++ "}".
+  "#" ++ atom_to_string(Tag) ++ "{" ++ string:join(FieldStrings, ",") ++ "}".
 
 record_fields_to_string([F|Fs], [{FName, _DefType}|FDefs], RecDict, Acc) ->
   NewAcc =
     case t_is_any(F) orelse t_is_atom('undefined', F) of
       true -> Acc;
       false ->
-	StrFV = atom_to_list(FName) ++ "::" ++ t_to_string(F, RecDict),
+	StrFV = atom_to_string(FName) ++ "::" ++ t_to_string(F, RecDict),
 	%% ActualDefType = t_subtract(DefType, t_atom('undefined')),
 	%% Str = case t_is_any(ActualDefType) of
 	%% 	  true -> StrFV;
@@ -3393,7 +3393,7 @@ field_diffs([F|Fs], [{FName, DefType}|FDefs], RecDict, Acc) ->
     case t_is_subtype(F, DefType) of
       true -> Acc;
       false ->
-	Str = atom_to_list(FName) ++ "::" ++ t_to_string(DefType, RecDict),
+	Str = atom_to_string(FName) ++ "::" ++ t_to_string(DefType, RecDict),
 	[Str|Acc]
     end,
   field_diffs(Fs, FDefs, RecDict, NewAcc);
@@ -3906,7 +3906,7 @@ t_form_to_string({type, _L, union, Args}) ->
   string:join(t_form_to_string_list(Args), " | ");
 t_form_to_string({type, _L, Name, []} = T) ->
   try t_to_string(t_from_form(T))
-  catch throw:{error, _} -> atom_to_list(Name) ++ "()"
+  catch throw:{error, _} -> atom_to_string(Name) ++ "()"
   end;
 t_form_to_string({type, _L, Name, List}) -> 
   io_lib:format("~w(~s)",
@@ -3920,6 +3920,11 @@ t_form_to_string_list([H|T], Acc) ->
 t_form_to_string_list([], Acc) ->
   lists:reverse(Acc).
 
+-spec atom_to_string(atom()) -> string().
+
+atom_to_string(Atom) ->
+  lists:flatten(io_lib:format("~w", [Atom])).
+
 %%=============================================================================
 %% 
 %% Utilities
diff --git a/lib/hipe/doc/src/make.dep b/lib/hipe/doc/src/make.dep
deleted file mode 100644
index d5f5844c21..0000000000
--- a/lib/hipe/doc/src/make.dep
+++ /dev/null
@@ -1,13 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex
-
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index 4eb188f76f..6b601e3039 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -30,6 +30,69 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
+<section><title>Hipe 3.8.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Clean up hipe.hrl.src (Thanks to Tuncer Ayaz)</p>
+          <p>
+	    Own Id: OTP-9511</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug with binary pattern matching of floats of
+	    variable size</p>
+          <p>
+	    Pattern matching of floats with variable size
+	    (&lt;&lt;F:S/float&gt;&gt;) did always fail. Judging from
+	    similar code for ints, this bug is simply a typo.(Thanks
+	    to Paul Guyot)</p>
+          <p>
+	    Own Id: OTP-9556</p>
+        </item>
+        <item>
+          <p>
+	    Quote atoms if necessary in types</p>
+          <p>
+	    Atoms in some occurrences were not correctly quoted when
+	    formatted to strings, for instance by the typer program
+	    (Thanks to Tomas Abrahamsson)</p>
+          <p>
+	    Update Dialyzer's reference results</p>
+          <p>
+	    Own Id: OTP-9560</p>
+        </item>
+        <item>
+          <p>
+	    Fix typer's crash for nonexisting files Remove unused
+	    macro Fix bug in dataflow Decrease tuple arity limit This
+	    fixes a memory related crash.</p>
+          <p>
+	    Own Id: OTP-9597</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Types for several BIFs have been extended/corrected. Also
+	    the types for types for <c>lists:keyfind/3</c>,
+	    <c>lists:keysearch/3</c>, and <c>lists:keyemember/3</c>
+	    have been corrected. The incorrect/incomplete types could
+	    cause false dialyzer warnings.</p>
+          <p>
+	    Own Id: OTP-9496</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Hipe 3.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/hipe/icode/hipe_beam_to_icode.erl b/lib/hipe/icode/hipe_beam_to_icode.erl
index d7eb035551..45b390acbd 100644
--- a/lib/hipe/icode/hipe_beam_to_icode.erl
+++ b/lib/hipe/icode/hipe_beam_to_icode.erl
@@ -281,10 +281,14 @@ needs_redtest(Leafness) ->
 %%-----------------------------------------------------------------------
 
 %%--- label & func_info combo ---
+trans_fun([{label,_}=F,{func_info,_,_,_}=FI|Instructions], Env) ->
+  %% Handle old code without a line instruction.
+  trans_fun([F,{line,[]},FI|Instructions], Env);
 trans_fun([{label,B},{label,_},
 	   {func_info,M,F,A},{label,L}|Instructions], Env) ->
   trans_fun([{label,B},{func_info,M,F,A},{label,L}|Instructions], Env);
 trans_fun([{label,B},
+	   {line,_},
 	   {func_info,{atom,_M},{atom,_F},_A},
 	   {label,L}|Instructions], Env) ->
   %% Emit code to handle function_clause errors.  The BEAM test instructions
@@ -720,7 +724,7 @@ trans_fun([{test,bs_get_float2,{f,Lbl},[Ms,_Live,Size,Unit,{field_flags,Flags0},
 	?EXIT({bad_bs_size_constant,Size});
       BitReg ->
 	Bits = mk_var(BitReg),
-	{{bs_get_float,Unit,Flags}, [Bits,MsVar]}
+	{{bs_get_float,Unit,Flags}, [MsVar,Bits]}
     end,
   trans_op_call({hipe_bs_primop,Name}, Lbl, Args, [Dst,MsVar], Env, Instructions);
 trans_fun([{test,bs_get_integer2,{f,Lbl},[Ms,_Live,Size,Unit,{field_flags,Flags0},X]}|
@@ -1142,6 +1146,11 @@ trans_fun([{trim,N,NY}|Instructions], Env) ->
   Moves = trans_trim(N, NY),
   Moves ++ trans_fun(Instructions, Env);
 %%--------------------------------------------------------------------
+%% New line/1 instruction in R15.
+%%--------------------------------------------------------------------
+trans_fun([{line,_}|Instructions], Env) ->
+  trans_fun(Instructions,Env);
+%%--------------------------------------------------------------------
 %%--- ERROR HANDLING ---
 %%--------------------------------------------------------------------
 trans_fun([X|_], _) ->
@@ -1869,6 +1878,8 @@ patch_make_funs([], FunIndex, Acc) ->
 
 find_mfa([{label,_}|Code]) ->
   find_mfa(Code);
+find_mfa([{line,_}|Code]) ->
+  find_mfa(Code);
 find_mfa([{func_info,{atom,M},{atom,F},A}|_]) 
   when is_atom(M), is_atom(F), is_integer(A), 0 =< A, A =< 255 ->
   {M, F, A}.
diff --git a/lib/hipe/main/hipe.hrl.src b/lib/hipe/main/hipe.hrl.src
index a1fbeda9cf..e74f31b19d 100644
--- a/lib/hipe/main/hipe.hrl.src
+++ b/lib/hipe/main/hipe.hrl.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -50,9 +50,8 @@
 %% Flags:
 %%  DEBUG           - Turns on debugging. (Can be defined to a integer
 %%                    value to determine the level of debugging)
-%%  VERBOSE         - More info is printed...
 %%  HIPE_LOGGING    - Turn on logging of messages with erl_logger.
-%%  DO_ASSERT       - Turn on Assertions.
+%%  DO_ASSERT       - Turn on assertions.
 %%  TIMING          - Turn on timing.
 %%  HIPE_INSTRUMENT_COMPILER - Turn on instrumentation of the compiler.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -107,13 +106,9 @@
 %%
 %% Define the exit macro
 %%
--ifdef(VERBOSE).
--define(EXIT(Reason), erlang:error({?MODULE,?LINE,Reason})).
--else.
 -define(EXIT(Reason),
  	?msg("EXITED with reason ~w @~w:~w\n", [Reason,?MODULE,?LINE]),
  	erlang:error({?MODULE,?LINE,Reason})).
--endif.
 
 %%
 %% Assertions.
diff --git a/lib/hipe/regalloc/hipe_node_sets.erl b/lib/hipe/regalloc/hipe_node_sets.erl
index b5e2971c4d..be43ff2bfd 100644
--- a/lib/hipe/regalloc/hipe_node_sets.erl
+++ b/lib/hipe/regalloc/hipe_node_sets.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -29,7 +29,7 @@
 
 -record(node_sets, 
 	{spilled,    % Nodes marked for spilling
-	 colored     % Nodes succesfully colored
+	 colored     % Nodes successfully colored
 	}).
 
 spilled(Node_sets) -> Node_sets#node_sets.spilled.
diff --git a/lib/hipe/rtl/hipe_rtl_lcm.erl b/lib/hipe/rtl/hipe_rtl_lcm.erl
index 5d65389d48..9224623c8b 100644
--- a/lib/hipe/rtl/hipe_rtl_lcm.erl
+++ b/lib/hipe/rtl/hipe_rtl_lcm.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -269,7 +269,7 @@ insert_expr_last(CFG0, Label, Instr) ->
 %% is a branch operation).
 insert_expr_last_work(_, Instr, []) ->
   %% This case should not happen since this means that block was completely 
-  %% empty when the function was called. For compability we insert it last.
+  %% empty when the function was called. For compatibility we insert it last.
   [Instr];
 insert_expr_last_work(_, Instr, [Code1]) ->
   %% We insert the code next to last.
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index 58ebe68401..65e04ff7fa 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.8
+HIPE_VSN = 3.8.1
diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
index 6eef7827b9..28040ca42d 100644
--- a/lib/ic/c_src/Makefile.in
+++ b/lib/ic/c_src/Makefile.in
@@ -125,13 +125,9 @@ docs:
 # Special Build Targets
 # ----------------------------------------------------
 
-$(OBJDIR):
-	-mkdir -p $(OBJDIR)
+_create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
-$(LIBDIR):
-	-mkdir -p $(LIBDIR)
-
-$(LIBRARY): $(OBJDIR) $(LIBDIR) $(OBJ_FILES) 
+$(LIBRARY): $(OBJ_FILES) 
 	-$(AR) $(AR_OUT) $@ $(OBJ_FILES) 
 	-$(RANLIB) $@
 
diff --git a/lib/ic/doc/src/Makefile b/lib/ic/doc/src/Makefile
index 8eda436a24..1e93578cb1 100644
--- a/lib/ic/doc/src/Makefile
+++ b/lib/ic/doc/src/Makefile
@@ -26,13 +26,6 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../../vsn.mk
 VSN=$(IC_VSN)
 APPLICATION=ic
-# ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
 
 # ----------------------------------------------------
 # Java specific
@@ -96,32 +89,10 @@ EXTRA_FILES = summary.html.src \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-TOP_PS_FILE  = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif 
-
 JAVA_SOURCE_FILES = \
 	Holder.java \
 	BooleanHolder.java \
@@ -209,8 +180,6 @@ JAVADOCFLAGS = \
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 ifneq (,$(JAVA))
 docs: pdf html man $(JAVADOC_GENERATED_FILES)
 else
@@ -229,38 +198,11 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
-else 
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html $(JAVADOC_GENERATED_FILES) gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
+$(JAVADOC_GENERATED_FILES): JAVADOC-GENERATED
 
-html: $(HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) 
-	rm -rf $(JAVA_OUT_DIR)
-
-endif
-
-$(JAVA_OUT_DIR):
-	mkdir $(JAVA_OUT_DIR)
-
-$(JAVADOC_GENERATED_FILES): $(JAVA_OUT_DIR)
+JAVADOC-GENERATED: $(JAVA_SOURCE_FILES:%=$(JAVA_SOURCE_DIR)/%)
 	@(cd ../../java_src; $(JAVADOC) $(JAVADOCFLAGS) com.ericsson.otp.ic)
+	>JAVADOC-GENERATED
 
 man: $(MAN3_FILES)
 
@@ -277,8 +219,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -288,46 +228,4 @@ release_docs_spec: docs
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-ifneq (,$(JAVA))
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html/java
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html/java/resources
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html/java/com
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html/java/com/ericsson
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html/java/com/ericsson/otp
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html/java/com/ericsson/otp/ic
-	$(INSTALL_DATA) $(JAVADOC_INDEX_HTML_FILES) \
-		$(RELSYSDIR)/doc/html/java
-	$(INSTALL_DATA) $(JD_GIF_FILES) \
-		$(RELSYSDIR)/doc/html/java/resources
-	$(INSTALL_DATA) $(JAVADOC_PACK_HTML_FILES) \
-		$(RELSYSDIR)/doc/html/java/com/ericsson/otp/ic
-endif
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-
-endif
-endif
-
-endif
-
-
 release_spec:
-
-
diff --git a/lib/ic/doc/src/make.dep b/lib/ic/doc/src/make.dep
deleted file mode 100644
index 64694ee85a..0000000000
--- a/lib/ic/doc/src/make.dep
+++ /dev/null
@@ -1,24 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex c-part.tex ch_basic_idl.tex ch_c_client.tex \
-		ch_c_corba_env.tex ch_c_mapping.tex ch_c_server.tex \
-		ch_erl_genserv.tex ch_erl_plain.tex ch_ic_protocol.tex \
-		ch_introduction.tex ch_java.tex erl-part.tex \
-		ic.tex ic_c_protocol.tex ic_clib.tex java-part.tex \
-		ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/ic/doc/src/notes.xml b/lib/ic/doc/src/notes.xml
index 5f6c31069c..ff289bd76c 100644
--- a/lib/ic/doc/src/notes.xml
+++ b/lib/ic/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1998</year><year>2010</year>
+      <year>1998</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,38 @@
   </header>
 
    <section>
+    <title>IC 4.2.28</title>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <list type="bulleted">
+        <item>
+          <p>
+	    Incorrect use of ets:match changed to ets:match_object.</p>
+          <p>
+            Own Id: OTP-9630 </p>
+        </item>
+      </list>
+    </section>
+   </section>
+
+   <section>
+    <title>IC 4.2.27</title>
+
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Reduced compile overhead (Thanks to Haitao Li).</p>
+          <p>
+            Own Id: OTP-9460 </p>
+        </item>
+      </list>
+    </section>
+   </section>
+
+   <section>
     <title>IC 4.2.26</title>
 
     <section>
diff --git a/lib/ic/examples/pre_post_condition/Makefile b/lib/ic/examples/pre_post_condition/Makefile
index 68e2168e1e..d57133c964 100644
--- a/lib/ic/examples/pre_post_condition/Makefile
+++ b/lib/ic/examples/pre_post_condition/Makefile
@@ -100,7 +100,7 @@ YRL_FLAGS =
 debug opt: $(TARGET_FILES) 
 
 clean:
-	rm -f $(TARGET_FILES) $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES) $(CLASS_FILES)
+	rm -f $(TARGET_FILES) $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES) $(CLASS_FILES) IDL-GENERATED
 	rm -f errs core *~
 
 docs:
@@ -108,9 +108,14 @@ docs:
 test: $(TEST_TARGET_FILES)
 
 
-$(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES): ex.idl
+IDL-GENERATED: ex.idl
 	erlc $(ERL_LOCAL_FLAGS) +'{precond,{tracer,pre}}' \
 		+'{{postcond,"m::i::f"},{tracer,post}}' ex.idl
+	>IDL-GENERATED
+
+$(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/ignore_config_record.inf b/lib/ic/java_src/com/ericsson/otp/ic/ignore_config_record.inf
deleted file mode 100644
index 34e5586175..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/ignore_config_record.inf
+++ /dev/null
@@ -1 +0,0 @@
-Dummy to speed up compilatio
diff --git a/lib/ic/src/ic.erl b/lib/ic/src/ic.erl
index 3c6ce3d9d6..50fad921c4 100644
--- a/lib/ic/src/ic.erl
+++ b/lib/ic/src/ic.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -320,7 +320,7 @@ pragma(G, File, T) ->
 		 time,
 		 time("pragma registration  ", ic_pragma, pragma_reg, [G,T]),
 		 ic_pragma:pragma_reg(G,T)) of
-	%% All pragmas were succesfully applied
+	%% All pragmas were successfully applied
 	{ok,Clean} ->
 	    typing(G, File, Clean);
        
diff --git a/lib/ic/src/ic_pp.erl b/lib/ic/src/ic_pp.erl
index db06118d32..8b53473caa 100644
--- a/lib/ic/src/ic_pp.erl
+++ b/lib/ic/src/ic_pp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -92,6 +92,14 @@
 %% 
 %%======================================================================================
 
+%% Multiple Include Optimization
+%%
+%% Algorithm described at:
+%% http://gcc.gnu.org/onlinedocs/cppinternals/Guard-Macros.html
+-record(mio, {valid = true,   %% multiple include valid
+              cmacro,         %% controlling macro of the current conditional directive
+              depth = 0,      %% conditional directive depth
+              included = []}).
 
 
 
@@ -130,7 +138,7 @@ run(FileList, FileName, IncDir, Flags) ->
     %%----------------------------------------------------------
     %% Run the second phase, i.e expand macros
     %%----------------------------------------------------------
-    {Out, Err, War, _Defs, IfCou} = expand(File, FileName, IncDir, Flags),
+    {Out, Err, War, _Defs, _Mio, IfCou} = expand(File, FileName, IncDir, Flags),
 
     %%----------------------------------------------------------
     %% Check if all #if #ifdef #ifndef have a matching #endif
@@ -155,9 +163,9 @@ run(FileList, FileName, IncDir, Flags) ->
 %% The entry for all included files
 %%
 %%
-%% Output   {Out, Defs, Err, War}
+%% Output   {Out, Err, War, Defs, MultipleIncludeValid}
 %%======================================================================================
-run_include(FileName, FileList, _Out, Defs, Err, War, IncLine, IncFile, IncDir) ->
+run_include(FileName, FileList, _Out, Defs, Err, War, IncLine, IncFile, IncDir, Mio) ->
 
     %%----------------------------------------------------------
     %% Run the first phase, i.e tokenise the file
@@ -169,18 +177,21 @@ run_include(FileName, FileList, _Out, Defs, Err, War, IncLine, IncFile, IncDir)
     %%----------------------------------------------------------
     %% Run the second phase, i.e expand macros
     %%----------------------------------------------------------
-
-    %% Try first pass without file info start/end
-    {OutT, ErrT, WarT, DefsT, IfCouT} =
-	expand(File, Defs, Err, War, [FileName|IncFile], IncDir),
-
-    {Out2, Err2, War2, Defs2, IfCou2} = 
-	case only_nls(OutT) of
-	    true -> %% The file is defined before
-		{["\n"], ErrT, WarT, DefsT, IfCouT};
-	    false -> %% The file is not defined before, try second pass
-		expand([FileInfoStart|File]++FileInfoEnd, Defs, Err, War, [FileName|IncFile], IncDir)
-	end,
+    {Out2, Err2, War2, Defs2, Mio2, IfCou2} =
+        expand([FileInfoStart|File]++FileInfoEnd, Defs, Err, War,
+               [FileName|IncFile], IncDir,
+               #mio{included=Mio#mio.included}),
+
+    MergeIncluded = sets:to_list(sets:from_list(Mio#mio.included ++ Mio2#mio.included)),
+
+    Mio3 =
+        case {Mio2#mio.valid, Mio2#mio.cmacro} of
+            {V, Macro} when V == false;
+                            Macro == undefined ->
+                update_mio(Mio#mio{included=MergeIncluded});
+            {true, _} ->
+                update_mio({include, FileName}, Mio#mio{included=MergeIncluded})
+        end,
     
     %%----------------------------------------------------------
     %% Check if all #if #ifdef #ifndef have a matching #endif
@@ -192,26 +203,7 @@ run_include(FileName, FileList, _Out, Defs, Err, War, IncLine, IncFile, IncDir)
 			   []
 		   end,
 
-    {Out2, Defs2, Err2++IfError, War2}.
-
-
-
-%% Return true if there is no data 
-%% other than new lines
-only_nls([]) ->
-    true;
-only_nls(["\n"|Rem]) ->
-    only_nls(Rem);
-only_nls(["\r","\n"|Rem]) ->
-    only_nls(Rem);
-only_nls([_|_Rem]) ->
-    false.
-
-
-
-
-
-
+    {Out2, Defs2, Err2++IfError, War2, Mio3}.
 
 
 
@@ -647,87 +639,86 @@ expand(List, FileName, IncDir, Flags) ->
     %% Get all definitions from preprocessor commnads
     %% and merge them on top of the file collected.
     CLDefs = get_cmd_line_defs(Flags),
-    expand(List, [], [], CLDefs, [FileName], IncDir, check_all, [], [], 1, FileName).
-
-expand(List, Defs, Err, War, [FileName|IncFile], IncDir) ->
-    expand(List, [], [], Defs, [FileName|IncFile], IncDir, check_all, Err, War, 1, FileName).
+    expand(List, [], [], CLDefs, [FileName], IncDir, #mio{}, check_all, [], [], 1, FileName).
 
+expand(List, Defs, Err, War, [FileName|IncFile], IncDir, Mio) ->
+    expand(List, [], [], Defs, [FileName|IncFile], IncDir, Mio, check_all, Err, War, 1, FileName).
 
 %%=======================================================
 %% Main loop for the expansion
 %%=======================================================
-expand([], Out, _SelfRef, Defs, _IncFile, _IncDir, IfCou, Err, War, _L, _FN) ->
+expand([], Out, _SelfRef, Defs, _IncFile, _IncDir, Mio, IfCou, Err, War, _L, _FN) ->
 %    io:format("~n   ===============~n"),
 %    io:format("   definitions    ~p~n",[lists:reverse(Defs)]),
 %    io:format("   found warnings ~p~n",[lists:reverse(War)]),
 %    io:format("   found errors   ~p~n",[lists:reverse(Err)]),
 %    io:format("   ===============~n~n~n"),
-    {Out, Err, War, Defs, IfCou};
+    {Out, Err, War, Defs, Mio, IfCou};
 
-expand([{file_info, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
-    expand(Rem, Str++Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+expand([{file_info, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
+    expand(Rem, Str++Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN);
 
 %%---------------------------------------
 %% Searching for endif, 
 %% i.e skip all source lines until matching
 %% end if is encountered
 %%---------------------------------------
-expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine}, Err, War, L, FN) 
+expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN)
   when Command == "ifdef" ->
     {_Removed, Rem2, _Nl} = read_to_nl(Rem),
     IfCou2 = {endif, Endif+1, IfLine},
-    expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, IfCou2, Err, War, L, FN);
+    expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err, War, L, FN);
 
 
-expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine}, Err, War, L, FN)
+expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN)
   when Command == "ifndef" ->
     {_Removed, Rem2, _Nl} = read_to_nl(Rem),
     IfCou2 = {endif, Endif+1, IfLine},
-    expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, IfCou2, Err, War, L, FN);
+    expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err, War, L, FN);
 
 
-expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine}, Err, War, L, FN)
+expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN)
   when Command == "if" ->
-    case pp_command(Command, Rem, Defs, IncDir, Err, War, L, FN) of
+    case pp_command(Command, Rem, Defs, IncDir, Mio, Err, War, L, FN) of
         {{'if', true}, Rem2, Err2, War2, Nl} ->
             IfCou2 = {endif, Endif+1, IfLine},
-            expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, IfCou2, Err2, War2, L+Nl, FN);
+            expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err2, War2, L+Nl, FN);
 %%        {{'if', false}, Rem2, Err2, War2, Nl} -> Not implemented yet
         {{'if', error}, Rem2, Err2, War2, Nl} ->
             IfCou2 = {endif, Endif, IfLine},
-            expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, IfCou2, Err2, War2, L+Nl, FN)
+            expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err2, War2, L+Nl, FN)
     end;
 
-expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine}, Err, War, L, FN) 
+expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN)
   when Command == "endif" ->
     {_Removed, Rem2, Nl} = read_to_nl(Rem),
     case Endif of
 	1 ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
-            expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err, War, L+Nl, FN);
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+            expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio, check_all, Err, War, L+Nl, FN);
 	_ ->
             IfCou2 = {endif, Endif-1, IfLine},
-            expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, IfCou2, Err, War, L+Nl, FN)
+            expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err, War, L+Nl, FN)
     end;
 
 
-expand([{command,_Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine}, Err, War, L, FN) ->
+expand([{command,_Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN) ->
     {_Removed, Rem2, _Nl} = read_to_nl(Rem),
     IfCou2 = {endif, Endif, IfLine},
-    expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, IfCou2, Err, War, L, FN);
+    expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err, War, L, FN);
 
 %% Solves a bug when spaces in front of hashmark !
-expand([space | Rem], Out, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine}, Err, War, L, FN) ->
-    expand(Rem, Out, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine}, Err, War, L, FN);
+expand([space | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN) ->
+    expand(Rem, Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN);
 
-expand([{nl,_Nl} | Rem], Out, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine}, Err, War, L, FN) ->
-    expand(Rem, Out, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine}, Err, War, L, FN);
+expand([{nl,_Nl} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN) ->
+    expand(Rem, Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN);
 
 
-expand([_X | Rem], Out, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine}, Err, War, L, FN) ->
+expand([_X | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN) ->
     {_Removed, Rem2, Nl} = read_to_nl(Rem),
-    Out2 = [lists:duplicate(Nl,$\n)|Out],
-    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine}, Err, War, L, FN);
+    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN);
 
 
 
@@ -736,121 +727,132 @@ expand([_X | Rem], Out, SelfRef, Defs, IncFile, IncDir, {endif, Endif, IfLine},
 %%---------------------------------------
 %% Check all tokens
 %%---------------------------------------
-expand([{nl, _N} | Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
-    expand(Rem, [$\n | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L+1, FN);
+expand([{nl, _N} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
+    expand(Rem, [$\n | Out], SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L+1, FN);
 
-expand([space | Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
-    expand(Rem, [?space | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+expand([space | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
+    expand(Rem, [?space | Out], SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN);
 
-expand([space_exp | Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
-    expand(Rem, [?space | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+expand([space_exp | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
+    expand(Rem, [?space | Out], SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN);
 
-expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, check_all, Err, War, L, FN) ->
-    case pp_command(Command, Rem, Defs, IncDir, Err, War, L, FN) of
+expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, check_all, Err, War, L, FN) ->
+    case pp_command(Command, Rem, Defs, IncDir, Mio, Err, War, L, FN) of
 	{define, Rem2, Defs2, Err2, War2, Nl} -> 
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
-	    expand(Rem2, Out2, SelfRef, Defs2, IncFile, IncDir, check_all, Err2, War2, L+Nl, FN);
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+	    expand(Rem2, Out2, SelfRef, Defs2, IncFile, IncDir, update_mio(Mio), check_all, Err2, War2, L+Nl, FN);
 
 	{undef, Rem2, Defs2, Err2, War2, Nl} -> 
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
-	    expand(Rem2, Out2, SelfRef, Defs2, IncFile, IncDir, check_all, Err2, War2, L+Nl, FN);
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+	    expand(Rem2, Out2, SelfRef, Defs2, IncFile, IncDir, update_mio(Mio), check_all, Err2, War2, L+Nl, FN);
 
 	{{include, ok}, FileName, FileCont, Rem2, Nl, Err2, War2} ->
-	    {Out3, Defs3, Err3, War3} = 
-		run_include(FileName, FileCont, Out, Defs, Err2, War2, L+Nl, IncFile, IncDir),
+	    {Out3, Defs3, Err3, War3, Mio2} =
+		run_include(FileName, FileCont, Out, Defs, Err2, War2, L+Nl, IncFile, IncDir, Mio),
 	    Nls = [],
 	    Out4 = Out3++Nls++Out,
-	    expand(Rem2, Out4, SelfRef, Defs3, IncFile, IncDir, check_all, Err3, War3, L+Nl, FN);
+	    expand(Rem2, Out4, SelfRef, Defs3, IncFile, IncDir, Mio2, check_all, Err3, War3, L+Nl, FN);
 	
 	{{include, error}, Rem2, Nl, Err2, War2} ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err2, War2, L+Nl, FN);
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, Err2, War2, L+Nl, FN);
+
+	{{include, skip}, Rem2} ->
+	    Out2 = [$\n|Out],
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, Err, War, L+1, FN);
 
 	{{ifdef, true}, Rem2, Err2, War2, Nl} ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
 	    IfCou2 = {endif, 1, L},
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, IfCou2, Err2, War2, L+Nl, FN);
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err2, War2, L+Nl, FN);
 	{{ifdef, false}, Rem2, Err2, War2, Nl} ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err2, War2, L+Nl, FN);
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+	    Mio2 = update_mio(ifdef, Mio),
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err2, War2, L+Nl, FN);
 
 	{{ifndef, true}, Rem2, Err2, War2, Nl} ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
 	    IfCou2 = {endif, 1, L},
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, IfCou2, Err2, War2, L+Nl, FN);
-	{{ifndef, false}, Rem2, Err2, War2, Nl} ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err2, War2, L+Nl, FN);
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err2, War2, L+Nl, FN);
+	{{ifndef, false}, Macro, Rem2, Err2, War2, Nl} ->
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+	    Mio2 = update_mio({ifndef, Macro}, Mio),
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err2, War2, L+Nl, FN);
 
 	{endif, Rem2, Err2, War2, Nl} ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err2, War2, L+Nl, FN);
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+	    Mio2 = update_mio(endif, Mio),
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err2, War2, L+Nl, FN);
 
 	{{'if', true}, Rem2, Err2, War2, Nl} ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
 	    IfCou2 = {endif, 1, L},
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, IfCou2, Err2, War2, L+Nl, FN);
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err2, War2, L+Nl, FN);
 %%	{{'if', false}, Removed, Rem2, Nl} ->   Not implemented at present
 	{{'if', error}, Rem2, Err2, War2, Nl} ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err2, War2, L+Nl, FN);
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+	    Mio2 = update_mio('if', Mio),
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err2, War2, L+Nl, FN);
 
 	{'else', {_Removed, Rem2, Nl}} ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
 	    Err2 = {FN, L, "`else' command is not implemented at present"},
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, [Err2|Err], War, L+Nl, FN);
+	    Mio2 = update_mio('else', Mio),
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, [Err2|Err], War, L+Nl, FN);
 
 	{'elif', {_Removed, Rem2, Nl}} ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
 	    Err2 = {FN, L, "`elif' command is not implemented at present"},
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, [Err2|Err], War, L+Nl, FN);
+	    Mio2 = update_mio('elif', Mio),
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, [Err2|Err], War, L+Nl, FN);
 
 	{warning, {WarningText, Rem2, Nl}} ->
 	    [FileName|_More] = IncFile,
 	    War2 = {FileName, L, "warning: #warning "++detokenise(WarningText)},
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err, [War2|War], L+Nl, FN);
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, Err, [War2|War], L+Nl, FN);
 	    
 	{error, {ErrorText, Rem2, Nl}} ->
 	    [FileName|_More] = IncFile,
 	    Err2 = {FileName, L, detokenise(ErrorText)},
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, [Err2|Err], War, L+Nl, FN);
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, [Err2|Err], War, L+Nl, FN);
 	    
 	{{line, ok}, {_Removed, Rem2, Nl}, L2, FN2, LineText} ->
 	    Out2 = lists:duplicate(Nl,$\n)++LineText++Out,
 	    [_X|IF] = IncFile,
 	    IncFile2 = [FN2|IF],
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile2, IncDir, check_all, Err, War, L2, FN2);
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile2, IncDir, update_mio(Mio), check_all, Err, War, L2, FN2);
 	{{line, error}, {_Removed, Rem2, Nl}, Err2} ->
-	    Out2 = [lists:duplicate(Nl,$\n)|Out],
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, [Err2|Err], War, L+Nl, FN);
+	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, [Err2|Err], War, L+Nl, FN);
 
 	hash_mark ->
-	    expand(Rem, Out, SelfRef, Defs, IncFile, IncDir, check_all, Err, War, L, FN);
+	    expand(Rem, Out, SelfRef, Defs, IncFile, IncDir, Mio, check_all, Err, War, L, FN);
 
 	{pragma, Rem2, Nl, Text} ->
 	    Out2 = lists:duplicate(Nl,$\n)++Text++Out,
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err, War, L+Nl, FN);
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, Err, War, L+Nl, FN);
 
 	{ident, Rem2, Nl, Text} ->
 	    Out2 = lists:duplicate(Nl,$\n)++Text++Out,
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err, War, L+Nl, FN);
+	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, Err, War, L+Nl, FN);
 
 	{not_recognised, {Removed, Rem2, Nl}} ->
 	    Text = lists:reverse([$#|Command]),
 	    RemovedS = lists:reverse([?space|detokenise(Removed)]),
 	    Out2 = [$\n|RemovedS]++Text++Out,
+	    Mio2 = update_mio(Mio),
 	    case Command of
 		[X|_T] when ?is_upper(X) ->
-		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err, War, L+Nl, FN);
+		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err, War, L+Nl, FN);
 		[X|_T] when ?is_lower(X) ->
-		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err, War, L+Nl, FN);
+		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err, War, L+Nl, FN);
 		[X|_T] when ?is_underline(X) ->
-		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, Err, War, L+Nl, FN);
+		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err, War, L+Nl, FN);
 		_ ->
 		    Err2 = {FN, L, "invalid preprocessing directive name"},
-		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, check_all, [Err2|Err], War, L+Nl, FN)
+		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, [Err2|Err], War, L+Nl, FN)
 	    end;
 
 	Else ->
@@ -859,19 +861,19 @@ expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, check_all
     end;
 
 
-expand([{var, "__LINE__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
+expand([{var, "__LINE__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
     LL = io_lib:format("~p",[L]),
-    expand(Rem, [LL | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+    expand(Rem, [LL | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
 
-expand([{var, "__FILE__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
-    expand(Rem, [$",FN,$" | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+expand([{var, "__FILE__"}|Rem], Out, SelfRef, Defs, IncFile, Mio, IncDir, IfCou, Err, War, L, FN) ->
+    expand(Rem, [$",FN,$" | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
 
-expand([{var, "__DATE__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
+expand([{var, "__DATE__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
     {{Y,M,D},{_H,_Mi,_S}} = calendar:universal_time(),
     Date = io_lib:format("\"~s ~p ~p\"",[month(M),D,Y]),
-    expand(Rem, [Date | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+    expand(Rem, [Date | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
 
-expand([{var, "__TIME__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
+expand([{var, "__TIME__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
     {{_Y,_M,_D},{H,Mi,S}} = calendar:universal_time(),
     HS = if H < 10 -> "0"++integer_to_list(H);
 	    true -> integer_to_list(H)
@@ -883,40 +885,40 @@ expand([{var, "__TIME__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err,
        true -> integer_to_list(S)
     end,
     Time = io_lib:format("\"~s:~s:~s\"",[HS,MiS,SS]),
-    expand(Rem, [Time | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+    expand(Rem, [Time | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
 
-expand([{var, "__INCLUDE_LEVEL__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
+expand([{var, "__INCLUDE_LEVEL__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
     IL = io_lib:format("~p",[length(IncFile)-1]),
-    expand(Rem, [IL | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+    expand(Rem, [IL | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
 
-expand([{var, "__BASE_FILE__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
+expand([{var, "__BASE_FILE__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
     [BF|_T] = lists:reverse(IncFile),
-    expand(Rem, [$",BF,$" | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+    expand(Rem, [$",BF,$" | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
 
-expand([{var, Var} | Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
+expand([{var, Var} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
     {Out2, Err2, War2, Rem2, SelfRef2} = 
 	source_line(Var, Rem, SelfRef, Defs, Err, War, L, FN),
-    expand(Rem2, [Out2 | Out], SelfRef2, Defs, IncFile, IncDir, IfCou, Err2, War2, L, FN);
+    expand(Rem2, [Out2 | Out], SelfRef2, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err2, War2, L, FN);
 
-expand([{char, Char} | Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
-    expand(Rem, [Char | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+expand([{char, Char} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
+    expand(Rem, [Char | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
 
-expand([{number, Number} | Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
-    expand(Rem, [Number | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+expand([{number, Number} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
+    expand(Rem, [Number | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
 
-expand([{expanded, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
-    expand(Rem, [Str | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+expand([{expanded, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
+    expand(Rem, [Str | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
 
-expand([{self_ref, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
+expand([{self_ref, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
     SelfRef2 = lists:delete(Str,SelfRef),
-    expand(Rem, Out, SelfRef2, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+    expand(Rem, Out, SelfRef2, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
 
-expand([{string, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
-    expand(Rem, [$", Str, $" | Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN);
+expand([{string, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
+    expand(Rem, [$", Str, $" | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
 
-expand([{string_part, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L, FN) ->
+expand([{string_part, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
     {Str2, Rem2, Nl} = expand_string_part([$"|Str], Rem),
-    expand(Rem2, [Str2| Out], SelfRef, Defs, IncFile, IncDir, IfCou, Err, War, L+Nl, FN).
+    expand(Rem2, [Str2| Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L+Nl, FN).
 
 
 
@@ -954,13 +956,14 @@ expand_string_part([{string_part, Str_part} | Rem], Str, Nl) ->
 get_cmd_line_defs(Flags) ->
     Adjusted = parse_cmd_line(Flags,[]),
 
-    {_Out, _Err, _War, Defs, _IfCou} =
+    {_Out, _Err, _War, Defs, _IfCou, _Mio} =
 	expand(tokenise(Adjusted,""),
 	       [],
 	       [],
 	       [],
 	       [],
 	       [],
+	       #mio{},
 	       check_all,
 	       [],
 	       [],
@@ -1030,10 +1033,10 @@ collect_undefine([C|Rest],Found) ->
 %%======================================================================================
 %%======================================================================================
 
-pp_command(Command, [space|File], Defs, IncDir, Err, War, L, FN) ->
-    pp_command(Command, File, Defs, IncDir, Err, War, L, FN);
+pp_command(Command, [space|File], Defs, IncDir, Mio, Err, War, L, FN) ->
+    pp_command(Command, File, Defs, IncDir, Mio, Err, War, L, FN);
 
-pp_command(Command, File, Defs, IncDir, Err, War, L, FN) ->
+pp_command(Command, File, Defs, IncDir, Mio, Err, War, L, FN) ->
 
     case Command of
 	%%----------------------------------------
@@ -1081,14 +1084,16 @@ pp_command(Command, File, Defs, IncDir, Err, War, L, FN) ->
 	%% #include
 	%%----------------------------------------
 	"include" ->
-	    case include(File, IncDir) of
-		{error, Rem, Nl, Err2} ->
-		    {{include, error}, Rem, Nl, [{FN, L, Err2}|Err], War};
-		{error, Rem, Nl, Err2, NameNl} ->
-		    {{include, error}, Rem, Nl, [{FN, L+ NameNl, Err2}|Err], War};
-		{ok, FileName, FileCont, Rem, Nl} ->
-		    {{include, ok}, FileName, FileCont, Rem, Nl, Err, War}
-	    end;
+             case include(File, IncDir, Mio) of
+                 {error, Rem, Nl, Err2} ->
+                     {{include, error}, Rem, Nl, [{FN, L, Err2}|Err], War};
+                 {error, Rem, Nl, Err2, NameNl} ->
+                     {{include, error}, Rem, Nl, [{FN, L+ NameNl, Err2}|Err], War};
+                 {ok, FileNamePath, FileCont, Rem, Nl} ->
+                     {{include, ok}, FileNamePath, FileCont, Rem, Nl, Err, War};
+                 {skip, Rem} ->
+                     {{include, skip}, Rem}
+             end;
 	
 	%%----------------------------------------
 	%% #ifdef
@@ -1127,14 +1132,14 @@ pp_command(Command, File, Defs, IncDir, Err, War, L, FN) ->
 			yes ->
 			    {{ifndef, true}, Rem, Err2, War2, Nl};
 			no ->
-			    {{ifndef, false}, Rem, Err2, War2, Nl}
+			    {{ifndef, false}, Name, Rem, Err2, War2, Nl}
 		    end;
 		{ok, Rem, Name, No_of_para, _Parameters, _Macro, Err2, War2, Nl} ->
 		    case is_defined_before(Name, No_of_para, Defs) of
 			yes ->
 			    {{ifndef, true}, Rem, Err2, War2, Nl};
 			no ->
-			    {{ifndef, false}, Rem, Err2, War2, Nl}
+			    {{ifndef, false}, Name, Rem, Err2, War2, Nl}
 		    end
 	    end;
 	
@@ -1408,29 +1413,32 @@ undef(_Rem) ->
 %%===============================================================
 %%===============================================================
 
-include(File, IncDir) ->
+include(File, IncDir, Mio) ->
     case include2(File) of
-	{ok, FileName, Rem, Nl, FileType} ->
-	    %% The error handling is lite strange just to make it compatible to gcc
-	    case {read_inc_file(FileName, IncDir), Nl, FileType} of
-		{{ok, FileList, FileNamePath}, _, _} ->
-		    {ok, FileNamePath, FileList, Rem, Nl};
-		{{error, Text}, _, own_file} ->
-		    NameNl = count_nl(FileName,0),
-		    Error = lists:flatten(io_lib:format("~s: ~s",[FileName,Text])),
-		    {error, Rem, Nl, Error,  NameNl};
-		{{error, Text}, 1, sys_file} ->
-		    NameNl = count_nl(FileName,0),
-		    Error = lists:flatten(io_lib:format("~s: ~s",[FileName,Text])),
-		    {error, Rem, Nl, Error,  NameNl};
-		{{error, _Text}, _, sys_file} ->
-		    {error, Rem, Nl, "`#include' expects \"FILENAME\" or <FILENAME>"}
-	    end;
-
-	{error, {_Removed, Rem, Nl}} ->
-	    {error, Rem, Nl, "`#include' expects \"FILENAME\" or <FILENAME>"}
+        {ok, FileName, Rem, Nl, FileType} ->
+            Result = read_inc_file(FileName, IncDir, Mio),
+            case {Result, Nl, FileType} of
+                {{ok, FileNamePath, FileCont}, _, _} ->
+                    {ok, FileNamePath, FileCont, Rem, Nl};
+                {skip, _, _} ->
+                    {skip, Rem};
+                {{error, Text}, _, own_file} ->
+                    NameNl = count_nl(FileName,0),
+                    Error = lists:flatten(io_lib:format("~s: ~s",[FileName,Text])),
+                    {error, Rem, Nl, Error,  NameNl};
+                {{error, Text}, 1, sys_file} ->
+                    NameNl = count_nl(FileName,0),
+                    Error = lists:flatten(io_lib:format("~s: ~s",[FileName,Text])),
+                    {error, Rem, Nl, Error,  NameNl};
+                {{error, _Text}, _, sys_file} ->
+                    {error, Rem, Nl, "`#include' expects \"FILENAME\" or <FILENAME>"}
+            end;
+        {error, {_Removed, Rem, Nl}} ->
+            {error, Rem, Nl, "`#include' expects \#FILENAME\" or <FILENAME>"}
     end.
 
+
+
 count_nl([],Nl) ->
     Nl;
 count_nl([$\n|T],Nl) ->
@@ -1909,18 +1917,37 @@ include_dir(Flags,IncDir) ->
 %%  Read a included file. Try current dir first then the IncDir list
 %%===============================================================
 
-read_inc_file(FileName, IncDir) ->
-    case catch file:read_file(FileName) of
-	{ok, Bin} ->
-	    FileList = binary_to_list(Bin),
-	    {ok, FileList, FileName};
+read_inc_file(FileName, IncDir, Mio) ->
+    case find_inc_file(FileName, IncDir) of
+        {ok, AbsFile} ->
+            %% is included before?
+            case lists:member(FileName, Mio#mio.included) of
+                false ->
+                    case catch file:read_file(AbsFile) of
+                        {ok, Bin} ->
+                            FileList = binary_to_list(Bin),
+                            {ok, AbsFile, FileList};
+                        {error, Text} ->
+                            {error, Text}
+                    end;
+                true ->
+                    skip
+            end;
+        {error, Text} ->
+            {error, Text}
+    end.
+
+find_inc_file(FileName, IncDir) ->
+    case catch file:read_file_info(FileName) of
+	{ok, _} ->
+	    {ok, FileName};
 	{error, _} ->
-	    read_inc_file2(FileName, IncDir) 
+	    find_inc_file2(FileName, IncDir)
     end.
 
-read_inc_file2(_FileName, []) ->
+find_inc_file2(_FileName, []) ->
     {error, "No such file or directory"};
-read_inc_file2(FileName, [D|Rem]) ->
+find_inc_file2(FileName, [D|Rem]) ->
     Dir = case lists:last(D) of
 	      $/ ->
 		  D;
@@ -1928,17 +1955,14 @@ read_inc_file2(FileName, [D|Rem]) ->
 		  D++"/"
 	  end,
 
-    case catch file:read_file(Dir++FileName) of
-	{ok, Bin} ->
-	    FileList = binary_to_list(Bin),
-	    {ok, FileList, Dir++FileName};
+    case catch file:read_file_info(Dir++FileName) of
+	{ok, _} ->
+	    {ok, Dir++FileName};
 	{error, _} ->
-	    read_inc_file2(FileName, Rem) 
+	    find_inc_file2(FileName, Rem)
     end.
 
 
-
-
 %%===============================================================
 %%  Read parameters of a macro or a variable in a source line
 %%===============================================================
@@ -2135,5 +2159,73 @@ month(11) -> "Nov";
 month(12) -> "Dec".
 
 
+%% Multiple Include Optimization
+%%
+%% Algorithm described at:
+%% http://gcc.gnu.org/onlinedocs/cppinternals/Guard-Macros.html
+update_mio({include, FileName}, #mio{included=Inc}=Mio) ->
+    Mio#mio{valid=false, included=[FileName|Inc]};
+
+%% valid=false & cmacro=undefined indicates it is already decided this file is
+%% not subject to MIO
+update_mio(_, #mio{valid=false, depth=0, cmacro=undefined}=Mio) ->
+    Mio;
+
+%% if valid=true, there is no non-whitespace tokens before this ifndef
+update_mio({'ifndef', Macro}, #mio{valid=true, depth=0, cmacro=undefined}=Mio) ->
+    Mio#mio{valid=false, cmacro=Macro, depth=1};
+
+%% detect any tokens before top level #ifndef
+update_mio(_, #mio{valid=true, depth=0, cmacro=undefined}=Mio) ->
+    Mio#mio{valid=false};
+
+%% If cmacro is alreay set, this is after the top level #endif
+update_mio({'ifndef', _}, #mio{valid=true, depth=0}=Mio) ->
+    Mio#mio{valid=false, cmacro=undefined};
+
+%% non-top level conditional, just update depth
+update_mio({'ifndef', _}, #mio{depth=D}=Mio) when D > 0 ->
+    Mio#mio{depth=D+1};
+update_mio('ifdef', #mio{depth=D}=Mio) ->
+    Mio#mio{depth=D+1};
+update_mio('if', #mio{depth=D}=Mio) ->
+    Mio#mio{depth=D+1};
+
+%% top level #else #elif invalidates multiple include optimization
+update_mio('else', #mio{depth=1}=Mio) ->
+    Mio#mio{valid=false, cmacro=undefined};
+update_mio('else', Mio) ->
+    Mio;
+update_mio('elif', #mio{depth=1}=Mio) ->
+    Mio#mio{valid=false, cmacro=undefined};
+update_mio('elif', Mio) ->
+    Mio;
+
+%% AT exit to top level, if the controlling macro is not set, this could be the
+%% end of a non-ifndef conditional block, or there were tokens before entering
+%% the #ifndef block. In either way, this invalidates the MIO
+%%
+%% It doesn't matter if `valid` is true at the time of exiting, it is set to
+%% true.  This will be used to detect if more tokens are following the top
+%% level #endif.
+update_mio('endif', #mio{depth=1, cmacro=undefined}=Mio) ->
+    Mio#mio{valid=false, depth=0};
+update_mio('endif', #mio{depth=1}=Mio) ->
+    Mio#mio{valid=true, depth=0};
+update_mio('endif', #mio{depth=D}=Mio) when D > 1 ->
+    Mio#mio{valid=true, depth=D-1};
+
+%%if more tokens are following the top level #endif.
+update_mio('endif', #mio{depth=1, cmacro=undefined}=Mio) ->
+    Mio#mio{valid=false, depth=0};
+update_mio('endif', #mio{depth=D}=Mio) when D > 0 ->
+    Mio#mio{valid=true, depth=D-1};
+update_mio(_, Mio) ->
+    Mio#mio{valid=false}.
+
+%% clear `valid`, this doesn't matter since #endif will restore it if
+%% appropriate
+update_mio(Mio) ->
+    Mio#mio{valid=false}.
 
 
diff --git a/lib/ic/src/ic_pragma.erl b/lib/ic/src/ic_pragma.erl
index 45cb64c9c8..beaa2852ab 100644
--- a/lib/ic/src/ic_pragma.erl
+++ b/lib/ic/src/ic_pragma.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. 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
@@ -1600,9 +1600,8 @@ remove_inheriters(S,RS,InheriterList) ->
 	[_OneOnly] ->
 	    ReducedInhList;
 	_Other ->
-	    EtsList = ets:tab2list(S),
 	    CleanList = 
-		[X || X <- EtsList, element(1,X) == inherits],
+                ets:match_object(S, {inherits,'_','_'}),
 %	    CodeOptList = 
 %		[X || X <- EtsList, element(1,X) == codeopt],
 	    NoInheriters =remove_inheriters2(S,ReducedInhList,CleanList),
@@ -1648,9 +1647,8 @@ remove_inh([X],[Y],List,EtsList) ->
 %%% from others in the list 
 %%%----------------------------------------------
 remove_inherited(S,InheriterList) ->
-    EtsList = ets:tab2list(S),
     CleanList = 
-	[X || X <- EtsList, element(1,X) == inherits],
+        ets:match_object(S, {inherits, '_', '_'}),
     remove_inherited(S,InheriterList,CleanList).
 
 
@@ -1694,11 +1692,8 @@ remove_inhed([X],[Y],List,EtsList) ->
 %%  are inherited from scope in the list 
 %%%----------------------------------------------
 get_inherited(S,Scope,OpScopeList) ->
-    EtsList = ets:tab2list(S),
-    [[element(3,X)] || X <- EtsList, 
-		       element(1,X) == inherits,
-		       element(2,X) == Scope,
-		       member([element(3,X)],OpScopeList)].
+    EtsList1 = ets:match(S, {inherits, Scope, '$1'}),
+    [X || X <- EtsList1, member(X, OpScopeList)].
 
 
 
@@ -1771,9 +1766,7 @@ inherits2(_X,Y,Z,EtsList) ->
 %%     false otherwise   
 %%
 is_inherited_by(Interface1,Interface2,PragmaTab) ->
-    FullList = ets:tab2list(PragmaTab),
-    InheritsList = 
-	[X || X <- FullList, element(1,X) == inherits],
+    InheritsList = ets:match_object(PragmaTab, {inherits, '_', '_'}),
     inherits(Interface2,Interface1,InheritsList).
 
 
diff --git a/lib/ic/vsn.mk b/lib/ic/vsn.mk
index 6d6c7fa625..703c8d29eb 100644
--- a/lib/ic/vsn.mk
+++ b/lib/ic/vsn.mk
@@ -1 +1 @@
-IC_VSN = 4.2.26
+IC_VSN = 4.2.28
diff --git a/lib/inets/Makefile b/lib/inets/Makefile
index f4c2746b0a..4765a2ca3c 100644
--- a/lib/inets/Makefile
+++ b/lib/inets/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2010. All Rights Reserved.
+# Copyright Ericsson AB 1996-2011. 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
diff --git a/lib/inets/doc/src/Makefile b/lib/inets/doc/src/Makefile
index e4cb0c4e48..82f2a5829f 100644
--- a/lib/inets/doc/src/Makefile
+++ b/lib/inets/doc/src/Makefile
@@ -26,16 +26,6 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include ../../vsn.mk
 VSN=$(INETS_VSN)
 
-
-# ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -98,37 +88,10 @@ EXTRA_FILES = summary.html.src \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = \
-	$(XML_PART_FILES:%.xml=%.tex) \
-	$(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_REF6_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-TOP_PS_FILE  = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-TOP_HTML_FILES = 
-
-endif
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -141,8 +104,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 ldocs: local_docs
@@ -156,33 +117,6 @@ html: gifs $(HTML_REF_MAN_FILE)
 clean clean_docs: clean_html clean_man clean_pdf
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) $(TOP_HTML_FILES) gifs
-
-clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-
-clean: clean_tex clean_html clean_man
-	rm -f *.xmls_output *.xmls_errs
-	rm -f $(TOP_PDF_FILE)
-	rm -f errs core *~ 
-endif
-
 man: $(MAN3_FILES) 
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -204,10 +138,7 @@ clean_man:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
-	@echo "release_docs_spec(docs) when DOCSUPPORT=$DOCSUPPORT"
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
@@ -215,33 +146,6 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	@echo "release_docs_spec(pdf)"
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	@echo "release_docs_spec(ps)"
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	@echo "release_docs_spec(docs)"
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-	$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-
-endif
-endif
-
-endif
 
 release_spec:
 
diff --git a/lib/inets/doc/src/http_server.xml b/lib/inets/doc/src/http_server.xml
index 599a939913..f29b505bc7 100644
--- a/lib/inets/doc/src/http_server.xml
+++ b/lib/inets/doc/src/http_server.xml
@@ -406,7 +406,7 @@ http://your.server.org/***/Module[:/]Function(?QueryString|/PathInfo)
             phase instead of first generating the whole web page and
             then sending it to the client. The option to implement a
             function with arity two is only kept for
-            backwardcompatibilty reasons. 
+            backwards compatibility reasons.
             See <seealso marker="mod_esi">mod_esi(3)</seealso> for 
             implementation details of the esi callback function.</p>
         </section>
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index d1671ac9bd..b1f964ae69 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -28,8 +28,10 @@
     <date></date>
     <rev></rev>
   </header>
+
   <module>httpc</module>
   <modulesummary>An HTTP/1.1 client </modulesummary>
+
   <description>
     <p>This module provides the API to a HTTP/1.1 compatible client according 
       to RFC 2616, caching is currently not supported.</p>
@@ -167,7 +169,6 @@ filename()       = string()
         <v>http_option() = {timeout,         timeout()} | 
                            {connect_timeout, timeout()} | 
                            {ssl,             ssloptions()} | 
-                           {ossl,            ssloptions()} | 
                            {essl,            ssloptions()} | 
                            {autoredirect,    boolean()} | 
                            {proxy_auth, {userstring(), passwordstring()}} | 
@@ -206,6 +207,7 @@ filename()       = string()
 	to the <c>receiver</c> depending on that value. </p>
 
         <p>Http option (<c>http_option()</c>) details: </p>
+        <marker id="request2_http_options"></marker>
         <taglist>
           <tag><c><![CDATA[timeout]]></c></tag>
           <item>
@@ -231,16 +233,9 @@ filename()       = string()
             <p>Defaults to <c>[]</c>. </p>
 	  </item>
 
-          <tag><c><![CDATA[ossl]]></c></tag>
-          <item>
-            <p>If using the OpenSSL based (old) implementation of SSL, 
-	    these SSL-specific options are used. </p>
-            <p>Defaults to <c>[]</c>. </p>
-	  </item>
-
           <tag><c><![CDATA[essl]]></c></tag>
           <item>
-            <p>If using the Erlang based (new) implementation of SSL, 
+            <p>If using the Erlang based implementation of SSL, 
 	    these SSL-specific options are used. </p>
             <p>Defaults to <c>[]</c>. </p>
 	  </item>
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index edacb73b65..f88099a82e 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -148,13 +148,11 @@
 	in the apache like configuration file.
       </item>
 
-      <tag>{socket_type, ip_comm | ssl | ossl | essl}</tag>
+      <tag>{socket_type, ip_comm | ssl | essl}</tag>
       <item>
-	<p>When using ssl, there are several alternatives. 
-          <c>ossl</c> specifically uses the OpenSSL based (old) SSL. 
-          <c>essl</c> specifically uses the Erlang based (new) SSL. 
-          When using <c>ssl</c> it <em>currently</em> defaults to 
-          <c>essl</c>. </p>
+	<p>When using ssl, there are currently only one alternative. 
+	<c>essl</c> specifically uses the Erlang based SSL. 
+	<c>ssl</c> defaults to <c>essl</c>. </p>
 	<p>Defaults to <c>ip_comm</c>. </p> 
       </item>
 
@@ -162,7 +160,7 @@
       <item>
 	<p>Defaults to <c>inet6fb4. </c> </p>
         <p>Note that this option is only used when the option 
-          <c>socket_type</c> has the value <c>ip_comm</c>. </p>
+	<c>socket_type</c> has the value <c>ip_comm</c>. </p>
       </item>
 
     </taglist>
diff --git a/lib/inets/doc/src/make.dep b/lib/inets/doc/src/make.dep
deleted file mode 100644
index 8deb7e7a5a..0000000000
--- a/lib/inets/doc/src/make.dep
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1999-2010. 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.
-#
-# %CopyrightEnd%
-#
-#
-
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex ftp.tex ftp_client.tex httpc.tex http_client.tex \
-		http_server.tex httpd.tex httpd_conf.tex httpd_socket.tex \
-		httpd_util.tex inets.tex inets_services.tex \
-		mod_alias.tex mod_auth.tex mod_esi.tex mod_security.tex \
-		part.tex ref_man.tex tftp.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-ftp.tex: ../../../../system/doc/definitions/term.defs
-
-inets_services.tex: ../../../../system/doc/definitions/term.defs
-
diff --git a/lib/inets/doc/src/mod_auth.xml b/lib/inets/doc/src/mod_auth.xml
index 42c49e9c35..2134ebeeae 100644
--- a/lib/inets/doc/src/mod_auth.xml
+++ b/lib/inets/doc/src/mod_auth.xml
@@ -80,7 +80,7 @@
         <marker id="delete_user"></marker>
         <p><c>delete_user/2, delete_user/3</c> and <c>delete_user/4</c> 
           deletes a user 
-          from the user database. If the operation is succesfull, this 
+          from the user database. If the operation is successful, this
           function returns <c>true</c>. If an error occurs, 
           <c>{error,Reason}</c> is returned. When <c>delete_user/2</c> is
           called the Port and Dir options are mandatory.</p>
diff --git a/lib/inets/doc/src/mod_esi.xml b/lib/inets/doc/src/mod_esi.xml
index 9674cd9a88..9906ae0895 100644
--- a/lib/inets/doc/src/mod_esi.xml
+++ b/lib/inets/doc/src/mod_esi.xml
@@ -31,8 +31,8 @@
   <module>mod_esi</module>
   <modulesummary>Erlang Server Interface </modulesummary>
   <description>
-    <p>This module defines the API - Erlang Server Interface (ESI).
-    Which is a more efficient way of writing erlang scripts
+    <p>This module defines the Erlang Server Interface (ESI) API.
+    It is a more efficient way of writing erlang scripts
     for your Inets web server than writing them as common CGI scripts.</p>
 
     <marker id="deliver"></marker>
@@ -95,12 +95,12 @@
           the server uses when <c>deliver/2</c> is called; do not
           assume anything about the datatype.</p>
         <p>Use this callback function to dynamically generate dynamic web
-          content. when a part of the page is generated send the
+          content. When a part of the page is generated send the
           data back to the client through <c>deliver/2</c>. Note
           that the first chunk of data sent to the client must at
           least contain all HTTP header fields that the response
           will generate. If the first chunk does not contain the
-          <em>End of HTTP the header</em>, that is <c>"\r\n\r\n",</c>
+          <em>End of HTTP header</em>, that is <c>"\r\n\r\n",</c>
           the server will
           assume that no HTTP header fields will be generated.</p>
       </desc>
@@ -118,8 +118,8 @@
       <desc>
         <p>This callback format consumes a lot of memory since the
           whole response must be generated before it is sent to the
-          user. This functions is deprecated and only keept for backwards
-          compatibility. 
+          user. This function is deprecated and only kept for backwards
+          compatibility.
           For new development Module:Function/3 should be used.</p>
       </desc>
     </func>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 34f26bf45b..87a8c173a5 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,6 +32,119 @@
     <file>notes.xml</file>
   </header>
   
+  <section><title>Inets 5.8</title>
+
+    <section><title>Improvements and New Features</title>
+    <p>-</p>
+
+<!--
+      <list>
+        <item>
+          <p>[httpc|httpd] Added support for IPv6 with ssl. </p>
+	  <p>Own Id: OTP-5566</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+    <p>-</p>
+
+<!--
+      <list>
+        <item>
+          <p>[httpc] Remove unnecessary usage of iolist_to_binary when 
+	  processing body (for PUT and POST). </p>
+	  <p>Filipe David Manana</p>
+	  <p>Own Id: OTP-9317</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+<!--
+      <p>-</p>
+-->
+
+      <list>
+        <item>
+          <p>[httpc] Deprecated interface module <c>http</c> has been removed. 
+	  It has (long) been replaced by http client interface module 
+	  <seealso marker="httpc#">httpc</seealso>. </p>
+	  <p>Own Id: OTP-9359</p>
+        </item>
+
+        <item>
+          <p>[httpc|httpd] The old ssl implementation (based on OpenSSL), 
+	  has been deprecated. The config option that specified usage of 
+	  this version of the ssl app, <c>ossl</c>, has been removed. </p>
+	  <p>Own Id: OTP-9522</p>
+        </item>
+
+      </list>
+
+    </section>
+
+  </section> <!-- 5.8 -->
+
+  
+  <section><title>Inets 5.7.1</title>
+
+    <section><title>Improvements and New Features</title>
+    <p>-</p>
+
+<!--
+      <list>
+        <item>
+          <p>[httpc|httpd] Added support for IPv6 with ssl. </p>
+          <p>Own Id: OTP-5566</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+<!--
+    <p>-</p>
+-->
+
+      <list>
+        <item>
+          <p>[httpc] Parsing of a cookie expire date should be more forgiving. 
+          That is, if the parsing fails, the date should be ignored.
+          Also added support for (yet another) date format: 
+          "Tue Jan 01 08:00:01 2036 GMT". </p>
+          <p>Own Id: OTP-9433</p>
+        </item>
+
+        <item>
+          <p>[httpc] Rewrote cookie parsing. Among other things solving 
+          cookie processing from www.expedia.com. </p>
+          <p>Own Id: OTP-9434</p>
+        </item>
+
+        <item>
+          <p>[httpd] Fix httpd directory traversal on Windows. 
+          Directory traversal was possible on Windows where
+          backward slash is used as directory separator. </p>
+          <p>Andr�s Veres-Szentkir�lyi.</p>
+          <p>Own Id: OTP-9561</p>
+        </item>
+
+      </list>
+    </section>
+
+  </section> <!-- 5.7.1 -->
+
+
   <section><title>Inets 5.7</title>
 
     <section><title>Improvements and New Features</title>
@@ -1044,570 +1157,11 @@
 
   </section> <!-- 5.1 -->
 
+  <!-- 
+       <p>For information about older versions see
+       <url href="part_notes_history_frame.html">release notes history</url>.</p>
+  -->
 
-  <section><title>Inets 5.0.14</title>
-
-      <section><title>Improvements and New Features</title>
-        <list>
-          <item>
-            <p>
-              [tftp] The callback watchdog has been removed, as it
-              turned out to be counter productive when the disk was
-              overloaded. Earlier a connection was aborted when a
-              callback (which performs the file access in the TFTP
-              server) took too long time.</p>
-            <p>
-              [tftp] The error message "Too many connections" has been
-              reclassified to be a warning.</p>
-            <p>
-              Own Id: OTP-7888</p>
-          </item>
-        </list>
-      </section>
-
-
-      <section><title>Fixed Bugs and Malfunctions</title>
-        <list>
-	  <item>
-	    <p>[httpc] - Incorrect http version option check. </p>
-            <p>Mats Cronqvist</p>
-	    <p>Own Id: OTP-7882</p>
-          </item>
-
-	  <item>
-	    <p>[httpc] - Unnecessary error report when client 
-              terminating as a result of the server closed the 
-              socket unexpectedly. </p>
-	    <p>Own Id: OTP-7883</p>
-          </item>
-
-	  <item>
-	    <p>[httpc] - Failed transforming a relative URI to 
-              an absolute URI. </p>
-            <p>[email protected]</p>
-	    <p>Own Id: OTP-7950</p>
-          </item>
-
-	  <item>
-	    <p>[httpd] - The HTTP server did not handle the config
-              option ssl_ca_certificate_file. </p>
-            <p>[email protected]</p>
-	    <p>Own Id: OTP-7976</p>
-          </item>
-
-        </list>
-      </section>
-
-  </section> <!-- 5.0.14 -->
-
-
-  <section><title>Inets 5.0.13</title>
-  
-  <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-	<item>
-	  <p>
-	    Ssl did not work correctly with the use of new style
-	    configuration due to sn old internal format that was not
-	  changed correctly in all places.</p>
-	  <p>
-            Own Id: OTP-7723 Aux Id: seq11143 </p>
-        </item>
-        <item>
-          <p>
-            [httpc] - Now streams 200 and 206 results and not only
-            200 results.</p>
-          <p>
-            Own Id: OTP-7857</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            [httpc] - The inets http client will now use persistent
-            connections without pipelining as default and if a
-            pipeline timeout is set it will pipeline the requests on
-            the persistent connections.</p>
-          <p>
-            *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-            Own Id: OTP-7463</p>
-        </item>
-        <item>
-          <p>
-            [httpd] - added option ssl_password_callback_arguments.</p>
-          <p>
-            Own Id: OTP-7724 Aux Id: seq11151 </p>
-        </item>
-        <item>
-          <p>
-            Changed the socket use so that it will become more robust
-            to non-functional ipv6 and fallback on ipv4. This changes
-            may for very special os-configurations cause a problem
-            when used with erts-versions pre R13.</p>
-          <p>
-            Own Id: OTP-7726</p>
-        </item>
-        <item>
-          <p>
-            Removed deprecated function httpd_util:key1search/[2,3]</p>
-          <p>
-            Own Id: OTP-7815</p>
-        </item>
-      </list>
-    </section>
-
-  </section>
-
-  <section><title>Inets 5.0.12</title>
-  
-  <section><title>Improvements and New Features</title>
-  <list>
-    <item>
-      <p>
-	[httpd] - Updated inets so that it not uses the deprecated
-	function ssl:accept/[2,3].</p>
-      <p>
-      Own Id: OTP-7636 Aux Id: seq11086 </p>
-    </item>
-      </list>
-  </section>
-  
-  </section>
-
-  
-  <section><title>Inets 5.0.11</title>
-
-  <section><title>Fixed Bugs and Malfunctions</title>
-  <list>
-    <item>
-      <p>
-	Transient bug related to hot code swap of the TFTP server is
-	now fixed. It could happen that the first TFTP server that was
-	started after a code upgrade to Inets-5.0.6 crashed with a
-	function clause error in tftp_engine:service_init/2.</p>
-	<p> Own Id: OTP-7574 Aux Id: seq11069 </p>
-        </item>
-	<item>
-	  <p>
-	    [httpd] - Validation of ssl_password_callback_module was
-	  incorrect.</p>
-	  <p>
-	  Own Id: OTP-7597 Aux Id: seq11074 </p>
-	</item>
-	<item>
-	  <p>
-	    [httpd] - Misspelling in old apachelike configuration
-	  directive TransferDiskLogSize has been corrected.</p>
-	  <p> Own Id: OTP-7598 Aux Id: seq11059 </p>
-	</item>
-	<item>
-	  <p>
-	  Minor problems found by dialyzer has been fixed.</p>
-	  <p>
-            Own Id: OTP-7605</p>
-        </item>
-  </list>
-  </section>
-
-  </section>
-
-<section><title>Inets 5.0.10</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            Enhanched an info report.</p>
-          <p>
-            Own Id: OTP-7450</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            Changed errro message from
-            {wrong_type,{document_root,"/tmp/htdocs"}} to
-            {invalid_option,{non_existing,
-            document_root,"/tmp/htdocs"}}.</p>
-          <p>
-            Own Id: OTP-7454</p>
-        </item>
-        <item>
-          <p>
-            Relative paths in directory authentication did not work
-            as intended, this has now been fixed.</p>
-          <p>
-            Own Id: OTP-7490</p>
-        </item>
-        <item>
-          <p>
-            The query-string passed to the callback function was not
-            compliant with the documentation, it is now.</p>
-          <p>
-            Own Id: OTP-7512</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-  <section><title>Inets 5.0.9</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            Parameters to error_logger:error_report/1 has been
-            corrected.</p>
-          <p>
-            Own Id: OTP-7257 Aux Id: OTP-7294, OTP-7258 </p>
-        </item>
-        <item>
-          <p>
-            [httpd] - If a Module/Function request matching an
-	    erl_script_alias registration does not exist as a function in
-	    the module registered a 404 error will now be issued instead of a
-            500 error.</p>
-          <p>
-            Own Id: OTP-7323</p>
-        </item>
-        <item>
-          <p>
-            [httpd] -The option auth_type for mod_auth is no longer
-	    mandatory, for backward-compatibility reasons.</p>
-          <p>
-            Own Id: OTP-7341</p>
-        </item>
-      </list>
-    </section>
-
-  </section>
-
-  <section><title>Inets 5.0.8</title>
-  
-  <section><title>Fixed Bugs and Malfunctions</title>
-  <list>
-    <item>
-      <p>
-	[httpd] - Spelling error caused client connection header
-      to be ignored.</p>
-      <p>
-      Own Id: OTP-7315 Aux Id: seq10951 </p>
-    </item>
-    <item>
-      <p>
-	[httpd] - Call to the function
-	mod_get:get_modification_date/1 was made too early
-	resulting in that httpd did not send the 404 file missing
-      response.</p>
-      <p>
-      Own Id: OTP-7321</p>
-    </item>
-  </list>
-  </section>
-  
-  </section>
-
-  <section><title>Inets 5.0.7</title>
-  
-  <section><title>Improvements and New Features</title>
-  <list>
-    <item>
-	  <p>
-	    [httpc, httpd] - Now follows the recommendation regarding
-	    line terminators in section 19.3 in RFC 2616 e.i: "The
-	    line terminator for message-header fields is the sequence
-	    CRLF. However, we recommend that applications, when
-	    parsing such headers, recognize a single LF as a line
-	  terminator and ignore the leading CR".</p>
-	  <p>
-	  Own Id: OTP-7304 Aux Id: seq10944 </p>
-    </item>
-  </list>
-  </section>
-  
-  </section>
-  
-  <section><title>Inets 5.0.6</title>
-
-  <section><title>Improvements and New Features</title>
-  <list>
-        <item>
-          <p>
-            [tftp] If a callback (which performs the file access in
-            the TFTP server) takes too long time (more than the
-	    double TFTP timeout), the server will abort the
-            connection and send an error reply to the client. This
-	    implies that the server will release resources attached
-            to the connection faster than before. The server simply
-            assumes that the client has given up.</p>
-          <p>
-            [tftp] If the TFTP server receives yet another request
-            from the same client (same host and port) while it
-            already has an active connection to the client, it will
-            simply ignore the new request if the request is equal
-            with the first one (same filename and options). This
-            implies that the (new) client will be served by the
-            already ongoing connection on the server side. By not
-            setting up yet another connection, in parallel with the
-            ongoing one, the server will consumer lesser resources.</p>
-          <p>
-            [tftp] netascii mode is now supported when the
-            client/server has native ascii support (Windows). The new
-            optional parameter native_ascii in the tftp_binary and
-            tftp_file callback modules can be used to override the
-            default behavior.</p>
-          <p>
-            [tftp] Yet another callback module has been added in
-            order to allow customized handling of error, warning and
-            info messages. See the new configuration parameter,
-            logger.</p>
-          <p>
-            [tftp] Yet another configuration parameter, max_retries,
-            has been added in order to control the number of times a
-            packet can be resent. The default is 5.</p>
-          <p>
-            [tftp] tftp:info/1 and tftp:change_config/2 can now be
-            applied to all daemons or all servers in one command
-            without bothering about their process identifiers.</p>
-          <p>
-            External TR HI89527.</p>
-          <p>
-            Own Id: OTP-7266</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Inets 5.0.5</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            [tftp] Blocks with too low block numbers are silently
-            discarded. For example if a server receives block #5 when
-            it expects block #7 it will discard the block without
-            interrupting the file transfer. Too high block numbers
-            does still imply an error. External TR HI96072.</p>
-          <p>
-            Own Id: OTP-7220</p>
-        </item>
-        <item>
-          <p>
-            [tftp] The problem with occasional case_clause errors in
-            tftp_engine:common_read/7 has been fixed. External TR
-            HI97362.</p>
-          <p>
-            Own Id: OTP-7221</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-  <section><title>Inets 5.0.4</title>
-  
-      <section><title>Improvements and New Features</title>
-	<list>
-	  <item>
-	    <p>
-	      Changed calls to file open to concur with the API and not
-	      use deprecated syntax.</p>
-	    <p>
-	      Own Id: OTP-7172</p>
-	  </item>
-	  <item>
-	    <p>
-	      [tftp] Server lost the first packet when the client timed
-	      out</p>
-	    <p>
-	      Own Id: OTP-7173</p>
-	  </item>
-	</list>
-      </section>
-  
-  </section>
-
-  <section><title>Inets 5.0.3</title>
-  
-    <section><title>Improvements and New Features</title>
-    <list>
-        <item>
-          <p>
-	    Updated copyright headers and fixed backwards
-	    compatibility for an undocumented feature, for now. This
-	    feature will later be removed and a new and documented
-	    option will take its place.</p>
-	  <p>
-	  Own Id: OTP-7144</p>
-        </item>
-    </list>
-    </section>
-
-  </section>
-
-  <section><title>Inets 5.0.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            [httpd] - Error logs now has a pretty and a compact
-            format and access logs can be written on the common log
-            format or the extended common log format.</p>
-          <p>
-            Own Id: OTP-6661 Aux Id: Seq 7764 </p>
-        </item>
-        <item>
-          <p>
-            [httpc] - Added acceptance of missing reason phrase to
-            the relaxed mode.</p>
-          <p>
-            Own Id: OTP-7024</p>
-        </item>
-        <item>
-          <p>
-            [httpc] - A new option has been added to enable the
-            client to act as lower version clients, by default the
-            client is an HTTP/1.1 client.</p>
-          <p>
-            Own Id: OTP-7043</p>
-        </item>
-      </list>
-    </section>
-
-  </section>
-  
-  <section><title>Inets 5.0.1</title>
-    
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            [httpd] - Deprecated function httpd:start/1 did not
-            accept all inputs that it had done previously. This
-            should now work again.</p>
-          <p>
-            Own Id: OTP-7040</p>
-        </item>
-      </list>
-    </section>
-    
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            [httpd] - Changed validity check on bind_address so that
-            it uses inet:getaddr instead of inet:gethostbyaddr as the
-            former puts a too hard restriction on the bind_address.</p>
-          <p>
-            Own Id: OTP-7041 Aux Id: seq10829 </p>
-        </item>
-        <item>
-          <p>
-            [httpc] - Internal process now does try-catch and
-            terminates normally in case of HTTP parse errors.
-            Semantical the client works just as before returning an
-            error message to the client, even if the error massage
-            has been enhanced, but there is no supervisor report in
-            the shell of a internal process crashing. (Which was the
-            expected behavior and not a fault.)</p>
-          <p>
-            Own Id: OTP-7042</p>
-        </item>
-      </list>
-    </section>
-
-  </section>
-
-  <section><title>Inets 5.0</title>
-    
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            [httpd, httpc] - Deprecated base64 decode/encode
-            functions have been removed. Inets uses base64 in STDLIB
-            instead.</p>
-          <p>
-            *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-            Own Id: OTP-6485</p>
-        </item>
-        <item>
-          <p>
-            [httpd] - It is now possible to restrict the length of
-            acceptable URI:s in the HTTP server.</p>
-          <p>
-            Own Id: OTP-6572</p>
-        </item>
-        <item>
-          <p>
-            [httpc] - Profiles are now supported i.e. the options
-            available in set_options/1 can be set locally for a
-            certain profile and do not have to affect all
-            HTTP-requests issued in the Erlang node. Calls to the
-            HTTP client API functions not using the profile argument
-            will use the default profile.</p>
-          <p>
-            Own Id: OTP-6690</p>
-        </item>
-        <item>
-          <p>
-            A new uniform Inets interface provides a flexible way to
-            start/stop Inets services and get information about
-            running services. See inets(3). This also means that
-            inflexibilities in the HTTP server has been removed and
-            more default values has been added.</p>
-          <p>
-            Own Id: OTP-6705</p>
-        </item>
-        <item>
-          <p>
-            [tftp] Logged errors have been changed to be logged
-            warnings.</p>
-          <p>
-            Own Id: OTP-6916 Aux Id: seq10737 </p>
-        </item>
-        <item>
-          <p>
-            [httpc] - The client will now return the proper value
-            when receiving a HTTP 204 code instead of hanging.</p>
-          <p>
-            Own Id: OTP-6982</p>
-        </item>
-        <item>
-          <p>
-            The Inets application now has to be explicitly started
-            and stopped i.e. it will not automatically be started as
-            a temporary application as it did before. Although a
-            practical feature when testing things in the shell it is
-            not desirable that people take advantage of this and not
-            start the Inets application in a correct way in their
-            products. Added functions to the Inets API that call
-            application:start/stop.</p>
-          <p>
-            *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-            Own Id: OTP-6993</p>
-        </item>
-      </list>
-    </section> 
-  
-    <!-- p>For information about older versions see
-      <url href="part_notes_history_frame.html">release notes history</url>.</p -->
-  </section>
 </chapter>
 
 
diff --git a/lib/inets/doc/src/notes_history.xml b/lib/inets/doc/src/notes_history.xml
index 6480bad758..151bec375e 100644
--- a/lib/inets/doc/src/notes_history.xml
+++ b/lib/inets/doc/src/notes_history.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -123,7 +123,7 @@
 	  re-receive of acknowledgments. If multiple copies of the
 	  same acknowledgments is received the spurious ones are
 	  silently ignored. This fix was intended for inets-4.7.14
-	  but accidentaly it was not included in that release.</p>
+	  but accidentally it was not included in that release.</p>
 	<p>Own Id: OTP-6706 Aux Id: OTP-6691 </p>
       </item>
     </list>
diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
index 0397b48ab2..3960c36d00 100644
--- a/lib/inets/src/http_client/Makefile
+++ b/lib/inets/src/http_client/Makefile
@@ -41,7 +41,6 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 MODULES = \
-	http \
 	httpc \
 	httpc_cookie \
 	httpc_handler \
diff --git a/lib/inets/src/http_client/http.erl b/lib/inets/src/http_client/http.erl
deleted file mode 100644
index bbe2fec267..0000000000
--- a/lib/inets/src/http_client/http.erl
+++ /dev/null
@@ -1,132 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2002-2010. 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.
-%%
-%% %CopyrightEnd%
-%%
-%%
-
-%%% Description: OLD API MODULE - USE httpc INSTEAD
-
--module(http).
-
--deprecated({request,         1, next_major_release}).
--deprecated({request,         2, next_major_release}).
--deprecated({request,         4, next_major_release}).
--deprecated({request,         5, next_major_release}).
--deprecated({cancel_request,  1, next_major_release}).
--deprecated({cancel_request,  2, next_major_release}).
--deprecated({set_option,      2, next_major_release}).
--deprecated({set_option,      3, next_major_release}).
--deprecated({set_options,     1, next_major_release}).
--deprecated({set_options,     2, next_major_release}).
--deprecated({verify_cookies,  2, next_major_release}).
--deprecated({verify_cookies,  3, next_major_release}).
--deprecated({cookie_header,   1, next_major_release}).
--deprecated({cookie_header,   2, next_major_release}).
--deprecated({stream_next,     1, next_major_release}).
--deprecated({default_profile, 0, next_major_release}).
-
-%% Deprecated
--export([
-	 request/1, request/2, request/4, request/5,
-	 cancel_request/1, cancel_request/2,
-	 set_option/2, set_option/3,
-	 set_options/1, set_options/2,
-	 verify_cookies/2, verify_cookies/3, 
-	 cookie_header/1, cookie_header/2, 
-	 stream_next/1,
-	 default_profile/0
-	]).
-
-
-%%%=========================================================================
-%%%  API
-%%%=========================================================================
-
-%%--------------------------------------------------------------------------
-%% request(Url [, Profile]) ->
-%% request(Method, Request, HTTPOptions, Options [, Profile])
-%%--------------------------------------------------------------------------
-
-request(Url)          -> httpc:request(Url).
-request(Url, Profile) -> httpc:request(Url, Profile).
-
-request(Method, Request, HttpOptions, Options) ->
-    httpc:request(Method, Request, HttpOptions, Options). 
-request(Method, Request, HttpOptions, Options, Profile) ->
-    httpc:request(Method, Request, HttpOptions, Options, Profile). 
-
-
-%%--------------------------------------------------------------------------
-%% cancel_request(RequestId [, Profile])
-%%-------------------------------------------------------------------------
-
-cancel_request(RequestId) ->
-    httpc:cancel_request(RequestId).
-cancel_request(RequestId, Profile) ->
-    httpc:cancel_request(RequestId, Profile).
-
-
-%%--------------------------------------------------------------------------
-%% set_options(Options [, Profile])
-%% set_option(Key, Value [, Profile])
-%%-------------------------------------------------------------------------
-
-set_options(Options) ->
-    httpc:set_options(Options).
-set_options(Options, Profile) ->
-    httpc:set_options(Options, Profile).
-
-set_option(Key, Value) ->
-    httpc:set_option(Key, Value).
-set_option(Key, Value, Profile) ->
-    httpc:set_option(Key, Value, Profile).
-
-
-%%--------------------------------------------------------------------------
-%% verify_cookies(SetCookieHeaders, Url [, Profile])
-%%-------------------------------------------------------------------------
-
-verify_cookies(SetCookieHeaders, Url) ->
-    httpc:store_cookies(SetCookieHeaders, Url).
-verify_cookies(SetCookieHeaders, Url, Profile) ->
-    httpc:store_cookies(SetCookieHeaders, Url, Profile).
-
-
-%%--------------------------------------------------------------------------
-%% cookie_header(Url [, Profile])
-%%-------------------------------------------------------------------------
-
-cookie_header(Url) ->
-    httpc:cookie_header(Url).
-cookie_header(Url, Profile) ->
-    httpc:cookie_header(Url, Profile).
-
-
-%%--------------------------------------------------------------------------
-%% stream_next(Pid)
-%%-------------------------------------------------------------------------
-
-stream_next(Pid) ->
-    httpc:stream_next(Pid).
-
-
-%%--------------------------------------------------------------------------
-%% default_profile()
-%%-------------------------------------------------------------------------
-
-default_profile() ->
-    httpc:default_profile().
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index fe8e93af1f..75c26c63cc 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -105,7 +105,6 @@ request(Url, Profile) ->
 %%                   {ssl, SSLOptions} | {proxy_auth, {User, Password}}
 %%	Ssloptions = ssl_options() | 
 %%                   {ssl,  ssl_options()} | 
-%%                   {ossl, ssl_options()} | 
 %%                   {essl, ssl_options()}
 %%      ssl_options() = [ssl_option()]
 %%	ssl_option() =  {verify, code()} | 
@@ -644,8 +643,6 @@ http_options_default() ->
 		      {ok, {?HTTP_DEFAULT_SSL_KIND, Value}};
 		 ({ssl, SslOptions}) when is_list(SslOptions) ->
 		      {ok, {?HTTP_DEFAULT_SSL_KIND, SslOptions}};
-		 ({ossl, SslOptions}) when is_list(SslOptions) ->
-		      {ok, {ossl, SslOptions}};
 		 ({essl, SslOptions}) when is_list(SslOptions) ->
 		      {ok, {essl, SslOptions}};
 		 (_) ->
diff --git a/lib/inets/src/http_client/httpc_cookie.erl b/lib/inets/src/http_client/httpc_cookie.erl
index 4d61f82b5a..69900bae65 100644
--- a/lib/inets/src/http_client/httpc_cookie.erl
+++ b/lib/inets/src/http_client/httpc_cookie.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -18,12 +18,32 @@
 %%
 %% Description: Cookie handling according to RFC 2109
 
+%% The syntax for the Set-Cookie response header is
+%% 
+%% set-cookie      =       "Set-Cookie:" cookies
+%% cookies         =       1#cookie
+%% cookie          =       NAME "=" VALUE *(";" cookie-av)
+%% NAME            =       attr
+%% VALUE           =       value
+%% cookie-av       =       "Comment" "=" value
+%%                 |       "Domain" "=" value
+%%                 |       "Max-Age" "=" value
+%%                 |       "Path" "=" value
+%%                 |       "Secure"
+%%                 |       "Version" "=" 1*DIGIT
+
+
+%% application:start(inets).
+%% httpc:set_options([{cookies, enabled}, {proxy, {{"www-proxy.ericsson.se",8080}, ["*.ericsson.se"]}}]).
+%% (catch httpc:request("http://www.expedia.com")).
+
 -module(httpc_cookie).
 
 -include("httpc_internal.hrl").
 
 -export([open_db/3, close_db/1, insert/2, header/4, cookies/3]). 
 -export([reset_db/1, which_cookies/1]). 
+-export([image_of/2, print/2]). 
 
 -record(cookie_db, {db, session_db}).
 
@@ -125,7 +145,7 @@ insert(#cookie_db{db = Db} = CookieDb,
 		    name    = Name, 
 		    path    = Path, 
 		    max_age = 0}) ->
-    ?hcrt("insert", [{domain, Key}, {name, Name}, {path, Path}]),
+    ?hcrt("insert cookie", [{domain, Key}, {name, Name}, {path, Path}]),
     Pattern = #http_cookie{domain = Key, name = Name, path = Path, _ = '_'}, 
     case dets:match_object(Db, Pattern) of
 	[] ->
@@ -136,7 +156,7 @@ insert(#cookie_db{db = Db} = CookieDb,
     ok;
 insert(#cookie_db{db = Db} = CookieDb,
        #http_cookie{domain = Key, name = Name, path = Path} = Cookie) ->
-    ?hcrt("insert", [{cookie, Cookie}]),
+    ?hcrt("insert cookie", [{cookie, Cookie}]),
     Pattern = #http_cookie{domain = Key,
 			   name = Name, 
 			   path = Path,
@@ -163,6 +183,7 @@ header(CookieDb, Scheme, {Host, _}, Path) ->
 	[] ->
 	    {"cookie", ""};
 	Cookies ->
+	    %% print_cookies("Header Cookies", Cookies), 
 	    {"cookie", cookies_to_string(Scheme, Cookies)}
     end.
 
@@ -173,11 +194,20 @@ header(CookieDb, Scheme, {Host, _}, Path) ->
 %%--------------------------------------------------------------------
 
 cookies(Headers, RequestPath, RequestHost) ->
+
     ?hcrt("cookies", [{headers,      Headers}, 
 		      {request_path, RequestPath}, 
 		      {request_host, RequestHost}]),
+
     Cookies = parse_set_cookies(Headers, {RequestPath, RequestHost}),
-    accept_cookies(Cookies, RequestPath, RequestHost).
+
+    %% print_cookies("Parsed Cookies", Cookies),
+
+    AcceptedCookies = accept_cookies(Cookies, RequestPath, RequestHost),
+
+    %% print_cookies("Accepted Cookies", AcceptedCookies),
+
+    AcceptedCookies.
 	
 
 %%--------------------------------------------------------------------
@@ -266,7 +296,8 @@ cookies_to_string(_, [], CookieStrs) ->
 	    lists:flatten(lists:reverse(CookieStrs))
     end;
 
-cookies_to_string(https, [#http_cookie{secure = true} = Cookie| Cookies], 
+cookies_to_string(https = Scheme, 
+		  [#http_cookie{secure = true} = Cookie| Cookies], 
 		  CookieStrs) ->
     Str = case Cookies of
 	      [] ->
@@ -274,7 +305,7 @@ cookies_to_string(https, [#http_cookie{secure = true} = Cookie| Cookies],
 	      _ ->
 		  cookie_to_string(Cookie) ++ "; "
 	  end,
-    cookies_to_string(https, Cookies, [Str | CookieStrs]);
+    cookies_to_string(Scheme, Cookies, [Str | CookieStrs]);
 
 cookies_to_string(Scheme, [#http_cookie{secure = true}| Cookies],  
 		  CookieStrs) ->
@@ -303,63 +334,54 @@ add_domain(Str, #http_cookie{domain_default = true}) ->
 add_domain(Str, #http_cookie{domain = Domain}) ->
     Str ++ "; $Domain=" ++  Domain.
 
-parse_set_cookies(OtherHeaders, DefaultPathDomain) ->
-    SetCookieHeaders = 
-	lists:foldl(fun({"set-cookie", Value}, Acc) ->  
-			    [string:tokens(Value, ",")| Acc];
-		       (_, Acc) ->
-			    Acc
-		    end, [], OtherHeaders),
-    
-    lists:flatten(
-      lists:map(fun(CookieHeader) ->
-			NewHeader = fix_netscape_cookie(CookieHeader, []),
-			parse_set_cookie(NewHeader, [], DefaultPathDomain) 
-		end,
-		SetCookieHeaders)).
-
-parse_set_cookie([], AccCookies, _) ->    
-    AccCookies;
-parse_set_cookie([CookieHeader | CookieHeaders], AccCookies, 
-		 Defaults = {DefaultPath, DefaultDomain}) -> 
-    [CookieStr | Attributes] = case string:tokens(CookieHeader, ";") of
-				   [CStr] ->
-				       [CStr, ""];
-				   [CStr | Attr] ->
-				       [CStr, Attr]
-			       end,
-    Pos = string:chr(CookieStr, $=),
-    Name = string:substr(CookieStr, 1, Pos - 1),
-    Value = string:substr(CookieStr, Pos + 1),
-    Cookie = #http_cookie{name = string:strip(Name), 
-			  value = string:strip(Value)},
-    NewAttributes = parse_set_cookie_attributes(Attributes),
-    TmpCookie = cookie_attributes(NewAttributes, Cookie),
+parse_set_cookies(CookieHeaders, DefaultPathDomain) ->
+    SetCookieHeaders = [Value || {"set-cookie", Value} <- CookieHeaders], 
+    Cookies = [parse_set_cookie(SetCookieHeader, DefaultPathDomain) || 
+		  SetCookieHeader <- SetCookieHeaders],
+    %% print_cookies("Parsed Cookies", Cookies),
+    Cookies.
+
+parse_set_cookie(CookieHeader, {DefaultPath, DefaultDomain}) ->
+    %% io:format("Raw Cookie: ~s~n", [CookieHeader]), 
+    Pos             = string:chr(CookieHeader, $=),
+    Name            = string:substr(CookieHeader, 1, Pos - 1),
+    {Value, Attrs}  = 
+	case string:substr(CookieHeader, Pos + 1) of
+	    [$;|ValueAndAttrs] ->
+		{"", string:tokens(ValueAndAttrs, ";")};
+	    ValueAndAttrs ->
+		[V | A] = string:tokens(ValueAndAttrs, ";"), 
+		{V, A}
+	end,
+    Cookie          = #http_cookie{name  = string:strip(Name), 
+				   value = string:strip(Value)},
+    Attributes      = parse_set_cookie_attributes(Attrs),
+    TmpCookie       = cookie_attributes(Attributes, Cookie),
     %% Add runtime defult values if necessary
-    NewCookie = domain_default(path_default(TmpCookie, DefaultPath), 
-			       DefaultDomain),
-    parse_set_cookie(CookieHeaders, [NewCookie | AccCookies], Defaults).
-
-parse_set_cookie_attributes([]) ->
-    [];
-parse_set_cookie_attributes([Attributes]) ->
-    lists:map(fun(Attr) -> 
-		      [AttrName, AttrValue] = 
-			  case string:tokens(Attr, "=") of
-			      %% All attributes have the form
-			      %% Name=Value except "secure"!
-			      [Name] -> 
-				  [Name, ""];
-			      [Name, Value] ->
-				  [Name, Value];
-			      %% Anything not expected will be
-			      %% disregarded
-			      _ -> 
-				  ["Dummy",""]
-			  end,
-		      {http_util:to_lower(string:strip(AttrName)), 
-		       string:strip(AttrValue)}
-	      end, Attributes).
+    NewCookie       = domain_default(path_default(TmpCookie, DefaultPath), 
+				     DefaultDomain),
+    NewCookie.
+    
+parse_set_cookie_attributes(Attributes) when is_list(Attributes) ->
+    [parse_set_cookie_attribute(A) || A <- Attributes].
+
+parse_set_cookie_attribute(Attribute) ->
+    {AName, AValue} = 
+	case string:tokens(Attribute, "=") of
+	    %% All attributes have the form
+	    %% Name=Value except "secure"!
+	    [Name] -> 
+		{Name, ""};
+	    [Name, Value] ->
+		{Name, Value};
+	    %% Anything not expected will be
+	    %% disregarded
+	    _ -> 
+		{"Dummy", ""}
+	end,
+    StrippedName  = http_util:to_lower(string:strip(AName)),
+    StrippedValue = string:strip(AValue),
+    {StrippedName, StrippedValue}.
 
 cookie_attributes([], Cookie) ->
     Cookie;
@@ -375,10 +397,15 @@ cookie_attributes([{"max-age", Value}| Attributes], Cookie) ->
 				Cookie#http_cookie{max_age = ExpireTime});
 %% Backwards compatibility with netscape cookies
 cookie_attributes([{"expires", Value}| Attributes], Cookie) ->
-    Time = http_util:convert_netscapecookie_date(Value),
-    ExpireTime = calendar:datetime_to_gregorian_seconds(Time),
-    cookie_attributes(Attributes, 
-		      Cookie#http_cookie{max_age = ExpireTime});
+    try http_util:convert_netscapecookie_date(Value) of
+	Time ->
+	    ExpireTime = calendar:datetime_to_gregorian_seconds(Time),
+	    cookie_attributes(Attributes, 
+			      Cookie#http_cookie{max_age = ExpireTime})
+    catch 
+	_:_ ->
+	    cookie_attributes(Attributes, Cookie)
+    end;
 cookie_attributes([{"path", Value}| Attributes], Cookie) ->
     cookie_attributes(Attributes, 
 		      Cookie#http_cookie{path = Value});
@@ -404,7 +431,7 @@ path_default(#http_cookie{path = undefined} = Cookie, DefaultPath) ->
 path_default(Cookie, _) ->
     Cookie.
 
-%% Note: if the path is only / that / will be keept
+%% Note: if the path is only / that / will be kept
 skip_right_most_slash("/") ->
     "/";
 skip_right_most_slash(Str) ->
@@ -476,20 +503,43 @@ path_sort(Cookies)->
     lists:reverse(lists:keysort(#http_cookie.path, Cookies)).
 
 
-%% Informally, the Set-Cookie response header comprises the token
-%% Set-Cookie:, followed by a comma-separated list of one or more
-%% cookies. Netscape cookies expires attribute may also have a, 
-%% in this case the header list will have been incorrectly split
-%% in parse_set_cookies/2 this functions fix that problem.
-fix_netscape_cookie([Cookie1, Cookie2 | Rest], Acc) ->
-    case inets_regexp:match(string:to_lower(Cookie1), "expires=") of
-	{_, _, _} ->
-	    fix_netscape_cookie(Rest, [Cookie1 ++ Cookie2 | Acc]);
-	nomatch ->
-	    fix_netscape_cookie([Cookie2 |Rest], [Cookie1| Acc])
-    end;
-fix_netscape_cookie([Cookie | Rest], Acc) ->
-    fix_netscape_cookie(Rest, [Cookie | Acc]);
-
-fix_netscape_cookie([], Acc) ->
-    Acc.
+%% print_cookies(Header, Cookies) ->
+%%     io:format("~s:~n", [Header]),
+%%     Prefix = "   ", 
+%%     lists:foreach(fun(Cookie) -> print(Prefix, Cookie) end, Cookies).
+
+image_of(Prefix, 
+	 #http_cookie{domain         = Domain,
+		      domain_default = DomainDef,
+		      name           = Name,
+		      value          = Value,
+		      comment        = Comment,
+		      max_age        = MaxAge,
+		      path           = Path, 
+		      path_default   = PathDef,
+		      secure         = Sec,
+		      version        = Version}) ->
+    lists:flatten(
+      io_lib:format("~sCookie ~s: "
+		    "~n~s   Value:     ~p"
+		    "~n~s   Domain:    ~p"
+		    "~n~s   DomainDef: ~p"
+		    "~n~s   Comment:   ~p"
+		    "~n~s   MaxAge:    ~p"
+		    "~n~s   Path:      ~p"
+		    "~n~s   PathDef:   ~p"
+		    "~n~s   Secure:    ~p"
+		    "~n~s   Version:   ~p", 
+		    [Prefix, Name, 
+		     Prefix, Value, 
+		     Prefix, Domain, 
+		     Prefix, DomainDef, 
+		     Prefix, Comment, 
+		     Prefix, MaxAge, 
+		     Prefix, Path, 
+		     Prefix, PathDef, 
+		     Prefix, Sec, 
+		     Prefix, Version])).
+
+print(Prefix, Cookie) when is_record(Cookie, http_cookie) ->
+    io:format("~s~n", [image_of(Prefix, Cookie)]).
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 9ac9ee6f7b..587e24cc8d 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -1157,7 +1157,7 @@ handle_cookies(Headers, Request, #options{cookies = enabled}, ProfileName) ->
     httpc_manager:store_cookies(Cookies, Request#request.address,
 				ProfileName).
 
-%% This request could not be pipelined or used as sequential keept alive
+%% This request could not be pipelined or used as sequential keep alive
 %% queue
 handle_queue(#state{status = close} = State, _) ->
     {stop, normal, State};
diff --git a/lib/inets/src/http_lib/http_internal.hrl b/lib/inets/src/http_lib/http_internal.hrl
index 2e924667c6..97cf474ab9 100644
--- a/lib/inets/src/http_lib/http_internal.hrl
+++ b/lib/inets/src/http_lib/http_internal.hrl
@@ -28,7 +28,6 @@
 -define(HTTP_MAX_URI_SIZE,    nolimit).
 
 -ifndef(HTTP_DEFAULT_SSL_KIND).
-%% -define(HTTP_DEFAULT_SSL_KIND, ossl).
 -define(HTTP_DEFAULT_SSL_KIND, essl).
 -endif. % -ifdef(HTTP_DEFAULT_SSL_KIND).
 
diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl
index 9b8190ebed..5eb827032f 100644
--- a/lib/inets/src/http_lib/http_transport.erl
+++ b/lib/inets/src/http_lib/http_transport.erl
@@ -62,8 +62,6 @@ start(ip_comm) ->
 %% This is just for backward compatibillity
 start({ssl, _}) ->
     do_start_ssl();
-start({ossl, _}) ->
-    do_start_ssl();
 start({essl, _}) ->
     do_start_ssl().
 
@@ -126,22 +124,6 @@ connect(ip_comm = _SocketType, {Host, Port}, Opts0, Timeout)
 connect({ssl, SslConfig}, Address, Opts, Timeout) ->
     connect({?HTTP_DEFAULT_SSL_KIND, SslConfig}, Address, Opts, Timeout);
 
-connect({ossl, SslConfig}, {Host, Port}, _, Timeout) ->
-    Opts = [binary, {active, false}, {ssl_imp, old}] ++ SslConfig,
-    ?hlrt("connect using ossl", 
-	  [{host,       Host}, 
-	   {port,       Port}, 
-	   {ssl_config, SslConfig}, 
-	   {timeout,    Timeout}]),
-    case (catch ssl:connect(Host, Port, Opts, Timeout)) of
-	{'EXIT', Reason} ->
-	    {error, {eoptions, Reason}};
-	{ok, _} = OK ->
-	    OK;
-	{error, _} = ERROR ->
-	    ERROR
-    end;
-
 connect({essl, SslConfig}, {Host, Port}, Opts0, Timeout) -> 
     Opts = [binary, {active, false}, {ssl_imp, new} | Opts0] ++ SslConfig,
     ?hlrt("connect using essl", 
@@ -187,13 +169,6 @@ listen({ssl, SSLConfig}, Addr, Port) ->
 	   {ssl_config, SSLConfig}]),
     listen({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Addr, Port);
 
-listen({ossl, SSLConfig}, Addr, Port) ->
-    ?hlrt("listen (ossl)", 
-	  [{addr,       Addr}, 
-	   {port,       Port}, 
-	   {ssl_config, SSLConfig}]),
-    listen_ssl(Addr, Port, [{ssl_imp, old} | SSLConfig]);
-
 listen({essl, SSLConfig}, Addr, Port) ->
     ?hlrt("listen (essl)", 
 	  [{addr,       Addr}, 
@@ -353,8 +328,6 @@ accept(ip_comm, ListenSocket, Timeout) ->
 accept({ssl, SSLConfig}, ListenSocket, Timeout) ->
     accept({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, ListenSocket, Timeout);
 
-accept({ossl, _SSLConfig}, ListenSocket, Timeout) ->
-    ssl:transport_accept(ListenSocket, Timeout);
 accept({essl, _SSLConfig}, ListenSocket, Timeout) ->
     ssl:transport_accept(ListenSocket, Timeout).
 
@@ -374,9 +347,6 @@ controlling_process(ip_comm, Socket, NewOwner) ->
 controlling_process({ssl, SSLConfig}, Socket, NewOwner) ->
     controlling_process({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, NewOwner);
 
-controlling_process({ossl, _}, Socket, NewOwner) ->
-    ssl:controlling_process(Socket, NewOwner);
-
 controlling_process({essl, _}, Socket, NewOwner) ->
     ssl:controlling_process(Socket, NewOwner).
 
@@ -397,13 +367,6 @@ setopts(ip_comm, Socket, Options) ->
 setopts({ssl, SSLConfig}, Socket, Options) ->
     setopts({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, Options);
 
-setopts({ossl, _}, Socket, Options) ->
-    ?hlrt("[o]ssl setopts", [{socket, Socket}, {options, Options}]),
-    Reason = (catch ssl:setopts(Socket, Options)),
-    ?hlrt("[o]ssl setopts result", [{reason, Reason}]),
-    Reason;
-	
-
 setopts({essl, _}, Socket, Options) ->
     ?hlrt("[e]ssl setopts", [{socket, Socket}, {options, Options}]),
     Reason = (catch ssl:setopts(Socket, Options)),
@@ -435,10 +398,6 @@ getopts(ip_comm, Socket, Options) ->
 getopts({ssl, SSLConfig}, Socket, Options) ->
     getopts({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, Options);
 
-getopts({ossl, _}, Socket, Options) ->
-    ?hlrt("ssl getopts", [{socket, Socket}, {options, Options}]),
-    getopts_ssl(Socket, Options);
-
 getopts({essl, _}, Socket, Options) ->
     ?hlrt("essl getopts", [{socket, Socket}, {options, Options}]),
     getopts_ssl(Socket, Options).
@@ -472,9 +431,6 @@ getstat(ip_comm = _SocketType, Socket) ->
 getstat({ssl, SSLConfig}, Socket) ->
     getstat({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket);
 
-getstat({ossl, _} = _SocketType, _Socket) ->
-    [];
-
 getstat({essl, _} = _SocketType, _Socket) ->
     [].
 
@@ -493,9 +449,6 @@ send(ip_comm, Socket, Message) ->
 send({ssl, SSLConfig}, Socket, Message) ->
     send({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, Message);
 
-send({ossl, _}, Socket, Message) ->
-    ssl:send(Socket, Message);
-
 send({essl, _}, Socket, Message) ->
     ssl:send(Socket, Message).
 
@@ -514,9 +467,6 @@ close(ip_comm, Socket) ->
 close({ssl, SSLConfig}, Socket) ->
     close({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket);
 
-close({ossl, _}, Socket) ->
-    ssl:close(Socket);
-
 close({essl, _}, Socket) ->
     ssl:close(Socket).
 
@@ -538,9 +488,6 @@ peername(ip_comm, Socket) ->
 peername({ssl, SSLConfig}, Socket) ->
     peername({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket);
 
-peername({ossl, _}, Socket) ->
-    do_peername(ssl:peername(Socket));
-
 peername({essl, _}, Socket) ->
     do_peername(ssl:peername(Socket)).
 
@@ -573,9 +520,6 @@ sockname(ip_comm, Socket) ->
 sockname({ssl, SSLConfig}, Socket) ->
     sockname({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket);
 
-sockname({ossl, _}, Socket) ->
-    do_sockname(ssl:sockname(Socket));
-
 sockname({essl, _}, Socket) ->
     do_sockname(ssl:sockname(Socket)).
 
@@ -651,9 +595,6 @@ negotiate(ip_comm,_,_) ->
 negotiate({ssl, SSLConfig}, Socket, Timeout) ->
     ?hlrt("negotiate(ssl)", []),
     negotiate({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, Timeout);
-negotiate({ossl, _}, Socket, Timeout) ->
-    ?hlrt("negotiate(ossl)", []),
-    negotiate_ssl(Socket, Timeout);
 negotiate({essl, _}, Socket, Timeout) ->
     ?hlrt("negotiate(essl)", []),
     negotiate_ssl(Socket, Timeout).
diff --git a/lib/inets/src/http_lib/http_util.erl b/lib/inets/src/http_lib/http_util.erl
index 5511ed388d..973600d7be 100644
--- a/lib/inets/src/http_lib/http_util.erl
+++ b/lib/inets/src/http_lib/http_util.erl
@@ -104,6 +104,22 @@ convert_netscapecookie_date([_D,_A,_Y, $ ,
     Sec       = list_to_integer([S1,S2]),
     {{Year,Month,Day},{Hour,Min,Sec}};
 
+%% Example: Tue Jan 01 08:00:01 2036 GMT
+convert_netscapecookie_date([_D,_A,_Y, $ ,
+			     M,O,N, $ ,
+			     D1,D2, $ ,
+			     H1,H2, $:,
+			     M1,M2, $:,
+			     S1,S2, $ ,
+			     Y1,Y2,Y3,Y4, $ |_Rest]) -> 
+    Year  = list_to_integer([Y1,Y2,Y3,Y4]),
+    Day   = list_to_integer([D1,D2]),
+    Month = convert_month([M,O,N]),
+    Hour  = list_to_integer([H1,H2]),
+    Min   = list_to_integer([M1,M2]),
+    Sec   = list_to_integer([S1,S2]),
+    {{Year,Month,Day},{Hour,Min,Sec}};
+
 %% Sloppy...
 convert_netscapecookie_date([_D,_A,_Y, $,, _SP,
                              D1,D2,_DA,
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index f4d8a6c09f..7646300409 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -219,9 +219,8 @@ load("ServerName " ++ ServerName, []) ->
 
 load("SocketType " ++ SocketType, []) ->
     %% ssl is the same as HTTP_DEFAULT_SSL_KIND
-    %% ossl is ssl based on OpenSSL (the "old" ssl)
     %% essl is the pure Erlang-based ssl (the "new" ssl)
-    case check_enum(clean(SocketType), ["ssl", "ossl", "essl", "ip_comm"]) of
+    case check_enum(clean(SocketType), ["ssl", "essl", "ip_comm"]) of
 	{ok, ValidSocketType} ->
 	    {ok, [], {socket_type, ValidSocketType}};
 	{error,_} ->
@@ -305,7 +304,7 @@ load("MaxKeepAliveRequests " ++  MaxRequests, []) ->
 			  " is an invalid MaxKeepAliveRequests")}
     end;
 
-%% This clause is keept for backwards compability 
+%% This clause is kept for backwards compatibility
 load("MaxKeepAliveRequest " ++  MaxRequests, []) ->
     case make_integer(MaxRequests) of
 	{ok, Integer} ->
@@ -541,7 +540,6 @@ validate_config_params([{server_name, Value} | _]) ->
 validate_config_params([{socket_type, Value} | Rest]) 
   when (Value =:= ip_comm) orelse 
        (Value =:= ssl) orelse 
-       (Value =:= ossl) orelse 
        (Value =:= essl) ->
     validate_config_params(Rest);
 validate_config_params([{socket_type, Value} | _]) ->
@@ -811,7 +809,7 @@ lookup_socket_type(ConfigDB) ->
     case httpd_util:lookup(ConfigDB, socket_type, ip_comm) of
 	ip_comm ->
 	    ip_comm;
-	SSL when (SSL =:= ssl) orelse (SSL =:= ossl) orelse (SSL =:= essl) ->
+	SSL when (SSL =:= ssl) orelse (SSL =:= essl) ->
 	    SSLTag = 
 		if
 		    (SSL =:= ssl) ->
diff --git a/lib/inets/src/http_server/httpd_esi.erl b/lib/inets/src/http_server/httpd_esi.erl
index 026ec9a5fe..000874d0a3 100644
--- a/lib/inets/src/http_server/httpd_esi.erl
+++ b/lib/inets/src/http_server/httpd_esi.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -39,7 +39,7 @@
 %% body part. Note that it is presumed that <Data> starts with a
 %% string including "\r\n\r\n" if there is any header information
 %% present. The returned headers will not contain the HTTP header body
-%% delimiter \r\n. (All header, header delimiters are keept.)
+%% delimiter \r\n. (All header, header delimiters are kept.)
 %% Ex: ["Content-Type : text/html\r\n Connection : closing \r\n\r\n" | 
 %% io_list()] -->  {"Content-Type : text/html\r\n Connection : closing \r\n",
 %% io_list()}
diff --git a/lib/inets/src/http_server/httpd_file.erl b/lib/inets/src/http_server/httpd_file.erl
index ccc1f7874a..e8a8ab6411 100644
--- a/lib/inets/src/http_server/httpd_file.erl
+++ b/lib/inets/src/http_server/httpd_file.erl
@@ -33,7 +33,7 @@ handle_error(enotdir, Op, ModData, Path) ->
     handle_error(404, Op, ModData, Path,
 	         ": A component of the file name is not a directory");
 handle_error(emfile, Op, _ModData, Path) ->
-    handle_error(500, Op, none, Path, ": To many open files");
+    handle_error(500, Op, none, Path, ": Too many open files");
 handle_error({enfile,_}, Op, _ModData, Path) ->
     handle_error(500, Op, none, Path, ": File table overflow");
 handle_error(_Reason, Op, ModData, Path) ->
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index 7084d9824a..a04bcc2778 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -312,8 +312,8 @@ validate_uri(RequestURI) ->
 	{'EXIT',_Reason} ->
 	    {error, {bad_request, {malformed_syntax, RequestURI}}};
 	_ ->
-	    Path = format_request_uri(UriNoQueryNoHex),
-	    Path2=[X||X<-string:tokens(Path, "/"),X=/="."], %% OTP-5938
+	    Path  = format_request_uri(UriNoQueryNoHex),
+	    Path2 = [X||X<-string:tokens(Path, "/\\"),X=/="."], 
 	    validate_path( Path2,0, RequestURI)
     end.
 
diff --git a/lib/inets/src/http_server/mod_auth_mnesia.erl b/lib/inets/src/http_server/mod_auth_mnesia.erl
index ffe028617b..91beb0e062 100644
--- a/lib/inets/src/http_server/mod_auth_mnesia.erl
+++ b/lib/inets/src/http_server/mod_auth_mnesia.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -55,7 +55,7 @@ store_directory_data(_Directory, _DirData, _Server_root) ->
 %% API
 %%
 
-%% Compability API
+%% Compatibility API
 
 store_user(UserName, Password, Port, Dir, _AccessPassword) ->
    %% AccessPassword is ignored - was not used in previous version
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index cb036157a5..4d0defb329 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -34,8 +34,7 @@
             ftp_sup,
             
             %% HTTP client:
-            http,    %% Old client API module
-            httpc,   %% New client API module
+            httpc, 
             httpc_handler,
 	    httpc_handler_sup,	
             httpc_manager,
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 8b0fcb185d..e6d315819c 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,65 +18,37 @@
 
 {"%VSN%",
  [
-  {"5.6", 
-   [
-    {load_module, httpc, soft_purge, soft_purge, [httpc_manager]}, 
-    {load_module, http_transport, soft_purge, soft_purge, [http_transport]},
-    {update, httpc_handler, soft, soft_purge, soft_purge, []}, 
-    {update, httpc_manager, soft, soft_purge, soft_purge, [httpc_handler]}, 
-    {update, ftp, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"5.5.2", 
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.5.1", 
+  {"5.7.1", 
    [
     {restart_application, inets}
    ]
   }, 
-  {"5.5",
+  {"5.7", 
    [
     {restart_application, inets}
    ]
   }, 
-  {"5.4",
+  {"5.6", 
    [
     {restart_application, inets}
    ]
   } 
  ],
  [
-  {"5.6", 
-   [
-    {load_module, httpc, soft_purge, soft_purge, [httpc_manager]}, 
-    {load_module, http_transport, soft_purge, soft_purge, [http_transport]},
-    {update, httpc_handler, soft, soft_purge, soft_purge, []}, 
-    {update, httpc_manager, soft, soft_purge, soft_purge, [httpc_handler]}, 
-    {update, ftp, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"5.5.2",
-   [
-    {restart_application, inets}
-   ]
-  },
-  {"5.5.1", 
+  {"5.7.1", 
    [
     {restart_application, inets}
    ]
   }, 
-  {"5.5",
+  {"5.7", 
    [
     {restart_application, inets}
    ]
-  },     
-  {"5.4",
+  }, 
+  {"5.6", 
    [
     {restart_application, inets}
    ]
-  }     
+  } 
  ]
 }.
diff --git a/lib/inets/src/inets_app/inets_service.erl b/lib/inets/src/inets_app/inets_service.erl
index e9eb9892f2..f89dac195c 100644
--- a/lib/inets/src/inets_app/inets_service.erl
+++ b/lib/inets/src/inets_app/inets_service.erl
@@ -20,24 +20,20 @@
 
 -module(inets_service).
 
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) ->
-    [{start_standalone,         1}, 
-     {start_service,            1},
-     {stop_service,             1},
-     {services,                 0},
-     {service_info,             1}];
-behaviour_info(_) ->
-    undefined.
-
 %% Starts service stand-alone
 %% start_standalone(Config) ->  % {ok, Pid} | {error, Reason}
 %%    <service>:start_link(Config).
 
+-callback start_standalone(Config :: term()) ->
+    {ok, pid()} | {error, Reason :: term()}.
+
 %% Starts service as part of inets
 %% start_service(Config) -> % {ok, Pid} | {error, Reason}
 %%    <service_sup>:start_child(Config).
+
+-callback start_service(Config :: term()) ->
+    {ok, pid()} | {error, Reason :: term()}.
+
 %% Stop service
 %% stop_service(Pid) ->  % ok | {error, Reason}   
 %%   <service_sup>:stop_child(maybe_map_pid_to_other_ref(Pid)).
@@ -51,6 +47,9 @@ behaviour_info(_) ->
 %%            Error
 %%    end.
 
+-callback stop_service(Service :: term()) ->
+    ok | {error, Reason :: term()}.
+
 %% Returns list of running services. Services started as stand alone
 %% are not listed 
 %% services() -> % [{Service, Pid}] 
@@ -59,7 +58,12 @@ behaviour_info(_) ->
 %%   [{httpc, Pid} || {_, Pid, _, _} <- 
 %%			supervisor:which_children(httpc_profile_sup)].
 
+-callback services() ->
+    [{Service :: term(), pid()}].
 
-%% service_info() -> [{Property, Value}] | {error, Reason}
+%% service_info() -> {ok, [{Property, Value}]} | {error, Reason}
 %% ex: httpc:service_info() -> [{profile, ProfileName}] 
 %%     httpd:service_info() -> [{host, Host}, {port, Port}]
+
+-callback service_info(Service :: term()) ->
+    {ok, [{Property :: term(), Value :: term()}]} | {error, Reason :: term()}.
diff --git a/lib/inets/src/tftp/tftp.erl b/lib/inets/src/tftp/tftp.erl
index bfdb4c0030..b33c0a98f4 100644
--- a/lib/inets/src/tftp/tftp.erl
+++ b/lib/inets/src/tftp/tftp.erl
@@ -215,8 +215,6 @@
 	 start/0
 	]).
 
--export([behaviour_info/1]).
-
 %% Application local functions
 -export([
 	 start_standalone/1,
@@ -227,13 +225,50 @@
 	]).
 
 
-behaviour_info(callbacks) ->
-    [{prepare, 6}, {open, 6}, {read, 1}, {write, 2}, {abort, 3}];
-behaviour_info(_) ->
-    undefined.
+-type peer() :: {PeerType :: inet | inet6,
+		 PeerHost :: inet:ip_address(),
+		 PeerPort :: port()}.
+
+-type access() :: read | write.
+
+-type options() :: [{Key :: string(), Value :: string()}].
+
+-type error_code() :: undef | enoent | eacces | enospc |
+		      badop | eexist | baduser | badopt |
+		      integer().
+
+-callback prepare(Peer :: peer(),
+		  Access :: access(),
+		  Filename :: file:name(),
+		  Mode :: string(),
+		  SuggestedOptions :: options(),
+		  InitialState :: [] | [{root_dir, string()}]) ->
+    {ok, AcceptedOptions :: options(), NewState :: term()} |
+    {error, {Code :: error_code(), string()}}.
+
+-callback open(Peer :: peer(),
+	       Access :: access(),
+	       Filename :: file:name(),
+	       Mode :: string(),
+	       SuggestedOptions :: options(),
+	       State :: [] | [{root_dir, string()}] | term()) ->
+    {ok, AcceptedOptions :: options(), NewState :: term()} |
+    {error, {Code :: error_code(), string()}}.
+
+-callback read(State :: term()) -> {more, binary(), NewState :: term()} |
+				   {last, binary(), integer()} |
+				   {error, {Code :: error_code(), string()}}.
+
+-callback write(binary(), State :: term()) ->
+    {more, NewState :: term()} |
+    {last, FileSize :: integer()} |
+    {error, {Code :: error_code(), string()}}.
+
+-callback abort(Code :: error_code(), string(), State :: term()) -> 'ok'.
 
 -include("tftp.hrl").
 
+
 %%-------------------------------------------------------------------
 %% read_file(RemoteFilename, LocalFilename, Options) ->
 %%   {ok, LastCallbackState} | {error, Reason}
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index 931ac6e024..04c7358715 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -584,7 +584,9 @@ convert_netscapecookie_date(Config) when is_list(Config) ->
 	http_util:convert_netscapecookie_date("Sun, 12-Dec-06 08:59:38 GMT"),
     {{2006,12,12},{8,59,38}} = 
 	http_util:convert_netscapecookie_date("Sun 12-Dec-06 08:59:38 GMT"),
-     ok.
+    {{2036,1,1},{8,0,1}} = 
+	http_util:convert_netscapecookie_date("Tue Jan 01 08:00:01 2036 GMT"),
+    ok.
 
 %%--------------------------------------------------------------------
 %%% Internal functions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 6edd5371af..f95fb93669 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -113,13 +113,10 @@ groups() ->
 		    proxy_page_does_not_exist,
 		    proxy_https_not_supported]}, 
      {ssl,     [], [ssl_head, 
-		    ossl_head, 
 		    essl_head, 
 		    ssl_get, 
-		    ossl_get,
 		    essl_get, 
 		    ssl_trace, 
-		    ossl_trace, 
 		    essl_trace]}, 
      {stream,  [], [http_stream,
 		    http_stream_once, 
@@ -273,10 +270,6 @@ init_per_testcase(Case, Timeout, Config) ->
 		init_per_testcase_ssl(ssl, PrivDir, SslConfFile, 
 				      [{watchdog, Dog} | TmpConfig]);
 
-	    [$o, $s, $s, $l | _] ->
-		init_per_testcase_ssl(ossl, PrivDir, SslConfFile, 
-				      [{watchdog, Dog} | TmpConfig]);
-
 	    [$e, $s, $s, $l | _] ->
 		init_per_testcase_ssl(essl, PrivDir, SslConfFile, 
 				      [{watchdog, Dog} | TmpConfig]);
@@ -1076,13 +1069,6 @@ ssl_head(suite) ->
 ssl_head(Config) when is_list(Config) ->   
     ssl_head(ssl, Config).
 
-ossl_head(doc) ->
-    ["Same as http_head/1 but over ssl sockets."];
-ossl_head(suite) ->
-    [];
-ossl_head(Config) when is_list(Config) ->   
-    ssl_head(ossl, Config).
-
 essl_head(doc) ->
     ["Same as http_head/1 but over ssl sockets."];
 essl_head(suite) ->
@@ -1105,8 +1091,6 @@ ssl_head(SslTag, Config) ->
 		case SslTag of
 		    ssl ->
 			SSLOptions;
-		    ossl ->
-			{ossl, SSLOptions};
 		    essl ->
 			{essl, SSLOptions}
 		end,
@@ -1131,13 +1115,6 @@ ssl_get(suite) ->
 ssl_get(Config) when is_list(Config) ->
     ssl_get(ssl, Config).
 
-ossl_get(doc) ->
-    ["Same as http_get/1 but over ssl sockets."];
-ossl_get(suite) ->
-    [];
-ossl_get(Config) when is_list(Config) ->
-    ssl_get(ossl, Config).
-
 essl_get(doc) ->
     ["Same as http_get/1 but over ssl sockets."];
 essl_get(suite) ->
@@ -1157,8 +1134,6 @@ ssl_get(SslTag, Config) when is_list(Config) ->
 		case SslTag of
 		    ssl ->
 			SSLOptions;
-		    ossl ->
-			{ossl, SSLOptions};
 		    essl ->
 			{essl, SSLOptions}
 		end,
@@ -1184,13 +1159,6 @@ ssl_trace(suite) ->
 ssl_trace(Config) when is_list(Config) ->
     ssl_trace(ssl, Config).
 
-ossl_trace(doc) ->
-    ["Same as http_trace/1 but over ssl sockets."];
-ossl_trace(suite) ->
-    [];
-ossl_trace(Config) when is_list(Config) ->
-    ssl_trace(ossl, Config).
-
 essl_trace(doc) ->
     ["Same as http_trace/1 but over ssl sockets."];
 essl_trace(suite) ->
@@ -1210,8 +1178,6 @@ ssl_trace(SslTag, Config) when is_list(Config) ->
 		case SslTag of
 		    ssl ->
 			SSLOptions;
-		    ossl ->
-			{ossl, SSLOptions};
 		    essl ->
 			{essl, SSLOptions}
 		end,
@@ -3038,10 +3004,6 @@ dummy_server_init(Caller, essl, IpV, SSLOptions) ->
     BaseOpts = [{ssl_imp, new}, 
 		{backlog, 128}, binary, {reuseaddr,true}, {active, false} |
 	        SSLOptions], 
-    dummy_ssl_server_init(Caller, BaseOpts, IpV);
-dummy_server_init(Caller, ossl, IpV, SSLOptions) ->
-    BaseOpts = [{ssl_imp, old}, 
-		{backlog, 128}, binary, {active, false} | SSLOptions], 
     dummy_ssl_server_init(Caller, BaseOpts, IpV).
 
 dummy_ssl_server_init(Caller, BaseOpts, IpV) ->
diff --git a/lib/inets/test/httpc_cookie_SUITE.erl b/lib/inets/test/httpc_cookie_SUITE.erl
index feef5f1eea..93dbc270c5 100644
--- a/lib/inets/test/httpc_cookie_SUITE.erl
+++ b/lib/inets/test/httpc_cookie_SUITE.erl
@@ -55,7 +55,7 @@ init_per_testcase(session_cookies_only = Case, Config0) ->
 	"~n   Config0: ~p", [Case, Config0]),
     Config = init_workdir(Case, Config0), 
     application:start(inets), 
-    http:set_options([{cookies, verify}]),
+    httpc:set_options([{cookies, verify}]),
     watch_dog(Config);
 
 init_per_testcase(Case, Config0) ->
@@ -66,7 +66,7 @@ init_per_testcase(Case, Config0) ->
     application:load(inets),
     application:set_env(inets, services, [{httpc, {default, CaseDir}}]),
     application:start(inets), 
-    http:set_options([{cookies, verify}]),
+    httpc:set_options([{cookies, verify}]),
     watch_dog(Config).
 
 watch_dog(Config) ->
@@ -119,10 +119,18 @@ end_per_testcase(Case, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [session_cookies_only, netscape_cookies, cookie_cancel,
-     cookie_expires, persistent_cookie, domain_cookie,
-     secure_cookie, update_cookie, update_cookie_session,
-     cookie_attributes].
+    [
+     session_cookies_only, 
+     netscape_cookies, 
+     cookie_cancel,
+     cookie_expires, 
+     persistent_cookie, 
+     domain_cookie,
+     secure_cookie, 
+     update_cookie, 
+     update_cookie_session,
+     cookie_attributes
+    ].
 
 groups() -> 
     [].
@@ -152,12 +160,12 @@ session_cookies_only(Config) when is_list(Config) ->
 
     SetCookieHeaders = [{"set-cookie", "test_cookie=true; path=/;" 
 			 ";max-age=60000"}],
-    http:verify_cookies(SetCookieHeaders, ?URL),
-     {"cookie","$Version=0; test_cookie=true; $Path=/"}
-	= http:cookie_header(?URL),
+    httpc:store_cookies(SetCookieHeaders, ?URL),
+    {"cookie", "$Version=0; test_cookie=true; $Path=/"} = 
+	httpc:cookie_header(?URL),
     application:stop(inets),
     application:start(inets),
-    {"cookie",""} = http:cookie_header(?URL),
+    {"cookie", ""} = httpc:cookie_header(?URL),
 
     tsp("session_cookies_only -> Cookies 2: ~p", [httpc:which_cookies()]),
     ok.
@@ -172,9 +180,9 @@ netscape_cookies(Config) when is_list(Config) ->
     Expires = future_netscape_date(),
     SetCookieHeaders = [{"set-cookie", "test_cookie=true; path=/; " 
 			 "expires=" ++ Expires}],
-    http:verify_cookies(SetCookieHeaders, ?URL),
-    {"cookie","$Version=0; test_cookie=true; $Path=/"} = 
-	http:cookie_header(?URL),
+    httpc:store_cookies(SetCookieHeaders, ?URL),
+    {"cookie", "$Version=0; test_cookie=true; $Path=/"} = 
+	httpc:cookie_header(?URL),
 
     tsp("netscape_cookies -> Cookies 2: ~p", [httpc:which_cookies()]),
     ok.
@@ -189,13 +197,13 @@ cookie_cancel(Config) when is_list(Config) ->
 
     SetCookieHeaders = [{"set-cookie", "test_cookie=true; path=/;" 
 			 "max-age=60000"}],
-    http:verify_cookies(SetCookieHeaders, ?URL),
-    {"cookie","$Version=0; test_cookie=true; $Path=/"}
-	= http:cookie_header(?URL),
-    NewSetCookieHeaders = [{"set-cookie", "test_cookie=true; path=/;" 
-			    "max-age=0"}],
-    http:verify_cookies(NewSetCookieHeaders, ?URL),
-    {"cookie", ""} = http:cookie_header(?URL),
+    httpc:store_cookies(SetCookieHeaders, ?URL),
+    {"cookie", "$Version=0; test_cookie=true; $Path=/"} = 
+	httpc:cookie_header(?URL),
+    NewSetCookieHeaders = 
+	[{"set-cookie", "test_cookie=true; path=/;max-age=0"}],
+    httpc:store_cookies(NewSetCookieHeaders, ?URL),
+    {"cookie", ""} = httpc:cookie_header(?URL),
 
     tsp("cookie_cancel -> Cookies 2: ~p", [httpc:which_cookies()]),
     ok.
@@ -209,11 +217,11 @@ cookie_expires(Config) when is_list(Config) ->
 
     SetCookieHeaders = [{"set-cookie", "test_cookie=true; path=/;" 
 			 "max-age=5"}],
-    http:verify_cookies(SetCookieHeaders, ?URL),
-    {"cookie","$Version=0; test_cookie=true; $Path=/"}
-	= http:cookie_header(?URL),
+    httpc:store_cookies(SetCookieHeaders, ?URL),
+    {"cookie", "$Version=0; test_cookie=true; $Path=/"} = 
+	httpc:cookie_header(?URL),
     test_server:sleep(10000),
-    {"cookie", ""} = http:cookie_header(?URL),
+    {"cookie", ""} = httpc:cookie_header(?URL),
 
     tsp("cookie_expires -> Cookies 2: ~p", [httpc:which_cookies()]),
     ok.
@@ -227,16 +235,16 @@ persistent_cookie(Config) when is_list(Config)->
 
     SetCookieHeaders = [{"set-cookie", "test_cookie=true; path=/;" 
 			 "max-age=60000"}],
-    http:verify_cookies(SetCookieHeaders, ?URL),
-    {"cookie","$Version=0; test_cookie=true; $Path=/"} = 
-	http:cookie_header(?URL),
+    httpc:store_cookies(SetCookieHeaders, ?URL),
+    {"cookie", "$Version=0; test_cookie=true; $Path=/"} = 
+	httpc:cookie_header(?URL),
     CaseDir = ?config(case_top_dir, Config),
     application:stop(inets),
     application:load(inets),
     application:set_env(inets, services, [{httpc, {default, CaseDir}}]),
     application:start(inets), 
-    http:set_options([{cookies, enabled}]),
-    {"cookie","$Version=0; test_cookie=true; $Path=/"} = http:cookie_header(?URL),
+    httpc:set_options([{cookies, enabled}]),
+    {"cookie","$Version=0; test_cookie=true; $Path=/"} = httpc:cookie_header(?URL),
 
     tsp("persistent_cookie -> Cookies 2: ~p", [httpc:which_cookies()]),
     ok.
@@ -251,10 +259,10 @@ domain_cookie(Config) when is_list(Config) ->
 
     SetCookieHeaders = [{"set-cookie", "test_cookie=true; path=/;" 
 			 "domain=.cookie.test.org"}],
-    http:verify_cookies(SetCookieHeaders, ?URL),
+    httpc:store_cookies(SetCookieHeaders, ?URL),
     {"cookie","$Version=0; test_cookie=true; $Path=/; "
      "$Domain=.cookie.test.org"} = 
-	http:cookie_header(?URL_DOMAIN),
+	httpc:cookie_header(?URL_DOMAIN),
 
     tsp("domain_cookie -> Cookies 2: ~p", [httpc:which_cookies()]),
     ok.
@@ -275,8 +283,8 @@ secure_cookie(Config) when is_list(Config) ->
     tsp("secure_cookie -> Cookies 1: ~p", [httpc:which_cookies()]),
     
     SetCookieHeaders = [{"set-cookie", "test_cookie=true; path=/; secure"}],
-    tsp("secure_cookie -> verify cookies (1)"),
-    ok = http:verify_cookies(SetCookieHeaders, ?URL),
+    tsp("secure_cookie -> store cookies (1)"),
+    ok = httpc:store_cookies(SetCookieHeaders, ?URL),
 
     tsp("secure_cookie -> Cookies 2: ~p", [httpc:which_cookies()]),
 
@@ -286,9 +294,9 @@ secure_cookie(Config) when is_list(Config) ->
     tsp("secure_cookie -> check cookie (plain)"),
     check_cookie("", ?URL),
 
-    tsp("secure_cookie -> verify cookies (2)"),
+    tsp("secure_cookie -> store cookies (2)"),
     SetCookieHeaders1 = [{"set-cookie", "test1_cookie=true; path=/; secure"}],
-    ok = http:verify_cookies(SetCookieHeaders1, ?URL),
+    ok = httpc:store_cookies(SetCookieHeaders1, ?URL),
 
     tsp("secure_cookie -> Cookies 3: ~p", [httpc:which_cookies()]),
 
@@ -297,7 +305,7 @@ secure_cookie(Config) when is_list(Config) ->
 		 "test1_cookie=true; $Path=/",
 		 ?URL_SECURE), 
 %%     {"cookie","$Version=0; test_cookie=true; $Path=/; "
-%%      "test1_cookie=true; $Path=/"} = http:cookie_header(?URL_SECURE),
+%%      "test1_cookie=true; $Path=/"} = httpc:cookie_header(?URL_SECURE),
 
     tsp("secure_cookie -> Cookies 4: ~p", [httpc:which_cookies()]),
 
@@ -305,38 +313,93 @@ secure_cookie(Config) when is_list(Config) ->
     tsp("secure_cookie -> done"),
     ok.
     
+expect_cookie_header(No, ExpectedCookie) ->
+    case httpc:cookie_header(?URL) of
+	{"cookie", ExpectedCookie} ->
+	    ok;
+    	{"cookie", BadCookie} ->
+	    io:format("Bad Cookie ~w: "
+		      "~n   Expected: ~s"
+		      "~n   Received: ~s"
+		      "~n", [No, ExpectedCookie, BadCookie]),
+	    exit({bad_cookie_header, No, ExpectedCookie, BadCookie})
+    end.
+
+print_cookies(Pre) ->
+    io:format("~s: ", [Pre]),
+    print_cookies2(httpc:which_cookies()).
+
+print_cookies2([]) ->
+    ok;
+print_cookies2([{cookies, Cookies}|Rest]) ->
+    print_cookies3("Cookies", Cookies),
+    print_cookies2(Rest);
+print_cookies2([{session_cookies, Cookies}|Rest]) ->
+    print_cookies3("Session Cookies", Cookies),
+    print_cookies2(Rest);
+print_cookies2([_|Rest]) ->
+    print_cookies2(Rest).
+
+print_cookies3(Header, []) ->
+    io:format("   ~s: []", [Header]);
+print_cookies3(Header, Cookies) ->
+    io:format("   ~s: ", [Header]),
+    Prefix      = "      ", 
+    PrintCookie = 
+	fun(Cookie) -> 
+		io:format("~s", [httpc_cookie:image_of(Prefix, Cookie)]) 
+	end, 
+    lists:foreach(PrintCookie, Cookies).
+
 update_cookie(doc)->
-    ["Test that a cookie can be updated."];
+    ["Test that a (plain) cookie can be updated."];
 update_cookie(suite) ->
     [];
-update_cookie(Config) when is_list(Config)->
-    SetCookieHeaders = [{"set-cookie", "test_cookie=true; path=/;"
-			 "max-age=6500"},
-			{"set-cookie", "test_cookie2=true; path=/;"
-			 "max-age=6500"}],
-    http:verify_cookies(SetCookieHeaders, ?URL),
-    {"cookie", "$Version=0; test_cookie2=true; $Path=/; "
-     "test_cookie=true; $Path=/"} = http:cookie_header(?URL),
-    NewSetCookieHeaders = [{"set-cookie", "test_cookie=false; "
-			    "path=/;max-age=6500"}],
-    http:verify_cookies(NewSetCookieHeaders, ?URL),
-    {"cookie", "$Version=0; test_cookie2=true; $Path=/; "
-     "test_cookie=false; $Path=/"} = http:cookie_header(?URL).
-    
+update_cookie(Config) when is_list(Config) ->
+    print_cookies("Cookies before store"),
+
+    SetCookieHeaders = 
+	[{"set-cookie", "test_cookie=true; path=/; max-age=6500"},
+	 {"set-cookie", "test_cookie2=true; path=/; max-age=6500"}],
+    httpc:store_cookies(SetCookieHeaders, ?URL),
+    print_cookies("Cookies after first store"),
+    ExpectCookie1 = 
+	"$Version=0; "
+	"test_cookie=true; $Path=/; "
+	"test_cookie2=true; $Path=/", 
+    expect_cookie_header(1, ExpectCookie1), 
+
+    NewSetCookieHeaders = 
+	[{"set-cookie", "test_cookie=false; path=/; max-age=6500"}],
+    httpc:store_cookies(NewSetCookieHeaders, ?URL),
+    print_cookies("Cookies after second store"),    
+    ExpectCookie2 = 
+	"$Version=0; "
+	"test_cookie2=true; $Path=/; "
+	"test_cookie=false; $Path=/", 
+    expect_cookie_header(2, ExpectCookie2).
+
 update_cookie_session(doc)->
-    ["Test that a cookie can be updated."];
+    ["Test that a session cookie can be updated."];
 update_cookie_session(suite) ->
     [];
 update_cookie_session(Config) when is_list(Config)->
+    print_cookies("Cookies before store"),
+
     SetCookieHeaders = [{"set-cookie", "test_cookie=true; path=/"},
 			{"set-cookie", "test_cookie2=true; path=/"}],
-    http:verify_cookies(SetCookieHeaders, ?URL),
-    {"cookie", "$Version=0; test_cookie2=true; $Path=/; "
-     "test_cookie=true; $Path=/"} = http:cookie_header(?URL),
+    httpc:store_cookies(SetCookieHeaders, ?URL),
+    print_cookies("Cookies after first store"),
+    ExpectedCookie1 = 
+	"$Version=0; test_cookie=true; $Path=/; test_cookie2=true; $Path=/",
+    expect_cookie_header(1, ExpectedCookie1), 
+
     NewSetCookieHeaders = [{"set-cookie", "test_cookie=false; path=/"}],
-    http:verify_cookies(NewSetCookieHeaders, ?URL),
-    {"cookie", "$Version=0; test_cookie2=true; $Path=/; "
-     "test_cookie=false; $Path=/"} = http:cookie_header(?URL).
+    httpc:store_cookies(NewSetCookieHeaders, ?URL),
+    print_cookies("Cookies after second store"),    
+    ExpectedCookie2 = 
+	"$Version=0; test_cookie2=true; $Path=/; test_cookie=false; $Path=/", 
+    expect_cookie_header(2, ExpectedCookie2).
     
 
 cookie_attributes(doc) -> 
@@ -348,8 +411,8 @@ cookie_attributes(Config) when is_list(Config) ->
 			 "comment=foobar; "%% Comment
 			 "foo=bar;" %% Nonsense should be ignored
 			 "max-age=60000"}],
-    http:verify_cookies(SetCookieHeaders, ?URL),
-    {"cookie","$Version=1; test_cookie=true"} = http:cookie_header(?URL),
+    httpc:store_cookies(SetCookieHeaders, ?URL),
+    {"cookie","$Version=1; test_cookie=true"} = httpc:cookie_header(?URL),
     ok.
 
 
@@ -358,7 +421,7 @@ cookie_attributes(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 
 check_cookie(Expect, URL) ->
-    case http:cookie_header(URL) of
+    case httpc:cookie_header(URL) of
 	{"cookie", Expect} ->
 	    ok;
 	{"cookie", Unexpected} ->
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index c4d4bf969b..faeed3b5f9 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -68,127 +68,96 @@
 
 -export([
 	 pssl_mod_alias/1, 
-	 ossl_mod_alias/1, 
 	 essl_mod_alias/1, 
 	 
 	 pssl_mod_actions/1, 
-	 ossl_mod_actions/1, 
 	 essl_mod_actions/1, 
 	 
 	 pssl_mod_security/1, 
-	 ossl_mod_security/1, 
 	 essl_mod_security/1, 
 	 
 	 pssl_mod_auth/1, 
-	 ossl_mod_auth/1, 
 	 essl_mod_auth/1, 
 
 	 pssl_mod_auth_api/1,  
-	 ossl_mod_auth_api/1,  
 	 essl_mod_auth_api/1,  
 	 
 	 pssl_mod_auth_mnesia_api/1, 
-	 ossl_mod_auth_mnesia_api/1, 
 	 essl_mod_auth_mnesia_api/1, 
 	 
 	 pssl_mod_htaccess/1, 
-	 ossl_mod_htaccess/1, 
 	 essl_mod_htaccess/1, 
 	 
 	 pssl_mod_cgi/1, 
-	 ossl_mod_cgi/1, 
 	 essl_mod_cgi/1,
  
 	 pssl_mod_esi/1, 
-	 ossl_mod_esi/1, 
 	 essl_mod_esi/1, 
 
 	 pssl_mod_get/1, 
-	 ossl_mod_get/1, 
 	 essl_mod_get/1, 
 
 	 pssl_mod_head/1, 
-	 ossl_mod_head/1, 
 	 essl_mod_head/1, 
 	 
 	 pssl_mod_all/1, 
-	 ossl_mod_all/1, 
 	 essl_mod_all/1, 
 	 
 	 pssl_load_light/1, 
-	 ossl_load_light/1, 
 	 essl_load_light/1, 
 	 
 	 pssl_load_medium/1, 
-	 ossl_load_medium/1, 
 	 essl_load_medium/1, 
 
 	 pssl_load_heavy/1, 
-	 ossl_load_heavy/1, 
 	 essl_load_heavy/1, 
 
 	 pssl_dos_hostname/1, 
-	 ossl_dos_hostname/1, 
 	 essl_dos_hostname/1, 
 
 	 pssl_time_test/1, 
-	 ossl_time_test/1, 
 	 essl_time_test/1,
 	 
 	 pssl_restart_no_block/1, 
-	 ossl_restart_no_block/1, 
 	 essl_restart_no_block/1, 
 	 
 	 pssl_restart_disturbing_block/1, 
-	 ossl_restart_disturbing_block/1, 
 	 essl_restart_disturbing_block/1,
 	 
 	 pssl_restart_non_disturbing_block/1, 
-	 ossl_restart_non_disturbing_block/1, 
 	 essl_restart_non_disturbing_block/1, 
 	 
 	 pssl_block_disturbing_idle/1, 
-	 ossl_block_disturbing_idle/1, 
 	 essl_block_disturbing_idle/1, 
 
 	 pssl_block_non_disturbing_idle/1, 
-	 ossl_block_non_disturbing_idle/1, 
 	 essl_block_non_disturbing_idle/1, 
 	 
 	 pssl_block_503/1, 
-	 ossl_block_503/1, 
 	 essl_block_503/1, 
 
 	 pssl_block_disturbing_active/1, 
-	 ossl_block_disturbing_active/1, 
 	 essl_block_disturbing_active/1, 
 
 	 pssl_block_non_disturbing_active/1, 
-	 ossl_block_non_disturbing_active/1, 
 	 essl_block_non_disturbing_active/1, 
 
 	 pssl_block_disturbing_active_timeout_not_released/1, 
-	 ossl_block_disturbing_active_timeout_not_released/1, 
 	 essl_block_disturbing_active_timeout_not_released/1, 
 
 	 pssl_block_disturbing_active_timeout_released/1, 
-	 ossl_block_disturbing_active_timeout_released/1, 
 	 essl_block_disturbing_active_timeout_released/1, 
 
 	 pssl_block_non_disturbing_active_timeout_not_released/1, 
-	 ossl_block_non_disturbing_active_timeout_not_released/1, 
 	 essl_block_non_disturbing_active_timeout_not_released/1, 
 	 
 	 pssl_block_non_disturbing_active_timeout_released/1, 
-	 ossl_block_non_disturbing_active_timeout_released/1, 
 	 essl_block_non_disturbing_active_timeout_released/1, 
 
 	 pssl_block_disturbing_blocker_dies/1, 
-	 ossl_block_disturbing_blocker_dies/1, 
 	 essl_block_disturbing_blocker_dies/1, 
 
 	 pssl_block_non_disturbing_blocker_dies/1, 
-	 ossl_block_non_disturbing_blocker_dies/1, 
 	 essl_block_non_disturbing_blocker_dies/1
 	]).
 
@@ -272,8 +241,7 @@ groups() ->
        ip_block_non_disturbing_active_timeout_released,
        ip_block_disturbing_blocker_dies,
        ip_block_non_disturbing_blocker_dies]},
-     {ssl, [],
-      [{group, pssl}, {group, ossl}, {group, essl}]},
+     {ssl, [], [{group, pssl}, {group, essl}]},
      {pssl, [],
       [pssl_mod_alias, pssl_mod_actions, pssl_mod_security,
        pssl_mod_auth, pssl_mod_auth_api,
@@ -293,25 +261,6 @@ groups() ->
        pssl_block_non_disturbing_active_timeout_released,
        pssl_block_disturbing_blocker_dies,
        pssl_block_non_disturbing_blocker_dies]},
-     {ossl, [],
-      [ossl_mod_alias, ossl_mod_actions, ossl_mod_security,
-       ossl_mod_auth, ossl_mod_auth_api,
-       ossl_mod_auth_mnesia_api, ossl_mod_htaccess,
-       ossl_mod_cgi, ossl_mod_esi, ossl_mod_get, ossl_mod_head,
-       ossl_mod_all, ossl_load_light, ossl_load_medium,
-       ossl_load_heavy, ossl_dos_hostname, ossl_time_test,
-       ossl_restart_no_block, ossl_restart_disturbing_block,
-       ossl_restart_non_disturbing_block,
-       ossl_block_disturbing_idle,
-       ossl_block_non_disturbing_idle, ossl_block_503,
-       ossl_block_disturbing_active,
-       ossl_block_non_disturbing_active,
-       ossl_block_disturbing_active_timeout_not_released,
-       ossl_block_disturbing_active_timeout_released,
-       ossl_block_non_disturbing_active_timeout_not_released,
-       ossl_block_non_disturbing_active_timeout_released,
-       ossl_block_disturbing_blocker_dies,
-       ossl_block_non_disturbing_blocker_dies]},
      {essl, [],
       [essl_mod_alias, essl_mod_actions, essl_mod_security,
        essl_mod_auth, essl_mod_auth_api,
@@ -493,7 +442,6 @@ init_per_testcase2(Case, Config) ->
 	    [X, $s, $s, $l | _] ->
 		case X of
 		    $p -> ssl;
-		    $o -> ossl;
 		    $e -> essl
 		end;
 	    _ ->
@@ -636,7 +584,6 @@ init_per_testcase3(Case, Config) ->
 		SslTag = 
 		    case X of
 			$p -> ssl;  % plain
-			$o -> ossl; % OpenSSL based ssl
 			$e -> essl  % Erlang based ssl
 		    end,
 		case inets_test_lib:start_http_server_ssl(
@@ -646,14 +593,13 @@ init_per_testcase3(Case, Config) ->
 		    ok ->
 			"mod_htaccess";
 		    Other ->
-			error_logger:info_report("Other: ~p~n", [Other]),
+			error_logger:info_msg("Other: ~p~n", [Other]),
 			{skip, "SSL does not seem to be supported"}
 		end;
 	    [X, $s, $s, $l, $_ | Rest] ->
 		SslTag = 
 		    case X of
 			$p -> ssl;
-			$o -> ossl;
 			$e -> essl
 		    end,
 		case inets_test_lib:start_http_server_ssl(
@@ -663,7 +609,7 @@ init_per_testcase3(Case, Config) ->
 		    ok ->
 			Rest;
 		    Other ->
-			error_logger:info_report("Other: ~p~n", [Other]),
+			error_logger:info_msg("Other: ~p~n", [Other]),
 			{skip, "SSL does not seem to be supported"}
 		end;
 	    "ipv6_" ++ _  = TestCaseStr ->
@@ -1158,13 +1104,6 @@ pssl_mod_alias(suite) ->
 pssl_mod_alias(Config) when is_list(Config) ->
     ssl_mod_alias(ssl, Config).
 
-ossl_mod_alias(doc) -> 
-    ["Module test: mod_alias - using new of configure old SSL"];
-ossl_mod_alias(suite) -> 
-    [];
-ossl_mod_alias(Config) when is_list(Config) ->
-    ssl_mod_alias(ossl, Config).
-
 essl_mod_alias(doc) -> 
     ["Module test: mod_alias - using new of configure new SSL"];
 essl_mod_alias(suite) -> 
@@ -1188,13 +1127,6 @@ pssl_mod_actions(suite) ->
 pssl_mod_actions(Config) when is_list(Config) ->
     ssl_mod_actions(ssl, Config).
 
-ossl_mod_actions(doc) -> 
-    ["Module test: mod_actions - using new of configure old SSL"];
-ossl_mod_actions(suite) -> 
-    [];
-ossl_mod_actions(Config) when is_list(Config) ->
-    ssl_mod_actions(ossl, Config).
-
 essl_mod_actions(doc) -> 
     ["Module test: mod_actions - using new of configure new SSL"];
 essl_mod_actions(suite) -> 
@@ -1220,13 +1152,6 @@ pssl_mod_security(suite) ->
 pssl_mod_security(Config) when is_list(Config) ->
     ssl_mod_security(ssl, Config).
 
-ossl_mod_security(doc) -> 
-    ["Module test: mod_security - using new of configure old SSL"];
-ossl_mod_security(suite) -> 
-    [];
-ossl_mod_security(Config) when is_list(Config) ->
-    ssl_mod_security(ossl, Config).
-
 essl_mod_security(doc) -> 
     ["Module test: mod_security - using new of configure new SSL"];
 essl_mod_security(suite) -> 
@@ -1253,13 +1178,6 @@ pssl_mod_auth(suite) ->
 pssl_mod_auth(Config) when is_list(Config) ->
     ssl_mod_auth(ssl, Config).
 
-ossl_mod_auth(doc) -> 
-    ["Module test: mod_auth - using new of configure old SSL"];
-ossl_mod_auth(suite) -> 
-    [];
-ossl_mod_auth(Config) when is_list(Config) ->
-    ssl_mod_auth(ossl, Config).
-
 essl_mod_auth(doc) -> 
     ["Module test: mod_auth - using new of configure new SSL"];
 essl_mod_auth(suite) -> 
@@ -1284,13 +1202,6 @@ pssl_mod_auth_api(suite) ->
 pssl_mod_auth_api(Config) when is_list(Config) ->
     ssl_mod_auth_api(ssl, Config).
 
-ossl_mod_auth_api(doc) -> 
-    ["Module test: mod_auth - using new of configure old SSL"];
-ossl_mod_auth_api(suite) -> 
-    [];
-ossl_mod_auth_api(Config) when is_list(Config) ->
-    ssl_mod_auth_api(ossl, Config).
-
 essl_mod_auth_api(doc) -> 
     ["Module test: mod_auth - using new of configure new SSL"];
 essl_mod_auth_api(suite) -> 
@@ -1317,13 +1228,6 @@ pssl_mod_auth_mnesia_api(suite) ->
 pssl_mod_auth_mnesia_api(Config) when is_list(Config) ->
     ssl_mod_auth_mnesia_api(ssl, Config).
 
-ossl_mod_auth_mnesia_api(doc) -> 
-    ["Module test: mod_auth_mnesia_api - using new of configure old SSL"];
-ossl_mod_auth_mnesia_api(suite) -> 
-    [];
-ossl_mod_auth_mnesia_api(Config) when is_list(Config) ->
-    ssl_mod_auth_mnesia_api(ossl, Config).
-
 essl_mod_auth_mnesia_api(doc) -> 
     ["Module test: mod_auth_mnesia_api - using new of configure new SSL"];
 essl_mod_auth_mnesia_api(suite) -> 
@@ -1348,13 +1252,6 @@ pssl_mod_htaccess(suite) ->
 pssl_mod_htaccess(Config) when is_list(Config) ->
     ssl_mod_htaccess(ssl, Config).
 
-ossl_mod_htaccess(doc) -> 
-    ["Module test: mod_htaccess - using new of configure old SSL"];
-ossl_mod_htaccess(suite) -> 
-    [];
-ossl_mod_htaccess(Config) when is_list(Config) ->
-    ssl_mod_htaccess(ossl, Config).
-
 essl_mod_htaccess(doc) -> 
     ["Module test: mod_htaccess - using new of configure new SSL"];
 essl_mod_htaccess(suite) -> 
@@ -1379,13 +1276,6 @@ pssl_mod_cgi(suite) ->
 pssl_mod_cgi(Config) when is_list(Config) ->
     ssl_mod_cgi(ssl, Config).
 
-ossl_mod_cgi(doc) ->
-    ["Module test: mod_cgi - using new of configure old SSL"];
-ossl_mod_cgi(suite) ->
-    [];
-ossl_mod_cgi(Config) when is_list(Config) ->
-    ssl_mod_cgi(ossl, Config).
-
 essl_mod_cgi(doc) ->
     ["Module test: mod_cgi - using new of configure new SSL"];
 essl_mod_cgi(suite) ->
@@ -1415,13 +1305,6 @@ pssl_mod_esi(suite) ->
 pssl_mod_esi(Config) when is_list(Config) ->
     ssl_mod_esi(ssl, Config).
 
-ossl_mod_esi(doc) ->
-    ["Module test: mod_esi - using new of configure old SSL"];
-ossl_mod_esi(suite) ->
-    [];
-ossl_mod_esi(Config) when is_list(Config) ->
-    ssl_mod_esi(ossl, Config).
-
 essl_mod_esi(doc) ->
     ["Module test: mod_esi - using new of configure new SSL"];
 essl_mod_esi(suite) ->
@@ -1446,13 +1329,6 @@ pssl_mod_get(suite) ->
 pssl_mod_get(Config) when is_list(Config) ->
     ssl_mod_get(ssl, Config).
 
-ossl_mod_get(doc) ->
-    ["Module test: mod_get - using new of configure old SSL"];
-ossl_mod_get(suite) ->
-    [];
-ossl_mod_get(Config) when is_list(Config) ->
-    ssl_mod_get(ossl, Config).
-
 essl_mod_get(doc) ->
     ["Module test: mod_get - using new of configure new SSL"];
 essl_mod_get(suite) ->
@@ -1477,13 +1353,6 @@ pssl_mod_head(suite) ->
 pssl_mod_head(Config) when is_list(Config) ->
     ssl_mod_head(ssl, Config).
 
-ossl_mod_head(doc) ->
-    ["Module test: mod_head - using new of configure old SSL"];
-ossl_mod_head(suite) ->
-    [];
-ossl_mod_head(Config) when is_list(Config) ->
-    ssl_mod_head(ossl, Config).
-
 essl_mod_head(doc) ->
     ["Module test: mod_head - using new of configure new SSL"];
 essl_mod_head(suite) ->
@@ -1508,13 +1377,6 @@ pssl_mod_all(suite) ->
 pssl_mod_all(Config) when is_list(Config) ->
     ssl_mod_all(ssl, Config).
 
-ossl_mod_all(doc) ->
-    ["All modules test - using new of configure old SSL"];
-ossl_mod_all(suite) ->
-    [];
-ossl_mod_all(Config) when is_list(Config) ->
-    ssl_mod_all(ossl, Config).
-
 essl_mod_all(doc) ->
     ["All modules test - using new of configure new SSL"];
 essl_mod_all(suite) ->
@@ -1539,13 +1401,6 @@ pssl_load_light(suite) ->
 pssl_load_light(Config) when is_list(Config) ->
     ssl_load_light(ssl, Config).
 
-ossl_load_light(doc) ->
-    ["Test light load - using new of configure old SSL"];
-ossl_load_light(suite) ->
-    [];
-ossl_load_light(Config) when is_list(Config) ->
-    ssl_load_light(ossl, Config).
-
 essl_load_light(doc) ->
     ["Test light load - using new of configure new SSL"];
 essl_load_light(suite) ->
@@ -1571,13 +1426,6 @@ pssl_load_medium(suite) ->
 pssl_load_medium(Config) when is_list(Config) ->
     ssl_load_medium(ssl, Config).
 
-ossl_load_medium(doc) ->
-    ["Test medium load - using new of configure old SSL"];
-ossl_load_medium(suite) ->
-    [];
-ossl_load_medium(Config) when is_list(Config) ->
-    ssl_load_medium(ossl, Config).
-
 essl_load_medium(doc) ->
     ["Test medium load - using new of configure new SSL"];
 essl_load_medium(suite) ->
@@ -1609,13 +1457,6 @@ pssl_load_heavy(suite) ->
 pssl_load_heavy(Config) when is_list(Config) ->
     ssl_load_heavy(ssl, Config).
 
-ossl_load_heavy(doc) ->
-    ["Test heavy load - using new of configure old SSL"];
-ossl_load_heavy(suite) ->
-    [];
-ossl_load_heavy(Config) when is_list(Config) ->
-    ssl_load_heavy(ossl, Config).
-
 essl_load_heavy(doc) ->
     ["Test heavy load - using new of configure new SSL"];
 essl_load_heavy(suite) ->
@@ -1647,13 +1488,6 @@ pssl_dos_hostname(suite) ->
 pssl_dos_hostname(Config) when is_list(Config) ->
     ssl_dos_hostname(ssl, Config).
 
-ossl_dos_hostname(doc) ->
-    ["Denial Of Service (DOS) attack test case - using new of configure old SSL"];
-ossl_dos_hostname(suite) ->
-    [];
-ossl_dos_hostname(Config) when is_list(Config) ->
-    ssl_dos_hostname(ossl, Config).
-
 essl_dos_hostname(doc) ->
     ["Denial Of Service (DOS) attack test case - using new of configure new SSL"];
 essl_dos_hostname(suite) ->
@@ -1679,13 +1513,6 @@ pssl_time_test(suite) ->
 pssl_time_test(Config) when is_list(Config) ->
     ssl_time_test(ssl, Config).
 
-ossl_time_test(doc) ->
-    ["using new of configure old SSL"];
-ossl_time_test(suite) ->
-    [];
-ossl_time_test(Config) when is_list(Config) ->
-    ssl_time_test(ossl, Config).
-
 essl_time_test(doc) ->
     ["using new of configure new SSL"];
 essl_time_test(suite) ->
@@ -1725,14 +1552,6 @@ pssl_block_503(suite) ->
 pssl_block_503(Config) when is_list(Config) ->
     ssl_block_503(ssl, Config).
 
-ossl_block_503(doc) ->
-    ["Check that you will receive status code 503 when the server"
-     " is blocked and 200 when its not blocked - using new of configure old SSL."];
-ossl_block_503(suite) ->
-    [];
-ossl_block_503(Config) when is_list(Config) ->
-    ssl_block_503(ossl, Config).
-
 essl_block_503(doc) ->
     ["Check that you will receive status code 503 when the server"
      " is blocked and 200 when its not blocked - using new of configure new SSL."];
@@ -1760,15 +1579,6 @@ pssl_block_disturbing_idle(suite) ->
 pssl_block_disturbing_idle(Config) when is_list(Config) ->
     ssl_block_disturbing_idle(ssl, Config).
 
-ossl_block_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "distribing does not really make a difference in this case." 
-     "Using new of configure old SSL"];
-ossl_block_disturbing_idle(suite) ->
-    [];
-ossl_block_disturbing_idle(Config) when is_list(Config) ->
-    ssl_block_disturbing_idle(ossl, Config).
-
 essl_block_disturbing_idle(doc) ->
     ["Check that you can block/unblock an idle server. The strategy " 
      "distribing does not really make a difference in this case." 
@@ -1797,15 +1607,6 @@ pssl_block_non_disturbing_idle(suite) ->
 pssl_block_non_disturbing_idle(Config) when is_list(Config) ->
     ssl_block_non_disturbing_idle(ssl, Config).
 
-ossl_block_non_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing does not really make a difference in this case." 
-     "Using new of configure old SSL"];
-ossl_block_non_disturbing_idle(suite) ->
-    [];
-ossl_block_non_disturbing_idle(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_idle(ossl, Config).
-
 essl_block_non_disturbing_idle(doc) ->
     ["Check that you can block/unblock an idle server. The strategy " 
      "non distribing does not really make a difference in this case." 
@@ -1834,15 +1635,6 @@ pssl_block_disturbing_active(suite) ->
 pssl_block_disturbing_active(Config) when is_list(Config) ->
     ssl_block_disturbing_active(ssl, Config).
 
-ossl_block_disturbing_active(doc) ->
-    ["Check that you can block/unblock an active server. The strategy " 
-     "distribing means ongoing requests should be terminated." 
-     "Using new of configure old SSL"];
-ossl_block_disturbing_active(suite) ->
-    [];
-ossl_block_disturbing_active(Config) when is_list(Config) ->
-    ssl_block_disturbing_active(ossl, Config).
-
 essl_block_disturbing_active(doc) ->
     ["Check that you can block/unblock an active server. The strategy " 
      "distribing means ongoing requests should be terminated." 
@@ -1871,15 +1663,6 @@ pssl_block_non_disturbing_active(suite) ->
 pssl_block_non_disturbing_active(Config) when is_list(Config) ->
     ssl_block_non_disturbing_active(ssl, Config).
 
-ossl_block_non_disturbing_active(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing means the ongoing requests should be compleated." 
-     "Using new of configure old SSL"];
-ossl_block_non_disturbing_active(suite) ->
-    [];
-ossl_block_non_disturbing_active(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_active(ossl, Config).
-
 essl_block_non_disturbing_active(doc) ->
     ["Check that you can block/unblock an idle server. The strategy " 
      "non distribing means the ongoing requests should be compleated." 
@@ -1910,17 +1693,6 @@ pssl_block_disturbing_active_timeout_not_released(Config)
   when is_list(Config) ->
     ssl_block_disturbing_active_timeout_not_released(ssl, Config).
 
-ossl_block_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be compleated"
-     "if the timeout does not occur." 
-    "Using new of configure old SSL"];
-ossl_block_disturbing_active_timeout_not_released(suite) ->
-    [];
-ossl_block_disturbing_active_timeout_not_released(Config) 
-  when is_list(Config) ->
-    ssl_block_disturbing_active_timeout_not_released(ossl, Config).
-
 essl_block_disturbing_active_timeout_not_released(doc) ->
     ["Check that you can block an active server. The strategy " 
      "distribing means ongoing requests should be compleated"
@@ -1954,17 +1726,6 @@ pssl_block_disturbing_active_timeout_released(Config)
   when is_list(Config) ->
     ssl_block_disturbing_active_timeout_released(ssl, Config).
 
-ossl_block_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be terminated when"
-     "the timeout occurs." 
-    "Using new of configure old SSL"];
-ossl_block_disturbing_active_timeout_released(suite) ->
-    [];
-ossl_block_disturbing_active_timeout_released(Config) 
-  when is_list(Config) ->
-    ssl_block_disturbing_active_timeout_released(ossl, Config).
-
 essl_block_disturbing_active_timeout_released(doc) ->
     ["Check that you can block an active server. The strategy " 
      "distribing means ongoing requests should be terminated when"
@@ -1999,16 +1760,6 @@ pssl_block_non_disturbing_active_timeout_not_released(Config)
   when is_list(Config) ->
     ssl_block_non_disturbing_active_timeout_not_released(ssl, Config).
 
-ossl_block_non_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed." 
-    "Using new of configure old SSL"];
-ossl_block_non_disturbing_active_timeout_not_released(suite) ->
-    [];
-ossl_block_non_disturbing_active_timeout_not_released(Config)
-  when is_list(Config) ->
-    ssl_block_non_disturbing_active_timeout_not_released(ossl, Config).
-
 essl_block_non_disturbing_active_timeout_not_released(doc) ->
     ["Check that you can block an active server. The strategy " 
      "non non distribing means ongoing requests should be completed." 
@@ -2043,17 +1794,6 @@ pssl_block_non_disturbing_active_timeout_released(Config)
   when is_list(Config) ->
     ssl_block_non_disturbing_active_timeout_released(ssl, Config).
 
-ossl_block_non_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non distribing means ongoing requests should be completed. "
-     "When the timeout occurs the block operation sohould be canceled." 
-     "Using new of configure old SSL"];
-ossl_block_non_disturbing_active_timeout_released(suite) ->
-    [];
-ossl_block_non_disturbing_active_timeout_released(Config)
-  when is_list(Config) ->
-    ssl_block_non_disturbing_active_timeout_released(ossl, Config).
-
 essl_block_non_disturbing_active_timeout_released(doc) ->
     ["Check that you can block an active server. The strategy " 
      "non distribing means ongoing requests should be completed. "
@@ -2087,13 +1827,6 @@ pssl_block_disturbing_blocker_dies(suite) ->
 pssl_block_disturbing_blocker_dies(Config) when is_list(Config) ->
     ssl_block_disturbing_blocker_dies(ssl, Config).
 
-ossl_block_disturbing_blocker_dies(doc) ->
-    ["using new of configure old SSL"];
-ossl_block_disturbing_blocker_dies(suite) ->
-    [];
-ossl_block_disturbing_blocker_dies(Config) when is_list(Config) ->
-    ssl_block_disturbing_blocker_dies(ossl, Config).
-
 essl_block_disturbing_blocker_dies(doc) ->
     ["using new of configure new SSL"];
 essl_block_disturbing_blocker_dies(suite) ->
@@ -2118,13 +1851,6 @@ pssl_block_non_disturbing_blocker_dies(suite) ->
 pssl_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
     ssl_block_non_disturbing_blocker_dies(ssl, Config).
 
-ossl_block_non_disturbing_blocker_dies(doc) ->
-    ["using new of configure old SSL"];
-ossl_block_non_disturbing_blocker_dies(suite) ->
-    [];
-ossl_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_blocker_dies(ossl, Config).
-
 essl_block_non_disturbing_blocker_dies(doc) ->
     ["using new of configure new SSL"];
 essl_block_non_disturbing_blocker_dies(suite) ->
@@ -2149,13 +1875,6 @@ pssl_restart_no_block(suite) ->
 pssl_restart_no_block(Config) when is_list(Config) ->
     ssl_restart_no_block(ssl, Config).
 
-ossl_restart_no_block(doc) ->
-    ["using new of configure old SSL"];
-ossl_restart_no_block(suite) ->
-    [];
-ossl_restart_no_block(Config) when is_list(Config) ->
-    ssl_restart_no_block(ossl, Config).
-
 essl_restart_no_block(doc) ->
     ["using new of configure new SSL"];
 essl_restart_no_block(suite) ->
@@ -2180,13 +1899,6 @@ pssl_restart_disturbing_block(suite) ->
 pssl_restart_disturbing_block(Config) when is_list(Config) ->
     ssl_restart_disturbing_block(ssl, Config).
 
-ossl_restart_disturbing_block(doc) ->
-    ["using new of configure old SSL"];
-ossl_restart_disturbing_block(suite) ->
-    [];
-ossl_restart_disturbing_block(Config) when is_list(Config) ->
-    ssl_restart_disturbing_block(ossl, Config).
-
 essl_restart_disturbing_block(doc) ->
     ["using new of configure new SSL"];
 essl_restart_disturbing_block(suite) ->
@@ -2244,13 +1956,6 @@ pssl_restart_non_disturbing_block(suite) ->
 pssl_restart_non_disturbing_block(Config) when is_list(Config) ->
     ssl_restart_non_disturbing_block(ssl, Config).
 
-ossl_restart_non_disturbing_block(doc) ->
-    ["using new of configure old SSL"];
-ossl_restart_non_disturbing_block(suite) ->
-    [];
-ossl_restart_non_disturbing_block(Config) when is_list(Config) ->
-    ssl_restart_non_disturbing_block(ossl, Config).
-
 essl_restart_non_disturbing_block(doc) ->
     ["using new of configure new SSL"];
 essl_restart_non_disturbing_block(suite) ->
@@ -2646,7 +2351,6 @@ create_config(Config, Access, FileName) ->
     SSL =
 	if
 	    (Type =:= ssl)  orelse 
-	    (Type =:= ossl) orelse 
 	    (Type =:= essl) ->
 		[cline(["SSLCertificateFile ", 
 			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
@@ -3041,7 +2745,6 @@ create_ipv6_config(Config, FileName, Ipv6Address) ->
     SSL =
 	if
 	    (SockType =:= ssl)  orelse 
-	    (SockType =:= ossl) orelse 
 	    (SockType =:= essl) ->
 		[cline(["SSLCertificateFile ", 
 			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index 2903aaafa5..581461fe03 100644
--- a/lib/inets/test/httpd_test_lib.erl
+++ b/lib/inets/test/httpd_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
diff --git a/lib/inets/test/httpd_time_test.erl b/lib/inets/test/httpd_time_test.erl
index f39f9faff0..c54674be36 100644
--- a/lib/inets/test/httpd_time_test.erl
+++ b/lib/inets/test/httpd_time_test.erl
@@ -19,7 +19,7 @@
 %%
 -module(httpd_time_test).
 
--export([t/3, t1/2, t2/2, t3/2, t4/2]).
+-export([t/3, t1/2, t2/2, t4/2]).
 
 -export([do/1, do/2, do/3, do/4, do/5]).
 
@@ -45,10 +45,6 @@ t2(Host, Port) ->
     t(ssl, Host, Port).
 
 
-t3(Host, Port) ->
-    t(ossl, Host, Port).
-
-
 t4(Host, Port) ->
     t(essl, Host, Port).
 
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index 2e19c41f16..ddb1a49394 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -340,9 +340,6 @@ connect_bin(SockType, Host, Port) ->
 connect_bin(ssl, Host, Port, Opts0) ->
     Opts = [binary, {packet,0} | Opts0], 
     connect(ssl, Host, Port, Opts);
-connect_bin(ossl, Host, Port, Opts0) ->
-    Opts = [{ssl_imp, old}, binary, {packet,0} | Opts0], 
-    connect(ssl, Host, Port, Opts);
 connect_bin(essl, Host, Port, Opts0) ->
     Opts = [{ssl_imp, new}, binary, {packet,0}, {reuseaddr, true} | Opts0], 
     connect(ssl, Host, Port, Opts);
@@ -357,9 +354,6 @@ connect_byte(SockType, Host, Port) ->
 connect_byte(ssl, Host, Port, Opts0) ->
     Opts = [{packet,0} | Opts0], 
     connect(ssl, Host, Port, Opts);
-connect_byte(ossl, Host, Port, Opts0) ->
-    Opts = [{ssl_imp, old}, {packet,0} | Opts0], 
-    connect(ssl, Host, Port, Opts);
 connect_byte(essl, Host, Port, Opts0) ->
     Opts = [{ssl_imp, new}, {packet,0} | Opts0], 
     connect(ssl, Host, Port, Opts);
@@ -421,8 +415,6 @@ connect(ip_comm, Host, Port, Opts) ->
 
 send(ssl, Socket, Data) ->
     ssl:send(Socket, Data);
-send(ossl, Socket, Data) ->
-    ssl:send(Socket, Data);
 send(essl, Socket, Data) ->
     ssl:send(Socket, Data);
 send(ip_comm,Socket,Data) ->
@@ -431,8 +423,6 @@ send(ip_comm,Socket,Data) ->
 
 close(ssl,Socket) ->
     catch ssl:close(Socket);
-close(ossl,Socket) ->
-    catch ssl:close(Socket);
 close(essl,Socket) ->
     catch ssl:close(Socket);
 close(ip_comm,Socket) ->
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 4abc1733d3..1df4558e45 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 5.7
+INETS_VSN   = 5.8
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
 
diff --git a/lib/inviso/doc/src/make.dep b/lib/inviso/doc/src/make.dep
deleted file mode 100644
index 9459f74e6d..0000000000
--- a/lib/inviso/doc/src/make.dep
+++ /dev/null
@@ -1,27 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex inviso.tex inviso_as_lib.tex inviso_chapter.tex \
-		inviso_lfm.tex inviso_lfm_tpfreader.tex inviso_rt.tex \
-		inviso_rt_meta.tex part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: inviso_users_guide_pic1.ps
-
diff --git a/lib/inviso/src/inviso_tool_lib.erl b/lib/inviso/src/inviso_tool_lib.erl
index 7953acedd6..f221c4b6de 100644
--- a/lib/inviso/src/inviso_tool_lib.erl
+++ b/lib/inviso/src/inviso_tool_lib.erl
@@ -19,7 +19,7 @@
 %% Support module to the inviso tool.

 %%

 %% Authors:

-%% Lennart �hman, [email protected]

+%% Lennart Öhman, [email protected]

 %% -----------------------------------------------------------------------------

 

 -module(inviso_tool_lib).

@@ -145,10 +145,10 @@ expand_module_names_2(Nodes,DirStr,ModStr,Opts) ->
 %% Always returns a regexp or {error,Reason}. 

 expand_module_names_special_regexp(Str) ->

     StrLen=length(Str),

-    case regexp:first_match(Str,"[0-9a-zA-Z_/]*") of

-	{match,1,StrLen} ->                  % Ok, it is the special case.

+    case re:run(Str,"[0-9a-zA-Z_/]*") of

+	{match,[{0,StrLen}]} ->	             % Ok, it is the special case.

 	    {ok,".*"++Str++".*"};            % Convert it to a proper regexp.

-	{match,_,_} ->

+	{match,_} ->

 	    {ok,Str};                        % Keep it and hope it is a regexp.

 	nomatch ->

 	    {ok,Str};                        % Keep it and hope it is a regexp.

diff --git a/lib/jinterface/doc/src/make.dep b/lib/jinterface/doc/src/make.dep
deleted file mode 100644
index a1b3c322c6..0000000000
--- a/lib/jinterface/doc/src/make.dep
+++ /dev/null
@@ -1,20 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex jinterface.tex jinterface_users_guide.tex \
-		part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/jinterface/java_src/Makefile b/lib/jinterface/java_src/Makefile
index 755ef46a8b..19f99831eb 100644
--- a/lib/jinterface/java_src/Makefile
+++ b/lib/jinterface/java_src/Makefile
@@ -29,9 +29,7 @@ VSN=$(JINTERFACE_VSN)
 # Common Macros
 # ----------------------------------------------------
 
-# call recursive make explicitly below
-# due to separate makefiles for Ronja & OTP
-# SUB_DIRECTORIES = com/ericsson/otp/erlang 
+SUB_DIRECTORIES = com/ericsson/otp/erlang
 
 SPECIAL_TARGETS = 
 
@@ -51,15 +49,5 @@ POM_SRC= $(POM_FILE).src
 $(POM_TARGET): $(POM_SRC) ../vsn.mk
 	sed -e 's;%VSN%;$(VSN);' $< > $@
 
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-
-.PHONY: debug opt instr release docs release_docs tests release_tests clean depend
-
-debug opt instr release docs release_docs tests release_tests clean depend: $(TARGET_FILES)
-	set -e; set -x; \
-	case "$(MAKE)" in *clearmake*) tflag="-T";; *) tflag="";; esac; \
-	if test -f com/ericsson/otp/erlang/ignore_config_record.inf; then xflag=$$tflag; fi; \
-	(cd com/ericsson/otp/erlang && $(MAKE) -f Makefile.otp $$xflag $@)
 
+include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
index d0ff9cda34..e772a2b0a5 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
@@ -96,7 +96,7 @@ docs:
 # include $(ERL_TOP)/make/otp_release_targets.mk
 
 release release_docs release_tests release_html:
-	$(MAKE) -f Makefile.otp $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE)  $@_spec
+	$(MAKE) $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE)  $@_spec
 
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java
index 19ee92e0d0..23734bf83b 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangString.java
@@ -166,7 +166,7 @@ public class OtpErlangString extends OtpErlangObject implements Serializable,
     /**
      * Validate a code point according to Erlang definition; Unicode 3.0.
      * That is; valid in the range U+0..U+10FFFF, but not in the range
-     * U+D800..U+DFFF (surrogat pairs), nor U+FFFE..U+FFFF (non-characters).
+     * U+D800..U+DFFF (surrogat pairs).
      *
      * @param  cp
      *             the code point value to validate
@@ -179,8 +179,7 @@ public class OtpErlangString extends OtpErlangObject implements Serializable,
 	// Erlang definition of valid Unicode code points; 
 	// Unicode 3.0, XML, et.al.
 	return (cp>>>16) <= 0x10 // in 0..10FFFF; Unicode range
-	    && (cp & ~0x7FF) != 0xD800 // not in D800..DFFF; surrogate range
-	    && (cp & ~1) != 0xFFFE; // not in FFFE..FFFF; non-characters
+	    && (cp & ~0x7FF) != 0xD800; // not in D800..DFFF; surrogate range
     }
 
     /**
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/ignore_config_record.inf b/lib/jinterface/java_src/com/ericsson/otp/erlang/ignore_config_record.inf
deleted file mode 100644
index 0a5053eba3..0000000000
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/ignore_config_record.inf
+++ /dev/null
@@ -1 +0,0 @@
-This file makes clearmake use the -T switch for this subdirectory
diff --git a/lib/kernel/doc/src/app.xml b/lib/kernel/doc/src/app.xml
index ef1f5985f4..ff8a12fe97 100644
--- a/lib/kernel/doc/src/app.xml
+++ b/lib/kernel/doc/src/app.xml
@@ -4,7 +4,7 @@
 <fileref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -170,7 +170,6 @@ Phases       [{Phase,PhaseArgs}]  undefined
           start phase defined by the <c>start_phases</c> key, and only
           after this extended start procedure will
           <c>application:start(Application)</c> return.</p>
-        <p></p>
         <p>Start phases may be used to synchronize startup of an
           application and its included applications. In this case,
           the <c>mod</c> key must be specified as:</p>
@@ -182,7 +181,6 @@ Phases       [{Phase,PhaseArgs}]  undefined
           for the primary application) both for the primary application
           and for each of its included application, for which the start
           phase is defined.</p>
-        <p></p>
         <p>This implies that for an included application, the set of
           start phases must be a subset of the set of phases defined
           for the primary application. Refer to <em>OTP Design Principles</em> for more information.</p>
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index 98cdd416b0..6b89711924 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -177,9 +177,9 @@
      archives. But the functions in <c>erl_prim_loader</c> may also be
      used by other applications to read files from archives. For
      example, the call
-     <c>erl_prim_loader:list_dir("/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/examples/bench)"</c>
+     <c>erl_prim_loader:list_dir( "/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/examples/bench)"</c>
      would list the contents of a directory inside an archive.
-     See <seealso marker="erts:erl_prim_loader">erl_prim_loader(3)</seealso></p>
+     See <seealso marker="erts:erl_prim_loader">erl_prim_loader(3)</seealso></p>.
 
     <p>An application archive file and a regular application directory
      may coexist. This may be useful when there is a need of having
diff --git a/lib/kernel/doc/src/disk_log.xml b/lib/kernel/doc/src/disk_log.xml
index 9721907162..d278d54d93 100644
--- a/lib/kernel/doc/src/disk_log.xml
+++ b/lib/kernel/doc/src/disk_log.xml
@@ -475,8 +475,7 @@
       <fsummary>Close a disk log.</fsummary>
       <type name="close_error_rsn"/>
       <desc>
-        <p>          <marker id="close_1"></marker>
-The function <c>close/1</c> closes a
+        <p><marker id="close_1"></marker>The function <c>close/1</c> closes a
           local or distributed disk log properly. An internally
           formatted log must be closed before the Erlang system is
           stopped, otherwise the log is regarded as unclosed and the
diff --git a/lib/kernel/doc/src/erl_ddll.xml b/lib/kernel/doc/src/erl_ddll.xml
index f9514dda2f..1911fb628e 100644
--- a/lib/kernel/doc/src/erl_ddll.xml
+++ b/lib/kernel/doc/src/erl_ddll.xml
@@ -989,7 +989,7 @@
                       <c>{ok, pending_driver}</c> or <c>{ok, pending_process}</c>.</p>
                   </item>
                 </taglist>
-                <p>The <c>pending_driver</c><c>MonitorOption</c> is by far
+                <p>The <c>pending_driver</c> <c>MonitorOption</c> is by far
                   the most useful and it has to be used to ensure that the
                   driver has really been unloaded and the ports closed
                   whenever the <c>kill_ports</c> option is used or the
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 861c582211..7db20e6343 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -60,11 +60,13 @@
     converted, why the Unicode mode for file names is not default on
     systems having completely transparent file naming.</p>
 
-    <note>As of R14B01, the most basic file handling modules
-    (<c>file</c>, <c>prim_file</c>, <c>filelib</c> and
-    <c>filename</c>) accept raw file names, but the rest of OTP is not
-    guaranteed to handle them, why Unicode file naming on systems
-    where it is not default is still considered experimental.</note>
+    <note>
+      <p>As of R14B01, the most basic file handling modules
+      (<c>file</c>, <c>prim_file</c>, <c>filelib</c> and
+      <c>filename</c>) accept raw file names, but the rest of OTP is not
+      guaranteed to handle them, why Unicode file naming on systems
+      where it is not default is still considered experimental.</p>
+    </note>
 
     <p>Raw file names is a new feature in OTP R14B01, which allows the
     user to supply completely uninterpreted file names to the
@@ -249,11 +251,9 @@
           </item>
         </taglist>
         <p>Example:</p>
-        <code type="none">
-f.txt:  {person, "kalle", 25}.
+<code type="none">f.txt:  {person, "kalle", 25}.
         {person, "pelle", 30}.</code>
-        <pre>
-1> <input>file:consult("f.txt").</input>
+<pre>1> <input>file:consult("f.txt").</input>
 {ok,[{person,"kalle",25},{person,"pelle",30}]}</pre>
       </desc>
     </func>
@@ -362,7 +362,6 @@ f.txt:  {person, "kalle", 25}.
           <p>In a future release, a bad type for the
             <c><anno>Filename</anno></c> argument will probably generate
             an exception.</p>
-          <p></p>
         </warning>
       </desc>
     </func>
@@ -1523,7 +1522,6 @@ f.txt:  {person, "kalle", 25}.
           <p>In a future release, a bad type for the
             <c><anno>Dir</anno></c>
             argument will probably generate an exception.</p>
-          <p></p>
         </warning>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index b761b6bd83..688cd0f78f 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -47,8 +47,7 @@
       SUSE Linux Enterprise Server 10 Service Pack 1 (x86_64)
       kernel 2.6.16.54-0.2.3-smp with lksctp-tools-1.0.7.</p>
     <p>Record definitions for the <c>gen_sctp</c> module can be found using:</p>
-    <pre>
-  -include_lib("kernel/include/inet_sctp.hrl").    </pre>
+<pre>  -include_lib("kernel/include/inet_sctp.hrl").    </pre>
     <p>These record definitions use the "new" spelling 'adaptation',
       not the deprecated 'adaption', regardless of which
       spelling the underlying C API uses.</p>
@@ -63,14 +62,13 @@
       <item><seealso marker="#options">SCTP SOCKET OPTIONS</seealso></item>
       <item><seealso marker="#examples">SCTP EXAMPLES</seealso></item>
       <item><seealso marker="#seealso">SEE ALSO</seealso></item>
-      <item><seealso marker="#authors">AUTHORS</seealso></item>
     </list>
     <marker id="types"></marker>
   </section>
 
   <datatypes>
     <datatype>
-      <name name="assoc_id"/>
+      <name><marker id="type-assoc_id">assoc_id()</marker></name>
       <desc>
         <p>An opaque term returned in for example #sctp_paddr_change{}
           that identifies an association for an SCTP socket. The term
@@ -80,36 +78,18 @@
       </desc>
     </datatype>
     <datatype>
-      <name name="hostname"/>
-    </datatype>
-    <datatype>
-      <name name="ip_address"/>
-      <desc>
-        <p>Represents an address of an SCTP socket. 
-          It is a tuple as explained in
-          <seealso marker="inet">inet(3)</seealso>.</p>
-      </desc>
-    </datatype>
-    <datatype>
-      <name name="port_number"/>
-    </datatype>
-    <datatype>
-      <name name="posix"/>
-      <desc>
-        <p>See <seealso marker="inet#error_codes">
-        inet(3); POSIX Error Codes</seealso>.</p>
-      </desc>
-    </datatype>
-    <datatype>
-      <name name="sctp_option"/>
+      <name name="option"/>
       <desc>
         <p>One of the 
           <seealso marker="#options">SCTP Socket Options.</seealso></p>
-        <marker id="type-sctp_socket"></marker>
       </desc>
     </datatype>
     <datatype>
-      <name name="sctp_socket"/>
+      <name name="option_name"/>
+      <desc><marker id="type-sctp_socket"></marker></desc>
+    </datatype>
+    <datatype>
+      <name><marker id="type-sctp_socket">sctp_socket()</marker></name>
       <desc>
         <p>Socket identifier returned from <c>open/*</c>.</p>
         <marker id="exports"></marker>
@@ -171,19 +151,17 @@
           The result of <c>connect/*</c> is an <c>#sctp_assoc_change{}</c>
           event which contains, in particular, the new 
           <seealso marker="#type-assoc_id">Association ID</seealso>.</p>
-        <pre>
-  #sctp_assoc_change{
+<pre>   #sctp_assoc_change{
         state             = atom(),
         error             = atom(),
-        outbound_streams  = int(),
-        inbound_streams   = int(),
+        outbound_streams  = integer(),
+        inbound_streams   = integer(),
         assoc_id          = assoc_id()
   }        </pre>
         <p>The number of outbound and inbound streams can be set by
           giving an <c>sctp_initmsg</c> option to <c>connect</c>
           as in:</p>
-        <pre>
-  connect(<anno>Socket</anno>, Ip, <anno>Port</anno>,
+<pre>  connect(<anno>Socket</anno>, Ip, <anno>Port</anno>,
         [{sctp_initmsg,#sctp_initmsg{num_ostreams=OutStreams,
                                      max_instreams=MaxInStreams}}])        </pre>
         <p>All options <c><anno>Opt</anno></c> are set on the socket before the
@@ -300,6 +278,19 @@
           The default <c><anno>IP</anno></c> and <c><anno>Port</anno></c> are <c>any</c>
           and <c>0</c>, meaning bind to all local addresses on any
           one free port.</p>
+
+        <p>Other options are:</p>
+        <taglist>
+          <tag><c>inet6</c></tag>
+          <item>
+            <p>Set up the socket for IPv6.</p>
+          </item>
+          <tag><c>inet</c></tag>
+          <item>
+            <p>Set up the socket for IPv4. This is the default.</p>
+          </item>
+        </taglist>
+
         <p>A default set of socket <seealso marker="#options">options</seealso>
           is used. In particular, the socket is opened in 
           <seealso marker="#option-binary">binary</seealso> and
@@ -346,11 +337,10 @@
             <p><seealso marker="#record-sctp_assoc_change">#sctp_assoc_change{}</seealso>;</p>
           </item>
           <item>
-            <pre>
-  #sctp_paddr_change{
+<pre>  #sctp_paddr_change{
         addr      = {ip_address(),port()},
         state     = atom(),
-        error     = int(),
+        error     = integer(),
         assoc_id  = assoc_id()
   }            </pre>
             <p>Indicates change of the status of the peer's IP address given by
@@ -384,10 +374,9 @@
               converted into a string using <c>error_string/1</c>.</p>
           </item>
           <item>
-            <pre>
-  #sctp_send_failed{
+<pre>  #sctp_send_failed{
         flags     = true | false,
-        error     = int(),
+        error     = integer(),
         info      = #sctp_sndrcvinfo{},
         assoc_id  = assoc_id()
         data      = binary()
@@ -405,9 +394,8 @@
               returned by <c>recv/*</c>.</p>
           </item>
           <item>
-            <pre>
-  #sctp_adaptation_event{
-        adaptation_ind = int(),
+<pre>  #sctp_adaptation_event{
+        adaptation_ind = integer(),
         assoc_id       = assoc_id()
   }            </pre>
             <p>Delivered when a peer sends an Adaptation Layer Indication
@@ -417,8 +405,7 @@
               the Erlang/SCTP binding, this event is disabled by default.</p>
           </item>
           <item>
-            <pre>
-  #sctp_pdapi_event{
+<pre>  #sctp_pdapi_event{
         indication = sctp_partial_delivery_aborted,
         assoc_id   = assoc_id()
   }            </pre>
@@ -475,7 +462,7 @@
     <marker id="option-binary"></marker>
     <marker id="option-list"></marker>
     <taglist>
-      <tag><c>{mode, list|binary}</c>or just <c>list</c> or <c>binary</c>.</tag>
+      <tag><c>{mode, list|binary}</c> or just <c>list</c> or <c>binary</c></tag>
       <item>
         <p>Determines the type of data returned from <c>gen_sctp:recv/1,2</c>.</p>
         <marker id="option-active"></marker>
@@ -505,7 +492,7 @@
         </list>
         <marker id="option-buffer"></marker>
       </item>
-      <tag><c>{buffer, int()}</c></tag>
+      <tag><c>{buffer, integer()}</c></tag>
       <item>
         <p>Determines the size of the user-level software buffer used by
           the SCTP driver. Not to be confused with <c>sndbuf</c>
@@ -515,7 +502,7 @@
           In fact, the <c>val(buffer)</c> is automatically set to
           the above maximum when <c>sndbuf</c> or <c>recbuf</c> values are set.</p>
       </item>
-      <tag><c>{tos, int()}</c></tag>
+      <tag><c>{tos, integer()}</c></tag>
       <item>
         <p>Sets the Type-Of-Service field on the IP datagrams being sent,
           to the given value, which effectively determines a prioritization
@@ -523,7 +510,7 @@
           are system-dependent. TODO: we do not provide
           symbolic names for these values yet.</p>
       </item>
-      <tag><c>{priority, int()}</c></tag>
+      <tag><c>{priority, integer()}</c></tag>
       <item>
         <p>A protocol-independent equivalent of <c>tos</c> above. Setting
           priority implies setting tos as well.</p>
@@ -542,7 +529,7 @@
           required for high-throughput servers).</p>
         <marker id="option-linger"></marker>
       </item>
-      <tag><c>{linger, {true|false, int()}</c></tag>
+      <tag><c>{linger, {true|false, integer()}</c></tag>
       <item>
         <p>Determines the timeout in seconds for flushing unsent data in the
           <c>gen_sctp:close/1</c> socket call. If the 1st component of the value
@@ -552,14 +539,14 @@
           the flushing time-out in seconds.</p>
         <marker id="option-sndbuf"></marker>
       </item>
-      <tag><c>{sndbuf, int()}</c></tag>
+      <tag><c>{sndbuf, integer()}</c></tag>
       <item>
         <p>The size, in bytes, of the *kernel* send buffer for this socket.
           Sending errors would occur for datagrams larger than
           <c>val(sndbuf)</c>. Setting this option also adjusts
           the size of the driver buffer (see <c>buffer</c> above).</p>
       </item>
-      <tag><c>{recbuf, int()}</c></tag>
+      <tag><c>{recbuf, integer()}</c></tag>
       <item>
         <p>The size, in bytes, of the *kernel* recv buffer for this socket.
           Sending errors would occur for datagrams larger than
@@ -568,12 +555,11 @@
       </item>
       <tag><c>{sctp_rtoinfo, #sctp_rtoinfo{}}</c></tag>
       <item>
-        <pre>
-  #sctp_rtoinfo{
+<pre>  #sctp_rtoinfo{
         assoc_id = assoc_id(),
-        initial  = int(),
-        max      = int(),
-        min      = int()
+        initial  = integer(),
+        max      = integer(),
+        min      = integer()
   }        </pre>
         <p>Determines re-transmission time-out parameters, in milliseconds,
           for the association(s) given by <c>assoc_id</c>. 
@@ -583,14 +569,13 @@
       </item>
       <tag><c>{sctp_associnfo, #sctp_assocparams{}}</c></tag>
       <item>
-        <pre>
-  #sctp_assocparams{
+<pre>  #sctp_assocparams{
         assoc_id                 = assoc_id(),
-        asocmaxrxt               = int(),
-        number_peer_destinations = int(),
-        peer_rwnd                = int(),
-        local_rwnd               = int(),
-        cookie_life              = int()
+        asocmaxrxt               = integer(),
+        number_peer_destinations = integer(),
+        peer_rwnd                = integer(),
+        local_rwnd               = integer(),
+        cookie_life              = integer()
   }        </pre>
         <p>Determines association parameters for the association(s) given by
           <c>assoc_id</c>. <c>assoc_id = 0</c> (default) indicates
@@ -599,12 +584,11 @@
       </item>
       <tag><c>{sctp_initmsg, #sctp_initmsg{}}</c></tag>
       <item>
-        <pre>
-  #sctp_initmsg{
-       num_ostreams   = int(),
-       max_instreams  = int(),
-       max_attempts   = int(),
-       max_init_timeo = int()
+<pre>  #sctp_initmsg{
+       num_ostreams   = integer(),
+       max_instreams  = integer(),
+       max_attempts   = integer(),
+       max_init_timeo = integer()
   }        </pre>
         <p>Determines the default parameters which this socket attempts
           to negotiate with its peer while establishing an association with it.
@@ -628,12 +612,12 @@
               for establishing an association.</p>
           </item>
         </list>
-        <p></p>
       </item>
-      <tag><c>{sctp_autoclose, int()|infinity}</c></tag>
+      <tag><c>{sctp_autoclose, integer() >= 0}</c></tag>
       <item>
         <p>Determines the time (in seconds) after which an idle association is
-          automatically closed.</p>
+          automatically closed. <c>0</c> means that the association is
+          never automatically closed.</p>
       </item>
       <tag><c>{sctp_nodelay, true|false}</c></tag>
       <item>
@@ -655,15 +639,14 @@
         <p>Turns on|off automatic mapping of IPv4 addresses into IPv6 ones
           (if the socket address family is AF_INET6).</p>
       </item>
-      <tag><c>{sctp_maxseg, int()}</c></tag>
+      <tag><c>{sctp_maxseg, integer()}</c></tag>
       <item>
         <p>Determines the maximum chunk size if message fragmentation is used.
           If <c>0</c>, the chunk size is limited by the Path MTU only.</p>
       </item>
       <tag><c>{sctp_primary_addr, #sctp_prim{}}</c></tag>
       <item>
-        <pre>
-  #sctp_prim{
+<pre>  #sctp_prim{
         assoc_id = assoc_id(),
         addr     = {IP, Port}
   }
@@ -676,8 +659,7 @@
       </item>
       <tag><c>{sctp_set_peer_primary_addr, #sctp_setpeerprim{}}</c></tag>
       <item>
-        <pre>
-  #sctp_setpeerprim{
+<pre>  #sctp_setpeerprim{
         assoc_id = assoc_id(),
         addr     = {IP, Port}
   }
@@ -691,9 +673,8 @@
       <tag><c>{sctp_adaptation_layer, #sctp_setadaptation{}}</c></tag>
       <item>
         <marker id="record-sctp_setadaptation"></marker>
-        <pre>
-  #sctp_setadaptation{
-        adaptation_ind = int()
+<pre>  #sctp_setadaptation{
+        adaptation_ind = integer()
   }        </pre>
         <p>When set, requests that the local endpoint uses the value given by
           <c>adaptation_ind</c> as the Adaptation Indication parameter for
@@ -703,14 +684,13 @@
       </item>
       <tag><c>{sctp_peer_addr_params, #sctp_paddrparams{}}</c></tag>
       <item>
-        <pre>
-  #sctp_paddrparams{
+<pre>  #sctp_paddrparams{
         assoc_id   = assoc_id(),
         address    = {IP, Port},
-        hbinterval = int(),
-        pathmaxrxt = int(),
-        pathmtu    = int(),
-        sackdelay  = int(),
+        hbinterval = integer(),
+        pathmaxrxt = integer(),
+        pathmtu    = integer(),
+        sackdelay  = integer(),
         flags      = list()
   }
   IP = ip_address()
@@ -761,24 +741,21 @@
                 <p><c>sackdelay_disable</c>: disable SAC delay.</p>
               </item>
             </list>
-            <p></p>
           </item>
         </list>
-        <p></p>
       </item>
       <tag><c>{sctp_default_send_param, #sctp_sndrcvinfo{}}</c></tag>
       <item>
         <marker id="record-sctp_sndrcvinfo"></marker>
-        <pre>
-  #sctp_sndrcvinfo{
-        stream     = int(),
-        ssn        = int(),
+<pre>  #sctp_sndrcvinfo{
+        stream     = integer(),
+        ssn        = integer(),
         flags      = list(),
-        ppid       = int(),
-        context    = int(),
-        timetolive = int(),
-        tsn        = int(),
-        cumtsn     = int(),
+        ppid       = integer(),
+        context    = integer(),
+        timetolive = integer(),
+        tsn        = integer(),
+        cumtsn     = integer(),
         assoc_id   = assoc_id()
   }        </pre>
         <p><c>#sctp_sndrcvinfo{}</c> is used both in this socket option, and as
@@ -812,20 +789,17 @@
                   association, with flushing of unsent data.</p>
               </item>
             </list>
-            <p></p>
             <p>Other fields are rarely used. See 
               <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC2960</url> and 
               <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions for SCTP</url> for full information.</p>
           </item>
         </list>
-        <p></p>
         <marker id="option-sctp_events"></marker>
       </item>
       <tag><c>{sctp_events, #sctp_event_subscribe{}}</c></tag>
       <item>
         <marker id="record-sctp_event_subscribe"></marker>
-        <pre>
-  #sctp_event_subscribe{
+<pre>  #sctp_event_subscribe{
           data_io_event          = true | false,
           association_event      = true | false,
           address_event          = true | false,
@@ -850,10 +824,9 @@
       </item>
       <tag><c>{sctp_delayed_ack_time, #sctp_assoc_value{}}</c></tag>
       <item>
-        <pre>
-  #sctp_assoc_value{
+<pre>  #sctp_assoc_value{
         assoc_id    = assoc_id(),
-        assoc_value = int()
+        assoc_value = integer()
   }        </pre>
         <p>Rarely used. Determines the ACK time
           (given by <c>assoc_value</c> in milliseconds) for
@@ -862,16 +835,15 @@
       </item>
       <tag><c>{sctp_status, #sctp_status{}}</c></tag>
       <item>
-        <pre>
-  #sctp_status{
+<pre>  #sctp_status{
         assoc_id            = assoc_id(),
         state               = atom(),
-        rwnd                = int(),
-        unackdata           = int(),
-        penddata            = int(),
-        instrms             = int(),
-        outstrms            = int(),
-        fragmentation_point = int(),
+        rwnd                = integer(),
+        unackdata           = integer(),
+        penddata            = integer(),
+        instrms             = integer(),
+        outstrms            = integer(),
+        fragmentation_point = integer(),
         primary             = #sctp_paddrinfo{}
   }        </pre>
         <p>This option is read-only. It determines the status of
@@ -935,21 +907,19 @@
               address (see below for the format of <c>#sctp_paddrinfo{}</c>).</p>
           </item>
         </list>
-        <p></p>
         <marker id="option-sctp_get_peer_addr_info"></marker>
       </item>
       <tag><c>{sctp_get_peer_addr_info, #sctp_paddrinfo{}}</c></tag>
       <item>
         <marker id="record-sctp_paddrinfo"></marker>
-        <pre>
-  #sctp_paddrinfo{
+<pre>  #sctp_paddrinfo{
         assoc_id  = assoc_id(),
         address   = {IP, Port},
         state     = inactive | active,
-        cwnd      = int(),
-        srtt      = int(),
-        rto       = int(),
-        mtu       = int()
+        cwnd      = integer(),
+        srtt      = integer(),
+        rto       = integer(),
+        mtu       = integer()
   }
   IP = ip_address()
   Port = port_number()        </pre>
@@ -973,8 +943,7 @@
       <item>
         <p>Example of an Erlang SCTP Server which receives SCTP messages and
           prints them on the standard output:</p>
-        <pre>
-  -module(sctp_server).
+<pre>  -module(sctp_server).
   
   -export([server/0,server/1,server/2]).
   -include_lib("kernel/include/inet.hrl").
@@ -1003,7 +972,6 @@
           io:format("Received: ~p~n", [Data])
       end,
       server_loop(S).        </pre>
-        <p></p>
       </item>
       <item>
         <p>Example of an Erlang SCTP Client which interacts with the above Server.
@@ -1013,8 +981,7 @@
           over Stream 5 fails. The client then <c>abort</c>s the association,
           which results in the corresponding Event being received on
           the Server side.</p>
-        <pre>
-  -module(sctp_client).
+<pre>  -module(sctp_client).
   
   -export([client/0, client/1, client/2]).
   -include_lib("kernel/include/inet.hrl").
@@ -1047,13 +1014,11 @@
       
       timer:sleep(1000),
       gen_sctp:close(S).        </pre>
-        <p></p>
       </item>
       <item>
         <p>A very simple Erlang SCTP Client which uses the
           connect_init API.</p>
-        <pre>
--module(ex3).
+<pre>-module(ex3).
 
 -export([client/4]).
 -include_lib("kernel/include/inet.hrl").
@@ -1106,7 +1071,6 @@ client_loop(S, Peer1, Port1, AssocId1, Peer2, Port2, AssocId2) -&gt;
             ok
     end.
 </pre>
-        <p></p>
       </item>
     </list>
   </section>
@@ -1119,7 +1083,6 @@ client_loop(S, Peer1, Port1, AssocId1, Peer2, Port2, AssocId2) -&gt;
       <seealso marker="gen_udp">gen_udp(3)</seealso>,
       <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC2960</url> (Stream Control Transmission Protocol),
       <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions for SCTP.</url></p>
-    <marker id="authors"></marker>
   </section>
 </erlref>
 
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index f1d42d9faa..8a5d40bb16 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -37,7 +37,7 @@
       binary and closing the connection:</p>
     <code type="none">
 client() ->
-    SomeHostInNet = "localhost" % to make it runnable on one machine
+    SomeHostInNet = "localhost", % to make it runnable on one machine
     {ok, Sock} = gen_tcp:connect(SomeHostInNet, 5678, 
                                  [binary, {packet, 0}]),
     ok = gen_tcp:send(Sock, "Some Data"),
@@ -65,25 +65,16 @@ do_recv(Sock, Bs) ->
 
   <datatypes>
     <datatype>
-      <name name="hostname"/>
+      <name name="option"/>
     </datatype>
     <datatype>
-      <name name="ip_address"/>
-      <desc>
-        <p>Represents an address of a TCP socket.
-          It is a tuple as explained in
-          <seealso marker="inet">inet(3)</seealso>.</p>
-      </desc>
+      <name name="option_name"/>
     </datatype>
     <datatype>
-      <name name="port_number"/>
+      <name name="connect_option"/>
     </datatype>
     <datatype>
-      <name name="posix"/>
-      <desc>
-        <p>See <seealso marker="inet#error_codes">
-        inet(3); POSIX Error Codes</seealso>.</p>
-      </desc>
+      <name name="listen_option"/>
     </datatype>
     <datatype>
       <name><marker id="type-socket">socket()</marker></name>
@@ -122,7 +113,7 @@ do_recv(Sock, Bs) ->
           <item>
             <p>Specify which local port number to use.</p>
           </item>
-          <tag><c>{fd, int()}</c></tag>
+          <tag><c>{fd, integer() >= 0}</c></tag>
           <item>
             <p>If a socket has somehow been connected without using
               <c>gen_tcp</c>, use this option to pass the file
@@ -196,6 +187,10 @@ do_recv(Sock, Bs) ->
             <p>If the host has several network interfaces, this option
               specifies which one to listen on.</p>
           </item>
+          <tag><c>{port, Port}</c></tag>
+          <item>
+            <p>Specify which local port number to use.</p>
+          </item>
           <tag><c>{fd, Fd}</c></tag>
           <item>
             <p>If a socket has somehow been connected without using
diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index c0e783f508..daa9b7d887 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -36,25 +36,10 @@
 
   <datatypes>
     <datatype>
-      <name name="hostname"/>
+      <name name="option"/>
     </datatype>
     <datatype>
-      <name name="ip_address"/>
-      <desc>
-        <p>Represents an address of a TCP socket.
-          It is a tuple as explained in
-          <seealso marker="inet">inet(3)</seealso>.</p>
-      </desc>
-    </datatype>
-    <datatype>
-      <name name="port_number"/>
-    </datatype>
-    <datatype>
-      <name name="posix"/>
-      <desc>
-        <p>See <seealso marker="inet#error_codes">
-        inet(3); POSIX Error Codes</seealso>.</p>
-      </desc>
+      <name name="option_name"/>
     </datatype>
     <datatype>
       <name><marker id="type-socket">socket()</marker></name>
@@ -87,7 +72,7 @@
             <p>If the host has several network interfaces, this option
               specifies which one to use.</p>
           </item>
-          <tag><c>{fd, int()}</c></tag>
+          <tag><c>{fd, integer() >= 0}</c></tag>
           <item>
             <p>If a socket has somehow been opened without using
               <c>gen_udp</c>, use this option to pass the file
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index fd843b00d9..fad5af85bb 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -105,6 +105,9 @@ fe80::204:acff:fe17:bf38
       <name name="ip6_address"/>
     </datatype>
     <datatype>
+      <name name="port_number"/>
+    </datatype>
+    <datatype>
       <name name="posix"/>
       <desc><p>An atom which is named from the Posix error codes
          used in Unix, and in the runtime libraries of most
@@ -119,7 +122,7 @@ fe80::204:acff:fe17:bf38
       </desc>
     </datatype>
     <datatype>
-      <name name="family_option"/>
+      <name name="address_family"/>
     </datatype>
   </datatypes>
 
@@ -250,26 +253,15 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name>getopts(Socket, Options) -> {ok, OptionValues} | {error, posix()}</name>
+      <name name="getopts" arity="2"/>
       <fsummary>Get one or more options for a socket</fsummary>
-      <type>
-        <v>Socket = term()</v>
-        <v>Options = [Opt | RawOptReq]</v>
-        <v>Opt = atom()</v>
-        <v>RawOptReq = {raw, Protocol, OptionNum, ValueSpec}</v>
-        <v>Protocol = integer()</v>
-        <v>OptionNum = integer()</v>
-        <v>ValueSpec = ValueSize | ValueBin</v>
-        <v>ValueSize = integer()</v>
-        <v>ValueBin = binary()</v>
-        <v>OptionValues = [{Opt, Val} | {raw, Protocol, OptionNum,  ValueBin}]</v>
-      </type>
       <type name="socket_getopt"/>
+      <type name="socket_setopt"/>
       <desc>
         <p>Gets one or more options for a socket. 
           See <seealso marker="#setopts/2">setopts/2</seealso> 
           for a list of available options.</p>
-        <p>The number of elements in the returned <c>OptionValues</c>
+        <p>The number of elements in the returned <c><anno>OptionValues</anno></c>
           list does not necessarily correspond to the number of options
           asked for. If the operating system fails to support an option,
           it is simply left out in the returned list. An error tuple is only
@@ -277,12 +269,12 @@ fe80::204:acff:fe17:bf38
           (i.e. the socket is closed or the buffer size in a raw request
           is too large). This behavior is kept for backward
           compatibility reasons.</p>
-        <p>A <c>RawOptReq</c> can be used to get information about
+        <p>A raw option request <c>RawOptReq = {raw, Protocol, OptionNum, ValueSpec}</c> can be used to get information about
           socket options not (explicitly) supported by the emulator. The
           use of raw socket options makes the code non portable, but
           allows the Erlang programmer to take advantage of unusual features
           present on the current platform.</p>
-        <p>The  <c>RawOptReq</c> consists of the tag <c>raw</c> followed
+        <p>The <c>RawOptReq</c> consists of the tag <c>raw</c> followed
           by the protocol level, the option number and either a binary
           or the size, in bytes, of the
           buffer in which the option value is to be stored. A binary
@@ -325,19 +317,14 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name>getstat(Socket)</name>
-      <name>getstat(Socket, Options) -> {ok, OptionValues} | {error, posix()}</name>
+      <name name="getstat" arity="1"/>
+      <name name="getstat" arity="2"/>
       <fsummary>Get one or more statistic options for a socket</fsummary>
-      <type>
-        <v>Socket = term()</v>
-        <v>Options = [Opt]</v>
-        <v>OptionValues = [{Opt, Val}]</v>
-        <v>&nbsp;Opt, Val -- see below</v>
-      </type>
+      <type name="stat_option"/>
       <desc>
         <p>Gets one or more statistic options for a socket.</p>
-	<p><c>getstat(Socket)</c> is equivalent to
-	<c>getstat(Socket,&nbsp;[recv_avg,&nbsp;recv_cnt,&nbsp;recv_dvi,&nbsp;recv_max,&nbsp;recv_oct,&nbsp;send_avg,&nbsp;send_cnt,&nbsp;send_dvi,&nbsp;send_max,&nbsp;send_oct])</c></p>
+	<p><c>getstat(<anno>Socket</anno>)</c> is equivalent to
+	<c>getstat(<anno>Socket</anno>,&nbsp;[recv_avg,&nbsp;recv_cnt,&nbsp;recv_dvi,&nbsp;recv_max,&nbsp;recv_oct,&nbsp;send_avg,&nbsp;send_cnt,&nbsp;send_dvi,&nbsp;send_max,&nbsp;send_oct])</c></p>
 	  <p>The following options are available:</p>
         <taglist>
 	  <tag><c>recv_avg</c></tag>
@@ -394,12 +381,8 @@ fe80::204:acff:fe17:bf38
       </desc>
     </func>
     <func>
-      <name>port(Socket) -> {ok, Port} | {error, any()}</name>
+      <name name="port" arity="1"/>
       <fsummary>Return the local port number for a socket</fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>Port = integer()</v>
-      </type>
       <desc>
         <p>Returns the local port number for a socket.</p>
       </desc>
@@ -412,16 +395,9 @@ fe80::204:acff:fe17:bf38
       </desc>
     </func>
     <func>
-      <name>setopts(Socket, Options) -> ok | {error, posix()}</name>
+      <name name="setopts" arity="2"/>
       <fsummary>Set one or more options for a socket</fsummary>
-      <type>
-        <v>Socket = term()</v>
-        <v>Options = [{Opt, Val} | {raw, Protocol, Option, ValueBin}]</v>
-        <v>Protocol = integer()</v>
-        <v>OptionNum = integer()</v>
-        <v>ValueBin = binary()</v>
-        <v>&nbsp;Opt, Val -- see below</v>
-      </type>
+      <type name="socket_setopt"/>
       <desc>
         <p>Sets one or more options for a socket. The following options
           are available:</p>
@@ -579,8 +555,14 @@ fe80::204:acff:fe17:bf38
                  mode will return <c>{ok, HttpPacket}</c> from <c>gen_tcp:recv</c>
                  while an active socket will send messages like <c>{http,
                  Socket, HttpPacket}</c>.</p>
-                 <p>Note that the packet type <c>httph</c> is not
-                 needed when reading from a socket.</p>   
+              </item>
+              <tag><c>httph | httph_bin</c></tag>
+              <item>
+                <p>These two types are often not needed as the socket will
+		automatically switch from <c>http</c>/<c>http_bin</c> to
+		<c>httph</c>/<c>httph_bin</c> internally after the first line
+		has been read. There might be occasions however when they are
+		useful, such as parsing trailers from chunked encoding.</p>
               </item>
             </taglist>
           </item>
diff --git a/lib/kernel/doc/src/make.dep b/lib/kernel/doc/src/make.dep
deleted file mode 100644
index f79d1c6367..0000000000
--- a/lib/kernel/doc/src/make.dep
+++ /dev/null
@@ -1,28 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: app.tex application.tex auth.tex book.tex \
-		code.tex config.tex disk_log.tex erl_boot_server.tex \
-		erl_ddll.tex erl_prim_loader_stub.tex erlang_stub.tex \
-		error_handler.tex error_logger.tex file.tex \
-		gen_sctp.tex gen_tcp.tex gen_udp.tex global.tex \
-		global_group.tex heart.tex inet.tex inet_res.tex \
-		init_stub.tex kernel_app.tex net_adm.tex net_kernel.tex \
-		os.tex packages.tex pg2.tex ref_man.tex rpc.tex \
-		seq_trace.tex user.tex wrap_log_reader.tex \
-		zlib_stub.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml
index 96e2aa665d..3b7a710664 100644
--- a/lib/kernel/doc/src/net_kernel.xml
+++ b/lib/kernel/doc/src/net_kernel.xml
@@ -37,13 +37,10 @@
       monitoring of the network.</p>
     <p>An Erlang node is started using the command line flag
       <c>-name</c> or <c>-sname</c>:</p>
-    <pre>
-$ <input>erl -sname foobar</input></pre>
+<pre>$ <input>erl -sname foobar</input></pre>
     <p>It is also possible to call <c>net_kernel:start([foobar])</c>
       directly from the normal Erlang shell prompt:</p>
-    <p></p>
-    <pre>
-1> <input>net_kernel:start([foobar, shortnames]).</input>
+<pre>1> <input>net_kernel:start([foobar, shortnames]).</input>
 {ok,&lt;0.64.0>}
 (foobar@gringotts)2></pre>
     <p>If the node is started with the command line flag <c>-sname</c>,
@@ -226,7 +223,6 @@ $ <input>erl -sname foobar</input></pre>
           <c><anno>NetTicktime</anno></c> seconds. <c><anno>TransitionPeriod</anno></c> defaults
           to 60.</p>
         <p>Some definitions:</p>
-        <p></p>
         <taglist>
           <tag>The minimum transition traffic interval (<c>MTTI</c>)</tag>
           <item>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index e325443f6c..ec57b03bd9 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -30,6 +30,62 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 2.14.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix type of Packet arg of gen_tcp:send/2 and
+	    gen_udp:send/4</p>
+          <p>
+	    The type is marked as a binary() or a string() but in
+	    practice it can be an iodata(). The test suite was
+	    updated to confirm the gen_tcp/2 and gen_udp:send/4
+	    functions accept iodata() (iolists) packets. (Thanks to
+	    Filipe David Manana)</p>
+          <p>
+	    Own Id: OTP-9514</p>
+        </item>
+        <item>
+	    <p> XML files have been corrected. </p>
+          <p>
+	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> The types and specifications of the inet modules have
+	    been improved. </p>
+          <p>
+	    Own Id: OTP-9260</p>
+        </item>
+        <item>
+	    <p> Types and specifications have been added. </p>
+          <p>
+	    Own Id: OTP-9356</p>
+        </item>
+        <item>
+	    <p> Contracts in STDLIB and Kernel have been improved and
+	    type errors have been corrected. </p>
+          <p>
+	    Own Id: OTP-9485</p>
+        </item>
+        <item>
+	    <p> Update documentation and specifications of some of
+	    the zlib functions. </p>
+          <p>
+	    Own Id: OTP-9506</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 2.14.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -2535,7 +2591,7 @@
             <c>badarg</c> if a process is already registered. As it
             turns out there is no check in <c>global</c> if a process is
             registered under more than one name. If some process is
-            accidentaly or by design given several names, it is
+            accidentally or by design given several names, it is
             possible that the name registry becomes inconsistent due
             to the way the resolve function is called when name
             clashes are discovered (see <c>register_name/3</c> in
diff --git a/lib/kernel/examples/uds_dist/c_src/uds_drv.c b/lib/kernel/examples/uds_dist/c_src/uds_drv.c
index fb10a375f4..9327ab19dc 100644
--- a/lib/kernel/examples/uds_dist/c_src/uds_drv.c
+++ b/lib/kernel/examples/uds_dist/c_src/uds_drv.c
@@ -111,7 +111,7 @@ do {									\
 typedef enum { 
     portTypeUnknown,      /* An uninitialized port */
     portTypeListener,     /* A listening port/socket */
-    portTypeAcceptor,     /* An intermidiate stage when accepting 
+    portTypeAcceptor,     /* An intermediate stage when accepting
 			     on a listen port */
     portTypeConnector,    /* An intermediate stage when connecting */
     portTypeCommand,      /* A connected open port in command mode */
@@ -401,7 +401,7 @@ static void uds_finish(void)
 /*
 ** Protocol to control:
 ** 'C': Set port in command mode.
-** 'I': Set port in intermidiate mode
+** 'I': Set port in intermediate mode
 ** 'D': Set port in data mode
 ** 'N': Get identification number for listen port
 ** 'S': Get statistics
@@ -1000,7 +1000,7 @@ static int ensure_dir(char *path)
 
 /*
 ** Try to open a lock file and lock the first byte write-only (advisory)
-** return the file descriptor if succesful, otherwise -1 (<0).
+** return the file descriptor if successful, otherwise -1 (<0).
 */ 
 static int try_lock(char *sockname, Byte *p_creation)
 {
diff --git a/lib/kernel/src/dist.hrl b/lib/kernel/include/dist.hrl
index aea1ab81ba..aea1ab81ba 100644
--- a/lib/kernel/src/dist.hrl
+++ b/lib/kernel/include/dist.hrl
diff --git a/lib/kernel/src/dist_util.hrl b/lib/kernel/include/dist_util.hrl
index f2b0598532..f2b0598532 100644
--- a/lib/kernel/src/dist_util.hrl
+++ b/lib/kernel/include/dist_util.hrl
diff --git a/lib/kernel/src/net_address.hrl b/lib/kernel/include/net_address.hrl
index 5342076507..5342076507 100644
--- a/lib/kernel/src/net_address.hrl
+++ b/lib/kernel/include/net_address.hrl
diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
index 9db6014a7d..02be6b5036 100644
--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
@@ -118,11 +118,14 @@ MODULES = \
 	user_sup \
 	wrap_log_reader
 
-HRL_FILES= ../include/file.hrl ../include/inet.hrl ../include/inet_sctp.hrl
+HRL_FILES= ../include/file.hrl ../include/inet.hrl ../include/inet_sctp.hrl \
+	../include/dist.hrl ../include/dist_util.hrl \
+	../include/net_address.hrl 
+
 INTERNAL_HRL_FILES= application_master.hrl disk_log.hrl \
-        net_address.hrl inet_dns.hrl inet_res.hrl \
+        inet_dns.hrl inet_res.hrl \
         inet_boot.hrl inet_config.hrl inet_int.hrl \
-	dist.hrl dist_util.hrl inet_dns_record_adts.hrl
+	inet_dns_record_adts.hrl
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -215,7 +218,7 @@ $(EBIN)/code_server.beam: ../include/file.hrl
 $(EBIN)/disk_log.beam: disk_log.hrl
 $(EBIN)/disk_log_1.beam: disk_log.hrl ../include/file.hrl
 $(EBIN)/disk_log_server.beam: disk_log.hrl
-$(EBIN)/dist_util.beam: dist_util.hrl dist.hrl
+$(EBIN)/dist_util.beam: ../include/dist_util.hrl ../include/dist.hrl
 $(EBIN)/erl_boot_server.beam: inet_boot.hrl
 $(EBIN)/erl_epmd.beam: inet_int.hrl erl_epmd.hrl
 $(EBIN)/file.beam: ../include/file.hrl
@@ -226,7 +229,7 @@ $(EBIN)/global.beam: ../../stdlib/include/ms_transform.hrl
 $(EBIN)/hipe_unified_loader.beam: ../../hipe/main/hipe.hrl hipe_ext_format.hrl
 $(EBIN)/inet.beam: ../include/inet.hrl inet_int.hrl ../include/inet_sctp.hrl
 $(EBIN)/inet6_tcp.beam: inet_int.hrl
-$(EBIN)/inet6_tcp_dist.beam: net_address.hrl dist.hrl dist_util.hrl
+$(EBIN)/inet6_tcp_dist.beam: ../include/net_address.hrl ../include/dist.hrl ../include/dist_util.hrl
 $(EBIN)/inet6_udp.beam: inet_int.hrl
 $(EBIN)/inet6_sctp.beam: inet_int.hrl
 $(EBIN)/inet_config.beam: inet_config.hrl ../include/inet.hrl
@@ -237,10 +240,10 @@ $(EBIN)/inet_hosts.beam: ../include/inet.hrl
 $(EBIN)/inet_parse.beam: ../include/file.hrl
 $(EBIN)/inet_res.beam: ../include/inet.hrl inet_res.hrl inet_dns.hrl inet_int.hrl
 $(EBIN)/inet_tcp.beam: inet_int.hrl
-$(EBIN)/inet_udp_dist.beam: net_address.hrl dist.hrl dist_util.hrl
+$(EBIN)/inet_udp_dist.beam: ../include/net_address.hrl ../include/dist.hrl ../include/dist_util.hrl
 $(EBIN)/inet_udp.beam: inet_int.hrl
 $(EBIN)/inet_sctp.beam: inet_int.hrl ../include/inet_sctp.hrl
-$(EBIN)/net_kernel.beam: net_address.hrl
+$(EBIN)/net_kernel.beam: ../include/net_address.hrl
 $(EBIN)/os.beam: ../include/file.hrl
 $(EBIN)/ram_file.beam: ../include/file.hrl
 $(EBIN)/wrap_log_reader.beam: disk_log.hrl ../include/file.hrl
diff --git a/lib/kernel/src/application.erl b/lib/kernel/src/application.erl
index fa3a4c3d36..caac4d926c 100644
--- a/lib/kernel/src/application.erl
+++ b/lib/kernel/src/application.erl
@@ -28,8 +28,6 @@
 -export([get_application/0, get_application/1, info/0]).
 -export([start_type/0]).
 
--export([behaviour_info/1]).
-
 %%%-----------------------------------------------------------------
 
 -type start_type() :: 'normal'
@@ -59,12 +57,12 @@
 
 %%------------------------------------------------------------------
 
--spec behaviour_info(atom()) -> 'undefined' | [{atom(), byte()}].
+-callback start(StartType :: normal | {takeover, node()} | {failover, node()},
+		StartArgs :: term()) ->
+    {ok, pid()} | {ok, pid(), State :: term()} | {error, Reason :: term}.
 
-behaviour_info(callbacks) ->
-    [{start,2},{stop,1}];
-behaviour_info(_Other) ->
-    undefined.
+-callback stop(State :: term()) ->
+    term().
 
 %%%-----------------------------------------------------------------
 %%% This module is API towards application_controller and
diff --git a/lib/kernel/src/auth.erl b/lib/kernel/src/auth.erl
index ac25ab958c..c329a5652a 100644
--- a/lib/kernel/src/auth.erl
+++ b/lib/kernel/src/auth.erl
@@ -212,7 +212,7 @@ handle_info({From,badcookie,net_kernel,{From,spawn_link,_M,_F,_A,_Gleader}}, O)
     {noreply, O};
 handle_info({_From,badcookie,ddd_server,_Mess}, O) ->
     %% Ignore bad messages to the ddd server, they will be resent
-    %% If the authentication is succesful
+    %% If the authentication is successful
     {noreply, O};
 handle_info({From,badcookie,rex,_Msg}, O) ->
     auth:print(getnode(From), 
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index 4a1fc7df34..e3d22e7999 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. 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
@@ -1379,8 +1379,12 @@ absname_vr([[X, $:]|Name], _, _AbsBase) ->
 %%  Kill all processes running code from *old* Module, and then purge the
 %%  module. Return true if any processes killed, else false.
 
-do_purge(Mod) ->
-    do_purge(processes(), to_atom(Mod), false).
+do_purge(Mod0) ->
+    Mod = to_atom(Mod0),
+    case erlang:check_old_code(Mod) of
+	false -> false;
+	true -> do_purge(processes(), Mod, false)
+    end.
 
 do_purge([P|Ps], Mod, Purged) ->
     case erlang:check_process_code(P, Mod) of
@@ -1399,16 +1403,19 @@ do_purge([], Mod, Purged) ->
     Purged.
 
 %% do_soft_purge(Module)
-%% Purge old code only if no procs remain that run old code
+%% Purge old code only if no procs remain that run old code.
 %% Return true in that case, false if procs remain (in this
 %% case old code is not purged)
 
 do_soft_purge(Mod) ->
-    catch do_soft_purge(processes(), Mod).
+    case erlang:check_old_code(Mod) of
+	false -> true;
+	true -> do_soft_purge(processes(), Mod)
+    end.
 
 do_soft_purge([P|Ps], Mod) ->
     case erlang:check_process_code(P, Mod) of
-	true -> throw(false);
+	true -> false;
 	false -> do_soft_purge(Ps, Mod)
     end;
 do_soft_purge([], Mod) ->
diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl
index 9b8d2db437..d6bc23be6d 100644
--- a/lib/kernel/src/disk_log.erl
+++ b/lib/kernel/src/disk_log.erl
@@ -1240,20 +1240,29 @@ is_owner(Pid, L) ->
 
 %% ok | throw(Error)
 rename_file(File, NewFile, halt) ->
-    file:rename(File, NewFile);
+    case file:rename(File, NewFile) of
+        ok ->
+            ok;
+        Else ->
+            file_error(NewFile, Else)
+    end;
 rename_file(File, NewFile, wrap) ->
     rename_file(wrap_file_extensions(File), File, NewFile, ok).
 
-rename_file([Ext|Exts], File, NewFile, Res) ->
-    NRes = case file:rename(add_ext(File, Ext), add_ext(NewFile, Ext)) of
+rename_file([Ext|Exts], File, NewFile0, Res) ->
+    NewFile = add_ext(NewFile0, Ext),
+    NRes = case file:rename(add_ext(File, Ext), NewFile) of
 	       ok ->
 		   Res;
 	       Else ->
-		   Else
+		   file_error(NewFile, Else)
 	   end,
-    rename_file(Exts, File, NewFile, NRes);
+    rename_file(Exts, File, NewFile0, NRes);
 rename_file([], _File, _NewFiles, Res) -> Res.
 
+file_error(FileName, {error, Error}) ->
+    {error, {file_error, FileName, Error}}.
+
 %% "Old" error messages have been kept, arg_mismatch has been added.
 %%-spec compare_arg(dlog_options(), #arg{}, 
 compare_arg([], _A, none, _OrigHead) ->
@@ -1947,7 +1956,8 @@ monitor_request(Pid, Req) ->
     receive 
 	{'DOWN', Ref, process, Pid, _Info} ->
 	    {error, no_such_log};
-	{disk_log, Pid, Reply} ->
+	{disk_log, Pid, Reply} when not is_tuple(Reply) orelse
+                                    element(2, Reply) =/= disk_log_stopped ->
 	    erlang:demonitor(Ref),
 	    receive 
 		{'DOWN', Ref, process, Pid, _Reason} ->
diff --git a/lib/kernel/src/error_handler.erl b/lib/kernel/src/error_handler.erl
index e1f99bf417..a67b11a888 100644
--- a/lib/kernel/src/error_handler.erl
+++ b/lib/kernel/src/error_handler.erl
@@ -88,12 +88,12 @@ int() -> int.
 -spec crash(atom(), [term()]) -> no_return().
 
 crash(Fun, Args) ->
-    crash({Fun,Args}).
+    crash({Fun,Args,[]}).
 
 -spec crash(atom(), atom(), arity()) -> no_return().
 
 crash(M, F, A) ->
-    crash({M,F,A}).
+    crash({M,F,A,[]}).
 
 -spec crash(tuple()) -> no_return().
 
@@ -101,7 +101,8 @@ crash(Tuple) ->
     try erlang:error(undef)
     catch
 	error:undef ->
-	    erlang:raise(error, undef, [Tuple|tl(erlang:get_stacktrace())])
+	    Stk = [Tuple|tl(erlang:get_stacktrace())],
+	    erlang:raise(error, undef, Stk)
     end.
 
 %% If the code_server has not been started yet dynamic code loading
@@ -127,7 +128,7 @@ ensure_loaded(Module) ->
 -spec stub_function(atom(), atom(), [_]) -> no_return().
 
 stub_function(Mod, Func, Args) ->
-    exit({undef,[{Mod,Func,Args}]}).
+    exit({undef,[{Mod,Func,Args,[]}]}).
 
 check_inheritance(Module, Args) ->
     Attrs = erlang:get_module_info(Module, attributes),
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 5e4e1b0ba8..706c60caaf 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -1163,7 +1163,7 @@ path_open_first([Path|Rest], Name, Mode, LastError) ->
 	{error, _} = Error ->
 	    Error;
 	FilePath ->
-	    FileName = filename:join(FilePath, Name),
+	    FileName = fname_join(FilePath, Name),
 	    case open(FileName, Mode) of
 		{ok, Fd} ->
 		    {ok, Fd, FileName};
@@ -1176,6 +1176,11 @@ path_open_first([Path|Rest], Name, Mode, LastError) ->
 path_open_first([], _Name, _Mode, LastError) ->
     {error, LastError}.
 
+fname_join(".", Name) ->
+    Name;
+fname_join(Dir, Name) ->
+    filename:join(Dir, Name).
+
 %%%-----------------------------------------------------------------
 %%% Utility functions.
 
diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl
index 004f03f231..6cebb7ab97 100644
--- a/lib/kernel/src/gen_sctp.erl
+++ b/lib/kernel/src/gen_sctp.erl
@@ -33,55 +33,85 @@
 -export([error_string/1]).
 -export([controlling_process/2]).
 
--opaque assoc_id() :: term().
--type hostname() :: inet:hostname().
--type ip_address() :: inet:ip_address().
--type port_number() :: 0..65535.
--type posix() :: inet:posix().
--type sctp_option() ::
-        {mode, list | binary} | list | binary
-      | {active, true | false | once}
-      | {buffer, non_neg_integer()}
-      | {tos, integer()}
-      | {priority, integer()}
-      | {dontroute, boolean()}
-      | {reuseaddr, boolean()}
-      | {linger, {boolean(), non_neg_integer()}}
-      | {sndbuf, non_neg_integer()}
-      | {recbuf, non_neg_integer()}
-      | {sctp_rtoinfo, #sctp_rtoinfo{}}
-      | {sctp_associnfo, #sctp_assocparams{}}
-      | {sctp_initmsg, #sctp_initmsg{}}
-      | {sctp_autoclose, timeout()}
-      | {sctp_nodelay, boolean()}
-      | {sctp_disable_fragments, boolean()}
-      | {sctp_i_want_mapped_v4_addr, boolean()}
-      | {sctp_maxseg, non_neg_integer()}
-      | {sctp_primary_addr, #sctp_prim{}}
-      | {sctp_set_peer_primary_addr, #sctp_setpeerprim{}}
-      | {sctp_adaptation_layer, #sctp_setadaptation{}}
-      | {sctp_peer_addr_params, #sctp_paddrparams{}}
-      | {sctp_default_send_param, #sctp_sndrcvinfo{}}
-      | {sctp_events, #sctp_event_subscribe{}}
-      | {sctp_delayed_ack_time, #sctp_assoc_value{}}
-      | {sctp_status, #sctp_status{}}
-      | {sctp_get_peer_addr_info, #sctp_paddrinfo{}}.
--opaque sctp_socket() :: port().
-
--spec open() -> {ok, Socket} | {error, posix()} when
+-type assoc_id() :: term().
+-type option() ::
+        {active, true | false | once} |
+        {buffer, non_neg_integer()} |
+        {dontroute, boolean()} |
+        {linger, {boolean(), non_neg_integer()}} |
+        {mode, list | binary} | list | binary |
+        {priority, non_neg_integer()} |
+        {recbuf, non_neg_integer()} |
+        {reuseaddr, boolean()} |
+        {sctp_adaptation_layer, #sctp_setadaptation{}} |
+        {sctp_associnfo, #sctp_assocparams{}} |
+        {sctp_autoclose, non_neg_integer()} |
+        {sctp_default_send_param, #sctp_sndrcvinfo{}} |
+        {sctp_delayed_ack_time, #sctp_assoc_value{}} |
+        {sctp_disable_fragments, boolean()} |
+        {sctp_events, #sctp_event_subscribe{}} |
+        {sctp_get_peer_addr_info, #sctp_paddrinfo{}} |
+        {sctp_i_want_mapped_v4_addr, boolean()} |
+        {sctp_initmsg, #sctp_initmsg{}} |
+        {sctp_maxseg, non_neg_integer()} |
+        {sctp_nodelay, boolean()} |
+        {sctp_peer_addr_params, #sctp_paddrparams{}} |
+        {sctp_primary_addr, #sctp_prim{}} |
+        {sctp_rtoinfo, #sctp_rtoinfo{}} |
+        {sctp_set_peer_primary_addr, #sctp_setpeerprim{}} |
+        {sctp_status, #sctp_status{}} |
+        {sndbuf, non_neg_integer()} |
+        {tos, non_neg_integer()}.
+-type option_name() ::
+        active |
+        buffer |
+        dontroute |
+        linger |
+        mode |
+        priority |
+        recbuf |
+        reuseaddr |
+        sctp_adaptation_layer |
+        sctp_associnfo |
+        sctp_autoclose |
+        sctp_default_send_param |
+        sctp_delayed_ack_time |
+        sctp_disable_fragments |
+        sctp_events |
+        sctp_get_peer_addr_info |
+        sctp_i_want_mapped_v4_addr |
+        sctp_initmsg |
+        sctp_maxseg |
+        sctp_nodelay |
+        sctp_peer_addr_params |
+        sctp_primary_addr |
+        sctp_rtoinfo |
+        sctp_set_peer_primary_addr |
+        sctp_status |
+        sndbuf |
+        tos.
+-type sctp_socket() :: port().
+
+-export_type([assoc_id/0, option/0, option_name/0, sctp_socket/0]).
+
+-spec open() -> {ok, Socket} | {error, inet:posix()} when
       Socket :: sctp_socket().
 
 open() ->
     open([]).
 
--spec open(Port) -> {ok, Socket} | {error, posix()} when
-              Port :: port_number(),
+-spec open(Port) -> {ok, Socket} | {error, inet:posix()} when
+              Port :: inet:port_number(),
               Socket :: sctp_socket();
-          (Opts) -> {ok, Socket} | {error, posix()} when
+          (Opts) -> {ok, Socket} | {error, inet:posix()} when
               Opts :: [Opt],
-              Opt :: {ip,IP} | {ifaddr,IP} | {port,Port} | sctp_option(),
-              IP :: ip_address() | any | loopback,
-              Port :: port_number(),
+              Opt :: {ip,IP}
+                   | {ifaddr,IP}
+                   | inet:address_family()
+                   | {port,Port}
+                   | option(),
+              IP :: inet:ip_address() | any | loopback,
+              Port :: inet:port_number(),
               Socket :: sctp_socket().
 
 open(Opts) when is_list(Opts) ->
@@ -98,11 +128,15 @@ open(Port) when is_integer(Port) ->
 open(X) ->
     erlang:error(badarg, [X]).
 
--spec open(Port, Opts) -> {ok, Socket} | {error, posix()} when
+-spec open(Port, Opts) -> {ok, Socket} | {error, inet:posix()} when
       Opts :: [Opt],
-      Opt :: {ip,IP} | {ifaddr,IP} | {port,Port} | sctp_option(),
-      IP :: ip_address() | any | loopback,
-      Port :: port_number(),
+              Opt :: {ip,IP}
+                   | {ifaddr,IP}
+                   | inet:address_family()
+                   | {port,Port}
+                   | option(),
+      IP :: inet:ip_address() | any | loopback,
+      Port :: inet:port_number(),
       Socket :: sctp_socket().
 
 open(Port, Opts) when is_integer(Port), is_list(Opts) ->
@@ -110,7 +144,7 @@ open(Port, Opts) when is_integer(Port), is_list(Opts) ->
 open(Port, Opts) ->
     erlang:error(badarg, [Port,Opts]).
 
--spec close(Socket) -> ok | {error, posix()} when
+-spec close(Socket) -> ok | {error, inet:posix()} when
       Socket :: sctp_socket().
 
 close(S) when is_port(S) ->
@@ -138,22 +172,22 @@ listen(S, Flag) when is_port(S), is_boolean(Flag) ->
 listen(S, Flag) ->
     erlang:error(badarg, [S,Flag]).
 
--spec connect(Socket, Addr, Port, Opts) -> {ok, Assoc} | {error, posix()} when
+-spec connect(Socket, Addr, Port, Opts) -> {ok, Assoc} | {error, inet:posix()} when
       Socket :: sctp_socket(),
-      Addr :: ip_address() | hostname(),
-      Port :: port_number(),
-      Opts :: [Opt :: sctp_option()],
+      Addr :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Opts :: [Opt :: option()],
       Assoc :: #sctp_assoc_change{}.
 
 connect(S, Addr, Port, Opts) ->
     connect(S, Addr, Port, Opts, infinity).
 
 -spec connect(Socket, Addr, Port, Opts, Timeout) ->
-                     {ok, Assoc} | {error, posix()} when
+                     {ok, Assoc} | {error, inet:posix()} when
       Socket :: sctp_socket(),
-      Addr :: ip_address() | hostname(),
-      Port :: port_number(),
-      Opts :: [Opt :: sctp_option()],
+      Addr :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Opts :: [Opt :: option()],
       Timeout :: timeout(),
       Assoc :: #sctp_assoc_change{}.
 
@@ -166,21 +200,21 @@ connect(S, Addr, Port, Opts, Timeout) ->
     end.
 
 -spec connect_init(Socket, Addr, Port, Opts) ->
-                          ok | {error, posix()} when
+                          ok | {error, inet:posix()} when
       Socket :: sctp_socket(),
-      Addr :: ip_address() | hostname(),
-      Port :: port_number(),
-      Opts :: [sctp_option()].
+      Addr :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Opts :: [option()].
 
 connect_init(S, Addr, Port, Opts) ->
     connect_init(S, Addr, Port, Opts, infinity).
 
 -spec connect_init(Socket, Addr, Port, Opts, Timeout) ->
-                          ok | {error, posix()} when
+                          ok | {error, inet:posix()} when
       Socket :: sctp_socket(),
-      Addr :: ip_address() | hostname(),
-      Port :: port_number(),
-      Opts :: [sctp_option()],
+      Addr :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Opts :: [option()],
       Timeout :: timeout().
 
 connect_init(S, Addr, Port, Opts, Timeout) ->
@@ -232,7 +266,7 @@ eof(S, #sctp_assoc_change{assoc_id=AssocId}) when is_port(S) ->
 eof(S, Assoc) ->
     erlang:error(badarg, [S,Assoc]).
 
--spec abort(Socket, Assoc) -> ok | {error, posix()} when
+-spec abort(Socket, Assoc) -> ok | {error, inet:posix()} when
       Socket :: sctp_socket(),
       Assoc :: #sctp_assoc_change{}.
 
@@ -294,13 +328,13 @@ send(S, AssocChange, Stream, Data) ->
 -spec recv(Socket) -> {ok, {FromIP, FromPort, AncData, Data}}
                           | {error, Reason} when
       Socket :: sctp_socket(),
-      FromIP   :: ip_address(),
-      FromPort :: port_number(),
+      FromIP   :: inet:ip_address(),
+      FromPort :: inet:port_number(),
       AncData  :: [#sctp_sndrcvinfo{}],
       Data     :: binary() | string() | #sctp_sndrcvinfo{}
                 | #sctp_assoc_change{} | #sctp_paddr_change{}
                 | #sctp_adaptation_event{},
-      Reason   :: posix() | #sctp_send_failed{} | #sctp_paddr_change{}
+      Reason   :: inet:posix() | #sctp_send_failed{} | #sctp_paddr_change{}
                 | #sctp_pdapi_event{} | #sctp_remote_error{}
                 | #sctp_shutdown_event{}.
 
@@ -311,13 +345,13 @@ recv(S) ->
                                    | {error, Reason} when
       Socket :: sctp_socket(),
       Timeout :: timeout(),
-      FromIP   :: ip_address(),
-      FromPort :: port_number(),
+      FromIP   :: inet:ip_address(),
+      FromPort :: inet:port_number(),
       AncData  :: [#sctp_sndrcvinfo{}],
       Data     :: binary() | string() | #sctp_sndrcvinfo{}
                 | #sctp_assoc_change{} | #sctp_paddr_change{}
                 | #sctp_adaptation_event{},
-      Reason   :: posix() | #sctp_send_failed{} | #sctp_paddr_change{}
+      Reason   :: inet:posix() | #sctp_send_failed{} | #sctp_paddr_change{}
                 | #sctp_pdapi_event{} | #sctp_remote_error{}
                 | #sctp_shutdown_event{}.
 
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index bee61ca84a..8ab18c01b4 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -28,34 +28,108 @@
 
 -include("inet_int.hrl").
 
--type hostname() :: inet:hostname().
--type ip_address() :: inet:ip_address().
--type port_number() :: 0..65535.
--type posix() :: inet:posix().
+-type option() ::
+        {active,          true | false | once} |
+        {bit8,            clear | set | on | off} |
+        {buffer,          non_neg_integer()} |
+        {delay_send,      boolean()} |
+        {deliver,         port | term} |
+        {dontroute,       boolean()} |
+        {exit_on_close,   boolean()} |
+        {header,          non_neg_integer()} |
+        {high_watermark,  non_neg_integer()} |
+        {keepalive,       boolean()} |
+        {linger,          {boolean(), non_neg_integer()}} |
+        {low_watermark,   non_neg_integer()} |
+        {mode,            list | binary} | list | binary |
+        {nodelay,         boolean()} |
+        {packet,
+         0 | 1 | 2 | 4 | raw | sunrm |  asn1 |
+         cdr | fcgi | line | tpkt | http | httph | http_bin | httph_bin } |
+        {packet_size,     non_neg_integer()} |
+        {priority,        non_neg_integer()} |
+        {raw,
+         Protocol :: non_neg_integer(),
+         OptionNum :: non_neg_integer(),
+         ValueBin :: binary()} |
+        {recbuf,          non_neg_integer()} |
+        {reuseaddr,       boolean()} |
+        {send_timeout,    non_neg_integer() | infinity} |
+        {send_timeout_close, boolean()} |
+        {sndbuf,          non_neg_integer()} |
+        {tos,             non_neg_integer()}.
+-type option_name() ::
+        active |
+        bit8 |
+        buffer |
+        delay_send |
+        deliver |
+        dontroute |
+        exit_on_close |
+        header |
+        high_watermark |
+        keepalive |
+        linger |
+        low_watermark |
+        mode |
+        nodelay |
+        packet |
+        packet_size |
+        priority |
+        {raw,
+         Protocol :: non_neg_integer(),
+         OptionNum :: non_neg_integer(),
+         ValueSpec :: (ValueSize :: non_neg_integer()) |
+                      (ValueBin :: binary())} |
+        recbuf |
+        reuseaddr |
+        send_timeout |
+        send_timeout_close |
+        sndbuf |
+        tos.
+-type connect_option() ::
+        {ip, inet:ip_address()} |
+        {fd, Fd :: non_neg_integer()} |
+        {ifaddr, inet:ip_address()} |
+        inet:address_family() |
+        {port, inet:port_number()} |
+        {tcp_module, module()} |
+        option().
+-type listen_option() ::
+        {ip, inet:ip_address()} |
+        {fd, Fd :: non_neg_integer()} |
+        {ifaddr, inet:ip_address()} |
+        inet:address_family() |
+        {port, inet:port_number()} |
+        {backlog, B :: non_neg_integer()} |
+        {tcp_module, module()} |
+        option().
 -type socket() :: port().
 
+-export_type([option/0, option_name/0, connect_option/0, listen_option/0]).
+
 %%
 %% Connect a socket
 %%
 
 -spec connect(Address, Port, Options) -> {ok, Socket} | {error, Reason} when
-      Address :: ip_address() | hostname(),
-      Port :: port_number(),
-      Options :: [Opt :: term()],
+      Address :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Options :: [connect_option()],
       Socket :: socket(),
-      Reason :: posix().
+      Reason :: inet:posix().
 
 connect(Address, Port, Opts) -> 
     connect(Address,Port,Opts,infinity).
 
 -spec connect(Address, Port, Options, Timeout) ->
                      {ok, Socket} | {error, Reason} when
-      Address :: ip_address() | hostname(),
-      Port :: port_number(),
-      Options :: [Opt :: term()],
+      Address :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Options :: [connect_option()],
       Timeout :: timeout(),
       Socket :: socket(),
-      Reason :: posix().
+      Reason :: inet:posix().
 
 connect(Address, Port, Opts, Time) ->
     Timer = inet:start_timer(Time),
@@ -97,10 +171,10 @@ try_connect([], _Port, _Opts, _Timer, _Mod, Err) ->
 %%
 
 -spec listen(Port, Options) -> {ok, ListenSocket} | {error, Reason} when
-      Port :: port_number(),
-      Options :: [Opt :: term()],
+      Port :: inet:port_number(),
+      Options :: [listen_option()],
       ListenSocket :: socket(),
-      Reason :: posix().
+      Reason :: inet:posix().
 
 listen(Port, Opts) ->
     Mod = mod(Opts, undefined),
@@ -119,7 +193,7 @@ listen(Port, Opts) ->
 -spec accept(ListenSocket) -> {ok, Socket} | {error, Reason} when
       ListenSocket :: socket(),
       Socket :: socket(),
-      Reason :: closed | timeout | posix().
+      Reason :: closed | timeout | inet:posix().
 
 accept(S) ->
     case inet_db:lookup_socket(S) of
@@ -133,7 +207,7 @@ accept(S) ->
       ListenSocket :: socket(),
       Timeout :: timeout(),
       Socket :: socket(),
-      Reason :: closed | timeout | posix().
+      Reason :: closed | timeout | inet:posix().
 
 accept(S, Time) when is_port(S) ->
     case inet_db:lookup_socket(S) of
@@ -150,7 +224,7 @@ accept(S, Time) when is_port(S) ->
 -spec shutdown(Socket, How) -> ok | {error, Reason} when
       Socket :: socket(),
       How :: read | write | read_write,
-      Reason :: posix().
+      Reason :: inet:posix().
 
 shutdown(S, How) when is_port(S) ->
     case inet_db:lookup_socket(S) of
@@ -176,8 +250,8 @@ close(S) ->
 
 -spec send(Socket, Packet) -> ok | {error, Reason} when
       Socket :: socket(),
-      Packet :: string() | binary(),
-      Reason :: posix().
+      Packet :: iodata(),
+      Reason :: inet:posix().
 
 send(S, Packet) when is_port(S) ->
     case inet_db:lookup_socket(S) of
@@ -195,7 +269,7 @@ send(S, Packet) when is_port(S) ->
       Socket :: socket(),
       Length :: non_neg_integer(),
       Packet :: string() | binary() | HttpPacket,
-      Reason :: closed | posix(),
+      Reason :: closed | inet:posix(),
       HttpPacket :: term().
 
 recv(S, Length) when is_port(S) ->
@@ -211,7 +285,7 @@ recv(S, Length) when is_port(S) ->
       Length :: non_neg_integer(),
       Timeout :: timeout(),
       Packet :: string() | binary() | HttpPacket,
-      Reason :: closed | posix(),
+      Reason :: closed | inet:posix(),
       HttpPacket :: term().
 
 recv(S, Length, Time) when is_port(S) ->
@@ -237,7 +311,7 @@ unrecv(S, Data) when is_port(S) ->
 -spec controlling_process(Socket, Pid) -> ok | {error, Reason} when
       Socket :: socket(),
       Pid :: pid(),
-      Reason :: closed | not_owner | posix().
+      Reason :: closed | not_owner | inet:posix().
 
 controlling_process(S, NewOwner) ->
     case inet_db:lookup_socket(S) of
diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl
index 7d14615c04..8688799ae9 100644
--- a/lib/kernel/src/gen_udp.erl
+++ b/lib/kernel/src/gen_udp.erl
@@ -25,25 +25,74 @@
 
 -include("inet_int.hrl").
 
--type hostname() :: inet:hostname().
--type ip_address() :: inet:ip_address().
--type port_number() :: 0..65535.
--type posix() :: inet:posix().
+-type option() ::
+        {active,          true | false | once} |
+        {add_membership,  {inet:ip_address(), inet:ip_address()}} |
+        {broadcast,       boolean()} |
+        {buffer,          non_neg_integer()} |
+        {deliver,         port | term} |
+        {dontroute,       boolean()} |
+        {drop_membership, {inet:ip_address(), inet:ip_address()}} |
+        {header,          non_neg_integer()} |
+        {mode,            list | binary} | list | binary |
+        {multicast_if,    inet:ip_address()} |
+        {multicast_loop,  boolean()} |
+        {multicast_ttl,   non_neg_integer()} |
+        {priority,        non_neg_integer()} |
+        {raw,
+         Protocol :: non_neg_integer(),
+         OptionNum :: non_neg_integer(),
+         ValueBin :: binary()} |
+        {read_packets,    non_neg_integer()} |
+        {recbuf,          non_neg_integer()} |
+        {reuseaddr,       boolean()} |
+        {sndbuf,          non_neg_integer()} |
+        {tos,             non_neg_integer()}.
+-type option_name() ::
+        active |
+        broadcast |
+        buffer |
+        deliver |
+        dontroute |
+        header |
+        mode |
+        multicast_if |
+        multicast_loop |
+        multicast_ttl |
+        priority |
+        {raw,
+         Protocol :: non_neg_integer(),
+         OptionNum :: non_neg_integer(),
+         ValueSpec :: (ValueSize :: non_neg_integer()) |
+                      (ValueBin :: binary())} |
+        read_packets |
+        recbuf |
+        reuseaddr |
+        sndbuf |
+        tos.
 -type socket() :: port().
 
+-export_type([option/0, option_name/0]).
+
 -spec open(Port) -> {ok, Socket} | {error, Reason} when
-      Port :: port_number(),
+      Port :: inet:port_number(),
       Socket :: socket(),
-      Reason :: posix().
+      Reason :: inet:posix().
 
 open(Port) -> 
     open(Port, []).
 
 -spec open(Port, Opts) -> {ok, Socket} | {error, Reason} when
-      Port :: port_number(),
-      Opts :: [Opt :: term()],
+      Port :: inet:port_number(),
+      Opts :: [Option],
+      Option :: {ip, inet:ip_address()}
+              | {fd, non_neg_integer()}
+              | {ifaddr, inet:ip_address()}
+              | inet:address_family()
+              | {port, inet:port_number()}
+              | option(),
       Socket :: socket(),
-      Reason :: posix().
+      Reason :: inet:posix().
 
 open(Port, Opts) ->
     Mod = mod(Opts, undefined),
@@ -58,10 +107,10 @@ close(S) ->
 
 -spec send(Socket, Address, Port, Packet) -> ok | {error, Reason} when
       Socket :: socket(),
-      Address :: ip_address() | hostname(),
-      Port :: port_number(),
-      Packet :: string() | binary(),
-      Reason :: not_owner | posix().
+      Address :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Packet :: iodata(),
+      Reason :: not_owner | inet:posix().
 
 send(S, Address, Port, Packet) when is_port(S) ->
     case inet_db:lookup_socket(S) of
@@ -92,10 +141,10 @@ send(S, Packet) when is_port(S) ->
                   {ok, {Address, Port, Packet}} | {error, Reason} when
       Socket :: socket(),
       Length :: non_neg_integer(),
-      Address :: ip_address(),
-      Port :: port_number(),
+      Address :: inet:ip_address(),
+      Port :: inet:port_number(),
       Packet :: string() | binary(),
-      Reason :: not_owner | posix().
+      Reason :: not_owner | inet:posix().
 
 recv(S,Len) when is_port(S), is_integer(Len) ->
     case inet_db:lookup_socket(S) of
@@ -110,10 +159,10 @@ recv(S,Len) when is_port(S), is_integer(Len) ->
       Socket :: socket(),
       Length :: non_neg_integer(),
       Timeout :: timeout(),
-      Address :: ip_address(),
-      Port :: port_number(),
+      Address :: inet:ip_address(),
+      Port :: inet:port_number(),
       Packet :: string() | binary(),
-      Reason :: not_owner | posix().
+      Reason :: not_owner | inet:posix().
 
 recv(S,Len,Time) when is_port(S) ->
     case inet_db:lookup_socket(S) of
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 5649188c38..48a6f3db65 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -63,8 +63,9 @@
 %% timer interface
 -export([start_timer/1, timeout/1, timeout/2, stop_timer/1]).
 
--export_type([family_option/0, hostent/0, hostname/0, ip4_address/0,
-              ip6_address/0, ip_address/0, posix/0, socket/0]).
+-export_type([address_family/0, hostent/0, hostname/0, ip4_address/0,
+              ip6_address/0, ip_address/0, posix/0, socket/0,
+              port_number/0]).
 
 %% imports
 -import(lists, [append/1, duplicate/2, filter/2, foldl/3]).
@@ -87,98 +88,15 @@
 -type ip6_address() :: {0..65535,0..65535,0..65535,0..65535,
 			0..65535,0..65535,0..65535,0..65535}.
 -type ip_address() :: ip4_address() | ip6_address().
--type ip_port() :: 0..65535.
+-type port_number() :: 0..65535.
 -type posix() :: exbadport | exbadseq | file:posix().
 -type socket() :: port().
 
 -type socket_setopt() ::
-      {'raw', non_neg_integer(), non_neg_integer(), binary()} |
-      %% TCP/UDP options
-      {'reuseaddr',       boolean()} |
-      {'keepalive',       boolean()} |
-      {'dontroute',       boolean()} |
-      {'linger',          {boolean(), non_neg_integer()}} |
-      {'broadcast',       boolean()} |
-      {'sndbuf',          non_neg_integer()} |
-      {'recbuf',          non_neg_integer()} |
-      {'priority',        non_neg_integer()} |
-      {'tos',             non_neg_integer()} |
-      {'nodelay',         boolean()} |
-      {'multicast_ttl',   non_neg_integer()} |
-      {'multicast_loop',  boolean()} |
-      {'multicast_if',    ip_address()} |
-      {'add_membership',  {ip_address(), ip_address()}} |
-      {'drop_membership', {ip_address(), ip_address()}} |
-      {'header',          non_neg_integer()} |
-      {'buffer',          non_neg_integer()} |
-      {'active',          boolean() | 'once'} |
-      {'packet',        
-       0 | 1 | 2 | 4 | 'raw' | 'sunrm' |  'asn1' |
-       'cdr' | 'fcgi' | 'line' | 'tpkt' | 'http' | 'httph' | 'http_bin' | 'httph_bin' } |
-      {'mode',           'list' | 'binary'} |
-      {'port',           'port', 'term'} |
-      {'exit_on_close',   boolean()} |
-      {'low_watermark',   non_neg_integer()} |
-      {'high_watermark',  non_neg_integer()} |
-      {'bit8',            'clear' | 'set' | 'on' | 'off'} |
-      {'send_timeout',    non_neg_integer() | 'infinity'} |
-      {'send_timeout_close', boolean()} |
-      {'delay_send',      boolean()} |
-      {'packet_size',     non_neg_integer()} |
-      {'read_packets',    non_neg_integer()} |
-      %% SCTP options
-      {'sctp_rtoinfo',               #sctp_rtoinfo{}} |
-      {'sctp_associnfo',             #sctp_assocparams{}} |
-      {'sctp_initmsg',               #sctp_initmsg{}} |
-      {'sctp_nodelay',               boolean()} |
-      {'sctp_autoclose',             non_neg_integer()} |
-      {'sctp_disable_fragments',     boolean()} |
-      {'sctp_i_want_mapped_v4_addr', boolean()} |
-      {'sctp_maxseg',                non_neg_integer()} |
-      {'sctp_primary_addr',          #sctp_prim{}} |
-      {'sctp_set_peer_primary_addr', #sctp_setpeerprim{}} |
-      {'sctp_adaptation_layer',      #sctp_setadaptation{}} |
-      {'sctp_peer_addr_params',      #sctp_paddrparams{}} |
-      {'sctp_default_send_param',    #sctp_sndrcvinfo{}} |
-      {'sctp_events',                #sctp_event_subscribe{}} |
-      {'sctp_delayed_ack_time',      #sctp_assoc_value{}}.
+        gen_sctp:option() | gen_tcp:option() | gen_udp:option().
 
 -type socket_getopt() ::
-      {'raw',
-       non_neg_integer(), non_neg_integer(), binary()|non_neg_integer()} |
-      %% TCP/UDP options
-      'reuseaddr' | 'keepalive' | 'dontroute' | 'linger' |
-      'broadcast' | 'sndbuf' | 'recbuf' | 'priority' | 'tos' | 'nodelay' | 
-      'multicast_ttl' | 'multicast_loop' | 'multicast_if' | 
-      'add_membership' | 'drop_membership' | 
-      'header' | 'buffer' | 'active' | 'packet' | 'mode' | 'port' | 
-      'exit_on_close' | 'low_watermark' | 'high_watermark' | 'bit8' | 
-      'send_timeout' | 'send_timeout_close' |
-      'delay_send' | 'packet_size' | 'read_packets' | 
-      %% SCTP options
-      {'sctp_status',                #sctp_status{}} |
-      'sctp_get_peer_addr_info' |
-      {'sctp_get_peer_addr_info',    #sctp_status{}} |
-      'sctp_rtoinfo' |
-      {'sctp_rtoinfo',               #sctp_rtoinfo{}} |
-      'sctp_associnfo' |
-      {'sctp_associnfo',             #sctp_assocparams{}} |
-      'sctp_initmsg' |
-      {'sctp_initmsg',               #sctp_initmsg{}} |
-      'sctp_nodelay' | 'sctp_autoclose' | 'sctp_disable_fragments' |
-      'sctp_i_want_mapped_v4_addr' | 'sctp_maxseg' |
-      {'sctp_primary_addr',          #sctp_prim{}} |
-      {'sctp_set_peer_primary_addr', #sctp_setpeerprim{}} |
-      'sctp_adaptation_layer' |
-      {'sctp_adaptation_layer',      #sctp_setadaptation{}} |
-      {'sctp_peer_addr_params',      #sctp_paddrparams{}} |
-      'sctp_default_send_param' |
-      {'sctp_default_send_param',    #sctp_sndrcvinfo{}} |
-      'sctp_events' |
-      {'sctp_events',                #sctp_event_subscribe{}} |
-      'sctp_delayed_ack_time' |
-      {'sctp_delayed_ack_time',      #sctp_assoc_value{}}.
-
+        gen_sctp:option_name() | gen_tcp:option_name() | gen_udp:option_name().
 -type ether_address() :: [0..255].
 
 -type if_setopt() ::
@@ -196,7 +114,7 @@
       'addr' | 'broadaddr' | 'dstaddr' | 
       'mtu' | 'netmask' | 'flags' |'hwaddr'.
 
--type family_option() :: 'inet' | 'inet6'.
+-type address_family() :: 'inet' | 'inet6'.
 -type protocol_option() :: 'tcp' | 'udp' | 'sctp'.
 -type stat_option() :: 
 	'recv_cnt' | 'recv_max' | 'recv_avg' | 'recv_oct' | 'recv_dvi' |
@@ -229,7 +147,7 @@ close(Socket) ->
 peername(Socket) -> 
     prim_inet:peername(Socket).
 
--spec setpeername(Socket :: socket(), Address :: {ip_address(), ip_port()}) ->
+-spec setpeername(Socket :: socket(), Address :: {ip_address(), port_number()}) ->
 	'ok' | {'error', any()}.
 
 setpeername(Socket, {IP,Port}) ->
@@ -246,7 +164,7 @@ setpeername(Socket, undefined) ->
 sockname(Socket) -> 
     prim_inet:sockname(Socket).
 
--spec setsockname(Socket :: socket(), Address :: {ip_address(), ip_port()}) ->
+-spec setsockname(Socket :: socket(), Address :: {ip_address(), port_number()}) ->
 	'ok' | {'error', any()}.
 
 setsockname(Socket, {IP,Port}) -> 
@@ -254,7 +172,9 @@ setsockname(Socket, {IP,Port}) ->
 setsockname(Socket, undefined) ->
     prim_inet:setsockname(Socket, undefined).
 
--spec port(Socket :: socket()) -> {'ok', ip_port()} | {'error', any()}.
+-spec port(Socket) -> {'ok', Port} | {'error', any()} when
+      Socket :: socket(),
+      Port :: port_number().
 
 port(Socket) ->
     case prim_inet:sockname(Socket) of
@@ -268,16 +188,18 @@ port(Socket) ->
 send(Socket, Packet) -> 
     prim_inet:send(Socket, Packet).
     
--spec setopts(Socket :: socket(), Opts :: [socket_setopt()]) -> 
-	'ok' | {'error', posix()}.
+-spec setopts(Socket, Options) -> ok | {error, posix()} when
+      Socket :: socket(),
+      Options :: [socket_setopt()].
 
 setopts(Socket, Opts) -> 
     prim_inet:setopts(Socket, Opts).
 
 -spec getopts(Socket, Options) ->
-	{'ok', [socket_setopt()]} | {'error', posix()} when
+	{'ok', OptionValues} | {'error', posix()} when
       Socket :: socket(),
-      Options :: [socket_getopt()].
+      Options :: [socket_getopt()],
+      OptionValues :: [socket_setopt()].
 
 getopts(Socket, Opts) ->
     prim_inet:getopts(Socket, Opts).
@@ -419,14 +341,19 @@ gethostname() ->
 gethostname(Socket) ->
     prim_inet:gethostname(Socket).
 
--spec getstat(Socket :: socket()) ->
-	{'ok', [{stat_option(), integer()}]} | {'error', posix()}.
+-spec getstat(Socket) ->
+	{ok, OptionValues} | {error, posix()} when
+      Socket :: socket(),
+      OptionValues :: [{stat_option(), integer()}].
 
 getstat(Socket) ->
     prim_inet:getstat(Socket, stats()).
 
--spec getstat(Socket :: socket(), Statoptions :: [stat_option()]) ->
-	{'ok', [{stat_option(), integer()}]} | {'error', posix()}.
+-spec getstat(Socket, Options) ->
+	{ok, OptionValues} | {error, posix()} when
+      Socket :: socket(),
+      Options :: [stat_option()],
+      OptionValues :: [{stat_option(), integer()}].
 
 getstat(Socket,What) ->
     prim_inet:getstat(Socket, What).
@@ -441,14 +368,14 @@ gethostbyname(Name) ->
 -spec gethostbyname(Hostname, Family) ->
                            {ok, Hostent} | {error, posix()} when
       Hostname :: hostname(),
-      Family :: family_option(),
+      Family :: address_family(),
       Hostent :: hostent().
 
 gethostbyname(Name,Family) -> 
     gethostbyname_tm(Name, Family, false).
 
 -spec gethostbyname(Name :: hostname(),
-	            Family :: family_option(),
+	            Family :: address_family(),
 	            Timeout :: non_neg_integer() | 'infinity') ->
 	{'ok', #hostent{}} | {'error', posix()}.
 	
@@ -527,14 +454,14 @@ getfd(Socket) ->
 
 -spec getaddr(Host, Family) -> {ok, Address} | {error, posix()} when
       Host :: ip_address() | hostname(),
-      Family :: family_option(),
+      Family :: address_family(),
       Address :: ip_address().
 
 getaddr(Address, Family) ->
     getaddr(Address, Family, infinity).
 
 -spec getaddr(Host :: ip_address() | hostname(),
-	      Family :: family_option(),
+	      Family :: address_family(),
 	      Timeout :: non_neg_integer() | 'infinity') ->
 	{'ok', ip_address()} | {'error', posix()}.
 
@@ -553,14 +480,14 @@ getaddr_tm(Address, Family, Timer) ->
 -spec getaddrs(Host, Family) ->
 	{ok, Addresses} | {error, posix()} when
       Host :: ip_address() | hostname(),
-      Family :: family_option(),
+      Family :: address_family(),
       Addresses :: [ip_address()].
 
 getaddrs(Address, Family) -> 
     getaddrs(Address, Family, infinity).
 
 -spec getaddrs(Host :: ip_address() | string() | atom(),
-	       Family :: family_option(),
+	       Family :: address_family(),
 	       Timeout :: non_neg_integer() | 'infinity') ->
 	{'ok', [ip_address()]} | {'error', posix()}.
 
@@ -570,7 +497,7 @@ getaddrs(Address, Family, Timeout) ->
     stop_timer(Timer),
     Res.
 
--spec getservbyport(Port :: ip_port(), Protocol :: atom() | string()) ->
+-spec getservbyport(Port :: port_number(), Protocol :: atom() | string()) ->
 	{'ok', string()} | {'error', posix()}.
 
 getservbyport(Port, Proto) ->
@@ -584,7 +511,7 @@ getservbyport(Port, Proto) ->
 
 -spec getservbyname(Name :: atom() | string(),
 	            Protocol :: atom() | string()) ->
-	{'ok', ip_port()} | {'error', posix()}.
+	{'ok', port_number()} | {'error', posix()}.
 
 getservbyname(Name, Protocol) when is_atom(Name) ->
     case inet_udp:open(0, []) of
@@ -1067,7 +994,7 @@ gethostbyaddr_tm_native(Addr, Timer, Opts) ->
 
 -spec open(Fd :: integer(),
 	   Addr :: ip_address(),
-	   Port :: ip_port(),
+	   Port :: port_number(),
 	   Opts :: [socket_setopt()],
 	   Protocol :: protocol_option(),
 	   Family :: 'inet' | 'inet6',
@@ -1108,7 +1035,7 @@ open(Fd, _Addr, _Port, Opts, Protocol, Family, Module) ->
 -spec fdopen(Fd :: non_neg_integer(),
 	     Opts :: [socket_setopt()],
 	     Protocol :: protocol_option(),
-	     Family :: family_option(),
+	     Family :: address_family(),
 	     Module :: atom()) ->
 	{'ok', socket()} | {'error', posix()}.
 
diff --git a/lib/kernel/src/inet_res.erl b/lib/kernel/src/inet_res.erl
index d1f5644ff7..59ba408d7a 100644
--- a/lib/kernel/src/inet_res.erl
+++ b/lib/kernel/src/inet_res.erl
@@ -407,7 +407,7 @@ gethostbyname(Name) ->
 -spec gethostbyname(Name, Family) -> {ok, Hostent} | {error, Reason} when
       Name :: dns_name(),
       Hostent :: inet:hostent(),
-      Family :: inet:family_option(),
+      Family :: inet:address_family(),
       Reason :: inet:posix() | res_error().
 
 gethostbyname(Name,Family) ->
@@ -418,7 +418,7 @@ gethostbyname(Name,Family) ->
       Name :: dns_name(),
       Hostent :: inet:hostent(),
       Timeout :: timeout(),
-      Family :: inet:family_option(),
+      Family :: inet:address_family(),
       Reason :: inet:posix() | res_error().
 
 gethostbyname(Name,Family,Timeout) ->
diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index 4ae4151004..2c5b8ccb66 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -967,7 +967,7 @@ otp_1586(doc) ->
     ["Test recursive load of applications."];
 otp_1586(Conf) when is_list(Conf) ->
     Dir = ?config(priv_dir,Conf),
-    {ok, Fd} = file:open(filename:join(Dir, "app5.app"), write),
+    {ok, Fd} = file:open(filename:join(Dir, "app5.app"), [write]),
     w_app5(Fd),
     file:close(Fd),
     ?line code:add_patha(Dir),
@@ -1021,10 +1021,10 @@ otp_2012(Conf) when is_list(Conf) ->
     ?line yes = global:register_name(conf_change, CcPid),
 
     % Write a .app file
-    {ok, Fd} = file:open("app1.app", write),
+    {ok, Fd} = file:open("app1.app", [write]),
     w_app1(Fd),
     file:close(Fd),
-    {ok, Fd2} = file:open("app2.app", write),
+    {ok, Fd2} = file:open("app2.app", [write]),
     w_app1(Fd2),
     file:close(Fd2),
 
@@ -1096,7 +1096,7 @@ otp_2973(doc) ->
     ["Test of two processes simultanously starting the same application."];
 otp_2973(Conf) when is_list(Conf) ->
     % Write a .app file
-    {ok, Fd} = file:open("app0.app", write),
+    {ok, Fd} = file:open("app0.app", [write]),
     w_app(Fd, app0()),
     file:close(Fd),
 
@@ -1138,7 +1138,7 @@ otp_2973(Conf) when is_list(Conf) ->
 
 
     % Write a .app file
-    ?line {ok, Fda} = file:open("app_start_error.app", write),
+    ?line {ok, Fda} = file:open("app_start_error.app", [write]),
     ?line w_app_start_error(Fda),
     ?line file:close(Fda),
 
@@ -1273,12 +1273,12 @@ otp_4066(Conf) when is_list(Conf) ->
     App1Nodes = {app1, AllNodes},
 
     Dir = ?config(priv_dir,Conf),
-    ?line {ok, FdC} = file:open(filename:join(Dir, "otp_4066.config"), write),
+    ?line {ok, FdC} = file:open(filename:join(Dir, "otp_4066.config"), [write]),
     ?line write_config(FdC, config_4066(AllNodes, 5000, [App1Nodes])),
     ?line file:close(FdC),
 
     % Write the app1.app file
-    ?line {ok, FdA12} = file:open(filename:join(Dir, "app1.app"), write),
+    ?line {ok, FdA12} = file:open(filename:join(Dir, "app1.app"), [write]),
     ?line w_app1(FdA12),
     ?line file:close(FdA12),
 
@@ -1441,7 +1441,7 @@ otp_5606(Conf) when is_list(Conf) ->
 
     %% Write a config file
     Dir = ?config(priv_dir, Conf),
-    {ok, Fd} = file:open(filename:join(Dir, "sys.config"), write),
+    {ok, Fd} = file:open(filename:join(Dir, "sys.config"), [write]),
     NodeNames = [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
     (config4(NodeNames))(Fd, 10000),
     file:close(Fd),
@@ -2436,7 +2436,7 @@ start_node_config_sf(Name, SysConfigFun, Conf) ->
 
 write_config_file(SysConfigFun, Conf) ->
     Dir = ?config(priv_dir, Conf),
-    {ok, Fd} = file:open(filename:join(Dir, "sys.config"), write),
+    {ok, Fd} = file:open(filename:join(Dir, "sys.config"), [write]),
     SysConfigFun(Fd),
     file:close(Fd),
     filename:join(Dir,"sys").
@@ -2571,15 +2571,15 @@ cc(List) ->
 create_app() ->
     ?line Dir = "./",
     ?line App1 = Dir ++ "app1",
-    ?line {ok, Fd1} = file:open(App1++".app",write),
+    ?line {ok, Fd1} = file:open(App1++".app",[write]),
     ?line io:format(Fd1, "~p. \n", [app1()]),
     ?line file:close(Fd1),
     ?line App2 = Dir ++ "app2",
-    ?line {ok, Fd2} = file:open(App2++".app",write),
+    ?line {ok, Fd2} = file:open(App2++".app",[write]),
     ?line io:format(Fd2, "~p. \n", [app2()]),
     ?line file:close(Fd2),
     ?line App3 = Dir ++ "app_sp",
-    ?line {ok, Fd3} = file:open(App3++".app",write),
+    ?line {ok, Fd3} = file:open(App3++".app",[write]),
     ?line io:format(Fd3, "~p. \n", [app_sp()]),
     ?line file:close(Fd3),
     ok.
@@ -2591,7 +2591,7 @@ create_script(ScriptName) ->
     ?line Apps = which_applications(),
     ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
     ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line {ok,Fd} = file:open(Name++".rel",[write]),
     ?line io:format(Fd,
 		    "{release, {\"Test release 3\", \"LATEST\"}, \n"
 		    " {erts, \"4.4\"}, \n"
@@ -2610,7 +2610,7 @@ create_script_dc(ScriptName) ->
     ?line Apps = which_applications(),
     ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
     ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line {ok,Fd} = file:open(Name++".rel",[write]),
     ?line io:format(Fd,
 		    "{release, {\"Test release 3\", \"LATEST\"}, \n"
 		    " {erts, \"4.4\"}, \n"
@@ -2630,7 +2630,7 @@ create_script_3002(ScriptName) ->
     ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
     ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
     ?line {value,{_,_,SaslVer}} = lists:keysearch(sasl,1,Apps),
-    ?line {ok,Fd} = file:open(Name++".rel",write),
+    ?line {ok,Fd} = file:open(Name++".rel",[write]),
     ?line io:format(Fd,
 		    "{release, {\"Test release 3\", \"LATEST\"}, \n"
 		    " {erts, \"4.4\"}, \n"
@@ -2646,22 +2646,22 @@ create_script_3002(ScriptName) ->
 distr_changed_prep(Conf) when is_list(Conf) ->
 
     % Write .app files
-    ?line {ok, Fd1} = file:open("app1.app", write),
+    ?line {ok, Fd1} = file:open("app1.app", [write]),
     ?line w_app1(Fd1),
     ?line file:close(Fd1),
-    ?line {ok, Fd2} = file:open("app2.app", write),
+    ?line {ok, Fd2} = file:open("app2.app", [write]),
     ?line w_app2(Fd2),
     ?line file:close(Fd2),
-    ?line {ok, Fd3} = file:open("app3.app", write),
+    ?line {ok, Fd3} = file:open("app3.app", [write]),
     ?line w_app3(Fd3),
     ?line file:close(Fd3),
-    ?line {ok, Fd4} = file:open("app6.app", write),
+    ?line {ok, Fd4} = file:open("app6.app", [write]),
     ?line w_app6(Fd4),
     ?line file:close(Fd4),
-    ?line {ok, Fd5} = file:open("app7.app", write),
+    ?line {ok, Fd5} = file:open("app7.app", [write]),
     ?line w_app7(Fd5),
     ?line file:close(Fd5),
-    ?line {ok, Fd6} = file:open("app8.app", write),
+    ?line {ok, Fd6} = file:open("app8.app", [write]),
     ?line w_app8(Fd6),
     ?line file:close(Fd6),
 
@@ -2683,7 +2683,7 @@ distr_changed_prep(Conf) when is_list(Conf) ->
     WithSyncTime = config_fun(config_dc(NodeNames)),
 
     ?line Dir = ?config(priv_dir,Conf),
-    ?line {ok, Fd_dc2} = file:open(filename:join(Dir, "sys2.config"), write),
+    ?line {ok, Fd_dc2} = file:open(filename:join(Dir, "sys2.config"), [write]),
     ?line (config_dc2(NodeNames))(Fd_dc2),
     ?line file:close(Fd_dc2),
     ?line Config2 = filename:join(Dir, "sys2"),
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 3ad49254f1..10ab3e4370 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -81,6 +81,13 @@ init_per_suite(Config) ->
 end_per_suite(Config) ->
     Config.
 
+init_per_testcase(big_boot_embedded, Config) ->
+    case catch crypto:start() of
+	ok ->
+	    init_per_testcase(do_big_boot_embedded, Config);
+	_Else ->
+	    {skip, "Needs crypto!"}
+    end;
 init_per_testcase(_Func, Config) ->
     Dog=?t:timetrap(?t:minutes(5)),
     P=code:get_path(),
@@ -258,8 +265,8 @@ replace_path(Config) when is_list(Config) ->
 
     %% Add a completly new application.
 
-    NewAppName = "blurf_blarfer",
-    ?line NewAppDir = filename:join(Cwd, NewAppName ++ "-6.33.1"),
+    NewAppName = 'blurf_blarfer',
+    ?line NewAppDir = filename:join(Cwd, atom_to_list(NewAppName) ++ "-6.33.1"),
     ?line ok = file:make_dir(NewAppDir),
     ?line true = code:replace_path(NewAppName, NewAppDir),
     ?line NewAppDir = code:lib_dir(NewAppName),
@@ -410,8 +417,10 @@ all_loaded_1() ->
     ?line Loaded2 = match_and_remove(Preloaded, Loaded1),
 
     ObjExt = code:objfile_extension(),
-    ?line [] = lists:filter(fun({Mod,AbsName}) when is_atom(Mod), is_list(AbsName) ->
-				    Mod =:= filename:basename(AbsName, ObjExt);
+    ?line [] = lists:filter(fun({Mod,AbsName}) when is_atom(Mod),
+                                                    is_list(AbsName) ->
+                                    Mod =/= list_to_atom(filename:basename(AbsName,
+                                                                           ObjExt));
 			       (_) -> true
 			    end,
 			    Loaded2),
@@ -571,11 +580,13 @@ add_del_path(Config) when is_list(Config) ->
 clash(Config) when is_list(Config) ->
     DDir = ?config(data_dir,Config)++"clash/",
     P = code:get_path(),
+    [TestServerPath|_] = [Path || Path <- code:get_path(), 
+				  re:run(Path,"test_server/?$",[]) /= nomatch],
 
     %% test non-clashing entries
 
-    %% remove "." to prevent clash with test-server path
-    ?line true = code:del_path("."),
+    %% remove TestServerPath to prevent clash with test-server path
+    ?line true = code:del_path(TestServerPath),
     ?line true = code:add_path(DDir++"foobar-0.1/ebin"),
     ?line true = code:add_path(DDir++"zork-0.8/ebin"),
     test_server:capture_start(),
@@ -587,8 +598,8 @@ clash(Config) when is_list(Config) ->
 
     %% test clashing entries
 
-    %% remove "." to prevent clash with test-server path
-    ?line true = code:del_path("."),
+    %% remove TestServerPath to prevent clash with test-server path
+    ?line true = code:del_path(TestServerPath),
     ?line true = code:add_path(DDir++"foobar-0.1/ebin"),
     ?line true = code:add_path(DDir++"foobar-0.1.ez/foobar-0.1/ebin"),
     test_server:capture_start(),
@@ -601,9 +612,9 @@ clash(Config) when is_list(Config) ->
 
     %% test "Bad path can't read"
 
-    %% remove "." to prevent clash with test-server path
+    %% remove TestServerPath to prevent clash with test-server path
     Priv = ?config(priv_dir, Config),
-    ?line true = code:del_path("."),
+    ?line true = code:del_path(TestServerPath),
     TmpEzFile = Priv++"foobar-0.tmp.ez",
     ?line {ok, _} = file:copy(DDir++"foobar-0.1.ez", TmpEzFile),
     ?line true = code:add_path(TmpEzFile++"/foobar-0.1/ebin"),
@@ -984,9 +995,9 @@ purge_stacktrace(Config) when is_list(Config) ->
 	error:function_clause ->
 	    ?line code:load_file(code_b_test),
 	    ?line case erlang:get_stacktrace() of
-		      [{?MODULE,_,[a]},
-		       {code_b_test,call,2},
-		       {?MODULE,purge_stacktrace,1}|_] ->
+		      [{?MODULE,_,[a],_},
+		       {code_b_test,call,2,_},
+		       {?MODULE,purge_stacktrace,1,_}|_] ->
 			  ?line false = code:purge(code_b_test),
 			  ?line [] = erlang:get_stacktrace()
 		  end
@@ -996,8 +1007,8 @@ purge_stacktrace(Config) when is_list(Config) ->
 	error:function_clause ->
 	    ?line code:load_file(code_b_test),
 	    ?line case erlang:get_stacktrace() of
-		      [{code_b_test,call,[nofun,2]},
-		       {?MODULE,purge_stacktrace,1}|_] ->
+		      [{code_b_test,call,[nofun,2],_},
+		       {?MODULE,purge_stacktrace,1,_}|_] ->
 			  ?line false = code:purge(code_b_test),
 			  ?line [] = erlang:get_stacktrace()
 		  end
@@ -1008,8 +1019,8 @@ purge_stacktrace(Config) when is_list(Config) ->
 	error:badarg ->
 	    ?line code:load_file(code_b_test),
 	    ?line case erlang:get_stacktrace() of
-		      [{code_b_test,call,Args},
-		       {?MODULE,purge_stacktrace,1}|_] ->
+		      [{code_b_test,call,Args,_},
+		       {?MODULE,purge_stacktrace,1,_}|_] ->
 			  ?line false = code:purge(code_b_test),
 			  ?line [] = erlang:get_stacktrace()
 		  end
@@ -1023,8 +1034,8 @@ mult_lib_roots(Config) when is_list(Config) ->
 			   "my_dummy_app-c/ebin/code_SUITE_mult_root_module"),
 
     %% Set up ERL_LIBS and start a slave node.
-    ErlLibs = filename:join(DataDir, first_root) ++ mult_lib_sep() ++
-	filename:join(DataDir, second_root),
+    ErlLibs = filename:join(DataDir, "first_root") ++ mult_lib_sep() ++
+	filename:join(DataDir, "second_root"),
 
     ?line {ok,Node} = 
 	?t:start_node(mult_lib_roots, slave,
@@ -1344,7 +1355,7 @@ create_script(Config) ->
     ?line Apps = application_controller:which_applications(),
     ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel, 1, Apps),
     ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib, 1, Apps),
-    ?line {ok,Fd} = file:open(Name ++ ".rel", write),
+    ?line {ok,Fd} = file:open(Name ++ ".rel", [write]),
     ?line io:format(Fd,
 		    "{release, {\"Test release 3\", \"P2A\"}, \n"
 		    " {erts, \"9.42\"}, \n"
@@ -1409,7 +1420,7 @@ create_big_script(Config,Local) ->
     %% Now we should have only "real" applications...
     ?line [application:load(list_to_atom(Y)) || {match,[Y]} <- [ re:run(X,code:lib_dir()++"/"++"([^/-]*).*/ebin",[{capture,[1],list}]) || X <- code:get_path()],filter_app(Y,Local)],
     ?line Apps = [ {N,V} || {N,_,V} <- application:loaded_applications()],
-    ?line {ok,Fd} = file:open(Name ++ ".rel", write),
+    ?line {ok,Fd} = file:open(Name ++ ".rel", [write]),
     ?line io:format(Fd,
 		    "{release, {\"Test release 3\", \"P2A\"}, \n"
 		    " {erts, \"9.42\"}, \n"
@@ -1470,7 +1481,7 @@ do_on_load_error(ReturnValue) ->
     ?line ErrorPid ! ReturnValue,
     receive
 	{'DOWN',Ref,process,_,Exit} ->
-	    ?line {undef,[{on_load_error,main,[]}|_]} = Exit
+	    ?line {undef,[{on_load_error,main,[],_}|_]} = Exit
     end.
 
 native_early_modules(suite) -> [];
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index 4ae47b4762..ad987fe7a7 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -1831,11 +1831,16 @@ block_queue2(Conf) when is_list(Conf) ->
     %% Asynchronous stuff is ignored.
     ?line ok = disk_log:balog_terms(n, [<<"foo">>,<<"bar">>]),
     ?line ok = disk_log:balog_terms(n, [<<"more">>,<<"terms">>]),
+    Parent = self(),
     ?line Fun = 
-        fun() -> {error,disk_log_stopped} = disk_log:sync(n)
+        fun() ->
+                {error,no_such_log} = disk_log:sync(n),
+                receive {disk_log, _, {error, disk_log_stopped}} -> ok end,
+                Parent ! disk_log_stopped_ok
         end,
     ?line spawn(Fun),
     ?line ok = sync_do(Pid, close),
+    ?line receive disk_log_stopped_ok -> ok end,
     ?line sync_do(Pid, terminate),
     ?line {ok,<<>>} = file:read_file(File ++ ".1"),
     ?line del(File, No),    
@@ -2708,7 +2713,7 @@ error_log(Conf) when is_list(Conf) ->
     % reopen (rename) fails, the log is terminated, ./File.2/ exists
     ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
 				   {format, external},{size, 100000}]),
-    ?line {error, eisdir} = disk_log:reopen(n, LDir),
+    ?line {error, {file_error, _, eisdir}} = disk_log:reopen(n, LDir),
     ?line true = (P0 == pps()),
     ?line file:delete(File),
 
@@ -2719,7 +2724,7 @@ error_log(Conf) when is_list(Conf) ->
     ?line {ok, n} = disk_log:open([{name, n}, {file, File2}, {type, wrap},
 				   {format, external},{size, {100, No}}]),
     ?line ok = disk_log:blog_terms(n, [B,B,B]),
-    ?line {error, eisdir} = disk_log:reopen(n, File),
+    ?line {error, {file_error, _, eisdir}} = disk_log:reopen(n, File),
     ?line {error, no_such_log} = disk_log:close(n),
     ?line del(File2, No),
     ?line del(File, No),
@@ -4917,7 +4922,7 @@ mark(FileName, What) ->
     ok = file:close(Fd).
 
 crash(File, Where) ->
-    {ok, Fd} = file:open(File, read_write),
+    {ok, Fd} = file:open(File, [read,write]),
     file:position(Fd, Where),
     ok = file:write(Fd, [10]),
     ok = file:close(Fd).
@@ -4933,7 +4938,7 @@ writable(Fname) ->
     file:write_file_info(Fname, Info#file_info{mode = Mode}).
 
 truncate(File, Where) ->
-    {ok, Fd} = file:open(File, read_write),
+    {ok, Fd} = file:open(File, [read,write]),
     file:position(Fd, Where),
     ok = file:truncate(Fd),
     ok = file:close(Fd).
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index f47c4603cf..7599a89779 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -547,8 +547,6 @@ host() ->
 stop_node(Node) ->
     test_server:stop_node(Node).
 
-get_loader_flag({ose,_}) ->
-    " -loader ose_inet ";
 get_loader_flag(_) ->
     " -loader inet ".
 
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index fdab2eb02b..77fc7e73f9 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -2165,7 +2165,7 @@ write_compressed(Config) when is_list(Config) ->
     ?line Second = io:get_line(Fd1, ''),
     ?line ok = ?FILE_MODULE:close(Fd1),
 
-    %% Verify succesful compression by uncompressing the file
+    %% Verify successful compression by uncompressing the file
     %% using zlib:gunzip/1.
 
     ?line {ok,Contents} = file:read_file(MyFile),
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 03e734445c..1b534a5fc4 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -212,7 +212,9 @@ xfer_active(Config) when is_list(Config) ->
 		?line test_server:fail({unexpected,flush()})
 	end,
     ?line io:format("SbAssocId=~p~n", [SbAssocId]),
-    ?line ok = gen_sctp:send(Sa, SaAssocId, 0, Data),
+    ?line ok =
+	do_from_other_process(
+	  fun () -> gen_sctp:send(Sa, SaAssocId, 0, Data) end),
     ?line receive
 	      {sctp,Sb,Loopback,Pa,
 	       {[#sctp_sndrcvinfo{stream=Stream,
@@ -378,11 +380,14 @@ def_sndrcvinfo(Config) when is_list(Config) ->
 			end
 	  end,
     ?line ok =
-	gen_sctp:send(
-	  S2,
-	  #sctp_sndrcvinfo{stream=0, ppid=20, assoc_id=S2AssocId},
-	  <<"4: ",Data/binary>>),
-    ?line case ok(gen_sctp:recv(S1)) of
+	do_from_other_process(
+	  fun () ->
+		  gen_sctp:send(
+		    S2,
+		    #sctp_sndrcvinfo{stream=0, ppid=20, assoc_id=S2AssocId},
+		    <<"4: ",Data/binary>>)
+	  end),
+    ?line case ok(do_from_other_process(fun() -> gen_sctp:recv(S1) end)) of
 	      {Loopback,P2,
 	       [#sctp_sndrcvinfo{
 		   stream=0, ppid=20, context=0, assoc_id=S1AssocId}],
@@ -575,6 +580,8 @@ api_opts(doc) ->
 api_opts(suite) ->
     [];
 api_opts(Config) when is_list(Config) ->
+    ?line Sndbuf = 32768,
+    ?line Recbuf = 65536,
     ?line {ok,S} = gen_sctp:open(0),
     ?line OSType = os:type(),
     ?line case {inet:setopts(S, [{linger,{true,2}}]),OSType} of
@@ -582,7 +589,15 @@ api_opts(Config) when is_list(Config) ->
                   ok;
               {{error,einval},{unix,sunos}} ->
                   ok
-          end.
+          end,
+    ?line ok = inet:setopts(S, [{sndbuf,Sndbuf}]),
+    ?line ok = inet:setopts(S, [{recbuf,Recbuf}]),
+    ?line case inet:getopts(S, [sndbuf]) of
+	      {ok,[{sndbuf,SB}]} when SB >= Sndbuf -> ok
+	  end,
+    ?line case inet:getopts(S, [recbuf]) of
+	      {ok,[{recbuf,RB}]} when RB >= Recbuf -> ok
+	  end.
 
 implicit_inet6(Config) when is_list(Config) ->
     ?line Hostname = ok(inet:gethostname()),
@@ -638,3 +653,31 @@ implicit_inet6(S1, Addr) ->
 	      {{0,0,0,0,0,0,0,0},P2} -> ok
 	  end,
     ?line ok = gen_sctp:close(S2).
+
+
+
+do_from_other_process(Fun) ->
+    Parent = self(),
+    Ref = make_ref(),
+    Child =
+	spawn(fun () ->
+		      try Fun() of
+			  Result ->
+			      Parent ! {Ref,Result}
+		      catch
+			  Class:Reason ->
+			      Stacktrace = erlang:get_stacktrace(),
+			      Parent ! {Ref,Class,Reason,Stacktrace}
+		      end
+	      end),
+    Mref = erlang:monitor(process, Child),
+    receive
+	{Ref,Result} ->
+	    receive {'DOWN',Mref,_,_,_} -> Result end;
+	{Ref,Class,Reason,Stacktrace} ->
+	    receive {'DOWN',Mref,_,_,_} ->
+		    erlang:raise(Class, Reason, Stacktrace)
+	    end;
+	{'DOWN',Mref,_,_,Reason} ->
+	    erlang:exit(Reason)
+    end.
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index fd4685cdad..cbaec2d6dd 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -158,6 +158,10 @@ t_shutdown_error(Config) when is_list(Config) ->
 
 t_fdopen(Config) when is_list(Config) ->
     ?line Question = "Aaaa... Long time ago in a small town in Germany,",
+    ?line Question1 = list_to_binary(Question),
+    ?line Question2 = [<<"Aaaa">>, "... ", $L, <<>>, $o, "ng time ago ",
+                       ["in ", [], <<"a small town">>, [" in Germany,", <<>>]]],
+    ?line Question1 = iolist_to_binary(Question2),
     ?line Answer = "there was a shoemaker, Schumacher was his name.",
     ?line {ok, L} = gen_tcp:listen(0, [{active, false}]),
     ?line {ok, Port} = inet:port(L),
@@ -167,6 +171,10 @@ t_fdopen(Config) when is_list(Config) ->
     ?line {ok, Server} = gen_tcp:fdopen(FD, []),
     ?line ok = gen_tcp:send(Client, Question),
     ?line {ok, Question} = gen_tcp:recv(Server, length(Question), 2000),
+    ?line ok = gen_tcp:send(Client, Question1),
+    ?line {ok, Question} = gen_tcp:recv(Server, length(Question), 2000),
+    ?line ok = gen_tcp:send(Client, Question2),
+    ?line {ok, Question} = gen_tcp:recv(Server, length(Question), 2000),
     ?line ok = gen_tcp:send(Server, Answer),
     ?line {ok, Answer} = gen_tcp:recv(Client, length(Answer), 2000),
     ?line ok = gen_tcp:close(Client),
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index b734d7fd98..514deaf065 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -201,13 +201,21 @@ binary_passive_recv(suite) ->
 binary_passive_recv(doc) ->
     ["OTP-3823 gen_udp:recv does not return address in binary mode"];
 binary_passive_recv(Config) when is_list(Config) ->
-    ?line D        = "The quick brown fox jumps over a lazy dog",
-    ?line B        = list_to_binary(D),
+    ?line D1       = "The quick brown fox jumps over a lazy dog",
+    ?line D2       = list_to_binary(D1),
+    ?line D3       = ["The quick", <<" brown ">>, "fox jumps ", <<"over ">>,
+                      <<>>, $a, [[], " lazy ", <<"dog">>]],
+    ?line D2       = iolist_to_binary(D3),
+    ?line B        = D2,
     ?line {ok, R}  = gen_udp:open(0, [binary, {active, false}]),
     ?line {ok, RP} = inet:port(R),
     ?line {ok, S}  = gen_udp:open(0),
     ?line {ok, SP} = inet:port(S),
-    ?line ok       = gen_udp:send(S, localhost, RP, D),
+    ?line ok       = gen_udp:send(S, localhost, RP, D1),
+    ?line {ok, {{127, 0, 0, 1}, SP, B}} = gen_udp:recv(R, byte_size(B)+1),
+    ?line ok       = gen_udp:send(S, localhost, RP, D2),
+    ?line {ok, {{127, 0, 0, 1}, SP, B}} = gen_udp:recv(R, byte_size(B)+1),
+    ?line ok       = gen_udp:send(S, localhost, RP, D3),
     ?line {ok, {{127, 0, 0, 1}, SP, B}} = gen_udp:recv(R, byte_size(B)+1),
     ?line ok       = gen_udp:close(S),
     ?line ok       = gen_udp:close(R),
diff --git a/lib/kernel/test/global_group_SUITE.erl b/lib/kernel/test/global_group_SUITE.erl
index 13b2fd07b5..799b0d9d05 100644
--- a/lib/kernel/test/global_group_SUITE.erl
+++ b/lib/kernel/test/global_group_SUITE.erl
@@ -100,7 +100,7 @@ start_gg_proc(Config) when is_list(Config) ->
 
     ?line Dir = ?config(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group.config"),
-    ?line {ok, Fd}=file:open(File, write),
+    ?line {ok, Fd}=file:open(File, [write]),
     [Ncp1,Ncp2,Ncp3] = node_names([cp1, cp2, cp3], Config),
     ?line config(Fd, Ncp1, Ncp2, Ncp3, "cpx", "cpy", "cpz", "cpq"),
 
@@ -135,7 +135,7 @@ no_gg_proc(Config) when is_list(Config) ->
 
     ?line Dir = ?config(priv_dir, Config),
     ?line File = filename:join(Dir, "no_global_group.config"),
-    ?line {ok, Fd} = file:open(File, write),
+    ?line {ok, Fd} = file:open(File, [write]),
     ?line config_no(Fd),
 
     ?line NN = node_name(atom_to_list(node())),
@@ -308,7 +308,7 @@ no_gg_proc_sync(Config) when is_list(Config) ->
 
     ?line Dir = ?config(priv_dir, Config),
     ?line File = filename:join(Dir, "no_global_group_sync.config"),
-    ?line {ok, Fd} = file:open(File, write),
+    ?line {ok, Fd} = file:open(File, [write]),
 
     [Ncp1,Ncp2,Ncp3,Ncpx,Ncpy,Ncpz] = 
         node_names([cp1,cp2,cp3,cpx,cpy,cpz], Config),
@@ -482,7 +482,7 @@ compatible(Config) when is_list(Config) ->
 
     ?line Dir = ?config(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group_comp.config"),
-    ?line {ok, Fd} = file:open(File, write),
+    ?line {ok, Fd} = file:open(File, [write]),
 
     [Ncp1,Ncp2,Ncp3,Ncpx,Ncpy,Ncpz] = 
         node_names([cp1,cp2,cp3,cpx,cpy,cpz], Config),
@@ -655,7 +655,7 @@ one_grp(Config) when is_list(Config) ->
 
     ?line Dir = ?config(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group.config"),
-    ?line {ok, Fd} = file:open(File, write),
+    ?line {ok, Fd} = file:open(File, [write]),
     [Ncp1,Ncp2,Ncp3] = node_names([cp1, cp2, cp3], Config),
     ?line config(Fd, Ncp1, Ncp2, Ncp3, "cpx", "cpy", "cpz", "cpq"),
 
@@ -742,7 +742,7 @@ one_grp_x(Config) when is_list(Config) ->
 
     ?line Dir = ?config(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group.config"),
-    ?line {ok, Fd} = file:open(File, write),
+    ?line {ok, Fd} = file:open(File, [write]),
     [Ncp1,Ncp2,Ncp3] = node_names([cp1, cp2, cp3], Config),
     ?line config(Fd, Ncp1, Ncp2, Ncp3, "cpx", "cpy", "cpz", "cpq"),
 
@@ -804,7 +804,7 @@ two_grp(Config) when is_list(Config) ->
 
     ?line Dir = ?config(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group.config"),
-    ?line {ok, Fd} = file:open(File, write),
+    ?line {ok, Fd} = file:open(File, [write]),
 
     [Ncp1,Ncp2,Ncp3,Ncpx,Ncpy,Ncpz,Ncpq] = 
         node_names([cp1,cp2,cp3,cpx,cpy,cpz,cpq], Config),
@@ -1104,7 +1104,7 @@ hidden_groups(Config) when is_list(Config) ->
 
     ?line Dir = ?config(priv_dir, Config),
     ?line File = filename:join(Dir, "global_group.config"),
-    ?line {ok, Fd} = file:open(File, write),
+    ?line {ok, Fd} = file:open(File, [write]),
 
     [Ncp1,Ncp2,Ncp3,Ncpx,Ncpy,Ncpz,Ncpq] = 
         node_names([cp1,cp2,cp3,cpx,cpy,cpz,cpq], Config),
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 1bb173a3ac..aaa20b7398 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -294,7 +294,7 @@ t_getaddr_v6(Config) when is_list(Config) ->
     ?line {Name,FullName,IPStr,_IP,_,IP_46_Str,IP46} =
 	ct:get_config(test_host_ipv4_only),
     case {inet:getaddr(IP_46_Str, inet6),inet:getaddr(Name, inet6)} of
-	{{ok,IP46},{ok,_}} -> 
+	{{ok,IP46},{ok,V4Addr}} when V4Addr /= {0,0,0,0,0,0,0,1} ->
 	    %% Since we suceeded in parsing an IPv6 address string and
 	    %% look up the name, this computer fully supports IPv6.
 	    ?line {ok,IP46} = inet:getaddr(IP46, inet6),
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl
index 6064a9b2d9..8a3d220e46 100644
--- a/lib/kernel/test/inet_res_SUITE.erl
+++ b/lib/kernel/test/inet_res_SUITE.erl
@@ -117,9 +117,15 @@ ns_init(ZoneDir, PrivDir, DataDir) ->
     case os:type() of
 	{unix,_} when ZoneDir =:= undefined -> undefined;
 	{unix,_} ->
-	    {ok,S} = gen_udp:open(0, [{reuseaddr,true}]),
-	    {ok,PortNum} = inet:port(S),
-	    gen_udp:close(S),
+	    PortNum = case {os:type(),os:version()} of
+			  {{unix,solaris},{M,V,_}} when M =< 5, V < 10 ->
+			      11895 + random:uniform(100);
+			  _ ->
+			      {ok,S} = gen_udp:open(0, [{reuseaddr,true}]),
+			      {ok,PNum} = inet:port(S),
+			      gen_udp:close(S),
+			      PNum
+		      end,
 	    RunNamed = filename:join(DataDir, ?RUN_NAMED),
 	    NS = {{127,0,0,1},PortNum},
 	    P = erlang:open_port({spawn_executable,RunNamed},
diff --git a/lib/kernel/test/inet_res_SUITE_data/run-named b/lib/kernel/test/inet_res_SUITE_data/run-named
index b418607d48..7caa3756ef 100755
--- a/lib/kernel/test/inet_res_SUITE_data/run-named
+++ b/lib/kernel/test/inet_res_SUITE_data/run-named
@@ -2,7 +2,7 @@
 ##
 ## %CopyrightBegin%
 ## 
-## Copyright Ericsson AB 2009. All Rights Reserved.
+## Copyright Ericsson AB 2009-2011. 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
@@ -155,7 +155,7 @@ $NAMED $NAMED_FG -c "$CONF_FILE" >"$LOG_FILE" 2>&1 </dev/null &
 NAMED=$!
 trap "kill -TERM $NAMED >/dev/null 2>&1; wait $NAMED >/dev/null 2>&1" \
     0 1 2 3 15
-sleep 1 # Give name server time to load its zone files
+sleep 2 # Give name server time to load its zone files
 echo "Running: Enter \`\`quit'' to terminate nameserver[$NAMED]..."
 while read LINE; do 
     test :"$LINE" = :'quit' && break
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index 2db0f7dcb8..b39fadd65f 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -656,7 +656,7 @@ create_script(Config) ->
     ?line Apps = application_controller:which_applications(),
     ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
     ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line {ok,Fd} = file:open(Name ++ ".rel", write),
+    ?line {ok,Fd} = file:open(Name ++ ".rel", [write]),
     ?line io:format(Fd,
 		    "{release, {\"Test release 3\", \"P2A\"}, \n"
 		    " {erts, \"4.4\"}, \n"
diff --git a/lib/kernel/test/ram_file_SUITE.erl b/lib/kernel/test/ram_file_SUITE.erl
index 9b3fbb91fc..ab95a3ff5f 100644
--- a/lib/kernel/test/ram_file_SUITE.erl
+++ b/lib/kernel/test/ram_file_SUITE.erl
@@ -552,7 +552,7 @@ large_file_light(Config) when is_list(Config) ->
     ?line PrivDir = ?config(priv_dir, Config),
     %% Marker for next test case that is to heavy to run in a suite.
     ?line ok = ?FILE_MODULE:write_file(
-		  filename:join(PrivDir, large_file_light), 
+		  filename:join(PrivDir, "large_file_light"),
 		  <<"TAG">>),
     %%
     ?line Data = "abcdefghijklmnopqrstuvwzyz",
@@ -582,7 +582,7 @@ large_file_heavy(Config) when is_list(Config) ->
     ?line PrivDir = ?config(priv_dir, Config),
     %% Check previous test case marker.
     case ?FILE_MODULE:read_file_info(
-	    filename:join(PrivDir, large_file_light)) of
+	    filename:join(PrivDir, "large_file_light")) of
 	{ok,_} ->
 	    {skipped,"Too heavy for casual testing!"};
 	_ ->
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index 9eb84c9167..74bafe8935 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -42,8 +42,8 @@
 		end
 	end()).
 
--define(BARG, {'EXIT',{badarg,[{zlib,_,_}|_]}}).
--define(DATA_ERROR, {'EXIT',{data_error,[{zlib,_,_}|_]}}).
+-define(BARG, {'EXIT',{badarg,[{zlib,_,_,_}|_]}}).
+-define(DATA_ERROR, {'EXIT',{data_error,[{zlib,_,_,_}|_]}}).
 
 init_per_testcase(_Func, Config) ->
     Dog = test_server:timetrap(test_server:seconds(60)),
@@ -412,6 +412,7 @@ api_crc32(Config) when is_list(Config) ->
     Compressed = list_to_binary(Compressed1 ++ Compressed2),
      CRC1 = ?m( CRC1 when is_integer(CRC1), zlib:crc32(Z1)),
     ?m(CRC1 when is_integer(CRC1), zlib:crc32(Z1,Bin)),
+    ?m(CRC1 when is_integer(CRC1), zlib:crc32(Z1,binary_to_list(Bin))),
     ?m(CRC2 when is_integer(CRC2), zlib:crc32(Z1,Compressed)),
     CRC2 = ?m(CRC2 when is_integer(CRC2), zlib:crc32(Z1,0,Compressed)),
     ?m(CRC3 when CRC2 /= CRC3, zlib:crc32(Z1,234,Compressed)),
@@ -437,6 +438,7 @@ api_adler32(Config) when is_list(Config) ->
     Compressed2 = ?m(_, zlib:deflate(Z1, <<>>, finish)),
     Compressed = list_to_binary(Compressed1 ++ Compressed2),
     ?m(ADLER1 when is_integer(ADLER1), zlib:adler32(Z1,Bin)),
+    ?m(ADLER1 when is_integer(ADLER1), zlib:adler32(Z1,binary_to_list(Bin))),
     ADLER2 = ?m(ADLER2 when is_integer(ADLER2), zlib:adler32(Z1,Compressed)),
     ?m(ADLER2 when is_integer(ADLER2), zlib:adler32(Z1,1,Compressed)),
     ?m(ADLER3 when ADLER2 /= ADLER3, zlib:adler32(Z1,234,Compressed)),
@@ -464,6 +466,7 @@ api_un_compress(Config) when is_list(Config) ->
     ?m({'EXIT',{data_error,_}}, zlib:uncompress(<<120,156,3>>)),
     ?m({'EXIT',{data_error,_}}, zlib:uncompress(<<120,156,3,0>>)),
     ?m({'EXIT',{data_error,_}}, zlib:uncompress(<<0,156,3,0,0,0,0,1>>)),
+    ?m(Bin, zlib:uncompress(binary_to_list(Comp))),
     ?m(Bin, zlib:uncompress(Comp)).
 
 api_un_zip(doc) -> "Test zip";
@@ -472,10 +475,12 @@ api_un_zip(Config) when is_list(Config) ->
     ?m(?BARG,zlib:zip(not_a_binary)),
     Bin = <<1,11,1,23,45>>,
     ?line  Comp = zlib:zip(Bin),
+    ?m(Comp, zlib:zip(binary_to_list(Bin))),
     ?m(?BARG,zlib:unzip(not_a_binary)),
     ?m({'EXIT',{data_error,_}}, zlib:unzip(<<171,171,171,171,171>>)),
     ?m({'EXIT',{data_error,_}}, zlib:unzip(<<>>)),
     ?m(Bin, zlib:unzip(Comp)),
+    ?m(Bin, zlib:unzip(binary_to_list(Comp))),
     
     %% OTP-6396
     B = <<131,104,19,100,0,13,99,95,99,105,100,95,99,115,103,115,110,95,50,97,1,107,0,4,208,161,246,29,107,0,3,237,166,224,107,0,6,66,240,153,0,2,10,1,0,8,97,116,116,97,99,104,101,100,104,2,100,0,22,117,112,100,97,116,101,95,112,100,112,95,99,111,110,116,101,120,116,95,114,101,113,107,0,114,69,3,12,1,11,97,31,113,150,64,104,132,61,64,104,12,3,197,31,113,150,64,104,132,61,64,104,12,1,11,97,31,115,150,64,104,116,73,64,104,0,0,0,0,0,0,65,149,16,61,65,149,16,61,1,241,33,4,5,0,33,4,4,10,6,10,181,4,10,6,10,181,38,15,99,111,109,109,97,110,100,1,114,45,97,112,110,45,49,3,99,111,109,5,109,110,99,57,57,6,109,99,99,50,52,48,4,103,112,114,115,8,0,104,2,104,2,100,0,8,97,99,116,105,118,97,116,101,104,23,100,0,11,112,100,112,95,99,111,110,116,1,120,116,100,0,7,112,114,105,109,97,114,121,97,1,100,0,9,117,110,100,101,102,105,110,101,100,97,1,97,4,97,4,97,7,100,0,9,117,110,100,101,102,105,110,101,100,100,0,9,117,110,100,101,102,105,110,10100,100,0,9,117,110,100,101,102,105,110,101,100,100,0,5,102,97,108,115,101,100,0,9,117,110,100,101,102,105,110,101,100,100,0,9,117,110,100,101,102,105,110,101,100,100,0,9,117,110,100,101,102,105,1,101,100,97,0,100,0,9,117,110,100,101,102,105,110,101,100,107,0,4,16,0,1,144,107,0,4,61,139,186,181,107,0,4,10,8,201,49,100,0,9,117,110,100,101,102,105,110,101,100,100,0,9,117,110,100,101,102,105,0,101,100,100,0,9,117,110,100,101,102,105,110,101,100,104,2,104,3,98,0,0,7,214,97,11,97,20,104,3,97,17,97,16,97,21,106,108,0,0,0,3,104,2,97,1,104,2,104,3,98,0,0,7,214,97,11,97,20,104,3,97,17,97,167,20,104,2,97,4,104,2,104,3,98,0,0,7,214,97,11,97,20,104,3,97,17,97,16,97,21,104,2,97,10,104,2,104,3,98,0,0,7,214,97,11,97,20,104,3,97,17,97,16,97,26,106,100,0,5,118,101,114,57,57,100,0,9,117,110,0,101,102,105,110,101,100,107,0,2,0,244,107,0,4,10,6,102,195,107,0,4,10,6,102,195,100,0,9,117,110,100,101,102,105,110,101,100,100,0,9,117,110,100,101,102,105,110,101,100,107,0,125,248,143,0,203,25115,157,116,65,185,65,172,55,87,164,88,225,50,203,251,115,157,116,65,185,65,172,55,87,164,88,225,50,0,0,82,153,50,0,200,98,87,148,237,193,185,65,149,167,69,144,14,16,153,50,3,81,70,94,13,109,193,1,120,5,181,113,198,118,50,3,81,70,94,13,109,193,185,120,5,181,113,198,118,153,3,81,70,94,13,109,193,185,120,5,181,113,198,118,153,50,16,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,113,92,2,119,128,0,0,108,0,0,1,107,0,114,69,3,12,1,11,97,31,113,150,64,104,132,61,64,104,12,3,11,97,31,113,150,64,104,132,61,64,104,12,1,11,97,31,115,150,64,104,116,73,64,104,0,0,0,0,0,0,65,149,16,61,65,149,16,61,1,241,33,4,0,33,4,4,10,6,10,181,4,10,6,10,181,38,15,99,111,109,109,97,110,100,101,114,45,97,112,110,45,49,3,99,111,109,5,109,110,99,57,57,6,109,99,99,50,52,48,4,103,112,114,115,8,0,106>>,
@@ -504,10 +509,12 @@ api_g_un_zip(Config) when is_list(Config) ->
     ?m(?BARG,zlib:gzip(not_a_binary)),
     Bin = <<1,11,1,23,45>>,
     ?line Comp = zlib:gzip(Bin),
+    ?m(Comp, zlib:gzip(binary_to_list(Bin))),
     ?m(?BARG, zlib:gunzip(not_a_binary)),
     ?m(?DATA_ERROR, zlib:gunzip(<<171,171,171,171,171>>)),
     ?m(?DATA_ERROR, zlib:gunzip(<<>>)),
     ?m(Bin, zlib:gunzip(Comp)),
+    ?m(Bin, zlib:gunzip(binary_to_list(Comp))),
     
     %% Bad CRC; bad length.
     BadCrc = bad_crc_data(),
@@ -844,6 +851,7 @@ dictionary_usage({run}) ->
     ?m(ok, zlib:inflateInit(Z2)),
     ?line {'EXIT',{{need_dictionary,DictID},_}} = (catch zlib:inflate(Z2, Compressed)),
     ?m(ok, zlib:inflateSetDictionary(Z2, Dict)),
+    ?m(ok, zlib:inflateSetDictionary(Z2, binary_to_list(Dict))),
     ?line Uncompressed = ?m(B when is_list(B), zlib:inflate(Z2, [])),
     ?m(ok, zlib:inflateEnd(Z2)),
     ?m(ok, zlib:close(Z2)),    
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 8be265e79d..76c62ece67 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 2.14.5
+KERNEL_VSN = 2.15
diff --git a/lib/megaco/doc/src/Makefile b/lib/megaco/doc/src/Makefile
index 4b3c117b20..f782afc3f6 100644
--- a/lib/megaco/doc/src/Makefile
+++ b/lib/megaco/doc/src/Makefile
@@ -27,14 +27,6 @@ VSN=$(MEGACO_VSN)
 APPLICATION=megaco
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -73,35 +65,10 @@ EXTRA_FILES = \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-TOP_PS_FILE  = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi $(APP_FILE)
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-
-TOP_HTML_FILES = $(INDEX_TARGET) 
-
-endif
-
 INDEX_FILE   = index.html
 INDEX_SRC    = $(INDEX_FILE).src
 INDEX_TARGET = $(DOCDIR)/$(INDEX_FILE)
@@ -131,8 +98,6 @@ $(HTMLDIR)/%.jpg: %.jpg
 $(HTMLDIR)/%.png: %.png
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 ldocs: local_docs $(INDEX_TARGET)
@@ -147,41 +112,6 @@ clean clean_docs: clean_html clean_man
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html imgs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: imgs $(HTML_FILES) $(TOP_HTML_FILES)
-
-mhtml: html $(HTML_REF3_FILES) $(HTML_CHAPTER_FILES)
-
-clean: clean_html clean_man clean_pdf
-	rm -f core *~ 
-	rm -f *.aux *.cites *.citeshd *.dvi *.idx *.ilg *.ind
-	rm -f *.indhd *.lof *.lofhd *.lot *.lothd *.otpdef
-	rm -f *.otpuse *.terms *.termshd *.toc *.makeindexlog *.dvipslog
-	rm -f *.bib *.bbl *.blg *.bibhd
-
-clean_pdf:
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f $(TEX_FILES_USERS_GUIDE) 
-	rm -f $(TEX_FILES_REF_MAN) 
-	rm -f $(TEX_FILES_BOOK)
-
-endif 
-
 clean_man:
 	rm -f $(MAN3DIR)/*
 
@@ -203,8 +133,6 @@ debug opt:
 info:
 	@echo "->Makefile<-"
 	@echo ""
-	@echo "DOCSUPPORT = $(DOCSUPPORT)"
-	@echo ""
 	@echo "INDEX_FILE   = $(INDEX_FILE)"
 	@echo "INDEX_SRC    = $(INDEX_SRC)"
 	@echo "INDEX_TARGET = $(INDEX_TARGET)"
@@ -216,10 +144,6 @@ info:
 	@echo ""
 	@echo "IMG_FILES             = $(IMG_FILES)"
 	@echo ""
-	@echo "TEX_FILES_USERS_GUIDE = $(TEX_FILES_USERS_GUIDE)"
-	@echo "TEX_FILES_REF_MAN     = $(TEX_FILES_REF_MAN)"
-	@echo "TEX_FILES_BOOK        = $(TEX_FILES_BOOK)"
-	@echo ""
 	@echo "MAN3_FILES            = $(MAN3_FILES)"
 	@echo ""
 	@echo "HTML_FILES            = $(HTML_FILES)"
@@ -236,8 +160,6 @@ info:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -250,33 +172,6 @@ release_docs_spec: docs
 	$(INSTALL_DIR)  $(RELSYSDIR)/doc/standard
 	$(INSTALL_DATA) $(STANDARDS) $(RELSYSDIR)/doc/standard
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR)  $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR)  $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR)  $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(IMG_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR)  $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(TOP_HTML_FILES) $(RELSYSDIR)/doc
-	$(INSTALL_DIR)  $(RELSYSDIR)/doc/standard
-	$(INSTALL_DATA) $(STANDARDS) $(RELSYSDIR)/doc/standard
-endif
-endif
-
-endif
-
 release_spec:
 
 $(HTMLDIR)/megaco_architecture.html: megaco_architecture.xml
diff --git a/lib/megaco/doc/src/make.dep b/lib/megaco/doc/src/make.dep
deleted file mode 100644
index 0e2040ab50..0000000000
--- a/lib/megaco/doc/src/make.dep
+++ /dev/null
@@ -1,59 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2001-2009. 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.
-# 
-# %CopyrightEnd%
-
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex megaco.tex megaco_architecture.tex \
-		megaco_codec_meas.tex \
-		megaco_codec_mstone1.tex megaco_codec_mstone2.tex \
-		megaco_codec_transform.tex \
-		megaco_debug.tex megaco_edist_compress.tex \
-		megaco_encode.tex megaco_encoder.tex megaco_examples.tex \
-		megaco_flex_scanner.tex megaco_intro.tex megaco_mib.tex \
-		megaco_performance.tex megaco_run.tex megaco_tcp.tex \
-		megaco_transport.tex megaco_transport_mechanisms.tex \
-		megaco_udp.tex megaco_user.tex part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: call_flow.ps call_flow_cont.ps distr_node_config.ps \
-		megaco_sys_arch.ps single_node_config.ps
-
-book.dvi: mstone1.ps
-
-book.dvi: MG-startup_flow_noMID.ps MGC_startup_call_flow.ps \
-		MG_startup_call_flow.ps
-
diff --git a/lib/megaco/doc/src/megaco.xml b/lib/megaco/doc/src/megaco.xml
index b9bf414299..5dd622368c 100644
--- a/lib/megaco/doc/src/megaco.xml
+++ b/lib/megaco/doc/src/megaco.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -646,7 +646,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
               segments has not yet been received.</p>
             <p>When the timer finally expires, a "megaco segments not
               received" (459) error message is sent to the other side
-              and the user is notified with a <c><![CDATA[segment timeout]]></c><c><![CDATA[UserReply]]></c> in either the 
+              and the user is notified with a <c><![CDATA[segment timeout]]></c> <c><![CDATA[UserReply]]></c> in either the
               <seealso marker="megaco_user#trans_reply">handle_trans_reply</seealso> callback function or 
               the return value of the 
               <seealso marker="megaco#call">call</seealso> function. </p>
@@ -1165,7 +1165,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
             <p>When the timer finally expires, a "megaco segments not
               received" (459) error message is sent to the other side
               and the user is notified with a 
-              <c><![CDATA[segment timeout]]></c><c><![CDATA[UserReply]]></c> in either the 
+              <c><![CDATA[segment timeout]]></c> <c><![CDATA[UserReply]]></c> in either the
               <seealso marker="megaco_user#trans_reply">handle_trans_reply</seealso> 
               callback function or 
               the return value of the 
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 4f678a2a1b..2aba8db71b 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -36,6 +36,48 @@
     section is the version number of Megaco.</p>
 
 
+  <section><title>Megaco 3.15.1.1</title>
+
+    <p>Version 3.15.1.1 supports code replacement in runtime from/to
+      version 3.15.1 and 3.15.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>Correct various XML errors. </p>
+          <p>Own Id: OTP-9550</p>
+        </item>
+
+     </list>
+
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+      
+      <p>-</p>
+      
+ <!--
+      <list type="bulleted">
+	<item>
+	  <p>Fixing miscellaneous things detected by dialyzer. </p>
+	  <p>Own Id: OTP-9075</p>
+	</item>
+	
+      </list>
+ -->
+      
+    </section>
+
+  </section> <!-- 3.15.1.1 -->
+
+
   <section><title>Megaco 3.15.1</title>
 
     <p>Version 3.15.1 supports code replacement in runtime from/to
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index 01b070d79f..7107178d1a 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -136,10 +136,17 @@
 %%      |
 %%      v
 %%    3.15.1
+%%      |
+%%      v
+%%   3.15.1.1
 %%
 %%
 {"%VSN%",
  [
+  {"3.15.1", 
+   [
+   ]
+  },
   {"3.15", 
    [
     {load_module, megaco_flex_scanner, soft_purge, soft_purge, []},
@@ -153,6 +160,10 @@
   }
  ],
  [
+  {"3.15.1", 
+   [
+   ]
+  },
   {"3.15", 
    [
     {load_module, megaco_flex_scanner, soft_purge, soft_purge, []},
diff --git a/lib/megaco/src/binary/depend.mk b/lib/megaco/src/binary/depend.mk
index 5ec4977175..c9ca34bcf6 100644
--- a/lib/megaco/src/binary/depend.mk
+++ b/lib/megaco/src/binary/depend.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2011. 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
@@ -24,9 +24,9 @@
 # but for per_bin it means that a stage in the encode
 # is done in the asn1 driver.
 #
-# +driver
+# +nif
 # For ber_bin this means that part of the decode is done
-# in the asn1 driver.
+# in the asn1 nif.
 #
 # +asn1config
 # This is only used by the ber_bin, and means that 
@@ -45,22 +45,22 @@ endif
 
 BER_V1_FLAGS             = $(ASN1_CT_OPTS)
 BER_BIN_V1_FLAGS         = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_V1_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize +driver
+BER_BIN_DRV_V1_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize +nif
 BER_V2_FLAGS             = $(ASN1_CT_OPTS)
 BER_BIN_V2_FLAGS         = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_V2_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize +driver
+BER_BIN_DRV_V2_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize +nif
 BER_PREV3A_FLAGS         = $(ASN1_CT_OPTS)
 BER_BIN_PREV3A_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_PREV3A_FLAGS = $(ASN1_CT_OPTS) +asn1config +optimize +driver
+BER_BIN_DRV_PREV3A_FLAGS = $(ASN1_CT_OPTS) +asn1config +optimize +nif
 BER_PREV3B_FLAGS         = $(ASN1_CT_OPTS)
 BER_BIN_PREV3B_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_PREV3B_FLAGS = $(ASN1_CT_OPTS) +asn1config +optimize +driver
+BER_BIN_DRV_PREV3B_FLAGS = $(ASN1_CT_OPTS) +asn1config +optimize +nif
 BER_PREV3C_FLAGS         = $(ASN1_CT_OPTS)
 BER_BIN_PREV3C_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_PREV3C_FLAGS = $(ASN1_CT_OPTS) +asn1config +optimize +driver
+BER_BIN_DRV_PREV3C_FLAGS = $(ASN1_CT_OPTS) +asn1config +optimize +nif
 BER_V3_FLAGS             = $(ASN1_CT_OPTS)
 BER_BIN_V3_FLAGS         = $(ASN1_CT_OPTS) +asn1config +optimize
-BER_BIN_DRV_V3_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize +driver
+BER_BIN_DRV_V3_FLAGS     = $(ASN1_CT_OPTS) +asn1config +optimize +nif
 PER_V1_FLAGS             = $(ASN1_CT_OPTS)
 PER_BIN_V1_FLAGS         = $(ASN1_CT_OPTS)
 PER_BIN_DRV_V1_FLAGS     = $(ASN1_CT_OPTS) +optimize
@@ -83,17 +83,16 @@ PER_BIN_DRV_V3_FLAGS     = $(ASN1_CT_OPTS) +optimize
 
 # --- Version 1 ---
 
-$(BER_ASN1_V1_SPEC).erl $(BER_ASN1_V1_SPEC).hrl: \
+$(BER_ASN1_V1_SPEC).erl: \
 	$(BER_ASN1_V1_SPEC).set.asn \
 	$(ASN1_V1_SPEC).asn
 	@echo "$(BER_ASN1_V1_SPEC):"
 	$(ERLC) -bber $(BER_V1_FLAGS) $(BER_ASN1_V1_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_V1_SPEC).$(EMULATOR): \
-	$(BER_ASN1_V1_SPEC).erl \
-	$(BER_ASN1_V1_SPEC).hrl
+	$(BER_ASN1_V1_SPEC).erl
 
-$(BER_BIN_ASN1_V1_SPEC).erl $(BER_BIN_ASN1_V1_SPEC).hrl: \
+$(BER_BIN_ASN1_V1_SPEC).erl: \
 	$(BER_BIN_ASN1_V1_SPEC).set.asn \
 	$(BER_BIN_ASN1_V1_SPEC).asn1config \
 	$(ASN1_V1_SPEC).asn
@@ -101,10 +100,9 @@ $(BER_BIN_ASN1_V1_SPEC).erl $(BER_BIN_ASN1_V1_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_V1_FLAGS) $(BER_BIN_ASN1_V1_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_ASN1_V1_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_V1_SPEC).erl \
-	$(BER_BIN_ASN1_V1_SPEC).hrl
+	$(BER_BIN_ASN1_V1_SPEC).erl
 
-$(BER_BIN_DRV_ASN1_V1_SPEC).erl $(BER_BIN_DRV_ASN1_V1_SPEC).hrl: \
+$(BER_BIN_DRV_ASN1_V1_SPEC).erl: \
 	$(BER_BIN_DRV_ASN1_V1_SPEC).set.asn \
 	$(BER_BIN_DRV_ASN1_V1_SPEC).asn1config \
 	$(ASN1_V1_SPEC).asn
@@ -112,53 +110,48 @@ $(BER_BIN_DRV_ASN1_V1_SPEC).erl $(BER_BIN_DRV_ASN1_V1_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_DRV_V1_FLAGS) $(BER_BIN_DRV_ASN1_V1_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_DRV_ASN1_V1_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_V1_SPEC).erl \
-	$(BER_BIN_DRV_ASN1_V1_SPEC).hrl
+	$(BER_BIN_DRV_ASN1_V1_SPEC).erl
 
-$(PER_ASN1_V1_SPEC).erl $(PER_ASN1_V1_SPEC).hrl: \
+$(PER_ASN1_V1_SPEC).erl: \
 	$(PER_ASN1_V1_SPEC).set.asn \
 	$(ASN1_V1_SPEC).asn
 	@echo "$(PER_ASN1_V1_SPEC):"
 	$(ERLC) -bper $(PER_V1_FLAGS) $(PER_ASN1_V1_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_V1_SPEC).$(EMULATOR): \
-	$(PER_ASN1_V1_SPEC).erl \
-	$(PER_ASN1_V1_SPEC).hrl
+	$(PER_ASN1_V1_SPEC).erl
 
-$(PER_BIN_ASN1_V1_SPEC).erl $(PER_BIN_ASN1_V1_SPEC).hrl: \
+$(PER_BIN_ASN1_V1_SPEC).erl: \
 	$(PER_BIN_ASN1_V1_SPEC).set.asn \
 	$(ASN1_V1_SPEC).asn
 	@echo "$(PER_BIN_ASN1_V1_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_V1_FLAGS) $(PER_BIN_ASN1_V1_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_ASN1_V1_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_V1_SPEC).erl \
-	$(PER_BIN_ASN1_V1_SPEC).hrl
+	$(PER_BIN_ASN1_V1_SPEC).erl
 
-$(PER_BIN_DRV_ASN1_V1_SPEC).erl $(PER_BIN_DRV_ASN1_V1_SPEC).hrl: \
+$(PER_BIN_DRV_ASN1_V1_SPEC).erl: \
 	$(PER_BIN_DRV_ASN1_V1_SPEC).set.asn \
 	$(ASN1_V1_SPEC).asn
 	@echo "$(PER_BIN_DRV_ASN1_V1_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_DRV_V1_FLAGS) $(PER_BIN_DRV_ASN1_V1_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_DRV_ASN1_V1_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_V1_SPEC).erl \
-	$(PER_BIN_DRV_ASN1_V1_SPEC).hrl
+	$(PER_BIN_DRV_ASN1_V1_SPEC).erl
 
 
 # --- Version 2 ---
 
-$(BER_ASN1_V2_SPEC).erl $(BER_ASN1_V2_SPEC).hrl: \
+$(BER_ASN1_V2_SPEC).erl: \
 	$(BER_ASN1_V2_SPEC).set.asn \
 	$(ASN1_V2_SPEC).asn
 	@echo "$(BER_ASN1_V2_SPEC):"
 	$(ERLC) -bber $(BER_V2_FLAGS) $(BER_ASN1_V2_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_V2_SPEC).$(EMULATOR): \
-	$(BER_ASN1_V2_SPEC).erl \
-	$(BER_ASN1_V2_SPEC).hrl
+	$(BER_ASN1_V2_SPEC).erl
 
-$(BER_BIN_ASN1_V2_SPEC).erl $(BER_BIN_ASN1_V2_SPEC).hrl: \
+$(BER_BIN_ASN1_V2_SPEC).erl: \
 	$(BER_BIN_ASN1_V2_SPEC).set.asn \
 	$(BER_BIN_ASN1_V2_SPEC).asn1config \
 	$(ASN1_V2_SPEC).asn
@@ -166,10 +159,9 @@ $(BER_BIN_ASN1_V2_SPEC).erl $(BER_BIN_ASN1_V2_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_V2_FLAGS) $(BER_BIN_ASN1_V2_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_ASN1_V2_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_V2_SPEC).erl \
-	$(BER_BIN_ASN1_V2_SPEC).hrl
+	$(BER_BIN_ASN1_V2_SPEC).erl
 
-$(BER_BIN_DRV_ASN1_V2_SPEC).erl $(BER_BIN_DRV_ASN1_V2_SPEC).hrl: \
+$(BER_BIN_DRV_ASN1_V2_SPEC).erl: \
 	$(BER_BIN_DRV_ASN1_V2_SPEC).set.asn \
 	$(BER_BIN_DRV_ASN1_V2_SPEC).asn1config \
 	$(ASN1_V2_SPEC).asn
@@ -177,55 +169,50 @@ $(BER_BIN_DRV_ASN1_V2_SPEC).erl $(BER_BIN_DRV_ASN1_V2_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_DRV_V2_FLAGS) $(BER_BIN_DRV_ASN1_V2_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_DRV_ASN1_V2_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_V2_SPEC).erl \
-	$(BER_BIN_DRV_ASN1_V2_SPEC).hrl
+	$(BER_BIN_DRV_ASN1_V2_SPEC).erl
 
-$(PER_ASN1_V2_SPEC).erl $(PER_ASN1_V2_SPEC).hrl: \
+$(PER_ASN1_V2_SPEC).erl: \
 	$(PER_ASN1_V2_SPEC).set.asn \
 	$(ASN1_V2_SPEC).asn
 	@echo "$(PER_ASN1_V2_SPEC):"
 	$(ERLC) -bper $(PER_V2_FLAGS) $(PER_ASN1_V2_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_V2_SPEC).$(EMULATOR): \
-	$(PER_ASN1_V2_SPEC).erl \
-	$(PER_ASN1_V2_SPEC).hrl
+	$(PER_ASN1_V2_SPEC).erl
 
-$(PER_BIN_ASN1_V2_SPEC).erl $(PER_BIN_ASN1_V2_SPEC).hrl: \
+$(PER_BIN_ASN1_V2_SPEC).erl: \
 	$(PER_BIN_ASN1_V2_SPEC).set.asn \
 	$(ASN1_V2_SPEC).asn
 	@echo "$(PER_BIN_ASN1_V2_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_V2_FLAGS) $(PER_BIN_ASN1_V2_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_ASN1_V2_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_V2_SPEC).erl \
-	$(PER_BIN_ASN1_V2_SPEC).hrl
+	$(PER_BIN_ASN1_V2_SPEC).erl
 
-$(PER_BIN_DRV_ASN1_V2_SPEC).erl $(PER_BIN_DRV_ASN1_V2_SPEC).hrl: \
+$(PER_BIN_DRV_ASN1_V2_SPEC).erl: \
 	$(PER_BIN_DRV_ASN1_V2_SPEC).set.asn \
 	$(ASN1_V2_SPEC).asn
 	@echo "$(PER_BIN_DRV_ASN1_V2_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_DRV_V2_FLAGS) $(PER_BIN_DRV_ASN1_V2_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_DRV_ASN1_V2_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_V2_SPEC).erl \
-	$(PER_BIN_DRV_ASN1_V2_SPEC).hrl
+	$(PER_BIN_DRV_ASN1_V2_SPEC).erl
 
 
 # --- Version 3 ---
 
 # -- (prev3a) --
 
-$(BER_ASN1_PREV3A_SPEC).erl $(BER_ASN1_PREV3A_SPEC).hrl: \
+$(BER_ASN1_PREV3A_SPEC).erl: \
 	$(BER_ASN1_PREV3A_SPEC).set.asn \
 	$(ASN1_PREV3A_SPEC).asn
 	@echo "$(BER_ASN1_PREV3A_SPEC):"
 	$(ERLC) -bber $(BER_PREV3A_FLAGS) $(BER_ASN1_PREV3A_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_PREV3A_SPEC).$(EMULATOR): \
-	$(BER_ASN1_PREV3A_SPEC).erl \
-	$(BER_ASN1_PREV3A_SPEC).hrl
+	$(BER_ASN1_PREV3A_SPEC).erl
 
-$(BER_BIN_ASN1_PREV3A_SPEC).erl $(BER_BIN_ASN1_PREV3A_SPEC).hrl: \
+$(BER_BIN_ASN1_PREV3A_SPEC).erl: \
 	$(BER_BIN_ASN1_PREV3A_SPEC).set.asn \
 	$(BER_BIN_ASN1_PREV3A_SPEC).asn1config \
 	$(ASN1_PREV3A_SPEC).asn
@@ -233,10 +220,9 @@ $(BER_BIN_ASN1_PREV3A_SPEC).erl $(BER_BIN_ASN1_PREV3A_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_PREV3A_FLAGS) $(BER_BIN_ASN1_PREV3A_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_ASN1_PREV3A_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_PREV3A_SPEC).erl \
-	$(BER_BIN_ASN1_PREV3A_SPEC).hrl
+	$(BER_BIN_ASN1_PREV3A_SPEC).erl
 
-$(BER_BIN_DRV_ASN1_PREV3A_SPEC).erl $(BER_BIN_DRV_ASN1_PREV3A_SPEC).hrl: \
+$(BER_BIN_DRV_ASN1_PREV3A_SPEC).erl: \
 	$(BER_BIN_DRV_ASN1_PREV3A_SPEC).set.asn \
 	$(BER_BIN_DRV_ASN1_PREV3A_SPEC).asn1config \
 	$(ASN1_PREV3A_SPEC).asn
@@ -244,52 +230,47 @@ $(BER_BIN_DRV_ASN1_PREV3A_SPEC).erl $(BER_BIN_DRV_ASN1_PREV3A_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_DRV_PREV3A_FLAGS) $(BER_BIN_DRV_ASN1_PREV3A_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_DRV_ASN1_PREV3A_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_PREV3A_SPEC).erl \
-	$(BER_BIN_DRV_ASN1_PREV3A_SPEC).hrl
+	$(BER_BIN_DRV_ASN1_PREV3A_SPEC).erl
 
-$(PER_ASN1_PREV3A_SPEC).erl $(PER_ASN1_PREV3A_SPEC).hrl: \
+$(PER_ASN1_PREV3A_SPEC).erl: \
 	$(PER_ASN1_PREV3A_SPEC).set.asn \
 	$(ASN1_PREV3A_SPEC).asn
 	@echo "$(PER_ASN1_PREV3A_SPEC):"
 	$(ERLC) -bper $(PER_PREV3A_FLAGS) $(PER_ASN1_PREV3A_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_PREV3A_SPEC).$(EMULATOR): \
-	$(PER_ASN1_PREV3A_SPEC).erl \
-	$(PER_ASN1_PREV3A_SPEC).hrl
+	$(PER_ASN1_PREV3A_SPEC).erl
 
-$(PER_BIN_ASN1_PREV3A_SPEC).erl $(PER_BIN_ASN1_PREV3A_SPEC).hrl: \
+$(PER_BIN_ASN1_PREV3A_SPEC).erl: \
 	$(PER_BIN_ASN1_PREV3A_SPEC).set.asn \
 	$(ASN1_PREV3A_SPEC).asn
 	@echo "$(PER_BIN_ASN1_PREV3A_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_PREV3A_FLAGS) $(PER_BIN_ASN1_PREV3A_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_ASN1_PREV3A_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_PREV3A_SPEC).erl \
-	$(PER_BIN_ASN1_PREV3A_SPEC).hrl
+	$(PER_BIN_ASN1_PREV3A_SPEC).erl
 
-$(PER_BIN_DRV_ASN1_PREV3A_SPEC).erl $(PER_BIN_DRV_ASN1_PREV3A_SPEC).hrl: \
+$(PER_BIN_DRV_ASN1_PREV3A_SPEC).erl: \
 	$(PER_BIN_DRV_ASN1_PREV3A_SPEC).set.asn \
 	$(ASN1_PREV3A_SPEC).asn
 	@echo "$(PER_BIN_DRV_ASN1_PREV3A_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_DRV_PREV3A_FLAGS) $(PER_BIN_DRV_ASN1_PREV3A_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_DRV_ASN1_PREV3A_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_PREV3A_SPEC).erl \
-	$(PER_BIN_DRV_ASN1_PREV3A_SPEC).hrl
+	$(PER_BIN_DRV_ASN1_PREV3A_SPEC).erl
 
 # -- (prev3b) --
 
-$(BER_ASN1_PREV3B_SPEC).erl $(BER_ASN1_PREV3B_SPEC).hrl: \
+$(BER_ASN1_PREV3B_SPEC).erl: \
 	$(BER_ASN1_PREV3B_SPEC).set.asn \
 	$(ASN1_PREV3B_SPEC).asn
 	@echo "$(BER_ASN1_PREV3B_SPEC):"
 	$(ERLC) -bber $(BER_PREV3B_FLAGS) $(BER_ASN1_PREV3B_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_PREV3B_SPEC).$(EMULATOR): \
-	$(BER_ASN1_PREV3B_SPEC).erl \
-	$(BER_ASN1_PREV3B_SPEC).hrl
+	$(BER_ASN1_PREV3B_SPEC).erl
 
-$(BER_BIN_ASN1_PREV3B_SPEC).erl $(BER_BIN_ASN1_PREV3B_SPEC).hrl: \
+$(BER_BIN_ASN1_PREV3B_SPEC).erl: \
 	$(BER_BIN_ASN1_PREV3B_SPEC).set.asn \
 	$(BER_BIN_ASN1_PREV3B_SPEC).asn1config \
 	$(ASN1_PREV3B_SPEC).asn
@@ -297,10 +278,9 @@ $(BER_BIN_ASN1_PREV3B_SPEC).erl $(BER_BIN_ASN1_PREV3B_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_PREV3B_FLAGS) $(BER_BIN_ASN1_PREV3B_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_ASN1_PREV3B_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_PREV3B_SPEC).erl \
-	$(BER_BIN_ASN1_PREV3B_SPEC).hrl
+	$(BER_BIN_ASN1_PREV3B_SPEC).erl
 
-$(BER_BIN_DRV_ASN1_PREV3B_SPEC).erl $(BER_BIN_DRV_ASN1_PREV3B_SPEC).hrl: \
+$(BER_BIN_DRV_ASN1_PREV3B_SPEC).erl: \
 	$(BER_BIN_DRV_ASN1_PREV3B_SPEC).set.asn \
 	$(BER_BIN_DRV_ASN1_PREV3B_SPEC).asn1config \
 	$(ASN1_PREV3B_SPEC).asn
@@ -308,53 +288,48 @@ $(BER_BIN_DRV_ASN1_PREV3B_SPEC).erl $(BER_BIN_DRV_ASN1_PREV3B_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_DRV_PREV3B_FLAGS) $(BER_BIN_DRV_ASN1_PREV3B_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_DRV_ASN1_PREV3B_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_PREV3B_SPEC).erl \
-	$(BER_BIN_DRV_ASN1_PREV3B_SPEC).hrl
+	$(BER_BIN_DRV_ASN1_PREV3B_SPEC).erl
 
-$(PER_ASN1_PREV3B_SPEC).erl $(PER_ASN1_PREV3B_SPEC).hrl: \
+$(PER_ASN1_PREV3B_SPEC).erl: \
 	$(PER_ASN1_PREV3B_SPEC).set.asn \
 	$(ASN1_PREV3B_SPEC).asn
 	@echo "$(PER_ASN1_PREV3B_SPEC):"
 	$(ERLC) -bper $(PER_PREV3B_FLAGS) $(PER_ASN1_PREV3B_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_PREV3B_SPEC).$(EMULATOR): \
-	$(PER_ASN1_PREV3B_SPEC).erl \
-	$(PER_ASN1_PREV3B_SPEC).hrl
+	$(PER_ASN1_PREV3B_SPEC).erl
 
-$(PER_BIN_ASN1_PREV3B_SPEC).erl $(PER_BIN_ASN1_PREV3B_SPEC).hrl: \
+$(PER_BIN_ASN1_PREV3B_SPEC).erl: \
 	$(PER_BIN_ASN1_PREV3B_SPEC).set.asn \
 	$(ASN1_PREV3B_SPEC).asn
 	@echo "$(PER_BIN_ASN1_PREV3B_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_PREV3B_FLAGS) $(PER_BIN_ASN1_PREV3B_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_ASN1_PREV3B_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_PREV3B_SPEC).erl \
-	$(PER_BIN_ASN1_PREV3B_SPEC).hrl
+	$(PER_BIN_ASN1_PREV3B_SPEC).erl
 
-$(PER_BIN_DRV_ASN1_PREV3B_SPEC).erl $(PER_BIN_DRV_ASN1_PREV3B_SPEC).hrl: \
+$(PER_BIN_DRV_ASN1_PREV3B_SPEC).erl: \
 	$(PER_BIN_DRV_ASN1_PREV3B_SPEC).set.asn \
 	$(ASN1_PREV3B_SPEC).asn
 	@echo "$(PER_BIN_DRV_ASN1_PREV3B_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_DRV_PREV3B_FLAGS) $(PER_BIN_DRV_ASN1_PREV3B_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_DRV_ASN1_PREV3B_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_PREV3B_SPEC).erl \
-	$(PER_BIN_DRV_ASN1_PREV3B_SPEC).hrl
+	$(PER_BIN_DRV_ASN1_PREV3B_SPEC).erl
 
 
 # -- (prev3c) --
 
-$(BER_ASN1_PREV3C_SPEC).erl $(BER_ASN1_PREV3C_SPEC).hrl: \
+$(BER_ASN1_PREV3C_SPEC).erl: \
 	$(BER_ASN1_PREV3C_SPEC).set.asn \
 	$(ASN1_PREV3C_SPEC).asn
 	@echo "$(BER_ASN1_PREV3C_SPEC):"
 	$(ERLC) -bber $(BER_PREV3C_FLAGS) $(BER_ASN1_PREV3C_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_PREV3C_SPEC).$(EMULATOR): \
-	$(BER_ASN1_PREV3C_SPEC).erl \
-	$(BER_ASN1_PREV3C_SPEC).hrl
+	$(BER_ASN1_PREV3C_SPEC).erl
 
-$(BER_BIN_ASN1_PREV3C_SPEC).erl $(BER_BIN_ASN1_PREV3C_SPEC).hrl: \
+$(BER_BIN_ASN1_PREV3C_SPEC).erl: \
 	$(BER_BIN_ASN1_PREV3C_SPEC).set.asn \
 	$(BER_BIN_ASN1_PREV3C_SPEC).asn1config \
 	$(ASN1_PREV3C_SPEC).asn
@@ -362,10 +337,9 @@ $(BER_BIN_ASN1_PREV3C_SPEC).erl $(BER_BIN_ASN1_PREV3C_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_PREV3C_FLAGS) $(BER_BIN_ASN1_PREV3C_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_ASN1_PREV3C_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_PREV3C_SPEC).erl \
-	$(BER_BIN_ASN1_PREV3C_SPEC).hrl
+	$(BER_BIN_ASN1_PREV3C_SPEC).erl
 
-$(BER_BIN_DRV_ASN1_PREV3C_SPEC).erl $(BER_BIN_DRV_ASN1_PREV3C_SPEC).hrl: \
+$(BER_BIN_DRV_ASN1_PREV3C_SPEC).erl: \
 	$(BER_BIN_DRV_ASN1_PREV3C_SPEC).set.asn \
 	$(BER_BIN_DRV_ASN1_PREV3C_SPEC).asn1config \
 	$(ASN1_PREV3C_SPEC).asn
@@ -373,53 +347,48 @@ $(BER_BIN_DRV_ASN1_PREV3C_SPEC).erl $(BER_BIN_DRV_ASN1_PREV3C_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_DRV_PREV3C_FLAGS) $(BER_BIN_DRV_ASN1_PREV3C_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_DRV_ASN1_PREV3C_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_PREV3C_SPEC).erl \
-	$(BER_BIN_DRV_ASN1_PREV3C_SPEC).hrl
+	$(BER_BIN_DRV_ASN1_PREV3C_SPEC).erl
 
-$(PER_ASN1_PREV3C_SPEC).erl $(PER_ASN1_PREV3C_SPEC).hrl: \
+$(PER_ASN1_PREV3C_SPEC).erl: \
 	$(PER_ASN1_PREV3C_SPEC).set.asn \
 	$(ASN1_PREV3C_SPEC).asn
 	@echo "$(PER_ASN1_PREV3C_SPEC):"
 	$(ERLC) -bper $(PER_PREV3C_FLAGS) $(PER_ASN1_PREV3C_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_PREV3C_SPEC).$(EMULATOR): \
-	$(PER_ASN1_PREV3C_SPEC).erl \
-	$(PER_ASN1_PREV3C_SPEC).hrl
+	$(PER_ASN1_PREV3C_SPEC).erl
 
-$(PER_BIN_ASN1_PREV3C_SPEC).erl $(PER_BIN_ASN1_PREV3C_SPEC).hrl: \
+$(PER_BIN_ASN1_PREV3C_SPEC).erl: \
 	$(PER_BIN_ASN1_PREV3C_SPEC).set.asn \
 	$(ASN1_PREV3C_SPEC).asn
 	@echo "$(PER_BIN_ASN1_PREV3C_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_PREV3C_FLAGS) $(PER_BIN_ASN1_PREV3C_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_ASN1_PREV3C_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_PREV3C_SPEC).erl \
-	$(PER_BIN_ASN1_PREV3C_SPEC).hrl
+	$(PER_BIN_ASN1_PREV3C_SPEC).erl
 
-$(PER_BIN_DRV_ASN1_PREV3C_SPEC).erl $(PER_BIN_DRV_ASN1_PREV3C_SPEC).hrl: \
+$(PER_BIN_DRV_ASN1_PREV3C_SPEC).erl: \
 	$(PER_BIN_DRV_ASN1_PREV3C_SPEC).set.asn \
 	$(ASN1_PREV3C_SPEC).asn
 	@echo "$(PER_BIN_DRV_ASN1_PREV3C_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_DRV_PREV3C_FLAGS) $(PER_BIN_DRV_ASN1_PREV3C_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_DRV_ASN1_PREV3C_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_PREV3C_SPEC).erl \
-	$(PER_BIN_DRV_ASN1_PREV3C_SPEC).hrl
+	$(PER_BIN_DRV_ASN1_PREV3C_SPEC).erl
 
 
 # -- (v3) --
 
-$(BER_ASN1_V3_SPEC).erl $(BER_ASN1_V3_SPEC).hrl: \
+$(BER_ASN1_V3_SPEC).erl: \
 	$(BER_ASN1_V3_SPEC).set.asn \
 	$(ASN1_V3_SPEC).asn
 	@echo "$(BER_ASN1_V3_SPEC):"
 	$(ERLC) -bber $(BER_V3_FLAGS) $(BER_ASN1_V3_SPEC).set.asn
 
 $(EBIN)/$(BER_ASN1_V3_SPEC).$(EMULATOR): \
-	$(BER_ASN1_V3_SPEC).erl \
-	$(BER_ASN1_V3_SPEC).hrl
+	$(BER_ASN1_V3_SPEC).erl
 
-$(BER_BIN_ASN1_V3_SPEC).erl $(BER_BIN_ASN1_V3_SPEC).hrl: \
+$(BER_BIN_ASN1_V3_SPEC).erl: \
 	$(BER_BIN_ASN1_V3_SPEC).set.asn \
 	$(BER_BIN_ASN1_V3_SPEC).asn1config \
 	$(ASN1_V3_SPEC).asn
@@ -427,10 +396,9 @@ $(BER_BIN_ASN1_V3_SPEC).erl $(BER_BIN_ASN1_V3_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_V3_FLAGS) $(BER_BIN_ASN1_V3_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_ASN1_V3_SPEC).$(EMULATOR): \
-	$(BER_BIN_ASN1_V3_SPEC).erl \
-	$(BER_BIN_ASN1_V3_SPEC).hrl
+	$(BER_BIN_ASN1_V3_SPEC).erl
 
-$(BER_BIN_DRV_ASN1_V3_SPEC).erl $(BER_BIN_DRV_ASN1_V3_SPEC).hrl: \
+$(BER_BIN_DRV_ASN1_V3_SPEC).erl: \
 	$(BER_BIN_DRV_ASN1_V3_SPEC).set.asn \
 	$(BER_BIN_DRV_ASN1_V3_SPEC).asn1config \
 	$(ASN1_V3_SPEC).asn
@@ -438,38 +406,34 @@ $(BER_BIN_DRV_ASN1_V3_SPEC).erl $(BER_BIN_DRV_ASN1_V3_SPEC).hrl: \
 	$(ERLC) -bber_bin $(BER_BIN_DRV_V3_FLAGS) $(BER_BIN_DRV_ASN1_V3_SPEC).set.asn
 
 $(EBIN)/$(BER_BIN_DRV_ASN1_V3_SPEC).$(EMULATOR): \
-	$(BER_BIN_DRV_ASN1_V3_SPEC).erl \
-	$(BER_BIN_DRV_ASN1_V3_SPEC).hrl
+	$(BER_BIN_DRV_ASN1_V3_SPEC).erl
 
-$(PER_ASN1_V3_SPEC).erl $(PER_ASN1_V3_SPEC).hrl: \
+$(PER_ASN1_V3_SPEC).erl: \
 	$(PER_ASN1_V3_SPEC).set.asn \
 	$(ASN1_V3_SPEC).asn
 	@echo "$(PER_ASN1_V3_SPEC):"
 	$(ERLC) -bper $(PER_V3_FLAGS) $(PER_ASN1_V3_SPEC).set.asn
 
 $(EBIN)/$(PER_ASN1_V3_SPEC).$(EMULATOR): \
-	$(PER_ASN1_V3_SPEC).erl \
-	$(PER_ASN1_V3_SPEC).hrl
+	$(PER_ASN1_V3_SPEC).erl
 
-$(PER_BIN_ASN1_V3_SPEC).erl $(PER_BIN_ASN1_V3_SPEC).hrl: \
+$(PER_BIN_ASN1_V3_SPEC).erl: \
 	$(PER_BIN_ASN1_V3_SPEC).set.asn \
 	$(ASN1_V3_SPEC).asn
 	@echo "$(PER_BIN_ASN1_V3_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_V3_FLAGS) $(PER_BIN_ASN1_V3_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_ASN1_V3_SPEC).$(EMULATOR): \
-	$(PER_BIN_ASN1_V3_SPEC).erl \
-	$(PER_BIN_ASN1_V3_SPEC).hrl
+	$(PER_BIN_ASN1_V3_SPEC).erl
 
-$(PER_BIN_DRV_ASN1_V3_SPEC).erl $(PER_BIN_DRV_ASN1_V3_SPEC).hrl: \
+$(PER_BIN_DRV_ASN1_V3_SPEC).erl: \
 	$(PER_BIN_DRV_ASN1_V3_SPEC).set.asn \
 	$(ASN1_V3_SPEC).asn
 	@echo "$(PER_BIN_DRV_ASN1_V3_SPEC):"
 	$(ERLC) -bper_bin $(PER_BIN_DRV_V3_FLAGS) $(PER_BIN_DRV_ASN1_V3_SPEC).set.asn
 
 $(EBIN)/$(PER_BIN_DRV_ASN1_V3_SPEC).$(EMULATOR): \
-	$(PER_BIN_DRV_ASN1_V3_SPEC).erl \
-	$(PER_BIN_DRV_ASN1_V3_SPEC).hrl
+	$(PER_BIN_DRV_ASN1_V3_SPEC).erl
 
 
 # -------------
diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
index 5af651d89b..2c46a673e4 100644
--- a/lib/megaco/src/flex/Makefile.in
+++ b/lib/megaco/src/flex/Makefile.in
@@ -391,7 +391,9 @@ $(STD_DRV).c: $(STD_DRV).flex
 $(MT_DRV).c: $(MT_DRV).flex
 	$(LEX) $(MT_LEX_FLAGS) -P$* -o$@ $< 
 
-solibs: $(LIBDIR) $(OBJDIR) $(SOLIBS) 
+_create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
+
+solibs: $(SOLIBS) 
 
 $(OBJDIR)/$(STD_DRV).o: $(STD_DRV).c 
 	@echo "compiling std driver:"
@@ -411,10 +413,3 @@ $(LIBDIR)/$(STD_DRV).$(DED_EXT): $(OBJDIR)/$(STD_DRV).o
 $(LIBDIR)/$(MT_DRV).$(DED_EXT): $(OBJDIR)/$(MT_DRV).o
 	@echo "linking multi-threaded driver:"
 	$(LD) $(LDFLAGS) -o $@ $< 
-
-$(LIBDIR):
-	-mkdir -p $(LIBDIR)
-
-$(OBJDIR):
-	-mkdir -p $(OBJDIR)
-
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 5f71712360..c1476488ca 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.15.1
+MEGACO_VSN  = 3.15.1.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/mnesia/doc/src/Makefile b/lib/mnesia/doc/src/Makefile
index f45b5137a3..f2e581f9d3 100644
--- a/lib/mnesia/doc/src/Makefile
+++ b/lib/mnesia/doc/src/Makefile
@@ -29,14 +29,6 @@ VSN=$(MNESIA_VSN)
 APPLICATION=mnesia
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -105,31 +97,10 @@ EXTRA_FILES = summary.html.src \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else 
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-TOP_PS_FILE  = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif 
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -142,8 +113,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT 
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -158,33 +127,6 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES)
-
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) 
-
-endif
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -199,8 +141,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -211,30 +151,4 @@ release_docs_spec: docs
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-endif
-endif
-
-endif
-
-
 release_spec:
-
diff --git a/lib/mnesia/doc/src/make.dep b/lib/mnesia/doc/src/make.dep
deleted file mode 100644
index 6e79484cb3..0000000000
--- a/lib/mnesia/doc/src/make.dep
+++ /dev/null
@@ -1,46 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: Mnesia_App_A.tex Mnesia_App_B.tex Mnesia_App_C.tex \
-		Mnesia_App_D.tex Mnesia_chap1.tex Mnesia_chap2.tex \
-		Mnesia_chap3.tex Mnesia_chap4.tex Mnesia_chap5.tex \
-		Mnesia_chap7.tex Mnesia_chap8.tex book.tex \
-		mnesia.tex mnesia_frag_hash.tex mnesia_registry.tex \
-		part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-Mnesia_App_B.tex: ../../src/mnesia_backup.erl
-
-Mnesia_App_C.tex: ../../src/mnesia_frag.erl
-
-Mnesia_App_D.tex: ../../src/mnesia_frag_hash.erl
-
-Mnesia_chap2.tex: company.erl company.hrl
-
-Mnesia_chap3.tex: company.erl
-
-Mnesia_chap4.tex: company.erl
-
-Mnesia_chap5.tex: FRUITS company.erl company_o.erl company_o.hrl
-
-Mnesia_chap7.tex: bup.erl
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: company.ps
-
diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml
index 7a8f796cee..19ec70118f 100644
--- a/lib/mnesia/doc/src/mnesia.xml
+++ b/lib/mnesia/doc/src/mnesia.xml
@@ -246,7 +246,7 @@ If a new item is inserted with the same key as
               </p>
           </item>
           <item>
-            <p><c>{max,MaxTabs}</c><c>MaxTabs</c> is a list of
+            <p><c>{max,MaxTabs}</c>. <c>MaxTabs</c> is a list of
               tables that should be included in the checkpoint. The
               default is []. For these tables, the redundancy will be
               maximized and checkpoint information will be retained together
@@ -274,7 +274,7 @@ If a new item is inserted with the same key as
               </p>
           </item>
           <item>
-            <p><c>{ram_overrides_dump,Bool} </c> Only applicable
+            <p><c>{ram_overrides_dump,Bool}</c>. Only applicable
               for <c>ram_copies</c>.  <c>Bool</c> allows you to choose
               to backup the table state as it is in RAM, or as it is on
               disc. <c>true</c> means that the latest committed
diff --git a/lib/mnesia/doc/src/mnesia_frag_hash.xml b/lib/mnesia/doc/src/mnesia_frag_hash.xml
index 73162c3974..665796f20d 100644
--- a/lib/mnesia/doc/src/mnesia_frag_hash.xml
+++ b/lib/mnesia/doc/src/mnesia_frag_hash.xml
@@ -64,7 +64,7 @@
         <p>Note that the <c>add_frag/2</c> function will be invoked
           one time each for the rest of the fragments (all but number 1)
           as a part of the table creation procedure.</p>
-        <p><c>State</c> is the initial value of the <c>hash_state</c><c>frag_property</c>. The <c>NewState</c> will be stored as
+        <p><c>State</c> is the initial value of the <c>hash_state</c> <c>frag_property</c>. The <c>NewState</c> will be stored as
           <c>hash_state</c> among the other <c>frag_properties</c>.
           </p>
       </desc>
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 7f50dc049a..8ef573a948 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -38,7 +38,50 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.4.19</title>
+  <section><title>Mnesia 4.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix protocol issues. Mnesia-4.4.19 could not communicate
+	    with to older nodes.</p>
+          <p>
+	    Own Id: OTP-9473</p>
+        </item>
+        <item>
+	    <p> XML files have been corrected. </p>
+          <p>
+	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Dump the log even if no transactions have been invoked on
+	    local node, otherwise the log will grow forever with
+	    decisions from the other nodes who have tables on disk.
+	    Thanks Marek Majkowski.</p>
+          <p>
+	    Own Id: OTP-9551</p>
+        </item>
+        <item>
+          <p>
+	    Use dedicated api for clear_table, i.e. instead of
+	    match_delete use delete_all_objects. Thanks KukHyun Lee.</p>
+          <p>
+	    Own Id: OTP-9558</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.4.19</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile
index e032f563fa..1c8ec54605 100644
--- a/lib/mnesia/src/Makefile
+++ b/lib/mnesia/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2011. 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
@@ -113,6 +113,8 @@ clean:
 
 docs:
 
+$(TARGET_FILES): $(HRL_FILES)
+
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
diff --git a/lib/mnesia/src/mnesia.appup.src b/lib/mnesia/src/mnesia.appup.src
index 3691aa249a..fe4e5e2e7a 100644
--- a/lib/mnesia/src/mnesia.appup.src
+++ b/lib/mnesia/src/mnesia.appup.src
@@ -1,11 +1,13 @@
 %% -*- erlang -*-
 {"%VSN%",  
  [
+  {"4.4.19", [{restart_application, mnesia}]},
   {"4.4.18", [{restart_application, mnesia}]},
   {"4.4.17", [{restart_application, mnesia}]},
   {"4.4.16", [{restart_application, mnesia}]}
  ],
  [
+  {"4.4.19", [{restart_application, mnesia}]},
   {"4.4.18", [{restart_application, mnesia}]},
   {"4.4.17", [{restart_application, mnesia}]},
   {"4.4.16", [{restart_application, mnesia}]}
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index d4b2c7b5cc..1d3bd55b48 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -57,7 +57,8 @@
 	 release_schema_commit_lock/0,
 	 create_table/1,
 	 get_disc_copy/1,
-	 get_cstructs/0,
+	 get_remote_cstructs/0,  % new function
+	 get_cstructs/0,         % old function
 	 sync_and_block_table_whereabouts/4,
 	 sync_del_table_copy_whereabouts/2,
 	 block_table/1,
@@ -278,9 +279,51 @@ rec_tabs([], _, _, Init) ->
     unlink(Init),
     ok.
 
-get_cstructs() ->
+%% New function that does exactly what get_cstructs() used to do.
+%% When this function is called, we know that the calling node knows
+%% how to convert cstructs on the receiving end (should they differ).
+get_remote_cstructs() ->
     call(get_cstructs).
 
+%% Old function kept for backwards compatibility; converts cstructs before sending.
+get_cstructs() ->
+    {cstructs, Cstructs, Running} = call(get_cstructs),
+    Node = node(group_leader()),
+    {cstructs, normalize_cstructs(Cstructs, Node), Running}.
+
+normalize_cstructs(Cstructs, Node) ->
+    %% backward-compatibility hack; normalize before returning
+    case rpc:call(Node, mnesia_lib, val, [{schema,cstruct}]) of
+	{badrpc, _} ->
+	    %% assume it's not a schema merge
+	    Cstructs;
+	#cstruct{} ->
+	    %% same format
+	    Cstructs;
+	Cstruct ->
+	    %% some other format
+	    RemoteFields = [F || {F,_} <- rpc:call(Node, mnesia_schema, cs2list, [Cstruct])],
+	    [convert_cs(Cs, RemoteFields) || Cs <- Cstructs]
+    end.
+
+convert_cs(Cs, Fields) ->
+    MyFields = record_info(fields, cstruct),
+    convert(tl(tuple_to_list(Cs)), MyFields, Fields, []).
+
+convert([H|T], [F|FsL], [F|FsR], Acc) ->
+    convert(T, FsL, FsR, [H|Acc]);
+convert([H|T], [Fl|FsL] = L, [Fr|FsR] = R, Acc) ->
+    case {lists:member(Fl, FsR), lists:member(Fr, FsL)} of
+	{true, false} ->
+	    convert(T, L, FsR, [H|Acc]);
+	{false, true} ->
+	    %% Field Fl doesn't exist on receiver side; skip.
+	    convert(T, FsL, R, Acc)
+    end;
+convert([], _, _, Acc) ->
+    list_to_tuple([cstruct|lists:reverse(Acc)]).
+
+
 update(Fun) ->
     call({update,Fun}).
 
diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl
index 92fd9dfade..f8d7664156 100644
--- a/lib/mnesia/src/mnesia_dumper.erl
+++ b/lib/mnesia/src/mnesia_dumper.erl
@@ -214,7 +214,12 @@ insert_rec(Rec, InPlace, InitBy, LogV) when is_record(Rec, commit) ->
 	{Tid, committed} ->
 	    do_insert_rec(Tid, Rec, InPlace, InitBy, LogV);
 	{Tid, aborted} ->
-	    mnesia_schema:undo_prepare_commit(Tid, Rec)
+	    case InitBy of
+		startup ->
+		    mnesia_schema:undo_prepare_commit(Tid, Rec);
+		_ ->
+		    ok
+	    end
     end;
 insert_rec(H, _InPlace, _InitBy, _LogV) when is_record(H, log_header) ->
     CurrentVersion = mnesia_log:version(),
@@ -359,7 +364,7 @@ dets_insert(Op,Tab,Key,Val) ->
 	    ok = dets:delete_object(Tab, Val);
 	clear_table ->
 	    dets_cleared(Tab),
-	    ok = dets:match_delete(Tab, '_')
+	    ok = dets:delete_all_objects(Tab)
     end.
 	    
 dets_updated(Tab,Key) -> 
diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl
index 7e926a6258..ae6631646c 100644
--- a/lib/mnesia/src/mnesia_lib.erl
+++ b/lib/mnesia/src/mnesia_lib.erl
@@ -413,7 +413,7 @@ pr_other(Var, Other) ->
 	    [self(), process_info(self(), registered_name),
 	     Var, Other, Why]),
     case Other of
-	{badarg, [{ets, lookup_element, _}|_]} ->
+	{badarg, [{ets, lookup_element, _, _}|_]} ->
 	    exit(Why);
 	_ ->
 	    erlang:error(Why)
@@ -1141,12 +1141,18 @@ db_erase(ram_copies, Tab, Key) -> ?ets_delete(Tab, Key), ok;
 db_erase(disc_copies, Tab, Key) -> ?ets_delete(Tab, Key), ok;
 db_erase(disc_only_copies, Tab, Key) -> dets:delete(Tab, Key).
 
+db_match_erase(Tab, '_') ->
+    db_delete_all(val({Tab, storage_type}),Tab);
 db_match_erase(Tab, Pat) ->
     db_match_erase(val({Tab, storage_type}), Tab, Pat).
 db_match_erase(ram_copies, Tab, Pat) -> ?ets_match_delete(Tab, Pat), ok;
 db_match_erase(disc_copies, Tab, Pat) -> ?ets_match_delete(Tab, Pat), ok;
 db_match_erase(disc_only_copies, Tab, Pat) -> dets:match_delete(Tab, Pat).
 
+db_delete_all(ram_copies, Tab) ->       ets:delete_all_objects(Tab);
+db_delete_all(disc_copies, Tab) ->      ets:delete_all_objects(Tab);
+db_delete_all(disc_only_copies, Tab) -> dets:delete_all_objects(Tab).
+
 db_first(Tab) ->
     db_first(val({Tab, storage_type}), Tab).
 db_first(ram_copies, Tab) -> ?ets_first(Tab);
diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl
index e785b795d1..c4b22814a8 100644
--- a/lib/mnesia/src/mnesia_loader.erl
+++ b/lib/mnesia/src/mnesia_loader.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. 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
@@ -27,7 +27,6 @@
 	 net_load_table/4,
 	 send_table/3]).
 
--export([old_node_init_table/6]). %% Spawned old node protocol conversion hack
 -export([spawned_receiver/8]).    %% Spawned lock taking process
 
 -import(mnesia_lib, [set/2, fatal/2, verbose/2, dbg_out/2]).
@@ -36,7 +35,7 @@
 
 val(Var) ->
     case ?catch_val(Var) of
-	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason); 
+	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason);
 	Value -> Value
     end.
 
@@ -51,7 +50,7 @@ disc_load_table(Tab, Reason) ->
     ?eval_debug_fun({?MODULE, do_get_disc_copy},
 		    [{tab, Tab},
 		     {reason, Reason},
-		     {storage, Storage}, 
+		     {storage, Storage},
 		     {type, Type}]),
     do_get_disc_copy2(Tab, Reason, Storage, Type).
 
@@ -63,19 +62,19 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_copies ->
     %% NOW we create the actual table
     Repair = mnesia_monitor:get_env(auto_repair),
     Args = [{keypos, 2}, public, named_table, Type],
-    case Reason of 
+    case Reason of
 	{dumper, _} -> %% Resources allready allocated
 	    ignore;
 	_ ->
 	    mnesia_monitor:mktab(Tab, Args),
-	    Count = mnesia_log:dcd2ets(Tab, Repair),	    
+	    Count = mnesia_log:dcd2ets(Tab, Repair),
 	    case ets:info(Tab, size) of
 		X when X < Count * 4 ->
-		    ok = mnesia_log:ets2dcd(Tab); 
+		    ok = mnesia_log:ets2dcd(Tab);
 		_ ->
 		    ignore
 	    end
-    end, 
+    end,
     mnesia_index:init_index(Tab, Storage),
     snmpify(Tab, Storage),
     set({Tab, load_node}, node()),
@@ -84,7 +83,7 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_copies ->
 
 do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == ram_copies ->
     Args = [{keypos, 2}, public, named_table, Type],
-    case Reason of 
+    case Reason of
 	{dumper, _} -> %% Resources allready allocated
 	    ignore;
 	_ ->
@@ -94,12 +93,12 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == ram_copies ->
 	    Repair = mnesia_monitor:get_env(auto_repair),
 	    case mnesia_monitor:use_dir() of
 		true ->
-		    case mnesia_lib:exists(Fname) of 
+		    case mnesia_lib:exists(Fname) of
 			true -> mnesia_log:dcd2ets(Tab, Repair);
 			false ->
 			    case mnesia_lib:exists(Datname) of
 				true ->
-				    mnesia_lib:dets_to_ets(Tab, Tab, Datname, 
+				    mnesia_lib:dets_to_ets(Tab, Tab, Datname,
 							   Type, Repair, no);
 				false ->
 				    false
@@ -154,11 +153,11 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_only_copies -
 %%                                      Disable rehashing of table
 %%                                      Release read lock on table
 %%                                      Send table to receiver in chunks
-%% 
+%%
 %%                                      Grab read lock on table
 %% Block dirty updates
 %%                                      Update wherabouts
-%% 
+%%
 %%                                      Cancel the update subscription
 %% Process the subscription events
 %% Optionally dump to disc
@@ -166,7 +165,7 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_only_copies -
 %%                                      Release read lock on table
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--define(MAX_TRANSFER_SIZE, 7500). 
+-define(MAX_TRANSFER_SIZE, 7500).
 -define(MAX_RAM_FILE_SIZE, 1000000).
 -define(MAX_RAM_TRANSFERS, (?MAX_RAM_FILE_SIZE div ?MAX_TRANSFER_SIZE) + 1).
 -define(MAX_NOPACKETS, 20).
@@ -187,14 +186,14 @@ try_net_load_table(Tab, Reason, Ns, Cs) ->
 do_get_network_copy(Tab, _Reason, _Ns, unknown, _Cs) ->
     verbose("Local table copy of ~p has recently been deleted, ignored.~n", [Tab]),
     {not_loaded, storage_unknown};
-do_get_network_copy(Tab, Reason, Ns, Storage, Cs) ->    
+do_get_network_copy(Tab, Reason, Ns, Storage, Cs) ->
     [Node | Tail] = Ns,
     case lists:member(Node,val({current, db_nodes})) of
 	true ->
 	    dbg_out("Getting table ~p (~p) from node ~p: ~p~n",
 		    [Tab, Storage, Node, Reason]),
 	    ?eval_debug_fun({?MODULE, do_get_network_copy},
-			    [{tab, Tab}, {reason, Reason}, 
+			    [{tab, Tab}, {reason, Reason},
 			     {nodes, Ns}, {storage, Storage}]),
 	    case init_receiver(Node, Tab, Storage, Cs, Reason) of
 		ok ->
@@ -208,7 +207,7 @@ do_get_network_copy(Tab, Reason, Ns, Storage, Cs) ->
 		restart ->
 		    try_net_load_table(Tab, Reason, Tail ++ [Node], Cs);
 		down ->
-		    try_net_load_table(Tab, Reason, Tail, Cs) 
+		    try_net_load_table(Tab, Reason, Tail, Cs)
 	    end;
 	false ->
 	    try_net_load_table(Tab, Reason, Tail, Cs)
@@ -223,10 +222,10 @@ do_snmpify(Tab, Us, Storage) ->
     Snmp = mnesia_snmp_hook:create_table(Us, Tab, Storage),
     set({Tab, {index, snmp}}, Snmp).
 
-%% Start the recieiver 
+%% Start the recieiver
 init_receiver(Node, Tab, Storage, Cs, Reas={dumper,add_table_copy}) ->
     case start_remote_sender(Node, Tab, Storage) of
-	{SenderPid, TabSize, DetsData} -> 
+	{SenderPid, TabSize, DetsData} ->
 	    start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,Reas);
 	Else ->
 	    Else
@@ -234,21 +233,21 @@ init_receiver(Node, Tab, Storage, Cs, Reas={dumper,add_table_copy}) ->
 init_receiver(Node, Tab,Storage,Cs,Reason) ->
     %% Grab a schema lock to avoid deadlock between table_loader and schema_commit dumping.
     %% Both may grab tables-locks in different order.
-    Load = 
-	fun() -> 
-		{_,Tid,Ts} = get(mnesia_activity_state), 
+    Load =
+	fun() ->
+		{_,Tid,Ts} = get(mnesia_activity_state),
 		mnesia_locker:rlock(Tid, Ts#tidstore.store, {schema, Tab}),
-		%% Check that table still exists		
+		%% Check that table still exists
 		Active = val({Tab, active_replicas}),
 		%% Check that we havn't loaded it already
 		case val({Tab,where_to_read}) == node() of
 		    true -> ok;
 		    _ ->
-			%% And that sender still got a copy 
-			%% (something might have happend while 
+			%% And that sender still got a copy
+			%% (something might have happend while
 			%% we where waiting for the lock)
 			true = lists:member(Node, Active),
-			{SenderPid, TabSize, DetsData} = 
+			{SenderPid, TabSize, DetsData} =
 			    start_remote_sender(Node,Tab,Storage),
 			Init = table_init_fun(SenderPid),
 			Args = [self(),Tab,Storage,Cs,SenderPid,
@@ -258,18 +257,18 @@ init_receiver(Node, Tab,Storage,Cs,Reason) ->
 			wait_on_load_complete(Pid)
 		end
 	end,
-    Res = 
+    Res =
 	case mnesia:transaction(Load, 20) of
-	    {atomic, {error,Result}} when 
-		  element(1,Reason) == dumper -> 
+	    {atomic, {error,Result}} when
+		  element(1,Reason) == dumper ->
 		{error,Result};
-	    {atomic, {error,Result}} -> 
+	    {atomic, {error,Result}} ->
 		fatal("Cannot create table ~p: ~p~n",
 		      [[Tab, Storage], Result]);
 	    {atomic,  Result} -> Result;
 	    {aborted, nomore} -> restart;
-	    {aborted, _Reas} -> 
-		verbose("Receiver failed on ~p from ~p:~nReason: ~p~n", 
+	    {aborted, _Reas} ->
+		verbose("Receiver failed on ~p from ~p:~nReason: ~p~n",
 			[Tab,Node,_Reas]),
 		down  %% either this node or sender is dying
 	end,
@@ -279,7 +278,7 @@ init_receiver(Node, Tab,Storage,Cs,Reason) ->
 start_remote_sender(Node,Tab,Storage) ->
     mnesia_controller:start_remote_sender(Node, Tab, self(), Storage),
     put(mnesia_table_sender_node, {Tab, Node}),
-    receive 
+    receive
 	{SenderPid, {first, TabSize}} ->
 	    {SenderPid, TabSize, false};
 	{SenderPid, {first, TabSize, DetsData}} ->
@@ -291,22 +290,14 @@ start_remote_sender(Node,Tab,Storage) ->
     end.
 
 table_init_fun(SenderPid) ->
-    PConv = mnesia_monitor:needs_protocol_conversion(node(SenderPid)),
-    MeMyselfAndI = self(),
     fun(read) ->
-	    Receiver = 
-		if 
-		    PConv == true -> 
-			MeMyselfAndI ! {actual_tabrec, self()},
-			MeMyselfAndI; %% Old mnesia
-		    PConv == false -> self()
-		end,
+	    Receiver = self(),
 	    SenderPid ! {Receiver, more},
 	    get_data(SenderPid, Receiver)
     end.
 
 %% Add_table_copy get's it's own locks.
-start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,{dumper,add_table_copy}) ->    
+start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,{dumper,add_table_copy}) ->
     Init = table_init_fun(SenderPid),
     case do_init_table(Tab,Storage,Cs,SenderPid,TabSize,DetsData,self(), Init) of
 	Err = {error, _} ->
@@ -317,8 +308,8 @@ start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,{dumper,add_table_copy}
     end.
 
 spawned_receiver(ReplyTo,Tab,Storage,Cs, SenderPid,TabSize,DetsData, Init) ->
-    process_flag(trap_exit, true), 
-    Done = do_init_table(Tab,Storage,Cs, 
+    process_flag(trap_exit, true),
+    Done = do_init_table(Tab,Storage,Cs,
 			 SenderPid,TabSize,DetsData,
 			 ReplyTo, Init),
     ReplyTo ! {self(),Done},
@@ -327,17 +318,17 @@ spawned_receiver(ReplyTo,Tab,Storage,Cs, SenderPid,TabSize,DetsData, Init) ->
     exit(normal).
 
 wait_on_load_complete(Pid) ->
-    receive 
-	{Pid, Res} -> 
+    receive
+	{Pid, Res} ->
 	    Res;
-	{'EXIT', Pid, Reason} -> 
+	{'EXIT', Pid, Reason} ->
 	    exit(Reason);
-	Else -> 
+	Else ->
 	    Pid ! Else,
 	    wait_on_load_complete(Pid)
     end.
 
-do_init_table(Tab,Storage,Cs,SenderPid, 
+do_init_table(Tab,Storage,Cs,SenderPid,
 	      TabSize,DetsInfo,OrigTabRec,Init) ->
     case create_table(Tab, TabSize, Storage, Cs) of
 	{Storage,Tab} ->
@@ -345,11 +336,9 @@ do_init_table(Tab,Storage,Cs,SenderPid,
 	    Node = node(SenderPid),
 	    put(mnesia_table_receiver, {Tab, Node, SenderPid}),
 	    mnesia_tm:block_tab(Tab),
-	    PConv = mnesia_monitor:needs_protocol_conversion(Node),
-
-	    case init_table(Tab,Storage,Init,PConv,DetsInfo,SenderPid) of
-		ok -> 
-		    tab_receiver(Node,Tab,Storage,Cs,PConv,OrigTabRec);
+	    case init_table(Tab,Storage,Init,DetsInfo,SenderPid) of
+		ok ->
+		    tab_receiver(Node,Tab,Storage,Cs,OrigTabRec);
 		Reason ->
 		    Msg = "[d]ets:init table failed",
 		    verbose("~s: ~p: ~p~n", [Msg, Tab, Reason]),
@@ -360,7 +349,7 @@ do_init_table(Tab,Storage,Cs,SenderPid,
     end.
 
 create_table(Tab, TabSize, Storage, Cs) ->
-    if 
+    if
 	Storage == disc_only_copies ->
 	    mnesia_lib:lock_table(Tab),
 	    Tmp = mnesia_lib:tab2tmp(Tab),
@@ -390,54 +379,30 @@ create_table(Tab, TabSize, Storage, Cs) ->
 	    end
     end.
 
-tab_receiver(Node, Tab, Storage, Cs, PConv, OrigTabRec) ->
+tab_receiver(Node, Tab, Storage, Cs, OrigTabRec) ->
     receive
-	{SenderPid, {no_more, DatBin}} when PConv == false ->
+	{SenderPid, {no_more, DatBin}} ->
 	    finish_copy(Storage,Tab,Cs,SenderPid,DatBin,OrigTabRec);
-	
-	%% Protocol conversion hack
-	{SenderPid, {no_more, DatBin}} when is_pid(PConv) ->
-	    PConv ! {SenderPid, no_more},
-	    receive 
-		{old_init_table_complete, ok} ->
-		    finish_copy(Storage, Tab, Cs, SenderPid, DatBin,OrigTabRec);
-		{old_init_table_complete, Reason} ->
-		    Msg = "OLD: [d]ets:init table failed",
-		    verbose("~s: ~p: ~p~n", [Msg, Tab, Reason]),
-		    down(Tab, Storage)
-	    end;
-
-	{actual_tabrec, Pid} ->	
-	    tab_receiver(Node, Tab, Storage, Cs, Pid,OrigTabRec);
-	
-	{SenderPid, {more, [Recs]}} when is_pid(PConv) ->  
-	    PConv ! {SenderPid, {more, Recs}}, %% Forward Msg to OldNodes 
-	    tab_receiver(Node, Tab, Storage, Cs, PConv,OrigTabRec);
 
-	{'EXIT', PConv, Reason} ->  %% [d]ets:init process crashed 
-	    Msg = "Receiver crashed",
-	    verbose("~s: ~p: ~p~n", [Msg, Tab, Reason]),
-	    down(Tab, Storage);
-	
 	%% Protocol conversion hack
 	{copier_done, Node} ->
 	    verbose("Sender of table ~p crashed on node ~p ~n", [Tab, Node]),
 	    down(Tab, Storage);
-	
+
 	{'EXIT', Pid, Reason} ->
 	    handle_exit(Pid, Reason),
-	    tab_receiver(Node, Tab, Storage, Cs, PConv,OrigTabRec)
+	    tab_receiver(Node, Tab, Storage, Cs, OrigTabRec)
     end.
 
 make_table_fun(Pid, TabRec) ->
     fun(close) ->
 	    ok;
        (read) ->
-	    get_data(Pid, TabRec)	   
+	    get_data(Pid, TabRec)
     end.
 
 get_data(Pid, TabRec) ->
-    receive 
+    receive
 	{Pid, {more_z, CompressedRecs}} when is_binary(CompressedRecs) ->
 	    Pid ! {TabRec, more},
 	    {zlib_uncompress(CompressedRecs), make_table_fun(Pid,TabRec)};
@@ -448,7 +413,7 @@ get_data(Pid, TabRec) ->
 	    end_of_input;
 	{copier_done, Node} ->
 	    case node(Pid) of
-		Node -> 
+		Node ->
 		    {copier_done, Node};
 		_ ->
 		    get_data(Pid, TabRec)
@@ -458,13 +423,13 @@ get_data(Pid, TabRec) ->
 	    get_data(Pid, TabRec)
     end.
 
-init_table(Tab, disc_only_copies, Fun, false, DetsInfo,Sender) ->
+init_table(Tab, disc_only_copies, Fun, DetsInfo,Sender) ->
     ErtsVer = erlang:system_info(version),
     case DetsInfo of
-	{ErtsVer, DetsData}  ->  
+	{ErtsVer, DetsData}  ->
 	    Res = (catch dets:is_compatible_bchunk_format(Tab, DetsData)),
 	    case Res of
-		{'EXIT',{undef,[{dets,_,_}|_]}} ->
+		{'EXIT',{undef,[{dets,_,_,_}|_]}} ->
 		    Sender ! {self(), {old_protocol, Tab}},
 		    dets:init_table(Tab, Fun);  %% Old dets version
 		{'EXIT', What} ->
@@ -481,28 +446,19 @@ init_table(Tab, disc_only_copies, Fun, false, DetsInfo,Sender) ->
 	_ ->
 	    dets:init_table(Tab, Fun)
     end;
-init_table(Tab, _, Fun, false, _DetsInfo,_) ->
+init_table(Tab, _, Fun, _DetsInfo,_) ->
     case catch ets:init_table(Tab, Fun) of
 	true ->
 	    ok;
 	{'EXIT', Else} -> Else
-    end;
-init_table(Tab, Storage, Fun, true, _DetsInfo, Sender) ->  %% Old Nodes    
-    spawn_link(?MODULE, old_node_init_table, 
-	       [Tab, Storage, Fun, self(), false, Sender]),
-    ok.
+    end.
 
-old_node_init_table(Tab, Storage, Fun, TabReceiver, DetsInfo,Sender) ->    
-    Res = init_table(Tab, Storage, Fun, false, DetsInfo,Sender),
-    TabReceiver ! {old_init_table_complete, Res},
-    unlink(TabReceiver),
-    ok.
 
 finish_copy(Storage,Tab,Cs,SenderPid,DatBin,OrigTabRec) ->
     TabRef = {Storage, Tab},
     subscr_receiver(TabRef, Cs#cstruct.record_name),
     case handle_last(TabRef, Cs#cstruct.type, DatBin) of
-	ok -> 
+	ok ->
 	    mnesia_index:init_index(Tab, Storage),
 	    snmpify(Tab, Storage),
 	    %% OrigTabRec must not be the spawned tab-receiver
@@ -534,7 +490,7 @@ subscr_receiver(TabRef = {_, Tab}, RecName) ->
 	    ok
     end.
 
-handle_event(TabRef, write, Rec) ->	    
+handle_event(TabRef, write, Rec) ->
     db_put(TabRef, Rec);
 handle_event(TabRef, delete, {_Tab, Key}) ->
     db_erase(TabRef, Key);
@@ -545,8 +501,8 @@ handle_event(TabRef, clear_table, {_Tab, _Key}) ->
 
 handle_last({disc_copies, Tab}, _Type, nobin) ->
     Ret = mnesia_log:ets2dcd(Tab),
-    Fname = mnesia_lib:tab2dat(Tab),  
-    case mnesia_lib:exists(Fname) of 
+    Fname = mnesia_lib:tab2dat(Tab),
+    case mnesia_lib:exists(Fname) of
 	true ->  %% Remove old .DAT files.
 	    file:delete(Fname);
 	false ->
@@ -653,31 +609,29 @@ send_table(Pid, Tab, RemoteS) ->
 	    {error, {no_exists, Tab}};
 	Storage ->
 	    %% Send first
-	    TabSize = mnesia:table_info(Tab, size),	    
-	    Pconvert = mnesia_monitor:needs_protocol_conversion(node(Pid)),
+	    TabSize = mnesia:table_info(Tab, size),
 	    KeysPerTransfer = calc_nokeys(Storage, Tab),
 	    ChunkData = dets:info(Tab, bchunk_format),
 
-	    UseDetsChunk = 
-		Storage == RemoteS andalso 
-		Storage == disc_only_copies andalso 
-		ChunkData /= undefined andalso
-		Pconvert == false,	    
-	    if 
+	    UseDetsChunk =
+		Storage == RemoteS andalso
+		Storage == disc_only_copies andalso
+		ChunkData /= undefined,
+	    if
 		UseDetsChunk == true ->
 		    DetsInfo = erlang:system_info(version),
 		    Pid ! {self(), {first, TabSize, {DetsInfo, ChunkData}}};
 		true  ->
 		    Pid ! {self(), {first, TabSize}}
 	    end,
-	    
+
 	    %% Debug info
 	    put(mnesia_table_sender, {Tab, node(Pid), Pid}),
 	    {Init, Chunk} = reader_funcs(UseDetsChunk, Tab, Storage, KeysPerTransfer),
-	    
+
 	    SendIt = fun() ->
 			     prepare_copy(Pid, Tab, Storage),
-			     send_more(Pid, 1, Chunk, Init(), Tab, Pconvert),
+			     send_more(Pid, 1, Chunk, Init(), Tab),
 			     finish_copy(Pid, Tab, Storage, RemoteS)
 		     end,
 
@@ -698,7 +652,7 @@ send_table(Pid, Tab, RemoteS) ->
 		    {error, Reason}
 	    end
     end.
-		
+
 prepare_copy(Pid, Tab, Storage) ->
     Trans =
 	fun() ->
@@ -717,11 +671,11 @@ prepare_copy(Pid, Tab, Storage) ->
 
 update_where_to_write(Tab, Node) ->
     case val({Tab, access_mode}) of
-	read_only -> 
+	read_only ->
 	    ignore;
-	read_write -> 
+	read_write ->
 	    Current = val({current, db_nodes}),
-	    Ns = 
+	    Ns =
 		case lists:member(Node, Current) of
 		    true -> Current;
 		    false -> [Node | Current]
@@ -729,27 +683,27 @@ update_where_to_write(Tab, Node) ->
 	    update_where_to_write(Ns, Tab, Node)
     end.
 
-update_where_to_write([], _, _) -> 
+update_where_to_write([], _, _) ->
     ok;
 update_where_to_write([H|T], Tab, AddNode) ->
-    rpc:call(H,  mnesia_controller, call, 
+    rpc:call(H,  mnesia_controller, call,
 	     [{update_where_to_write, [add, Tab, AddNode], self()}]),
     update_where_to_write(T, Tab, AddNode).
 
-send_more(Pid, N, Chunk, DataState, Tab, OldNode) ->
+send_more(Pid, N, Chunk, DataState, Tab) ->
     receive
 	{NewPid, more} ->
-	    case send_packet(N - 1, NewPid, Chunk, DataState, OldNode) of 
-		New when is_integer(New) -> 
+	    case send_packet(N - 1, NewPid, Chunk, DataState) of
+		New when is_integer(New) ->
 		    New - 1;
 		NewData ->
-		    send_more(NewPid, ?MAX_NOPACKETS, Chunk, NewData, Tab, OldNode)
+		    send_more(NewPid, ?MAX_NOPACKETS, Chunk, NewData, Tab)
 	    end;
 	{_NewPid, {old_protocol, Tab}} ->
 	    Storage =  val({Tab, storage_type}),
-	    {Init, NewChunk} = 
+	    {Init, NewChunk} =
 		reader_funcs(false, Tab, Storage, calc_nokeys(Storage, Tab)),
-	    send_more(Pid, 1, NewChunk, Init(), Tab, OldNode);
+	    send_more(Pid, 1, NewChunk, Init(), Tab);
 
 	{copier_done, Node} when Node == node(Pid)->
 	    verbose("Receiver of table ~p crashed on ~p (more)~n", [Tab, Node]),
@@ -770,7 +724,7 @@ dets_bchunk(Tab, Chunk) -> %% Arrg
     case dets:bchunk(Tab, Chunk) of
 	{Cont, Data} -> {Data, Cont};
 	Else -> Else
-    end.	    
+    end.
 
 zlib_compress(Data, Level) ->
     BinData = term_to_binary(Data),
@@ -793,28 +747,20 @@ compression_level() ->
 	Val -> Val
     end.
 
-send_packet(N, Pid, _Chunk, '$end_of_table', OldNode) ->
-    case OldNode of
-	true -> ignore; %% Old nodes can't handle the new no_more
-	false ->  Pid ! {self(), no_more}
-    end,
+send_packet(N, Pid, _Chunk, '$end_of_table') ->
+    Pid ! {self(), no_more},
     N;
-send_packet(N, Pid, Chunk, {[], Cont}, OldNode) ->
-    send_packet(N, Pid, Chunk, Chunk(Cont), OldNode);
-send_packet(N, Pid, Chunk, {Recs, Cont}, OldNode) when N < ?MAX_NOPACKETS ->
-    case OldNode of
-        true ->
-            Pid ! {self(), {more, [Recs]}}; %% Old need's wrapping list
-        false ->
-            case compression_level() of
-                0 ->
-                    Pid ! {self(), {more, Recs}};
-                Level ->
-                    Pid ! {self(), {more_z, zlib_compress(Recs, Level)}}
-            end
+send_packet(N, Pid, Chunk, {[], Cont}) ->
+    send_packet(N, Pid, Chunk, Chunk(Cont));
+send_packet(N, Pid, Chunk, {Recs, Cont}) when N < ?MAX_NOPACKETS ->
+    case compression_level() of
+	0 ->
+	    Pid ! {self(), {more, Recs}};
+	Level ->
+	    Pid ! {self(), {more_z, zlib_compress(Recs, Level)}}
     end,
-    send_packet(N+1, Pid, Chunk, Chunk(Cont), OldNode);
-send_packet(_N, _Pid, _Chunk, DataState, _OldNode) ->
+    send_packet(N+1, Pid, Chunk, Chunk(Cont));
+send_packet(_N, _Pid, _Chunk, DataState) ->
     DataState.
 
 finish_copy(Pid, Tab, Storage, RemoteS) ->
@@ -855,5 +801,5 @@ dat2bin(_Tab, _LocalS, _RemoteS) ->
 
 handle_exit(Pid, Reason) when node(Pid) == node() ->
     exit(Reason);
-handle_exit(_Pid, _Reason) ->  %% Not from our node, this will be handled by 
+handle_exit(_Pid, _Reason) ->  %% Not from our node, this will be handled by
     ignore.                  %% mnesia_down soon.
diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl
index 9e804cc4c2..94153473cb 100644
--- a/lib/mnesia/src/mnesia_log.erl
+++ b/lib/mnesia/src/mnesia_log.erl
@@ -1021,7 +1021,8 @@ add_recs([LogH|Rest], N)
        LogH#log_header.log_version >= "1.0" ->    
     add_recs(Rest, N);
 add_recs([{{Tab, _Key}, _Val, clear_table} | Rest], N) ->
-    true = ets:match_delete(Tab, '_'),
-    add_recs(Rest, N+ets:info(Tab, size));  
+    Size = ets:info(Tab, size),
+    true = ets:delete_all_objects(Tab),
+    add_recs(Rest, N+Size);
 add_recs([], N) ->
     N.
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl
index b6eda9ad3a..e110ad3241 100644
--- a/lib/mnesia/src/mnesia_monitor.erl
+++ b/lib/mnesia/src/mnesia_monitor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -76,13 +76,13 @@
 
 -include("mnesia.hrl").
 
--record(state, {supervisor, pending_negotiators = [], 
+-record(state, {supervisor, pending_negotiators = [],
 		going_down = [], tm_started = false, early_connects = [],
 		connecting, mq = []}).
 
--define(current_protocol_version, {7,6}).
+-define(current_protocol_version,  {8,0}).
 
--define(previous_protocol_version, {7,5}).
+-define(previous_protocol_version, {7,6}).
 
 start() ->
     gen_server:start_link({local, ?MODULE}, ?MODULE,
@@ -151,12 +151,12 @@ check_protocol([{Node, {accept, Mon, Version, Protocol}} | Tail], Protocols) ->
     case lists:member(Protocol, Protocols) of
 	true ->
 	    case Protocol == protocol_version() of
-		true -> 
+		true ->
 		    set({protocol, Node}, {Protocol, false});
 		false ->
 		    set({protocol, Node}, {Protocol, true})
 	    end,
-	    [node(Mon) | check_protocol(Tail, Protocols)]; 
+	    [node(Mon) | check_protocol(Tail, Protocols)];
 	false  ->
 	    verbose("Failed to connect with ~p. ~p protocols rejected. "
 		    "expected version = ~p, expected protocol = ~p~n",
@@ -179,7 +179,7 @@ check_protocol([], [Protocol | _Protocols]) ->
     set(protocol_version, Protocol),
     [].
 
-protocol_version() -> 
+protocol_version() ->
     case ?catch_val(protocol_version) of
 	{'EXIT', _} -> ?current_protocol_version;
 	Version -> Version
@@ -189,14 +189,14 @@ protocol_version() ->
 %% preferred protocols are first in the list
 acceptable_protocol_versions() ->
     [protocol_version(), ?previous_protocol_version].
-    
+
 needs_protocol_conversion(Node) ->
     case {?catch_val({protocol, Node}), protocol_version()} of
 	{{'EXIT', _}, _} ->
 	    false;
-	{{_, Bool}, ?current_protocol_version} -> 
+	{{_, Bool}, ?current_protocol_version} ->
 	    Bool;
-	{{_, Bool}, _} -> 
+	{{_, Bool}, _} ->
 	    not Bool
     end.
 
@@ -255,15 +255,15 @@ terminate_proc(Who, Reason, _State) ->
 %%----------------------------------------------------------------------
 init([Parent]) ->
     process_flag(trap_exit, true),
-    ?ets_new_table(mnesia_gvar, [set, public, named_table]), 
-    ?ets_new_table(mnesia_stats, [set, public, named_table]), 
+    ?ets_new_table(mnesia_gvar, [set, public, named_table]),
+    ?ets_new_table(mnesia_stats, [set, public, named_table]),
     set(subscribers, []),
     set(activity_subscribers, []),
     mnesia_lib:verbose("~p starting: ~p~n", [?MODULE, self()]),
     Version = mnesia:system_info(version),
     set(version, Version),
     dbg_out("Version: ~p~n", [Version]),
-    
+
     case catch process_config_args(env()) of
 	ok ->
 	    mnesia_lib:set({'$$$_report', current_pos}, 0),
@@ -283,7 +283,7 @@ init([Parent]) ->
 	    set(checkpoints, []),
 	    set(pending_checkpoints, []),
 	    set(pending_checkpoint_pids, []),
-	    
+
 	    {ok, #state{supervisor = Parent}};
 	{'EXIT', Reason} ->
 	    mnesia_lib:report_fatal("Bad configuration: ~p~n", [Reason]),
@@ -398,9 +398,9 @@ handle_call({unsafe_close_log, Name}, _From, State) ->
     disk_log:close(Name),
     {reply, ok, State};
 
-handle_call({negotiate_protocol, Mon, _Version, _Protocols}, _From, State) 
+handle_call({negotiate_protocol, Mon, _Version, _Protocols}, _From, State)
   when State#state.tm_started == false ->
-    State2 =  State#state{early_connects = [node(Mon) | State#state.early_connects]},    
+    State2 =  State#state{early_connects = [node(Mon) | State#state.early_connects]},
     {reply, {node(), {reject, self(), uninitialized, uninitialized}}, State2};
 
 %% From remote monitor..
@@ -412,7 +412,7 @@ handle_call({negotiate_protocol, Mon, Version, Protocols}, From, State)
 	true ->
 	    accept_protocol(Mon, MyVersion, Protocol, From, State);
 	false ->
-	    %% in this release we should be able to handle the previous 
+	    %% in this release we should be able to handle the previous
 	    %% protocol
 	    case hd(Protocols) of
 		?previous_protocol_version ->
@@ -427,7 +427,7 @@ handle_call({negotiate_protocol, Mon, Version, Protocols}, From, State)
     end;
 
 %% Local request to negotiate with other monitors (nodes).
-handle_call({negotiate_protocol, Nodes}, From, State) ->    
+handle_call({negotiate_protocol, Nodes}, From, State) ->
     case mnesia_lib:intersect(State#state.going_down, Nodes) of
 	[] ->
 	    spawn_link(?MODULE, negotiate_protocol_impl, [Nodes, From]),
@@ -461,7 +461,7 @@ accept_protocol(Mon, Version, Protocol, From, State) ->
 	    %% No need for wait
 	    link(Mon),  %% link to remote Monitor
 	    case Protocol == protocol_version() of
-		true -> 
+		true ->
 		    set({protocol, Node}, {Protocol, false});
 		false ->
 		    set({protocol, Node}, {Protocol, true})
@@ -509,7 +509,7 @@ handle_cast({disconnect, Node}, State) ->
 	    ignore;
 	undefined ->
 	    ignore;
-	RemoteMon when is_pid(RemoteMon) -> 
+	RemoteMon when is_pid(RemoteMon) ->
 	    unlink(RemoteMon)
     end,
     {noreply, State};
@@ -534,7 +534,7 @@ handle_info({'EXIT', Pid, R}, State) when Pid == State#state.supervisor ->
     dbg_out("~p was ~p by supervisor~n",[?MODULE, R]),
     {stop, R, State};
 
-handle_info({'EXIT', Pid, fatal}, State) when node(Pid) == node() -> 
+handle_info({'EXIT', Pid, fatal}, State) when node(Pid) == node() ->
     dbg_out("~p got FATAL ERROR from: ~p~n",[?MODULE, Pid]),
     exit(State#state.supervisor, shutdown),
     {noreply, State};
@@ -550,7 +550,7 @@ handle_info(Msg = {'EXIT',Pid,_}, State) ->
 	Node /= node() ->
 	    {noreply, State#state{mq = State#state.mq ++ [{info, Msg}]}};
 	true ->
-	    %% We have probably got an exit signal from 
+	    %% We have probably got an exit signal from
 	    %% disk_log or dets
 	    Hint = "Hint: check that the disk still is writable",
 	    fatal("~p got unexpected info: ~p; ~p~n",
@@ -567,10 +567,10 @@ handle_info({nodeup, Node}, State) ->
     %% Let's check if Mnesia is running there in order
     %% to detect if the network has been partitioned
     %% due to communication failure.
-    
+
     HasDown   = mnesia_recover:has_mnesia_down(Node),
     ImRunning = mnesia_lib:is_running(),
-    
+
     if
 	%% If I'm not running the test will be made later.
 	HasDown == true, ImRunning == yes ->
@@ -589,7 +589,7 @@ handle_info({disk_log, _Node, Log, Info}, State) ->
 	{truncated, _No} ->
 	    ok;
 	_ ->
-	    mnesia_lib:important("Warning Log file ~p error reason ~s~n", 
+	    mnesia_lib:important("Warning Log file ~p error reason ~s~n",
 				 [Log, disk_log:format_error(Info)])
     end,
     {noreply, State};
@@ -681,38 +681,38 @@ env() ->
      send_compressed
     ].
 
-default_env(access_module) -> 
+default_env(access_module) ->
     mnesia;
-default_env(auto_repair) -> 
+default_env(auto_repair) ->
     true;
-default_env(backup_module) -> 
+default_env(backup_module) ->
     mnesia_backup;
-default_env(debug) -> 
+default_env(debug) ->
     none;
 default_env(dir) ->
     Name = lists:concat(["Mnesia.", node()]),
     filename:absname(Name);
-default_env(dump_log_load_regulation) -> 
+default_env(dump_log_load_regulation) ->
     false;
-default_env(dump_log_time_threshold) -> 
+default_env(dump_log_time_threshold) ->
     timer:minutes(3);
-default_env(dump_log_update_in_place) -> 
+default_env(dump_log_update_in_place) ->
     true;
 default_env(dump_log_write_threshold) ->
     1000;
-default_env(embedded_mnemosyne) -> 
+default_env(embedded_mnemosyne) ->
     false;
-default_env(event_module) -> 
+default_env(event_module) ->
     mnesia_event;
-default_env(extra_db_nodes) -> 
+default_env(extra_db_nodes) ->
     [];
-default_env(ignore_fallback_at_startup) -> 
+default_env(ignore_fallback_at_startup) ->
     false;
 default_env(fallback_error_function) ->
     {mnesia, lkill};
-default_env(max_wait_for_decision) -> 
+default_env(max_wait_for_decision) ->
     infinity;
-default_env(schema_location) -> 
+default_env(schema_location) ->
     opt_disc;
 default_env(core_dir) ->
     false;
@@ -732,7 +732,7 @@ check_type(Env, Val) ->
 	NewVal ->
 	    NewVal
     end.
-				      
+
 do_check_type(access_module, A) when is_atom(A) -> A;
 do_check_type(auto_repair, B) -> bool(B);
 do_check_type(backup_module, B) when is_atom(B) -> B;
@@ -749,7 +749,7 @@ do_check_type(dump_log_update_in_place, B) -> bool(B);
 do_check_type(dump_log_write_threshold, I) when is_integer(I), I > 0 -> I;
 do_check_type(event_module, A) when is_atom(A) -> A;
 do_check_type(ignore_fallback_at_startup, B) -> bool(B);
-do_check_type(fallback_error_function, {Mod, Func}) 
+do_check_type(fallback_error_function, {Mod, Func})
   when is_atom(Mod), is_atom(Func) -> {Mod, Func};
 do_check_type(embedded_mnemosyne, B) -> bool(B);
 do_check_type(extra_db_nodes, L) when is_list(L) ->
@@ -804,8 +804,8 @@ detect_inconcistency(Nodes, Context) ->
 has_remote_mnesia_down(Node) ->
     HasDown = mnesia_recover:has_mnesia_down(Node),
     Master  = mnesia_recover:get_master_nodes(schema),
-    if 
-	HasDown == true, Master == [] -> 
+    if
+	HasDown == true, Master == [] ->
 	    {true, node()};
 	true ->
 	    {false, node()}
diff --git a/lib/mnesia/src/mnesia_recover.erl b/lib/mnesia/src/mnesia_recover.erl
index b3eed1de6e..4750291a10 100644
--- a/lib/mnesia/src/mnesia_recover.erl
+++ b/lib/mnesia/src/mnesia_recover.erl
@@ -227,11 +227,13 @@ do_log_decision(D, DoTell, NodeD) ->
     note_outcome(D2),
     case mnesia_monitor:use_dir() of
 	true ->
-	    mnesia_log:append(latest_log, D2),
 	    if
 		DoTell == true, Outcome /= unclear ->
 		    tell_im_certain(NodeD#decision.disc_nodes--[node()],D2),
-		    tell_im_certain(NodeD#decision.ram_nodes--[node()], D2);
+		    tell_im_certain(NodeD#decision.ram_nodes--[node()], D2),
+		    mnesia_log:log(D2);
+		Outcome /= unclear ->
+		    mnesia_log:log(D2);
 		true ->
 		    ignore
 	    end;
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index fef72ad39c..05be474aea 100644
--- a/lib/mnesia/src/mnesia_schema.erl
+++ b/lib/mnesia/src/mnesia_schema.erl
@@ -100,7 +100,7 @@
 	]).
 
 %% Needed outside to be able to use/set table_properties
-%% from user (not supported) 
+%% from user (not supported)
 -export([schema_transaction/1,
 	 insert_schema_ops/2,
 	 do_create_table/1,
@@ -118,9 +118,9 @@
 %% Here comes the init function which also resides in
 %% this module, it is called upon by the trans server
 %% at startup of the system
-%% 
+%%
 %% We have a meta table which looks like
-%% {table, schema, 
+%% {table, schema,
 %%    {type, set},
 %%    {disc_copies, all},
 %%    {arity, 2}
@@ -149,14 +149,14 @@ exit_on_error(GoodRes) ->
 
 val(Var) ->
     case ?catch_val(Var) of
-	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason); 
-	Value -> Value 
+	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason);
+	Value -> Value
     end.
 
 %% This function traverses all cstructs in the schema and
 %% sets all values in mnesia_gvar accordingly for each table/cstruct
 
-set_schema('$end_of_table') -> 
+set_schema('$end_of_table') ->
     [];
 set_schema(Tab) ->
     do_set_schema(Tab),
@@ -253,8 +253,8 @@ version() ->
 incr_version(Cs) ->
     {{Major, Minor}, _} = Cs#cstruct.version,
     Nodes = mnesia_lib:intersect(val({schema, disc_copies}),
-                                 mnesia_lib:cs_to_nodes(Cs)), 
-    V = 
+                                 mnesia_lib:cs_to_nodes(Cs)),
+    V =
         case Nodes -- val({Cs#cstruct.name, active_replicas}) of
             [] -> {Major + 1, 0};    % All replicas are active
             _ -> {Major, Minor + 1}  % Some replicas are inactive
@@ -359,7 +359,7 @@ delete_schema2() ->
 	{error, Reason} ->
 	    {error, Reason}
     end.
-    
+
 ensure_no_schema([H|T]) when is_atom(H) ->
     case rpc:call(H, ?MODULE, remote_read_schema, []) of
         {badrpc, Reason} ->
@@ -407,7 +407,7 @@ opt_create_dir(UseDir, Dir) when UseDir == true->
             check_can_write(Dir);
         false ->
             case file:make_dir(Dir) of
-                ok -> 
+                ok ->
                     verbose("Create Directory ~p~n", [Dir]),
                     ok;
                 {error, Reason} ->
@@ -417,7 +417,7 @@ opt_create_dir(UseDir, Dir) when UseDir == true->
     end;
 opt_create_dir(false, _) ->
     {error, {has_no_disc, node()}}.
-    
+
 check_can_write(Dir) ->
     case file:read_file_info(Dir) of
         {ok, FI} when FI#file_info.type == directory,
@@ -450,7 +450,7 @@ read_schema(Keep) ->
 
 read_schema(Keep, IgnoreFallback) ->
     lock_schema(),
-    Res = 
+    Res =
         case mnesia:system_info(is_running) of
             yes ->
                 {ok, ram, get_create_list(schema)};
@@ -477,7 +477,7 @@ read_disc_schema(Keep, IgnoreFallback) ->
     case mnesia_bup:fallback_exists() of
         true when IgnoreFallback == false, Running /= yes ->
              mnesia_bup:fallback_to_schema();
-        _ ->  
+        _ ->
             %% If we're running, we read the schema file even
             %% if fallback exists
             Dat = mnesia_lib:tab2dat(schema),
@@ -499,7 +499,7 @@ read_disc_schema(Keep, IgnoreFallback) ->
     end.
 
 do_read_disc_schema(Fname, Keep) ->
-    T = 
+    T =
         case Keep of
             false ->
                 Args = [{keypos, 2}, public, set],
@@ -523,7 +523,7 @@ do_read_disc_schema(Fname, Keep) ->
 get_initial_schema(SchemaStorage, Nodes) ->
     Cs = #cstruct{name = schema,
 		  record_name = schema,
-		  attributes = [table, cstruct]},    
+		  attributes = [table, cstruct]},
     Cs2 =
 	case SchemaStorage of
         ram_copies -> Cs#cstruct{ram_copies = Nodes};
@@ -532,7 +532,7 @@ get_initial_schema(SchemaStorage, Nodes) ->
     cs2list(Cs2).
 
 read_cstructs_from_disc() ->
-    %% Assumptions: 
+    %% Assumptions:
     %% - local schema lock in global
     %% - use_dir is true
     %% - Mnesia is not running
@@ -552,14 +552,14 @@ read_cstructs_from_disc() ->
 			  end,
 		    Cstructs = dets:traverse(Tab, Fun),
 		    dets:close(Tab),
-		    {ok, Cstructs};  
+		    {ok, Cstructs};
 		{error, Reason} ->
 		    {error, Reason}
 	    end;
 	false ->
 	    {error, "No schema file exists"}
     end.
-    
+
 %% We run a very special type of transactions when we
 %% we want to manipulate the schema.
 
@@ -593,20 +593,20 @@ schema_transaction(Fun) ->
 
 %% This process may dump the transaction log, and should
 %% therefore not be run in an application process
-%% 
+%%
 schema_coordinator(Client, _Fun, undefined) ->
     Res = {aborted, {node_not_running, node()}},
     Client ! {transaction_done, Res, self()},
     unlink(Client);
-    
+
 schema_coordinator(Client, Fun, Controller) when is_pid(Controller) ->
     %% Do not trap exit in order to automatically die
     %% when the controller dies
 
     link(Controller),
     unlink(Client),
-    
-    %% Fulfull the transaction even if the client dies     
+
+    %% Fulfull the transaction even if the client dies
     Res = mnesia:transaction(Fun),
     Client ! {transaction_done, Res, self()},
     unlink(Controller),         % Avoids spurious exit message
@@ -619,7 +619,7 @@ schema_coordinator(Client, Fun, Controller) when is_pid(Controller) ->
 
 insert_schema_ops({_Mod, _Tid, Ts}, SchemaIOps) ->
     do_insert_schema_ops(Ts#tidstore.store, SchemaIOps).
-    
+
 do_insert_schema_ops(Store, [Head | Tail]) ->
     ?ets_insert(Store, Head),
     do_insert_schema_ops(Store, Tail);
@@ -628,15 +628,56 @@ do_insert_schema_ops(_Store, []) ->
 
 cs2list(Cs) when is_record(Cs, cstruct) ->
     Tags = record_info(fields, cstruct),
-    rec2list(Tags, 2, Cs);
+    rec2list(Tags, Tags, 2, Cs);
 cs2list(CreateList) when is_list(CreateList) ->
-    CreateList.
-
-rec2list([Tag | Tags], Pos, Rec) ->
+    CreateList;
+%% 4.4.19
+cs2list(Cs) when element(1, Cs) == cstruct, tuple_size(Cs) == 18 ->
+    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
+	    load_order,access_mode,majority,index,snmp,local_content,
+	    record_name,attributes,user_properties,frag_properties,
+	    cookie,version],
+    rec2list(Tags, Tags, 2, Cs);
+%% 4.4.18 and earlier
+cs2list(Cs) when element(1, Cs) == cstruct, tuple_size(Cs) == 17 ->
+    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
+	    load_order,access_mode,index,snmp,local_content,
+	    record_name,attributes,user_properties,frag_properties,
+	    cookie,version],
+    rec2list(Tags, Tags, 2, Cs).
+
+cs2list(false, Cs) ->
+    cs2list(Cs);
+cs2list(ver4_4_18, Cs) ->
+    Orig = record_info(fields, cstruct),
+    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
+	    load_order,access_mode,index,snmp,local_content,
+	    record_name,attributes,user_properties,frag_properties,
+	    cookie,version],
+    rec2list(Tags, Orig, 2, Cs);
+cs2list(ver4_4_19, Cs) ->
+    Orig = record_info(fields, cstruct),
+    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
+	    load_order,access_mode,majority,index,snmp,local_content,
+	    record_name,attributes,user_properties,frag_properties,
+	    cookie,version],
+    rec2list(Tags, Orig, 2, Cs).
+
+rec2list([Tag | Tags], [Tag | Orig], Pos, Rec) ->
     Val = element(Pos, Rec),
-    [{Tag, Val} | rec2list(Tags, Pos + 1, Rec)];
-rec2list([], _Pos, _Rec) ->
-    [].
+    [{Tag, Val} | rec2list(Tags, Orig, Pos + 1, Rec)];
+rec2list([], _, _Pos, _Rec) ->
+    [];
+rec2list(Tags, [_|Orig], Pos, Rec) ->
+    rec2list(Tags, Orig, Pos+1, Rec).
+
+api_list2cs(List) when is_list(List) ->
+    Name = pick(unknown, name, List, must),
+    Keys = check_keys(Name, List, record_info(fields, cstruct)),
+    check_duplicates(Name, Keys),
+    list2cs(List);
+api_list2cs(Other) ->
+    mnesia:abort({badarg, Other}).
 
 list2cs(List) when is_list(List) ->
     Name = pick(unknown, name, List, must),
@@ -667,10 +708,7 @@ list2cs(List) when is_list(List) ->
 
     Frag = pick(Name, frag_properties, List, []),
     verify({alt, [nil, list]}, mnesia_lib:etype(Frag),
-	   {badarg, Name, {frag_properties, Frag}}), 
-        
-    Keys = check_keys(Name, List, record_info(fields, cstruct)),
-    check_duplicates(Name, Keys),
+	   {badarg, Name, {frag_properties, Frag}}),
     #cstruct{name = Name,
              ram_copies = Rc,
              disc_copies = Dc,
@@ -687,9 +725,7 @@ list2cs(List) when is_list(List) ->
              user_properties = lists:sort(UserProps),
 	     frag_properties = lists:sort(Frag),
              cookie = Cookie,
-             version = Version};
-list2cs(Other) ->
-    mnesia:abort({badarg, Other}).
+             version = Version}.
 
 pick(Tab, Key, List, Default) ->
     case lists:keysearch(Key, 1, List) of
@@ -708,7 +744,7 @@ attr_tab_to_pos(_Tab, Pos) when is_integer(Pos) ->
     Pos;
 attr_tab_to_pos(Tab, Attr) ->
     attr_to_pos(Attr, val({Tab, attributes})).
-    
+
 %% Convert attribute name to integer if neccessary
 attr_to_pos(Pos, _Attrs) when is_integer(Pos) ->
     Pos;
@@ -723,7 +759,7 @@ attr_to_pos(Attr, [_ | Attrs], Pos) ->
     attr_to_pos(Attr, Attrs, Pos + 1);
 attr_to_pos(Attr, _, _) ->
     mnesia:abort({bad_type, Attr}).
-    
+
 check_keys(Tab, [{Key, _Val} | Tail], Items) ->
     case lists:member(Key, Items) of
         true ->  [Key | check_keys(Tab, Tail, Items)];
@@ -759,7 +795,7 @@ verify_cstruct(Cs) when is_record(Cs, cstruct) ->
 	   {bad_type, Tab, {type, Type}}),
 
     %% Currently ordered_set is not supported for disk_only_copies.
-    if 
+    if
  	Type == ordered_set, Cs#cstruct.disc_only_copies /= [] ->
 	    mnesia:abort({bad_type, Tab, {not_supported, Type, disc_only_copies}});
 	true ->
@@ -776,10 +812,10 @@ verify_cstruct(Cs) when is_record(Cs, cstruct) ->
 
     Arity = length(Attrs) + 1,
     verify(true, Arity > 2, {bad_type, Tab, {attributes, Attrs}}),
-    
+
     lists:foldl(fun(Attr,_Other) when Attr == snmp ->
                         mnesia:abort({bad_type, Tab, {attributes, [Attr]}});
-                   (Attr,Other) -> 
+                   (Attr,Other) ->
                         verify(atom, mnesia_lib:etype(Attr),
                                {bad_type, Tab, {attributes, [Attr]}}),
                         verify(false, lists:member(Attr, Other),
@@ -792,7 +828,7 @@ verify_cstruct(Cs) when is_record(Cs, cstruct) ->
     Index = Cs#cstruct.index,
     verify({alt, [nil, list]}, mnesia_lib:etype(Index),
 	   {bad_type, Tab, {index, Index}}),
-    
+
     IxFun =
         fun(Pos) ->
                 verify(true, fun() ->
@@ -807,7 +843,7 @@ verify_cstruct(Cs) when is_record(Cs, cstruct) ->
                        {bad_type, Tab, {index, [Pos]}})
         end,
     lists:foreach(IxFun, Index),
-    
+
     LC = Cs#cstruct.local_content,
     verify({alt, [true, false]}, LC,
 	   {bad_type, Tab, {local_content, LC}}),
@@ -834,7 +870,7 @@ verify_cstruct(Cs) when is_record(Cs, cstruct) ->
     lists:foreach(CheckProp, Cs#cstruct.user_properties),
 
     case Cs#cstruct.cookie of
-	{{MegaSecs, Secs, MicroSecs}, _Node} 
+	{{MegaSecs, Secs, MicroSecs}, _Node}
 	when is_integer(MegaSecs), is_integer(Secs),
 	     is_integer(MicroSecs), is_atom(node) ->
             ok;
@@ -870,15 +906,15 @@ verify_nodes(Cs) ->
     end,
     verify(integer, mnesia_lib:etype(LoadOrder),
 	   {bad_type, Tab, {load_order, LoadOrder}}),
-    
+
     Nodes = Ram ++ Disc ++ DiscOnly,
     verify(list, mnesia_lib:etype(Nodes),
 	   {combine_error, Tab,
 	    [{ram_copies, []}, {disc_copies, []}, {disc_only_copies, []}]}),
     verify(false, has_duplicates(Nodes), {combine_error, Tab, Nodes}),
-    AtomCheck = fun(N) -> verify(atom, mnesia_lib:etype(N), {bad_type, Tab, N}) end, 
+    AtomCheck = fun(N) -> verify(atom, mnesia_lib:etype(N), {bad_type, Tab, N}) end,
     lists:foreach(AtomCheck, Nodes).
-    
+
 verify(Expected, Fun, Error) when is_function(Fun) ->
     do_verify(Expected, catch Fun(), Error);
 verify(Expected, Actual, Error) ->
@@ -909,7 +945,7 @@ ensure_active(Cs, What) ->
     W = {Tab, What},
     ensure_non_empty(W),
     Nodes = mnesia_lib:intersect(val({schema, disc_copies}),
-                                 mnesia_lib:cs_to_nodes(Cs)), 
+                                 mnesia_lib:cs_to_nodes(Cs)),
     case Nodes -- val(W) of
         [] ->
             ok;
@@ -936,7 +972,7 @@ ensure_non_empty({Tab, Vhat}) ->
 
 ensure_not_active(Tab = schema, Node) ->
     Active = val({Tab, active_replicas}),
-    case lists:member(Node, Active) of 
+    case lists:member(Node, Active) of
 	false when Active =/= [] ->
 	    ok;
 	false ->
@@ -970,7 +1006,7 @@ create_table(TabDef) ->
 do_multi_create_table(TabDef) ->
     get_tid_ts_and_lock(schema, write),
     ensure_writable(schema),
-    Cs = list2cs(TabDef),
+    Cs = api_list2cs(TabDef),
     case Cs#cstruct.frag_properties of
 	[] ->
 	    do_create_table(Cs);
@@ -999,7 +1035,7 @@ unsafe_make_create_table(Cs) ->
     {_Mod, Tid, Ts} =  get_tid_ts_and_lock(schema, none),
     verify_cstruct(Cs),
     Tab = Cs#cstruct.name,
-        
+
     %% Check that we have all disc replica nodes running
     DiscNodes = Cs#cstruct.disc_copies ++ Cs#cstruct.disc_only_copies,
     RunningNodes = val({current, db_nodes}),
@@ -1017,7 +1053,7 @@ unsafe_make_create_table(Cs) ->
 check_if_exists(Tab) ->
     TidTs = get_tid_ts_and_lock(schema, write),
     {_, _, Ts} = TidTs,
-    Store = Ts#tidstore.store, 
+    Store = Ts#tidstore.store,
     ets:foldl(
       fun({op, create_table, [{name, T}|_]}, _Acc) when T==Tab ->
 	      true;
@@ -1054,7 +1090,7 @@ make_delete_table(Tab, Mode) ->
 	    %% nodes etc.
 	    TidTs = get_tid_ts_and_lock(schema, write),
 	    {_, _, Ts} = TidTs,
-	    Store = Ts#tidstore.store, 
+	    Store = Ts#tidstore.store,
 	    Deleted = ets:select_delete(
 			Store, [{{op,'$1',[{name,Tab}|'_']},
 				 [{'or',
@@ -1077,9 +1113,9 @@ make_delete_table(Tab, Mode) ->
 			[] ->
 			    [make_delete_table2(Tab)];
 			_Props ->
-			    %% Check if it is a base table 
-			    mnesia_frag:lookup_frag_hash(Tab),		    
-			    
+			    %% Check if it is a base table
+			    mnesia_frag:lookup_frag_hash(Tab),
+
 			    %% Check for foreigners
 			    F = mnesia_frag:lookup_foreigners(Tab),
 			    verify([], F, {combine_error,
@@ -1101,7 +1137,7 @@ make_delete_table2(Tab) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Change fragmentation of a table
-    
+
 change_table_frag(Tab, Change) ->
     schema_transaction(fun() -> do_change_table_frag(Tab, Change) end).
 
@@ -1112,7 +1148,7 @@ do_change_table_frag(Tab, Change) when is_atom(Tab), Tab /= schema ->
     ok;
 do_change_table_frag(Tab, _Change) ->
     mnesia:abort({bad_type, Tab}).
-    
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Clear a table
 
@@ -1150,7 +1186,7 @@ make_add_table_copy(Tab, Node, Storage) ->
     verify(false, lists:member(Node, Ns), {already_exists, Tab, Node}),
     Cs2 = new_cs(Cs, Node, Storage, add),
     verify_cstruct(Cs2),
-    
+
     %% Check storage and if node is running
     IsRunning = lists:member(Node, val({current, db_nodes})),
     if
@@ -1177,21 +1213,21 @@ del_table_copy(Tab, Node) ->
 
 do_del_table_copy(Tab, Node) when is_atom(Node)  ->
     TidTs = get_tid_ts_and_lock(schema, write),
-%%    get_tid_ts_and_lock(Tab, write), 
+%%    get_tid_ts_and_lock(Tab, write),
     insert_schema_ops(TidTs, make_del_table_copy(Tab, Node));
 do_del_table_copy(Tab, Node) ->
     mnesia:abort({badarg, Tab, Node}).
-   
+
 make_del_table_copy(Tab, Node) ->
     ensure_writable(schema),
     Cs = incr_version(val({Tab, cstruct})),
     Storage = mnesia_lib:schema_cs_to_storage_type(Node, Cs),
-    Cs2 = new_cs(Cs, Node, Storage, del),    
+    Cs2 = new_cs(Cs, Node, Storage, del),
     case mnesia_lib:cs_to_nodes(Cs2) of
         [] when Tab == schema ->
             mnesia:abort({combine_error, Tab, "Last replica"});
         [] ->
-	    ensure_active(Cs),	    
+	    ensure_active(Cs),
             dbg_out("Last replica deleted in table ~p~n",  [Tab]),
             make_delete_table(Tab,  whole_table);
         _ when Tab == schema ->
@@ -1210,14 +1246,14 @@ remove_node_from_tabs([], _Node) ->
     [];
 remove_node_from_tabs([schema|Rest], Node) ->
     remove_node_from_tabs(Rest, Node);
-remove_node_from_tabs([Tab|Rest], Node) ->    
-    {Cs, IsFragModified} = 
+remove_node_from_tabs([Tab|Rest], Node) ->
+    {Cs, IsFragModified} =
 	mnesia_frag:remove_node(Node, incr_version(val({Tab, cstruct}))),
     case mnesia_lib:schema_cs_to_storage_type(Node, Cs)  of
 	unknown ->
 	    case IsFragModified of
 		true ->
-		    [{op, change_table_frag, {del_node, Node}, cs2list(Cs)} | 
+		    [{op, change_table_frag, {del_node, Node}, cs2list(Cs)} |
 		     remove_node_from_tabs(Rest, Node)];
 		false ->
 		    remove_node_from_tabs(Rest, Node)
@@ -1246,7 +1282,7 @@ new_cs(Cs, Node, ram_copies, del) ->
 new_cs(Cs, Node, disc_copies, del) ->
     Cs#cstruct{disc_copies = lists:delete(Node , Cs#cstruct.disc_copies)};
 new_cs(Cs, Node, disc_only_copies, del) ->
-    Cs#cstruct{disc_only_copies = 
+    Cs#cstruct{disc_only_copies =
                lists:delete(Node , Cs#cstruct.disc_only_copies)};
 new_cs(Cs, _Node, Storage, _Op) ->
     mnesia:abort({badarg, Cs#cstruct.name, Storage}).
@@ -1278,7 +1314,7 @@ make_move_table(Tab, FromNode, ToNode) ->
     Running = val({current, db_nodes}),
     Storage = mnesia_lib:schema_cs_to_storage_type(FromNode, Cs),
     verify(true, lists:member(ToNode, Running), {not_active, schema, ToNode}),
-    
+
     Cs2 = new_cs(Cs, ToNode, Storage, add),
     Cs3 = new_cs(Cs2, FromNode, Storage, del),
     verify_cstruct(Cs3),
@@ -1306,7 +1342,7 @@ make_change_table_copy_type(Tab, Node, unknown) ->
 make_change_table_copy_type(Tab, Node, ToS) ->
     ensure_writable(schema),
     Cs = incr_version(val({Tab, cstruct})),
-    FromS = mnesia_lib:storage_type_at_node(Node, Tab), 
+    FromS = mnesia_lib:storage_type_at_node(Node, Tab),
 
     case compare_storage_type(false, FromS, ToS) of
 	{same, _} ->
@@ -1320,12 +1356,12 @@ make_change_table_copy_type(Tab, Node, ToS) ->
     Cs2 = new_cs(Cs, Node, FromS, del),
     Cs3 = new_cs(Cs2, Node, ToS, add),
     verify_cstruct(Cs3),
-    
+
     [{op, change_table_copy_type, Node, FromS, ToS, cs2list(Cs3)}].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% change index functions ....
-%% Pos is allready added by 1 in both of these functions 
+%% Pos is allready added by 1 in both of these functions
 
 add_table_index(Tab, Pos) ->
     schema_transaction(fun() -> do_add_table_index(Tab, Pos) end).
@@ -1412,14 +1448,14 @@ make_del_snmp(Tab) ->
     [{op, del_snmp, cs2list(Cs2)}].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
+%%
 
-transform_table(Tab, Fun, NewAttrs, NewRecName) 
-  when is_function(Fun), is_list(NewAttrs), is_atom(NewRecName) -> 
+transform_table(Tab, Fun, NewAttrs, NewRecName)
+  when is_function(Fun), is_list(NewAttrs), is_atom(NewRecName) ->
     schema_transaction(fun() -> do_transform_table(Tab, Fun, NewAttrs, NewRecName) end);
 
-transform_table(Tab, ignore, NewAttrs, NewRecName) 
-  when is_list(NewAttrs), is_atom(NewRecName) -> 
+transform_table(Tab, ignore, NewAttrs, NewRecName)
+  when is_list(NewAttrs), is_atom(NewRecName) ->
     schema_transaction(fun() -> do_transform_table(Tab, ignore, NewAttrs, NewRecName) end);
 
 transform_table(Tab, Fun, NewAttrs, NewRecName) ->
@@ -1438,7 +1474,7 @@ make_transform(Tab, Fun, NewAttrs, NewRecName) ->
     ensure_active(Cs),
     ensure_writable(Tab),
     case mnesia_lib:val({Tab, index}) of
-	[] -> 
+	[] ->
 	    Cs2 = Cs#cstruct{attributes = NewAttrs, record_name = NewRecName},
 	    verify_cstruct(Cs2),
 	    [{op, transform, Fun, cs2list(Cs2)}];
@@ -1464,7 +1500,7 @@ make_transform(Tab, Fun, NewAttrs, NewRecName) ->
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
+%%
 
 change_table_access_mode(Tab, Mode) ->
     schema_transaction(fun() -> do_change_table_access_mode(Tab, Mode) end).
@@ -1598,9 +1634,9 @@ change_prop_in_existing_op(Tab, Prop, How, Store) ->
 	false ->
 	    false
     end.
- 
-update_existing_op([{op, Op, L = [{name,Tab}|_], _OldProp}|Ops], 
-		   Tab, Prop, How, Acc) when Op == write_property; 
+
+update_existing_op([{op, Op, L = [{name,Tab}|_], _OldProp}|Ops],
+		   Tab, Prop, How, Acc) when Op == write_property;
 					     Op == delete_property ->
     %% Apparently, mnesia_dumper doesn't care about OldProp here -- just L,
     %% so we will throw away OldProp (not that it matters...) and insert Prop.
@@ -1625,7 +1661,7 @@ update_existing_op([], _, _, _, _) ->
 do_read_table_property(Tab, Key) ->
     TidTs = get_tid_ts_and_lock(schema, read),
     {_, _, Ts} = TidTs,
-    Store = Ts#tidstore.store, 
+    Store = Ts#tidstore.store,
     Props = ets:foldl(
 	      fun({op, create_table, [{name, T}|Opts]}, _Acc)
 		 when T==Tab ->
@@ -1689,7 +1725,7 @@ do_delete_table_property(Tab, PropKey) ->
 		    [Tab,PropKey]),
 	    %% this must be an existing table
 	    get_tid_ts_and_lock(Tab, none),
-	    insert_schema_ops(TidTs, 
+	    insert_schema_ops(TidTs,
 			      make_delete_table_properties(Tab, [PropKey]))
     end.
 
@@ -1711,17 +1747,17 @@ make_delete_table_properties(_Tab, [], _Cs) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% Ensure that the transaction can be committed even 
+%% Ensure that the transaction can be committed even
 %% if the node crashes and Mnesia is restarted
 prepare_commit(Tid, Commit, WaitFor) ->
     case Commit#commit.schema_ops of
 	[] ->
 	    {false, Commit, optional};
 	OrigOps ->
-	    {Modified, Ops, DumperMode} = 
+	    {Modified, Ops, DumperMode} =
 		prepare_ops(Tid, OrigOps, WaitFor, false, [], optional),
 	    InitBy = schema_prepare,
-	    GoodRes = {Modified, 
+	    GoodRes = {Modified,
 		       Commit#commit{schema_ops = lists:reverse(Ops)},
 		       DumperMode},
 	    case DumperMode of
@@ -1737,7 +1773,7 @@ prepare_commit(Tid, Commit, WaitFor) ->
 		    end
 	    end,
 	    case Ops of
-		[] -> 
+		[] ->
 		    ignore;
 		_ ->
 		    %% We need to grab a dumper lock here, the log may not
@@ -1749,20 +1785,20 @@ prepare_commit(Tid, Commit, WaitFor) ->
 
 prepare_ops(Tid, [Op | Ops], WaitFor, Changed, Acc, DumperMode) ->
     case prepare_op(Tid, Op, WaitFor) of
-        {true, mandatory} -> 
+        {true, mandatory} ->
 	    prepare_ops(Tid, Ops, WaitFor, Changed, [Op | Acc], mandatory);
-        {true, optional} -> 
+        {true, optional} ->
 	    prepare_ops(Tid, Ops, WaitFor, Changed, [Op | Acc], DumperMode);
-        {true, Ops2, mandatory} -> 
+        {true, Ops2, mandatory} ->
 	    prepare_ops(Tid, Ops, WaitFor, true, Ops2 ++ Acc, mandatory);
-        {true, Ops2, optional} -> 
+        {true, Ops2, optional} ->
 	    prepare_ops(Tid, Ops, WaitFor, true, Ops2 ++ Acc, DumperMode);
-	{false, optional} -> 
+	{false, optional} ->
 	    prepare_ops(Tid, Ops, WaitFor, true, Acc, DumperMode)
     end;
 prepare_ops(_Tid, [], _WaitFor, Changed, Acc, DumperMode) ->
     {Changed, Acc, DumperMode}.
-    
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Prepare for commit
 %% returns true if Op should be included, i.e. unmodified
@@ -1781,8 +1817,8 @@ prepare_op(_Tid, {op, rec, unknown, Rec}, _WaitFor) ->
 
 prepare_op(_Tid, {op, announce_im_running, Node, SchemaDef, Running, RemoteRunning}, _WaitFor) ->
     SchemaCs = list2cs(SchemaDef),
-    if 	
-	Node == node() -> %% Announce has already run on local node 
+    if
+	Node == node() -> %% Announce has already run on local node
 	    ignore;       %% from do_merge_schema
 	true ->
 	    %% If a node has restarted it may still linger in db_nodes,
@@ -1794,9 +1830,9 @@ prepare_op(_Tid, {op, announce_im_running, Node, SchemaDef, Running, RemoteRunni
     end,
     {false, optional};
 
-prepare_op(_Tid, {op, sync_trans}, {part, CoordPid}) ->    
+prepare_op(_Tid, {op, sync_trans}, {part, CoordPid}) ->
     CoordPid ! {sync_trans, self()},
-    receive 
+    receive
 	{sync_trans, CoordPid} ->
 	    {false, optional};
 	{mnesia_down, _Node} = Else ->
@@ -1807,7 +1843,7 @@ prepare_op(_Tid, {op, sync_trans}, {part, CoordPid}) ->
 	    mnesia:abort(Else)
     end;
 
-prepare_op(_Tid, {op, sync_trans}, {coord, Nodes}) ->    
+prepare_op(_Tid, {op, sync_trans}, {coord, Nodes}) ->
     case receive_sync(Nodes, []) of
 	{abort, Reason} ->
 	    mnesia_lib:verbose("sync_op terminated due to ~p~n", [Reason]),
@@ -1838,7 +1874,7 @@ prepare_op(Tid, {op, create_table, TabDef}, _WaitFor) ->
 	    create_ram_table(Tab, Cs#cstruct.type),
 	    create_disc_table(Tab),
 	    insert_cstruct(Tid, Cs, false),
-	    {true, optional};	
+	    {true, optional};
 	disc_only_copies ->
 	    mnesia_lib:set({Tab, create_table},true),
 	    create_disc_only_table(Tab,Cs#cstruct.type),
@@ -1857,15 +1893,15 @@ prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}, _WaitFor) ->
     if
 	Tab == schema ->
 	    {true, optional};
-	
+
 	Node == node() ->
-	    case mnesia_lib:val({schema, storage_type}) of 
-		ram_copies when Storage /= ram_copies -> 
+	    case mnesia_lib:val({schema, storage_type}) of
+		ram_copies when Storage /= ram_copies ->
 		    Error = {combine_error, Tab, "has no disc", Node},
 		    mnesia:abort(Error);
 		_  ->
 		    ok
-	    end,   
+	    end,
 	    %% Tables are created by mnesia_loader get_network code
 	    insert_cstruct(Tid, Cs, true),
 	    case mnesia_controller:get_network_copy(Tab, Cs) of
@@ -1902,22 +1938,22 @@ prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}, _WaitFor) ->
 prepare_op(Tid, {op, del_table_copy, _Storage, Node, TabDef}, _WaitFor) ->
     Cs = list2cs(TabDef),
     Tab = Cs#cstruct.name,
-    
+
     if
 	%% Schema table lock is always required to run a schema op.
 	%% No need to look it.
-	node(Tid#tid.pid) == node(), Tab /= schema -> 
+	node(Tid#tid.pid) == node(), Tab /= schema ->
 	    Self = self(),
 	    Pid = spawn_link(fun() -> lock_del_table(Tab, Node, Cs, Self) end),
 	    put(mnesia_lock, Pid),
-	    receive 
-		{Pid, updated} -> 
+	    receive
+		{Pid, updated} ->
 		    {true, optional};
 		{Pid, FailReason} ->
 		    mnesia:abort(FailReason);
 		{'EXIT', Pid, Reason} ->
 		    mnesia:abort(Reason)
-	    end;	
+	    end;
 	true ->
 	    {true, optional}
     end;
@@ -1928,12 +1964,12 @@ prepare_op(_Tid, {op, change_table_copy_type,  N, FromS, ToS, TabDef}, _WaitFor)
     Tab = Cs#cstruct.name,
 
     NotActive = mnesia_lib:not_active_here(Tab),
-    
-    if 
+
+    if
 	NotActive == true ->
 	    mnesia:abort({not_active, Tab, node()});
-	
-	Tab == schema ->	    
+
+	Tab == schema ->
 	    case {FromS, ToS} of
 		{ram_copies, disc_copies} ->
 		    case mnesia:system_info(schema_location) of
@@ -1943,7 +1979,7 @@ prepare_op(_Tid, {op, change_table_copy_type,  N, FromS, ToS, TabDef}, _WaitFor)
 			    mnesia:abort({combine_error,  Tab, node(),
 					  "schema_location must be opt_disc"})
 		    end,
-		    Dir = mnesia_lib:dir(),    
+		    Dir = mnesia_lib:dir(),
 		    case opt_create_dir(true, Dir) of
 			ok ->
 			    purge_dir(Dir, []),
@@ -1967,18 +2003,18 @@ prepare_op(_Tid, {op, change_table_copy_type,  N, FromS, ToS, TabDef}, _WaitFor)
 		_ ->
 		    mnesia:abort({combine_error, Tab, ToS})
 	    end;
-	
-	FromS == ram_copies ->	    
+
+	FromS == ram_copies ->
 	    case mnesia_monitor:use_dir() of
-		true -> 
+		true ->
 		    Dat = mnesia_lib:tab2dcd(Tab),
 		    case mnesia_lib:exists(Dat) of
 			true ->
 			    mnesia:abort({combine_error, Tab, node(),
 					  "Table dump exists"});
 			false ->
-			    case ToS of 
-				disc_copies -> 
+			    case ToS of
+				disc_copies ->
 				    mnesia_log:ets2dcd(Tab, dmp);
 				disc_only_copies ->
 				    mnesia_dumper:raw_named_dump_table(Tab, dmp)
@@ -1988,7 +2024,7 @@ prepare_op(_Tid, {op, change_table_copy_type,  N, FromS, ToS, TabDef}, _WaitFor)
 		false ->
 		    mnesia:abort({has_no_disc, node()})
 	    end;
-	
+
 	FromS == disc_copies, ToS == disc_only_copies ->
 	    mnesia_dumper:raw_named_dump_table(Tab, dmp);
 	FromS == disc_only_copies ->
@@ -2020,7 +2056,7 @@ prepare_op(_Tid, {op, dump_table, unknown, TabDef}, _WaitFor) ->
     case lists:member(node(), Cs#cstruct.ram_copies) of
         true ->
 	    case mnesia_monitor:use_dir() of
-		true -> 
+		true ->
 		    mnesia_log:ets2dcd(Tab, dmp),
 		    Size = mnesia:table_info(Tab, size),
 		    {true, [{op, dump_table, Size, TabDef}], optional};
@@ -2058,7 +2094,7 @@ prepare_op(_Tid, {op, transform, Fun, TabDef}, _WaitFor) ->
 	    mnesia_lib:db_fixtable(Storage, Tab, true),
             Key = mnesia_lib:db_first(Tab),
 	    Op = {op, transform, Fun, TabDef},
-            case catch transform_objs(Fun, Tab, RecName, 
+            case catch transform_objs(Fun, Tab, RecName,
 				      Key, NewArity, Storage, Type, [Op]) of
                 {'EXIT', Reason} ->
 		    mnesia_lib:db_fixtable(Storage, Tab, false),
@@ -2072,7 +2108,7 @@ prepare_op(_Tid, {op, transform, Fun, TabDef}, _WaitFor) ->
 prepare_op(_Tid, {op, merge_schema, TabDef}, _WaitFor) ->
     Cs = list2cs(TabDef),
     case verify_merge(Cs) of
-	ok  ->	
+	ok  ->
 	    {true, optional};
 	Error ->
 	    verbose("Merge_Schema ~p failed on ~p: ~p~n", [_Tid,node(),Error]),
@@ -2093,7 +2129,7 @@ create_ram_table(Tab, Type) ->
 create_disc_table(Tab) ->
     File = mnesia_lib:tab2dcd(Tab),
     file:delete(File),
-    FArg = [{file, File}, {name, {mnesia,create}}, 
+    FArg = [{file, File}, {name, {mnesia,create}},
 	    {repair, false}, {mode, read_write}],
     case mnesia_monitor:open_log(FArg) of
 	{ok,Log} ->
@@ -2124,7 +2160,7 @@ receive_sync([], Pids) ->
 receive_sync(Nodes, Pids) ->
     receive
 	{sync_trans, Pid} ->
-	    Node = node(Pid),	    
+	    Node = node(Pid),
 	    receive_sync(lists:delete(Node, Nodes), [Pid | Pids]);
 	Else ->
 	    {abort, Else}
@@ -2140,16 +2176,16 @@ lock_del_table(Tab, Node, Cs, Father) ->
 				    false;
 			       ({badrpc, {'EXIT', {undef, _}}}) ->
 				    %% This will be the case we talks with elder nodes
-				    %% than 3.8.2, they will set where_to_read without 
-				    %% getting a lock. 
+				    %% than 3.8.2, they will set where_to_read without
+				    %% getting a lock.
 				    false;
 			       (_) ->
 				    true
 			    end,
 		   case lists:filter(Filter, Res) of
-		       [] -> 
+		       [] ->
 			   Father ! {self(), updated},
-			   %% When transaction is commited the process dies 
+			   %% When transaction is commited the process dies
 			   %% and the lock is released.
 			   receive _ -> ok end;
 		       Err ->
@@ -2166,7 +2202,7 @@ lock_del_table(Tab, Node, Cs, Father) ->
     exit(normal).
 
 set_where_to_read(Tab, Node, Cs) ->
-    case mnesia_lib:val({Tab, where_to_read}) of 
+    case mnesia_lib:val({Tab, where_to_read}) of
 	Node ->
 	    case Cs#cstruct.local_content of
 		true ->
@@ -2185,16 +2221,16 @@ transform_objs(_Fun, _Tab, _RT, '$end_of_table', _NewArity, _Storage, _Type, Acc
 transform_objs(Fun, Tab, RecName, Key, A, Storage, Type, Acc) ->
     Objs = mnesia_lib:db_get(Tab, Key),
     NextKey = mnesia_lib:db_next_key(Tab, Key),
-    Oid = {Tab, Key},   
+    Oid = {Tab, Key},
     NewObjs = {Ws, Ds} = transform_obj(Tab, RecName, Key, Fun, Objs, A, Type, [], []),
-    if 
-	NewObjs == {[], []} -> 
+    if
+	NewObjs == {[], []} ->
 	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type, Acc);
-	Type == bag ->	    
+	Type == bag ->
 	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
 			   [{op, rec, Storage, {Oid, Ws, write}},
 			    {op, rec, Storage, {Oid, [Oid], delete}} | Acc]);
-	Ds == [] -> 
+	Ds == [] ->
 	    %% Type is set or ordered_set, no need to delete the record first
 	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
 			   [{op, rec, Storage, {Oid, Ws, write}} | Acc]);
@@ -2215,15 +2251,15 @@ transform_obj(Tab, RecName, Key, Fun, [Obj|Rest], NewArity, Type, Ws, Ds) ->
 	NewObj == Obj ->
 	    transform_obj(Tab, RecName, Key, Fun, Rest, NewArity, Type, Ws, Ds);
         RecName == element(1, NewObj), Key == element(2, NewObj) ->
-            transform_obj(Tab, RecName, Key, Fun, Rest, NewArity, 
+            transform_obj(Tab, RecName, Key, Fun, Rest, NewArity,
 			  Type, [NewObj | Ws], Ds);
-	NewObj == delete -> 
-	    case Type of 
+	NewObj == delete ->
+	    case Type of
 		bag -> %% Just don't write that object
-		   transform_obj(Tab, RecName, Key, Fun, Rest, 
-				 NewArity, Type, Ws, Ds); 
+		   transform_obj(Tab, RecName, Key, Fun, Rest,
+				 NewArity, Type, Ws, Ds);
 		_ ->
-		    transform_obj(Tab, RecName, Key, Fun, Rest, NewArity, 
+		    transform_obj(Tab, RecName, Key, Fun, Rest, NewArity,
 				  Type, Ws, [NewObj | Ds])
 	    end;
         true ->
@@ -2247,7 +2283,7 @@ undo_prepare_commit(Tid, Commit) ->
 
 %% Undo in reverse order
 undo_prepare_ops(Tid, [Op | Ops]) ->
-    case element(1, Op) of	
+    case element(1, Op) of
 	TheOp when TheOp /= op, TheOp /= restore_op ->
 	    undo_prepare_ops(Tid, Ops);
 	_ ->
@@ -2274,7 +2310,7 @@ undo_prepare_op(Tid, {op, create_table, TabDef}) ->
     mnesia_lib:unset({Tab, create_table}),
     delete_cstruct(Tid, Cs),
     case mnesia_lib:cs_to_storage_type(node(), Cs) of
-	unknown -> 
+	unknown ->
 	    ok;
 	ram_copies ->
 	    ram_delete_table(Tab, ram_copies);
@@ -2289,7 +2325,7 @@ undo_prepare_op(Tid, {op, create_table, TabDef}) ->
 	    %%	    disc_delete_table(Tab, Storage),
 	    file:delete(Dat)
     end;
-	    
+
 undo_prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}) ->
     Cs = list2cs(TabDef),
     Tab = Cs#cstruct.name,
@@ -2314,21 +2350,21 @@ undo_prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}) ->
 	    Cs2 = new_cs(Cs, Node, Storage, del),
 	    insert_cstruct(Tid, Cs2, true) % Don't care about the version
     end;
-    
-undo_prepare_op(_Tid, {op, del_table_copy, _, Node, TabDef}) 
+
+undo_prepare_op(_Tid, {op, del_table_copy, _, Node, TabDef})
   when Node == node() ->
     Cs = list2cs(TabDef),
     Tab = Cs#cstruct.name,
     mnesia_lib:set({Tab, where_to_read}, Node);
 
 
-undo_prepare_op(_Tid, {op, change_table_copy_type, N, FromS, ToS, TabDef}) 
+undo_prepare_op(_Tid, {op, change_table_copy_type, N, FromS, ToS, TabDef})
         when N == node() ->
     Cs = list2cs(TabDef),
     Tab = Cs#cstruct.name,
     mnesia_checkpoint:tm_change_table_copy_type(Tab, ToS, FromS),
     Dmp = mnesia_lib:tab2dmp(Tab),
-    
+
     case {FromS, ToS} of
         {ram_copies, disc_copies} when Tab == schema ->
             file:delete(Dmp),
@@ -2382,9 +2418,9 @@ ram_delete_table(Tab, Storage) ->
 	    ignore;
 	disc_only_copies ->
 	    ignore;
-	_Else -> 
+	_Else ->
 	    %% delete possible index files and data .....
-	    %% Got to catch this since if no info has been set in the 
+	    %% Got to catch this since if no info has been set in the
 	    %% mnesia_gvar it will crash
 	    catch mnesia_index:del_transient(Tab, Storage),
 	    case ?catch_val({Tab, {index, snmp}}) of
@@ -2454,7 +2490,7 @@ has_known_suffix(File, [Suffix | Tail], false) ->
     has_known_suffix(File, Tail, lists:suffix(Suffix, File));
 has_known_suffix(_File, [], Bool) ->
     Bool.
-	    
+
 known_suffixes() -> real_suffixes() ++ tmp_suffixes().
 
 real_suffixes() ->  [".DAT", ".LOG", ".BUP", ".DCL", ".DCD"].
@@ -2477,11 +2513,11 @@ info2(Tab, [{frag_hash, _V} | Tail]) -> % Ignore frag_hash
 info2(Tab, [{P, V} | Tail]) ->
     io:format("~-20w -> ~p~n",[P,V]),
     info2(Tab, Tail);
-info2(_, []) -> 
+info2(_, []) ->
     io:format("~n", []).
 
 get_table_properties(Tab) ->
-    case catch mnesia_lib:db_match_object(ram_copies, 
+    case catch mnesia_lib:db_match_object(ram_copies,
 					  mnesia_gvar, {{Tab, '_'}, '_'}) of
 	{'EXIT', _} ->
 	    mnesia:abort({no_exists, Tab, all});
@@ -2509,9 +2545,9 @@ get_table_properties(Tab) ->
 	    recs = error_recs
 	   }).
 
-restore(Opaque) -> 
+restore(Opaque) ->
     restore(Opaque, [], mnesia_monitor:get_env(backup_module)).
-restore(Opaque, Args) when is_list(Args) -> 
+restore(Opaque, Args) when is_list(Args) ->
     restore(Opaque, Args, mnesia_monitor:get_env(backup_module));
 restore(_Opaque, BadArg) ->
     {aborted, {badarg, BadArg}}.
@@ -2522,7 +2558,7 @@ restore(Opaque, Args, Module) when is_list(Args), is_atom(Module) ->
 	    case mnesia_bup:read_schema(R#r.module, Opaque) of
 		{error, Reason} ->
 		    {aborted, Reason};
-		BupSchema -> 
+		BupSchema ->
 		    schema_transaction(fun() -> do_restore(R, BupSchema) end)
 	    end;
 	{'EXIT', Reason} ->
@@ -2556,8 +2592,8 @@ check_restore_arg({keep_tables, List}, R) when is_list(List) ->
 check_restore_arg({skip_tables, List}, R) when is_list(List) ->
     TableList = [{Tab, skip_tables} || Tab <- List],
     R#r{table_options = R#r.table_options ++ TableList};
-check_restore_arg({default_op, Op}, R) -> 
-    case Op of 
+check_restore_arg({default_op, Op}, R) ->
+    case Op of
 	clear_tables -> ok;
 	recreate_tables -> ok;
 	keep_tables -> ok;
@@ -2588,12 +2624,12 @@ restore_items([Rec | Recs], Header, Schema, R) ->
     case lists:keysearch(Tab, 1, R#r.tables) of
 	{value, {Tab, Where0, Snmp, RecName}} ->
 	    Where = case Where0 of
-			undefined -> 
+			undefined ->
 			    val({Tab, where_to_commit});
 			_ ->
 			    Where0
 		    end,
-	    {Rest, NRecs} = restore_tab_items([Rec | Recs], Tab, 
+	    {Rest, NRecs} = restore_tab_items([Rec | Recs], Tab,
 					      RecName, Where, Snmp,
 					      R#r.recs, R#r.insert_op),
 	    restore_items(Rest, Header, Schema, R#r{recs = NRecs});
@@ -2601,12 +2637,12 @@ restore_items([Rec | Recs], Header, Schema, R) ->
 	    Rest = skip_tab_items(Recs, Tab),
 	    restore_items(Rest, Header, Schema, R)
     end;
-    
+
 restore_items([], _Header, _Schema, R) ->
     R.
 
 restore_func(Tab, R) ->
-    case lists:keysearch(Tab, 1, R#r.table_options) of 
+    case lists:keysearch(Tab, 1, R#r.table_options) of
 	{value, {Tab, OP}} ->
 	    OP;
 	false ->
@@ -2618,24 +2654,24 @@ where_to_commit(Tab, CsList) ->
     Disc =  [{N, disc_copies} || N <- pick(Tab, disc_copies, CsList, [])],
     DiscO = [{N, disc_only_copies} || N <- pick(Tab, disc_only_copies, CsList, [])],
     Ram ++ Disc ++ DiscO.
-    
+
 %% Changes of the Meta info of schema itself is not allowed
 restore_schema([{schema, schema, _List} | Schema], R) ->
     restore_schema(Schema, R);
 restore_schema([{schema, Tab, List} | Schema], R) ->
     case restore_func(Tab, R) of
-	clear_tables -> 
+	clear_tables ->
 	    do_clear_table(Tab),
-	    Snmp = val({Tab, snmp}), 
-	    RecName = val({Tab, record_name}), 
+	    Snmp = val({Tab, snmp}),
+	    RecName = val({Tab, record_name}),
 	    R2 = R#r{tables = [{Tab, undefined, Snmp, RecName} | R#r.tables]},
 	    restore_schema(Schema, R2);
-	recreate_tables -> 
+	recreate_tables ->
 	    case ?catch_val({Tab, cstruct}) of
-		{'EXIT', _} ->    
+		{'EXIT', _} ->
 		    TidTs = {_Mod, Tid, Ts} = get(mnesia_activity_state),
 		    RunningNodes = val({current, db_nodes}),
-		    Nodes = mnesia_lib:intersect(mnesia_lib:cs_to_nodes(list2cs(List)), 
+		    Nodes = mnesia_lib:intersect(mnesia_lib:cs_to_nodes(list2cs(List)),
 						 RunningNodes),
 		    mnesia_locker:wlock_no_exist(Tid, Ts#tidstore.store, Tab, Nodes),
 		    TidTs;
@@ -2643,20 +2679,20 @@ restore_schema([{schema, Tab, List} | Schema], R) ->
 		    TidTs = get_tid_ts_and_lock(Tab, write)
 	    end,
 	    NC    = {cookie, ?unique_cookie},
-	    List2 = lists:keyreplace(cookie, 1, List, NC),		
+	    List2 = lists:keyreplace(cookie, 1, List, NC),
 	    Where = where_to_commit(Tab, List2),
 	    Snmp  = pick(Tab, snmp, List2, []),
 	    RecName = pick(Tab, record_name, List2, Tab),
 	    insert_schema_ops(TidTs, [{op, restore_recreate, List2}]),
 	    R2 = R#r{tables = [{Tab, Where, Snmp, RecName} | R#r.tables]},
 	    restore_schema(Schema, R2);
-	keep_tables -> 
+	keep_tables ->
 	    get_tid_ts_and_lock(Tab, write),
 	    Snmp = val({Tab, snmp}),
-	    RecName = val({Tab, record_name}), 
+	    RecName = val({Tab, record_name}),
 	    R2 = R#r{tables = [{Tab, undefined, Snmp, RecName} | R#r.tables]},
 	    restore_schema(Schema, R2);
-	skip_tables -> 
+	skip_tables ->
 	    restore_schema(Schema, R)
     end;
 
@@ -2667,7 +2703,7 @@ restore_schema([{schema, Tab} | Schema], R) ->
 restore_schema([], R) ->
     R.
 
-restore_tab_items([Rec | Rest], Tab, RecName, Where, Snmp, Recs, Op) 
+restore_tab_items([Rec | Rest], Tab, RecName, Where, Snmp, Recs, Op)
   when element(1, Rec) == Tab ->
     NewRecs = Op(Rec, Recs, RecName, Where, Snmp),
     restore_tab_items(Rest, Tab, RecName, Where, Snmp, NewRecs, Op);
@@ -2675,7 +2711,7 @@ restore_tab_items([Rec | Rest], Tab, RecName, Where, Snmp, Recs, Op)
 restore_tab_items(Rest, _Tab, _RecName, _Where, _Snmp, Recs, _Op) ->
     {Rest, Recs}.
 
-skip_tab_items([Rec| Rest], Tab) 
+skip_tab_items([Rec| Rest], Tab)
   when element(1, Rec) == Tab ->
     skip_tab_items(Rest, Tab);
 skip_tab_items(Recs, _) ->
@@ -2710,7 +2746,6 @@ merge_schema() ->
 merge_schema(UserFun) ->
     schema_transaction(fun() -> UserFun(fun(Arg) -> do_merge_schema(Arg) end) end).
 
-
 do_merge_schema(LockTabs0) ->
     {_Mod, Tid, Ts} = get_tid_ts_and_lock(schema, write),
     LockTabs = [{T, tab_to_nodes(T)} || T <- LockTabs0],
@@ -2732,14 +2767,14 @@ do_merge_schema(LockTabs0) ->
             [mnesia_locker:wlock_no_exist(
                Tid, Store, T, mnesia_lib:intersect(Ns, OtherNodes))
              || {T,Ns} <- LockTabs],
-	    case rpc:call(Node, mnesia_controller, get_cstructs, []) of
+	    case fetch_cstructs(Node) of
 		{cstructs, Cstructs, RemoteRunning1} ->
 		    LockedAlready = Running ++ [Node],
 		    {New, Old} = mnesia_recover:connect_nodes(RemoteRunning1),
 		    RemoteRunning = mnesia_lib:intersect(New ++ Old, RemoteRunning1),
-		    if 
+		    if
 			RemoteRunning /= RemoteRunning1 ->
-			    mnesia_lib:error("Mnesia on ~p could not connect to node(s) ~p~n", 
+			    mnesia_lib:error("Mnesia on ~p could not connect to node(s) ~p~n",
 					     [node(), RemoteRunning1 -- RemoteRunning]),
 			    mnesia:abort({node_not_running, RemoteRunning1 -- RemoteRunning});
 			true -> ok
@@ -2749,24 +2784,24 @@ do_merge_schema(LockTabs0) ->
                     [mnesia_locker:wlock_no_exist(Tid, Store, T,
                                                   mnesia_lib:intersect(Ns,NeedsLock))
                      || {T,Ns} <- LockTabs],
-		    {value, SchemaCs} =
-			lists:keysearch(schema, #cstruct.name, Cstructs),
 
+		    NeedsConversion = need_old_cstructs(NeedsLock ++ LockedAlready),
+		    {value, SchemaCs} = lists:keysearch(schema, #cstruct.name, Cstructs),
+		    SchemaDef = cs2list(NeedsConversion, SchemaCs),
 		    %% Announce that Node is running
-		    A = [{op, announce_im_running, node(),
-			  cs2list(SchemaCs), Running, RemoteRunning}],
+		    A = [{op, announce_im_running, node(), SchemaDef, Running, RemoteRunning}],
 		    do_insert_schema_ops(Store, A),
-		    
+
 		    %% Introduce remote tables to local node
-		    do_insert_schema_ops(Store, make_merge_schema(Node, Cstructs)),
-		    
+		    do_insert_schema_ops(Store, make_merge_schema(Node, NeedsConversion, Cstructs)),
+
 		    %% Introduce local tables to remote nodes
 		    Tabs = val({schema, tables}),
 		    Ops = [{op, merge_schema, get_create_list(T)}
 			   || T <- Tabs,
 			      not lists:keymember(T, #cstruct.name, Cstructs)],
 		    do_insert_schema_ops(Store, Ops),
-		    
+
 		    %% Ensure that the txn will be committed on all nodes
 		    NewNodes = RemoteRunning -- Running,
 		    mnesia_lib:set(prepare_op, {announce_im_running,NewNodes}),
@@ -2782,19 +2817,49 @@ do_merge_schema(LockTabs0) ->
 	    not_merged
     end.
 
+fetch_cstructs(Node) ->
+    case mnesia_monitor:needs_protocol_conversion(Node) of
+	true ->
+	    case rpc:call(Node, mnesia_controller, get_cstructs, []) of
+		{cstructs, Cs0, RR} ->
+		    {cstructs, [list2cs(cs2list(Cs)) || Cs <- Cs0], RR};
+		Err -> Err
+	    end;
+	false ->
+	    rpc:call(Node, mnesia_controller, get_remote_cstructs, [])
+    end.
+
+need_old_cstructs(Nodes) ->
+    Filter = fun(Node) -> not mnesia_monitor:needs_protocol_conversion(Node) end,
+    case lists:dropwhile(Filter, Nodes) of
+	[] -> false;
+	[Node|_] ->
+	    case rpc:call(Node, mnesia_lib, val, [{schema,cstruct}]) of
+		#cstruct{} ->
+		    %% mnesia_lib:warning("Mnesia on ~p do not need to convert cstruct (~p)~n",
+		    %% 		       [node(), Node]),
+		    false;
+		{badrpc, _} ->
+		    need_old_cstructs(lists:delete(Node,Nodes));
+		Cs when element(1, Cs) == cstruct, tuple_size(Cs) == 17 ->
+		    ver4_4_18;			% Without majority
+		Cs when element(1, Cs) == cstruct, tuple_size(Cs) == 18 ->
+		    ver4_4_19			% With majority
+	    end
+    end.
+
 tab_to_nodes(Tab) when is_atom(Tab) ->
     Cs = val({Tab, cstruct}),
     mnesia_lib:cs_to_nodes(Cs).
 
-make_merge_schema(Node, [Cs | Cstructs]) ->
-    Ops = do_make_merge_schema(Node, Cs),
-    Ops ++ make_merge_schema(Node, Cstructs);
-make_merge_schema(_Node, []) ->
+make_merge_schema(Node, NeedsConv, [Cs | Cstructs]) ->
+    Ops = do_make_merge_schema(Node, NeedsConv, Cs),
+    Ops ++ make_merge_schema(Node, NeedsConv, Cstructs);
+make_merge_schema(_Node, _, []) ->
     [].
 
 %% Merge definitions of schema table
-do_make_merge_schema(Node, RemoteCs)
-  when RemoteCs#cstruct.name == schema ->
+do_make_merge_schema(Node, NeedsConv, RemoteCs = #cstruct{name = schema}) ->
     Cs = val({schema, cstruct}),
     Masters = mnesia_recover:get_master_nodes(schema),
     HasRemoteMaster = lists:member(Node, Masters),
@@ -2804,15 +2869,15 @@ do_make_merge_schema(Node, RemoteCs)
     StCsLocal   = mnesia_lib:cs_to_storage_type(node(), Cs),
     StRcsLocal  = mnesia_lib:cs_to_storage_type(node(), RemoteCs),
     StCsRemote  = mnesia_lib:cs_to_storage_type(Node, Cs),
-    StRcsRemote = mnesia_lib:cs_to_storage_type(Node, RemoteCs),        
-    
+    StRcsRemote = mnesia_lib:cs_to_storage_type(Node, RemoteCs),
+
     if
 	Cs#cstruct.cookie == RemoteCs#cstruct.cookie,
 	Cs#cstruct.version == RemoteCs#cstruct.version ->
 	    %% Great, we have the same cookie and version
 	    %% and do not need to merge cstructs
 	    [];
-	
+
 	Cs#cstruct.cookie /= RemoteCs#cstruct.cookie,
 	Cs#cstruct.disc_copies /= [],
 	RemoteCs#cstruct.disc_copies /= [] ->
@@ -2823,14 +2888,14 @@ do_make_merge_schema(Node, RemoteCs)
 		HasRemoteMaster == false ->
 		    %% Choose local cstruct,
 		    %% since it's the master
-		    [{op, merge_schema, cs2list(Cs)}];
+		    [{op, merge_schema, cs2list(NeedsConv, Cs)}];
 
 		HasRemoteMaster == true,
 		HasLocalMaster == false ->
 		    %% Choose remote cstruct,
 		    %% since it's the master
-		    [{op, merge_schema, cs2list(RemoteCs)}];
-		
+		    [{op, merge_schema, cs2list(NeedsConv, RemoteCs)}];
+
 		true ->
 		    Str = io_lib:format("Incompatible schema cookies. "
 					"Please, restart from old backup."
@@ -2838,12 +2903,12 @@ do_make_merge_schema(Node, RemoteCs)
 					[Node, cs2list(RemoteCs), node(), cs2list(Cs)]),
 		    throw(Str)
 	    end;
-	
+
 	StCsLocal /= StRcsLocal, StRcsLocal /= unknown, StCsLocal /= ram_copies ->
 	    Str = io_lib:format("Incompatible schema storage types (local). "
 				"on ~w storage ~w, on ~w storage ~w~n",
 				[node(), StCsLocal, Node, StRcsLocal]),
-	    throw(Str);    
+	    throw(Str);
 	StCsRemote /= StRcsRemote, StCsRemote /= unknown, StRcsRemote /= ram_copies ->
 	    Str = io_lib:format("Incompatible schema storage types (remote). "
 				"on ~w cs ~w, on ~w rcs ~w~n",
@@ -2854,27 +2919,27 @@ do_make_merge_schema(Node, RemoteCs)
 	    %% Choose local cstruct,
 	    %% since it involves disc nodes
 	    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}];
-	
+	    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}];
+
 	RemoteCs#cstruct.disc_copies /= [] ->
 	    %% Choose remote cstruct,
 	    %% since it involves disc nodes
 	    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}];
+	    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}];
 
 	Cs > RemoteCs ->
 	    %% Choose remote cstruct
 	    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}];
-	
+	    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}];
+
 	true ->
 	    %% Choose local cstruct
 	    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}]
+	    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}]
     end;
 
 %% Merge definitions of normal table
-do_make_merge_schema(Node, RemoteCs) ->
+do_make_merge_schema(Node, NeedsConv, RemoteCs = #cstruct{}) ->
     Tab = RemoteCs#cstruct.name,
     Masters = mnesia_recover:get_master_nodes(schema),
     HasRemoteMaster = lists:member(Node, Masters),
@@ -2883,27 +2948,27 @@ do_make_merge_schema(Node, RemoteCs) ->
     case ?catch_val({Tab, cstruct}) of
 	{'EXIT', _} ->
 	    %% A completely new table, created while Node was down
-	    [{op, merge_schema, cs2list(RemoteCs)}];
+	    [{op, merge_schema, cs2list(NeedsConv, RemoteCs)}];
 	Cs when Cs#cstruct.cookie == RemoteCs#cstruct.cookie ->
 	    if
 		Cs#cstruct.version == RemoteCs#cstruct.version ->
 		    %% We have exactly the same version of the
 		    %% table def
 		    [];
-		
+
 		Cs#cstruct.version > RemoteCs#cstruct.version ->
 		    %% Oops, we have different versions
 		    %% of the table def, lets merge them.
 		    %% The only changes that may have occurred
 		    %% is that new replicas may have been added.
 		    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
-		    [{op, merge_schema, cs2list(MergedCs)}];
-		
+		    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}];
+
 		Cs#cstruct.version < RemoteCs#cstruct.version ->
 		    %% Oops, we have different versions
 		    %% of the table def, lets merge them
 		    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
-		    [{op, merge_schema, cs2list(MergedCs)}]
+		    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}]
 	    end;
 	Cs ->
 	    %% Different cookies, not possible to merge
@@ -2912,14 +2977,14 @@ do_make_merge_schema(Node, RemoteCs) ->
 		HasRemoteMaster == false ->
 		    %% Choose local cstruct,
 		    %% since it's the master
-		    [{op, merge_schema, cs2list(Cs)}];
+		    [{op, merge_schema, cs2list(NeedsConv, Cs)}];
 
 		HasRemoteMaster == true,
 		HasLocalMaster == false ->
 		    %% Choose remote cstruct,
 		    %% since it's the master
-		    [{op, merge_schema, cs2list(RemoteCs)}];
-		
+		    [{op, merge_schema, cs2list(NeedsConv, RemoteCs)}];
+
 		true ->
 		    Str = io_lib:format("Bad cookie in table definition"
 					" ~w: ~w = ~w, ~w = ~w~n",
@@ -2989,7 +3054,7 @@ compare_storage_type(true, One, Another) ->
     compare_storage_type(false, Another, One);
 compare_storage_type(false, _One, _Another) ->
     incompatible.
-  
+
 change_storage_type(N, ram_copies, Cs) ->
     Nodes = [N | Cs#cstruct.ram_copies],
     Cs#cstruct{ram_copies = mnesia_lib:uniq(Nodes)};
@@ -3071,14 +3136,14 @@ verify_merge(RemoteCs) ->
 	    if
 		StCsLocal  == StRcsLocal ->   ok;
 		StCsLocal  == unknown ->      ok;
-		(StRcsLocal == unknown), (HasRemoteMaster == false) ->      
+		(StRcsLocal == unknown), (HasRemoteMaster == false) ->
 		    {merge_error, Cs, RemoteCs};
 		%%  Trust the merger
 		true  -> ok
 	    end
     end.
 
-announce_im_running([N | Ns], SchemaCs) ->    
+announce_im_running([N | Ns], SchemaCs) ->
     {L1, L2} = mnesia_recover:connect_nodes([N]),
     case lists:member(N, L1) or lists:member(N, L2) of
 	true ->
@@ -3095,7 +3160,7 @@ announce_im_running([], _) ->
 
 unannounce_im_running([N | Ns]) ->
     mnesia_lib:del({current, db_nodes}, N),
-    mnesia_controller:del_active_replica(schema, N),    
+    mnesia_controller:del_active_replica(schema, N),
     unannounce_im_running(Ns);
 unannounce_im_running([]) ->
     ok.
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 2fa629d064..a21ab007ef 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.4.19
+MNESIA_VSN = 4.5
diff --git a/lib/observer/doc/src/make.dep b/lib/observer/doc/src/make.dep
deleted file mode 100644
index 3c1b3df771..0000000000
--- a/lib/observer/doc/src/make.dep
+++ /dev/null
@@ -1,29 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex crashdump.tex crashdump_ug.tex etop.tex \
-		etop_ug.tex observer_app.tex part.tex ref_man.tex \
-		ttb.tex ttb_ug.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: etop_5.ps etop_lines.ps etop_main.ps etop_opt.ps
-
-book.dvi: et_modsprocs.ps et_processes.ps
-
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 73eb992323..baa1354268 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -31,6 +31,22 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 0.9.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Do not install *.bat files on non-win32 machines (Thanks
+	    to Hans Ulrich Niedermann)</p>
+          <p>
+	    Own Id: OTP-9515</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 0.9.9</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/observer/doc/src/ttb.xml b/lib/observer/doc/src/ttb.xml
index 2c80891925..4e63aecbf2 100644
--- a/lib/observer/doc/src/ttb.xml
+++ b/lib/observer/doc/src/ttb.xml
@@ -25,11 +25,12 @@
 
     <title>ttb</title>
     <prepared>Siri hansen</prepared>
+    <prepared>Bartlomiej Puzon</prepared>
     <responsible></responsible>
     <docno>1</docno>
     <approved></approved>
     <checked></checked>
-    <date>2002-02-25</date>
+    <date>2010-08-13</date>
     <rev>PA1</rev>
     <file>ttb.sgml</file>
   </header>
@@ -43,6 +44,35 @@
   </description>
   <funcs>
     <func>
+      <name>start_trace(Nodes, Patterns, FlagSpec, Opts) -> Result</name>
+      <fsummary>Start a trace port on each given node.</fsummary>
+      <type>
+        <v>Result = see p/2</v>
+        <v>Nodes = see tracer/2</v>
+        <v>Patterns = [tuple()]</v>
+        <v>FlagSpec = {Procs, Flags}</v>
+        <v>Proc = see p/2</v>
+        <v>Flags = see p/2</v>
+        <v>Opts = see tracer/2</v>
+      </type>
+      <desc>
+        <p>This function is a shortcut allowing to start a trace with one command. Each
+          tuple in <c>Patterns</c> is converted to list which is in turn passed to
+          <c>ttb:tpl</c>.
+          The call:<code type="none">
+ttb:start_trace([Node, OtherNode],
+[{mod, foo, []}, {mod, bar, 2}],
+{all, call},
+[{file, File}, {handler,{fun myhandler/4, S}}])</code>
+          is equivalent to <code type="none">
+ttb:start_trace([Node, OtherNode], [{file, File}, {handler,{fun myhandler/4, S}}]),
+ttb:tpl(mod, foo, []),
+ttb:tpl(mod, bar, 2, []),
+ttb:p(all, call)</code>
+        </p>
+      </desc>
+    </func>
+    <func>
       <name>tracer() -> Result</name>
       <fsummary>This is equivalent to tracer(node()).</fsummary>
       <desc>
@@ -50,6 +80,17 @@
       </desc>
     </func>
     <func>
+      <name>tracer(Shortcut) -> Result</name>
+      <fsummary>Handy shortcuts for common tracing settings</fsummary>
+      <type>
+        <v>Shortcut = shell | dbg</v>
+      </type>
+      <desc>
+        <p><c>shell</c> is equivalent to <c>tracer(node(),[{file, {local, "ttb"}}, shell])</c>.</p>
+        <p><c>dbg</c> is equivalent to <c>tracer(node(),[{shell, only}])</c>.</p>
+      </desc>
+    </func>
+    <func>
       <name>tracer(Nodes) -> Result</name>
       <fsummary>This is equivalent to tracer(Nodes,[]).</fsummary>
       <desc>
@@ -62,14 +103,21 @@
       <type>
         <v>Result = {ok, ActivatedNodes} | {error,Reason}</v>
         <v>Nodes   = atom() | [atom()] | all | existing | new</v>
-        <v>Opts = [Opt]</v>
-        <v>Opt = {file,Client} | {handler, FormatHandler} | {process_info,PI}</v>
+        <v>Opts = Opt | [Opt]</v>
+        <v>Opt = {file,Client} | {handler, FormatHandler} | {process_info,PI} |
+          shell | {shell, ShellSpec} | {timer, TimerSpec} | {overload, {MSec, Module, Function}}
+          | {flush, MSec} | resume | {resume, FetchTimeout}</v>
+        <v>TimerSpec = MSec | {MSec, StopOpts}</v>
+        <v>MSec = FetchTimeout = integer()</v>
+        <v>Module = Function = atom() </v>
+        <v>StopOpts = see stop/2</v>
         <v>Client = File | {local, File}</v>
         <v>File = Filename | Wrap</v>
         <v>Filename = string()</v>
         <v>Wrap = {wrap,Filename} | {wrap,Filename,Size,Count}</v>
         <v>FormatHandler = See format/2</v>
         <v>PI = true | false </v>
+        <v>ShellSpec = true | false | only</v>
       </type>
       <desc>
         <p>This function starts a file trace port on all given nodes
@@ -96,7 +144,70 @@
           is the process' registered name its globally registered name,
           or its initial function. It is possible to turn off this
           functionality by setting <c>PI = false</c>.
-          </p>
+        </p>
+        <p>The <c>{shell, ShellSpec}</c> option indicates that the trace messages should
+          be printed on the console as they are received by the tracing
+          process. This implies <c>{local, File}</c> trace client. If the ShellSpec
+          is <c>only</c> (instead of <c>true</c>), no trace logs are stored.
+        </p>
+        <p>The <c>shell</c> option is a shortcut for <c>{shell, true}</c>.</p>
+        <p>The <c>timer</c> option indicates that the trace should be
+          automatically stopped after <c>MSec</c> milliseconds. <c>StopOpts</c>
+          are passed to <c>ttb:stop/2</c> command if specified (default is <c>[]</c>).
+          Note that the timing is approximate, as delays related to
+          network communication are always present. The timer starts after
+          <c>ttb:p/2</c> is issued, so you can set up your trace patterns before.
+        </p>
+        <p>The <c>overload</c> option allows to enable overload
+          checking on the nodes under trace. <c>Module:Function(check)</c>
+          is performed each <c>MSec</c> milliseconds. If the check returns
+          <c>true</c>, the tracing is disabled on a given node.<br/>
+          <c>Module:Function</c> should be able to handle at least three
+          atoms: <c>init</c>, <c>check</c> and <c>stop</c>. <c>init</c> and
+          <c>stop</c> give the user a possibility to initialize and clean
+          up the check environment.<br/>
+          When a node gets overloaded, it is not possible to issue <c>ttb:p</c>
+          nor any command from the <c>ttb:tp</c> family, as it would lead to
+          inconsistent tracing state (different trace specifications on
+          different node).
+        </p>
+        <p>The <c>flush</c> option periodically flushes all file trace
+          port clients (see <c>dbg:flush_trace_port/1</c>). When enabled,
+          the buffers are freed each <c>MSec</c> milliseconds. This option is
+          not allowed with <c>{file, {local, File}}</c> tracing.
+        </p>
+        <p><c>{resume, FetchTimeout}</c> enables the autoresume feature.
+          Whenever enabled, remote nodes try to reconnect to the controlling node
+          in case they were restarted. The feature requires <c>runtime_tools</c>
+          application to be started (so it has to be present in the <c>.boot</c>
+          scripts if the traced nodes run with embedded erlang). If this is
+          not possible, resume may be performed manually by starting
+          <c>runtime_tools</c> remotely using <c>rpc:call/4</c>.<br/>
+          <c>ttb</c> tries to fetch all logs from a reconnecting node before
+          reinitializing the trace. This has to finish within FetchTimeout milliseconds
+          or is aborted<br/>
+          By default, autostart information is stored in a file called
+          <c>ttb_autostart.bin</c> on each node. If this is not desired
+          (i.e. on diskless nodes), a custom module to handle autostart
+          information storage and retrieval can be provided by specifying
+          <c>ttb_autostart_module</c> environment variable for the <c>runtime_tools</c>
+          application. The module has to respond to the following API:
+          <taglist>
+            <tag><c>write_config(Data) -> ok</c></tag>
+            <item>Store the provided data for further retrieval. It is
+              important to realize that the data storage used must not
+              be affected by the node crash.</item>
+            <tag><c>read_config() -> {ok, Data} | {error, Error}</c></tag>
+            <item>Retrieve configuration stored with <c>write_config(Data)</c>.</item>
+            <tag><c>delete_config() -> ok</c></tag>
+            <item>Delete configuration stored with <c>write_config(Data)</c>.
+              Note that after this call any subsequent calls to <c>read_config</c>
+              must return <c>{error, Error}</c>.
+            </item>
+          </taglist>
+        </p>
+        <p>The <c>resume</c> option implies the default <c>FetchTimeout</c>, which is
+          10 seconds</p>
       </desc>
     </func>
     <func>
@@ -110,7 +221,7 @@
       </type>
       <desc>
         <p>This function sets the given trace flags on the given
-          processes.
+          processes. The <c>timestamp</c> flag is always turned on.
           </p>
         <p>Please turn to the Reference manual for module <c>dbg</c>
           for details about the possible trace flags. The parameter
@@ -119,6 +230,9 @@
           registered names or process identifiers. If a registered name
           is given, the flags are set on processes with this name on all
           active nodes.</p>
+        <p>Issuing this command starts the timer for this trace if
+          <c>timer</c> option was specified with <c>tracer/2</c>.
+        </p>
       </desc>
     </func>
     <func>
@@ -155,6 +269,18 @@
           <tag><c>ctpg</c></tag>
           <item>Clear trace pattern on global function calls</item>
         </taglist>
+        <p>With <c>tp</c> and <c>tpl</c> one of match specification shortcuts
+          may be used (example: <c>ttb:tp(foo_module, caller)</c>). The shortcuts are:
+          <taglist>
+            <item><c>return</c> - for <c>[{'_',[],[{return_trace}]}]</c>
+              (report the return value)</item>
+            <item><c>caller</c> - for <c>[{'_',[],[{message,{caller}}]}]</c>
+              (report the calling function)</item>
+            <item><c>{codestr, Str}</c> - for <c>dbg:fun2ms/1</c> arguments
+              passed as strings (example: <c>"fun(_) -> return_trace() end"</c>)
+            </item>
+          </taglist>
+        </p>
       </desc>
     </func>
     <func>
@@ -189,7 +315,7 @@
       </desc>
     </func>
     <func>
-      <name>write_config(ConfigFile,Config,Opt) -> ok | {error,Reason}</name>
+      <name>write_config(ConfigFile,Config,Opts) -> ok | {error,Reason}</name>
       <fsummary>Creates a config file.</fsummary>
       <type>
         <v>ConfigFile = string()</v>
@@ -197,7 +323,8 @@
         <v>Mod = atom()</v>
         <v>Func = atom()</v>
         <v>Args = [term()]</v>
-        <v>Opt = [] | [append]</v>
+        <v>Opts = Opt | [Opt]</v>
+        <v>Opt = append</v>
       </type>
       <desc>
         <p>This function creates or extends a config file which can be
@@ -213,9 +340,9 @@
           should be a list of integers pointing out the entries to be
           stored.
           </p>
-        <p>If <c>Opt</c> is not given or if it is <c>[]</c>,
+        <p>If <c>Opts</c> is not given or if it is <c>[]</c>,
           <c>ConfigFile</c> is deleted and a new file is created. If
-          <c>Opt = [append]</c>, <c>ConfigFile</c> will not be deleted.
+          <c>Opts = [append]</c>, <c>ConfigFile</c> will not be deleted.
           The new information will be appended at the end of the file.</p>
       </desc>
     </func>
@@ -226,7 +353,9 @@
         <v>ConfigFile = string()</v>
       </type>
       <desc>
-        <p>Executes all entries in the given config file.</p>
+        <p>Executes all entries in the given config file. Note that the history
+          of the last trace is always available in the file named
+          <c>ttb_last_config</c>.</p>
       </desc>
     </func>
     <func>
@@ -243,6 +372,9 @@
           </p>
         <p>The content of a config file can be listed with
           <c>list_config/1</c>.</p>
+        <p> Note that the history
+          of the last trace is always available in the file named
+          <c>ttb_last_config</c>.</p>
       </desc>
     </func>
     <func>
@@ -334,29 +466,51 @@
       </desc>
     </func>
     <func>
-      <name>stop(Opts) -> stopped</name>
+      <name>stop(Opts) -> stopped | {stopped, Dir}</name>
       <fsummary>Stop tracing and fetch/format logs from all nodes</fsummary>
       <type>
-        <v>Opts = [Opt]</v>
-        <v>Opt = fetch | format</v>
+        <v>Opts = Opt | [Opt]</v>
+        <v>Opt = nofetch | {fetch_dir, Dir} | format | {format, FormatOpts} | return_fetch_dir</v>
+        <v>Dir = string()</v>
+        <v>FormatOpts = see format/2</v>
       </type>
       <desc>
-        <p>Stops tracing on all nodes.
-          </p>
-        <p>The <c>fetch</c> option indicates that trace logs shall be
-          collected from all nodes after tracing is stopped. This option
-          is useful if nodes on remote machines are traced. Logs and
-          trace information files are then sent to the trace control
+        <p>Stops tracing on all nodes. Logs and
+          trace information files are sent to the trace control
           node and stored in a directory named
-          <c>ttb_upload-Timestamp</c>, where <c>Timestamp</c> is on the
+          <c>ttb_upload_FileName-Timestamp</c>, where <c>Filename</c> is
+          the one provided with <c>{file, File}</c> during trace setup
+          and <c>Timestamp</c> is of the
           form <c>yyyymmdd-hhmmss</c>. Even logs from nodes on the same
           machine as the trace control node are moved to this directory.
-          </p>
+          The history list is saved to a file named <c>ttb_last_config</c>
+          for further reference (as it will be not longer accessible
+          through history and configuration management functions (like
+          <c>ttb:list_history/0</c>).
+        </p>
+        <p>The <c>nofetch</c> option indicates that trace logs shall not be
+          collected after tracing is stopped.
+        </p>
+        <p>The <c>{fetch, Dir}</c> option allows to specify the directory
+          to fetch the data to. If the directory already exists, an
+          error is thrown.
+        </p>
         <p>The <c>format</c> option indicates that the trace logs
-          shall be formatted after tracing is stopped. Note that this
-          option also implies the <c>fetch</c> option, i.e. logs are
-          collected in a new directory on the trace control node before
-          formatting. All logs in the directory will be merged.</p>
+          shall be formatted after tracing is stopped. All logs in the fetch directory will be merged.
+          You may use <c>{format, FormatOpts}</c> to pass additional
+          arguments to <c>format/2</c>.</p>
+        <p>The <c>return_fetch_dir</c> option indicates that the return value
+          should be <c>{stopped, Dir}</c> and not just <c>stopped</c>.
+          This implies <c>fetch</c>.
+        </p>
+      </desc>
+    </func>
+    <func>
+      <name>get_et_handler()</name>
+      <fsummary>Returns <c>et</c> handler.</fsummary>
+      <desc>
+        <p>The <c>et</c> handler returned by the function may be used with <c>format/2</c>
+          or <c>tracer/2</c>. Example: <c>ttb:format(Dir, [{handler, ttb:get_et_handler()}])</c>.</p>
       </desc>
     </func>
     <func>
@@ -372,37 +526,40 @@
       <type>
         <v>File = string() | [string()]</v>
         <d>This can be the name of a binary log, a list of such logs or the name of a directory containing one or more binary logs.</d>
-        <v>Options = [Opt]</v>
-        <v>Opt = {out,Out} | {handler,FormatHandler}</v>
+        <v>Options = Opt | [Opt]</v>
+        <v>Opt = {out,Out} | {handler,FormatHandler} | disable_sort</v>
         <v>Out = standard_io | string()</v>
-        <v>FormatHandler = {Function, InitialState} | et</v>
+        <v>FormatHandler = {Function, InitialState}</v>
         <v>Function = fun(Fd,Trace,TraceInfo,State) -> State</v>
         <v>Fd = standard_io | FileDescriptor</v>
         <d>This is the file descriptor of the destination file <c>Out</c></d>
         <v>Trace = tuple()</v>
         <d>This is the trace message. Please turn to the Reference manual for the <c>erlang</c>module for details.</d>
         <v>TraceInfo = [{Key,ValueList}]</v>
-        <d>This includes the keys <c>flags</c>, <c>client</c>and <c>node</c>,  and if <c>handler</c>is given as option to the tracer function,  this is also included. In addition all information written with the <c>write_trace_info/2</c>function is included. </d>
+        <d>This includes the keys <c>flags</c>, <c>client</c> and <c>node</c>,  and if <c>handler</c> is given as option to the tracer function,  this is also included. In addition all information written with the <c>write_trace_info/2</c>function is included. </d>
       </type>
       <desc>
-        <p>Reads the given binary trace log(s). If a directory or a
-          list of logs is given and the <c>timestamp</c> flag was set
-          during tracing, the trace messages from the different logs are
-          merged according to the timestamps.
-          </p>
+        <p>Reads the given binary trace log(s). The logs are processed
+          in the order of their timestamp as long as <c>disable_sort</c>
+          option is not given.
+        </p>
         <p>If <c>FormatHandler = {Function,InitialState}</c>,
           <c>Function</c> will be called for each trace message. If
-          <c>FormatHandler = et</c>, <c>et_viewer</c> in the <em>Event Tracer</em> application (<c>et</c>) is used for presenting the
-          trace log graphically. <c>ttb</c> provides a few different
+          <c>FormatHandler = get_et_handler()</c>, <c>et_viewer</c> in
+          the <em>Event Tracer</em> application (<c>et</c>) is used for presenting
+          the trace log graphically. <c>ttb</c> provides a few different
           filters which can be selected from the Filter menu in the
           <c>et_viewer</c>. If <c>FormatHandler</c> is not given, a
           default handler is used which presents each trace message as a
           line of text.
           </p>
+        <p>The state returned from each call of <c>Function</c> is passed to the next call,
+          even if next call is to format a message from another log file.
+          </p>
         <p>If <c>Out</c> is given, <c>FormatHandler</c> gets the
-          filedescriptor to <c>Out</c> as the first parameter.
+          file descriptor to <c>Out</c> as the first parameter.
           </p>
-        <p><c>Out</c> is ignored if <c>FormatHandler = et</c>.
+        <p><c>Out</c> is ignored if <c>et</c> format handler is used.
           </p>
         <p>Wrap logs can be formatted one by one or all in one go. To
           format one of the wrap logs in a set, give the exact name of
diff --git a/lib/observer/doc/src/ttb_ug.xml b/lib/observer/doc/src/ttb_ug.xml
index 44b7b08fd3..4f2b55a22a 100644
--- a/lib/observer/doc/src/ttb_ug.xml
+++ b/lib/observer/doc/src/ttb_ug.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -48,11 +48,13 @@
       <item>Formatting of binary trace logs and merging of logs from
        multiple nodes.</item>
     </list>
-    <p>Even though the intention of the Trace Tool Builder is to serve
-      as a base for tailor made trace tools, it is of course possible
-      to use it directly from the erlang shell. The application only
-      allows the use of file port tracer, so if you would like would
-      like to use other types of trace clients you will be better off
+    <p>The intention of the Trace Tool Builder is to serve
+      as a base for tailor made trace tools, but you may use it directly
+      from the erlang shell (it may mimic <c>dbg</c> behaviour while
+      still providing useful additions like match specification shortcuts).
+      The application only
+      allows the use of file port tracer, so if you would like
+      to use other types of trace clients you will be better off
       using <c>dbg</c> directly instead.</p>
   </section>
 
@@ -64,14 +66,15 @@
       trace flags on the processes you want to trace with
       <c>ttb:p/2</c>. Then, when the tracing is completed, you must stop
       the tracer with <c>ttb:stop/0/1</c> and format the trace log with
-      <c>ttb:format/1/2</c>.
+      <c>ttb:format/1/2</c> (as long as there is anything to format, of
+      course).
       </p>
-    <p><c>ttb:tracer/0/1/2</c> opens a file trace port on each node
-      that shall be traced. All trace messages will be written to this
-      port and end up in a binary file (the binary trace log).
+    <p><c>ttb:tracer/0/1/2</c> opens a trace port on each node
+      that shall be traced. By default, trace messages are written
+      to binary files on remote nodes(the binary trace log).
       </p>
-    <p><c>ttb:p/2</c> specifies which processes that shall be
-      traced. Trace flags given in this call specifies what to trace on
+    <p><c>ttb:p/2</c> specifies which processes shall be
+      traced. Trace flags given in this call specify what to trace on
       each process. You can call this function several times if you like
       different trace flags to be set on different processes.
       </p>
@@ -105,14 +108,15 @@
 -export([f/0]).
 f() ->
    receive 
-      From when pid(From) -> 
+      From when is_pid(From) ->
          Now = erlang:now(),
          From ! {self(),Now}
    end.      </code>
       <p>The following example shows the basic use of <c>ttb</c> from
         the erlang shell. Default options are used both for starting the
-        tracer and for formatting. This gives a trace log named
-        <c>Node-ttb</c>, where <c>Node</c> is the name of the node.  The
+        tracer and for formatting (the custom fetch dir is however provided).
+        This gives a trace log named <c>Node-ttb</c> in the newly-created
+        directory, where <c>Node</c> is the name of the node.  The
         default handler prints the formatted trace messages in the
         shell.</p>
       <code type="none"><![CDATA[
@@ -131,11 +135,11 @@ f() ->
 (tiger@durin)50> 
 (tiger@durin)50> %% Here I set a trace pattern on erlang:now/0
 (tiger@durin)50> %% The trace pattern is a simple match spec
-(tiger@durin)50> %% generated by dbg:fun2ms/1. It indicates that 
-(tiger@durin)50> %% the return value shall be traced.
-(tiger@durin)50> MS = dbg:fun2ms(fun(_) -> return_trace() end).
-[{'_',[],[{return_trace}]}]
-(tiger@durin)51> ttb:tp(erlang,now,MS).
+(tiger@durin)50> %% indicating that the return value should be
+(tiger@durin)50> %% traced. Refer to the reference_manual for
+(tiger@durin)50> %% the full list of match spec shortcuts
+(tiger@durin)50> %% available.
+(tiger@durin)51> ttb:tp(erlang,now,return).
 {ok,[{matched,tiger@durin,1},{saved,1}]}
 (tiger@durin)52> 
 (tiger@durin)52> %% I run my test (i.e. send a message to
@@ -145,11 +149,11 @@ f() ->
 (tiger@durin)53> 
 (tiger@durin)53> %% And then I have to stop ttb in order to flush
 (tiger@durin)53> %% the trace port buffer
-(tiger@durin)53> ttb:stop().
-stopped
+(tiger@durin)53> ttb:stop([return, {fetch_dir, "fetch"}]).
+{stopped, "fetch"}
 (tiger@durin)54> 
 (tiger@durin)54> %% Finally I format my trace log
-(tiger@durin)54> ttb:format("tiger@durin-ttb").
+(tiger@durin)54> ttb:format("fetch").
 ({<0.125.0>,{m,f,0},tiger@durin}) call erlang:now()
 ({<0.125.0>,{m,f,0},tiger@durin}) returned from erlang:now/0 ->
 {1031,133451,667611}
@@ -166,11 +170,9 @@ ok      ]]></code>
 -module(mydebug).
 -export([start/0,trc/1,stop/0,format/1]).
 -export([print/4]).
-
 %% Include ms_transform.hrl so that I can use dbg:fun2ms/2 to
 %% generate match specifications.
 -include_lib("stdlib/include/ms_transform.hrl").
-
 %%% -------------Tool API-------------
 %%% ----------------------------------
 %%% Star the "mydebug" tool
@@ -180,28 +182,28 @@ start() ->
     %% module shall be used as format handler
     ttb:tracer(all,[{file,"debug_log"},{handler,{{?MODULE,print},0}}]),
     %% All processes (existing and new) shall trace function calls
-    %% and include a timestamp in each trace message
-    ttb:p(all,[call,timestamp]).
+    %% We want trace messages to be sorted upon format, which requires
+    %% timestamp flag. The flag is however enabled by default in ttb.
+    ttb:p(all,call).
 
 %%% Set trace pattern on function(s)
-trc(M) when atom(M) ->
+trc(M) when is_atom(M) ->
     trc({M,'_','_'});
-trc({M,F}) when atom(M), atom(F) ->
+trc({M,F}) when is_atom(M), is_atom(F) ->
     trc({M,F,'_'});
-trc({M,F,_A}=MFA) when atom(M), atom(F) ->
-    %% This match spec specifies that return values shall 
-    %% be traced. NOTE that ms_transform.hrl must be included
-    %% if dbg:fun2ms/1 shall be used!
+trc({M,F,_A}=MFA) when is_atom(M), is_atom(F) ->
+    %% This match spec shortcut specifies that return values shall
+    %% be traced.
     MatchSpec = dbg:fun2ms(fun(_) -> return_trace() end),
     ttb:tpl(MFA,MatchSpec).
 
 %%% Format a binary trace log
-format(File) ->
-    ttb:format(File).
+format(Dir) ->
+    ttb:format(Dir).
 
 %%% Stop the "mydebug" tool
 stop() ->
-    ttb:stop().
+    ttb:stop(return).
 
 %%% --------Internal functions--------
 %%% ----------------------------------
@@ -226,9 +228,9 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
               [N,Ts,P,M,F,A,R]).      ]]></code>
       <p>To distinguish trace logs produced with this tool from other
         logs, the <c>file</c> option is used in <c>tracer/2</c>. The
-        logs will therefore be named <c>Node-debug_log</c>, where
-        <c>Node</c> is the name of the node where the log is produced.
-        </p>
+        logs will therefore be fetched to a directory named
+        <c>ttb_upload_debug_log-YYYYMMDD-HHMMSS</c>
+      </p>
       <p>By using the <c>handler</c> option when starting the tracer,
         the information about how to format the file is stored in the
         trace information file (<c>.ti</c>). This is not necessary, as
@@ -278,13 +280,157 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
         must be given to the <c>tracer/2</c> function with the value
         <c>{local, File}</c>, e.g.</p>
       <code type="none">
-(trace_control@durin)1> ttb:tracer(mynode@diskless,[{file,{local,
-{wrap,"mytrace"}}}]).
+(trace_control@durin)1> ttb:tracer(mynode@diskless,{file,{local,
+{wrap,"mytrace"}}}).
 {ok,[mynode@diskless]}      </code>
     </section>
   </section>
 
   <section>
+    <title>Additional tracing options</title>
+    <p>When setting up a trace, several features may be turned on:</p>
+      <list type="bulleted">
+        <item>time-constrained tracing,</item>
+        <item>overload protection,</item>
+        <item>autoresuming.</item>
+      </list>
+      <section>
+        <title>Time-constrained tracing</title>
+        <p>Sometimes, it may be helpful to enable trace for a
+          given period of time (i.e. to monitor a system for 24 hours
+          or half of a second). This may be done by issuing additional
+          <c>{timer, TimerSpec}</c> option. If <c>TimerSpec</c> has the
+          form of <c>MSec</c>, the trace is stopped after <c>MSec</c>
+          milliseconds using <c>ttb:stop/0</c>. If any additional options
+          are provided (<c>TimerSpec = {MSec, Opts}</c>), <c>ttb:stop/1</c>
+          is called instead with <c>Opts</c> as the arguments. The timer
+          is started with <c>ttb:p/2</c>, so any trace patterns should
+          be set up before. <c>ttb:start_trace/4</c>
+          always sets up all pattern before invoking <c>ttb:p/2</c>.
+          Note that due to network and processing delays the the period
+          of tracing is approximate.
+          The example below shows how to set up a trace which will be
+          automatically stopped and formatted after 5 seconds
+        </p><code>
+(tiger@durin)1>ttb:start_trace([node()],
+                               [{erlang, now,[]}],
+                               {all, call},
+                               [{timer, {5000, format}}]).
+</code>
+        </section>
+        <section>
+          <label>Overload protection</label>
+          <p>When tracing live systems, special care needs to be always taken
+            not to overload a node with too heavy tracing. <c>ttb</c> provides
+            the <c>overload</c> option to help to address the problem.</p>
+          <p><c>{overload, MSec, Module, Function}</c> instructs the ttb backend
+            (called <c>observer_backend</c>, part of the <c>runtime_tools</c>
+            application) to perform overload check every <c>MSec</c> milliseconds.
+            If the check (namely <c>Module:Function(check)</c>) returns
+            <c>true</c>, tracing is disabled on the selected node.</p>
+          <p>Overload protection activated on one node does not
+            affect other nodes, where the tracing continues as normal.
+            <c>ttb:stop/0/1</c> fetches data from all clients, including everything
+            that has been collected before overload protection was activated.
+            Note that
+            changing trace details (with <c>ttb:p</c> and <c>ttb:tp/tpl...</c>)
+            once overload protection gets activated in one of the traced
+            nodes is not permitted in order not to allow trace setup
+            to be inconsistent between nodes.
+          </p>
+          <p><c>Module:Function</c> provided with the <c>overload</c> option must
+            handle three calls: <c>init</c>, <c>check</c> and <c>stop</c>. <c>init</c>
+            and <c>stop</c> allows to perform some setup and teardown required by
+            the check. An overload check module could look like this (note that
+            <c>check</c> is always called by the same process, so <c>put</c> and
+            <c>get</c> are possible).
+          </p><code>
+-module(overload).
+-export([check/1]).
+
+check(init) ->
+    Pid = sophisticated_module:start(),
+    put(pid, Pid);
+check(check) ->
+    get(pid) ! is_overloaded,
+    receive
+        Reply ->
+            Reply
+    after 5000 ->
+            true
+    end;
+check(stop) ->
+    get(pid) ! stop.</code>
+        </section>
+        <section>
+          <title>Autoresume</title>
+          <p>It is possible that a node (probably a buggy one, hence traced)
+            crashes. In order to automatically resume tracing on the node
+            as soon as it gets back, <c>resume</c> has to be used. When
+            it is, the failing node tries to reconnect
+            to trace control node as soon as <c>runtime tools</c> is started.
+            This implies that <c>runtime_tools</c> must be included in
+            other node's startup chain (if it is not, one could still
+            resume tracing by starting <c>runtime_tools</c> manually,
+            i.e. by an RPC call).</p>
+          <p>In order not to loose the data that the failing node stored
+            up to the point of crash, the control node will try to fetch
+            it before restarting trace. This must happen within the allowed
+            time frame or is aborted (default is 10 seconds, can be customized with
+            <c>{resume, MSec}</c>). The data fetched this way is then
+            merged with all other traces.</p>
+          <p>Autostart feature requires additional data to be stored on
+            traced nodes. By default, the data is stored automatically
+            to the file called "ttb_autostart.bin" in the traced node's cwd.
+            Users may decide to change this behaviour (i.e. on diskless
+            nodes) by specifying their own module to handle autostart data
+            storage and retrieval (<c>ttb_autostart_module</c>
+            environment variable of <c>runtime_tools</c>). Please see the
+            ttb's reference manual to see the module's API. This example
+            shows the default handler</p>
+          <code>
+-module(ttb_autostart).
+-export([read_config/0,
+         write_config/1,
+         delete_config/0]).
+
+-define(AUTOSTART_FILENAME, "ttb_autostart.bin").
+
+delete_config() ->
+    file:delete(?AUTOSTART_FILENAME).
+
+read_config() ->
+    case file:read_file(?AUTOSTART_FILENAME) of
+        {ok, Data} -> {ok, binary_to_term(Data)};
+        Error      -> Error
+    end.
+
+write_config(Data) ->
+    file:write_file(?AUTOSTART_FILENAME, term_to_binary(Data)).
+          </code>
+          <p>Remember that file trace ports buffer the data
+            by default. If the node crashes, trace messages are not
+            flushed to the binary log. If the chance of failure is
+            high, it might be a good idea to automatically flush
+            the buffers every now and then. Passing <c>{flush, MSec}</c>
+            as one of <c>ttb:tracer/2</c> option flushes all buffers
+            every <c>MSec</c> milliseconds.</p>
+        </section>
+        <section>
+          <title>dbg mode</title>
+          <p>The <c>{shell, ShellType}</c> option allows to make <c>ttb</c>
+            operation similar to <c>dbg</c>. Using <c>{shell, true}</c>
+            displays all trace messages in the shell before storing them.
+            <c>{shell, only}</c> additionally disables message storage
+            (so that the tool behaves exactly like dbg). This is allowed
+            only with ip trace ports (<c>{trace, {local, File}}</c>).
+          </p>
+          <p>The command <c>ttb:tracer(dbg)</c> is a shortcut for the pure-dbg
+            mode (<c>{shell, only}</c>).</p>
+        </section>
+  </section>
+
+  <section>
     <marker id="trace_info"></marker>
     <title>Trace Information and the .ti File</title>
     <p>In addition to the trace log file(s), a file with the extension
@@ -292,13 +438,9 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
       is the trace information file. It is a binary file, and it
       contains the process information, trace flags used, the name of
       the node to which it belongs and all information written with the
-      <c>write_trace_info/2</c> function.
-      </p>
-    <p>To be able to use all this information during formatting, it is
-      important that the trace information file exists in the same
-      directory as the trace log, and that it has the same name as the
-      trace log with the additional extension <c>.ti</c>.
-      </p>
+      <c>write_trace_info/2</c> function. .ti files are always fetched
+      with other logs when the trace is stopped.
+    </p>
     <p>Except for the process information, everything in the trace
       information file is passed on to the handler function when
       formatting. The <c>TI</c> parameter is a list of
@@ -327,7 +469,12 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
       each log. <c>ttb</c> will create a new binary log each time a log
       reaches the maximum size. When the the maximum number of logs are
       reached, the oldest log is deleted before a new one is created.
-      </p>
+    </p>
+    <p>Note that the overall size of data generated by ttb may be greater
+      than the wrap specification would suggest - if a traced node restarts
+      and autoresume is enabled, old wrap log is always stored and
+      a new one is created.
+    </p>
     <p>Wrap logs can be formatted one by one or all at once. See
       <seealso marker="#format">Formatting</seealso>.
       </p>
@@ -348,12 +495,10 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
       present the trace log graphically (see <seealso marker="#et_viewer">Presenting trace logs with Event Tracer</seealso>).
       </p>
     <p>The first argument to <c>ttb:format/1/2</c> specifies which
-      binary log(s) to format. This can be the name of one binary log, a
-      list of such logs or the name of a directory containing one or
-      more binary logs. If this argument indicates more than one log,
-      and the <c>timestamp</c> flag was set when tracing, the trace
-      messages from the different logs will be merged according to the
-      timestamps in each message.
+      binary log(s) to format. This is usually the name of a directory
+      that ttb created during log fetch. Unless there is the <c>disable_sort</c>
+      option provided, the logs from different files are always sorted
+      according to timestamp in traces.
       </p>
     <p>The second argument to <c>ttb:format/2</c> is a list of
       options. The <c>out</c> option specifies the destination where the
@@ -363,7 +508,10 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
       option is not given, the <c>handler</c> option given when starting
       the tracer is used. If the <c>handler</c> option was not given
       when starting the tracer either, a default handler is used, which
-      prints each trace message as a line of text.
+      prints each trace message as a line of text. The <c>disable_sort</c>
+      option indicates that there logs should not be merged according to
+      timestamp, but processed one file after another (this might be
+      a bit faster).
       </p>
     <p>A format handler is a fun taking four arguments. This fun will
       be called for each trace message in the binary log(s). A simple
@@ -396,10 +544,24 @@ end    </code>
       <c>handle_gc/4</c> in the module <c>multitrace.erl</c> which can
       be found in the <c>src</c> directory of the Observer application.
       </p>
-    <p>By giving the format handler <c>et</c>, you can have the trace
+    <p>The actual trace message is passed as the second argument (<c>Trace</c>).
+      The possible values of <c>Trace</c> are:</p>
+      <list type="bulleted">
+        <item>all trace messages described in <c>erlang:trace/3</c> documentation,
+        </item>
+        <item><c>{drop, N}</c> if ip tracer is used (see <c>dbg:trace_port/2</c>),
+        </item>
+        <item><c>end_of_trace</c> received once when all trace messages have
+          been processed.</item>
+      </list>
+    <p>By giving the format handler <c>ttb:get_et_handler()</c>, you can have the trace
       log presented graphically with <c>et_viewer</c> in the Event
       Tracer application (see <seealso marker="#et_viewer">Presenting trace logs with Event Tracer</seealso>).
-      </p>
+    </p>
+    <p>You may always decide not to format the whole trace data contained
+      in the fetch directory, but analyze single files instead. In order
+      to do so, a single file (or list of files) have to be passed as
+      the first argument to <c>format/1/2</c>.</p>
     <p>Wrap logs can be formatted one by one or all in one go. To
       format one of the wrap logs in a set, give the exact name of the
       file. To format the whole set of wrap logs, give the name with '*'
@@ -407,7 +569,7 @@ end    </code>
       </p>
     <p>Start tracing:</p>
     <code type="none">
-(tiger@durin)1> ttb:tracer(node(),[{file,{wrap,"trace"}}]).
+(tiger@durin)1> ttb:tracer(node(),{file,{wrap,"trace"}}).
 {ok,[tiger@durin]}
 (tiger@durin)2> ttb:p(...)
 ...    </code>
@@ -443,7 +605,7 @@ ok
         to the User's Guide and Reference Manuals for the <c>et</c>
         application.
         </p>
-      <p>By giving the format handler <c>et</c>, you can have the
+      <p>By giving the format handler <c>ttb:get_et_handler()</c>, you can have the
         trace log presented graphically with <c>et_viewer</c> in the
         Event Tracer application. <c>ttb</c> provides a few different
         filters which can be selected from the Filter menu in the
@@ -495,9 +657,23 @@ ok
         filters respectively, except that each module or function can
         have several vertical lines, one for each process it resides on.
         </p>
-      <p>As an example this module is used, and the function
-        <c>bar:f1()</c> is called from another module <c>foo</c>.</p>
+      <p>In the next example, modules <c>foo</c> and <c>bar</c> are used:</p>
       <code type="none">
+-module(foo).
+-export([start/0,go/0]).
+
+start() ->
+    spawn(?MODULE, go, []).
+
+go() ->
+    receive
+        stop ->
+            ok;
+        go ->
+            bar:f1(),
+            go()
+    end.
+</code><code type="none">
 -module(bar).
 -export([f1/0,f3/0]).
 f1() ->
@@ -506,12 +682,23 @@ f1() ->
 f2() ->
     spawn(?MODULE,f3,[]).
 f3() ->
-    ok.      </code>
-      <p>The <c>call</c> and <c>return_to</c> flags are used, and
-        trace pattern is set on local calls in module <c>bar</c>.
-        </p>
-      <p><c>ttb:format("tiger@durin-ttb", [{handler, et}])</c> gives the
-        following result:
+    ok.</code>
+
+      <p>Now let's set up the trace.</p>
+<code>
+(tiger@durin)1>%%First we retrieve the Pid to limit traced processes set
+(tiger@durin)1>Pid = foo:start().
+(tiger@durin)2>%%Now we set up tracing
+(tiger@durin)2>ttb:tracer().
+(tiger@durin)3>ttb:p(Pid, [call, return_to, procs, set_on_spawn]).
+(tiger@durin)4>ttb:tpl(bar, []).
+(tiger@durin)5>%%Invoke our test function and see output with et viewer
+(tiger@durin)5>Pid ! go.
+(tiger@durin)6>ttb:stop({format, {handler, ttb:get_et_handler()}}).
+</code>
+
+      <p>This shoud render a result similar to the
+        following:
         </p>
       <p></p>
       <image file="et_processes.gif">
@@ -520,25 +707,37 @@ f3() ->
       <image file="et_modsprocs.gif">
         <icaption>Filter: "mods_and_procs"</icaption>
       </image>
+
+      <p>Note, that we can use <c>ttb:start_trace/4</c> function to help
+        us here:</p>
+<code>
+(tiger@durin)1>Pid = foo:start().
+(tiger@durin)2>ttb:start_trace([node()],
+                               [{bar,[]}],
+                               {Pid, [call, return_to, procs, set_on_spawn]}
+                               {handler, ttb:get_et_handler()}).
+(tiger@durin)3>Pid ! go.
+(tiger@durin)4>ttb:stop(format).
+</code>
+
     </section>
   </section>
 
   <section>
     <marker id="fetch_format"></marker>
     <title>Automatically collect and format logs from all nodes</title>
-    <p>If the option <c>fetch</c> is given to the <c>ttb:stop/1</c>
-      function, trace logs and trace information files are fetched
-      from all nodes after tracing is stopped. The logs are stored in a
-      new directory named <c>ttb_upload-Timestamp</c> under the working
-      directory of the trace control node.
+    <p>By default <c>ttb:stop/1</c> fetches  trace logs and
+      trace information files from all nodes. The logs are stored in a
+      new directory named <c>ttb_upload-Filename-Timestamp</c> under the working
+      directory of the trace control node. Fetching may be disabled by
+      providing the <c>nofetch</c> option to <c>ttb:stop/1</c>. User can
+      specify a fetch directory of his choice passing the
+      <c>{fetch_dir, Dir}</c> option.
       </p>
     <p>If the option <c>format</c> is given to <c>ttb:stop/1</c>, the
       trace logs are automatically formatted after tracing is
-      stopped. Note that <c>format</c> also implies <c>fetch</c>,
-      i.e. the trace logs will be collected from all nodes as for the
-      <c>fetch</c> option before they are formatted. All logs in the
-      upload directory are merged during formatting.
-      </p>
+      stopped.
+    </p>
   </section>
 
   <section>
@@ -546,13 +745,18 @@ f3() ->
     <p>For the tracing functionality, <c>dbg</c> could be used instead
       of the <c>ttb</c> for setting trace flags on processes and trace
       patterns for call trace, i.e. the functions <c>p</c>, <c>tp</c>,
-      <c>tpl</c>, <c>ctp</c>, <c>ctpl</c> and <c>ctpg</c>. The only
-      thing added by <c>ttb</c> for these functions is that all calls
-      are stored in the history buffer and can be recalled and stored in
-      a configuration file. This makes it easy to setup the same trace
-      environment e.g. if you want to compare two test runs. It also
-      reduces the amount of typing when using <c>ttb</c> from the erlang
-      shell.
+      <c>tpl</c>, <c>ctp</c>, <c>ctpl</c> and <c>ctpg</c>. There are only
+      two things added by <c>ttb</c> for these functions:
+      <list type="bulleted">
+        <item>all calls  are stored in the history buffer and can be
+          recalled and stored in a configuration file. This makes it
+          easy to setup the same trace environment e.g. if you want to
+          compare two test runs. It also reduces the amount of
+          typing when using <c>ttb</c> from the erlang shell;</item>
+        <item>shortcuts are provided for the most common match
+          specifications (in order not to force the user to use
+          <c>dbg:fun2ms</c> continually</item>).
+      </list>
       </p>
     <p>Use <c>list_history/0</c> to see the content of the history
       buffer, and <c>run_history/1</c> to re-execute one of the entries.
@@ -574,7 +778,8 @@ f3() ->
       selected entries from the history by calling
       <c>ttb:write_config(ConfigFile,NumList)</c>, where
       <c>NumList</c> is a list of integers pointing out the history
-      entries to write.
+      entries to write. Moreover, the history buffer is always dumped
+      to <c>ttb_last_config</c> when <c>ttb:stop/0/1</c> is called.
       </p>
     <p>User defined entries can also be written to a config file by
       calling the function
@@ -720,9 +925,7 @@ ok
 {ok,[{matched,1},{saved,1}]}
 (tiger@durin)113> dbg:get_tracer(), seq_trace:reset_trace().         
 true
-(tiger@durin)114> ttb:stop().                                       
-ok
-(tiger@durin)115> ttb:format("tiger@durin-ttb").                    
+(tiger@durin)114> ttb:stop(format).
 ({<0.158.0>,{shell,evaluator,3},tiger@durin}) call dbg:get_tracer()
 SeqTrace [0]: ({<0.158.0>,{shell,evaluator,3},tiger@durin}) 
 {<0.237.0>,dbg,tiger@durin} ! {<0.158.0>,{get_tracer,tiger@durin}} 
@@ -743,9 +946,7 @@ ok
 (tiger@durin)117> seq_trace:set_token(send,true), dbg:get_tracer(), 
 seq_trace:reset_trace().
 true
-(tiger@durin)118> ttb:stop().
-ok
-(tiger@durin)119> ttb:format("tiger@durin-ttb").
+(tiger@durin)118> ttb:stop(format).
 SeqTrace [0]: ({<0.158.0>,{shell,evaluator,3},tiger@durin}) 
 {<0.246.0>,dbg,tiger@durin} ! {<0.158.0>,{get_tracer,tiger@durin}} 
 [Serial: {0,1}]
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index 2d06cb6bc4..3875b62101 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -56,13 +56,16 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
 PRIVDIR= ../priv
 WEBTOOLFILES= $(PRIVDIR)/crashdump_viewer.tool
 BINDIR= $(PRIVDIR)/bin
+ifeq ($(findstring win32,$(TARGET)),win32)
+WIN32_EXECUTABLES= $(BINDIR)/etop.bat $(BINDIR)/getop.bat $(BINDIR)/cdv.bat
+else
+WIN32_EXECUTABLES=
+endif
 EXECUTABLES= \
 	$(BINDIR)/etop \
 	$(BINDIR)/getop \
 	$(BINDIR)/cdv \
-	$(BINDIR)/etop.bat \
-	$(BINDIR)/getop.bat \
-	$(BINDIR)/cdv.bat
+	$(WIN32_EXECUTABLES)
 CDVDIR= $(PRIVDIR)/crashdump_viewer
 GIF_FILES= \
 	$(CDVDIR)/collapsd.gif \
diff --git a/lib/observer/src/ttb.erl b/lib/observer/src/ttb.erl
index 221b71df6a..1471be92e5 100644
--- a/lib/observer/src/ttb.erl
+++ b/lib/observer/src/ttb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. 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
@@ -18,9 +18,11 @@
 %%
 -module(ttb).
 -author('[email protected]').
+-author('[email protected]').
 
 %% API
--export([tracer/0,tracer/1,tracer/2,p/2,stop/0,stop/1]).
+-export([tracer/0,tracer/1,tracer/2,p/2,stop/0,stop/1,start_trace/4]).
+-export([get_et_handler/0]).
 -export([tp/2, tp/3, tp/4, ctp/0, ctp/1, ctp/2, ctp/3, tpl/2, tpl/3, tpl/4, 
 	 ctpl/0, ctpl/1, ctpl/2, ctpl/3, ctpg/0, ctpg/1, ctpg/2, ctpg/3]).
 -export([seq_trigger_ms/0,seq_trigger_ms/1]).
@@ -34,24 +36,38 @@
 
 -include_lib("kernel/include/file.hrl").
 -define(meta_time,5000).
+-define(fetch_time, 10000).
 -define(history_table,ttb_history_table).
 -define(seq_trace_flags,[send,'receive',print,timestamp]).
--define(upload_dir,"ttb_upload").
+-define(upload_dir(Logname),"ttb_upload_"++Logname).
+-define(last_config, "ttb_last_config").
+-define(partial_dir, "ttb_partial_result").
 -ifdef(debug).
--define(get_status,;get_status -> erlang:display(dict:to_list(NodeInfo)),loop(NodeInfo)).
+-define(get_status,;get_status -> erlang:display(dict:to_list(NodeInfo),loop(NodeInfo, TraceInfo)).
 -else.
 -define(get_status,).
 -endif.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Shortcut
+start_trace(Nodes, Patterns, {Procs, Flags}, Options) ->
+    {ok, _} = tracer(Nodes, Options),
+    [{ok, _} = apply(?MODULE, tpl, tuple_to_list(Args)) || Args <- Patterns],
+    {ok, _} = p(Procs, Flags).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Open a trace port on all given nodes and create the meta data file
 tracer() -> tracer(node()).
+tracer(shell) -> tracer(node(), shell);
+tracer(dbg) -> tracer(node(), {shell, only});
 tracer(Nodes) -> tracer(Nodes,[]).
 tracer(Nodes,Opt) ->
-    start(),
-    store(tracer,[Nodes,Opt]),
     {PI,Client,Traci} = opt(Opt),
-    do_tracer(Nodes,PI,Client,Traci).
+    %%We use initial Traci as SessionInfo for loop/2
+    Pid = start(Traci),
+    store(tracer,[Nodes,Opt]),
+    do_tracer(Nodes,PI,Client,[{ttb_control, Pid}|Traci]).
 
 do_tracer(Nodes0,PI,Client,Traci) ->
     Nodes = nods(Nodes0),
@@ -59,9 +75,14 @@ do_tracer(Nodes0,PI,Client,Traci) ->
     do_tracer(Clients,PI,Traci).
 
 do_tracer(Clients,PI,Traci) ->
+    ShellOutput = proplists:get_value(shell, Traci, false),
     {ClientSucc,Succ} = 
 	lists:foldl(
 	  fun({N,{local,File},TF},{CS,S}) -> 
+                  TF2 = case ShellOutput of
+                            only -> none;
+                            _    -> TF
+                        end,
 		  [_Sname,Host] = string:tokens(atom_to_list(N),"@"),
 		  case catch dbg:tracer(N,port,dbg:trace_port(ip,0)) of
 		      {ok,N} ->
@@ -69,8 +90,8 @@ do_tracer(Clients,PI,Traci) ->
 			  {ok,T} = dbg:get_tracer(N),
 			  rpc:call(N,seq_trace,set_system_tracer,[T]),
 			  dbg:trace_client(ip,{Host,Port},
-					   {fun ip_to_file/2,{file,File}}),
-			  {[{N,{local,File,Port},TF}|CS], [N|S]};
+					   {fun ip_to_file/2,{{file,File}, ShellOutput}}),
+			  {[{N,{local,File,Port},TF2}|CS], [N|S]};
 		      Other ->
 			  display_warning(N,{cannot_open_ip_trace_port,
 					     Host,
@@ -98,17 +119,54 @@ do_tracer(Clients,PI,Traci) ->
 	    {ok,Succ}
     end.
 
+opt(Opt) when is_list(Opt) ->
+    opt(Opt,{true,?MODULE,[]});
 opt(Opt) ->
-    opt(Opt,{true,?MODULE,[]}).
+    opt([Opt]).
 
 opt([{process_info,PI}|O],{_,Client,Traci}) ->
     opt(O,{PI,Client,Traci});
 opt([{file,Client}|O],{PI,_,Traci}) ->
-    opt(O,{PI,Client,Traci});
+    opt(O,{PI,Client,[{logfile,get_logname(Client)}|Traci]});
 opt([{handler,Handler}|O],{PI,Client,Traci}) ->
     opt(O,{PI,Client,[{handler,Handler}|Traci]});
+opt([{timer, {MSec, StopOpts}}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{timer,{MSec, StopOpts}}|Traci]});
+opt([{timer, MSec}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{timer,{MSec, []}}|Traci]});
+opt([{overload_check, {MSec,M,F}}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{overload_check,{MSec,M,F}}|Traci]});
+opt([shell|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{shell, true}|Traci]});
+opt([{shell,Type}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{shell, Type}|Traci]});
+opt([resume|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{resume, {true, ?fetch_time}}|Traci]});
+opt([{resume,MSec}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{resume, {true, MSec}}|Traci]});
+opt([{flush,MSec}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{flush, MSec}|Traci]});
 opt([],Opt) ->
-    Opt.
+    ensure_opt(Opt).
+
+ensure_opt({PI,Client,Traci}) ->
+    case {proplists:get_value(flush, Traci), Client} of
+        {undefined, _}  -> ok;
+        {_, {local, _}} -> exit(flush_unsupported_with_ip_trace_port);
+        {_,_}           -> ok
+    end,
+    NeedIpTracer = proplists:get_value(shell, Traci, false) /= false,
+    case {NeedIpTracer, Client} of
+        {false, _}        -> {PI, Client, Traci};
+        {true, ?MODULE}       -> {PI, {local, ?MODULE}, Traci};
+        {true, {local, File}} -> {PI, {local, File}, Traci};
+        {true, _}             -> exit(local_client_required_on_shell_tracing)
+    end.
+
+get_logname({local, F}) -> get_logname(F);
+get_logname({wrap, F}) -> filename:basename(F);
+get_logname({wrap, F, _, _}) -> filename:basename(F);
+get_logname(F) -> filename:basename(F).
 
 nods(all) ->
     Nodes1 = remove_active([node()|nodes()]),
@@ -205,17 +263,29 @@ run_history([H|T]) ->
 	ok -> run_history(T);
 	{error,not_found} -> {error,{not_found,H}}
     end;
+
+run_history(all) ->
+    CurrentHist = ets:tab2list(?history_table),
+    ets:delete_all_objects(?history_table),
+    [run_printed(MFA,true) || {_, MFA} <- CurrentHist];
+run_history(all_silent) ->
+    CurrentHist = ets:tab2list(?history_table),
+    ets:delete_all_objects(?history_table),
+    [run_printed(MFA,false) || {_, MFA} <- CurrentHist];
 run_history([]) ->
     ok;
 run_history(N) ->
     case catch ets:lookup(?history_table,N) of
 	[{N,{M,F,A}}] -> 
-	    print_func(M,F,A),
-	    R = apply(M,F,A),
-	    print_result(R);
+            run_printed({M,F,A},true);
 	_ -> 
 	    {error, not_found}
     end.
+
+run_printed({M,F,A},Verbose) ->
+    Verbose andalso print_func(M,F,A),
+    R = apply(M,F,A),
+    Verbose andalso print_result(R).
 	
 write_config(ConfigFile,all) ->
     write_config(ConfigFile,['_']);
@@ -223,6 +293,8 @@ write_config(ConfigFile,Config) ->
     write_config(ConfigFile,Config,[]).
 write_config(ConfigFile,all,Opt) ->
     write_config(ConfigFile,['_'],Opt);
+write_config(ConfigFile,Config,Opt) when not(is_list(Opt)) ->
+    write_config(ConfigFile,Config,[Opt]);
 write_config(ConfigFile,Nums,Opt) when is_list(Nums), is_integer(hd(Nums)); 
 				       Nums=:=['_'] ->
     F = fun(N) -> ets:select(?history_table,
@@ -313,6 +385,7 @@ arg_list([A1|A],Acc) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Set trace flags on processes
 p(Procs0,Flags0) ->
+    ensure_no_overloaded_nodes(),
     store(p,[Procs0,Flags0]),
     no_store_p(Procs0,Flags0).
 no_store_p(Procs0,Flags0) ->
@@ -327,11 +400,12 @@ no_store_p(Procs0,Flags0) ->
 					     {error,Reason} -> 
 						 display_warning(P,Reason),
 						 {PMatched,Ps}
-					 end
+						     end
 			     end,{[],[]},Procs) of
 		{[],[]} -> {error, no_match};
 		{SuccMatched,Succ} ->
 		    no_store_write_trace_info(flags,{Succ,Flags}),
+		    ?MODULE ! trace_started,
 		    {ok,SuccMatched}
 	    end
     end.
@@ -339,7 +413,7 @@ no_store_p(Procs0,Flags0) ->
 transform_flags([clear]) ->
     [clear];
 transform_flags(Flags) ->
-    dbg:transform_flags(Flags).
+    dbg:transform_flags([timestamp | Flags]).
 
 
 procs(Procs) when is_list(Procs) ->
@@ -365,24 +439,30 @@ proc({global,Name}) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Trace pattern
 tp(A,B) ->
-    store(tp,[A,B]),
-    dbg:tp(A,B).
+    ensure_no_overloaded_nodes(),
+    store(tp,[A,ms(B)]),
+    dbg:tp(A,ms(B)).
 tp(A,B,C) ->
-    store(tp,[A,B,C]),
-    dbg:tp(A,B,C).
+    ensure_no_overloaded_nodes(),
+    store(tp,[A,B,ms(C)]),
+    dbg:tp(A,B,ms(C)).
 tp(A,B,C,D) ->
-    store(tp,[A,B,C,D]),
-    dbg:tp(A,B,C,D).
+    ensure_no_overloaded_nodes(),
+    store(tp,[A,B,C,ms(D)]),
+    dbg:tp(A,B,C,ms(D)).
 
 tpl(A,B) ->
-    store(tpl,[A,B]),
-    dbg:tpl(A,B).
+    ensure_no_overloaded_nodes(),
+    store(tpl,[A,ms(B)]),
+    dbg:tpl(A,ms(B)).
 tpl(A,B,C) ->
-    store(tpl,[A,B,C]),
-    dbg:tpl(A,B,C).
+    ensure_no_overloaded_nodes(),
+    store(tpl,[A,B,ms(C)]),
+    dbg:tpl(A,B,ms(C)).
 tpl(A,B,C,D) ->
-    store(tpl,[A,B,C,D]),
-    dbg:tpl(A,B,C,D).
+    ensure_no_overloaded_nodes(),
+    store(tpl,[A,B,C,ms(D)]),
+    dbg:tpl(A,B,C,ms(D)).
 
 ctp() ->
     store(ctp,[]),
@@ -423,6 +503,56 @@ ctpg(A,B,C) ->
     store(ctpg,[A,B,C]),
     dbg:ctpg(A,B,C).
 
+ms(return) ->
+    [{'_',[],[{return_trace}]}];
+ms(caller) ->
+    [{'_',[],[{message,{caller}}]}];
+ms({codestr, FunStr}) ->
+    {ok, MS} = string2ms(FunStr),
+    MS;
+ms(Other) ->
+    Other.
+
+ensure_no_overloaded_nodes() ->
+    Overloaded = case whereis(?MODULE) of
+                     undefined ->
+                         [];
+                     _ ->
+                         ?MODULE ! {get_overloaded, self()},
+                         receive {overloaded,O} -> O end
+                 end,
+    case Overloaded of
+        [] -> ok;
+        Overloaded -> exit({error, overload_protection_active, Overloaded})
+    end.
+
+-spec string2ms(string()) -> {ok, list()} | {error, fun_format}.
+string2ms(FunStr) ->
+    case erl_scan:string(fix_dot(FunStr)) of
+	{ok, Tokens, _} ->
+	    case erl_parse:parse_exprs(Tokens) of
+		{ok, [Expression]} ->
+		    case Expression of
+			{_, _, {clauses, Clauses}} ->
+			    {ok, ms_transform:transform_from_shell(dbg, Clauses, [])};
+			_ ->
+			    {error, fun_format}
+		    end;
+		_ ->
+		    {error, fun_format}
+	    end;
+	_ ->{error, fun_format}
+    end.
+
+-spec fix_dot(string()) -> string().
+fix_dot(FunStr) ->
+    [H | Rest]  = lists:reverse(FunStr),
+    case H of
+	$. ->
+	    FunStr;
+	H ->
+	    lists:reverse([$., H | Rest])
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Support for sequential trace
@@ -457,66 +587,114 @@ no_store_write_trace_info(Key,What) ->
 %%% Stop tracing on all nodes
 stop() ->
     stop([]).
-stop(Opts) ->
+stop(Opts) when is_list(Opts) ->
     Fetch = stop_opts(Opts),
-    case whereis(?MODULE) of
-	undefined -> ok;
-	Pid when is_pid(Pid) -> 
-	    ?MODULE ! {stop,Fetch,self()},
-	    receive {?MODULE,stopped} -> ok end
+    Result =
+        case whereis(?MODULE) of
+            undefined -> ok;
+            Pid when is_pid(Pid) ->
+                ?MODULE ! {stop,Fetch,self()},
+                receive {?MODULE,R} -> R end
+        end,
+    case {Fetch, Result} of
+        {nofetch, _} ->
+            ok;
+        {_, {stopped, _}} ->
+            %% Printout moved out of the ttb loop to avoid occasional deadlock
+            io:format("Stored logs in ~s~n", [element(2, Result)]);
+        {_, _} ->
+            ok
     end,
-    stopped.
+    stop_return(Result,Opts);
+stop(Opts) ->
+    stop([Opts]).
 
 stop_opts(Opts) ->
-    case lists:member(format,Opts) of
-	true -> 
-	    format; % format implies fetch
-	false -> 
-	    case lists:member(fetch,Opts) of
-		true -> fetch;
-		false -> nofetch
-	    end
+    FetchDir = proplists:get_value(fetch_dir, Opts),
+    ensure_fetch_dir(FetchDir),
+    FormatData = case proplists:get_value(format, Opts) of
+                     undefined -> false;
+                     true ->      {format, []};
+                     FOpts ->     {format, FOpts}
+                 end,
+    case {FormatData, lists:member(return_fetch_dir, Opts)} of
+	{false, true} ->
+	    {fetch, FetchDir}; % if we specify return_fetch_dir, the data should be fetched
+    {false, false} ->
+	    case lists:member(nofetch,Opts) of
+		    false -> {fetch, FetchDir};
+		    true -> nofetch
+	    end;
+    {FormatData, _} ->
+            {FormatData, FetchDir}
+    end.
+
+ensure_fetch_dir(undefined) -> ok;
+ensure_fetch_dir(Dir) ->
+    case filelib:is_file(Dir) of
+	true ->
+	    throw({error, exists, Dir});
+	false ->
+	   ok
+    end.
+
+stop_return(R,Opts) ->
+    case {lists:member(return_fetch_dir,Opts),R} of
+        {true,_} ->
+            R;
+        {false,{stopped,_}} ->
+            stopped;
+        {false,_} ->
+            %% Anything other than 'stopped' would not be bw compatible...
+            stopped
     end.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Process implementation
-start() ->
+start(SessionInfo) ->
     case whereis(?MODULE) of
 	undefined ->
 	    Parent = self(),
-	    Pid = spawn(fun() -> init(Parent) end),
-	    receive {started,Pid} -> ok end;
+	    Pid = spawn(fun() -> init(Parent, SessionInfo) end),
+	    receive {started,Pid} -> ok end,
+            Pid;
 	Pid when is_pid(Pid) ->
-	    ok
+	    Pid
     end.
 
-
-init(Parent) ->
+init(Parent, SessionInfo) ->
     register(?MODULE,self()),
     ets:new(?history_table,[ordered_set,named_table,public]),
     Parent ! {started,self()},
-    loop(dict:new()).
+    NewSessionInfo = [{partials, 0}, {dead_nodes, []} | SessionInfo],
+    try_send_flush_tick(NewSessionInfo),
+    loop(dict:new(), NewSessionInfo).
 
-loop(NodeInfo) ->
+loop(NodeInfo, SessionInfo) ->
     receive 
 	{init_node,Node,MetaFile,PI,Traci} ->
 	    erlang:monitor_node(Node,true),
-	    MetaPid = 
+	    {AbsoluteMetaFile, MetaPid} =
 		case rpc:call(Node,
 			      observer_backend,
 			      ttb_init_node,
 			      [MetaFile,PI,Traci]) of
-		    {ok,MP} ->
-			MP;
+		    {ok,MF,MP} ->
+			{MF,MP};
 		    {badrpc,nodedown} ->
 			%% We will get a nodedown message
-			undefined
+			{MetaFile,undefined}
 		end,
-	    loop(dict:store(Node,{MetaFile,MetaPid},NodeInfo));
+	    loop(dict:store(Node,{AbsoluteMetaFile,MetaPid},NodeInfo), SessionInfo);
+	{ip_to_file_trace_port,Port,Sender} ->
+	    Ports = proplists:get_value(ip_to_file_trace_ports, SessionInfo, []),
+	    NewSessionInfo = [{ip_to_file_trace_ports,[Port|Ports]}|SessionInfo],
+	    Sender ! {?MODULE,ok},
+	    loop(NodeInfo, NewSessionInfo);
 	{get_nodes,Sender} ->
 	    Sender ! {?MODULE,dict:fetch_keys(NodeInfo)},
-	    loop(NodeInfo);
+	    loop(NodeInfo, SessionInfo);
 	{write_trace_info,Key,What} ->
 	    dict:fold(fun(Node,{_MetaFile,MetaPid},_) -> 
 			      rpc:call(Node,observer_backend,
@@ -524,55 +702,136 @@ loop(NodeInfo) ->
 		      end,
 		      ok,
 		      NodeInfo),
-	    loop(NodeInfo);
+	    loop(NodeInfo, SessionInfo);
 	{nodedown,Node} ->
-	    loop(dict:erase(Node,NodeInfo));
+            NewState = make_node_dead(Node, NodeInfo, SessionInfo),
+	    loop(dict:erase(Node,NodeInfo), NewState);
+        {noderesumed,Node,Reporter} ->
+            {MetaFile, CurrentSuffix, NewState} = make_node_alive(Node, SessionInfo),
+            fetch_partial_result(Node, MetaFile, CurrentSuffix),
+            spawn(fun() -> resume_trace(Reporter) end),
+            loop(NodeInfo, NewState);
+	{timeout, StopOpts} ->
+	    spawn(?MODULE, stop, [StopOpts]),
+	    loop(NodeInfo, SessionInfo);
+        {node_overloaded, Node} ->
+            io:format("Overload check activated on node: ~p.~n", [Node]),
+            {Overloaded, SI} = {proplists:get_value(overloaded, SessionInfo, []),
+                                lists:keydelete(overloaded, 1, SessionInfo)},
+	    loop(NodeInfo, [{overloaded, [Node|Overloaded]} | SI]);
+        {get_overloaded, Pid} ->
+            Pid ! {overloaded,proplists:get_value(overloaded, SessionInfo, [])},
+            loop(NodeInfo, SessionInfo);
+	trace_started ->
+	    case proplists:get_value(timer, SessionInfo) of
+		undefined -> ok;
+		{MSec, StopOpts}  -> erlang:send_after(MSec, self(), {timeout, StopOpts})
+	    end,
+	    loop(NodeInfo, SessionInfo);
+        flush_timeout ->
+            [ dbg:flush_trace_port(Node) || Node <- dict:fetch_keys(NodeInfo) ],
+            try_send_flush_tick(SessionInfo),
+            loop(NodeInfo, SessionInfo);
 	{stop,nofetch,Sender} ->
-	    dict:fold(
-	      fun(Node,{_,MetaPid},_) -> 
-		      rpc:call(Node,observer_backend,ttb_stop,[MetaPid])
-	      end,
-	      ok,
-	      NodeInfo),
-	    dbg:stop_clear(),
-	    ets:delete(?history_table),
-	    Sender ! {?MODULE,stopped};
-	{stop,FetchOrFormat,Sender} ->
-	    Localhost = host(node()),
-	    Dir = ?upload_dir++ts(),
- 	    file:make_dir(Dir),
-	    %% The nodes are traversed twice here because
-	    %% the meta tracing in observer_backend must be
-	    %% stopped before dbg is stopped, and dbg must
-	    %% be stopped before the trace logs are moved orelse
-	    %% windows complains.
-	    AllNodesAndMeta = 
-		dict:fold(
-		  fun(Node,{MetaFile,MetaPid},Nodes) -> 
-			  rpc:call(Node,observer_backend,ttb_stop,[MetaPid]),
-			  [{Node,MetaFile}|Nodes]
-		  end,
-		  [],
-		  NodeInfo),
-	    dbg:stop_clear(),
-	    AllNodes = 
-		lists:map(
-		  fun({Node,MetaFile}) ->
-			  spawn(fun() -> fetch(Localhost,Dir,Node,MetaFile) end),
-			  Node
+            do_stop(nofetch, Sender, NodeInfo, SessionInfo);
+	{stop,FetchSpec,Sender} ->
+            case proplists:get_value(shell, SessionInfo, false) of
+                only -> do_stop(nofetch, Sender, NodeInfo, SessionInfo);
+                _    -> do_stop(FetchSpec, Sender, NodeInfo, SessionInfo)
+            end
+    end.
+
+do_stop(nofetch, Sender, NodeInfo, SessionInfo) ->
+    write_config(?last_config, all),
+    dict:fold(
+      fun(Node,{_,MetaPid},_) ->
+              rpc:call(Node,observer_backend,ttb_stop,[MetaPid])
+      end,
+      ok,
+      NodeInfo),
+    stop_ip_to_file_trace_ports(SessionInfo),
+    dbg:stop_clear(),
+    ets:delete(?history_table),
+    Sender ! {?MODULE, stopped};
+
+do_stop({FetchOrFormat, UserDir}, Sender, NodeInfo, SessionInfo) ->
+    write_config(?last_config, all),
+    Localhost = host(node()),
+    Dir = get_fetch_dir(UserDir, proplists:get_value(logfile, SessionInfo)),
+    file:make_dir(Dir),
+    %% The nodes are traversed twice here because
+    %% the meta tracing in observer_backend must be
+    %% stopped before dbg is stopped, and dbg must
+    %% be stopped before the trace logs are moved orelse
+    %% windows complains.
+    AllNodesAndMeta =
+        dict:fold(
+          fun(Node,{MetaFile,MetaPid},Nodes) ->
+                  rpc:call(Node,observer_backend,ttb_stop,[MetaPid]),
+                  [{Node,MetaFile}|Nodes]
+          end,
+          [],
+          NodeInfo),
+    stop_ip_to_file_trace_ports(SessionInfo),
+    dbg:stop_clear(),
+    AllNodes =
+        lists:map(
+          fun({Node,MetaFile}) ->
+                  spawn(fun() -> fetch_report(Localhost,Dir,Node,MetaFile) end),
+                  Node
+          end,
+          AllNodesAndMeta),
+    ets:delete(?history_table),
+    wait_for_fetch(AllNodes),
+    copy_partials(Dir, proplists:get_value(partials, SessionInfo)),
+    Absname = filename:absname(Dir),
+    case FetchOrFormat of
+        fetch -> ok;
+        {format, Opts} -> format(Dir, Opts)
+    end,
+    Sender ! {?MODULE,{stopped,Absname}}.
+
+stop_ip_to_file_trace_ports(SessionInfo) ->
+    lists:foreach(fun(Port) ->
+			  case lists:member(Port,erlang:ports()) of
+			      true ->
+				  dbg:deliver_and_flush(Port),
+				  erlang:port_close(Port);
+			      false ->
+				  ok
+			  end
 		  end,
-		  AllNodesAndMeta),
-	    ets:delete(?history_table),
-	    wait_for_fetch(AllNodes),
-	    io:format("Stored logs in ~s~n",[filename:absname(Dir)]),
-	    case FetchOrFormat of
-		format -> format(Dir);
-		fetch -> ok
-	    end,
-	    Sender ! {?MODULE,stopped}
-         ?get_status
+		  proplists:get_value(ip_to_file_trace_ports,SessionInfo,[])).
+
+
+make_node_dead(Node, NodeInfo, SessionInfo) ->
+    {MetaFile,_} = dict:fetch(Node, NodeInfo),
+    NewDeadNodes = [{Node, MetaFile} | proplists:get_value(dead_nodes, SessionInfo)],
+    [{dead_nodes, NewDeadNodes} | lists:keydelete(dead_nodes, 1, SessionInfo)].
+
+make_node_alive(Node, SessionInfo) ->
+            DeadNodes = proplists:get_value(dead_nodes, SessionInfo),
+            Partials = proplists:get_value(partials, SessionInfo),
+            {value, {_, MetaFile}, Dn2} = lists:keytake(Node, 1, DeadNodes),
+            SessionInfo2 = lists:keyreplace(dead_nodes, 1, SessionInfo, {dead_nodes, Dn2}),
+            {MetaFile, Partials + 1, lists:keyreplace(partials, 1, SessionInfo2, {partials, Partials + 1})}.
+
+try_send_flush_tick(State) ->
+    case proplists:get_value(flush, State) of
+        undefined ->
+            ok;
+        MSec ->
+            erlang:send_after(MSec, self(), flush_timeout)
     end.
 
+get_fetch_dir(undefined,undefined) -> ?upload_dir(?MODULE_STRING) ++ ts();
+get_fetch_dir(undefined,Logname) -> ?upload_dir(Logname) ++ ts();
+get_fetch_dir(Dir,_) -> Dir.
+
+resume_trace(Reporter) ->
+    ?MODULE:run_history(all_silent),
+    Reporter ! trace_resumed.
+
 get_nodes() ->
     ?MODULE ! {get_nodes,self()},
     receive {?MODULE,Nodes} -> Nodes end.
@@ -582,19 +841,40 @@ ts() ->
     io_lib:format("-~4.4.0w~2.2.0w~2.2.0w-~2.2.0w~2.2.0w~2.2.0w",
 		  [Y,M,D,H,Min,S]).
 
+copy_partials(_, 0) ->
+    ok;
+copy_partials(Dir, Num) ->
+    PartialDir = ?partial_dir ++ integer_to_list(Num),
+    file:rename(PartialDir, filename:join(Dir,PartialDir)),
+    copy_partials(Dir, Num - 1).
+
+fetch_partial_result(Node,MetaFile,Current) ->
+    DirName = ?partial_dir ++ integer_to_list(Current),
+    case file:list_dir(DirName) of
+        {error, enoent} ->
+            ok;
+        {ok, Files} ->
+            [ file:delete(filename:join(DirName, File)) || File <- Files ],
+            file:del_dir(DirName)
+    end,
+    file:make_dir(DirName),
+    fetch(host(node()), DirName, Node, MetaFile).
 
+fetch_report(Localhost, Dir, Node, MetaFile) ->
+    fetch(Localhost,Dir,Node,MetaFile),
+    ?MODULE ! {fetch_complete,Node}.
 
 fetch(Localhost,Dir,Node,MetaFile) ->
-    case host(Node) of
-	Localhost -> % same host, just move the files
-	    Files = rpc:call(Node,observer_backend,ttb_get_filenames,[MetaFile]),
+    case (host(Node) == Localhost) orelse is_local(MetaFile) of
+    true -> % same host, just move the files
+	    Files = get_filenames(Node,MetaFile),
 	    lists:foreach(
-	      fun(File0) ->
-		      File = filename:join(Dir,filename:basename(File0)),
-		      file:rename(File0,File)
-	      end,
-	      Files);
-	_Otherhost ->
+            fun(File0) ->
+                Dest = filename:join(Dir,filename:basename(File0)),
+                file:rename(File0, Dest)
+            end,
+        Files);
+	false ->
 	    {ok, LSock} = gen_tcp:listen(0, [binary,{packet,2},{active,false}]),
 	    {ok,Port} = inet:port(LSock),
 	    rpc:cast(Node,observer_backend,ttb_fetch,
@@ -603,8 +883,17 @@ fetch(Localhost,Dir,Node,MetaFile) ->
 	    receive_files(Dir,Sock,undefined),
 	    ok = gen_tcp:close(LSock),
 	    ok = gen_tcp:close(Sock)
-    end,
-    ?MODULE ! {fetch_complete,Node}.
+    end.
+
+is_local({local, _, _}) ->
+    true;
+is_local(_) ->
+    false.
+
+get_filenames(_N, {local,F,_}) ->
+    observer_backend:ttb_get_filenames(F);
+get_filenames(N, F) ->
+    rpc:call(N, observer_backend,ttb_get_filenames,[F]).
 
 receive_files(Dir,Sock,Fd) ->
     case gen_tcp:recv(Sock, 0) of
@@ -646,9 +935,16 @@ wait_for_fetch(Nodes) ->
 %%% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 write_info(Nodes,PI,Traci) ->
-    lists:foreach(fun({N,{local,C,_},F}) -> 
-			  MetaFile = F ++ ".ti",
-			  file:delete(MetaFile),
+    {ok, Cwd} = file:get_cwd(),
+    lists:foreach(fun({N,{local,C,_},F}) ->
+			  MetaFile = case F of
+                                         none ->
+                                             none;
+                                         F ->
+                                             AbsFile = filename:join(Cwd, F) ++ ".ti",
+                                             file:delete(AbsFile),
+                                             AbsFile
+                                     end,
 			  Traci1 = [{node,N},{file,C}|Traci],
 			  {ok,Port} = dbg:get_tracer(N),
 			  ?MODULE ! 
@@ -662,38 +958,35 @@ write_info(Nodes,PI,Traci) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Format binary trace logs
+get_et_handler() ->
+    {fun ttb_et:handler/4, initial}.
+
 format(Files) ->
     format(Files,[]).
 format(Files,Opt) ->
-    {Out,Handler} = format_opt(Opt),
+    {Out,Handler,DisableSort} = format_opt(Opt),
     ets:new(?MODULE,[named_table]),
-    format(Files,Out,Handler).
-format(File,Out,Handler) when is_list(File), is_integer(hd(File)) ->
+    format(Files,Out,Handler, DisableSort).
+format(File,Out,Handler,DisableSort) when is_list(File), is_integer(hd(File)) ->
     Files = 
 	case filelib:is_dir(File) of
 	    true ->  % will merge all files in the directory
-		MetaFiles = filelib:wildcard(filename:join(File,"*.ti")),
-		lists:map(fun(M) ->
-				  Sub = string:left(M,length(M)-3),
-				  case filelib:is_file(Sub) of
-				      true -> Sub;
-				      false -> Sub++".*.wrp"
-				  end
-			  end,
-			  MetaFiles);
+                List = filelib:wildcard(filename:join(File, ?partial_dir++"*")),
+                lists:append(collect_files([File | List]));
 	    false -> % format one file
 		[File]
 	end,
-    format(Files,Out,Handler);
-format(Files,Out,Handler) when is_list(Files), is_list(hd(Files)) ->
+    format(Files,Out,Handler,DisableSort);
+format(Files,Out,Handler,DisableSort) when is_list(Files), is_list(hd(Files)) ->
     StopDbg = case whereis(dbg) of
 		  undefined -> true;
 		  _ -> false
 	      end,
-    Details = lists:foldl(fun(File,Acc) -> [prepare(File,Handler)|Acc] end,
+    Details = lists:foldl(fun(File,Acc) -> [prepare(File)|Acc] end,
 			  [],Files),
     Fd = get_fd(Out),
-    R = do_format(Fd,Details),
+    RealHandler = get_handler(Handler, Files),
+    R = do_format(Fd,Details,DisableSort,RealHandler),
     file:close(Fd),
     ets:delete(?MODULE),
     case StopDbg of
@@ -702,7 +995,30 @@ format(Files,Out,Handler) when is_list(Files), is_list(hd(Files)) ->
     end,
     R.
 
-prepare(File,Handler) ->
+collect_files(Dirs) ->
+    lists:map(fun(Dir) ->
+                      MetaFiles = filelib:wildcard(filename:join(Dir,"*.ti")),
+                      lists:map(fun(M) ->
+                                        Sub = string:left(M,length(M)-3),
+                                        case filelib:is_file(Sub) of
+                                            true -> Sub;
+                                            false -> Sub++".*.wrp"
+                                        end
+                                end,
+                                MetaFiles)
+              end, Dirs).
+
+get_handler(undefined, Files) ->
+    %%We retrieve traci from the first available file
+    {Traci, _} = read_traci(hd(Files)),
+    case dict:find(handler, Traci) of
+        error             -> {fun defaulthandler/4, initial};
+        {ok, [Handler]}   -> Handler
+    end;
+get_handler(Handler, _) ->
+    Handler.
+
+prepare(File) ->
     {Traci,Proci} = read_traci(File),
     Node = get_node(Traci),
     lists:foreach(fun({Pid,PI}) ->
@@ -714,19 +1030,21 @@ prepare(File,Handler) ->
 			  ets:insert(?MODULE,{Pid,PI,Node})
 		  end,Proci),
     FileOrWrap = get_file(File,Traci),
-    Handler1 = get_handler(Handler,Traci),
-    {FileOrWrap,Traci,Handler1}.
+    {FileOrWrap,Traci}.
 
-format_opt(Opt) ->
+format_opt(Opt) when is_list(Opt) ->
     Out = case lists:keysearch(out,1,Opt) of
 	      {value,{out,O}} -> O;
 	      _ -> standard_io
 	  end,
     Handler = case lists:keysearch(handler,1,Opt) of
-	      {value,{handler,H}} -> H;
-	      _ -> undefined
+                  {value,{handler,H}} -> H;
+                  _ -> undefined
 	  end,
-    {Out,Handler}.
+    DisableSort = proplists:get_value(disable_sort, Opt, false),
+    {Out,Handler,DisableSort};
+format_opt(Opt) ->
+    format_opt([Opt]).
 
 
 read_traci(File) ->
@@ -800,75 +1118,61 @@ check_client(Client,File) when is_tuple(Client),element(2,Client)==wrap ->
 check_exists(File) ->
     case file:read_file_info(File) of
 	{ok,#file_info{type=regular}} -> File;
-	_ -> 
+	_ ->
 	    exit({error,no_file})
     end.
-	
 
-get_handler(Handler,Traci) ->
-    case Handler of
-	undefined -> 
-	    case dict:find(handler,Traci) of
-		{ok,[H]} -> H;
-		error -> undefined
-	    end;
-	_ ->
-	    Handler
-    end.
 
-do_format(Fd,Details) ->
-    Clients = lists:foldl(fun({FileOrWrap,Traci,Handler},Acc) ->
-				  [start_client(FileOrWrap,Traci,Handler)
-				   |Acc]
+do_format(Fd,Details,DisableSort,Handler) ->
+    Clients = lists:foldl(fun({FileOrWrap,Traci},Acc) ->
+                                  [start_client(FileOrWrap,Traci)|Acc]
 			  end,[],Details),
-    init_collector(Fd,Clients).
-
-
-start_client(FileOrWrap,Traci,et) ->
-    dbg:trace_client(file, FileOrWrap, 
-		     {fun handler/2, 
-		      {dict:to_list(Traci),{{ttb_et,handler},initial}}});
-start_client(FileOrWrap,Traci,undefined) ->
-    dbg:trace_client(file, FileOrWrap, 
-		     {fun handler/2, 
-		      {dict:to_list(Traci),{fun defaulthandler/4,initial}}});
-start_client(FileOrWrap,Traci,Handler) ->
-    dbg:trace_client(file, FileOrWrap, 
-		     {fun handler/2, {dict:to_list(Traci),Handler}}).
-
-handler(Trace,State) ->
-    %% State here is only used for the initial state. The accumulated
-    %% State is maintained by collector!!!
-    receive 
-	{get,Collector} -> Collector ! {self(),{Trace,State}};
+    init_collector(Fd,Clients,DisableSort,Handler).
+
+start_client(FileOrWrap,Traci) ->
+    dbg:trace_client(file, FileOrWrap,
+		     {fun handler/2, dict:to_list(Traci)}).
+
+handler(Trace,Traci) ->
+    %%We return our own Traci so that it not necesarry to look it up
+    %%This may take time if something huge has been written to it
+    receive
+	{get,Collector} -> Collector ! {self(),{Trace,Traci}};
 	done -> ok
     end,
-    State.
+    Traci.
 
-handler1(Trace,{Fd,{Traci,{Fun,State}}}) when is_function(Fun) ->
-    {Traci,{Fun,Fun(Fd,Trace,Traci,State)}};
-handler1(Trace,{Fd,{Traci,{{M,F},State}}}) when is_atom(M), is_atom(F) ->
-    {Traci,{{M,F},M:F(Fd,Trace,Traci,State)}}.
+%%Used to handle common state (the same for all clients)
+handler2(Trace,{Fd,Traci,{Fun,State}}) when is_function(Fun) ->
+    {Fun, Fun(Fd, Trace, Traci, State)};
+handler2(Trace,{Fd,Traci,{{M,F},State}}) when is_atom(M), is_atom(F) ->
+    {{M,F}, M:F(Fd, Trace, Traci, State)}.
 
 defaulthandler(Fd,Trace,_Traci,initial) ->
     dbg:dhandler(Trace,Fd);
 defaulthandler(_Fd,Trace,_Traci,State) ->
     dbg:dhandler(Trace,State).
 
-init_collector(Fd,Clients) ->
+init_collector(Fd,Clients,DisableSort,Handler) ->
     Collected = get_first(Clients),
-    collector(Fd,sort(Collected)).
+    case DisableSort of
+        true -> collector(Fd,Collected, DisableSort, Handler);
+        false -> collector(Fd,sort(Collected), DisableSort, Handler)
+    end.
 
-collector(Fd,[{_,{Client,{Trace,State}}}|Rest]) ->
+collector(Fd,[{_,{Client,{Trace,Traci}}} |Rest], DisableSort, CommonState) ->
     Trace1 = update_procinfo(Trace),
-    State1 = handler1(Trace1,{Fd,State}),
-    case get_next(Client,State1) of
-	end_of_trace -> 
-	    handler1(end_of_trace,{Fd,State1}),
-	    collector(Fd,Rest);
-	Next -> collector(Fd,sort([Next|Rest]))
+    CommonState2 = handler2(Trace1, {Fd, Traci, CommonState}),
+    case get_next(Client) of
+	end_of_trace ->
+	    collector(Fd,Rest,DisableSort, CommonState2);
+	Next -> case DisableSort of
+                    false -> collector(Fd,sort([Next|Rest]), DisableSort, CommonState2);
+                    true -> collector(Fd,[Next|Rest], DisableSort, CommonState2)
+                end
     end;
-collector(_Fd,[]) ->
+collector(Fd,[], _, CommonState) ->
+    handler2(end_of_trace, {Fd, end_of_trace, CommonState}),
     ok.
 
 update_procinfo({drop,_N}=Trace) ->
@@ -895,7 +1199,7 @@ update_procinfo(Trace) ->
     ProcInfo = get_procinfo(Pid),
     setelement(2,Trace,ProcInfo).
 
-get_procinfo(Pid) when is_pid(Pid) ->
+get_procinfo(Pid) when is_pid(Pid); is_port(Pid) ->
     case ets:lookup(?MODULE,Pid) of
 	[PI] -> PI;
 	[] -> Pid
@@ -913,21 +1217,21 @@ get_procinfo({Name,Node}) when is_atom(Name) ->
 
 get_first([Client|Clients]) ->
     Client ! {get,self()},
-    receive 
-	{Client,{end_of_trace,_}} -> 
+    receive
+	{Client,{end_of_trace,_}} ->
 	    get_first(Clients);
-	{Client,{Trace,_State}}=Next -> 
+	{Client,{Trace,_}}=Next ->
 	    [{timestamp(Trace),Next}|get_first(Clients)]
     end;
 get_first([]) -> [].
 
-get_next(Client,State) when is_pid(Client) ->
+get_next(Client) when is_pid(Client) ->
     Client ! {get,self()},
-    receive 
-	{Client,{end_of_trace,_}} -> 
+    receive
+	{Client,{end_of_trace,_}} ->
 	    end_of_trace;
-	{Client,{Trace,_OldState}} -> 
-	    {timestamp(Trace),{Client,{Trace,State}}} % inserting new state!!
+	{Client,{Trace, Traci}} ->
+	    {timestamp(Trace),{Client,{Trace,Traci}}}
     end.
 
 sort(List) ->
@@ -971,19 +1275,37 @@ display_warning(Item,Warning) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Trace client which reads an IP port and puts data directly to a file.
 %%% This is used when tracing remote nodes with no file system.
-ip_to_file(Trace,{file,File}) ->
+ip_to_file({metadata,_,_},{_, only} = State) ->
+    State;
+ip_to_file(Trace, {_, only} = State) ->
+    dbg:dhandler(Trace, standard_io),
+    State;
+ip_to_file(Trace,{{file,File}, ShellOutput}) ->
     Fun = dbg:trace_port(file,File), %File can be a filename or a wrap spec
     Port = Fun(),
-    ip_to_file(Trace,Port);
-ip_to_file({metadata,MetaFile,MetaData},Port) ->
+    %% Store the port so it can be properly closed
+    ?MODULE ! {ip_to_file_trace_port, Port, self()},
+    receive {?MODULE,ok} -> ok end,
+    case Trace of
+        {metadata, _, _} -> ok;
+        Trace            -> show_trace(Trace, ShellOutput)
+    end,
+    ip_to_file(Trace,{Port,ShellOutput});
+ip_to_file({metadata,MetaFile,MetaData},State) ->
     {ok,MetaFd} = file:open(MetaFile,[write,raw,append]),
     file:write(MetaFd,MetaData),
     file:close(MetaFd),
-    Port;
-ip_to_file(Trace,Port) ->
+    State;
+ip_to_file(Trace,{Port, ShellOutput}) ->
+    show_trace(Trace, ShellOutput),
     B = term_to_binary(Trace),
     erlang:port_command(Port,B),
-    Port.
+    {Port, ShellOutput}.
+
+show_trace(Trace, true) ->
+    dbg:dhandler(Trace, standard_io);
+show_trace(_, _) ->
+    ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% For debugging
@@ -996,5 +1318,3 @@ dump_ti(<<>>,Acc) ->
 dump_ti(B,Acc) ->
     {Term,Rest} = get_term(B),
     dump_ti(Rest,[Term|Acc]).
-
-
diff --git a/lib/observer/test/Makefile b/lib/observer/test/Makefile
index 6073e6ea00..bf99f07081 100644
--- a/lib/observer/test/Makefile
+++ b/lib/observer/test/Makefile
@@ -22,7 +22,10 @@ MODULES =  \
 	observer_SUITE \
 	crashdump_viewer_SUITE \
 	etop_SUITE \
+	ttb_helper \
 	ttb_SUITE \
+	client \
+	server \
 	crashdump_helper
 
 ERL_FILES= $(MODULES:%=%.erl)
diff --git a/lib/observer/test/client.erl b/lib/observer/test/client.erl
new file mode 100644
index 0000000000..90b72d3f8f
--- /dev/null
+++ b/lib/observer/test/client.erl
@@ -0,0 +1,28 @@
+-module(client).
+-compile(export_all).
+
+init(Node) ->
+    application:start(runtime_tools),
+    net_kernel:connect_node(Node).
+
+init() ->
+    init(server_node()).
+
+restart() ->
+    init:restart().
+
+server_node() ->
+    {ok,HostName} = inet:gethostname(),
+    list_to_atom("server@" ++ HostName).
+
+get() ->
+    erlang:send({server,server_node()}, {get,self()}),
+    receive Data -> Data
+    after 1000   -> no_reply
+    end.
+
+put(Thing) ->
+    erlang:send({server,server_node()}, {put,self(),Thing}),
+    receive ok -> timer:sleep(2), ok
+    after 1000 -> no_reply
+    end.
diff --git a/lib/observer/test/server.erl b/lib/observer/test/server.erl
new file mode 100644
index 0000000000..f6d3542c96
--- /dev/null
+++ b/lib/observer/test/server.erl
@@ -0,0 +1,44 @@
+-module(server).
+-compile(export_all).
+
+start() ->
+    application:start(runtime_tools),
+    Pid = spawn(?MODULE,loop,[[], 0]),
+    register(server,Pid).
+
+stop() ->
+    case lists:member(server, registered()) of
+	true ->
+	    server ! stop;
+	false ->
+	    ok
+    end.
+
+loop(Data, Num) ->
+    receive
+	{put,From,Ting} -> timer:sleep(2),
+			   received(From,Ting),
+			   From ! ok,
+			   loop([Ting|Data], Num+1);
+	{get,From}      -> From ! Data,
+			   loop(Data, Num+1);
+	stop            -> stopped;
+	clear           -> loop([], Num+1);
+	{cnt, From}     -> From ! Num,
+			   loop(Data, Num)
+    end.
+
+counter() ->
+    server ! {cnt, self()},
+    receive
+	Num ->
+	    Num
+    end.
+
+received(From, Thing) ->
+    case Thing of
+	never_send_this_atom ->
+	    loop(Thing, 0);
+	_ ->
+	    {return, 27, Thing, From}
+    end.
diff --git a/lib/observer/test/ttb_SUITE.erl b/lib/observer/test/ttb_SUITE.erl
index 24b4a22aa9..695d41b48a 100644
--- a/lib/observer/test/ttb_SUITE.erl
+++ b/lib/observer/test/ttb_SUITE.erl
@@ -1,7 +1,7 @@
-%%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
+%%
+%% Copyright Ericsson AB 2002-2010. 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
@@ -33,12 +33,34 @@
 -include_lib("test_server/include/test_server.hrl").
 
 -define(default_timeout, ?t:minutes(1)).
+-define(OUTPUT, "handler_output").
+-define(FNAME, "temptest").
+-define(DIRNAME, "ddtemp").
 
-init_per_testcase(_Case, Config) ->
-    ttb:stop(),
+init_per_testcase(Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
+    ttb:stop(),
+    rm(?OUTPUT),
+    [rm(Upload) || Upload<-filelib:wildcard("ttb_upload*")],
+    rm(?DIRNAME),
+    [rm(At) || At <- filelib:wildcard("*@*")],
+    rm("ttb_last_config"),
+    %% Workaround for bug(?) in test_server - if the test case fails
+    %% with a timetrap timeout, then end_per_testcase will run with
+    %% faulty group_leader - which in turn makes test_server:stop_node
+    %% hang (stop_node is called by most of the cleanup functions).
+    %% Therefore we do the cleanup before each testcase instead - this
+    %% is obviously not 100% correct, but it will at least make sure
+    %% that the nodes which are to be started in a test case at are
+    %% terminated.
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
     [{watchdog, Dog}|Config].
-end_per_testcase(_Case, Config) ->
+end_per_testcase(Case, Config) ->
+    %% try apply(?MODULE,Case,[cleanup,Config])
+    %% catch error:undef -> ok
+    %% end,
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
@@ -49,12 +71,31 @@ all() ->
     [file, file_no_pi, file_fetch, wrap, wrap_merge,
      wrap_merge_fetch_format, write_config1, write_config2,
      write_config3, history, write_trace_info, seq_trace,
-     diskless, otp_4967_1, otp_4967_2].
+     diskless, diskless_wrap, otp_4967_1, otp_4967_2,
+     fetch_when_no_option_given, basic_ttb_run_ip_port, basic_ttb_run_file_port,
+     return_fetch_dir_implies_fetch, logfile_name_in_fetch_dir, upload_to_my_logdir,
+     upload_to_my_existing_logdir, fetch_with_options_not_as_list,
+     error_when_formatting_multiple_files_4393, format_on_trace_stop,
+     trace_to_remote_files_on_localhost_with_different_pwd,
+     trace_to_local_files_on_localhost_with_different_pwd,
+     trace_to_remote_files_on_localhost_with_different_pwd_abs,
+     changing_cwd_on_control_node, changing_cwd_on_remote_node,
+     changing_cwd_on_control_node_with_local_trace,
+     one_command_trace_setup, dbg_style_fetch, shell_tracing_init,
+     only_one_state_for_format_handler, only_one_state_with_default_format_handler,
+     only_one_state_with_initial_format_handler, run_trace_with_shortcut1,
+     run_trace_with_shortcut2, run_trace_with_shortcut3, run_trace_with_shortcut4,
+     cant_specify_local_and_flush, trace_sorted_by_default,disable_sorting,
+     trace_resumed_after_node_restart, trace_resumed_after_node_restart_ip,
+     trace_resumed_after_node_restart_wrap,
+     trace_resumed_after_node_restart_wrap_mult
+].
 
 groups() -> 
     [].
 
 init_per_suite(Config) ->
+    clean_priv_dir(Config),
     Config.
 
 end_per_suite(_Config) ->
@@ -76,7 +117,7 @@ file(Config) when is_list(Config) ->
     ?line {ok,OtherNode} = ?t:start_node(node2,slave,[]),
     ?line c:nl(?MODULE),
     ?line S = self(),
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"file"),
     ?line {ok,[Node]} =
 	ttb:tracer(Node,[{file, File},
@@ -92,18 +133,20 @@ file(Config) when is_list(Config) ->
     ?line {ok,[{matched,_,1},{matched,_,1}]} = ttb:tp(?MODULE,foo,[]),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
-    ?line ?t:stop_node(OtherNode),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(filename:join(Privdir,atom_to_list(Node)++"-file")),
     ?line ok = ttb:format(filename:join(Privdir,
 					atom_to_list(OtherNode)++"-file")),
 
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace,
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ok.
 
+file(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
+
 file_no_pi(suite) ->
     [];
 file_no_pi(doc) ->
@@ -113,7 +156,7 @@ file_no_pi(Config) when is_list(Config) ->
     ?line {ok,OtherNode} = ?t:start_node(node2,slave,[]),
     ?line c:nl(?MODULE),
     ?line S = self(),
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"file"),
     ?line {ok,[_,_]} =
 	ttb:tracer([Node,OtherNode],[{file, File},
@@ -123,20 +166,23 @@ file_no_pi(Config) when is_list(Config) ->
     ?line {ok,[{matched,_,1},{matched,_,1}]} = ttb:tp(?MODULE,foo,[]),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
-    ?line ?t:stop_node(OtherNode),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(filename:join(Privdir,atom_to_list(Node)++"-file")),
     ?line ok = ttb:format(filename:join(Privdir,
 					atom_to_list(OtherNode)++"-file")),
 
-    ?line [{trace,LocalProc,call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,LocalProc,call,{?MODULE,foo,[]}, {_,_,_}},
 	   end_of_trace,
-	   {trace,RemoteProc,call,{?MODULE,foo,[]}},
+	   {trace_ts,RemoteProc,call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ?line true = is_pid(LocalProc),
     ?line true = is_pid(RemoteProc),
     ok.
 
+file_no_pi(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
+
+
 file_fetch(suite) ->
     [];
 file_fetch(doc) ->
@@ -146,7 +192,7 @@ file_fetch(Config) when is_list(Config) ->
     ?line {ok,OtherNode} = ?t:start_node(node2,slave,[]),
     ?line c:nl(?MODULE),
     ?line S = self(),
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line ThisDir = filename:join(Privdir,this),
     ?line ok = file:make_dir(ThisDir),
     ?line OtherDir = filename:join(Privdir,other),
@@ -170,12 +216,11 @@ file_fetch(Config) when is_list(Config) ->
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
     ?line ?t:capture_start(),
-    ?line ttb:stop([fetch]),
+    ?line ttb:stop([return_fetch_dir]),
     ?line ?t:capture_stop(),
     ?line [StoreString] = ?t:capture_get(),
     ?line UploadDir =
 	lists:last(string:tokens(lists:flatten(StoreString),"$ \n")),
-    ?line ?t:stop_node(OtherNode),
 
     %% check that files are no longer in original directories...
     ?line ok = check_gone(ThisDir,atom_to_list(Node)++"-file_fetch"),
@@ -194,14 +239,18 @@ file_fetch(Config) when is_list(Config) ->
     ?line ok = ttb:format(filename:join(UploadDir,
 					atom_to_list(OtherNode)++"-file_fetch")),
 
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace,
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
 
     ?line ok = file:set_cwd(Cwd),
     ok.
 
+file_fetch(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
+
+
 wrap(suite) ->
     [];
 wrap(doc) ->
@@ -211,7 +260,7 @@ wrap(Config) when is_list(Config) ->
     ?line {ok,OtherNode} = ?t:start_node(node2,slave,[]),
     ?line c:nl(?MODULE),
     ?line S = self(),
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"wrap"),
     ?line {ok,[_,_]} = 
 	ttb:tracer([Node,OtherNode],[{file, {wrap,File,200,3}},
@@ -224,19 +273,18 @@ wrap(Config) when is_list(Config) ->
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
-    ?line ?t:stop_node(OtherNode),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(filename:join(Privdir,
 					atom_to_list(Node)++"-wrap.*.wrp")),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   {trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   {trace,{S,_,Node},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ?line ok = ttb:format(filename:join(Privdir,
 					atom_to_list(OtherNode)++"-wrap.*.wrp")),
-    ?line [{trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
 
     %% Check that merge does not crash even if the timestamp flag is not on.
@@ -244,17 +292,19 @@ wrap(Config) when is_list(Config) ->
 		 [filename:join(Privdir,
 				atom_to_list(Node)++"-wrap.*.wrp"),
 		  filename:join(Privdir,
-				atom_to_list(OtherNode)++"-wrap.*.wrp")]),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   {trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   {trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   end_of_trace,
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
+				atom_to_list(OtherNode)++"-wrap.*.wrp")],[{disable_sort,true}]),
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ok.
 
+wrap(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
+
 wrap_merge(suite) ->
     [];
 wrap_merge(doc) ->
@@ -264,7 +314,7 @@ wrap_merge(Config) when is_list(Config) ->
     ?line {ok,OtherNode} = ?t:start_node(node2,slave,[]),
     ?line c:nl(?MODULE),
     ?line S = self(),
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"wrap_merge"),
     ?line {ok,[_,_]} = 
 	ttb:tracer([Node,OtherNode],[{file, {wrap,File,200,3}},
@@ -277,8 +327,7 @@ wrap_merge(Config) when is_list(Config) ->
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
-    ?line ?t:stop_node(OtherNode),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,
 				atom_to_list(Node)++"-wrap_merge.*.wrp"),
@@ -289,11 +338,13 @@ wrap_merge(Config) when is_list(Config) ->
 	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},_},
 	   {trace_ts,_,call,{?MODULE,foo,[]},_},
 	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},_},
-	   end_of_trace,
 	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},_},
 	   end_of_trace] = flush(),
     ok.
 
+wrap_merge(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
+
 
 wrap_merge_fetch_format(suite) ->
     [];
@@ -304,7 +355,7 @@ wrap_merge_fetch_format(Config) when is_list(Config) ->
     ?line {ok,OtherNode} = ?t:start_node(node2,slave,[]),
     ?line c:nl(?MODULE),
     ?line S = self(),
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"wrap_merge_fetch_format"),
 
     %% I'm setting priv_dir as cwd, so ttb_upload directory is created there
@@ -324,19 +375,19 @@ wrap_merge_fetch_format(Config) when is_list(Config) ->
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
     ?line ttb:stop([format]),
-    ?line ?t:stop_node(OtherNode),
     ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},_},
 	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},_},
 	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},_},
 	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},_},
 	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},_},
-	   end_of_trace,
 	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},_},
 	   end_of_trace] = flush(),
 
     ?line ok = file:set_cwd(Cwd),
     ok.
 
+wrap_merge_fetch_format(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
 
 write_config1(suite) ->
     [];
@@ -348,7 +399,7 @@ write_config1(Config) when is_list(Config) ->
     ?line c:nl(?MODULE),
     ?line S = self(),
 
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"write_config1"),
     ?line ok = ttb:write_config(File,
 				[{ttb,tracer,[[Node,OtherNode],
@@ -360,16 +411,14 @@ write_config1(Config) when is_list(Config) ->
     ?line ok = ttb:run_config(File),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
-    ?line ?t:stop_node(OtherNode),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,
 				atom_to_list(Node)++"-write_config1"),
 		  filename:join(Privdir,
 				atom_to_list(OtherNode)++"-write_config1")]),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   end_of_trace,
-	   {trace,Other,call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,Other,call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
 
     case metatest(Other,OtherNode,Privdir,"-write_config1.ti") of
@@ -388,6 +437,10 @@ write_config1(Config) when is_list(Config) ->
     end,	    
     ok.
 
+
+write_config1(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
+
 write_config2(suite) ->
     [];
 write_config2(doc) ->
@@ -397,7 +450,7 @@ write_config2(Config) when is_list(Config) ->
     ?line {ok,OtherNode} = ?t:start_node(node2,slave,[]),
     ?line c:nl(?MODULE),
     ?line S = self(),
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"write_config2"),
     ?line {ok,[_,_]} = 
 	ttb:tracer([Node,OtherNode],[{file, File},
@@ -410,16 +463,14 @@ write_config2(Config) when is_list(Config) ->
     ?line ok = ttb:run_config(File),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
-    ?line ?t:stop_node(OtherNode),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,
 				atom_to_list(Node)++"-write_config2"),
 		  filename:join(Privdir,
 				atom_to_list(OtherNode)++"-write_config2")]),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   end_of_trace,
-	   {trace,Other,call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,Other,call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
 
     case metatest(Other,OtherNode,Privdir,"-write_config2.ti") of
@@ -438,6 +489,10 @@ write_config2(Config) when is_list(Config) ->
     end,
     ok.
 
+write_config2(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
+
+
 write_config3(suite) ->
     [];
 write_config3(doc) ->
@@ -447,7 +502,7 @@ write_config3(Config) when is_list(Config) ->
     ?line {ok,OtherNode} = ?t:start_node(node2,slave,[]),
     ?line c:nl(?MODULE),
     ?line S = self(),
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"write_config3"),
     ?line {ok,[_,_]} = 
 	ttb:tracer([Node,OtherNode],[{file, File},
@@ -455,18 +510,18 @@ write_config3(Config) when is_list(Config) ->
     ?line {ok,[{all,[{matched,_,_},{matched,_,_}]}]} = ttb:p(all,call),
     ?line {ok,[{matched,_,1},{matched,_,1}]} = ttb:tp(?MODULE,foo,[]),
     ?line ok = ttb:write_config(File,[1,2]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line [_,_] = ttb:list_config(File),
     ?line ok = ttb:run_config(File),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,
 				atom_to_list(Node)++"-write_config3"),
 		  filename:join(Privdir,
 				atom_to_list(OtherNode)++"-write_config3")]),
-    ?line [] = flush(), %foo is not traced
+    ?line [end_of_trace] = flush(), %foo is not traced
 
     ?line ok = ttb:write_config(File,[{ttb,tp,[?MODULE,foo,[]]}],
 			      [append]),
@@ -474,16 +529,14 @@ write_config3(Config) when is_list(Config) ->
     ?line ok = ttb:run_config(File),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
-    ?line ?t:stop_node(OtherNode),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,
 				atom_to_list(Node)++"-write_config3"),
 		  filename:join(Privdir,
 				atom_to_list(OtherNode)++"-write_config3")]),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   end_of_trace,
-	   {trace,Other,call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,Other,call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
 
     case metatest(Other,OtherNode,Privdir,"-write_config3.ti") of
@@ -502,6 +555,10 @@ write_config3(Config) when is_list(Config) ->
     end,
     ok.
 
+write_config3(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
+
+
 
 history(suite) ->
     [];
@@ -514,7 +571,7 @@ history(Config) when is_list(Config) ->
     ?line S = self(),
 
     ?line Nodes = [Node,OtherNode],
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"history"),
     ?line StartOpts = [{file, File},
 		       {handler,{fun myhandler/4, S}}],
@@ -531,15 +588,16 @@ history(Config) when is_list(Config) ->
     ?line ?MODULE:foo(),
     ?line ok = ttb:run_history([3,4]),
     ?line ?MODULE:foo(),
-    ?line ttb:stop(),
-    ?line ?t:stop_node(OtherNode),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,atom_to_list(Node)++"-history"),
 		  filename:join(Privdir,atom_to_list(OtherNode)++"-history")]),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ok.
-    
+
+history(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
 
 
 write_trace_info(suite) ->
@@ -551,7 +609,7 @@ write_trace_info(Config) when is_list(Config) ->
     ?line {ok,OtherNode} = ?t:start_node(node2,slave,[]),
     ?line c:nl(?MODULE),
     ?line S = self(),
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"write_trace_info"),
     ?line {ok,[_,_]} = 
 	ttb:tracer([Node,OtherNode],[{file, File},
@@ -561,20 +619,21 @@ write_trace_info(Config) when is_list(Config) ->
     ?line ok = ttb:write_trace_info(mytraceinfo,fun() -> node() end),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
-    ?line ?t:stop_node(OtherNode),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,atom_to_list(Node)++"-write_trace_info"),
 		  filename:join(Privdir,
 				atom_to_list(OtherNode)++"-write_trace_info")],
 		 [{handler,{fun otherhandler/4,S}}]),
-    ?line [{{trace,{S,_,Node},call,{?MODULE,foo,[]}},[Node]},
-	   {end_of_trace,[Node]},
-	   {{trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},[OtherNode]},
-	   {end_of_trace,[OtherNode]}] = flush(),
+    ?line [{{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},[Node]},
+	   {{trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},[OtherNode]},
+	   end_of_trace] = flush(),
 
     ok.
 
+write_trace_info(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
+
 
 seq_trace(suite) ->
     [];
@@ -583,7 +642,7 @@ seq_trace(doc) ->
 seq_trace(Config) when is_list(Config) ->
     ?line S = self(),
 
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"seq_trace"),
     ?line {ok,[Node]} = ttb:tracer(node(),[{file,File},
 				     {handler,{fun myhandler/4, S}}]),
@@ -593,10 +652,10 @@ seq_trace(Config) when is_list(Config) ->
 
     ?line Start = spawn(fun() -> seq() end),
     ?line timer:sleep(300),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,atom_to_list(Node)++"-seq_trace")]),
-    ?line [{trace,StartProc,call,{?MODULE,seq,[]}},
+    ?line [{trace_ts,StartProc,call,{?MODULE,seq,[]},{_,_,_}},
 	   {seq_trace,0,{send,{0,1},StartProc,P1Proc,{Start,P2}}},
 	   {seq_trace,0,{send,{1,2},P1Proc,P2Proc,{P1,Start}}},
 	   {seq_trace,0,{send,{2,3},P2Proc,StartProc,{P2,P1}}},
@@ -650,7 +709,7 @@ diskless(Config) when is_list(Config) ->
     ?line {ok,RemoteNode} = ?t:start_node(node2,slave,[]),
     ?line c:nl(?MODULE),
     ?line S = self(),
-    ?line Privdir=?config(priv_dir, Config),
+    ?line Privdir=priv_dir(Config),
     ?line File = filename:join(Privdir,"diskless"),
     ?line {ok,[RemoteNode]} = 
 	ttb:tracer([RemoteNode],[{file, {local, File}},
@@ -660,15 +719,45 @@ diskless(Config) when is_list(Config) ->
 
     ?line rpc:call(RemoteNode,?MODULE,foo,[]),
     ?line timer:sleep(500), % needed for the IP port to flush
-    ?line ttb:stop(),
-    ?line ?t:stop_node(RemoteNode),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(filename:join(Privdir,
 					atom_to_list(RemoteNode)++"-diskless")),
 
-    ?line [{trace,{_,_,RemoteNode},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{_,_,RemoteNode},call,{?MODULE,foo,[]},{_,_,_}},
+	   end_of_trace] = flush(),
+    ok.
+
+diskless(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
+
+diskless_wrap(suite) ->
+    [];
+diskless_wrap(doc) ->
+    ["Start tracing on diskless remote node, save to local wrapped file"];
+diskless_wrap(Config) when is_list(Config) ->
+    ?line {ok,RemoteNode} = ?t:start_node(node2,slave,[]),
+    ?line c:nl(?MODULE),
+    ?line S = self(),
+    ?line Privdir=priv_dir(Config),
+    ?line File = filename:join(Privdir,"diskless"),
+    ?line {ok,[RemoteNode]} =
+	ttb:tracer([RemoteNode],[{file, {local, {wrap,File,200,3}}},
+				 {handler,{fun myhandler/4, S}}]),
+    ?line {ok,[{all,[{matched,RemoteNode,_}]}]} = ttb:p(all,call),
+    ?line {ok,[{matched,RemoteNode,1}]} = ttb:tp(?MODULE,foo,[]),
+
+    ?line rpc:call(RemoteNode,?MODULE,foo,[]),
+    ?line timer:sleep(500), % needed for the IP port to flush
+    ?line ttb:stop([nofetch]),
+    ?line ok = ttb:format(filename:join(Privdir,
+					atom_to_list(RemoteNode)++"-diskless.*.wrp")),
+
+    ?line [{trace_ts,{_,_,RemoteNode},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ok.
 
+diskless_wrap(cleanup,_Config) ->
+    ?line ?t:stop_node(ttb_helper:get_node(node2)).
 
 otp_4967_1(suite) ->
     [];
@@ -688,7 +777,7 @@ otp_4967_2(doc) ->
     ["OTP-4967: Trace message sent to {Name, Node}"];
 otp_4967_2(Config) when is_list(Config) ->
     io:format("1: ~p",[now()]),
-    ?line Privdir = ?config(priv_dir,Config),
+    ?line Privdir = priv_dir(Config),
     io:format("2: ~p",[now()]),
     ?line File = filename:join(Privdir,"otp_4967"),
     io:format("3: ~p",[now()]),
@@ -715,19 +804,41 @@ otp_4967_2(Config) when is_list(Config) ->
     io:format("11: ~p",[now()]),
     ?line true = lists:member(heihopp,Msgs), % the heihopp message itself
     io:format("13: ~p",[now()]),
-    ?line {value,{trace,_,send,heihopp,{_,otp_4967,Node}}} = 
+    ?line {value,{trace_ts,_,send,heihopp,{_,otp_4967,Node},{_,_,_}}} =
 	lists:keysearch(heihopp,4,Msgs), % trace trace of the heihopp message
     io:format("14: ~p",[now()]),
     ?line end_of_trace = lists:last(Msgs), % end of the trace
     ok.
     
 
-
-
 myhandler(_Fd,Trace,_,Relay) ->
     Relay ! Trace,
     Relay.
 
+simple_call_handler() ->
+    {fun(A, {trace_ts, _, call, _, _} ,_,_) -> io:format(A, "ok.~n", []);
+	(_, end_of_trace, _, _) -> ok end, []}.
+
+marking_call_handler() ->
+    {fun(_, _, _, initial) -> file:write_file("HANDLER_OK", []);
+	(_,_,_,_) -> ok end, initial}.
+
+counter_call_handler() ->
+    {fun(_, {trace_ts, _, call, _, _} ,_,State) -> State + 1;
+	(A, end_of_trace, _, State) -> io:format(A,"~p.~n", [State]) end, 0}.
+
+ret_caller_call_handler() ->
+    {fun(A, {trace_ts, _, call, _, _, _} ,_,_) -> io:format(A, "ok.~n", []);
+	(A, {trace_ts, _, return_from, _, _, _}, _, _) -> io:format(A, "ok.~n", []);
+	(_, _, _, _) -> ok end, []}.
+
+node_call_handler() ->
+    {fun(A, {trace_ts, {_,_,Node}, call, _, _} ,_,_) -> io:format(A, "~p.~n", [Node]);
+	(_, end_of_trace, _, _) -> ok end, []}.
+
+otherhandler(_Fd,_,end_of_trace,Relay) ->
+    Relay ! end_of_trace,
+    Relay;
 otherhandler(_Fd,Trace,TI,Relay) ->
     {value,{mytraceinfo,I}} = lists:keysearch(mytraceinfo,1,TI),
     Relay ! {Trace,I},
@@ -794,3 +905,630 @@ check_gone(Dir,File) ->
 	      false -> 
 		  ok
 	  end.
+
+start_client_and_server() ->
+    ?line {ok,ClientNode} = ?t:start_node(client,slave,[]),
+    ?line ok = ttb_helper:c(code, add_paths, [code:get_path()]),
+    ?line {ok,ServerNode} = ?t:start_node(server,slave,[]),
+    ?line ok = ttb_helper:s(code, add_paths, [code:get_path()]),
+    ?line ttb_helper:clear(),
+    {ServerNode, ClientNode}.
+
+stop_client_and_server() ->
+    ClientNode = ttb_helper:get_node(client),
+    ServerNode = ttb_helper:get_node(server),
+    erlang:monitor_node(ClientNode,true),
+    erlang:monitor_node(ServerNode,true),
+    ?line ?t:stop_node(ClientNode),
+    ?line ?t:stop_node(ServerNode),
+    wait_for_client_and_server_stop(ClientNode,ServerNode).
+
+wait_for_client_and_server_stop(undefined,undefined) ->
+    ok;
+wait_for_client_and_server_stop(ClientNode,ServerNode) ->
+    receive
+	{nodedown,ClientNode} ->
+	    erlang:monitor_node(ClientNode,false),
+	    wait_for_client_and_server_stop(undefined,ServerNode);
+	{nodedown,ServerNode} ->
+	    erlang:monitor_node(ServerNode,false),
+	    wait_for_client_and_server_stop(ClientNode,undefined)
+    end.
+
+begin_trace(ServerNode, ClientNode, Dest) ->
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, Dest}]),
+    ?line ttb:p(all, call),
+    ?line ttb:tp(server, received, []),
+    ?line ttb:tp(client, put, []),
+    ?line ttb:tp(client, get, []).
+
+begin_trace_local(ServerNode, ClientNode, Dest) ->
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, Dest}]),
+    ?line ttb:p(all, call),
+    ?line ttb:tpl(server, received, []),
+    ?line ttb:tpl(client, put, []),
+    ?line ttb:tpl(client, get, []).
+
+check_size(N, Dest, Output, ServerNode, ClientNode) ->
+    ?line begin_trace(ServerNode, ClientNode, Dest),
+    ?line case Dest of
+        {local, _} ->
+            ?line ttb_helper:msgs_ip(N);
+        _ ->
+            ?line ttb_helper:msgs(N)
+    end,
+    ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
+    ?line ttb:format(D, [{out, Output}, {handler, simple_call_handler()}]),
+    ?line {ok, Ret} = file:consult(Output),
+    ?line true = (N + 1 == length(Ret)).
+
+fetch_when_no_option_given(suite) ->
+    [];
+fetch_when_no_option_given(doc) ->
+    ["Fetch when no option given"];
+fetch_when_no_option_given(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line {ok, Privdir} = file:get_cwd(),
+    ?line [] = filelib:wildcard(filename:join(Privdir,"ttb_upload_temptest*")),
+    begin_trace(ServerNode, ClientNode, ?FNAME),
+    ?line ttb_helper:msgs(4),
+    ?line stopped = ttb:stop(),
+    ?line [_] = filelib:wildcard(filename:join(Privdir,"ttb_upload_temptest*")).
+
+fetch_when_no_option_given(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+
+basic_ttb_run_ip_port(suite) ->
+    [];
+basic_ttb_run_ip_port(doc) ->
+    ["Basic ttb run ip port"];
+basic_ttb_run_ip_port(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line check_size(1, {local, ?FNAME}, ?OUTPUT, ServerNode, ClientNode),
+    ?line check_size(2, {local, ?FNAME}, ?OUTPUT, ServerNode, ClientNode),
+    ?line check_size(10, {local, ?FNAME}, ?OUTPUT, ServerNode, ClientNode).
+basic_ttb_run_ip_port(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+basic_ttb_run_file_port(suite) ->
+    [];
+basic_ttb_run_file_port(doc) ->
+    ["Basic ttb run file port"];
+basic_ttb_run_file_port(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line check_size(1, ?FNAME, ?OUTPUT, ServerNode, ClientNode),
+    ?line check_size(2, ?FNAME, ?OUTPUT, ServerNode, ClientNode),
+    ?line check_size(10, ?FNAME, ?OUTPUT, ServerNode, ClientNode).
+basic_ttb_run_file_port(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+return_fetch_dir_implies_fetch(suite) ->
+    [];
+return_fetch_dir_implies_fetch(doc) ->
+    ["Return_fetch_dir implies fetch"];
+return_fetch_dir_implies_fetch(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, ?FNAME),
+    ?line ttb_helper:msgs(2),
+    ?line {_,_} = ttb:stop([return_fetch_dir]).
+return_fetch_dir_implies_fetch(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+logfile_name_in_fetch_dir(suite) ->
+    [];
+logfile_name_in_fetch_dir(doc) ->
+    ["Logfile name in fetch dir"];
+logfile_name_in_fetch_dir(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, {local, ?FNAME}),
+    ?line {_,Dir} = ttb:stop([return_fetch_dir]),
+    ?line P1 = lists:nth(3, string:tokens(filename:basename(Dir), "_")),
+    ?line P2 = hd(string:tokens(P1, "-")),
+    ?line _File = P2.
+logfile_name_in_fetch_dir(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+upload_to_my_logdir(suite) ->
+    [];
+upload_to_my_logdir(doc) ->
+    ["Upload to my logdir"];
+upload_to_my_logdir(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, ?FNAME}]),
+    ?line {stopped,_} = ttb:stop([return_fetch_dir, {fetch_dir, ?DIRNAME}]),
+    ?line true = filelib:is_file(?DIRNAME),
+    ?line [] = filelib:wildcard("ttb_upload_"++?FNAME).
+upload_to_my_logdir(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+upload_to_my_existing_logdir(suite) ->
+    [];
+upload_to_my_existing_logdir(doc) ->
+    ["Upload to my existing logdir"];
+upload_to_my_existing_logdir(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line ok = file:make_dir(?DIRNAME),
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, ?FNAME}]),
+    ?line {error,_,_} = (catch ttb:stop([return_fetch_dir, {fetch_dir, ?DIRNAME}])),
+    ?line {stopped,_} = ttb:stop(return_fetch_dir).
+upload_to_my_existing_logdir(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+fetch_with_options_not_as_list(suite) ->
+    [];
+fetch_with_options_not_as_list(doc) ->
+    ["Fetch with options not as list"];
+fetch_with_options_not_as_list(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, ?FNAME}]),
+    ?line {stopped, D} = ttb:stop(return_fetch_dir),
+    ?line false = filelib:is_file(?OUTPUT),
+    ?line ttb:format(D, {out, ?OUTPUT}),
+    ?line true = filelib:is_file(?OUTPUT).
+fetch_with_options_not_as_list(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+error_when_formatting_multiple_files_4393(suite) ->
+    [];
+error_when_formatting_multiple_files_4393(doc) ->
+    ["Error when formatting multiple files"];
+error_when_formatting_multiple_files_4393(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, ?FNAME),
+    ?line ttb_helper:msgs(2),
+    ?line {_, Dir} = ttb:stop(return_fetch_dir),
+    ?line Files = [filename:join(Dir, atom_to_list(ServerNode) ++ "-" ++ ?FNAME),
+		   filename:join(Dir, atom_to_list(ClientNode) ++ "-" ++ ?FNAME)],
+    ?line ok = ttb:format(Files).
+error_when_formatting_multiple_files_4393(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+format_on_trace_stop(suite) ->
+    [];
+format_on_trace_stop(doc) ->
+    ["Format on trace stop"];
+format_on_trace_stop(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, {local, ?FNAME}),
+    ?line ttb_helper:msgs_ip(2),
+    ?line file:delete("HANDLER_OK"),
+    ?line {_,_} = ttb:stop([fetch, return_fetch_dir, {format, {handler, marking_call_handler()}}]),
+    ?line true = filelib:is_file("HANDLER_OK"),
+    ?line ok = file:delete("HANDLER_OK").
+format_on_trace_stop(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+%% The following three tests are for the issue "fixes fetch fail when nodes on the same host
+%% have different cwd"
+trace_to_remote_files_on_localhost_with_different_pwd(suite) ->
+    [];
+trace_to_remote_files_on_localhost_with_different_pwd(doc) ->
+    ["Trace to remote files on localhost with different pwd"];
+trace_to_remote_files_on_localhost_with_different_pwd(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line ok = file:set_cwd(".."),
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line check_size(2, ?FNAME, ?OUTPUT, ServerNode, ClientNode),
+    ?line ok = file:set_cwd(OldDir).
+trace_to_remote_files_on_localhost_with_different_pwd(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+trace_to_local_files_on_localhost_with_different_pwd(suite) ->
+    [];
+trace_to_local_files_on_localhost_with_different_pwd(doc) ->
+    ["Trace to local files on localhost with different pwd"];
+trace_to_local_files_on_localhost_with_different_pwd(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line ok = file:set_cwd(".."),
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line check_size(2, {local, ?FNAME}, ?OUTPUT, ServerNode, ClientNode),
+    ?line ok = file:set_cwd(OldDir).
+trace_to_local_files_on_localhost_with_different_pwd(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+trace_to_remote_files_on_localhost_with_different_pwd_abs(suite) ->
+    [];
+trace_to_remote_files_on_localhost_with_different_pwd_abs(doc) ->
+    ["Trace to remote files on localhost with different pwd abs"];
+trace_to_remote_files_on_localhost_with_different_pwd_abs(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line ok = file:set_cwd(".."),
+    ?line {ok, Path} = file:get_cwd(),
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line File = filename:join(Path, ?FNAME),
+    ?line check_size(2, File, ?OUTPUT, ServerNode, ClientNode),
+    ?line ok = file:set_cwd(OldDir).
+trace_to_remote_files_on_localhost_with_different_pwd_abs(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+%% Trace is not affected by changes of cwd on control node or remote nodes during tracing
+%% (three tests)
+changing_cwd_on_control_node(suite) ->
+    [];
+changing_cwd_on_control_node(doc) ->
+    ["Changing cwd on control node during tracing is safe"];
+changing_cwd_on_control_node(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, ?FNAME),
+    ?line NumMsgs = 3,
+    ?line ttb_helper:msgs(NumMsgs),
+    ?line ok = file:set_cwd(".."),
+    ?line ttb_helper:msgs(NumMsgs),
+    ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line true = (2*(NumMsgs + 1) == length(Ret)),
+    ?line ok = file:set_cwd(OldDir).
+changing_cwd_on_control_node(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+changing_cwd_on_control_node_with_local_trace(suite) ->
+    [];
+changing_cwd_on_control_node_with_local_trace(doc) ->
+    ["Changing cwd on control node during local tracing is safe"];
+changing_cwd_on_control_node_with_local_trace(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, {local, ?FNAME}),
+    ?line NumMsgs = 3,
+    ?line ttb_helper:msgs_ip(NumMsgs),
+    ?line ok = file:set_cwd(".."),
+    ?line ttb_helper:msgs_ip(NumMsgs),
+    ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line true = (2*(NumMsgs + 1) == length(Ret)),
+    ?line ok = file:set_cwd(OldDir).
+changing_cwd_on_control_node_with_local_trace(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+changing_cwd_on_remote_node(suite) ->
+    [];
+changing_cwd_on_remote_node(doc) ->
+    ["Changing cwd on remote node during tracing is safe"];
+changing_cwd_on_remote_node(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, ?FNAME),
+    ?line NumMsgs = 2,
+    ?line ttb_helper:msgs(NumMsgs),
+    ?line ok = rpc:call(ClientNode, file, set_cwd, [".."]),
+    ?line ttb_helper:msgs(NumMsgs),
+    ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line true = (2*(NumMsgs + 1) == length(Ret)).
+changing_cwd_on_remote_node(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+one_command_trace_setup(suite) ->
+    [];
+one_command_trace_setup(doc) ->
+    ["One command trace setup"];
+one_command_trace_setup(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line ttb:start_trace([ClientNode, ServerNode],
+			  [{server, received, '_', []},
+			   {client, put, 1, []},
+			   {client, get, '_', []}],
+			  {all, call},
+			  [{file, ?FNAME}]),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop(return_fetch_dir),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line 5 = length(Ret).
+one_command_trace_setup(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+dbg_style_fetch(suite) ->
+    [];
+dbg_style_fetch(doc) ->
+    ["Dbg style fetch"];
+dbg_style_fetch(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line DirSize = length(element(2, file:list_dir("."))),
+    ?line ttb:start_trace([ClientNode, ServerNode],
+			  [{server, received, '_', []},
+			   {client, put, 1, []},
+			   {client, get, '_', []}],
+			  {all, call},
+			  [{shell, only}]),
+    ?line DirSize = length(element(2, file:list_dir("."))),
+    ?line ttb_helper:msgs(2),
+    ?line DirSize = length(element(2, file:list_dir("."))),
+    ?line stopped, ttb:stop(format),
+    %%+1 -> ttb_last_trace
+    ?line true = (DirSize + 1 == length(element(2, file:list_dir(".")))),
+    ?line {ok,[{all, [{matched,_,_}, {matched,_,_}]}]} =
+	ttb:start_trace([ClientNode, ServerNode],
+			[{server, received, '_', []},
+			 {client, put, 1, []},
+			 {client, get, '_', []}],
+			{all, call},
+			[{shell, only}]),
+    ?line ttb:stop().
+dbg_style_fetch(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+shell_tracing_init(suite) ->
+    [];
+shell_tracing_init(doc) ->
+    ["Shell tracing init"];
+shell_tracing_init(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line ttb:tracer([ClientNode, ServerNode], shell),
+    ?line ttb:stop(),
+    ?line ttb:tracer([ClientNode, ServerNode],
+		     [{file, {local, ?FNAME}}, shell]),
+    ?line ttb:stop(),
+    ?line local_client_required_on_shell_tracing =
+	try  ttb:tracer([ClientNode, ServerNode],[{file, ?FNAME}, shell])
+	catch
+	    exit:local_client_required_on_shell_tracing ->
+		local_client_required_on_shell_tracing
+	end.
+shell_tracing_init(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+only_one_state_for_format_handler(suite) ->
+    [];
+only_one_state_for_format_handler(doc) ->
+    ["Only one state for format handler"];
+only_one_state_for_format_handler(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_local(ServerNode, ClientNode, ?FNAME),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, counter_call_handler()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line [5] = Ret.
+only_one_state_for_format_handler(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+only_one_state_with_default_format_handler(suite) ->
+    [];
+only_one_state_with_default_format_handler(doc) ->
+    ["Only one state with default format handler"];
+only_one_state_with_default_format_handler(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_local(ServerNode, ClientNode, ?FNAME),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}]),
+    ?line true = filelib:is_file(?OUTPUT).
+only_one_state_with_default_format_handler(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+only_one_state_with_initial_format_handler(suite) ->
+    [];
+only_one_state_with_initial_format_handler(doc) ->
+    ["Only one state with initial format handler"];
+only_one_state_with_initial_format_handler(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, ?FNAME}, {handler, counter_call_handler()}]),
+    ?line ttb:p(all, call),
+    ?line ttb:tpl(server, received, []),
+    ?line ttb:tpl(client, put, []),
+    ?line ttb:tpl(client, get, []),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line [5] = Ret.
+only_one_state_with_initial_format_handler(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+run_trace_with_shortcut(Shortcut, Ret, F) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, ?FNAME}]),
+    ?line ttb:p(all, call),
+    ?line ttb:F(client, put, Shortcut),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, ret_caller_call_handler()}]),
+    ?line {ok, Ret} =file:consult(?OUTPUT),
+    ?line stop_client_and_server().
+
+fun_for(return) ->
+    {codestr, "fun(_) -> return_trace() end"};
+fun_for(msg_false) ->
+    {codestr, "fun(_) -> message(false) end"}.
+
+run_trace_with_shortcut1(suite) ->
+    [];
+run_trace_with_shortcut1(doc) ->
+    ["Run trace with shortcut 1"];
+run_trace_with_shortcut1(Config) when is_list(Config) ->
+    ?line run_trace_with_shortcut(caller, [ok,ok], tp),
+    ?line run_trace_with_shortcut(caller, [ok,ok], tpl).
+run_trace_with_shortcut1(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+run_trace_with_shortcut2(suite) ->
+    [];
+run_trace_with_shortcut2(doc) ->
+    ["Run trace with shortcut 2"];
+run_trace_with_shortcut2(Config) when is_list(Config) ->
+    ?line run_trace_with_shortcut(return, [ok,ok], tp),
+    ?line run_trace_with_shortcut(return, [ok,ok], tpl).
+run_trace_with_shortcut2(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+run_trace_with_shortcut3(suite) ->
+    [];
+run_trace_with_shortcut3(doc) ->
+    ["Run trace with shortcut 3"];
+run_trace_with_shortcut3(Config) when is_list(Config) ->
+    ?line run_trace_with_shortcut(fun_for(return), [ok,ok], tp),
+    ?line run_trace_with_shortcut(fun_for(return), [ok,ok], tpl).
+run_trace_with_shortcut3(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+run_trace_with_shortcut4(suite) ->
+    [];
+run_trace_with_shortcut4(doc) ->
+    ["Run trace with shortcut 4"];
+run_trace_with_shortcut4(Config) when is_list(Config) ->
+    ?line run_trace_with_shortcut(fun_for(msg_false), [], tp),
+    ?line run_trace_with_shortcut(fun_for(msg_false), [], tpl).
+run_trace_with_shortcut4(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+cant_specify_local_and_flush(suite) ->
+    [];
+cant_specify_local_and_flush(doc) ->
+    ["Can't specify local and flush"];
+cant_specify_local_and_flush(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line flush_unsupported_with_ip_trace_port =
+	try ttb:tracer([ServerNode, ClientNode],
+		       [{flush, 1000}, {file, {local, ?FNAME}}])
+	catch
+	    exit:flush_unsupported_with_ip_trace_port ->
+		flush_unsupported_with_ip_trace_port
+	end.
+cant_specify_local_and_flush(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+trace_sorted_by_default(suite) ->
+    [];
+trace_sorted_by_default(doc) ->
+    ["Trace sorted by default"];
+trace_sorted_by_default(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_local(ServerNode, ClientNode, ?FILE),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, node_call_handler()}, {disable_sort, false}]),
+    {ok, Ret} = file:consult(?OUTPUT),
+    ?line [ClientNode,ServerNode,ClientNode,ServerNode,ServerNode] = Ret.
+trace_sorted_by_default(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+disable_sorting(suite) ->
+    [];
+disable_sorting(doc) ->
+    ["Disable sorting"];
+disable_sorting(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_local(ServerNode, ClientNode, ?FILE),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, node_call_handler()}, {disable_sort, true}]),
+    {ok, Ret} = file:consult(?OUTPUT),
+    ?line [ClientNode,ClientNode,ServerNode,ServerNode,ServerNode] = Ret.
+disable_sorting(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+%% -----------------------------------------------------------------------------
+%% tests for autoresume of tracing
+%% -----------------------------------------------------------------------------
+
+trace_resumed_after_node_restart(suite) ->
+    [];
+trace_resumed_after_node_restart(doc) ->
+    ["Test trace resumed after node restart, trace to files on remote node."];
+trace_resumed_after_node_restart(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_with_resume(ServerNode, ClientNode, ?FNAME),
+    ?line logic(2,6,file).
+trace_resumed_after_node_restart(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+trace_resumed_after_node_restart_ip(suite) ->
+    [];
+trace_resumed_after_node_restart_ip(doc) ->
+    ["Test trace resumed after node restart, trace via tcp/ip to local node."];
+trace_resumed_after_node_restart_ip(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_with_resume(ServerNode, ClientNode, {local, ?FNAME}),
+    ?line logic(2,6,local).
+trace_resumed_after_node_restart_ip(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+trace_resumed_after_node_restart_wrap(suite) ->
+    [];
+trace_resumed_after_node_restart_wrap(doc) ->
+    ["Test trace resumed after node restart, wrap option."];
+trace_resumed_after_node_restart_wrap(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_with_resume(ServerNode, ClientNode, {wrap, ?FNAME, 10, 4}),
+    ?line logic(1,4,file).
+trace_resumed_after_node_restart_wrap(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+trace_resumed_after_node_restart_wrap_mult(suite) ->
+    [];
+trace_resumed_after_node_restart_wrap_mult(doc) ->
+    ["Test trace resumed after node restart, wrap option, multiple files."];
+trace_resumed_after_node_restart_wrap_mult(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_with_resume(ServerNode, ClientNode, {wrap, ?FNAME, 10, 4}),
+    ?line logic(20,8,file).
+trace_resumed_after_node_restart_wrap_mult(cleanup,_Config) ->
+    ?line stop_client_and_server().
+
+logic(N, M, TracingType) ->
+    helper_msgs(N, TracingType),
+    ?t:stop_node(ttb_helper:get_node(client)),
+    timer:sleep(2500),
+    ?line {ok,_ClientNode} = ?t:start_node(client,slave,[]),
+    ?line ok = ttb_helper:c(code, add_paths, [code:get_path()]),
+    ?line ttb_helper:c(client, init, []),
+    ?line helper_msgs(N, TracingType),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, ret_caller_call_handler2()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line M = length(Ret).
+
+begin_trace_with_resume(ServerNode, ClientNode, Dest) ->
+    ?line {ok, _} = ttb:tracer([ServerNode,ClientNode], [{file, Dest}, resume]),
+    ?line ttb:p(all, [call, timestamp]),
+    ?line ttb:tp(server, received, []),
+    ?line ttb:tp(client, put, []),
+    ?line ttb:tp(client, get, []).
+
+ret_caller_call_handler2() ->
+    {fun(A, {trace_ts, _, call, _, _} ,_,_) -> io:format(A, "ok.~n", []);
+	(_, _, _, _) -> ok end, []}.
+
+helper_msgs(N, TracingType) ->
+    case TracingType of
+        local ->
+            ttb_helper:msgs_ip(N);
+        _ ->
+            ttb_helper:msgs(N)
+    end.
+
+priv_dir(Conf) ->
+    %% Due to problem with long paths on windows => creating a new
+    %% priv_dir under data_dir
+    Dir = filename:absname(filename:join(?config(data_dir, Conf),priv_dir)),
+    filelib:ensure_dir(filename:join(Dir,"*")),
+    Dir.
+
+clean_priv_dir(Config) ->
+    PrivDir = priv_dir(Config),
+    case filelib:is_dir(PrivDir) of
+        true -> rm(PrivDir);
+        false -> ok
+    end.
+
+rm(This) ->
+    case filelib:is_dir(This) of
+        true ->
+            {ok,Files} = file:list_dir(This),
+            [rm(filename:join(This,F)) || F <- Files],
+	    file:del_dir(This);
+        false ->
+	    file:delete(This)
+    end.
diff --git a/lib/observer/test/ttb_helper.erl b/lib/observer/test/ttb_helper.erl
new file mode 100644
index 0000000000..76b06cd3ce
--- /dev/null
+++ b/lib/observer/test/ttb_helper.erl
@@ -0,0 +1,157 @@
+-module(ttb_helper). %%Nodes control
+-compile(export_all).
+
+%%API
+%%get() -> client:get()
+%%put(X) -> client:put(X)
+%%msgs(N) -> N times client:put(test_msg)
+%%clear() -> restart server
+%%ensure_running() / stop() -> start/stop nodes
+%%get_node(atom) -> return atom@hostname
+
+-define(NODE_CMD(Name),
+	"erl -sname " ++ atom_to_list(Name) ++
+	" -pa .. -pa . -detached -run ttb_helper send_ok").
+-define(REG_NAME, nc_testing).
+
+new_fun() ->
+    fun(_, end_of_trace, _, Dict) -> io:format("~p~n", [dict:to_list(Dict)]);
+       (_, T, _, Dict) -> case element(2, T) of
+                              {Pid, _, _} ->
+                                  dict:update_counter(Pid, 1, Dict);
+                              Pid ->
+                                  dict:update_counter(Pid, 1, Dict)
+                          end
+    end.
+
+new_fun_2() ->
+    fun(_, end_of_trace, _, Dict) -> io:format("~p~n", [dict:to_list(Dict)]);
+       (_, T, _, Dict) ->  case element(2, T) of
+                               {_, Name, _} when is_atom(Name)->
+                                  dict:update_counter(Name, 1, Dict);
+                              Pid ->
+                                  dict:update_counter(Pid, 1, Dict)
+                          end
+
+    end.
+
+
+ensure_running() ->
+    try_start_node(server),
+    try_start_node(client),
+    clear().
+
+try_start_node(Node) ->
+    global:unregister_name(?REG_NAME),
+    global:register_name(?REG_NAME, self()),
+    global:sync(),
+    N = get_node(Node),
+    case net_adm:ping(N) of
+	pong ->
+	    io:format("Node ~p already running~n", [N]);
+	_ ->
+	    io:format("Starting node ~p... ~p ", [Node, os:cmd(?NODE_CMD(Node))]),
+	    recv()
+    end.
+
+clear() ->
+    s(server, stop, []),
+    init().
+
+stop() ->
+    s(init, stop, []),
+    c(init, stop, []).
+
+msgs(N) ->
+    [c(client, put, [test_msg]) || _ <- lists:seq(1, N)],
+    s(server, received, [a,b]),
+    [dbg:flush_trace_port(Node) || Node <- [get_node(client), get_node(server)]].
+
+msgs_ip(N) ->
+    [c(client, put, [test_msg]) || _ <- lists:seq(1, N)],
+    s(server, received, [a,b]),
+    timer:sleep(200). %% allow trace messages to arrive over tcp/ip
+
+run() ->
+    ttb({local, "A"}),
+    msgs(2),
+    c(erlang, whereis, [ttbt]).
+
+get() -> c(client, get, []).
+put(Thing) -> c(client, put, [Thing]).
+
+get_node(Node) ->
+    {ok, Host} = inet:gethostname(),
+    list_to_atom(atom_to_list(Node) ++ "@" ++ Host).
+
+trace_setup() ->
+    ttb:p(all, call),
+    ttb:tp(server, received, []),
+    ttb:tp(client, put, []),
+    ttb:tp(client, get, []).
+
+ttb() -> ttb("A").
+ttb(File) ->
+    ttb:tracer([get_node(client), get_node(server)], [{file, File}, resume]),
+    ttb:p(all, [call, timestamp]),
+    ttb:tp(client, put, []),
+    ttb:tp(client, get, []),
+    ttb:tp(server, received, []).
+
+tc() ->
+    TC = example_config_gen:create_trace_case("dummy comment"),
+    Patterns = example_config_gen:create_pattern(client, put, 1, return),
+    Flags = example_config_gen:create_flags(all, call),
+    Merge = example_config_gen:create_merge_conf(show_handler(), "dummy merge comment"),
+    Merge2 = example_config_gen:create_merge_conf(undefined, "dummy merge comment"),
+    TC2 = example_config_gen:add_pattern(Patterns, TC),
+    TC3 = example_config_gen:add_flags(Flags, TC2),
+    TC4 = example_config_gen:add_merge_conf(Merge, TC3),
+    TC5 = example_config_gen:add_merge_conf(Merge2, TC4),
+    example_config_gen:add_nodes([get_node(client), get_node(server)], TC5).
+
+
+show(X) ->
+    io:format(user, "Showing: ~p~n", [X]).
+
+state_handler() ->
+    {fun(_,_,I,S) -> io:format(user, "Got from ~p: ~p~n", [I,S]), S+1 end, 0}.
+
+show_handler() ->
+    {fun(A,B,_,_) -> io:format(A, "~p~n", [B]) end, []}.
+
+opts() ->
+    [[get_node(client), get_node(server)],
+     [{server, received, '_', []},
+      {client, put, '_', []},
+      {client, get, '_', []}],
+     {all, call},
+     [{file, "TEST"}]].
+
+overload_check(check) ->
+    true;
+overload_check(_) ->
+    ok.
+%%%Internal
+s(M, F, A) -> rpc:call(get_node(server), M, F, A).
+c(M, F, A) -> rpc:call(get_node(client), M, F, A).
+
+send_ok() ->
+    pong = net_adm:ping(get_node(test)),
+    global:sync(),
+    global:send(?REG_NAME, node()).
+
+init() ->
+    True = s(server, start, []),
+    io:format("ok1: ~p~n", [True]),
+    true = c(client, init, [get_node(server)]).
+
+recv() ->
+    receive
+	Node ->
+	    io:format("Node ~p ready.~n", [Node]),
+            ok
+    after 5000 ->
+	    io:format("Startup failed~n",[]),
+	    throw(startup_failed)
+    end.
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index 14c8f54ba3..76e2f591fa 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 0.9.9
+OBSERVER_VSN = 0.9.10
diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
index ed3eeb1d42..dda896bcd2 100644
--- a/lib/odbc/c_src/Makefile.in
+++ b/lib/odbc/c_src/Makefile.in
@@ -89,9 +89,10 @@ TARGET_FLAGS =  @TARGET_FLAGS@
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
+_create_dirs := $(shell mkdir -p $(OBJ_DIR) $(BIN_DIR))
 
 ifdef EXE_TARGET
-opt debug: create_dirs $(EXE_TARGET) 
+opt debug: $(EXE_TARGET) 
 else
 opt debug:
 endif
@@ -119,10 +120,6 @@ endif
 $(OBJ_DIR)/odbcserver.o: odbcserver.c
 	$(CC) $(CFLAGS) $(INCLUDES) $(TARGET_FLAGS) -o $@ -c odbcserver.c
 
-create_dirs:
-	$(INSTALL_DIR) $(OBJ_DIR)
-	$(INSTALL_DIR) $(BIN_DIR)
-
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c
index 11e311d72d..ab2d7fe210 100644
--- a/lib/odbc/c_src/odbcserver.c
+++ b/lib/odbc/c_src/odbcserver.c
@@ -772,6 +772,7 @@ static db_result_msg db_param_query(byte *buffer, db_state *state)
     }
     associated_result_set(state) = FALSE;
     param_query(state) = TRUE;
+    out_params(state) = FALSE;
 
     msg = encode_empty_message();
 
diff --git a/lib/odbc/c_src/odbcserver.h b/lib/odbc/c_src/odbcserver.h
index 314fbf32c6..56b6148777 100644
--- a/lib/odbc/c_src/odbcserver.h
+++ b/lib/odbc/c_src/odbcserver.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2002-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2011. 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
diff --git a/lib/odbc/doc/src/Makefile b/lib/odbc/doc/src/Makefile
index e2f09733d0..3e648d854d 100644
--- a/lib/odbc/doc/src/Makefile
+++ b/lib/odbc/doc/src/Makefile
@@ -29,14 +29,6 @@ VSN=$(ODBC_VSN)
 APPLICATION=odbc
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -89,32 +81,10 @@ EXTRA_FILES = $(DEFAULT_GIF_FILES) \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-TOP_PS_FILE  = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -128,8 +98,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif			# Copy them to ../html
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -144,32 +112,6 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) 
-
-endif
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)	# We depend just to copy them to ../html
@@ -182,8 +124,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -193,32 +133,5 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-	$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-endif
-endif
-
-endif 
 
 release_spec:
-
-
-
-
diff --git a/lib/odbc/doc/src/databases.xml b/lib/odbc/doc/src/databases.xml
index 09f5a5af5b..34e1d51255 100644
--- a/lib/odbc/doc/src/databases.xml
+++ b/lib/odbc/doc/src/databases.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/doc/src/make.dep b/lib/odbc/doc/src/make.dep
deleted file mode 100644
index d62e8dd8f0..0000000000
--- a/lib/odbc/doc/src/make.dep
+++ /dev/null
@@ -1,27 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex databases.tex error_handling.tex \
-		getting_started.tex introduction.tex odbc.tex \
-		part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: odbc_app_arc.ps
-
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index e15e7dea7d..9c6ca8a017 100644
--- a/lib/odbc/doc/src/notes.xml
+++ b/lib/odbc/doc/src/notes.xml
@@ -31,7 +31,49 @@
   <p>This document describes the changes made to the odbc application.
   </p>
 
-  <section><title>ODBC 2.10.10</title>
+  <section><title>ODBC 2.10.11</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    When using output parameters the internal odbc state was
+	    not correctly cleaned causing the next call to
+	    param_query to misbehave.</p>
+          <p>
+	    Own Id: OTP-9444</p>
+        </item>
+        <item>
+	    <p> XML files have been corrected. </p>
+          <p>
+	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add code to handle old ODBC drivers on solaris. Also adds
+	    tests with MySQL.</p>
+          <p>
+	    Own Id: OTP-8407</p>
+        </item>
+        <item>
+          <p>
+	    Odbc now supports SQL_WLONGVARCHAR, thanks to Hanfei Shen
+	    for the patch.</p>
+          <p>
+	    Own Id: OTP-8493</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ODBC 2.10.10</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/odbc/doc/src/odbc.xml b/lib/odbc/doc/src/odbc.xml
index 11ca97f743..8a58dc2848 100644
--- a/lib/odbc/doc/src/odbc.xml
+++ b/lib/odbc/doc/src/odbc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2010</year>
+      <year>1999</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -138,7 +138,7 @@
       <fsummary>Opens a connection to the database. </fsummary>
       <type>
         <v>ConnectStr = string()</v>
-        <d>An example of a connection string:<c>"DSN=sql-server;UID=aladdin;PWD=sesame"</c>where DSN is your ODBC Data Source Name, UID is a database user id and PWD is the password for that user. These are usually the attributes required in the connection string, but some drivers have other driver specific attributes, for example<c>"DSN=Oracle8;DBQ=gandalf;UID=aladdin;PWD=sesame"</c>where DBQ is your TNSNAMES.ORA entry name e.g. some Oracle specific configuration attribute.</d>
+        <d>An example of a connection string: <c>"DSN=sql-server;UID=aladdin;PWD=sesame"</c> where DSN is your ODBC Data Source Name, UID is a database user id and PWD is the password for that user. These are usually the attributes required in the connection string, but some drivers have other driver specific attributes, for example <c>"DSN=Oracle8;DBQ=gandalf;UID=aladdin;PWD=sesame"</c> where DBQ is your TNSNAMES.ORA entry name e.g. some Oracle specific configuration attribute.</d>
         <v>Options = [] | [option()]</v>
         <d>All options has default values. </d>
         <v>option() = {auto_commit, on | off} | {timeout, milliseconds()}
@@ -432,7 +432,7 @@
       <desc>
         <p>Selects <c>N</c> consecutive rows of the result set. If
           <c>Position</c> is <c>next</c> it is semantically equivalent
-          of calling <c>next/[1,2]</c><c>N</c> times. If
+          of calling <c>next/[1,2]</c> <c>N</c> times. If
           <c>Position</c> is <c>{relative, Pos}</c>, <c>Pos</c> will be
           used as an offset from the current cursor position to
           determine the first selected row. If <c>Position</c> is
diff --git a/lib/odbc/src/odbc_internal.hrl b/lib/odbc/src/odbc_internal.hrl
index c0e7d9657b..bd80cdc659 100644
--- a/lib/odbc/src/odbc_internal.hrl
+++ b/lib/odbc/src/odbc_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. 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
diff --git a/lib/odbc/test/mysql.erl b/lib/odbc/test/mysql.erl
index 49068c4356..c990793213 100644
--- a/lib/odbc/test/mysql.erl
+++ b/lib/odbc/test/mysql.erl
@@ -26,7 +26,22 @@
 
 %-------------------------------------------------------------------------
 connection_string() ->
-    "DSN=MySQL;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';".
+    case test_server:os_type() of
+	{unix, linux} ->
+	    "DSN=MySQL;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';";
+	{unix, sunos} ->
+	    solaris_str();
+	{unix, darwin} ->
+	    "DSN=MySQLMac;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';"
+    end.
+
+solaris_str() ->
+    case erlang:system_info(system_architecture) of
+	"sparc" ++ _ ->
+	    "DSN=MySQLSolaris10;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';";
+	"i386" ++ _ ->
+	    "DSN=MySQLSolaris10i386;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';"
+    end.
 
 %-------------------------------------------------------------------------
 insert_result() ->
diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index e59be772e3..a076c4dfff 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -76,20 +76,26 @@ end_per_group(_GroupName, Config) ->
 %% Note: This function is free to add any key/value pairs to the Config
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    case (catch odbc:start()) of
-	ok ->
-	    case catch odbc:connect(?RDBMS:connection_string(),
-				    [{auto_commit, off}] ++ odbc_test_lib:platform_options()) of
-		{ok, Ref} ->
-		    odbc:disconnect(Ref),
-		    [{tableName, odbc_test_lib:unique_table_name()} | Config];
-		_  ->
-		    {skip, "ODBC is not properly setup"}
-	    end;
-	_ ->
-	    {skip,"ODBC not startable"}
-    end.	    
+init_per_suite(Config) when is_list(Config) ->
+    case odbc_test_lib:skip() of
+	true ->
+	    {skip, "ODBC not supported"};
+	false ->
+	    case (catch odbc:start()) of
+		ok ->
+		    case catch odbc:connect(?RDBMS:connection_string(),
+					    [{auto_commit, off}] ++ odbc_test_lib:platform_options()) of
+			{ok, Ref} ->
+			    odbc:disconnect(Ref),
+			    [{tableName, odbc_test_lib:unique_table_name()} | Config];
+			_  ->
+			    {skip, "ODBC is not properly setup"}
+		    end;
+		_ ->
+		    {skip,"ODBC not startable"}
+	    end
+    end.
+
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index 099ae0aa7d..d61a91f973 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -89,17 +89,15 @@ init_per_group(GroupName, Config) when GroupName == fixed_char;
     end;
 
 init_per_group(unicode, Config) ->
-    %% Uses parameterized queries
-    case {os:type(), erlang:system_info(wordsize)} of
+    case {os:type(), erlang:system_info({wordsize, external})} of
 	{{unix, _}, 4} ->
 	    Config;
 	{{unix, _}, _} ->
-	    {skip, "Not supported by driver"};
+	    {skip, "Postgres drivers pre version psqlODBC 08.04.0200 have utf8-problems"};
 	_ ->
 	    Config
     end;
 
-
 init_per_group(_GroupName, Config) ->
     Config.
 
@@ -115,14 +113,18 @@ end_per_group(_GroupName, Config) ->
 %% Note: This function is free to add any key/value pairs to the Config
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    case (catch odbc:start()) of
-	ok ->
-	    [{tableName, odbc_test_lib:unique_table_name()} | Config];
-	_ ->
-	    {skip, "ODBC not startable"}
+init_per_suite(Config) when is_list(Config) ->
+    case odbc_test_lib:skip() of
+	true ->
+	    {skip, "ODBC not supported"};
+	false ->
+	    case (catch odbc:start()) of
+		ok ->
+		    [{tableName, odbc_test_lib:unique_table_name()}| Config];
+		_ ->
+		    {skip, "ODBC not startable"}
+	    end
     end.
-
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index 76a214d553..1852678b4b 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -89,6 +89,7 @@ init_per_group(scrollable_cursors, Config) ->
 	_ ->
 	    Config
     end;
+
 init_per_group(_,Config) ->
     Config.
 
@@ -105,11 +106,16 @@ end_per_group(_GroupName, Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) when is_list(Config) ->
-    case (catch odbc:start()) of
-	ok ->
-	    [{tableName, odbc_test_lib:unique_table_name()}| Config];
-	_ ->
-	    {skip, "ODBC not startable"}
+    case odbc_test_lib:skip() of
+	true ->
+	    {skip, "ODBC not supported"};
+	false ->
+	    case (catch odbc:start()) of
+		ok ->
+		    [{tableName, odbc_test_lib:unique_table_name()}| Config];
+		_ ->
+		    {skip, "ODBC not startable"}
+	    end
     end.
 
 %%--------------------------------------------------------------------
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index 440c0ca921..e3a3440559 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -39,11 +39,18 @@
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    case code:which(odbc) of
-	non_existing ->
-	    {skip, "No ODBC built"};
-	_ ->
-	    [{tableName, odbc_test_lib:unique_table_name()} | Config]
+    case odbc_test_lib:skip() of
+	true ->
+	    {skip, "ODBC not supported"};
+	false ->
+	    case code:which(odbc) of
+		non_existing ->
+		    {skip, "No ODBC built"};
+		_ ->
+		    %% Make sure odbc is not already started
+		    odbc:stop(),
+		    [{tableName, odbc_test_lib:unique_table_name()} | Config]
+	    end
     end.
 
 %%--------------------------------------------------------------------
diff --git a/lib/odbc/test/odbc_test.hrl b/lib/odbc/test/odbc_test.hrl
index 397d04756b..f7bb338a7f 100644
--- a/lib/odbc/test/odbc_test.hrl
+++ b/lib/odbc/test/odbc_test.hrl
@@ -25,14 +25,16 @@
 
 -define(RDBMS, case os:type() of
 		   {unix, sunos} ->
-		       postgres;
+		       mysql;
 		   {unix,linux} ->
-		       case erlang:system_info(wordsize) of
+		       case  erlang:system_info({wordsize, external}) of
 			   4 ->
 			       mysql;
 			   _ ->
 			       postgres
 		       end;
+		   {unix, darwin} ->
+		       mysql;
 		   {win32, _} ->
 		       sqlserver
 	       end).
diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl
index 3e78105cf3..a8439d5fb6 100644
--- a/lib/odbc/test/odbc_test_lib.erl
+++ b/lib/odbc/test/odbc_test_lib.erl
@@ -36,18 +36,25 @@ match_float(Float, Match, Delta) ->
     (Float < Match + Delta) and (Float > Match - Delta).
 
 odbc_check() ->
-    case erlang:system_info(wordsize) of
-	4 ->
-	    ok;
-	Other ->
-	    case os:type() of
-		{unix, linux} ->
+    case os:type() of
+	{unix,darwin} ->
+	    lists:flatten(
+	      io_lib:format("Currently we have no working drivers for MAC",
+			    []));
+	_ ->
+	    case erlang:system_info({wordsize, external}) of
+		4 ->
 		    ok;
-		Platform ->
-		    lists:flatten(
-		      io_lib:format("Word on platform ~w size"
-				    " ~w not supported", [Other,
-							  Platform]))
+		Other ->
+		    case os:type() of
+			{unix, linux} ->
+			    ok;
+			Platform ->
+			    lists:flatten(
+			      io_lib:format("Word on platform ~w size"
+					    " ~w not supported", [Other,
+								  Platform]))
+		    end
 	    end
     end.
 
@@ -71,9 +78,39 @@ strict(_,_) ->
     ok.
 
 platform_options() ->
+    [].
+
+skip() ->
     case os:type() of
+	{unix, linux} ->
+	    Issue = linux_issue(),
+	    is_sles9(Issue);
 	{unix, sunos} ->
-	    [{scrollable_cursors, off}];
+	    not supported_solaris();
+	_ ->
+	    false
+    end.
+
+supported_solaris() ->
+    case os:version() of
+	{_,10,_} ->
+	    true;
 	_ ->
-	    []
+	    false
     end.
+
+linux_issue() ->
+    {ok, Binary} = file:read_file("/etc/issue"),
+    string:tokens(binary_to_list(Binary), " ").
+
+is_sles11(IssueTokens) ->
+    lists:member("11", IssueTokens).
+
+is_sles10(IssueTokens) ->
+    lists:member("10", IssueTokens).
+
+is_sles9(IssueTokens) ->
+    lists:member("9", IssueTokens).
+
+is_ubuntu(IssueTokens) ->
+    lists:member("Ubuntu", IssueTokens).
diff --git a/lib/odbc/test/postgres.erl b/lib/odbc/test/postgres.erl
index 26a2913d46..d564dbd5ff 100644
--- a/lib/odbc/test/postgres.erl
+++ b/lib/odbc/test/postgres.erl
@@ -30,7 +30,7 @@ connection_string() ->
 	{unix, sunos} ->
 	    "DSN=Postgres;UID=odbctest";
 	{unix, linux} ->
-	    Size = erlang:system_info(wordsize),
+	    Size = erlang:system_info({wordsize, external}),
 	    linux_dist_connection_string(Size)  
     end.
 
@@ -43,7 +43,12 @@ linux_dist_connection_string(4) ->
     end;
 
 linux_dist_connection_string(_) ->
-    "DSN=PostgresLinux64;UID=odbctest".
+    case linux_dist() of
+	"ubuntu" ->
+	    "DSN=PostgresLinux64Ubuntu;UID=odbctest";
+	_ ->
+	    "DSN=PostgresLinux64;UID=odbctest"
+    end.
 			
 linux_dist() ->
     case file:read_file("/etc/issue") of
diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile
index d3deec7600..d4b2079036 100644
--- a/lib/orber/COSS/CosNaming/Makefile
+++ b/lib/orber/COSS/CosNaming/Makefile
@@ -113,7 +113,7 @@ debug:
 	@${MAKE} TYPE=debug
 
 clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES)  $(APP_TARGET)
+	rm -f $(TARGET_FILES) $(GEN_FILES)  $(APP_TARGET) IDL-GENERATED
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC)
@@ -124,13 +124,15 @@ docs:
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
-$(GEN_FILES): cos_naming_ext.idl cos_naming.idl
+IDL-GENERATED: cos_naming_ext.idl cos_naming.idl
 	erlc $(ERL_IDL_FLAGS) +'{this,"CosNaming::NamingContext"}' \
 	+'{this,"CosNaming::NamingContextExt"}' cos_naming_ext.idl
 	erlc $(ERL_IDL_FLAGS) +'{this,"CosNaming::NamingContext"}' cos_naming.idl
+	>IDL-GENERATED
 
-#	echo "ic:gen(cos_naming, [{this, \"CosNaming::NamingContext\"}]), halt()."| $(ERL) $(ERL_IDL_FLAGS)
+$(GEN_FILES): IDL-GENERATED
 
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/orber/doc/src/Makefile b/lib/orber/doc/src/Makefile
index b8e26d5ba3..8a555cb408 100644
--- a/lib/orber/doc/src/Makefile
+++ b/lib/orber/doc/src/Makefile
@@ -28,14 +28,6 @@ VSN=$(ORBER_VSN)
 APPLICATION=orber
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -128,32 +120,10 @@ EXTRA_FILES = summary.html.src \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-TOP_PS_FILE  = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -167,8 +137,6 @@ $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -184,35 +152,6 @@ clean clean_docs:
 	rm -f errs core *~
 	rm -f $(JD_HTML) $(JD_PACK)
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) $(INTERNAL_HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) 
-	rm -f $(JD_HTML) $(JD_PACK)
-
-endif
-
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -224,9 +163,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -236,30 +172,5 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-
-endif
-endif
-
-endif
 
 release_spec:
-
diff --git a/lib/orber/doc/src/Orber/ignore_config_record.inf b/lib/orber/doc/src/Orber/ignore_config_record.inf
deleted file mode 100644
index 0a5053eba3..0000000000
--- a/lib/orber/doc/src/Orber/ignore_config_record.inf
+++ /dev/null
@@ -1 +0,0 @@
-This file makes clearmake use the -T switch for this subdirectory
diff --git a/lib/orber/doc/src/make.dep b/lib/orber/doc/src/make.dep
deleted file mode 100644
index cf5aad747d..0000000000
--- a/lib/orber/doc/src/make.dep
+++ /dev/null
@@ -1,62 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: CosNaming.tex CosNaming_BindingIterator.tex \
-		CosNaming_NamingContext.tex CosNaming_NamingContextExt.tex \
-		Module_Interface.tex any.tex book.tex ch_contents.tex \
-		ch_debugging.tex ch_exceptions.tex \
-		ch_idl_to_erlang_mapping.tex ch_ifr.tex ch_install.tex \
-		ch_interceptors.tex ch_introduction.tex ch_naming_service.tex \
-		ch_orber_kernel.tex ch_orberweb.tex ch_security.tex \
-		ch_stubs.tex corba.tex corba_object.tex example_part.tex \
-		fixed.tex interceptors.tex intro_part.tex \
-		lname.tex lname_component.tex orber.tex orber_acl.tex \
-		orber_diagnostics.tex orber_ifr.tex orber_tc.tex \
-		ref_man.tex tools_debugging_part.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-ch_contents.tex: ../../../../system/doc/definitions/term.defs
-
-ch_idl_to_erlang_mapping.tex: ../../../../system/doc/definitions/term.defs
-
-ch_install.tex: ../../../../system/doc/definitions/term.defs
-
-ch_introduction.tex: ../../../../system/doc/definitions/term.defs
-
-ch_naming_service.tex: ../../../../system/doc/definitions/term.defs
-
-ch_orber_kernel.tex: ../../../../system/doc/definitions/term.defs
-
-orber_ifr.tex: ../../../../system/doc/definitions/term.defs
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: firewall_nat.ps
-
-book.dvi: interceptor_operations.ps
-
-book.dvi: dependent.ps orbs.ps
-
-book.dvi: name.ps
-
-book.dvi: iiop.ps theORB.ps
-
-book.dvi: dataframe1.ps dataframe2.ps dataframe3.ps \
-		dataframe4.ps dataframe5.ps dataframe6.ps \
-		dataframe7.ps dataframe8.ps menuframe.ps
-
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 231872f958..c8477d9252 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -32,7 +32,21 @@
     <file>notes.xml</file>
   </header>
 
-  <section>
+  <section><title>Orber 3.6.22</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> XML files have been corrected. </p>
+          <p>
+	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section>
     <title>Orber 3.6.21</title>
 
     <section>
diff --git a/lib/orber/doc/src/orber_ifr.xml b/lib/orber/doc/src/orber_ifr.xml
index 021082e101..2d47d57476 100644
--- a/lib/orber/doc/src/orber_ifr.xml
+++ b/lib/orber/doc/src/orber_ifr.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -297,7 +297,7 @@
       </desc>
     </func>
     <func>
-      <name>describe_contents(Objref,Limit_type,Exclude_inherited,Max_returned_objs) -> Return</name>
+      <name>describe_contents(Objref, Limit_type, Exclude_inherited, Max_returned_objs) -> Return</name>
       <fsummary>Return a list of descriptions of the IFR objects contained by the target Container object</fsummary>
       <type>
         <v>Objref = #IFR_objref</v>
diff --git a/lib/orber/examples/Stack/Makefile b/lib/orber/examples/Stack/Makefile
index 6e7f292a04..215e57fcbe 100644
--- a/lib/orber/examples/Stack/Makefile
+++ b/lib/orber/examples/Stack/Makefile
@@ -64,6 +64,8 @@ HRL_FILES=
 
 ERL_FILES= $(MODULES:%=%.erl)
 
+GEN_FILES = $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES)
+
 JAVA_CLASSES = \
 	StackClient
 
@@ -94,16 +96,20 @@ ERL_COMPILE_FLAGS += \
 debug opt: $(TARGET_FILES) 
 
 clean:
-	rm -f $(TARGET_FILES) $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES) $(CLASS_FILES)
+	rm -f $(TARGET_FILES) $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES) $(CLASS_FILES) IDL-GENERATED
 	rm -f errs core *~
 
 docs:
 
 test: $(TEST_TARGET_FILES)
 
-
-$(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES): stack.idl
+IDL-GENERATED: stack.idl
 	erlc $(ERL_IDL_FLAGS) stack.idl
+	>IDL-GENERATED
+
+$(GEN_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/orber/include/Makefile b/lib/orber/include/Makefile
deleted file mode 100644
index 219b7085e6..0000000000
--- a/lib/orber/include/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1998-2009. 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.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-EXTERNAL_HRL_FILES= ../include/corba.hrl \
-	../include/ifr_types.hrl \
-	../include/orber_pi.hrl
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-debug opt clean docs:
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
-
-
-release_docs_spec:
-
-
diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
index ccc449333c..e812e22b46 100644
--- a/lib/orber/src/Makefile
+++ b/lib/orber/src/Makefile
@@ -212,7 +212,7 @@ debug:
 opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
 clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET)
+	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
 	rm -f errs core *~
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
@@ -227,15 +227,14 @@ docs:
 # Special Build Targets
 # ----------------------------------------------------
 
-$(GEN_ERL_FILES1) $(GEN_HRL_FILES1): $(ERL_TOP)/lib/ic/include/erlang.idl
+IDL-GENERATED:  $(ERL_TOP)/lib/ic/include/erlang.idl CORBA.idl OrberIFR.idl
 	erlc $(ERL_IDL_FLAGS) $(ERL_TOP)/lib/ic/include/erlang.idl
-
-$(GEN_ERL_FILES2) $(GEN_HRL_FILES2): CORBA.idl
 	erlc $(ERL_IDL_FLAGS) CORBA.idl
+	erlc $(ERL_IDL_FLAGS) +'{this,"Orber::IFR"}' OrberIFR.idl
+	>IDL-GENERATED
 
-$(GEN_ERL_FILES3) $(GEN_HRL_FILES3): OrberIFR.idl
-	erlc $(ERL_IDL_FLAGS) +'{this,"Orber::IFR"}' \
-	OrberIFR.idl
+$(GEN_ERL_FILES): IDL-GENERATED
+$(TARGET_FILES): IDL-GENERATED
 
 $(GEN_ASN_ERL) $(GEN_ASN_HRL): OrberCSIv2.asn1 OrberCSIv2.set.asn
 	erlc $(ERL_COMPILE_FLAGS) $(ASN_FLAGS) +'{inline,"OrberCSIv2"}' OrberCSIv2.set.asn
diff --git a/lib/orber/src/corba.erl b/lib/orber/src/corba.erl
index ecec768544..989e84f581 100644
--- a/lib/orber/src/corba.erl
+++ b/lib/orber/src/corba.erl
@@ -947,7 +947,7 @@ handle_cast2(M, F, A, InternalState, State, Ctx) ->
 	    {noreply, {InternalState, NewState}}
     end.
 
-handle_exit(InternalState, State, {undef, [{M, F, _}|_]} = Reason, 
+handle_exit(InternalState, State, {undef, [{M, F, _, _}|_]} = Reason, 
 	    OnewayOp, {M, F}, A) ->
     case catch check_exports(M:module_info(exports), F) of
 	{'EXIT',{undef,_}} ->
@@ -979,7 +979,7 @@ handle_exit(InternalState, State, {undef, [{M, F, _}|_]} = Reason,
 			     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 4),
 					    completion_status=?COMPLETED_MAYBE})
     end;
-handle_exit(InternalState, State, {undef, [{M2, F2, A2}|_]} = Reason, 
+handle_exit(InternalState, State, {undef, [{M2, F2, A2, _}|_]} = Reason, 
 	    OnewayOp, {M, F}, A) ->
     case catch check_exports(M2:module_info(exports), F2) of
 	{'EXIT',{undef,_}} ->
diff --git a/lib/orber/src/orber_diagnostics.erl b/lib/orber/src/orber_diagnostics.erl
index c12dbfa896..c115d79524 100644
--- a/lib/orber/src/orber_diagnostics.erl
+++ b/lib/orber/src/orber_diagnostics.erl
@@ -130,10 +130,10 @@ missing_modules_helper([[Mod, Type]|T], ErrorsFound) when Type == ?IFR_StructDef
     end;
 missing_modules_helper([[Mod, Type]|T], ErrorsFound) when Type == ?IFR_InterfaceDef ->
     case catch Mod:oe_get_interface() of
-	{'EXIT', {undef,[{Mod, _, _}|_]}} ->
+	{'EXIT', {undef,[{Mod, _, _, _}|_]}} ->
 	    io:format("Missing (Interface): ~p~n", [Mod]),
 	    missing_modules_helper(T, ErrorsFound + 1);
-	{'EXIT', {undef,[{OtherMod, _, _}|_]}} ->
+	{'EXIT', {undef,[{OtherMod, _, _, _}|_]}} ->
 	    io:format("Missing (Inherited by the ~p Interface): ~p~n", 
 		      [Mod, OtherMod]),
 	    missing_modules_helper(T, ErrorsFound + 1);
diff --git a/lib/orber/src/orber_ifr.erl b/lib/orber/src/orber_ifr.erl
index e56672be93..9631a268e4 100644
--- a/lib/orber/src/orber_ifr.erl
+++ b/lib/orber/src/orber_ifr.erl
@@ -500,7 +500,7 @@ get_tc(Id, Type) ->
 	    case catch Module:tc() of
 		{'EXIT', Reason} ->
 		    case Reason of
-			{undef,[{Module, tc,[]}|_]} ->
+			{undef,[{Module, tc,[],_}|_]} ->
 			    orber:dbg("[~p] ~p:get_tc(~p);~nMissing ~p:tc()~n",
 				      [?LINE, ?MODULE, Id, Module], ?DEBUG_LEVEL),
 			    corba:raise(#'UNKNOWN'{minor=(?ORBER_VMCID bor 1),
diff --git a/lib/orber/test/Makefile b/lib/orber/test/Makefile
index b682bcf24b..996d0d1874 100644
--- a/lib/orber/test/Makefile
+++ b/lib/orber/test/Makefile
@@ -184,31 +184,17 @@ docs:
 # Special Targets
 # ----------------------------------------------------
 
-#
-# Each IDL file produces many target files so no pattern
-# rule can be used.
-#
-TGT_ORBER = \
-	$(GEN_HRL_ORBER:%=$(IDLOUTDIR)/%) \
-	$(GEN_MOD_ORBER:%=$(IDLOUTDIR)/%.erl)
-TGT_IIOP = \
-	$(GEN_HRL_IIOP:%=$(IDLOUTDIR)/%) \
-	$(GEN_MOD_IIOP:%=$(IDLOUTDIR)/%.erl)
-
-TGT_TEST_SERVER = \
-	$(GEN_HRL_TEST_SERVER:%=$(IDLOUTDIR)/%) \
-	$(GEN_MOD_TEST_SERVER:%=$(IDLOUTDIR)/%.erl)
-
-$(TGT_ORBER): orber_test.idl
+IDL-GENERATED: orber_test.idl iiop_test.idl orber_test_server.idl
 	erlc $(ERL_IDL_FLAGS) -o$(IDLOUTDIR) orber_test.idl
-
-$(TGT_IIOP): iiop_test.idl
 	erlc $(ERL_IDL_FLAGS) -o$(IDLOUTDIR) \
 		+'{preproc_flags,"-I../COSS/CosNaming"}' iiop_test.idl
-
-$(TGT_TEST_SERVER): orber_test_server.idl
 	erlc $(ERL_IDL_FLAGS) -o$(IDLOUTDIR) \
 	+'{cfgfile,"orber_test_server.cfg"}' orber_test_server.idl
+	>IDL-GENERATED
+
+$(GEN_FILES): IDL-GENERATED
+
+$(TARGET_FILES): IDL-GENERATED
 
 # ----------------------------------------------------
 # Release Targets
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index 35aabd51cd..29b21e8e01 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1,3 +1,3 @@
 
-ORBER_VSN = 3.6.21
+ORBER_VSN = 3.6.22
 
diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
index 1a371eb380..b81d3f564b 100644
--- a/lib/os_mon/c_src/Makefile.in
+++ b/lib/os_mon/c_src/Makefile.in
@@ -82,13 +82,9 @@ ALL_CFLAGS = @CFLAGS@ @DEFS@ $(CFLAGS)
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(OBJDIR) $(BINDIR) $(TARGET_FILES)
+_create_dirs := $(shell mkdir -p $(OBJDIR) $(BINDIR))
 
-$(OBJDIR):
-	-@mkdir -p $(OBJDIR)
-
-$(BINDIR):
-	-@mkdir -p $(BINDIR)
+debug opt: $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
diff --git a/lib/os_mon/c_src/cpu_sup.c b/lib/os_mon/c_src/cpu_sup.c
index fbf318c614..9c5f9a6aa5 100644
--- a/lib/os_mon/c_src/cpu_sup.c
+++ b/lib/os_mon/c_src/cpu_sup.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2011. 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
@@ -191,7 +191,10 @@ int main(int argc, char** argv) {
 static cpu_t *read_procstat(FILE *fp, cpu_t *cpu) {
     char buffer[BUFFERSIZE];
 
-    fgets(buffer, BUFFERSIZE, fp);
+    if (fgets(buffer, BUFFERSIZE, fp) == NULL) {
+	memset(cpu, 0, sizeof(cpu_t));
+	return cpu;
+    }
     sscanf(buffer, "cpu%u %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
 	&(cpu->id),
 	&(cpu->user),
@@ -223,7 +226,11 @@ static void util_measure(unsigned int **result_vec, int *result_sz) {
 	return;
     }
 
-    fgets(buffer, BUFFERSIZE, fp); /*ignore read*/
+	/*ignore read*/
+    if (fgets(buffer, BUFFERSIZE, fp) == NULL) {
+	*result_sz = 0;
+	return;
+    }
     rv = *result_vec; 
     rv[0] = no_of_cpus;
     rv[1] = CU_VALUES;
@@ -447,8 +454,12 @@ static void sendv(unsigned int data[], int ints) {
 }
 
 static void error(char* err_msg) {
-  write(FD_ERR, err_msg, strlen(err_msg));
-  write(FD_ERR, "\n", 1);
+  /* 
+   * if we get error here we have trouble,
+   * silence unnecessary warnings
+   */
+  if(write(FD_ERR, err_msg, strlen(err_msg)));
+  if(write(FD_ERR, "\n", 1));
   exit(-1);
 }
 
diff --git a/lib/os_mon/doc/src/make.dep b/lib/os_mon/doc/src/make.dep
deleted file mode 100644
index b657f2e036..0000000000
--- a/lib/os_mon/doc/src/make.dep
+++ /dev/null
@@ -1,21 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex cpu_sup.tex disksup.tex memsup.tex \
-		nteventlog.tex os_mon.tex os_mon_mib.tex os_sup.tex \
-		ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index 3b5dbe3146..f641bbd828 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,20 @@
   </header>
   <p>This document describes the changes made to the OS_Mon application.</p>
 
+<section><title>Os_Mon 2.2.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Remove misc. compiler warnings</p>
+          <p>
+	    Own Id: OTP-9542</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Os_Mon 2.2.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/os_mon/mibs/Makefile b/lib/os_mon/mibs/Makefile
index cbbc337491..a361fef378 100644
--- a/lib/os_mon/mibs/Makefile
+++ b/lib/os_mon/mibs/Makefile
@@ -78,6 +78,9 @@ $(SNMP_BIN_TARGET_DIR)/OTP-MIB.bin:     $(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-MI
 v1/%.mib.v1: %.mib
 	$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
 
+$(SNMP_BIN_TARGET_DIR)/OTP-OS-MON-MIB.bin: \
+	$(SNMP_BIN_TARGET_DIR)/OTP-REG.bin \
+	$(SNMP_BIN_TARGET_DIR)/OTP-MIB.bin \
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index 2d583a398b..f000e24a8f 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.2.6
+OS_MON_VSN = 2.2.7
diff --git a/lib/otp_mibs/doc/src/make.dep b/lib/otp_mibs/doc/src/make.dep
deleted file mode 100644
index 2885155315..0000000000
--- a/lib/otp_mibs/doc/src/make.dep
+++ /dev/null
@@ -1,20 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex introduction.tex mibs.tex otp_mib.tex \
-		part.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/parsetools/doc/src/leex.xml b/lib/parsetools/doc/src/leex.xml
index 1fa426a79e..d5c24c303d 100644
--- a/lib/parsetools/doc/src/leex.xml
+++ b/lib/parsetools/doc/src/leex.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2009</year><year>2009</year>
+      <year>2009</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/parsetools/doc/src/make.dep b/lib/parsetools/doc/src/make.dep
deleted file mode 100644
index 3a09ecdedd..0000000000
--- a/lib/parsetools/doc/src/make.dep
+++ /dev/null
@@ -1,21 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex leex.tex ref_man.tex yecc.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-ref_man.tex: ../../../../system/doc/definitions/term.defs
-
diff --git a/lib/parsetools/doc/src/notes.xml b/lib/parsetools/doc/src/notes.xml
index 77b3a1a657..0c611db1ec 100644
--- a/lib/parsetools/doc/src/notes.xml
+++ b/lib/parsetools/doc/src/notes.xml
@@ -30,6 +30,52 @@
   </header>
   <p>This document describes the changes made to the Parsetools application.</p>
 
+<section><title>Parsetools 2.0.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Dialyzer warnings have been removed. </p>
+          <p>
+	    Own Id: OTP-8318</p>
+        </item>
+        <item>
+          <p>
+	    yecc: add warnings_as_errors option(Thanks to Tuncer
+	    ayaz)</p>
+          <p>
+	    Own Id: OTP-9376</p>
+        </item>
+        <item>
+          <p>
+	    Fix incorrect order of pseudo variables in yecc example</p>
+          <p>
+	    The example is for converting from infix to prefix. This
+	    change uses to correct ordering of the triplet. (Thanks
+	    to Garret Smith)</p>
+          <p>
+	    Own Id: OTP-9484</p>
+        </item>
+        <item>
+          <p>
+	    Implement or fix -Werror option</p>
+          <p>
+	    If -Werror is enabled and there are warnings no output
+	    file is written. Also make sure that error/warning
+	    reporting is consistent. (Thanks to Tuncer Ayaz)</p>
+          <p>
+	    Own Id: OTP-9536</p>
+        </item>
+        <item>
+	    <p> XML files have been corrected. </p>
+          <p>
+	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Parsetools 2.0.5</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/parsetools/doc/src/yecc.xml b/lib/parsetools/doc/src/yecc.xml
index c712609cf4..66bc6f4795 100644
--- a/lib/parsetools/doc/src/yecc.xml
+++ b/lib/parsetools/doc/src/yecc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -336,7 +336,7 @@ element -> list : '$1'.    </code>
     <code type="none">
 {cons, {atom, 1, a,} {cons, {atom, 1, b},
                             {cons, {atom, 1, c}, nil}}}    </code>
-    <p>The associated code contains <c>pseudo variables</c><c>'$1'</c>, <c>'$2'</c>, <c>'$3'</c>, etc. which refer to (are
+    <p>The associated code contains <c>pseudo variables</c> <c>'$1'</c>, <c>'$2'</c>, <c>'$3'</c>, etc. which refer to (are
       bound to) the values associated previously by the parser with
       the symbols of the right hand side of the rule. When these
       symbols are terminal categories, the values are token tuples of
@@ -425,9 +425,9 @@ myparser:parse_and_scan({Mod, Tokenizer, Args})    </code>
 Nonterminals E T F.
 Terminals '+' '*' '(' ')' number.
 Rootsymbol E.
-E -> E '+' T: ['$1', '$2', '$3'].
+E -> E '+' T: ['$2', '$1', '$3'].
 E -> T : '$1'.
-T -> T '*' F: ['$1', '$2', '$3'].
+T -> T '*' F: ['$2', '$1', '$3'].
 T -> F : '$1'.
 F -> '(' E ')' : '$2'.
 F -> number : '$1'.    </code>
@@ -438,8 +438,8 @@ Terminals '+' '*' '(' ')' number.
 Rootsymbol E.
 Left 100 '+'.
 Left 200 '*'.
-E -> E '+' E : ['$1', '$2', '$3'].
-E -> E '*' E : ['$1', '$2', '$3'].
+E -> E '+' E : ['$2', '$1', '$3'].
+E -> E '*' E : ['$2', '$1', '$3'].
 E -> '(' E ')' : '$2'.
 E -> number : '$1'.    </code>
     <p>3. An overloaded minus operator:</p>
diff --git a/lib/parsetools/include/yeccpre.hrl b/lib/parsetools/include/yeccpre.hrl
index 80a3afbdb6..f638529aa4 100644
--- a/lib/parsetools/include/yeccpre.hrl
+++ b/lib/parsetools/include/yeccpre.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -67,7 +67,7 @@ yeccpars0(Tokens, Tzr, State, States, Vstack) ->
             Error
     end.
 
-yecc_error_type(function_clause, [{?MODULE,F,ArityOrArgs} | _]) ->
+yecc_error_type(function_clause, [{?MODULE,F,ArityOrArgs,_} | _]) ->
     case atom_to_list(F) of
         "yeccgoto_" ++ SymbolL ->
             {ok,[{atom,_,Symbol}],_} = erl_scan:string(SymbolL),
diff --git a/lib/parsetools/src/leex.erl b/lib/parsetools/src/leex.erl
index 942e9928b1..cdf20461d9 100644
--- a/lib/parsetools/src/leex.erl
+++ b/lib/parsetools/src/leex.erl
@@ -73,12 +73,15 @@
 %%% Interface to erl_compile.
 
 compile(Input0, Output0,
-        #options{warning = WarnLevel, verbose=Verbose, includes=Includes}) ->
+        #options{warning = WarnLevel, verbose=Verbose, includes=Includes,
+		 specific=Specific}) ->
     Input = assure_extension(shorten_filename(Input0), ".xrl"),
     Output = assure_extension(shorten_filename(Output0), ".erl"),
     Includefile = lists:sublist(Includes, 1),
+    Werror = proplists:get_bool(warnings_as_errors, Specific),
     Opts = [{scannerfile,Output},{includefile,Includefile},{verbose,Verbose},
-            {report_errors,true},{report_warnings,WarnLevel > 0}],
+            {report_errors,true},{report_warnings,WarnLevel > 0},
+	    {warnings_as_errors, Werror}],
     case file(Input, Opts) of
         {ok, _} ->
             ok;
@@ -107,7 +110,7 @@ file(File, Opts0) ->
     St = try
              {ok,REAs,Actions,Code,St2} = parse_file(St1),
              {DFA,DF} = make_dfa(REAs, St2),
-             case werr(St2) of
+             case werror(St2) of
                  false ->
                      St3 = out_file(St2, DFA, DF, Actions, Code),
                      case lists:member(dfa_graph, St3#leex.opts) of
@@ -259,9 +262,9 @@ leex_ret(St) ->
     report_warnings(St),
     Es = pack_errors(St#leex.errors),
     Ws = pack_warnings(St#leex.warnings),
-    Werr = werr(St),
+    Werror = werror(St),
     if 
-        Werr ->
+        Werror ->
             do_error_return(St, Es, Ws);
         Es =:= [] -> 
             case member(return_warnings, St#leex.opts) of
@@ -278,9 +281,9 @@ do_error_return(St, Es, Ws) ->
         false -> error
     end.
 
-werr(St) ->
-    member(warnings_as_errors, St#leex.opts)
-        andalso length(St#leex.warnings) > 0.
+werror(St) ->
+    St#leex.warnings =/= []
+	andalso member(warnings_as_errors, St#leex.opts).
 
 pack_errors([{File,_} | _] = Es) ->
     [{File, flatmap(fun({_,E}) -> [E] end, sort(Es))}];
@@ -304,15 +307,24 @@ report_errors(St) ->
              end, report_errors, St#leex.opts).
 
 report_warnings(St) ->
-    when_opt(fun () ->
-                     foreach(fun({File,{none,Mod,W}}) -> 
-                                     io:fwrite("~s: Warning: ~s\n",
-                                               [File,Mod:format_error(W)]);
-                                ({File,{Line,Mod,W}}) -> 
-                                     io:fwrite("~s:~w: Warning: ~s\n",
-                                               [File,Line,Mod:format_error(W)])
-                             end, sort(St#leex.warnings))
-             end, report_warnings, St#leex.opts).
+    Werror = member(warnings_as_errors, St#leex.opts),
+    Prefix = case Werror of
+		 true -> "";
+		 false -> "Warning: "
+	     end,
+    ReportWerror = Werror andalso member(report_errors, St#leex.opts),
+    ShouldReport = member(report_warnings, St#leex.opts) orelse ReportWerror,
+    when_bool(fun () ->
+		      foreach(fun({File,{none,Mod,W}}) ->
+				      io:fwrite("~s: ~s~s\n",
+						[File,Prefix,
+						 Mod:format_error(W)]);
+				 ({File,{Line,Mod,W}}) ->
+				      io:fwrite("~s:~w: ~s~s\n",
+						[File,Line,Prefix,
+						 Mod:format_error(W)])
+			      end, sort(St#leex.warnings))
+	      end, ShouldReport).
 
 -spec add_error(_, #leex{}) -> no_return().
 add_error(E, St) ->
@@ -360,6 +372,12 @@ when_opt(Do, Opt, Opts) ->
         false -> ok
     end.
 
+when_bool(Do, Bool) ->
+    case Bool of
+	true -> Do();
+	false -> ok
+    end.
+
 verbose_print(St, Format, Args) ->
     when_opt(fun () -> io:fwrite(Format, Args) end, verbose, St#leex.opts).
 
diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl
index 72cff3af92..b0792a6ed8 100644
--- a/lib/parsetools/src/yecc.erl
+++ b/lib/parsetools/src/yecc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -133,12 +133,15 @@
 %%% Interface to erl_compile.
 
 compile(Input0, Output0, 
-        #options{warning = WarnLevel, verbose=Verbose, includes=Includes}) ->
+        #options{warning = WarnLevel, verbose=Verbose, includes=Includes,
+		 specific=Specific}) ->
     Input = shorten_filename(Input0),
     Output = shorten_filename(Output0),
     Includefile = lists:sublist(Includes, 1),
+    Werror = proplists:get_bool(warnings_as_errors, Specific),
     Opts = [{parserfile,Output}, {includefile,Includefile}, {verbose,Verbose},
-            {report_errors, true}, {report_warnings, WarnLevel > 0}],
+            {report_errors, true}, {report_warnings, WarnLevel > 0},
+	    {warnings_as_errors, Werror}],
     case file(Input, Opts) of
         {ok, _OutFile} ->
             ok;
@@ -411,15 +414,15 @@ infile(Parent, Infilex, Options) ->
              {error, Reason} ->
                  add_error(St0#yecc.infile, none, {file_error, Reason}, St0)
          end,
-    case {St#yecc.errors, werr(St)} of
+    case {St#yecc.errors, werror(St)} of
         {[], false} -> ok;
         _ -> _ = file:delete(St#yecc.outfile)
     end,
     Parent ! {self(), yecc_ret(St)}.
 
-werr(St) ->
-    member(warnings_as_errors, St#yecc.options)
-        andalso length(St#yecc.warnings) > 0.
+werror(St) ->
+    St#yecc.warnings =/= []
+	andalso member(warnings_as_errors, St#yecc.options).
 
 outfile(St0) ->
     case file:open(St0#yecc.outfile, [write, delayed_write]) of
@@ -783,9 +786,9 @@ yecc_ret(St0) ->
     report_warnings(St),
     Es = pack_errors(St#yecc.errors),
     Ws = pack_warnings(St#yecc.warnings),
-    Werr = werr(St),
+    Werror = werror(St),
     if 
-        Werr ->
+        Werror ->
             do_error_return(St, Es, Ws);
         Es =:= [] -> 
             case member(return_warnings, St#yecc.options) of
@@ -849,14 +852,22 @@ report_errors(St) ->
     end.
 
 report_warnings(St) ->
-    case member(report_warnings, St#yecc.options) of
+    Werror = member(warnings_as_errors, St#yecc.options),
+    Prefix = case Werror of
+		 true -> "";
+		 false -> "Warning: "
+	     end,
+    ReportWerror = Werror andalso member(report_errors, St#yecc.options),
+    case member(report_warnings, St#yecc.options) orelse ReportWerror of
         true ->
             foreach(fun({File,{none,Mod,W}}) -> 
-                            io:fwrite(<<"~s: Warning: ~s\n">>, 
-                                      [File,Mod:format_error(W)]);
+                            io:fwrite(<<"~s: ~s~s\n">>,
+                                      [File,Prefix,
+				       Mod:format_error(W)]);
                        ({File,{Line,Mod,W}}) -> 
-                            io:fwrite(<<"~s:~w: Warning: ~s\n">>, 
-                                      [File,Line,Mod:format_error(W)])
+                            io:fwrite(<<"~s:~w: ~s~s\n">>,
+                                      [File,Line,Prefix,
+				       Mod:format_error(W)])
                     end, sort(St#yecc.warnings));
         false -> 
             ok
diff --git a/lib/parsetools/src/yeccparser.erl b/lib/parsetools/src/yeccparser.erl
index 63127802ee..e4b8b06db5 100644
--- a/lib/parsetools/src/yeccparser.erl
+++ b/lib/parsetools/src/yeccparser.erl
@@ -17,7 +17,7 @@ line_of(Token) ->
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -83,7 +83,7 @@ yeccpars0(Tokens, Tzr, State, States, Vstack) ->
             Error
     end.
 
-yecc_error_type(function_clause, [{?MODULE,F,ArityOrArgs} | _]) ->
+yecc_error_type(function_clause, [{?MODULE,F,ArityOrArgs,_} | _]) ->
     case atom_to_list(F) of
         "yeccgoto_" ++ SymbolL ->
             {ok,[{atom,_,Symbol}],_} = erl_scan:string(SymbolL),
diff --git a/lib/parsetools/test/leex_SUITE.erl b/lib/parsetools/test/leex_SUITE.erl
index 48312445ef..1e50aedf07 100644
--- a/lib/parsetools/test/leex_SUITE.erl
+++ b/lib/parsetools/test/leex_SUITE.erl
@@ -152,6 +152,7 @@ file(Config) when is_list(Config) ->
     ?line writable(Dotfile),
     file:delete(Dotfile),
 
+    ok = file:delete(Scannerfile),
     Warn = <<"Definitions.1998\n"
              "D  = [0-9]\n"
              "Rules.\n"
@@ -159,11 +160,15 @@ file(Config) when is_list(Config) ->
              "Erlang code.\n">>,
     ok = file:write_file(Filename, Warn),
     error = leex:file(Filename, [warnings_as_errors]),
+    false = filelib:is_regular(Scannerfile),
     error = leex:file(Filename, [return_warnings,warnings_as_errors]),
-    {ok,Scannerfile,[{Filename,[{1,leex,ignored_characters}]}]} =
-	leex:file(Filename, [return_warnings]),
+    false = filelib:is_regular(Scannerfile),
     {error,_,[{Filename,[{1,leex,ignored_characters}]}]} =
-	leex:file(Filename, [return_errors,warnings_as_errors]),
+        leex:file(Filename, [return_errors,warnings_as_errors]),
+    false = filelib:is_regular(Scannerfile),
+    {ok,Scannerfile,[{Filename,[{1,leex,ignored_characters}]}]} =
+        leex:file(Filename, [return_warnings]),
+    true = filelib:is_regular(Scannerfile),
 
     file:delete(Filename),
     ok.
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index 0133524950..a5f66b48e9 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -173,6 +173,7 @@ syntax(Config) when is_list(Config) ->
     %% Report errors. Very simple test of format_error/1.
     Ret = [return, {report, true}],
     Filename = filename:join(Dir, "file.yrl"),
+    Parserfile = filename:join(Dir, "file.erl"),
     Parserfile1 = filename:join(Dir, "a file"),
 
     ?line ok = file:write_file(Filename, <<"">>),
@@ -248,12 +249,17 @@ syntax(Config) when is_list(Config) ->
         yecc:file(Filename, Ret),
 
     %% Bad declaration with warnings_as_errors.
+    ok = file:delete(Parserfile),
     error = yecc:file(Filename, [warnings_as_errors]),
+    false = filelib:is_regular(Parserfile),
     error = yecc:file(Filename, [return_warnings,warnings_as_errors]),
-    {ok,_,[{_,[{2,yecc,bad_declaration}]}]} =
-        yecc:file(Filename, [return_warnings]),
+    false = filelib:is_regular(Parserfile),
     {error,_,[{_,[{2,yecc,bad_declaration}]}]} =
         yecc:file(Filename, [return_errors,warnings_as_errors]),
+    false = filelib:is_regular(Parserfile),
+    {ok,_,[{_,[{2,yecc,bad_declaration}]}]} =
+        yecc:file(Filename, [return_warnings]),
+    true = filelib:is_regular(Parserfile),
 
     %% Bad declaration.
     ?line ok = file:write_file(Filename, 
diff --git a/lib/parsetools/vsn.mk b/lib/parsetools/vsn.mk
index 812bf21f03..093523f0e7 100644
--- a/lib/parsetools/vsn.mk
+++ b/lib/parsetools/vsn.mk
@@ -1 +1 @@
-PARSETOOLS_VSN = 2.0.5
+PARSETOOLS_VSN = 2.0.6
diff --git a/lib/percept/doc/src/make.dep b/lib/percept/doc/src/make.dep
deleted file mode 100644
index df16cffd4f..0000000000
--- a/lib/percept/doc/src/make.dep
+++ /dev/null
@@ -1,34 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex egd.tex egd_ug.tex part.tex percept.tex \
-		percept_profile.tex percept_ug.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-egd_ug.tex: img.erl img_esi.erl
-
-percept_ug.tex: sorter.erl
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: img_esi_result.ps test1.ps test2.ps test3.ps \
-		test4.ps
-
-book.dvi: percept_compare.ps percept_overview.ps percept_processes.ps \
-		percept_processinfo.ps
-
diff --git a/lib/percept/doc/src/notes.xml b/lib/percept/doc/src/notes.xml
index 33bfa7baab..95c2bbda56 100644
--- a/lib/percept/doc/src/notes.xml
+++ b/lib/percept/doc/src/notes.xml
@@ -32,6 +32,32 @@
   </header>
   <p>This document describes the changes made to the Percept application.</p>
 
+<section><title>Percept 0.8.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix message handling in select requests</p>
+          <p>
+	    percept_db used to send results in untagged messages, and
+	    use a non selective receive to extract them. When percept
+	    is used from the shell process, this can confuse other
+	    messages with the actual result.</p>
+          <p>
+	    Add a tag to the message to be {result, Result}. Add
+	    demonitor to avoid keeping DOWN message in the queue fix
+	    one spec in do_start/0</p>
+          <p>
+	    (Thanks to Ahmed Omar)</p>
+          <p>
+	    Own Id: OTP-9490</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Percept 0.8.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/percept/src/percept_db.erl b/lib/percept/src/percept_db.erl
index 52e9afb78f..68eb38d298 100644
--- a/lib/percept/src/percept_db.erl
+++ b/lib/percept/src/percept_db.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -92,7 +92,7 @@ restart(PerceptDB)->
         stop_sync(PerceptDB),
         do_start().
 
-%% @spec do_start(pid()) -> pid()
+%% @spec do_start() -> pid()
 %% @private
 %% @doc starts the percept database.
 
@@ -131,6 +131,7 @@ stop_sync(Pid)->
         {'DOWN', MonitorRef, _Type, Pid, _Info}->
             true
     after ?STOP_TIMEOUT->
+            erlang:demonitor(MonitorRef, [flush]),
             exit(Pid, kill)
     end.
 
@@ -166,14 +167,14 @@ insert(Trace) ->
 
 select(Query) -> 
     percept_db ! {select, self(), Query},
-    receive Match -> Match end.
+    receive {result, Match} -> Match end.
 
 %% @spec select(atom(), list()) -> Result
 %% @equiv select({Table,Options}) 
 
 select(Table, Options) -> 
     percept_db ! {select, self(), {Table, Options}},
-    receive Match -> Match end.
+    receive {result, Match} -> Match end.
 
 %% @spec consolidate() -> Result
 %% @doc Checks timestamp and state-flow inconsistencies in the
@@ -213,7 +214,7 @@ loop_percept_db() ->
 	    insert_trace(clean_trace(Trace)),
 	    loop_percept_db();
 	{select, Pid, Query} ->
-	    Pid ! select_query(Query),
+	    Pid ! {result, select_query(Query)},
 	    loop_percept_db();
 	{action, stop} -> 
 	    stopped;
@@ -222,7 +223,7 @@ loop_percept_db() ->
 	    loop_percept_db();
         {operate, Pid, {Table, {Fun, Start}}} ->
 	    Result = ets:foldl(Fun, Start, Table),
-	    Pid ! Result,
+	    Pid ! {result, Result},
 	    loop_percept_db();
 	Unhandled -> 
 	    io:format("loop_percept_db, unhandled query: ~p~n", [Unhandled]),
diff --git a/lib/percept/vsn.mk b/lib/percept/vsn.mk
index 2a302991aa..3b4d9bbb64 100644
--- a/lib/percept/vsn.mk
+++ b/lib/percept/vsn.mk
@@ -1 +1 @@
-PERCEPT_VSN = 0.8.5
+PERCEPT_VSN = 0.8.6
diff --git a/lib/pman/doc/src/make.dep b/lib/pman/doc/src/make.dep
deleted file mode 100644
index 2f6a8a06cd..0000000000
--- a/lib/pman/doc/src/make.dep
+++ /dev/null
@@ -1,26 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex part.tex pman.tex pman_chapter.tex \
-		ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: main_window.ps options.ps trace.ps
-
diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
index 94abec083c..c4f8d65aa7 100644
--- a/lib/public_key/asn1/Makefile
+++ b/lib/public_key/asn1/Makefile
@@ -65,7 +65,7 @@ EBIN = ../ebin
 EXTRA_ERLC_FLAGS = 
 ERL_COMPILE_FLAGS += $(EXTRA_ERLC_FLAGS)
 
-ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj +asn1config +inline
+ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj +asn1config +inline +nif
 
 # ----------------------------------------------------
 # Targets
@@ -79,7 +79,7 @@ clean:
 
 docs:
 
-%.erl: %.set.asn
+%.erl %.hrl: %.set.asn
 	erlc $(ASN_FLAGS) $<
 
 $(HRL_FILES):	$(ASN_HRLS)
diff --git a/lib/public_key/asn1/README b/lib/public_key/asn1/README
index 5fb8cf9725..2a880e2d51 100644
--- a/lib/public_key/asn1/README
+++ b/lib/public_key/asn1/README
@@ -46,6 +46,6 @@ diff -r1.1 PKIXAttributeCertificate.asn1
 ---
 >                 version        AttCertVersion,  -- version is v2
 
-4. Defenitions of publuic keys from PKCS-1.asn1 present in
+4. Definitions of public keys from PKCS-1.asn1 present in
 PKIX1Algorithms88.asn1 where removed as we take them directly from
 PKCS-1.asn1
\ No newline at end of file
diff --git a/lib/public_key/doc/src/Makefile b/lib/public_key/doc/src/Makefile
index afb17399da..9616a96195 100644
--- a/lib/public_key/doc/src/Makefile
+++ b/lib/public_key/doc/src/Makefile
@@ -29,14 +29,6 @@ VSN=$(PUBLIC_KEY_VSN)
 APPLICATION=public_key
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif 
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -79,33 +71,10 @@ EXTRA_FILES = \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-        $(XML_PART_FILES:%.xml=%.tex) \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = public_key-$(VSN).pdf
-TOP_PS_FILE  = public_key-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif
-
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
@@ -118,8 +87,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -134,33 +101,6 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ min_head.gif \
-	$(LATEX_CLEAN)
-
-endif
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -173,8 +113,6 @@ debug opt:
 # ----------------------------------------------------
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -184,30 +122,6 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-endif
-endif
-
-endif
-
 release_spec:
 
 info:
diff --git a/lib/public_key/doc/src/introduction.xml b/lib/public_key/doc/src/introduction.xml
index 8cf11ee10e..a21fcf3576 100644
--- a/lib/public_key/doc/src/introduction.xml
+++ b/lib/public_key/doc/src/introduction.xml
@@ -48,5 +48,13 @@
     of the concepts of using public keys.</p>
   </section>
 
+  <section>
+    <title>Performance tips</title>
+    <p>The public_key decode and encode functions will try to use the nifs
+    which are in the asn1 compilers runtime modules if they can be found.
+    So for the best  performance you want to have the asn1 application in the
+    path of your system. </p>
+  </section>
+
 </chapter>
 
diff --git a/lib/public_key/doc/src/make.dep b/lib/public_key/doc/src/make.dep
deleted file mode 100644
index 2675556f1b..0000000000
--- a/lib/public_key/doc/src/make.dep
+++ /dev/null
@@ -1,21 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex cert_records.tex introduction.tex \
-		part.tex public_key.tex public_key_records.tex \
-		ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 9d77750ea2..efd4a37eb9 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -34,6 +34,23 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 0.13</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    replace "a ssl" with "an ssl" reindent
+	    pkix_path_validation/3 Trivial documentation fixes
+	    (Thanks to Christian von Roques )</p>
+          <p>
+	    Own Id: OTP-9464</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 0.12</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index d60d91cd83..9a3832c68b 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -63,7 +63,7 @@
     <p><code>pki_asn1_type() = 'Certificate' | 'RSAPrivateKey'| 'RSAPublicKey'
     'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo'</code></p>
     
-    <p><code>pem_entry () = {pki_asn1_type(), binary() %% DER or encrypted DER
+    <p><code>pem_entry () = {pki_asn1_type(), binary(), %% DER or encrypted DER
           not_encrypted | {"DES-CBC" | "DES-EDE3-CBC",  crypto:rand_bytes(8)}}.</code></p>
     
     <p><code>rsa_public_key()  = #'RSAPublicKey'{}</code></p>
@@ -72,8 +72,6 @@
 
     <p><code>dsa_public_key() = {integer(),  #'Dss-Parms'{}} </code></p>
 
-    <p><code>rsa_private_key() = #'RSAPrivateKey'{} </code></p>
-    
     <p><code>dsa_private_key() = #'DSAPrivateKey'{}</code></p>
     
     <p><code> public_crypt_options() = [{rsa_pad, rsa_padding()}]. </code></p>
@@ -149,7 +147,7 @@
     <name>der_decode(Asn1type, Der) -> term()</name>
     <fsummary> Decodes a public key asn1 der encoded entity.</fsummary>
     <type>
-      <v>Asn1Type = atom() -</v>
+      <v>Asn1Type = atom()</v>
       <d> ASN.1 type present in the public_key applications
       asn1 specifications.</d>
       <v>Der = der_encoded()</v>
@@ -166,7 +164,8 @@
       <v>Asn1Type = atom()</v>
       <d> Asn1 type present in the public_key applications
 	 ASN.1 specifications.</d>
-      <v>Entity = term() - The erlang representation of <c> Asn1Type</c></v>
+      <v>Entity = term()</v>
+      <d>The erlang representation of <c>Asn1Type</c></d>
   </type> 
   <desc> 
     <p> Encodes a public key entity with ASN.1 DER encoding.</p>
@@ -218,12 +217,13 @@
     <fsummary> Creates a pem entry that can be fed to pem_encode/1.</fsummary>
     <type>
       <v>Asn1Type = pki_asn1_type()</v>
-      <v>Entity = term() - The Erlang representation of
+      <v>Entity = term()</v>
+      <d>The Erlang representation of
       <c>Asn1Type</c>.  If <c>Asn1Type</c> is 'SubjectPublicKeyInfo'
       then <c>Entity</c> must be either an rsa_public_key() or a
       dsa_public_key() and this function will create the appropriate
       'SubjectPublicKeyInfo' entry.
-      </v>
+      </d>
       <v>CipherInfo = {"DES-CBC" | "DES-EDE3-CBC",  crypto:rand_bytes(8)}</v>
       <v>Password = string()</v> 
   </type> 
@@ -281,7 +281,7 @@
   <desc> 
     <p>Der encodes a pkix x509 certificate or part of such a
     certificate. This function must be used for encoding certificates or parts of certificates
-    that are decoded/created on the otp format, whereas for the plain format this
+    that are decoded/created in the otp format, whereas for the plain format this
     function will directly call der_encode/2. </p> 
   </desc> 
   </func>
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 2901020e83..33fcce2c44 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -488,9 +488,10 @@ pkix_path_validation(PathErr, [Cert | Chain], Options0) when is_atom(PathErr)->
 	_:_ ->
 	    {error, Reason}
     end;
-pkix_path_validation(TrustedCert, CertChain, Options) when
-  is_binary(TrustedCert) -> OtpCert = pkix_decode_cert(TrustedCert,
-  otp), pkix_path_validation(OtpCert, CertChain, Options);
+pkix_path_validation(TrustedCert, CertChain, Options)
+  when is_binary(TrustedCert) ->
+    OtpCert = pkix_decode_cert(TrustedCert, otp),
+    pkix_path_validation(OtpCert, CertChain, Options);
 
 pkix_path_validation(#'OTPCertificate'{} = TrustedCert, CertChain, Options)
   when is_list(CertChain), is_list(Options) ->
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 3c6b012152..66ac78a65d 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 0.12
+PUBLIC_KEY_VSN = 0.13
diff --git a/lib/reltool/doc/src/make.dep b/lib/reltool/doc/src/make.dep
deleted file mode 100644
index 59e77e8162..0000000000
--- a/lib/reltool/doc/src/make.dep
+++ /dev/null
@@ -1,20 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex part.tex ref_man.tex reltool.tex \
-		reltool_examples.tex reltool_intro.tex reltool_usage.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index 324d69675e..5304b996a4 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -37,7 +37,35 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Reltool.</p>
 
-  <section><title>Reltool 0.5.6</title>
+  <section><title>Reltool 0.5.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If a module was duplicated in the library directories
+	    visible to reltool, and the configuration did not point
+	    out which file to use, then reltool:start would always
+	    fail. A pop-up is added which asks if you want to
+	    continue with a safe and minimal configuration.</p>
+          <p>
+	    Own Id: OTP-9383</p>
+        </item>
+        <item>
+          <p>
+	    wx would sometimes crash due to an empty radiobox on the
+	    'releases' tab of the system window. This radiobox is
+	    removed, and replaced by a listbox which will always
+	    contain at least kernel and stdlib applications.</p>
+          <p>
+	    Own Id: OTP-9384</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Reltool 0.5.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/reltool/vsn.mk b/lib/reltool/vsn.mk
index 227b1c80a2..751f9bb6db 100644
--- a/lib/reltool/vsn.mk
+++ b/lib/reltool/vsn.mk
@@ -1 +1 @@
-RELTOOL_VSN = 0.5.6
+RELTOOL_VSN = 0.5.7
diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
index 840de39f07..73ab6cdc11 100644
--- a/lib/runtime_tools/c_src/Makefile.in
+++ b/lib/runtime_tools/c_src/Makefile.in
@@ -89,42 +89,31 @@ endif
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(OBJDIR) $(BINDIR) $(SOLIBS)
+_create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
-$(OBJDIR):
-	-@mkdir -p $(OBJDIR)
-
-$(BINDIR):
-	-@mkdir -p $(BINDIR)
+debug opt: $(SOLIBS)
 
 $(OBJDIR)/%.o: %.c
-	$(INSTALL_DIR) $(OBJDIR)
 	$(CC) -c -o $@ $(ALL_CFLAGS) $<
 
 $(LIBDIR)/trace_ip_drv.so: $(TRACE_IP_DRV_OBJS)
-	$(INSTALL_DIR) $(LIBDIR)
 	$(LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS)
 
 $(LIBDIR)/trace_file_drv.so: $(TRACE_FILE_DRV_OBJS)
-	$(INSTALL_DIR) $(LIBDIR)
 	$(LD) $(LDFLAGS) -o $@ $^ -lc $(LIBS)
 
 $(LIBDIR)/trace_ip_drv.dll: $(TRACE_IP_DRV_OBJS)
-	$(INSTALL_DIR) $(LIBDIR)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 $(LIBDIR)/trace_file_drv.dll: $(TRACE_FILE_DRV_OBJS)
-	$(INSTALL_DIR) $(LIBDIR)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 #
 # VxWorks is simply to different from Unix in this sense.
 # Here are the inference rules for VxWorks
 #
 $(LIBDIR)/trace_ip_drv.eld: $(TRACE_IP_DRV_OBJS)
-	$(INSTALL_DIR) $(LIBDIR)
 	$(LD) $(LDFLAGS) -o $@ $^ 
 
 $(LIBDIR)/trace_file_drv.eld: $(TRACE_FILE_DRV_OBJS)
-	$(INSTALL_DIR) $(LIBDIR)
 	$(LD) $(LDFLAGS) -o $@ $^ 
 
 clean:
diff --git a/lib/runtime_tools/doc/src/dbg.xml b/lib/runtime_tools/doc/src/dbg.xml
index 0e63649c09..c7c5cd4ff0 100644
--- a/lib/runtime_tools/doc/src/dbg.xml
+++ b/lib/runtime_tools/doc/src/dbg.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -316,7 +316,8 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
         <v>Module = atom() | '_'</v>
         <v>Function = atom() | '_'</v>
         <v>Arity = integer() |'_'</v>
-        <v>MatchSpec = integer() | atom() | [] | match_spec()</v>
+        <v>MatchSpec = integer() | Built-inAlias | [] | match_spec()</v>
+	<v>Built-inAlias = x | c | cx</v>
         <v>MatchDesc = [MatchInfo]</v>
         <v>MatchInfo = {saved, integer()} | MatchNum</v>
         <v>MatchNum = {matched, node(), integer()} | {matched, node(), 0, RPCError}</v>
@@ -349,8 +350,9 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
           if the MatchSpec is other
           than []. The integer <c>N</c> may then be used in
           subsequent calls to this function and will stand as an
-          "alias" for the given expression. There are also built-in
-          aliases named with atoms (see also <c>ltp/0</c> below).</p>
+          "alias" for the given expression. There are also a couple of
+	  built-in aliases for common expressions, see <c>ltp/0</c> below 
+	  for details.</p>
         <p>If an error is returned, it can be due to errors in
           compilation of the match specification. Such errors are
           presented as a list of tuples <c>{error, string()}</c> where
@@ -528,6 +530,21 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
         <p>Match specifications used can be saved in a file (if a
           read-write file system is present) for use in later
           debugging sessions, see <c>wtp/1</c> and <c>rtp/1</c></p>
+	<p>There are three built-in trace patterns:
+	  <c>exception_trace</c>, <c>caller_trace</c> 
+	  and <c>caller_exception_trace</c> (or <c>x</c>, <c>c</c> and 
+	  <c>cx</c> respectively). 
+	  Exception trace sets a trace which will show function names, 
+	  parameters, return values and exceptions thrown from functions. 
+	  Caller traces display function names, parameters and information 
+	  about which function called it. An example using a built-in alias:</p>
+	  <pre>
+(x@y)4> <input>dbg:tp(lists,sort,cx).</input>
+{ok,[{matched,nonode@nohost,2},{saved,cx}]}
+(x@y)4> <input>lists:sort([2,1]).</input>
+(&lt;0.32.0&gt;) call lists:sort([2,1]) ({erl_eval,do_apply,5})
+(&lt;0.32.0&gt;) returned from lists:sort/1 -> [1,2]
+[1,2]</pre>
       </desc>
     </func>
     <func>
@@ -706,7 +723,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
           value from the last invocation of the fun. The initial value
           of the second parameter is specified in the <c>InitialData</c>
           part of the <c>HandlerSpec</c>. The <c>HandlerFun</c> may
-          chose any appropriate action to take when invoked, and can
+          choose any appropriate action to take when invoked, and can
           save a state for the next invocation by returning it.
           </p>
         <p>If <c>Type</c> is a port, then the second parameter should
@@ -766,7 +783,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
         <p>This function creates a trace port generating <em>fun</em>.
           The <em>fun</em> takes no arguments and returns a newly opened
           trace port. The return value from this function is suitable as
-          a second parameter to tracer/2, i. e. <c>dbg:tracer(port, dbg:trace_port(ip, 4711))</c>. </p>
+          a second parameter to tracer/2, i.e. <c>dbg:tracer(port, dbg:trace_port(ip, 4711))</c>. </p>
         <p>A trace port is an
           Erlang port to a dynamically linked in driver that handles
           trace messages directly, without the overhead of sending them
@@ -852,9 +869,9 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
       <desc>
         <p>This function is used to do a control operation on the
           active trace port driver on the given node
-          (<c>Nodename</c>). Which operations that are allowed as well
-          as their return values are depending on which trace driver
-          that is used.</p>
+          (<c>Nodename</c>). Which operations are allowed as well
+          as their return values depend on which trace driver
+          is used.</p>
         <p>Returns either <c>ok</c> or <c>{ok, Result}</c> 
           if the operation was successful, or <c>{error, Reason}</c> 
           if the current tracer is a process 
diff --git a/lib/runtime_tools/doc/src/make.dep b/lib/runtime_tools/doc/src/make.dep
deleted file mode 100644
index 85eae88adf..0000000000
--- a/lib/runtime_tools/doc/src/make.dep
+++ /dev/null
@@ -1,20 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex dbg.tex erts_alloc_config.tex refman.tex \
-		runtime_tools_app.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: refman.xml
-
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index 599be62241..0bb76e1ea4 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -31,6 +31,23 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
+<section><title>Runtime_Tools 1.8.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Two new built-in trace pattern aliases have been added:
+	    caller_trace (c) and caller_exception_trace (cx). See the
+	    dbg:ltp/0 documentation for more info.</p>
+          <p>
+	    Own Id: OTP-9458</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Runtime_Tools 1.8.5</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
index 4f831f3dd8..46b570210a 100644
--- a/lib/runtime_tools/src/Makefile
+++ b/lib/runtime_tools/src/Makefile
@@ -46,7 +46,8 @@ MODULES= \
 	runtime_tools_sup \
 	dbg \
 	percept_profile \
-	observer_backend
+	observer_backend \
+	ttb_autostart
 HRL_FILES= ../include/observer_backend.hrl
 
 ERL_FILES= $(MODULES:%=%.erl)
diff --git a/lib/runtime_tools/src/dbg.erl b/lib/runtime_tools/src/dbg.erl
index 56283f4d3d..385047ee73 100644
--- a/lib/runtime_tools/src/dbg.erl
+++ b/lib/runtime_tools/src/dbg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -32,7 +32,7 @@
 -export([fun2ms/1]).
 
 %% Local exports
--export([erlang_trace/3,get_info/0]).
+-export([erlang_trace/3,get_info/0,deliver_and_flush/1]).
 
 %% Debug exports
 -export([wrap_presort/2, wrap_sort/2, wrap_postsort/1, wrap_sortfix/2,
@@ -348,17 +348,16 @@ trace_port_control(Operation) ->
     trace_port_control(node(), Operation).
 
 trace_port_control(Node, flush) ->
-    Ref = erlang:trace_delivered(all),
-    receive
-	{trace_delivered,all,Ref} -> ok
-    end,
-    case trace_port_control(Node, $f, "") of
-	{ok, [0]} ->
-	    ok;
-	{ok, _} ->
-	    {error, not_supported_by_trace_driver};
-	Other ->
-	    Other
+    case get_tracer(Node) of
+	{ok, Port} when is_port(Port) ->
+	    case catch rpc:call(Node,?MODULE,deliver_and_flush,[Port]) of
+		[0] ->
+		    ok;
+		_ ->
+		    {error, not_supported_by_trace_driver}
+	    end;
+	_ ->
+	    {error, no_trace_driver}
     end;
 trace_port_control(Node,get_listen_port) ->
     case trace_port_control(Node,$p, "") of
@@ -378,7 +377,14 @@ trace_port_control(Node, Command, Arg) ->
 	    {error, no_trace_driver}
     end.
     
-
+%% A bit more than just flush - it also makes sure all trace messages
+%% are delivered first, before flushing the driver.
+deliver_and_flush(Port) ->
+    Ref = erlang:trace_delivered(all),
+    receive
+	{trace_delivered,all,Ref} -> ok
+    end,
+    erlang:port_control(Port, $f, "").
 					   
 
 trace_port(file, {Filename, wrap, Tail}) ->
@@ -684,18 +690,12 @@ loop({C,T}=SurviveLinks, Table) ->
 	    %% tracing on the node it removes from the list of active trace nodes,
 	    %% we will call erlang:trace_delivered/1 on ALL nodes that we have
 	    %% connections to.
-	    Delivered = fun() ->
-				Ref = erlang:trace_delivered(all),
-				receive
-				    {trace_delivered,all,Ref} -> ok
-				end
-			end,
-	    catch rpc:multicall(nodes(), erlang, apply, [Delivered,[]]),
-	    Ref = erlang:trace_delivered(all),
-	    receive
-		{trace_delivered,all,Ref} ->
-		    exit(done)
-	    end;
+	    %% If it is a file trace driver, we will also flush the port.
+	    lists:foreach(fun({Node,{_Relay,Port}}) ->
+				  rpc:call(Node,?MODULE,deliver_and_flush,[Port])
+			  end,
+			  get()),
+	    exit(done);
 	{From, {link_to, Pid}} -> 	    
 	    case (catch link(Pid)) of
 		{'EXIT', Reason} ->
@@ -1449,6 +1449,19 @@ new_pattern_table() ->
     ets:insert(PT, 
 	       {exception_trace, 
 		term_to_binary(x)}),
+    ets:insert(PT,
+	       {c,
+		term_to_binary([{'_',[],[{message,{caller}}]}])}),
+    ets:insert(PT,
+	       {caller_trace,
+		term_to_binary(c)}),
+    ets:insert(PT,
+	       {cx,
+		term_to_binary([{'_',[],[{exception_trace},
+					 {message,{caller}}]}])}),
+    ets:insert(PT,
+	       {caller_exception_trace,
+		term_to_binary(cx)}),
     PT.
 
 
diff --git a/lib/runtime_tools/src/inviso_rt.erl b/lib/runtime_tools/src/inviso_rt.erl
index ac7ac2a584..b162f5b045 100644
--- a/lib/runtime_tools/src/inviso_rt.erl
+++ b/lib/runtime_tools/src/inviso_rt.erl
@@ -2359,8 +2359,8 @@ list_wrapset(Prefix,Suffix) ->
 
 list_wrapset_2([File|Rest],RegExp) ->
     Length=length(File),
-    case regexp:first_match(File,RegExp) of
-	{match,1,Length} ->                  % This is a member of the set.
+    case re:run(File,RegExp) of
+	{match,[{0,Length}]} ->                  % This is a member of the set.
 	    [File|list_wrapset_2(Rest,RegExp)];
 	_ ->
 	    list_wrapset_2(Rest,RegExp)
diff --git a/lib/runtime_tools/src/inviso_rt_lib.erl b/lib/runtime_tools/src/inviso_rt_lib.erl
index 2c6964e53e..ee6a72ae0c 100644
--- a/lib/runtime_tools/src/inviso_rt_lib.erl
+++ b/lib/runtime_tools/src/inviso_rt_lib.erl
@@ -197,15 +197,15 @@ match_modules(RegExpDir,RegExpMod,Actions) ->
 handle_expand_regexp_2([{Mod,Path}|Rest],RegExpDir,RegExpMod,Result) ->
     ModStr=atom_to_list(Mod),
     ModLen=length(ModStr),
-    case regexp:first_match(ModStr,RegExpMod) of
-	{match,1,ModLen} ->                  % Ok, The regexp matches the module.
+    case re:run(ModStr,RegExpMod) of
+	{match,[{0,ModLen}]} ->                  % Ok, The regexp matches the module.
 	    if
 		is_list(RegExpDir),is_atom(Path) -> % Preloaded or covercompiled...
 		    handle_expand_regexp_2(Rest,RegExpDir,RegExpMod,Result);
 		is_list(RegExpDir),is_list(Path) -> % Dir reg-exp is used!
 		    PathOnly=filename:dirname(Path), % Must remove beam-file name.
-		    case regexp:first_match(PathOnly,RegExpDir) of
-			{match,_,_} ->       % Did find a match, that is enough!
+		    case re:run(PathOnly,RegExpDir,[{capture,none}]) of
+			match ->             % Did find a match, that is enough!
 			    handle_expand_regexp_2(Rest,RegExpDir,RegExpMod,[Mod|Result]);
 			_ ->                 % Either error or nomatch.
 			    handle_expand_regexp_2(Rest,RegExpDir,RegExpMod,Result)
@@ -233,8 +233,8 @@ handle_expand_regexp_3([Path|Rest],RegExpDir,RegExpMod,AllLoaded,Result) ->
 		    volumerelative ->        % Only on Windows!?
 			filename:absname(Path)
 		end,
-	    case regexp:first_match(AbsPath,RegExpDir) of
-		{match,_,_} ->               % Ok, the directory is allowed.
+	    case re:run(AbsPath,RegExpDir,[{capture,none}]) of
+		match ->                     % Ok, the directory is allowed.
 		    NewResult=handle_expand_regexp_3_1(Path,RegExpMod,AllLoaded,Result),
 		    handle_expand_regexp_3(Rest,RegExpDir,RegExpMod,AllLoaded,NewResult);
 		_ ->                         % This directory does not qualify.
@@ -262,8 +262,8 @@ handle_expand_regexp_3_2([File|Rest],RegExpMod,AllLoaded,Result) ->
 	    case {lists:keysearch(Mod,1,AllLoaded),lists:member(Mod,Result)} of
 		{false,false} ->             % This module is not tried before.
 		    ModLen=length(ModStr),
-		    case regexp:first_match(ModStr,RegExpMod) of
-			{match,1,ModLen} ->  % This module satisfies the regexp.
+		    case re:run(ModStr,RegExpMod) of
+			{match,[{0,ModLen}]} ->  % This module satisfies the regexp.
 			    handle_expand_regexp_3_2(Rest,RegExpMod,AllLoaded,[Mod|Result]);
 			_ ->                 % Error or not perfect match.
 			    handle_expand_regexp_3_2(Rest,RegExpMod,AllLoaded,Result)
diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index 0f428de07a..9c1f9da5b1 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -31,6 +31,7 @@
 	 ttb_write_binary/2,
 	 ttb_stop/1,
 	 ttb_fetch/2,
+         ttb_resume_trace/0,
 	 ttb_get_filenames/1]).
 -define(CHUNKSIZE,8191). % 8 kbytes - 1 byte
 
@@ -92,16 +93,22 @@ etop_collect([], Acc) -> Acc.
 %%
 %% ttb backend
 %%
-ttb_init_node(MetaFile,PI,Traci) ->
+ttb_init_node(MetaFile_0,PI,Traci) ->
     if
-	is_list(MetaFile);
-	is_atom(MetaFile) ->
+	is_list(MetaFile_0);
+	is_atom(MetaFile_0) ->
+	    {ok, Cwd} = file:get_cwd(),
+	    MetaFile = filename:join(Cwd, MetaFile_0),
 	    file:delete(MetaFile);
 	true -> 				% {local,_,_}
-	    ok
+	    MetaFile = MetaFile_0
+    end,
+    case proplists:get_value(resume, Traci) of
+        {true, _} -> (autostart_module()):write_config(Traci);
+        _    -> ok
     end,
     Self = self(),
-    MetaPid = spawn(fun() -> ttb_meta_tracer(MetaFile,PI,Self) end),
+    MetaPid = spawn(fun() -> ttb_meta_tracer(MetaFile,PI,Self,Traci) end),
     receive {MetaPid,started} -> ok end,
     MetaPid ! {metadata,Traci},
     case PI of
@@ -111,13 +118,14 @@ ttb_init_node(MetaFile,PI,Traci) ->
 	false ->
 	    ok
     end,
-    {ok,MetaPid}.
+    {ok,MetaFile,MetaPid}.
 
 ttb_write_trace_info(MetaPid,Key,What) ->
     MetaPid ! {metadata,Key,What},
     ok.
 
-ttb_meta_tracer(MetaFile,PI,Parent) ->
+ttb_meta_tracer(MetaFile,PI,Parent,SessionData) ->
+    erlang:monitor(process, proplists:get_value(ttb_control, SessionData)),
     case PI of
 	true ->
 	    ReturnMS = [{'_',[],[{return_trace}]}],
@@ -130,22 +138,29 @@ ttb_meta_tracer(MetaFile,PI,Parent) ->
 	    ok
     end,
     Parent ! {self(),started},
-    ttb_meta_tracer_loop(MetaFile,PI,dict:new()).
+    case proplists:get_value(overload_check, SessionData) of
+        {Ms, M, F} ->
+            catch M:F(init),
+            erlang:send_after(Ms, self(), overload_check);
+        _ ->
+            ok
+    end,
+    ttb_meta_tracer_loop(MetaFile,PI,dict:new(),SessionData).
 
-ttb_meta_tracer_loop(MetaFile,PI,Acc) ->
+ttb_meta_tracer_loop(MetaFile,PI,Acc,State) ->
     receive
 	{trace_ts,_,call,{erlang,register,[Name,Pid]},_} ->
 	    ttb_store_meta({pid,{Pid,Name}},MetaFile),
-	    ttb_meta_tracer_loop(MetaFile,PI,Acc);
+	    ttb_meta_tracer_loop(MetaFile,PI,Acc,State);
 	{trace_ts,_,call,{global,register_name,[Name,Pid]},_} ->
 	    ttb_store_meta({pid,{Pid,{global,Name}}},MetaFile),
-	    ttb_meta_tracer_loop(MetaFile,PI,Acc);
+	    ttb_meta_tracer_loop(MetaFile,PI,Acc,State);
 	{trace_ts,CallingPid,call,{erlang,spawn_opt,[{M,F,Args,_}]},_} ->
 	    MFA = {M,F,length(Args)},
 	    NewAcc = dict:update(CallingPid,
 				 fun(Old) -> [MFA|Old] end, [MFA], 
 				 Acc),
-	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc);
+	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc,State);
 	{trace_ts,CallingPid,return_from,{erlang,spawn_opt,_Arity},Ret,_} ->
 	    case Ret of
 		{NewPid,_Mref} when is_pid(NewPid) -> ok;
@@ -158,14 +173,14 @@ ttb_meta_tracer_loop(MetaFile,PI,Acc) ->
 				    T 
 			    end,
 			    Acc),
-	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc);
+	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc,State);
 	{trace_ts,CallingPid,call,{erlang,Spawn,[M,F,Args]},_} 
 	when Spawn==spawn;Spawn==spawn_link ->
 	    MFA = {M,F,length(Args)},
 	    NewAcc = dict:update(CallingPid,
 				 fun(Old) -> [MFA|Old] end, [MFA], 
 				 Acc),
-	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc);
+	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc,State);
 
 	{trace_ts,CallingPid,return_from,{erlang,Spawn,_Arity},NewPid,_} 
 	when Spawn==spawn;Spawn==spawn_link ->
@@ -176,28 +191,53 @@ ttb_meta_tracer_loop(MetaFile,PI,Acc) ->
 				    T
 			    end,
 			    Acc),
-	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc);
+	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc,State);
 
 	{metadata,Data} when is_list(Data) ->
 	    ttb_store_meta(Data,MetaFile),
-	    ttb_meta_tracer_loop(MetaFile,PI,Acc);
+	    ttb_meta_tracer_loop(MetaFile,PI,Acc,State);
 
 	{metadata,Key,Fun} when is_function(Fun) ->
 	    ttb_store_meta([{Key,Fun()}],MetaFile),
-	    ttb_meta_tracer_loop(MetaFile,PI,Acc);
+	    ttb_meta_tracer_loop(MetaFile,PI,Acc,State);
 
 	{metadata,Key,What} ->
 	    ttb_store_meta([{Key,What}],MetaFile),
-	    ttb_meta_tracer_loop(MetaFile,PI,Acc);
-
-	stop when PI=:=true ->
-	    erlang:trace_pattern({erlang,spawn,3},false,[meta]),
+	    ttb_meta_tracer_loop(MetaFile,PI,Acc,State);
+        overload_check ->
+            {Ms, M, F} = proplists:get_value(overload_check, State),
+            case catch M:F(check) of
+                true ->
+                    erlang:trace(all, false, [all]),
+                    ControlPid = proplists:get_value(ttb_control, State),
+                    ControlPid ! {node_overloaded, node()},
+                    catch M:F(stop),
+                    ttb_meta_tracer_loop(MetaFile,PI,Acc,lists:keydelete(overload_check, 1, State));
+                _ ->
+                    erlang:send_after(Ms, self(), overload_check),
+                    ttb_meta_tracer_loop(MetaFile,PI,Acc, State)
+            end;
+     {'DOWN', _, _, _, _} ->
+            stop_seq_trace(),
+            self() ! stop,
+            ttb_meta_tracer_loop(MetaFile,PI,Acc, State);
+     stop when PI=:=true ->
+            try_stop_resume(State),
+            try_stop_overload_check(State),
+            erlang:trace_pattern({erlang,spawn,3},false,[meta]),
 	    erlang:trace_pattern({erlang,spawn_link,3},false,[meta]),
 	    erlang:trace_pattern({erlang,spawn_opt,1},false,[meta]),
 	    erlang:trace_pattern({erlang,register,2},false,[meta]),
 	    erlang:trace_pattern({global,register_name,2},false,[meta]);
 	stop ->
-	    ok
+            try_stop_resume(State),
+            try_stop_overload_check(State)
+    end.
+
+try_stop_overload_check(State) ->
+    case proplists:get_value(overload, State) of
+        undefined -> ok;
+        {_, M, F} -> catch M:F(stop)
     end.
 
 pnames() ->
@@ -222,6 +262,40 @@ pinfo(P,Globals) ->
 	undefined -> [] % the process has terminated
     end.
 
+autostart_module() ->
+    element(2, application:get_env(runtime_tools, ttb_autostart_module)).
+
+try_stop_resume(State) ->
+    case proplists:get_value(resume, State) of
+        true -> (autostart_module()):delete_config();
+        _    -> ok
+    end.
+
+ttb_resume_trace() ->
+    case (autostart_module()):read_config() of
+        {error, _} ->
+            ok;
+        {ok, Data} ->
+            Pid = proplists:get_value(ttb_control, Data),
+            {_, Timeout} = proplists:get_value(resume, Data),
+            case rpc:call(node(Pid), erlang, whereis, [ttb]) of
+                Pid ->
+                    Pid ! {noderesumed, node(), self()},
+                    wait_for_fetch_ready(Timeout);
+                _ ->
+                    ok
+            end,
+            (autostart_module()):delete_config(),
+            ok
+    end.
+
+wait_for_fetch_ready(Timeout) ->
+    receive
+        trace_resumed ->
+            ok
+    after Timeout ->
+            ok
+    end.
 
 ttb_store_meta(Data,{local,MetaFile,Port}) when is_list(Data) ->
     ttb_send_to_port(Port,MetaFile,Data);
@@ -273,6 +347,9 @@ ttb_stop(MetaPid) ->
     %% returns, and then the Port (in {local,MetaFile,Port})
     %% cannot be accessed any more.
     receive {'DOWN', Ref, process, MetaPid, _Info} -> ok end,
+    stop_seq_trace().
+
+stop_seq_trace() ->
     seq_trace:reset_trace(),
     seq_trace:set_system_tracer(false).
 
@@ -287,7 +364,7 @@ ttb_fetch(MetaFile,{Port,Host}) ->
 
 send_files({Sock,Host},[File|Files]) ->
     {ok,Fd} = file:open(File,[raw,read,binary]),
-    gen_tcp:send(Sock,<<1,(list_to_binary(File))/binary>>),
+    gen_tcp:send(Sock,<<1,(list_to_binary(filename:basename(File)))/binary>>),
     send_chunks(Sock,Fd),
     file:delete(File),
     send_files({Sock,Host},Files);
diff --git a/lib/runtime_tools/src/runtime_tools.app.src b/lib/runtime_tools/src/runtime_tools.app.src
index e6dc7a21d4..095567b165 100644
--- a/lib/runtime_tools/src/runtime_tools.app.src
+++ b/lib/runtime_tools/src/runtime_tools.app.src
@@ -22,7 +22,8 @@
     {modules,      [dbg,observer_backend,percept_profile,
 		    inviso_rt,inviso_rt_lib,inviso_rt_meta,
 		    inviso_as_lib,inviso_autostart,inviso_autostart_server,
-		    runtime_tools,runtime_tools_sup,erts_alloc_config]},
+		    runtime_tools,runtime_tools_sup,erts_alloc_config,
+		    ttb_autostart]},
     {registered,   [runtime_tools_sup,inviso_rt,inviso_rt_meta]},
     {applications, [kernel, stdlib]},
 %    {env,          [{inviso_autostart_mod,your_own_autostart_module}]},
diff --git a/lib/runtime_tools/src/runtime_tools_sup.erl b/lib/runtime_tools/src/runtime_tools_sup.erl
index 1a872c355d..4fcb2292d0 100644
--- a/lib/runtime_tools/src/runtime_tools_sup.erl
+++ b/lib/runtime_tools/src/runtime_tools_sup.erl
@@ -38,6 +38,8 @@
 init(AutoModArgs) ->
     Flags = {one_for_one, 0, 3600},
     Children = [{inviso_rt, {inviso_rt, start_link_auto, [AutoModArgs]}, 
-		 temporary, 3000, worker, [inviso_rt]}],
+		 temporary, 3000, worker, [inviso_rt]},
+                {ttb_autostart, {ttb_autostart, start_link, []},
+                 temporary, 3000, worker, [ttb_autostart]}],
     {ok, {Flags, Children}}.
 %% -----------------------------------------------------------------------------
diff --git a/lib/runtime_tools/src/ttb_autostart.erl b/lib/runtime_tools/src/ttb_autostart.erl
new file mode 100644
index 0000000000..4c6971c119
--- /dev/null
+++ b/lib/runtime_tools/src/ttb_autostart.erl
@@ -0,0 +1,55 @@
+%%%-------------------------------------------------------------------
+%%% File    : ttb_autostart.erl
+%%% Author  : Bartłomiej Puzoń <[email protected]>
+%%% Description : This supervisor is used to resume ttb tracing
+%%% Users are able to provide custom restart modules for *_config, as
+%%% file:write/read/delete may not be possible on diskless nodes.
+%%%
+%%% Created : 31 Jul 2010 by <[email protected]>
+%%%-------------------------------------------------------------------
+-module(ttb_autostart).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0,
+         read_config/0,
+         write_config/1,
+         delete_config/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+-define(DEF_AUTOSTART_MODULE, ?MODULE).
+-define(AUTOSTART_FILENAME, "ttb_autostart.bin").
+
+start_link() ->
+    gen_server:start_link(?MODULE, no_args, []).
+
+delete_config() ->
+    file:delete(?AUTOSTART_FILENAME).
+
+read_config() ->
+    case file:read_file(?AUTOSTART_FILENAME) of
+        {ok, Data} -> {ok, binary_to_term(Data)};
+        Error      -> Error
+    end.
+
+write_config(Data) ->
+    file:write_file(?AUTOSTART_FILENAME, term_to_binary(Data)).
+
+init(no_args) ->
+    case application:get_env(runtime_tools, ttb_autostart_module) of
+        {ok, _} ->  ok;
+        undefined -> application:set_env(runtime_tools, ttb_autostart_module, ?DEF_AUTOSTART_MODULE)
+    end,
+    observer_backend:ttb_resume_trace(),
+    %%As the process is not needed any more, it will shut itself down
+    {ok, no_args, 10000}.
+
+handle_call(_,_,_)       -> {noreply, no_args}.
+handle_cast(_,_)         -> {noreply, no_args}.
+handle_info(timeout,_)   -> {stop, normal, no_args}.
+terminate(_,_)           -> ok.
+code_change(_,_,_)       -> {ok, no_args}.
diff --git a/lib/runtime_tools/test/inviso_SUITE.erl b/lib/runtime_tools/test/inviso_SUITE.erl
index 3ae8d34dd6..758867cf45 100644
--- a/lib/runtime_tools/test/inviso_SUITE.erl
+++ b/lib/runtime_tools/test/inviso_SUITE.erl
@@ -1380,9 +1380,10 @@ fetch_log_dist_trace_2(Config) ->
     io:format("~p~n",[NodeResults]),
     CheckFun=fun({N,{complete,[{trace_log,FileResults1},{ti_log,[{ok,TiFile}]}]}}) ->
 		     Fun2=fun({ok,File}) ->
-				  {match,1,_}=
-				      regexp:first_match(File,
-							 "^"++"p1"++Name++atom_to_list(N)),
+				  match=
+				      re:run(File,
+					     "^"++"p1"++Name++atom_to_list(N),
+					     [{capture,none}]),
 				  true;
 			     (_) ->
 				  false
@@ -1425,8 +1426,8 @@ fetch_log_dist_trace_3(Config) ->
     CheckFun=fun({N,{ok,[{trace_log,PrivDir2,[F1,F2]},{ti_log,PrivDir2,[F3]}]}})->
 		     PrivDir2=PrivDir,
 		     RegExp="^"++Name++atom_to_list(N)++"[0-9]+"++"\.log",
-		     {match,1,_}=regexp:first_match(F1,RegExp),
-		     {match,1,_}=regexp:first_match(F2,RegExp),
+		     match=re:run(F1,RegExp,[{capture,none}]),
+		     match=re:run(F2,RegExp,[{capture,none}]),
 		     F3=Name++"_ti_"++atom_to_list(N)++".ti",
 		     true;
 		(_) ->
@@ -1439,9 +1440,10 @@ fetch_log_dist_trace_3(Config) ->
 io:format("~p~n",[NodeResults2]),
     CheckFun2=fun({N,{complete,[{trace_log,FileResults1},{ti_log,[{ok,TiFile}]}]}}) ->
 		     Fun2=fun({ok,File}) ->
-				  {match,1,_}=
-				      regexp:first_match(File,
-							 "^"++"p1"++Name++atom_to_list(N)),
+				  match=
+				      re:run(File,
+					     "^"++"p1"++Name++atom_to_list(N),
+					    [{capture,none}]),
 				  true;
 			     (_) ->
 				  false
@@ -2649,8 +2651,8 @@ check_on_nodes([],_,_,_,_) ->
 how_many_files_regexp([],_,N) ->
     {ok,N};
 how_many_files_regexp([FName|Rest],RegExp,N) ->
-    case regexp:first_match(FName,RegExp) of
-	{match,1,_} ->
+    case re:run(FName,RegExp,[{capture,none}]) of
+	match ->
 	    how_many_files_regexp(Rest,RegExp,N+1);
 	nomatch ->
 	    how_many_files_regexp(Rest,RegExp,N);
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index 6ed98f697e..0bcd261861 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.8.5
+RUNTIME_TOOLS_VSN = 1.8.6
diff --git a/lib/sasl/doc/src/make.dep b/lib/sasl/doc/src/make.dep
deleted file mode 100644
index 4843b7934a..0000000000
--- a/lib/sasl/doc/src/make.dep
+++ /dev/null
@@ -1,22 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: alarm_handler.tex appup.tex book.tex error_logging.tex \
-		overload.tex part.tex rb.tex ref_man.tex rel.tex \
-		release_handler.tex relup.tex sasl_app.tex \
-		sasl_intro.tex script.tex systools.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index d4460d47b4..01cdc4b29e 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -30,6 +30,104 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
+<section><title>SASL 2.1.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The release_handler functionality on windows services was
+	    broken. This has been corrected.</p>
+          <p>
+	    Own Id: OTP-9306</p>
+        </item>
+        <item>
+          <p>
+	    If a new version of an application did not include any
+	    erlang module changes, the code path of the application
+	    was not updated by the release_handler unless a
+	    'load_object_code' instruction was added for the
+	    application. This would be a problem if e.g. only some
+	    files in the priv dir were changed since calls to
+	    code:lib_dir or code:priv_dir would then point to the old
+	    location of the application. This has been corrected -
+	    now code:replace_path/2 will be called for all
+	    applications that are changed (i.e. when the
+	    application's vsn is changed in the .rel file).</p>
+          <p>
+	    Own Id: OTP-9402</p>
+        </item>
+        <item>
+          <p>
+	    The appup instruction 'delete_module' would cause a crash
+	    during upgrade if the module to be deleted was not
+	    loaded. This has been corrected.</p>
+          <p>
+	    Own Id: OTP-9417</p>
+        </item>
+        <item>
+          <p>
+	    If a path was given as ONLY 'ebin' and not for example
+	    './ebin', then systools:make_tar would fail with a
+	    <c>function_clause</c> exception in filename:join/1. This
+	    has been corrected. (Thanks to Nikola Skoric for
+	    reporting).</p>
+          <p>
+	    Own Id: OTP-9507</p>
+        </item>
+        <item>
+          <p>
+	    Implement or fix -Werror option</p>
+          <p>
+	    If -Werror is enabled and there are warnings no output
+	    file is written. Also make sure that error/warning
+	    reporting is consistent. (Thanks to Tuncer Ayaz)</p>
+          <p>
+	    Own Id: OTP-9536</p>
+        </item>
+        <item>
+          <p>
+	    Improved error information for timeouts during
+	    release_handler:install_release.</p>
+          <p>
+	    This patch addresses two cases where a timeout will occur
+	    during upgrade. 1) if a supervisor is suspended (call to
+	    get children from supervisor will hang) 2) if the child
+	    spec for a supervisor incorrectly states that it is a
+	    worker with a dynamic set of modules (call to get modules
+	    from gen_event will hang)</p>
+          <p>
+	    An error report will now be printed, and the return value
+	    of release_handler:install_release will indicate what
+	    happened. (Thanks to joe williams)</p>
+          <p>
+	    Own Id: OTP-9546</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    <c>release_handler:install_release</c> could be very slow
+	    when there are many processes in the system. Some
+	    optimization work has been done both in erts and in the
+	    release handler in order to improve this. </p>
+          <p>
+	    A new option, <c>purge</c>, is added to
+	    <c>release_handler:check_install_release</c> which can be
+	    called first in order to speed up the execution of
+	    <c>release_handler:install_release</c>.</p>
+          <p>
+	    Own Id: OTP-9395</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SASL 2.1.9.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/sasl/doc/src/release_handler.xml b/lib/sasl/doc/src/release_handler.xml
index 4a973bc5ed..5ac0dc1acc 100644
--- a/lib/sasl/doc/src/release_handler.xml
+++ b/lib/sasl/doc/src/release_handler.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -159,9 +159,12 @@ old        reboot_old            permanent
   <funcs>
     <func>
       <name>check_install_release(Vsn) -> {ok, OtherVsn, Descr} | {error, Reason}</name>
+      <name>check_install_release(Vsn,Opts) -> {ok, OtherVsn, Descr} | {error, Reason}</name>
       <fsummary>Check installation of a release in the system.</fsummary>
       <type>
         <v>Vsn = OtherVsn = string()</v>
+	<v>Opts = [Opt]</v>
+	<v>Opt = purge</v>
         <v>Descr = term()</v>
         <v>Reason = term()</v>
       </type>
@@ -179,6 +182,11 @@ old        reboot_old            permanent
           upgrade script.</p>
         <p>Returns the same as <c>install_release/1</c>. <c>Descr</c>
           defaults to "" if no <c>relup</c> file is found.</p>
+	<p>If the option <c>purge</c> is given, all old code that can
+          be soft purged will be purged after all other checks are
+          successfully completed. This can be useful in order to
+          reduce the time needed by <seealso
+          marker="#install_release/1">install_release</seealso>.</p>
       </desc>
     </func>
     <func>
@@ -299,6 +307,24 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
           <c>{update_paths,true}</c>, afterwards
           <c>code:lib_dir(myapp)</c> will return
           <c>/home/user/myapp-1.0</c>.</p>
+	<note>
+	  <p>Installing a new release might be quite time consuming if
+	  there are many processes in the system. The reason is that
+	  each process must be checked for references to old code
+	  before a module can be purged. This check might lead to
+	  garbage collections and copying of data.</p>
+	  <p>If you wish to speed up the execution of
+	  <c>install_release</c>, then you may call <seealso
+	  marker="#check_install_release/1">check_install_release</seealso>
+	  first, using the option <c>purge</c>. This will do the same
+	  check for old code, and then purge all modules that can be
+	  soft purged. The purged modules will then no longer have any
+	  old code, and <c>install_release</c> will not need to do the
+	  checks.</p>
+	  <p>Obviously, this will not reduce the overall time for the
+	  upgrade, but it will allow checks and purge to be executed
+	  in the background before the real upgrade is started.</p>
+	</note>
       </desc>
     </func>
     <func>
diff --git a/lib/sasl/doc/src/systools.xml b/lib/sasl/doc/src/systools.xml
index 883c9c372b..8c1c327d74 100644
--- a/lib/sasl/doc/src/systools.xml
+++ b/lib/sasl/doc/src/systools.xml
@@ -45,7 +45,8 @@
         <v>Name = string()</v>
         <v>UpFrom = DownTo = [Name | {Name,Descr}]</v>
         <v>&nbsp;Descr = term()</v>
-        <v>Opt = {path,[Dir]} | restart_emulator | silent | noexec | {outdir,Dir}</v>
+        <v>Opt = {path,[Dir]} | restart_emulator | silent | noexec | {outdir,Dir}
+	| warnings_as_errors</v>
         <v>&nbsp;Dir = string()</v>
         <v>Result = ok | error | {ok,Relup,Module,Warnings} | {error,Module,Error}</v>
         <v>&nbsp;Relup - see relup(4)</v>
@@ -122,6 +123,8 @@
         <p>If the option <c>noexec</c> is provided, the function returns
           the same values as for <c>silent</c> but no <c>relup</c> file
           is created.</p>
+	<p>If the option <c>warnings_as_errors</c> is provided, warnings
+	   are treated as errors.</p>
       </desc>
     </func>
     <func>
@@ -130,7 +133,8 @@
       <fsummary>Generate a boot script <c>.script/.boot</c>.</fsummary>
       <type>
         <v>Name = string()</v>
-        <v>Opt = src_tests | {path,[Dir]} | local | {variables,[Var]} | exref | {exref,[App]}] | silent | {outdir,Dir}</v>
+        <v>Opt = src_tests | {path,[Dir]} | local | {variables,[Var]} | exref | {exref,[App]}]
+	| silent | {outdir,Dir} | warnings_as_errors</v>
         <v>&nbsp;Dir = string()</v>
         <v>&nbsp;Var = {VarName,Prefix}</v>
         <v>&nbsp;&nbsp;VarName = Prefix = string()</v>
@@ -232,6 +236,8 @@
           Warnings and errors can be converted to strings by calling
           <c>Module:format_warning(Warnings)</c> or
           <c>Module:format_error(Error)</c>.</p>
+	<p>If the option <c>warnings_as_errors</c> is provided, warnings
+	   are treated as errors.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/sasl/examples/src/Makefile b/lib/sasl/examples/src/Makefile
index 4a4e04a536..9cf0d4c25d 100644
--- a/lib/sasl/examples/src/Makefile
+++ b/lib/sasl/examples/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2010. All Rights Reserved.
+# Copyright Ericsson AB 2010-2011. 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
@@ -66,7 +66,7 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/examples/src
 	$(INSTALL_DIR) $(RELSYSDIR)/examples/ebin
 	(cd ..; tar cf - src ebin  | (cd $(RELSYSDIR)/examples; tar xf -))
-	chmod -f -R ug+w $(RELSYSDIR)/examples
+	chmod -R ug+w $(RELSYSDIR)/examples
 
 release_docs_spec:
 
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index ab54b1d00b..bc08f94dff 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -25,8 +25,8 @@
 -export([start_link/0,
 	 create_RELEASES/1, create_RELEASES/2, create_RELEASES/4,
 	 unpack_release/1,
-	 check_install_release/1, install_release/1, install_release/2,
-	 remove_release/1, 
+	 check_install_release/1, check_install_release/2,
+	 install_release/1, install_release/2, remove_release/1,
 	 which_releases/0, make_permanent/1, reboot_old_release/1,
 	 set_unpacked/2, set_removed/1, install_file/2]).
 -export([upgrade_app/2, downgrade_app/2, downgrade_app/3,
@@ -149,15 +149,35 @@ unpack_release(ReleaseName) ->
 %%-----------------------------------------------------------------
 %% Purpose: Checks the relup script for the specified version.
 %%          The release must be unpacked.
+%%          Options = [purge] - all old code that can be soft purged
+%%          will be purged if all checks succeeds. This can be usefull
+%%          in order to reduce time needed in the following call to
+%%          install_release.
 %% Returns: {ok, FromVsn, Descr} | {error, Reason}
-%%          Reason = {already_installed, Vsn} |
+%%          Reason = {illegal_option, IllegalOpt} |
+%%                   {already_installed, Vsn} |
 %%                   {bad_relup_file, RelFile} |
 %%                   {no_such_release, Vsn} |
 %%                   {no_such_from_vsn, Vsn} |
 %%                   exit_reason()
 %%-----------------------------------------------------------------
 check_install_release(Vsn) ->
-    call({check_install_release, Vsn}).
+    check_install_release(Vsn, []).
+
+check_install_release(Vsn, Opts) ->
+    case check_check_install_options(Opts, false) of
+	{ok,Purge} ->
+	    call({check_install_release, Vsn, Purge});
+	Error ->
+	    Error
+    end.
+
+check_check_install_options([purge|Opts], _) ->
+    check_check_install_options(Opts, true);
+check_check_install_options([Illegal|_],_Purge) ->
+    {error,{illegal_option,Illegal}};
+check_check_install_options([],Purge) ->
+    {ok,Purge}.
 
 
 %%-----------------------------------------------------------------
@@ -541,11 +561,12 @@ handle_call({unpack_release, ReleaseName}, _From, S)
 handle_call({unpack_release, _ReleaseName}, _From, S) ->
     {reply, {error, client_node}, S};
 
-handle_call({check_install_release, Vsn}, _From, S) ->
+handle_call({check_install_release, Vsn, Purge}, _From, S) ->
     case catch do_check_install_release(S#state.rel_dir,
 					Vsn,
 					S#state.releases,
-					S#state.masters) of
+					S#state.masters,
+					Purge) of
 	{ok, CurrentVsn, Descr} -> 
 	    {reply, {ok, CurrentVsn, Descr}, S};
 	{error, Reason}   ->
@@ -855,7 +876,7 @@ check_path_response(Path, {ok, _Info}) ->
 check_path_response(Path, {error, _Reason}) ->
 	throw({error, {no_such_directory, Path}}).
 
-do_check_install_release(RelDir, Vsn, Releases, Masters) ->
+do_check_install_release(RelDir, Vsn, Releases, Masters, Purge) ->
     case lists:keysearch(Vsn, #release.vsn, Releases) of
 	{value, #release{status = current}} ->
 	    {error, {already_installed, Vsn}};
@@ -880,7 +901,20 @@ do_check_install_release(RelDir, Vsn, Releases, Masters) ->
 		    case get_rh_script(LatestRelease, Release, RelDir, Masters) of
 			{ok, {CurrentVsn, Descr, Script}} ->
 			    case catch check_script(Script, Libs) of
-				ok ->
+				{ok,SoftPurgeMods} when Purge=:=true ->
+				    %% Get modules with brutal_purge
+				    %% instructions, but that can be
+				    %% soft purged
+				    {ok,BrutalPurgeMods} =
+					release_handler_1:check_old_processes(
+					  Script,brutal_purge),
+				    lists:foreach(
+				      fun(Mod) ->
+					      catch erlang:purge_module(Mod)
+				      end,
+				      SoftPurgeMods ++ BrutalPurgeMods),
+				    {ok, CurrentVsn, Descr};
+				{ok,_} ->
 				    {ok, CurrentVsn, Descr};
 				Else ->
 				    Else
@@ -1967,7 +2001,7 @@ safe_write_file_m(File, Data, Masters) ->
 %% 'update_paths' option to release_handler:install_release/2 if the
 %% code path shall be updated then.
 %% -----------------------------------------------------------------
-get_new_libs([{App,Vsn,LibDir}|CurrentLibs], NewLibs) ->
+get_new_libs([{App,Vsn,_LibDir}|CurrentLibs], NewLibs) ->
     case lists:keyfind(App,1,NewLibs) of
 	{App,NewVsn,_} = LibInfo when NewVsn =/= Vsn ->
 	    [LibInfo | get_new_libs(CurrentLibs,NewLibs)];
diff --git a/lib/sasl/src/release_handler_1.erl b/lib/sasl/src/release_handler_1.erl
index ff62f847ac..8d0baf3ab1 100644
--- a/lib/sasl/src/release_handler_1.erl
+++ b/lib/sasl/src/release_handler_1.erl
@@ -19,8 +19,9 @@
 -module(release_handler_1).
 
 %% External exports
--export([eval_script/1, eval_script/5, check_script/2]).
--export([get_current_vsn/1]). %% exported because used in a test case
+-export([eval_script/1, eval_script/5,
+	 check_script/2, check_old_processes/2]).
+-export([get_current_vsn/1, get_supervised_procs/0]). %% exported because used in a test case
 
 -record(eval_state, {bins = [], stopped = [], suspended = [], apps = [],
 		     libdirs, unpurged = [], vsns = [], newlibs = [],
@@ -47,17 +48,20 @@
 %%% This is a low-level release handler.
 %%%-----------------------------------------------------------------
 check_script(Script, LibDirs) ->
-    case catch check_old_processes(Script) of
-	ok ->
+    case catch check_old_processes(Script,soft_purge) of
+	{ok, PurgeMods} ->
 	    {Before, _After} = split_instructions(Script),
 	    case catch lists:foldl(fun(Instruction, EvalState1) ->
 					   eval(Instruction, EvalState1)
 				   end,
 				   #eval_state{libdirs = LibDirs},
 				   Before) of
-		EvalState2 when is_record(EvalState2, eval_state) -> ok;
-		{error, Error} -> {error, Error};
-		Other -> {error, Other}
+		EvalState2 when is_record(EvalState2, eval_state) ->
+		    {ok,PurgeMods};
+		{error, Error} ->
+		    {error, Error};
+		Other ->
+		    {error, Other}
 	    end;
 	{error, Mod} ->
 	    {error, {old_processes, Mod}}
@@ -68,8 +72,8 @@ eval_script(Script) ->
     eval_script(Script, [], [], [], []).
 
 eval_script(Script, Apps, LibDirs, NewLibs, Opts) ->
-    case catch check_old_processes(Script) of
-	ok ->
+    case catch check_old_processes(Script,soft_purge) of
+	{ok,_} ->
 	    {Before, After} = split_instructions(Script),
 	    case catch lists:foldl(fun(Instruction, EvalState1) ->
 					   eval(Instruction, EvalState1)
@@ -112,32 +116,63 @@ split_instructions([], Before) ->
     {[], lists:reverse(Before)}.
 
 %%-----------------------------------------------------------------
-%% Func: check_old_processes/1
+%% Func: check_old_processes/2
 %% Args: Script = [instruction()]
+%%       PrePurgeMethod = soft_purge | brutal_purge
 %% Purpose: Check if there is any process that runs an old version
-%%          of a module that should be soft_purged, (i.e. not purged
-%%          at all if there is any such process).  Returns {error, Mod}
-%%          if so, ok otherwise.
-%% Returns: ok | {error, Mod}
+%%          of a module that should be purged according to PrePurgeMethod.
+%%          Returns a list of modules that can be soft_purged.
+%%
+%%          If PrePurgeMethod == soft_purge, the function will succeed
+%%          only if there is no process running old code of any of the
+%%          modules. Else it will throw {error,Mod}, where Mod is the
+%%          first module found that can not be soft_purged.
+%%
+%%          If PrePurgeMethod == brutal_purge, the function will
+%%          always succeed and return a list of all modules that are
+%%          specified in the script with PrePurgeMethod brutal_purge,
+%%          but that can be soft_purged.
+%%
+%% Returns: {ok,PurgeMods} | {error, Mod}
+%%          PurgeMods = [Mod]
 %%          Mod = atom()  
 %%-----------------------------------------------------------------
-check_old_processes(Script) ->
-    lists:foreach(fun({load, {Mod, soft_purge, _PostPurgeMethod}}) ->
-			  check_old_code(Mod);
-		     ({remove, {Mod, soft_purge, _PostPurgeMethod}}) ->
-			  check_old_code(Mod);
-		     (_) -> ok
-		  end,
-		  Script).
+check_old_processes(Script,PrePurgeMethod) ->
+    Procs = erlang:processes(),
+    {ok,lists:flatmap(
+	  fun({load, {Mod, PPM, _PostPurgeMethod}}) when PPM==PrePurgeMethod ->
+		  check_old_code(Mod,Procs,PrePurgeMethod);
+	     ({remove, {Mod, PPM, _PostPurgeMethod}}) when PPM==PrePurgeMethod ->
+		  check_old_code(Mod,Procs,PrePurgeMethod);
+	     (_) -> []
+	  end,
+	  Script)}.
+
+check_old_code(Mod,Procs,PrePurgeMethod) ->
+    case erlang:check_old_code(Mod) of
+	true when PrePurgeMethod==soft_purge ->
+	    do_check_old_code(Mod,Procs);
+	true when PrePurgeMethod==brutal_purge ->
+	    case catch do_check_old_code(Mod,Procs) of
+		{error,Mod} -> [];
+		R -> R
+	    end;
+	false ->
+	    []
+    end.
+
+
+do_check_old_code(Mod,Procs) ->
+    lists:foreach(
+      fun(Pid) ->
+	      case erlang:check_process_code(Pid, Mod) of
+		  false -> ok;
+		  true -> throw({error, Mod})
+	      end
+      end,
+      Procs),
+    [Mod].
 
-check_old_code(Mod) ->
-    lists:foreach(fun(Pid) ->
-			  case erlang:check_process_code(Pid, Mod) of
-			      false -> ok;
-			      true -> throw({error, Mod})
-			  end
-		  end,
-		  erlang:processes()).
 
 %%-----------------------------------------------------------------
 %% An unpurged module is a module for which there exist an old
@@ -458,6 +493,19 @@ start(Procs) ->
 %%       supervisor module, we should load the new version, and then
 %%       delete the old.  Then we should perform the start changes
 %%       manually, by adding/deleting children.
+%%
+%%       Recent changes to this code cause the upgrade error out and
+%%       log the case where a suspended supervisor has which_children
+%%       called against it. This retains the behavior of causing a VM
+%%       restart to the *old* version of a release but has the
+%%       advantage of logging the pid and supervisor that had the
+%%       issue.
+%%
+%%       A second case where this can occur is if a child spec is
+%%       incorrect and get_modules is called against a process that
+%%       can't respond to the gen:call. Again an error is logged,
+%%       an error returned and a VM restart is issued.
+%%
 %% Returns: [{SuperPid, ChildName, ChildPid, Mods}]
 %%-----------------------------------------------------------------
 %% OTP-3452. For each application the first item contains the pid
@@ -467,49 +515,81 @@ start(Procs) ->
 get_supervised_procs() ->
     lists:foldl(
       fun(Application, Procs) ->
-	      case application_controller:get_master(Application) of
-		  Pid when is_pid(Pid) ->
-		      {Root, _AppMod} = application_master:get_child(Pid),
-		      case get_supervisor_module(Root) of
-			  {ok, SupMod} ->
-			      get_procs(supervisor:which_children(Root), 
-					Root) ++
-				  [{undefined, undefined, Root, [SupMod]} | 
-				   Procs];
-			  {error, _} ->
-			      error_logger:error_msg("release_handler: "
-						     "cannot find top "
-						     "supervisor for "
-						    "application ~w~n", 
-						    [Application]),
-			      get_procs(supervisor:which_children(Root), 
-					Root) ++ Procs
-		      end;
-		  _ -> Procs
-	      end
+              get_master_procs(Application,
+                               Procs,
+                               application_controller:get_master(Application))
       end,
       [],
-      lists:map(fun({Application, _Name, _Vsn}) ->
-			Application
-		end,
-		application:which_applications())).
+      get_application_names()).
+
+get_supervised_procs(_, Root, Procs, {ok, SupMod}) ->
+    get_procs(maybe_supervisor_which_children(get_proc_state(Root), SupMod, Root), Root) ++
+        [{undefined, undefined, Root, [SupMod]} |  Procs];
+get_supervised_procs(Application, Root, Procs, {error, _}) ->
+    error_logger:error_msg("release_handler: cannot find top supervisor for "
+                           "application ~w~n", [Application]),
+    get_procs(maybe_supervisor_which_children(get_proc_state(Root), Application, Root), Root) ++ Procs.
+
+get_application_names() ->
+    lists:map(fun({Application, _Name, _Vsn}) ->
+                      Application
+              end,
+              application:which_applications()).
+
+get_master_procs(Application, Procs, Pid) when is_pid(Pid) ->
+    {Root, _AppMod} = application_master:get_child(Pid),
+    get_supervised_procs(Application, Root, Procs, get_supervisor_module(Root));
+get_master_procs(_, Procs, _) ->
+    Procs.
 
 get_procs([{Name, Pid, worker, dynamic} | T], Sup) when is_pid(Pid) ->
-    Mods = get_dynamic_mods(Pid),
+    Mods = maybe_get_dynamic_mods(Name, Pid),
     [{Sup, Name, Pid, Mods} | get_procs(T, Sup)];
 get_procs([{Name, Pid, worker, Mods} | T], Sup) when is_pid(Pid), is_list(Mods) ->
     [{Sup, Name, Pid, Mods} | get_procs(T, Sup)];
 get_procs([{Name, Pid, supervisor, Mods} | T], Sup) when is_pid(Pid) ->
-    [{Sup, Name, Pid, Mods} | get_procs(T, Sup)] ++ 
-	get_procs(supervisor:which_children(Pid), Pid);
+    [{Sup, Name, Pid, Mods} | get_procs(T, Sup)] ++
+        get_procs(maybe_supervisor_which_children(get_proc_state(Pid), Name, Pid), Pid);
 get_procs([_H | T], Sup) ->
     get_procs(T, Sup);
 get_procs(_, _Sup) ->
     [].
 
-get_dynamic_mods(Pid) ->
-    {ok,Res} = gen:call(Pid, self(), get_modules),
-    Res.
+get_proc_state(Proc) ->
+    {status, _, {module, _}, [_, State, _, _, _]} = sys:get_status(Proc),
+    State.
+
+maybe_supervisor_which_children(suspended, Name, Pid) ->
+    error_logger:error_msg("release_handler: a which_children call"
+                           " to ~p (~p) was avoided. This supervisor"
+                           " is suspended and should likely be upgraded"
+                           " differently. Exiting ...~n", [Name, Pid]),
+    error(suspended_supervisor);
+
+maybe_supervisor_which_children(State, Name, Pid) ->
+    case catch supervisor:which_children(Pid) of
+        Res when is_list(Res) ->
+            Res;
+        Other ->
+            error_logger:error_msg("release_handler: ~p~nerror during"
+                                   " a which_children call to ~p (~p)."
+                                   " [State: ~p] Exiting ... ~n",
+                                   [Other, Name, Pid, State]),
+            error(which_children_failed)
+    end.
+
+maybe_get_dynamic_mods(Name, Pid) ->
+    case catch gen:call(Pid, self(), get_modules) of
+        {ok, Res} ->
+            Res;
+        Other ->
+            error_logger:error_msg("release_handler: ~p~nerror during a"
+                                   " get_modules call to ~p (~p),"
+                                   " there may be an error in it's"
+                                   " childspec. Exiting ...~n",
+                                   [Other, Name, Pid]),
+            error(get_modules_failed)
+    end.
 
 %% XXXX
 %% Note: The following is a terrible hack done in order to resolve the
diff --git a/lib/sasl/src/systools_lib.erl b/lib/sasl/src/systools_lib.erl
index f951647b79..1b6ea125d9 100644
--- a/lib/sasl/src/systools_lib.erl
+++ b/lib/sasl/src/systools_lib.erl
@@ -24,7 +24,7 @@
 %%         
 
 -export([file_term2binary/2, read_term/1, read_term_from_stream/2,
-	 get_dirs/1, get_path/1]).
+	 get_dirs/1, get_path/1, werror/2]).
 
 -include_lib("kernel/include/file.hrl").
 
@@ -219,6 +219,7 @@ flat([H|T], Ack) ->
     flat(T, [H|Ack]);
 flat([], Ack) ->
     lists:reverse(Ack).
-    
-			       
+
+werror(Options, Warnings) ->
+    lists:member(warnings_as_errors, Options) andalso Warnings =/= [].
 
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 7489ee58d2..7f400f5cce 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -44,10 +44,12 @@
 
 %%-----------------------------------------------------------------
 %% Create a boot script from a release file.
-%% Options is a list of {path, Path} | silent | local where path sets
-%% the search path, silent supresses error message printing on console,
-%% local generates a script with references to the directories there
-%% the applications are found.
+%% Options is a list of {path, Path} | silent | local
+%%         | warnings_as_errors
+%% where path sets the search path, silent supresses error message
+%% printing on console, local generates a script with references
+%% to the directories there the applications are found,
+%% and warnings_as_errors treats warnings as errors.
 %%
 %% New options: {path,Path} can contain wildcards
 %%              src_tests
@@ -85,11 +87,16 @@ make_script(RelName, Output, Flags) when is_list(RelName),
 	    ModTestP = {member(src_tests, Flags),xref_p(Flags)},
 	    case get_release(RelName, Path, ModTestP, machine(Flags)) of
 		{ok, Release, Appls, Warnings} ->
-		    case generate_script(Output,Release,Appls,Flags) of
-			ok ->
+		    case systools_lib:werror(Flags, Warnings) of
+			true ->
 			    return(ok,Warnings,Flags);
-			Error ->
-			    return(Error,Warnings,Flags)
+			false ->
+			    case generate_script(Output,Release,Appls,Flags) of
+				ok ->
+				    return(ok,Warnings,Flags);
+				Error ->
+				    return(Error,Warnings,Flags)
+			    end
 		    end;
 		Error ->
 		    return(Error,[],Flags)
@@ -130,10 +137,21 @@ get_outdir(Flags) ->
 return(ok,Warnings,Flags) ->
     case member(silent,Flags) of
 	true ->
-	    {ok,?MODULE,Warnings};
+	    case systools_lib:werror(Flags, Warnings) of
+		true ->
+		    error;
+		false ->
+		    {ok,?MODULE,Warnings}
+	    end;
 	_ ->
-	    io:format("~s",[format_warning(Warnings)]),
-	    ok
+	    case member(warnings_as_errors,Flags) of
+		true ->
+		    io:format("~s",[format_warning(Warnings, true)]),
+		    error;
+		false ->
+		    io:format("~s",[format_warning(Warnings)]),
+		    ok
+	    end
     end;
 return({error,Mod,Error},_,Flags) ->
     case member(silent,Flags) of
@@ -1612,9 +1630,9 @@ var_dir(_Dir, _, _, []) ->
     false.
 
 appDir(AppDir) ->
-    case reverse(filename:split(AppDir)) of
-	["ebin"|Dir] -> filename:join(reverse(Dir));
-	_            -> AppDir
+    case filename:basename(AppDir) of
+	"ebin" -> filename:dirname(AppDir);
+	_ -> AppDir
     end.
 
 add_modules(Modules, Tar, AppDir, ToDir, Ext) ->
@@ -1833,78 +1851,89 @@ get_flag(_,_)         -> false.
 %% Check Options for make_script
 check_args_script(Args) ->
     cas(Args,
-	{undef, undef, undef, undef, undef, undef, undef, undef, []}). 
+	{undef, undef, undef, undef, undef, undef, undef, undef,
+	 undef, []}).
 
-cas([], {_Path,_Sil,_Loc,_Test,_Var,_Mach,_Xref,_XrefApps, X}) ->
+cas([], {_Path,_Sil,_Loc,_Test,_Var,_Mach,_Xref,_XrefApps,_Werror, X}) ->
     X;
 %%% path ---------------------------------------------------------------
-cas([{path, P} | Args], {Path, Sil, Loc, Test, Var, Mach, 
-			 Xref, XrefApps, X}) when is_list(P) -> 
+cas([{path, P} | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			 XrefApps, Werror, X}) when is_list(P) ->
     case check_path(P) of
 	ok ->
-	    cas(Args, {P, Sil, Loc, Test, Var, Mach, Xref, XrefApps,X});
+	    cas(Args, {P, Sil, Loc, Test, Var, Mach, Xref, XrefApps,
+		       Werror, X});
 	error ->
 	    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,
-		       X++[{path,P}]})
+		       Werror, X++[{path,P}]})
     end;
 %%% silent -------------------------------------------------------------
-cas([silent | Args], {Path, _Sil, Loc, Test, Var, Mach,
-		      Xref, XrefApps, X}) ->
-    cas(Args, {Path, silent, Loc, Test, Var, Mach, Xref, XrefApps, X});
+cas([silent | Args], {Path, _Sil, Loc, Test, Var, Mach, Xref,
+		      XrefApps, Werror, X}) ->
+    cas(Args, {Path, silent, Loc, Test, Var, Mach, Xref, XrefApps,
+	       Werror, X});
 %%% local --------------------------------------------------------------
-cas([local | Args], {Path, Sil, _Loc, Test, Var, Mach,
-		     Xref, XrefApps, X}) ->
-    cas(Args, {Path, Sil, local, Test, Var, Mach, Xref, XrefApps, X});
+cas([local | Args], {Path, Sil, _Loc, Test, Var, Mach, Xref,
+		     XrefApps, Werror, X}) ->
+    cas(Args, {Path, Sil, local, Test, Var, Mach, Xref, XrefApps,
+	       Werror, X});
 %%% src_tests -------------------------------------------------------
-cas([src_tests | Args], {Path, Sil, Loc, _Test, Var, Mach,
-			    Xref, XrefApps, X}) ->
+cas([src_tests | Args], {Path, Sil, Loc, _Test, Var, Mach, Xref,
+			 XrefApps, Werror, X}) ->
     cas(Args,
-	{Path, Sil, Loc, src_tests, Var, Mach, Xref, XrefApps,X});
+	{Path, Sil, Loc, src_tests, Var, Mach, Xref, Werror, XrefApps,X});
 %%% variables ----------------------------------------------------------
-cas([{variables, V} | Args], {Path, Sil, Loc, Test, Var, Mach, 
-				 Xref, XrefApps, X}) when is_list(V) ->
+cas([{variables, V} | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			      XrefApps, Werror, X}) when is_list(V) ->
     case check_vars(V) of
 	ok ->
 	    cas(Args,
-		{Path, Sil, Loc, Test, V, Mach, Xref, XrefApps, X});
+		{Path, Sil, Loc, Test, V, Mach, Xref, XrefApps, Werror, X});
 	error ->
 	    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,
-		       X++[{variables, V}]})
+		       Werror, X++[{variables, V}]})
     end;
 %%% machine ------------------------------------------------------------
-cas([{machine, M} | Args], {Path, Sil, Loc, Test, Var, Mach, 
-			    Xref, XrefApps, X}) when is_atom(M) ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, X});
+cas([{machine, M} | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			    XrefApps, Werror, X}) when is_atom(M) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, Werror, X});
 %%% exref --------------------------------------------------------------
-cas([exref | Args], {Path, Sil, Loc, Test, Var, Mach,
-		     _Xref, XrefApps, X})  ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, exref, XrefApps, X});
+cas([exref | Args], {Path, Sil, Loc, Test, Var, Mach, _Xref,
+		     XrefApps, Werror, X})  ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, exref, XrefApps, Werror, X});
 %%% exref Apps ---------------------------------------------------------
-cas([{exref, Apps} | Args], {Path, Sil, Loc, Test, Var, Mach, 
-			     Xref, XrefApps, X}) when is_list(Apps) ->
+cas([{exref, Apps} | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			     XrefApps, Werror, X}) when is_list(Apps) ->
     case check_apps(Apps) of 
 	ok ->
 	    cas(Args, {Path, Sil, Loc, Test, Var, Mach, 
-			     Xref, Apps, X});
+		       Xref, Apps, Werror, X});
 	error ->
 	    cas(Args, {Path, Sil, Loc, Test, Var, Mach, 
-			     Xref, XrefApps, X++[{exref, Apps}]})
+		       Xref, XrefApps, Werror, X++[{exref, Apps}]})
     end;
 %%% outdir Dir ---------------------------------------------------------
-cas([{outdir, Dir} | Args], {Path, Sil, Loc, Test, Var, Mach,
-			     Xref, XrefApps, X}) when is_list(Dir) ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, X});
+cas([{outdir, Dir} | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			     XrefApps, Werror, X}) when is_list(Dir) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, Werror, X});
 %%% otp_build (secret, not documented) ---------------------------------
-cas([otp_build | Args], {Path, Sil, Loc, Test, Var, Mach,
-			 Xref, XrefApps, X}) ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, X});
+cas([otp_build | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			 XrefApps, Werror, X}) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, Werror, X});
 %%% no_module_tests (kept for backwards compatibility, but ignored) ----
-cas([no_module_tests | Args], {Path, Sil, Loc, Test, Var, Mach,
-			       Xref, XrefApps, X}) ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,X});
+cas([no_module_tests | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			       XrefApps, Werror, X}) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, Werror, X});
+%%% warnings_as_errors (kept for backwards compatibility, but ignored) ----
+cas([warnings_as_errors | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+				  XrefApps, _Werror, X}) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,
+	       warnings_as_errors, X});
 %%% ERROR --------------------------------------------------------------
-cas([Y | Args], {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, X}) ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,X++[Y]}).
+cas([Y | Args], {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,
+		 Werror, X}) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, Werror,
+	       X++[Y]}).
 
 
 
@@ -2030,7 +2059,6 @@ check_apps([H|T]) when is_atom(H) ->
 check_apps(_) ->
     error.
 
-
 %% Format error
 
 format_error(badly_formatted_release) ->
@@ -2144,21 +2172,31 @@ form_tar_err({add, File, Error}) ->
 %% Format warning
 
 format_warning(Warnings) ->
-    map(fun({warning,W}) -> form_warn(W) end, Warnings).
-
-form_warn({source_not_found,{Mod,_,App,_,_}}) ->
-    io_lib:format("*WARNING* ~p: Source code not found: ~p.erl~n",
-		  [App,Mod]);
-form_warn({{parse_error, File},{_,_,App,_,_}}) ->
-    io_lib:format("*WARNING* ~p: Parse error: ~p~n",
-		  [App,File]);
-form_warn({obj_out_of_date,{Mod,_,App,_,_}}) ->
-    io_lib:format("*WARNING* ~p: Object code (~p) out of date~n",[App,Mod]);
-form_warn({exref_undef, Undef}) ->
-    F = fun({M,F,A}) -> 
-		io_lib:format("*WARNING* Undefined function ~p:~p/~p~n", 
-			      [M,F,A])
+    format_warning(Warnings, false).
+
+format_warning(Warnings, Werror) ->
+    Prefix = case Werror of
+		 true ->
+		     "";
+		 false ->
+		     "*WARNING* "
+	     end,
+    map(fun({warning,W}) -> form_warn(Prefix, W) end, Warnings).
+
+form_warn(Prefix, {source_not_found,{Mod,_,App,_,_}}) ->
+    io_lib:format("~s~p: Source code not found: ~p.erl~n",
+		  [Prefix,App,Mod]);
+form_warn(Prefix, {{parse_error, File},{_,_,App,_,_}}) ->
+    io_lib:format("~s~p: Parse error: ~p~n",
+		  [Prefix,App,File]);
+form_warn(Prefix, {obj_out_of_date,{Mod,_,App,_,_}}) ->
+    io_lib:format("~s~p: Object code (~p) out of date~n",
+		  [Prefix,App,Mod]);
+form_warn(Prefix, {exref_undef, Undef}) ->
+    F = fun({M,F,A}) ->
+		io_lib:format("~sUndefined function ~p:~p/~p~n",
+			      [Prefix,M,F,A])
 	end,
     map(F, Undef);
-form_warn(What) ->
-    io_lib:format("*WARNING* ~p~n", [What]).
+form_warn(Prefix, What) ->
+    io_lib:format("~s ~p~n", [Prefix,What]).
diff --git a/lib/sasl/src/systools_relup.erl b/lib/sasl/src/systools_relup.erl
index ec5486226c..6d9e922900 100644
--- a/lib/sasl/src/systools_relup.erl
+++ b/lib/sasl/src/systools_relup.erl
@@ -122,7 +122,7 @@
 %% rel_filename() = description() = string()
 %% Opts = [opt()]
 %% opt() = {path, [path()]} | silent | noexec | restart_emulator
-%%       | {outdir, string()}
+%%       | {outdir, string()} | warnings_as_errors
 %% path() = [string()]
 %% Ret = ok | error | {ok, Relup, Module, Warnings} | {error, Module, Error}
 %%
@@ -139,8 +139,9 @@
 %% 
 %% The option `path' sets search path, `silent' suppresses printing of
 %% error messages to the console, `noexec' inhibits the creation of
-%% the output "relup" file, and restart_emulator ensures that the new
-%% emulator is restarted (as the final step).
+%% the output "relup" file, restart_emulator ensures that the new
+%% emulator is restarted (as the final step), and `warnings_as_errors'
+%% treats warnings as errors.
 %% ----------------------------------------------------------------
 mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs) ->
     mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs, []).
@@ -153,14 +154,29 @@ mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs, Opts) ->
 		{false, false} ->
 		    case R of
 			{ok, _Res, _Mod, Ws} -> 
-			    print_warnings(Ws),
-			    ok;
+			    print_warnings(Ws, Opts),
+			    case systools_lib:werror(Opts, Ws) of
+				true ->
+				    error;
+				false ->
+				    ok
+			    end;
 			Other -> 
 			    print_error(Other),
 			    error
 		    end;
-		_ -> 
-		    R
+		_ ->
+		    case R of
+			{ok, _Res, _Mod, Ws} ->
+			    case systools_lib:werror(Opts, Ws) of
+				true ->
+				    error;
+				false ->
+				    R
+			    end;
+			R ->
+			    R
+		    end
 	    end;
 	BadArg ->
 	    erlang:error({badarg, BadArg})
@@ -195,7 +211,12 @@ do_mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs, Path, Opts) ->
 	    {Dn, Ws2} = foreach_baserel_dn(TopRel, TopApps, BaseDnRelDcs, 
 					  Path, Opts, Ws1),
 	    Relup = {TopRel#release.vsn, Up, Dn},
-	    write_relup_file(Relup, Opts),
+	    case systools_lib:werror(Opts, Ws2) of
+		true ->
+		    ok;
+		false ->
+		    write_relup_file(Relup, Opts)
+	    end,
 	    {ok, Relup, ?MODULE, Ws2};
 	Other -> 
 	    throw(Other)
@@ -527,20 +548,29 @@ format_error(Error) ->
     io:format("~p~n", [Error]).
 
 
-print_warnings(Ws) when is_list(Ws) ->
-    lists:foreach(fun(W) -> print_warning(W) end, Ws);
-print_warnings(W) ->
-    print_warning(W).
+print_warnings(Ws, Opts) when is_list(Ws) ->
+    lists:foreach(fun(W) -> print_warning(W, Opts) end, Ws);
+print_warnings(W, Opts) ->
+    print_warning(W, Opts).
 
-print_warning(W) ->
-    S = format_warning(W),
+print_warning(W, Opts) ->
+    Prefix = case lists:member(warnings_as_errors, Opts) of
+		 true ->
+		     "";
+		 false ->
+		     "*WARNING* "
+	     end,
+    S = format_warning(Prefix, W),
     io:format("~s", [S]).
 
-format_warning({erts_vsn_changed, {Rel1, Rel2}}) ->
-    io_lib:format("*WARNING* The ERTS version changed between ~p and ~p~n",
-		  [Rel1, Rel2]);
-format_warning(What) ->
-    io_lib:format("*WARNING* ~p~n",[What]).
+format_warning(W) ->
+    format_warning("*WARNING* ", W).
+
+format_warning(Prefix, {erts_vsn_changed, {Rel1, Rel2}}) ->
+    io_lib:format("~sThe ERTS version changed between ~p and ~p~n",
+		  [Prefix, Rel1, Rel2]);
+format_warning(Prefix, What) ->
+    io_lib:format("~s~p~n",[Prefix, What]).
 
 
 get_reason({error, {open, _, _}}) -> open;
diff --git a/lib/sasl/test/Makefile b/lib/sasl/test/Makefile
index 0bdb79a06a..65be134462 100644
--- a/lib/sasl/test/Makefile
+++ b/lib/sasl/test/Makefile
@@ -86,7 +86,7 @@ release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)
 	$(INSTALL_DATA) sasl.spec sasl.cover $(EMAKEFILE) $(RELSYSDIR)
-	chmod -f -R u+w $(RELSYSDIR)
+	chmod -R u+w $(RELSYSDIR)
 	@tar cfh - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
 release_docs_spec:
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 9c7733b7ec..af2183bfff 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -55,7 +55,10 @@ win32_cases() ->
 
 %% Cases that can be run on all platforms
 cases() ->
-    [otp_2740, otp_2760, otp_5761, otp_9402, otp_9417, instructions, eval_appup].
+    [otp_2740, otp_2760, otp_5761, otp_9402, otp_9417,
+     otp_9395_check_old_code, otp_9395_check_and_purge,
+     otp_9395_update_many_mods, otp_9395_rm_many_mods,
+     instructions, eval_appup, supervisor_which_children_timeout].
 
 groups() ->
     [{release,[],
@@ -520,6 +523,29 @@ no_cc() ->
 %%%-----------------------------------------------------------------
 
 %%-----------------------------------------------------------------
+%% release_handler_1:get_supervised_procs/0 test
+%%-----------------------------------------------------------------
+supervisor_which_children_timeout(Conf) ->
+    PrivDir = priv_dir(Conf),
+    Dir = filename:join(PrivDir,"supervisor_which_children_timeout"),
+    DataDir = ?config(data_dir,Conf),
+    LibDir = filename:join([DataDir,release_handler_timeouts]),
+
+    Rel1 = create_and_install_fake_first_release(Dir,[{dummy,"0.1",LibDir}]),
+
+    {ok, Node} = t_start_node(supervisor_which_children_timeout, Rel1, []),
+    Proc = rpc:call(Node, erlang, whereis, [dummy_sup_2]),
+    ok = rpc:call(Node, sys, suspend, [Proc]),
+    Result = {badrpc, {'EXIT', {suspended_supervisor, _}}} =
+        rpc:call(Node, release_handler_1, get_supervised_procs, []),
+    ?t:format("release_handler_1:get_supervised_procs/0: ~p~n", [Result]),
+
+    ok.
+
+supervisor_which_children_timeout(cleanup, Conf) ->
+    stop_node(node_name(supervisor_which_children_timeout)).
+
+%%-----------------------------------------------------------------
 %% Ticket: OTP-2740
 %% Slogan: vsn not numeric doesn't work so good in release_handling
 %%-----------------------------------------------------------------
@@ -556,7 +582,7 @@ otp_2760(Conf) ->
     LibDir = filename:join([DataDir,app1_app2,lib1]),
 
     Rel1 = create_and_install_fake_first_release(Dir,[{app1,"1.0",LibDir}]),
-    Rel2 = create_fake_upgrade_release(Dir,"after",[],{Rel1,Rel1,[LibDir]}),
+    Rel2 = create_fake_upgrade_release(Dir,"after",[],{[Rel1],[Rel1],[LibDir]}),
     Rel2Dir = filename:dirname(Rel2),
 
     %% Start a node with Rel1.boot and check that the app1 module is loaded
@@ -569,9 +595,12 @@ otp_2760(Conf) ->
     {ok, []} = rpc:call(Node, release_handler_1, eval_script, [Script]),
     false = rpc:call(Node, code, is_loaded, [app1]),
 
-    true = stop_node(Node),
     ok.
 
+otp_2760(cleanup,_Conf) ->
+    stop_node(node_name(otp_2760)).
+
+
 %% Test upgrade using other filesystem than the defined in OTP and
 %% option {update_paths, true}
 otp_5761(Conf) when is_list(Conf) ->
@@ -597,7 +626,7 @@ otp_5761(Conf) when is_list(Conf) ->
 				       "2",
 				       [{app1,"2.0",LibDir2},
 					{app2,"1.0",LibDir2}],
-				       {Rel1,Rel1,[LibDir1]}),
+				       {[Rel1],[Rel1],[LibDir1]}),
     Rel1Dir = filename:dirname(Rel1),
     Rel2Dir = filename:dirname(Rel2),
     
@@ -653,10 +682,11 @@ otp_5761(Conf) when is_list(Conf) ->
     App11Dir = rpc:call(Node, code, lib_dir, [app1]),
     App2aDir = rpc:call(Node, code, lib_dir, [app2]),
 
-    %% Stop the slave node
-    true = stop_node(Node),
     ok.
 
+otp_5761(cleanup,_Conf) ->
+    stop_node(node_name(otp_5761)).
+
 
 %% When a new version of an application is added, but no module is
 %% changed - the path was not updated - i.e. code:priv_dir would point
@@ -673,7 +703,7 @@ otp_9402(Conf) when is_list(Conf) ->
     Rel2 = create_fake_upgrade_release(Dir,
 				       "2",
 				       [{a,"1.2",LibDir}],
-				       {Rel1,Rel1,[LibDir]}),
+				       {[Rel1],[Rel1],[LibDir]}),
     Rel1Dir = filename:dirname(Rel1),
     Rel2Dir = filename:dirname(Rel2),
 
@@ -722,6 +752,9 @@ otp_9402(Conf) when is_list(Conf) ->
 
     ok.
 
+otp_9402(cleanup,_Conf) ->
+    stop_node(node_name(otp_9402)).
+
 
 %% When a module is deleted in an appup instruction, the upgrade
 %% failed if the module was not loaded.
@@ -737,7 +770,7 @@ otp_9417(Conf) when is_list(Conf) ->
     Rel2 = create_fake_upgrade_release(Dir,
 				       "2",
 				       [{b,"2.0",LibDir}],
-				       {Rel1,Rel1,[LibDir]}),
+				       {[Rel1],[Rel1],[LibDir]}),
     Rel1Dir = filename:dirname(Rel1),
     Rel2Dir = filename:dirname(Rel2),
 
@@ -777,6 +810,282 @@ otp_9417(Conf) when is_list(Conf) ->
     {file,BServerBeam} = rpc:call(Node,code,is_loaded,[b_server]),
     ok.
 
+otp_9417(cleanup,_Conf) ->
+    stop_node(node_name(otp_9417)).
+
+
+%% OTP-9395 - performance problems when there are MANY processes
+%% Test that the procedure of checking for old code before an upgrade
+%% can be started is "very much faster" when there is no old code in
+%% the system.
+otp_9395_check_old_code(Conf) when is_list(Conf) ->
+
+    NProcs = 1000,
+    MPath = filename:join([?config(data_dir,Conf),"lib","many_mods-1.0","ebin"]),
+    code:add_path(MPath),
+
+    %% Start NProc processes, each referencing each module
+    {Modules,Pids} = m:start(NProcs),
+
+    %% Load each module again in order to get old code
+    [code:load_file(Mod) || Mod <- Modules],
+    true = erlang:check_old_code(m10),
+
+    S = [point_of_no_return |
+	 [{remove,{M,soft_purge,soft_purge}} || M <- Modules]],
+
+    %% Do the old code check, then purge, and redo
+    {T1,{ok,PurgeMods}} = timer:tc(release_handler_1,check_script,[S,[]]),
+    true = (lists:sort(PurgeMods) == lists:sort(Modules)),
+    [code:purge(M) || M <- PurgeMods],
+    {T2,{ok,[]}} = timer:tc(release_handler_1,check_script,[S,[]]),
+
+    %% Cleanup
+    lists:foreach(fun(Pid) -> Pid ! stop end, Pids),
+    lists:foreach(fun(Mod) -> code:purge(Mod),
+			      code:delete(Mod),
+			      code:purge(Mod)
+		  end, Modules),
+    code:del_path(MPath),
+
+    %% Test that second run was much faster than the first
+    if T2 > 0 ->
+	    X = T1/T2,
+	    ct:log("~p procs, ~p mods -> ~n"
+		   "\tWith old code: ~.2f sec~n"
+		   "\tAfter purge: ~.2f sec~n"
+		   "\tT1/T2: ~.2f",
+		   [NProcs,length(Modules),T1/1000000,T2/1000000,X]),
+	    if X < 1000 ->
+		    ct:fail({not_enough_improvement_after_purge,round(X)});
+	       true ->
+		    ok
+	    end;
+       T1 > 0 -> %% Means T1/T2 = infinite
+	    ok;
+       true ->
+	    ct:fail({unexpected_values,T1,T2})
+    end,
+    ok.
+
+
+%% OTP-9395 - performance problems when there are MANY processes
+%% Added option 'purge' to check_install_release
+otp_9395_check_and_purge(Conf) when is_list(Conf) ->
+    %% Set some paths
+    PrivDir = priv_dir(Conf),
+    Dir = filename:join(PrivDir,"otp_9395_check_and_purge"),
+    LibDir = filename:join(?config(data_dir, Conf), "lib"),
+
+    %% Create the releases
+    Rel1 = create_and_install_fake_first_release(Dir,
+						 [{b,"1.0",LibDir}]),
+    Rel2 = create_fake_upgrade_release(Dir,
+				       "2",
+				       [{b,"2.0",LibDir}],
+				       {[Rel1],[Rel1],[LibDir]}),
+    Rel1Dir = filename:dirname(Rel1),
+    Rel2Dir = filename:dirname(Rel2),
+
+    %% Start a slave node
+    {ok, Node} = t_start_node(otp_9395_check_and_purge, Rel1,
+			      filename:join(Rel1Dir,"sys.config")),
+
+    %% Make sure there is old code for b_lib and b_server
+    rpc:call(Node,code,load_file,[b_lib]),
+    rpc:call(Node,code,load_file,[b_lib]),
+    rpc:call(Node,code,load_file,[b_server]),
+    rpc:call(Node,code,load_file,[b_server]),
+    true = rpc:call(Node,erlang,check_old_code,[b_lib]),
+    true = rpc:call(Node,erlang,check_old_code,[b_server]),
+
+    %% Unpack second release, which removes b_lib module and loads b_server
+    {ok, RelVsn2} =
+	rpc:call(Node, release_handler, set_unpacked,
+		 [Rel2++".rel", [{b,"2.0",LibDir}]]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "relup")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "start.boot")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
+
+    %% Do check_install_release, and check that old code still exists
+    {ok, _RelVsn1, []} =
+	rpc:call(Node, release_handler, check_install_release, [RelVsn2]),
+    true = rpc:call(Node,erlang,check_old_code,[b_lib]),
+    true = rpc:call(Node,erlang,check_old_code,[b_server]),
+
+    %% Do check_install_release with option 'purge' and check that old
+    %% code is gone
+    {ok, _RelVsn1, []} =
+	rpc:call(Node, release_handler, check_install_release, [RelVsn2,[purge]]),
+    false = rpc:call(Node,erlang,check_old_code,[b_lib]),
+    false = rpc:call(Node,erlang,check_old_code,[b_server]),
+
+    ok.
+
+otp_9395_check_and_purge(cleanup,_Conf) ->
+    stop_node(node_name(otp_9395_check_and_purge)).
+
+
+%% OTP-9395 - performance problems when there are MANY processes
+%% Upgrade which updates many modules (brutal_purge)
+otp_9395_update_many_mods(Conf) when is_list(Conf) ->
+    %% Set some paths
+    PrivDir = priv_dir(Conf),
+    Dir = filename:join(PrivDir,"otp_9395_update_many_mods"),
+    LibDir = filename:join(?config(data_dir, Conf), "lib"),
+
+    %% Create the releases
+    Rel1 = create_and_install_fake_first_release(Dir,
+						 [{many_mods,"1.0",LibDir}]),
+    Rel2 = create_fake_upgrade_release(Dir,
+				       "2",
+				       [{many_mods,"1.1",LibDir}],
+				       {[Rel1],[Rel1],[LibDir]}),
+    Rel1Dir = filename:dirname(Rel1),
+    Rel2Dir = filename:dirname(Rel2),
+
+    %% Start a slave node
+    {ok, Node} = t_start_node(otp_9395_update_many_mods, Rel1,
+			      filename:join(Rel1Dir,"sys.config")),
+
+    %% Start a lot of processes on the new node, all with refs to each
+    %% module that will be updated
+    NProcs = 1000,
+    {Modules,Pids1} = rpc:call(Node,m,start,[NProcs]),
+
+    %% Then load modules in order to get old code
+    [rpc:call(Node,code,load_file,[Mod]) || Mod <- Modules],
+    true = rpc:call(Node,erlang,check_old_code,[m10]),
+
+    %% Unpack second release, which updates all mX modules
+    {ok, RelVsn2} =
+	rpc:call(Node, release_handler, set_unpacked,
+		 [Rel2++".rel", [{many_mods,"1.1",LibDir}]]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "relup")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "start.boot")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
+
+    %% First, install release directly and check how much time it takes
+    {TInst0,{ok, _, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
+    ct:log("install_release: ~.2f",[TInst0/1000000]),
+
+    %% Restore to old release, spawn processes again and load to get old code
+    {_,RelVsn1} = init:script_id(),
+    {_TInst1,{ok, _, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn1]]),
+%    ct:log("install_release: ~.2f",[_TInst1/1000000]),
+
+    [exit(Pid,kill) || Pid <- Pids1],
+    {Modules,_Pids2} = rpc:call(Node,m,start,[NProcs]),
+    [rpc:call(Node,code,load_file,[Mod]) || Mod <- Modules],
+    true = rpc:call(Node,erlang,check_old_code,[m10]),
+
+    %% Run check_install_release with purge before install this time
+    {TCheck,{ok, _RelVsn1, []}} =
+	timer:tc(rpc,call,[Node, release_handler, check_install_release,
+			   [RelVsn2,[purge]]]),
+    ct:log("check_install_release with purge: ~.2f",[TCheck/1000000]),
+
+    %% Finally install release after check and purge, and check that
+    %% this install was faster than the first.
+    {TInst2,{ok, _RelVsn1, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
+    ct:log("install_release: ~.2f",[TInst2/1000000]),
+
+    true = (TInst2 < TInst0),
+
+    ok.
+
+otp_9395_update_many_mods(cleanup,_Conf) ->
+    stop_node(node_name(otp_9395_update_many_mods)).
+
+
+%% OTP-9395 - performance problems when there are MANY processes
+%% Upgrade which removes many modules (brutal_purge)
+otp_9395_rm_many_mods(Conf) when is_list(Conf) ->
+    %% Set some paths
+    PrivDir = priv_dir(Conf),
+    Dir = filename:join(PrivDir,"otp_9395_rm_many_mods"),
+    LibDir = filename:join(?config(data_dir, Conf), "lib"),
+
+    %% Create the releases
+    Rel1 = create_and_install_fake_first_release(Dir,
+						 [{many_mods,"1.0",LibDir}]),
+    Rel2 = create_fake_upgrade_release(Dir,
+				       "2",
+				       [{many_mods,"2.0",LibDir}],
+				       {[Rel1],[Rel1],[LibDir]}),
+    Rel1Dir = filename:dirname(Rel1),
+    Rel2Dir = filename:dirname(Rel2),
+
+    %% Start a slave node
+    {ok, Node} = t_start_node(otp_9395_rm_many_mods, Rel1,
+			      filename:join(Rel1Dir,"sys.config")),
+
+    %% Start a lot of processes on the new node, all with refs to each
+    %% module that will be updated
+    NProcs = 1000,
+    {Modules,Pids1} = rpc:call(Node,m,start,[NProcs]),
+
+    %% Then load modules in order to get old code
+    [rpc:call(Node,code,load_file,[Mod]) || Mod <- Modules],
+    true = rpc:call(Node,erlang,check_old_code,[m10]),
+
+    %% Unpack second release, which removes all mX modules
+    {ok, RelVsn2} =
+	rpc:call(Node, release_handler, set_unpacked,
+		 [Rel2++".rel", [{many_mods,"2.0",LibDir}]]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "relup")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "start.boot")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
+
+    %% First, install release directly and check how much time it takes
+    {TInst0,{ok, _, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
+    ct:log("install_release: ~.2f",[TInst0/1000000]),
+
+    %% Restore to old release, spawn processes again and load to get old code
+    {_,RelVsn1} = init:script_id(),
+    {_TInst1,{ok, _, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn1]]),
+%    ct:log("install_release: ~.2f",[_TInst1/1000000]),
+
+    [exit(Pid,kill) || Pid <- Pids1],
+    {Modules,_Pids2} = rpc:call(Node,m,start,[NProcs]),
+    [rpc:call(Node,code,load_file,[Mod]) || Mod <- Modules],
+    true = rpc:call(Node,erlang,check_old_code,[m10]),
+
+    %% Run check_install_release with purge before install this time
+    {TCheck,{ok, _RelVsn1, []}} =
+	timer:tc(rpc,call,[Node, release_handler, check_install_release,
+			   [RelVsn2,[purge]]]),
+    ct:log("check_install_release with purge: ~.2f",[TCheck/1000000]),
+
+    %% Finally install release after check and purge, and check that
+    %% this install was faster than the first.
+    {TInst2,{ok, _RelVsn1, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
+    ct:log("install_release: ~.2f",[TInst2/1000000]),
+
+    true = (TInst2 =< TInst0),
+
+    ok.
+
+otp_9395_rm_many_mods(cleanup,_Conf) ->
+    stop_node(node_name(otp_9395_rm_many_mods)).
+
+
+
 %% Test upgrade and downgrade of applications
 eval_appup(Conf) when is_list(Conf) ->
 
@@ -1838,9 +2147,8 @@ create_fake_upgrade_release(Dir,RelVsn,AppDirs,{UpFrom,DownTo,ExtraLibs}) ->
 
     %% And a relup file so it can be upgraded to
     RelupPath = Paths ++ [filename:join([Lib,"*","ebin"]) || Lib <- ExtraLibs],
-    ok = systools:make_relup(Rel,[UpFrom],[DownTo],
-				   [{path,RelupPath},
-				    {outdir,RelDir}]),
+    ok = systools:make_relup(Rel,UpFrom,DownTo,[{path,RelupPath},
+						{outdir,RelDir}]),
     
     Rel.
 
diff --git a/lib/sasl/test/release_handler_SUITE_data/Makefile.src b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
index a12e526d2e..edb446413d 100644
--- a/lib/sasl/test/release_handler_SUITE_data/Makefile.src
+++ b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
@@ -13,7 +13,30 @@ LIB= \
      lib/a-1.0/ebin/a_sup.@EMULATOR@ \
      lib/b-1.0/ebin/b_server.@EMULATOR@ \
      lib/b-1.0/ebin/b_lib.@EMULATOR@ \
-     lib/b-2.0/ebin/b_server.@EMULATOR@
+     lib/b-2.0/ebin/b_server.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m1.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m2.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m3.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m4.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m5.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m6.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m7.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m8.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m9.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m10.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m1.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m2.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m3.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m4.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m5.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m6.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m7.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m8.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m9.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m10.@EMULATOR@ \
+     lib/many_mods-2.0/ebin/m.@EMULATOR@
 
 APP= \
      app1_app2/lib1/app1-1.0/ebin/app1_sup.@EMULATOR@ \
@@ -41,8 +64,13 @@ C= \
      c/b.@EMULATOR@ \
      c/c_sup.@EMULATOR@
     
+SUP= \
+	 release_handler_timeouts/dummy-0.1/ebin/dummy_app.@EMULATOR@ \
+	 release_handler_timeouts/dummy-0.1/ebin/dummy_server.@EMULATOR@ \
+	 release_handler_timeouts/dummy-0.1/ebin/dummy_sup.@EMULATOR@ \
+	 release_handler_timeouts/dummy-0.1/ebin/dummy_sup_2.@EMULATOR@
 
-all: $(P2B) $(LIB) $(APP) $(OTP2740) $(C)
+all: $(P2B) $(LIB) $(APP) $(OTP2740) $(C) $(SUP)
 
 P2B/a-2.0/ebin/a.@EMULATOR@: P2B/a-2.0/src/a.erl
 	erlc $(EFLAGS) -oP2B/a-2.0/ebin P2B/a-2.0/src/a.erl
@@ -75,6 +103,52 @@ lib/b-1.0/ebin/b_lib.@EMULATOR@: lib/b-1.0/src/b_lib.erl
 lib/b-2.0/ebin/b_server.@EMULATOR@: lib/b-2.0/src/b_server.erl
 	erlc $(EFLAGS) -olib/b-2.0/ebin lib/b-2.0/src/b_server.erl
 
+lib/many_mods-1.0/ebin/m.@EMULATOR@: lib/many_mods-1.0/src/m.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m.erl
+lib/many_mods-1.0/ebin/m1.@EMULATOR@: lib/many_mods-1.0/src/m1.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m1.erl
+lib/many_mods-1.0/ebin/m2.@EMULATOR@: lib/many_mods-1.0/src/m2.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m2.erl
+lib/many_mods-1.0/ebin/m3.@EMULATOR@: lib/many_mods-1.0/src/m3.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m3.erl
+lib/many_mods-1.0/ebin/m4.@EMULATOR@: lib/many_mods-1.0/src/m4.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m4.erl
+lib/many_mods-1.0/ebin/m5.@EMULATOR@: lib/many_mods-1.0/src/m5.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m5.erl
+lib/many_mods-1.0/ebin/m6.@EMULATOR@: lib/many_mods-1.0/src/m6.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m6.erl
+lib/many_mods-1.0/ebin/m7.@EMULATOR@: lib/many_mods-1.0/src/m7.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m7.erl
+lib/many_mods-1.0/ebin/m8.@EMULATOR@: lib/many_mods-1.0/src/m8.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m8.erl
+lib/many_mods-1.0/ebin/m9.@EMULATOR@: lib/many_mods-1.0/src/m9.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m9.erl
+lib/many_mods-1.0/ebin/m10.@EMULATOR@: lib/many_mods-1.0/src/m10.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m10.erl
+lib/many_mods-1.1/ebin/m.@EMULATOR@: lib/many_mods-1.1/src/m.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m.erl
+lib/many_mods-1.1/ebin/m1.@EMULATOR@: lib/many_mods-1.1/src/m1.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m1.erl
+lib/many_mods-1.1/ebin/m2.@EMULATOR@: lib/many_mods-1.1/src/m2.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m2.erl
+lib/many_mods-1.1/ebin/m3.@EMULATOR@: lib/many_mods-1.1/src/m3.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m3.erl
+lib/many_mods-1.1/ebin/m4.@EMULATOR@: lib/many_mods-1.1/src/m4.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m4.erl
+lib/many_mods-1.1/ebin/m5.@EMULATOR@: lib/many_mods-1.1/src/m5.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m5.erl
+lib/many_mods-1.1/ebin/m6.@EMULATOR@: lib/many_mods-1.1/src/m6.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m6.erl
+lib/many_mods-1.1/ebin/m7.@EMULATOR@: lib/many_mods-1.1/src/m7.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m7.erl
+lib/many_mods-1.1/ebin/m8.@EMULATOR@: lib/many_mods-1.1/src/m8.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m8.erl
+lib/many_mods-1.1/ebin/m9.@EMULATOR@: lib/many_mods-1.1/src/m9.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m9.erl
+lib/many_mods-1.1/ebin/m10.@EMULATOR@: lib/many_mods-1.1/src/m10.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m10.erl
+lib/many_mods-2.0/ebin/m.@EMULATOR@: lib/many_mods-2.0/src/m.erl
+	erlc $(EFLAGS) -olib/many_mods-2.0/ebin lib/many_mods-2.0/src/m.erl
 
 
 app1_app2/lib1/app1-1.0/ebin/app1_sup.@EMULATOR@: app1_app2/lib1/app1-1.0/src/app1_sup.erl
@@ -126,3 +200,12 @@ c/b.@EMULATOR@: c/b.erl
 	erlc $(EFLAGS) -oc c/b.erl
 c/c_sup.@EMULATOR@: c/c_sup.erl
 	erlc $(EFLAGS) -oc c/c_sup.erl
+
+release_handler_timeouts/dummy-0.1/ebin/dummy_app.@EMULATOR@: release_handler_timeouts/dummy-0.1/src/dummy_app.erl
+	erlc $(EFLAGS) -orelease_handler_timeouts/dummy-0.1/ebin release_handler_timeouts/dummy-0.1/src/dummy_app.erl
+release_handler_timeouts/dummy-0.1/ebin/dummy_server.@EMULATOR@: release_handler_timeouts/dummy-0.1/src/dummy_server.erl
+	erlc $(EFLAGS) -orelease_handler_timeouts/dummy-0.1/ebin release_handler_timeouts/dummy-0.1/src/dummy_server.erl
+release_handler_timeouts/dummy-0.1/ebin/dummy_sup.@EMULATOR@: release_handler_timeouts/dummy-0.1/src/dummy_sup.erl
+	erlc $(EFLAGS) -orelease_handler_timeouts/dummy-0.1/ebin release_handler_timeouts/dummy-0.1/src/dummy_sup.erl
+release_handler_timeouts/dummy-0.1/ebin/dummy_sup_2.@EMULATOR@: release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl
+	erlc $(EFLAGS) -orelease_handler_timeouts/dummy-0.1/ebin release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/README b/lib/sasl/test/release_handler_SUITE_data/lib/README
index 667d21d4cf..639a4ca0fb 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/README
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/README
@@ -13,4 +13,21 @@ start version, includes b_lib and b_server
 
 b-2.0:
 can be upgraded to from b-1.0.
-Removes b_lib and updates b_server
+Removes b_lib (soft_purge) and updates b_server (brutal_purge)
+* The diff in purge method is important for test "check_and_purge", in
+  order to check that the purge option to check_install_release works
+  for both methods.
+
+many_mods-1.0:
+start version.
+m:start/1 starts N procs, each calling Mod:bar() in all other modules (m1-m10).
+m1-m10: implements bar() which returns a big constant.
+The point is to get many processes with references to many modules,
+and then load the modules again so that old code exists. See tests
+otp_9395_update_many_mods and otp_9395_rm_many_mods.
+
+many_mods-1.1:
+can be upgraded to from many_mods-1.0. Updates modules m1-m10.
+
+many_mods-2.0:
+can be upgraded to from many_mods-1.0. Removes modules m1-m10.
\ No newline at end of file
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.appup b/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.appup
index d261a37732..001255a88c 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.appup
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.appup
@@ -1,3 +1,6 @@
+%% -*- erlang -*-
 {"2.0",
- [{"1.0",[{delete_module,b_lib}, {update,b_server,{advanced,[]}}]}],
- [{"1.0",[{add_module,b_lib},{update,b_server,{advanced,[]}}]}]}.
+ [{"1.0",[{remove_module,b_lib,soft_purge,soft_purge,[]},
+	  {update,b_server,{advanced,[]}}]}],
+ [{"1.0",[{add_module,b_lib},
+	  {update,b_server,{advanced,[]}}]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app
new file mode 100644
index 0000000000..aa39adfffa
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app
@@ -0,0 +1,17 @@
+%% -*- erlang -*-
+{application, many_mods,
+ [{description, "Application with many modules  CXC 138 11"},
+  {vsn, "1.0"},
+  {modules, [{m, 1},
+	     {m1,1},
+	     {m2,1},
+	     {m3,1},
+	     {m4,1},
+	     {m5,1},
+	     {m6,1},
+	     {m7,1},
+	     {m8,1},
+	     {m9,1},
+	     {m10,1}]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl
new file mode 100644
index 0000000000..418102bebb
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl
@@ -0,0 +1,11 @@
+-module(m).
+-compile(export_all).
+
+start(NProcs) ->
+    Modules = [m1,m2,m3,m4,m5,m6,m7,m8,m9,m10],
+    Pids = [spawn_link(fun() ->
+			       Cs = [M:bar() || M <- Modules],
+			       receive stop -> Cs end
+		       end) ||
+	       _ <- lists:seq(1,NProcs)],
+    {Modules,Pids}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m1.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m1.erl
new file mode 100644
index 0000000000..cacc13f5d7
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m1.erl
@@ -0,0 +1,4 @@
+-module(m1).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m10.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m10.erl
new file mode 100644
index 0000000000..81e120b891
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m10.erl
@@ -0,0 +1,4 @@
+-module(m10).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m2.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m2.erl
new file mode 100644
index 0000000000..481276ba7b
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m2.erl
@@ -0,0 +1,4 @@
+-module(m2).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m3.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m3.erl
new file mode 100644
index 0000000000..9a04ed5fc9
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m3.erl
@@ -0,0 +1,4 @@
+-module(m3).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m4.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m4.erl
new file mode 100644
index 0000000000..90de9a30c9
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m4.erl
@@ -0,0 +1,4 @@
+-module(m4).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m5.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m5.erl
new file mode 100644
index 0000000000..8a9b690dfa
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m5.erl
@@ -0,0 +1,4 @@
+-module(m5).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m6.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m6.erl
new file mode 100644
index 0000000000..cd0d3977ed
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m6.erl
@@ -0,0 +1,4 @@
+-module(m6).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m7.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m7.erl
new file mode 100644
index 0000000000..1f79918d6e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m7.erl
@@ -0,0 +1,4 @@
+-module(m7).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m8.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m8.erl
new file mode 100644
index 0000000000..2ce03a0b7e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m8.erl
@@ -0,0 +1,4 @@
+-module(m8).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m9.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m9.erl
new file mode 100644
index 0000000000..1c5f72e628
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m9.erl
@@ -0,0 +1,4 @@
+-module(m9).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app
new file mode 100644
index 0000000000..36c50caf2f
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app
@@ -0,0 +1,17 @@
+%% -*- erlang -*-
+{application, many_mods,
+ [{description, "Application with many modules  CXC 138 11"},
+  {vsn, "1.1"},
+  {modules, [{m, 1},
+	     {m1,1},
+	     {m2,1},
+	     {m3,1},
+	     {m4,1},
+	     {m5,1},
+	     {m6,1},
+	     {m7,1},
+	     {m8,1},
+	     {m9,1},
+	     {m10,1}]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.appup b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.appup
new file mode 100644
index 0000000000..696435e06f
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.appup
@@ -0,0 +1,22 @@
+%% -*- erlang -*-
+{"1.1",
+ [{"1.0",[{update,m1},
+	  {update,m2},
+	  {update,m3},
+	  {update,m4},
+	  {update,m5},
+	  {update,m6},
+	  {update,m7},
+	  {update,m8},
+	  {update,m9},
+	  {update,m10}]}],
+ [{"1.0",[{update,m1},
+	  {update,m2},
+	  {update,m3},
+	  {update,m4},
+	  {update,m5},
+	  {update,m6},
+	  {update,m7},
+	  {update,m8},
+	  {update,m9},
+	  {update,m10}]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl
new file mode 100644
index 0000000000..418102bebb
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl
@@ -0,0 +1,11 @@
+-module(m).
+-compile(export_all).
+
+start(NProcs) ->
+    Modules = [m1,m2,m3,m4,m5,m6,m7,m8,m9,m10],
+    Pids = [spawn_link(fun() ->
+			       Cs = [M:bar() || M <- Modules],
+			       receive stop -> Cs end
+		       end) ||
+	       _ <- lists:seq(1,NProcs)],
+    {Modules,Pids}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m1.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m1.erl
new file mode 100644
index 0000000000..cacc13f5d7
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m1.erl
@@ -0,0 +1,4 @@
+-module(m1).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m10.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m10.erl
new file mode 100644
index 0000000000..81e120b891
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m10.erl
@@ -0,0 +1,4 @@
+-module(m10).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m2.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m2.erl
new file mode 100644
index 0000000000..481276ba7b
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m2.erl
@@ -0,0 +1,4 @@
+-module(m2).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m3.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m3.erl
new file mode 100644
index 0000000000..9a04ed5fc9
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m3.erl
@@ -0,0 +1,4 @@
+-module(m3).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m4.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m4.erl
new file mode 100644
index 0000000000..90de9a30c9
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m4.erl
@@ -0,0 +1,4 @@
+-module(m4).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m5.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m5.erl
new file mode 100644
index 0000000000..8a9b690dfa
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m5.erl
@@ -0,0 +1,4 @@
+-module(m5).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m6.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m6.erl
new file mode 100644
index 0000000000..cd0d3977ed
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m6.erl
@@ -0,0 +1,4 @@
+-module(m6).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m7.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m7.erl
new file mode 100644
index 0000000000..1f79918d6e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m7.erl
@@ -0,0 +1,4 @@
+-module(m7).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m8.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m8.erl
new file mode 100644
index 0000000000..2ce03a0b7e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m8.erl
@@ -0,0 +1,4 @@
+-module(m8).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m9.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m9.erl
new file mode 100644
index 0000000000..1c5f72e628
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m9.erl
@@ -0,0 +1,4 @@
+-module(m9).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app
new file mode 100644
index 0000000000..98f6527750
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app
@@ -0,0 +1,7 @@
+%% -*- erlang -*-
+{application, many_mods,
+ [{description, "Application with many modules  CXC 138 11"},
+  {vsn, "2.0"},
+  {modules, [{m, 1}]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.appup b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.appup
new file mode 100644
index 0000000000..3a34db78c1
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.appup
@@ -0,0 +1,24 @@
+%% -*- erlang -*-
+{"2.0",
+ [{"1.0",[{update,m},
+	  {delete_module,m1},
+	  {delete_module,m2},
+	  {delete_module,m3},
+	  {delete_module,m4},
+	  {delete_module,m5},
+	  {delete_module,m6},
+	  {delete_module,m7},
+	  {delete_module,m8},
+	  {delete_module,m9},
+	  {delete_module,m10}]}],
+ [{"1.0",[{update,m},
+	  {add_module,m1},
+	  {add_module,m2},
+	  {add_module,m3},
+	  {add_module,m4},
+	  {add_module,m5},
+	  {add_module,m6},
+	  {add_module,m7},
+	  {add_module,m8},
+	  {add_module,m9},
+	  {add_module,m10}]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl
new file mode 100644
index 0000000000..2edc1e6be4
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl
@@ -0,0 +1,11 @@
+-module(m).
+-compile(export_all).
+
+start(NProcs) ->
+    Modules = [],
+    Pids = [spawn_link(fun() ->
+			       Cs = [M:bar() || M <- Modules],
+			       receive stop -> Cs end
+		       end) ||
+	       _ <- lists:seq(1,NProcs)],
+    {Modules,Pids}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/ebin/dummy.app b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/ebin/dummy.app
new file mode 100644
index 0000000000..9efdc2e5da
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/ebin/dummy.app
@@ -0,0 +1,7 @@
+{application,dummy,
+             [{description,"a dummy app"},
+              {vsn,"0.1"},
+              {registered,[dummy_app]},
+              {mod,{dummy_app,[]}},
+              {applications,[kernel,stdlib,sasl]},
+              {modules,[dummy_app,dummy_server,dummy_sup,dummy_sup_2]}]}.
\ No newline at end of file
diff --git a/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_app.erl b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_app.erl
new file mode 100644
index 0000000000..51363b3630
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_app.erl
@@ -0,0 +1,9 @@
+-module(dummy_app).
+-behaviour(application).
+
+-export([start/2, stop/1]).
+
+start(_,_) ->
+    dummy_sup:start_link().
+
+stop(_) -> ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_server.erl b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_server.erl
new file mode 100644
index 0000000000..382251eba7
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_server.erl
@@ -0,0 +1,56 @@
+-module(dummy_server).
+-behaviour(gen_server).
+
+-export([start_link/0, set_state/1, get_state/0]).
+
+-export([init/1,
+         handle_call/3,
+         handle_cast/2,
+         handle_info/2,
+         terminate/2,
+         code_change/3]).
+
+%%
+
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+set_state(What) ->
+    gen_server:call(?MODULE, {set_state, What}).
+
+get_state() ->
+    gen_server:call(?MODULE, get_state).
+
+
+%%
+
+init([]) ->
+    say("init, setting state to 0", []),
+    {ok, 0}.
+
+
+handle_call({set_state, NewState}, _From, _State) ->
+    {reply, {ok, NewState}, NewState};
+
+handle_call(get_state, _From, State) ->
+    {reply, State, State}.
+
+handle_cast('__not_implemented', State) ->
+    {noreply, State}.
+
+handle_info(_Info, State) ->
+    say("info ~p, ~p.", [_Info, State]),
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    say("terminate ~p, ~p", [_Reason, _State]),
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    say("code_change ~p, ~p, ~p", [_OldVsn, State, _Extra]),
+    {ok, State}.
+
+%% Internal
+
+say(Format, Data) ->
+    io:format("~p:~p: ~s~n", [?MODULE, self(), io_lib:format(Format, Data)]).
diff --git a/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup.erl b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup.erl
new file mode 100644
index 0000000000..3d7b5060df
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup.erl
@@ -0,0 +1,15 @@
+-module(dummy_sup).
+-behaviour(supervisor).
+
+-export([start_link/0]).
+-export([init/1]).
+
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+init([]) ->
+    DummySup2 = {dummy_sup_2,
+                {dummy_sup_2, start_link, []},
+                permanent, 5000, supervisor, [dummy_sup_2]},
+
+    {ok, {{one_for_one, 10, 10}, [DummySup2]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl
new file mode 100644
index 0000000000..d936cbcbd6
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl
@@ -0,0 +1,15 @@
+-module(dummy_sup_2).
+-behaviour(supervisor).
+
+-export([start_link/0]).
+-export([init/1]).
+
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+init([]) ->
+    Dummy = {dummy_server,
+             {dummy_server, start_link, []},
+             permanent, 5000, worker, [dummy_server]},
+
+    {ok, {{one_for_one, 10, 10}, [Dummy]}}.
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index 9190b111ef..e352247d44 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -48,7 +48,7 @@
 	  included_fail_script/1, included_bug_script/1, exref_script/1]).
 -export([ tar_options/1, normal_tar/1, no_mod_vsn_tar/1, variable_tar/1,
 	  src_tests_tar/1, shadow_tar/1, var_tar/1,
-	  exref_tar/1, link_tar/1]).
+	  exref_tar/1, link_tar/1, otp_9507/1]).
 -export([ normal_relup/1, abnormal_relup/1, no_appup_relup/1,
 	  bad_appup_relup/1, app_start_type_relup/1, otp_3065/1]).
 -export([
@@ -81,7 +81,7 @@ groups() ->
      {tar, [],
       [tar_options, normal_tar, no_mod_vsn_tar, variable_tar,
        src_tests_tar, shadow_tar, var_tar,
-       exref_tar, link_tar]},
+       exref_tar, link_tar, otp_9507]},
      {relup, [],
       [normal_relup, abnormal_relup, no_appup_relup,
        bad_appup_relup, app_start_type_relup]},
@@ -396,6 +396,7 @@ src_tests_script(Config) when is_list(Config) ->
     ?line PSAVE = code:get_path(),		% Save path
 
     ?line {LatestDir, LatestName} = create_script(latest,Config),
+    ?line BootFile = LatestName ++ ".boot",
 
     ?line DataDir = filename:absname(?copydir),
     ?line LibDir = fname([DataDir, d_missing_src, lib]),
@@ -416,14 +417,32 @@ src_tests_script(Config) when is_list(Config) ->
     ?line Erl2 = filename:join([P1,"..","src","db2.erl"]),
     ?line file:delete(Erl2),
 
-    %% Then make script - two warnings should be issued when
-    %% src_tests is given
+    %% Then make script
+
+    %% .boot file should not exist
+    ?line ok = file:delete(BootFile),
+    ?line false = filelib:is_regular(BootFile),
+    %% With warnings_as_errors and src_tests option, an error should be issued
+    ?line error =
+	systools:make_script(LatestName, [silent, {path, N}, src_tests,
+					  warnings_as_errors]),
+    ?line error =
+	systools:make_script(LatestName, [{path, N}, src_tests,
+					  warnings_as_errors]),
+
+    %% due to warnings_as_errors .boot file should still not exist
+    ?line false = filelib:is_regular(BootFile),
+
+    %% Two warnings should be issued when src_tests is given
     %% 1. old object code for db1.beam
     %% 2. missing source code for db2.beam
     ?line {ok, _, [{warning,{obj_out_of_date,_}},
 		   {warning,{source_not_found,_}}]} =
 	systools:make_script(LatestName, [silent, {path, N}, src_tests]),
 
+    %% .boot file should exist now
+    ?line true = filelib:is_regular(BootFile),
+
     %% Without the src_tests option, no warning should be issued
     ?line {ok, _, []} =
 	systools:make_script(LatestName, [silent, {path, N}]),
@@ -1066,6 +1085,48 @@ exref_tar(Config) when is_list(Config) ->
     ?line ok = file:set_cwd(OldDir),
     ok.
 
+
+
+%% otp_9507
+%%
+otp_9507(suite) -> [];
+otp_9507(doc) ->
+    ["make_tar failed when path given as just 'ebin'."];
+otp_9507(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest_small,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line FeDir = fname([LibDir, 'fe-3.1']),
+
+    ?line ok = file:set_cwd(FeDir),
+
+    RelName = fname([LatestDir,LatestName]),
+
+    ?line P1 = ["./ebin",
+	       fname([DataDir, lib, kernel, ebin]),
+	       fname([DataDir, lib, stdlib, ebin])],
+    ?line {ok, _, _} = systools:make_script(RelName, [silent, {path, P1}]),
+    ?line ok = systools:make_tar(RelName, [{path, P1}]),
+    ?line Content1 = tar_contents(RelName),
+
+    ?line P2 = ["ebin",
+	       fname([DataDir, lib, kernel, ebin]),
+	       fname([DataDir, lib, stdlib, ebin])],
+
+    %% Tickets solves the following line - it used to fail with
+    %% {function_clause,[{filename,join,[[]]},...}
+    ?line ok = systools:make_tar(RelName, [{path, P2}]),
+    ?line Content2 = tar_contents(RelName),
+    true = (Content1 == Content2),
+
+    ?line ok = file:set_cwd(OldDir),
+
+    ok.
+
+
 %% The relup stuff.
 %%
 %%
@@ -1108,6 +1169,21 @@ normal_relup(Config) when is_list(Config) ->
 			    [{path, P}, silent]),
     ?line ok = check_relup([{db, "2.1"}], [{db, "1.0"}]),
 
+    %% file should not be written if warnings_as_errors is enabled.
+    %% delete before running tests.
+    ?line ok = file:delete("relup"),
+
+    %% Check that warnings are treated as errors
+    ?line error =
+	systools:make_relup(LatestName, [LatestName2], [LatestName1],
+			    [{path, P}, warnings_as_errors]),
+    ?line error =
+	systools:make_relup(LatestName, [LatestName2], [LatestName1],
+			    [{path, P}, silent, warnings_as_errors]),
+
+    %% relup file should not exist
+    ?line false = filelib:is_regular("relup"),
+
     %% Check that warnings get through
     ?line ok = systools:make_relup(LatestName, [LatestName2], [LatestName1],
 				   [{path, P}]),
@@ -1117,6 +1193,9 @@ normal_relup(Config) when is_list(Config) ->
 			    [{path, P}, silent]),
     ?line ok = check_relup([{fe, "3.1"}, {db, "2.1"}], [{db, "1.0"}]),
 
+    %% relup file should exist now
+    ?line true = filelib:is_regular("relup"),
+
     ?line ok = file:set_cwd(OldDir),
     ok.
 
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 26dc2c1448..2db134af48 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 2.1.9.4
+SASL_VSN = 2.1.10
diff --git a/lib/snmp/Makefile b/lib/snmp/Makefile
index c55eff04c6..4264531112 100644
--- a/lib/snmp/Makefile
+++ b/lib/snmp/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2011. 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
diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile
index aa9431477c..df597c8ba7 100644
--- a/lib/snmp/doc/src/Makefile
+++ b/lib/snmp/doc/src/Makefile
@@ -28,14 +28,6 @@ VSN = $(SNMP_VSN)
 APPLICATION=snmp
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -88,40 +80,10 @@ MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6)
 MAN7_FILES = $(MIB_FILES:$(MIBSDIR)/%.mib=$(MAN7DIR)/%.7)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = \
-	$(XML_REF1_FILES:%.xml=%.tex) \
-	$(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_REF6_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_PART_FILES = $(XML_PART_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = snmp-$(VSN).pdf
-TOP_PS_FILE  = snmp-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	@echo "building $(TOP_PDF_FILE)"
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	@echo "building $(TOP_PS_FILE)"
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-TOP_HTML_FILES = $(INDEX_TARGET) 
-
-endif 
-
 INDEX_FILE   = index.html
 INDEX_SRC    = $(INDEX_FILE).src
 INDEX_TARGET = $(DOCDIR)/$(INDEX_FILE)
@@ -141,8 +103,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif			# Copy them to ../html
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 ldocs: local_docs $(INDEX_TARGET)
@@ -157,47 +117,6 @@ html2: html $(INDEX_TARGET)
 clean clean_docs: clean_html clean_man clean_pdf
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) $(TOP_HTML_FILES) gifs 
-
-html2: gifs $(TOP_HTML_FILES) $(HTML_FILES) $(HTML_REF1_FILES) $(HTML_REF3_FILES) $(HTML_REF6_FILES) $(HTML_CHAP_FILES) 
-
-clean: clean_tex clean_html clean_man clean_docs
-
-
-clean_tex:
-	@echo "cleaning tex:"
-	rm -f $(TEX_FILES_USERS_GUIDE) 
-	rm -f $(TEX_FILES_REF_MAN) 
-	rm -f $(TEX_PART_FILES) 
-	rm -f $(TEX_FILES_BOOK)
-
-clean_docs: 
-	@echo "cleaning docs:"
-	rm -f $(TOP_PDF_FILE) 
-	rm -f $(TOP_PS_FILE)
-	rm -f core $(LATEX_CLEAN)
-
-
-$(HTML_PART_FILES): notes.xml
-
-endif
-
 $(INDEX_TARGET): $(INDEX_SRC) ../../vsn.mk	# Create top make file 
 	sed -e 's;%VSN%;$(VSN);' $< > $@	# inserting version number
 
@@ -250,8 +169,6 @@ $(MAN1DIR)/snmpc.1: snmpc_cmd.xml
 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -268,55 +185,13 @@ release_docs_spec: docs
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man7
 	$(INSTALL_DATA) $(MAN7DIR)/* $(RELEASE_PATH)/man/man7
 
-else
-
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DATA) $(MAN1_FILES) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6_FILES) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man7
-	$(INSTALL_DATA) $(MAN7_FILES) $(RELEASE_PATH)/man/man7
-	$(INSTALL_DATA) $(TOP_HTML_FILES) \
-		$(RELSYSDIR)/doc
-endif
-endif
-
-endif 
-
 release_spec:
 
-ifdef DOCSUPPORT
 info: info_xml info_man info_html
 	@echo "MAN1DIR: $(MAN1DIR)"
 	@echo "MAN3DIR: $(MAN3DIR)"
 	@echo "MAN6DIR: $(MAN6DIR)"
 	@echo "MAN7DIR: $(MAN7DIR)"
-else
-info: info_xml info_man info_html info_tex
-	@echo "DVI2PS        = $(DVI2PS)"
-	@echo "DVIPS_FLAGS   = $(DVIPS_FLAGS)"
-	@echo ""
-	@echo "DISTILL       = $(DISTILL)"
-	@echo "DISTILL_FLAGS = $(DISTILL_FLAGS)"
-endif
 
 info_man: 
 	@echo "man files:"
@@ -362,14 +237,3 @@ info_html:
 	@echo "HTML_REF3_FILES = $(HTML_REF3_FILES)"
 	@echo "HTML_REF6_FILES = $(HTML_REF6_FILES)"
 	@echo "HTML_CHAP_FILES = $(HTML_CHAP_FILES)"
-
-info_tex: 
-	@echo "tex files:"
-	@echo "TEX_FILES_USERS_GUIDE = $(TEX_FILES_USERS_GUIDE)"
-	@echo "TEX_FILES_REF_MAN     = $(TEX_FILES_REF_MAN)"
-	@echo "TEX_PART_FILES        = $(TEX_PART_FILES)"
-	@echo "TEX_FILES_BOOK        = $(TEX_FILES_BOOK)"
-
-ifndef DOCSUPPORT
-include depend.mk
-endif
diff --git a/lib/snmp/doc/src/depend.mk b/lib/snmp/doc/src/depend.mk
deleted file mode 100644
index 20a523dd8c..0000000000
--- a/lib/snmp/doc/src/depend.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2004-2011. 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.
-# 
-# %CopyrightEnd%
-
-$(HTMLDIR)/part_notes.html: \
-	part_notes_history.xml \
-	part_notes.xml \
-	notes_history.xml \
-	notes.xml
-
-$(HTMLDIR)/part.html: \
-	part.xml \
-	snmp_intro.xml \
-	snmp_agent_funct_descr.xml \
-	snmp_manager_funct_descr.xml \
-	snmp_mib_compiler.xml \
-	snmp_config.xml \
-	snmp_agent_config_files.xml \
-	snmp_manager_config_files.xml \
-	snmp_impl_example_agent.xml \
-	snmp_impl_example_manager.xml \
-	snmp_instr_functions.xml \
-	snmp_def_instr_functions.xml \
-	snmp_agent_netif.xml \
-	snmp_manager_netif.xml \
-	snmp_audit_trail_log.xml \
-	snmp_advanced_agent.xml \
-	snmp_app_a.xml \
-	snmp_app_b.xml
-
-$(HTMLDIR)/ref_man.html: \
-	ref_man.xml \
-	snmp_app.xml \
-	snmp.xml \
-	snmpc.xml \
-	snmpc_cmd.xml \
-	snmpa.xml \
-	snmpa_conf.xml \
-	snmpa_discovery_handler.xml \
-	snmpa_error_report.xml \
-	snmpa_error.xml \
-	snmpa_error_io.xml \
-	snmpa_error_logger.xml \
-	snmpa_local_db.xml \
-	snmpa_mpd.xml \
-	snmpa_network_interface.xml \
-	snmpa_network_interface_filter.xml \
-	snmpa_notification_delivery_info_receiver.xml \
-	snmpa_notification_filter.xml \
-	snmpa_supervisor.xml \
-	snmp_community_mib.xml \
-	snmp_framework_mib.xml \
-	snmp_generic.xml \
-	snmp_index.xml \
-	snmp_notification_mib.xml \
-	snmp_pdus.xml \
-	snmp_standard_mib.xml \
-	snmp_target_mib.xml \
-	snmp_user_based_sm_mib.xml \
-	snmp_view_based_acm_mib.xml \
-	snmpm.xml \
-	snmpm_conf.xml \
-	snmpm_mpd.xml \
-	snmpm_network_interface.xml \
-	snmpm_network_interface_filter.xml \
-	snmpm_user.xml
-
-
diff --git a/lib/snmp/doc/src/make.dep b/lib/snmp/doc/src/make.dep
deleted file mode 100644
index 223e197f25..0000000000
--- a/lib/snmp/doc/src/make.dep
+++ /dev/null
@@ -1,77 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2011. 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.
-# 
-# %CopyrightEnd%
-
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex part.tex ref_man.tex snmp.tex snmp_advanced_agent.tex \
-		snmp_agent_config_files.tex snmp_agent_funct_descr.tex \
-		snmp_agent_netif.tex snmp_app.tex snmp_app_a.tex \
-		snmp_app_b.tex snmp_audit_trail_log.tex \
-		snmp_community_mib.tex \
-		snmp_config.tex snmp_def_instr_functions.tex \
-		snmp_framework_mib.tex snmp_generic.tex \
-		snmp_impl_example_agent.tex \
-		snmp_impl_example_manager.tex snmp_index.tex \
-		snmp_instr_functions.tex snmp_intro.tex \
-		snmp_manager_config_files.tex \
-		snmp_manager_funct_descr.tex snmp_manager_netif.tex \
-		snmp_mib_compiler.tex snmp_notification_mib.tex \
-		snmp_pdus.tex snmp_standard_mib.tex snmp_target_mib.tex \
-		snmp_user_based_sm_mib.tex snmp_view_based_acm_mib.tex \
-		snmpa.tex snmpa_conf.tex snmpa_error.tex snmpa_error_io.tex \
-		snmpa_error_logger.tex snmpa_error_report.tex \
-		snmpa_local_db.tex snmpa_mpd.tex \
-		snmpa_discovery_handler.tex \
-		snmpa_network_interface.tex \
-		snmpa_network_interface_filter.tex \
-		snmpa_notification_delivery_info_receiver.tex \
-		snmpa_notification_filter.tex \
-		snmpa_supervisor.tex \
-		snmpc.tex snmpc_cmd.tex snmpm.tex snmpm_conf.tex snmpm_mpd.tex \
-		snmpm_network_interface.tex snmpm_network_interface_filter.tex \
-		snmpm_user.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: MIB_mechanism.ps snmp-um-1-image-1.ps snmp-um-1-image-2.ps \
-		snmp-um-1-image-3.ps
-
-book.dvi: snmp_agent_netif_1.ps
-
-book.dvi: getnext1.ps getnext2.ps getnext3.ps getnext4.ps
-
-book.dvi: snmp_manager_netif_1.ps
-
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 4178192120..9e1a060dee 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -33,6 +33,62 @@
   </header>
 
   <section>
+    <title>SNMP Development Toolkit 4.21.1</title>
+    <p>Version 4.21.1 supports code replacement in runtime from/to
+      version 4.20.1, 4.20 and 4.19. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+      <list type="bulleted">
+        <item>
+          <p>[compiler] Used wrong variable name (for 
+	  warnings-as-errors variable), which caused the 
+	  compiler to crash when using the snmpc (e)script. </p>
+	  <p>Also added the option 
+	  <seealso marker="snmpc(command)#option_werror">--Werror</seealso>
+	  for the SNMP MIB compiler (escript) frontend (to mimic 
+	  <seealso marker="erts:erlc">erlc</seealso>), 
+	  which specifies whether warnings should be treated as errors. </p>
+          <p>Own Id: OTP-9447</p>
+        </item>
+
+        <item>
+          <p>[agent] Some very minor debugging improvements. </p>
+          <p>Own Id: OTP-9446</p>
+        </item>
+      </list>
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <p>-</p> 
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>The snmp config tool could not handle (manager) audit trail config 
+	  because the option seqno was not handled. </p>
+	  <p>Own Id: OTP-9354</p>
+	</item>
+
+      </list>
+-->
+    </section>
+
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+
+  </section> <!-- 4.21.1 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.21</title>
     <p>Version 4.21 supports code replacement in runtime from/to
       version 4.20.1, 4.20 and 4.19. </p>
diff --git a/lib/snmp/doc/src/snmpc_cmd.xml b/lib/snmp/doc/src/snmpc_cmd.xml
index 72116f8981..971f8a3cff 100644
--- a/lib/snmp/doc/src/snmpc_cmd.xml
+++ b/lib/snmp/doc/src/snmpc_cmd.xml
@@ -79,16 +79,18 @@
         <p>Print debug info. </p>
 	<p><c>verbosity</c> = <c>trace</c> | <c>debug</c> | <c>log</c> | <c>info</c> | <c>silence</c></p>
 	<p>Defaults to <c>silence</c>.</p>
+	<marker id="option_w"></marker>
 	<marker id="option_warnings"></marker>
       </item>
 
-      <tag>--warnings</tag>
+      <tag>--warnings | --W</tag>
       <item>
         <p>Print warning messages. </p>
 	<marker id="option_wae"></marker>
+	<marker id="option_werror"></marker>
       </item>
 
-      <tag>--wae</tag>
+      <tag>--wae | --Werror</tag>
       <item>
         <p>Warnings as errors. 
 	Indicates that warnings shall be treated as errors. </p>
@@ -211,7 +213,7 @@
 
   <section>
     <title>SEE ALSO</title>
-    <p><seealso marker="erlc">erlc(1)</seealso>,
+    <p><seealso marker="erts:erlc">erlc(1)</seealso>,
     <seealso marker="compiler:compile">compile(3)</seealso>,
     <seealso marker="snmp:snmpc">snmpc(3)</seealso></p>
   </section>
diff --git a/lib/snmp/mibs/Makefile.in b/lib/snmp/mibs/Makefile.in
index 3af74eca75..993a67c6f2 100644
--- a/lib/snmp/mibs/Makefile.in
+++ b/lib/snmp/mibs/Makefile.in
@@ -41,8 +41,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/snmp-$(VSN)
 # ----------------------------------------------------
 
 # NOTE: 
-# 1) Order is important; some MIBs include others
-# 2) The OTP-REG mib actually belongs to another
+#    The OTP-REG mib actually belongs to another
 #    application (otp_mibs), and is exported by this
 #    app. But since that app is built later, we have 
 #    to built it here in order to be able to build 
@@ -148,6 +147,35 @@ $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1: $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1.src
 $(SNMP_BIN_TARGET_DIR)/OTP-REG.bin:	$(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-REG.mib
 	$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
 
+# To support parallel make, we'll need explicit dependencies
+# to ensure that an imported MIB has been compiled when it's needed.
+
+$(SNMP_BIN_TARGET_DIR)/STANDARD-MIB.bin: \
+	$(SNMP_BIN_TARGET_DIR)/RFC1213-MIB.bin
+
+$(SNMP_BIN_TARGET_DIR)/SNMP-TARGET-MIB.bin: \
+	$(SNMP_BIN_TARGET_DIR)/SNMP-FRAMEWORK-MIB.bin
+
+$(SNMP_BIN_TARGET_DIR)/SNMP-NOTIFICATION-MIB.bin: \
+	$(SNMP_BIN_TARGET_DIR)/SNMP-FRAMEWORK-MIB.bin \
+	$(SNMP_BIN_TARGET_DIR)/SNMP-TARGET-MIB.bin
+
+$(SNMP_BIN_TARGET_DIR)/SNMP-COMMUNITY-MIB.bin: \
+	$(SNMP_BIN_TARGET_DIR)/SNMP-FRAMEWORK-MIB.bin \
+	$(SNMP_BIN_TARGET_DIR)/SNMP-TARGET-MIB.bin
+
+$(SNMP_BIN_TARGET_DIR)/SNMP-USER-BASED-SM-MIB.bin: \
+	$(SNMP_BIN_TARGET_DIR)/SNMP-FRAMEWORK-MIB.bin
+
+$(SNMP_BIN_TARGET_DIR)/SNMP-VIEW-BASED-ACM-MIB.bin: \
+	$(SNMP_BIN_TARGET_DIR)/SNMP-FRAMEWORK-MIB.bin
+
+$(SNMP_BIN_TARGET_DIR)/SNMP-USM-AES-MIB.bin: \
+	$(SNMP_BIN_TARGET_DIR)/SNMP-FRAMEWORK-MIB.bin
+
+$(SNMP_BIN_TARGET_DIR)/OTP-SNMPEA-MIB.bin: \
+	$(SNMP_BIN_TARGET_DIR)/OTP-REG.bin
+
 clean:
 	rm -f $(TARGET_FILES)
 
@@ -185,7 +213,7 @@ info:
 	@echo "VSN         = $(VSN)"
 	@echo "RELSYSDIR   = $(RELSYSDIR)"
 
-v1/%.mib.v1: %.mib
+v1/%.mib.v1: %.mib $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1
 	$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
 
 
diff --git a/lib/snmp/src/agent/snmp_target_mib.erl b/lib/snmp/src/agent/snmp_target_mib.erl
index 77910541a2..60bd3e0912 100644
--- a/lib/snmp/src/agent/snmp_target_mib.erl
+++ b/lib/snmp/src/agent/snmp_target_mib.erl
@@ -383,10 +383,18 @@ is_valid_tag(Tag, TDomain, TAddress) ->
     is_valid_tag(TDomain, TAddress, Tag, []).
 
 is_valid_tag(TDomain, TAddress, Tag, Key) ->
+    ?vtrace("is_valid_tag -> entry with"
+	    "~n   TDomain:  ~p"
+	    "~n   TAddress: ~p"
+	    "~n   Tag:      ~p"
+	    "~n   Key:      ~p", [TDomain, TAddress, Tag, Key]),
     case table_next(snmpTargetAddrTable, Key) of
 	endOfTable -> 
+	    ?vtrace("is_valid_tag -> endOfTable", []),
 	    false;
 	NextKey -> 
+	    ?vtrace("is_valid_tag -> next key found"
+		    "~n   NextKey: ~p", [NextKey]),
 	    case get(snmpTargetAddrTable, NextKey, [?snmpTargetAddrTDomain,
 						    ?snmpTargetAddrTAddress,
 						    ?snmpTargetAddrTagList,
@@ -395,6 +403,8 @@ is_valid_tag(TDomain, TAddress, Tag, Key) ->
 		 {value, TAddress}, % RFC2576: chapters 5.2.1 & 5.3
 		 {value, TagList}, 
 		 {value, []}] ->
+		    ?vtrace("is_valid_tag -> found with exact match"
+			    "~n   TagList: ~p", [TagList]),
 		    case snmp_misc:is_tag_member(Tag, TagList) of
 			true ->
 			    ?vtrace("is_valid_tag -> exact: "
@@ -410,9 +420,14 @@ is_valid_tag(TDomain, TAddress, Tag, Key) ->
 		 {value, TAddress2},
 		 {value, TagList}, 
 		 {value, TMask}] when TMask =/= [] ->
+		    ?vtrace("is_valid_tag -> found with exact match"
+			    "~n   TagList: ~p"
+			    "~n   TMask:   ~p", [TagList, TMask]),
 		    case snmp_misc:is_tmask_match(TAddress, TAddress2, 
 						  TMask) of
 			true ->
+			    ?vtrace("is_valid_tag -> "
+				    "tmask match - now check tag member", []),
 			    case snmp_misc:is_tag_member(Tag, TagList) of
 				true ->
 				    ?vtrace("is_valid_tag -> masked: "
@@ -425,10 +440,12 @@ is_valid_tag(TDomain, TAddress, Tag, Key) ->
 						 Tag, NextKey)
 			    end;
 			false ->
+			    ?vtrace("is_valid_tag -> tmask NO match", []),
 			    is_valid_tag(TDomain, TAddress,
 					 Tag, NextKey)
 		    end;
 		_ ->
+		    ?vtrace("is_valid_tag -> not found - try next", []),
 		    is_valid_tag(TDomain, TAddress, Tag, NextKey)
 	    end
     end.
@@ -591,9 +608,9 @@ snmpTargetAddrTable(print) ->
 				[Prefix, element(?snmpTargetAddrName, Row),
 				 Prefix, element(?snmpTargetAddrTDomain, Row),
 				 case element(?snmpTargetAddrTDomain, Row) of
-				     ?snmpUDPDomain -> udp;
-				     ?transportDomainUdpIpv4 -> udpIpv4;
-				     ?transportDomainUdpIpv6 -> udpIpv6;
+				     ?snmpUDPDomain -> snmpUDPDomain;
+				     ?transportDomainUdpIpv4 -> transportDomainUdpIpv4;
+				     ?transportDomainUdpIpv6 -> transportDomainUdpIpv6;
 				     _ -> undefined
 				 end,
 				 Prefix, element(?snmpTargetAddrTAddress, Row),
diff --git a/lib/snmp/src/agent/snmpa_set_lib.erl b/lib/snmp/src/agent/snmpa_set_lib.erl
index 191029f6db..00c77a0cdb 100644
--- a/lib/snmp/src/agent/snmpa_set_lib.erl
+++ b/lib/snmp/src/agent/snmpa_set_lib.erl
@@ -378,15 +378,15 @@ dbg_apply(M,F,A) ->
 		Res
 	end,
     case Result of
-	{'EXIT', {undef, [{M, F, A} | _]}} ->
+	{'EXIT', {undef, [{M, F, A, _} | _]}} ->
 	    {'EXIT', {hook_undef, {M, F, A}}};
-	{'EXIT', {function_clause, [{M, F, A} | _]}} ->
+	{'EXIT', {function_clause, [{M, F, A, _} | _]}} ->
 	    {'EXIT', {hook_function_clause, {M, F, A}}};
 
 	% XXX: Old format for compatibility
-	{'EXIT', {undef, {M, F, A}}} ->
+	{'EXIT', {undef, {M, F, A, _}}} ->
 	    {'EXIT', {hook_undef, {M, F, A}}};
-	{'EXIT', {function_clause, {M, F, A}}} ->
+	{'EXIT', {function_clause, {M, F, A, _}}} ->
 	    {'EXIT', {hook_function_clause, {M, F, A}}};
 
 	Result ->
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 8e1855b4df..0b6ea93231 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,8 +22,14 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.21", 
+   [
+    {load_module, snmp_target_mib, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.20.1", 
    [
+    {load_module, snmp_target_mib, soft_purge, soft_purge, []}, 
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpm, soft_purge, soft_purge, 
      [snmpm_server, snmpm_config, snmp_config]}, 
@@ -109,8 +115,14 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.21", 
+   [
+    {load_module, snmp_target_mib, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.20.1", 
    [
+    {load_module, snmp_target_mib, soft_purge, soft_purge, []}, 
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpm, soft_purge, soft_purge, 
      [snmpm_server, snmpm_config, snmp_config]}, 
diff --git a/lib/snmp/src/compile/snmpc.src b/lib/snmp/src/compile/snmpc.src
index 4e91ae9a03..f993335b89 100644
--- a/lib/snmp/src/compile/snmpc.src
+++ b/lib/snmp/src/compile/snmpc.src
@@ -46,7 +46,7 @@
 	 agent_capabilities = false,
 	 module,
 	 no_defaults        = false,
-	 relaxed_row_name_assigne_check = false,
+	 relaxed_row_name_assign_check = false,
 	 %% The default verbosity (silence) will be filled in 
 	 %% during argument processing.
 	 verbosity, 
@@ -75,7 +75,7 @@
 %% --version
 %% --verbosity V
 %% --warnings
-%% --wae
+%% --Werror | --wae | --warnings_as_errors
 main(Args) when is_list(Args) ->
     case (catch process_args(Args)) of
 	ok ->
@@ -154,7 +154,7 @@ mk_mib_options(#state{outdir             = OutDir,
 		      agent_capabilities = AC,
 		      module             = Mod,
 		      no_defaults        = ND,
-		      relaxed_row_name_assigne_check = RRNAC,
+		      relaxed_row_name_assign_check = RRNAC,
 		      %% The default verbosity (silence) will be filled in 
 		      %% during argument processing.
 		      verbosity          = V, 
@@ -182,7 +182,7 @@ mk_mib_options(#state{outdir             = OutDir,
 	maybe_option(MI,    module_identity) ++ 
 	maybe_option(MC,    module_compliance) ++ 
 	maybe_option(AC,    agent_capabilities) ++ 
-	maybe_option(WE,    warnings_as_errors).
+	maybe_option(WAE,   warnings_as_errors).
 
 maybe_option(true, Opt) -> [Opt];
 maybe_option(_,    _)   -> [].
@@ -234,6 +234,8 @@ process_args(["--verbosity", Verbosity0|Args], #state{verbosity = V} = State)
 process_args(["--verbosity"|_Args], #state{verbosity = V}) 
   when (V =/= undefined) ->
     e(lists:flatten(io_lib:format("Verbosity already set to ~w", [V])));
+process_args(["--w"|Args], State) ->
+    process_args(Args, State#state{warnings = true});
 process_args(["--warnings"|Args], State) ->
     process_args(Args, State#state{warnings = true});
 process_args(["--o", Dir|Args], State) ->
@@ -295,9 +297,13 @@ process_args(["--mod"|_Args], #state{module = M})
 process_args(["--nd"|Args], State) ->
     process_args(Args, State#state{no_defaults = true});
 process_args(["--rrnac"|Args], State) ->
-    process_args(Args, State#state{relaxed_row_name_assigne_check = true});
+    process_args(Args, State#state{relaxed_row_name_assign_check = true});
+process_args(["--Werror"|Args], State) ->
+    process_args(Args, State#state{warnings_as_errors = true});
 process_args(["--wae"|Args], State) ->
     process_args(Args, State#state{warnings_as_errors = true});
+process_args(["--warnings_as_errors"|Args], State) ->
+    process_args(Args, State#state{warnings_as_errors = true});
 process_args([MIB], State) ->
     Ext = filename:extension(MIB),
     if 
@@ -332,7 +338,7 @@ usage() ->
 	      "~n   --verbosity <verbosity>  - Print debug info."
 	      "~n                              verbosity = trace | debug | log | info | silence"
 	      "~n                              Defaults to silence."
-	      "~n   --warnings               - Print warning messages."
+	      "~n   --warnings | --W         - Print warning messages."
 	      "~n   --o <output dir>         - The output dir."
 	      "~n                              Defaults to current working dir."
 	      "~n   --i <include dir>        - Add this dir to the list of dirs that will be"
@@ -340,16 +346,19 @@ usage() ->
 	      "~n                              The current workin dir will always be included. "
 	      "~n   --il <include_lib dir>   - Add this dir to the list of dirs that will be"
 	      "~n                              searched for imported (compiled) MIB files."
-	      "~n                              It assumes that the first element in the dir name"
-	      "~n                              correspond to an OTP application. For example snmp/mibs/"
-	      "~n                              The current workin dir and the <snmp-home>/priv/mibs "
+	      "~n                              It assumes that the first element in the dir "
+	      "~n                              name correspond to an OTP application. "
+	      "~n                              For example snmp/mibs/ "
+	      "~n                              The current workin dir and the "
+	      "~n                              <snmp-home>/priv/mibs "
 	      "~n                              are always listed last the includ path. "
 	      "~n   --db <DB>                - Database to used for the default instrumentation."
 	      "~n                              Defaults to volatile."
-	      "~n   --sgc                    - This option (skip group check), if present, disables "
-	      "~n                              the \"group check\" of the mib compiler. "
-	      "~n                              That is, should the OBJECT-GROUP and the NOTIFICATION-GROUP "
-	      "~n                              macro(s) be checked for correctness or not. "
+	      "~n   --sgc                    - This option (skip group check), if present, "
+	      "~n                              disables the \"group check\" of the mib compiler. "
+	      "~n                              That is, should the OBJECT-GROUP and the "
+	      "~n                              NOTIFICATION-GROUP macro(s) be checked for "
+	      "~n                              correctness or not. "
 	      "~n                              By default the check is done. "
 	      "~n   --dep                    - Keep deprecated definition(s)."
 	      "~n                              If not specified the compiler will ignore"
@@ -360,25 +369,27 @@ usage() ->
 	      "~n   --mi                     - The MODULE-IDENTITY field will be included."
 	      "~n   --mc                     - The MODULE-COMPLIANCE field will be included."
 	      "~n   --ac                     - The AGENT-CAPABILITIES field will be included."
-	      "~n   --mod <module>           - The module which implements all the instrumentation"
-	      "~n                              functions. "
+	      "~n   --mod <module>           - The module which implements all the "
+	      "~n                              instrumentation functions. "
 	      "~n                              The name of all instrumentation functions must"
 	      "~n                              be the same as the corresponding managed object"
 	      "~n                              it implements."
-	      "~n   --nd                     - The default instrumentation functions will *not* be used"
-	      "~n                              if a managed object have no instrumentation function. "
-	      "~n                              Instead this will be reported as an error, and the "
-	      "~n                              compilation aborts. "
-	      "~n   --rrnac                  - This option, if present, specifies that the row name "
-	      "~n                              assign check shall not be done strictly according to"
-	      "~n                              the SMI (which allows only the value 1). "
-	      "~n                              With this option, all values greater than zero is allowed"
-	      "~n                              (>= 1). This means that the error will be converted to "
+	      "~n   --nd                     - The default instrumentation functions will *not* "
+	      "~n                              be used if a managed object have no "
+	      "~n                              instrumentation function. Instead this will be "
+	      "~n                              reported as an error, and the compilation aborts. "
+	      "~n   --rrnac                  - This option, if present, specifies that the row "
+	      "~n                              name assign check shall not be done strictly "
+	      "~n                              according to the SMI (which allows only the "
+	      "~n                              value 1). With this option, all values greater "
+	      "~n                              than zero is allowed (>= 1). "
+	      "~n                              This means that the error will be converted to "
 	      "~n                              a warning. "
-	      "~n                              By default it is not included, but if this option is "
-	      "~n                              present it will be. "
-	      "~n   --wae                    - Warnings as errors. "
-              "~n                              Indicates that warnings shall be treated as errors. "
+	      "~n                              By default it is not included, but if this "
+	      "~n                              option is present it will be. "
+	      "~n   --wae | --Werror         - Warnings as errors. "
+              "~n                              Indicates that warnings shall be treated as "
+              "~n                              errors. "
 	      "~n   "
 	      "~n", []),
     halt(1).
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl
index 4f71c47bfa..38bb8f3ac6 100644
--- a/lib/snmp/src/compile/snmpc_lib.erl
+++ b/lib/snmp/src/compile/snmpc_lib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -1754,12 +1754,12 @@ error(FormatStr, Data, Line) when is_list(FormatStr) ->
     exit(error).
 
 print_error(FormatStr, Data) when is_list(FormatStr) ->
-    ok = io:format("~s: Error: " ++ FormatStr,[get(filename)|Data]),
+    ok = io:format("~s: " ++ FormatStr,[get(filename)|Data]),
     put(errors,yes),
     io:format("~n").
     
 print_error(FormatStr, Data,Line) when is_list(FormatStr) ->
-    ok = io:format("~s: ~w: Error: " ++ FormatStr,[get(filename), Line |Data]),
+    ok = io:format("~s: ~w: " ++ FormatStr,[get(filename), Line |Data]),
     put(errors,yes),
     io:format("~n").
 
diff --git a/lib/snmp/src/manager/snmpm_mpd.erl b/lib/snmp/src/manager/snmpm_mpd.erl
index 627838e3d4..103c87d32b 100644
--- a/lib/snmp/src/manager/snmpm_mpd.erl
+++ b/lib/snmp/src/manager/snmpm_mpd.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
diff --git a/lib/snmp/test/Makefile b/lib/snmp/test/Makefile
index 5530805bc1..78ffb1c255 100644
--- a/lib/snmp/test/Makefile
+++ b/lib/snmp/test/Makefile
@@ -220,6 +220,10 @@ appup: make
             $(MAYBE_ESTOP)
 
 
+$(SNMP_BIN_TARGET_DIR)/Klas4.bin: $(SNMP_BIN_TARGET_DIR)/Klas3.bin
+
+$(SNMP_BIN_TARGET_DIR)/SA-MIB.bin: $(SNMP_BIN_TARGET_DIR)/OLD-SNMPEA-MIB.bin
+
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index cee11ba97a..c964b08168 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -47,7 +47,7 @@
 	 module_identity/1,
 	 agent_capabilities/1,
 	 module_compliance/1, 
-	 warnings_as_errors/1, 
+	 warnings_as_errors/1,
 
 	 otp_6150/1,
 	 otp_8574/1, 
@@ -101,7 +101,7 @@ all() ->
      module_identity, 
      agent_capabilities, 
      module_compliance, 
-     warnings_as_errors, 
+     warnings_as_errors,
      {group, tickets}
     ].
 
@@ -282,8 +282,8 @@ warnings_as_errors(Config) when is_list(Config) ->
     MibDir  = ?config(mib_dir,  Config),
     MibFile = join(MibDir, "OTP8574-MIB.mib"),
     OutFile = join(Dir, "OTP8574-MIB.bin"),
-    Opts =  [{group_check, false}, 
-	     {outdir,      Dir}, 
+    Opts =  [{group_check, false},
+	     {outdir,      Dir},
 	     {verbosity,   trace},
 	     relaxed_row_name_assign_check],
     {error, compilation_failed} =
@@ -291,6 +291,7 @@ warnings_as_errors(Config) when is_list(Config) ->
     false = filelib:is_regular(OutFile),
     {ok, _} = snmpc:compile(MibFile, Opts),
     true = filelib:is_regular(OutFile),
+    ok = file:delete(OutFile),
     ok.
 
 
diff --git a/lib/snmp/test/test_config/Makefile b/lib/snmp/test/test_config/Makefile
index d7bebbc431..d65bb8abe2 100644
--- a/lib/snmp/test/test_config/Makefile
+++ b/lib/snmp/test/test_config/Makefile
@@ -155,23 +155,23 @@ release_spec:
 
 release_tests_spec: clean opt
 	$(INSTALL_DIR)  $(RELSYSDIR)
-	chmod -f -R u+w $(RELSYSDIR)
+	chmod -R u+w $(RELSYSDIR)
 	$(INSTALL_DIR)  $(RELSYSDIR)/agent
-	chmod -f -R u+w $(RELSYSDIR)/agent
+	chmod -R u+w $(RELSYSDIR)/agent
 	$(INSTALL_DIR)  $(RELSYSDIR)/agent/conf
-	chmod -f -R u+w $(RELSYSDIR)/agent/conf
+	chmod -R u+w $(RELSYSDIR)/agent/conf
 	$(INSTALL_DIR)  $(RELSYSDIR)/agent/db
-	chmod -f -R u+w $(RELSYSDIR)/agent/db
+	chmod -R u+w $(RELSYSDIR)/agent/db
 	$(INSTALL_DIR)  $(RELSYSDIR)/agent/log
-	chmod -f -R u+w $(RELSYSDIR)/agent/log
+	chmod -R u+w $(RELSYSDIR)/agent/log
 	$(INSTALL_DIR)  $(RELSYSDIR)/manager
-	chmod -f -R u+w $(RELSYSDIR)/manager
+	chmod -R u+w $(RELSYSDIR)/manager
 	$(INSTALL_DIR)  $(RELSYSDIR)/manager/conf
-	chmod -f -R u+w $(RELSYSDIR)/manager/conf
+	chmod -R u+w $(RELSYSDIR)/manager/conf
 	$(INSTALL_DIR)  $(RELSYSDIR)/manager/db
-	chmod -f -R u+w $(RELSYSDIR)/manager/db
+	chmod -R u+w $(RELSYSDIR)/manager/db
 	$(INSTALL_DIR)  $(RELSYSDIR)/manager/log
-	chmod -f -R u+w $(RELSYSDIR)/manager/log
+	chmod -R u+w $(RELSYSDIR)/manager/log
 	$(INSTALL_DATA) $(SYS_CONFIG_FILES)     $(RELSYSDIR)
 	$(INSTALL_DATA) $(AGENT_CONFIG_FILES)   $(RELSYSDIR)/agent/conf
 	$(INSTALL_DATA) $(MANAGER_CONFIG_FILES) $(RELSYSDIR)/manager/conf
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 08251ab9ea..c95e0a22d1 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -17,6 +17,6 @@
 #
 # %CopyrightEnd%
 
-SNMP_VSN = 4.21
+SNMP_VSN = 4.21.1
 PRE_VSN  =
 APP_VSN  = "snmp-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/Makefile b/lib/ssh/doc/src/Makefile
index c4d8d9901c..c97c99cf52 100644
--- a/lib/ssh/doc/src/Makefile
+++ b/lib/ssh/doc/src/Makefile
@@ -29,15 +29,6 @@ VSN=$(SSH_VSN)
 APPLICATION=ssh
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-
-ifndef DOCSUPPORT
-include make.dep
-endif 
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -76,33 +67,10 @@ EXTRA_FILES = \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = $(APPLICATION)-$(VSN).pdf
-TOP_PS_FILE  = $(APPLICATION)-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif 
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -115,8 +83,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -131,32 +97,6 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES)
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN) 
-
-endif
-
 man: $(MAN3_FILES)
 
 
@@ -168,8 +108,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -179,28 +117,5 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-endif
-endif
-
-endif
 
 release_spec:
diff --git a/lib/ssh/doc/src/make.dep b/lib/ssh/doc/src/make.dep
deleted file mode 100644
index cfe2f9617b..0000000000
--- a/lib/ssh/doc/src/make.dep
+++ /dev/null
@@ -1,19 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex ref_man.tex ssh.tex ssh_channel.tex \
-                ssh_connection.tex ssh_sftp.tex ssh_sftpd.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 71f3941577..6fc4fdc43d 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,20 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 2.0.8</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            Calling ssh_sftp:stop_channel/1 resulted in that the trap_exit flag was
+            set to true for the invoking process.</p>
+          <p>
+            Own Id: OTP-9386 Aux Id: seq11865</p>
+        </item>
+      </list>
+    </section>
+</section>
+
 <section><title>Ssh 2.0.7</title>
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index 42880fa80b..e7cf2c6723 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -127,13 +127,10 @@ $(APP_TARGET): $(APP_SRC) ../vsn.mk
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 	sed -e 's;%VSN%;$(VSN);' $< > $@
 
-%.hrl: %.asn1
-	erlc $(ASN_FLAGS) $<
+%.erl %.hrl: %.asn1
+	$(ERLC) $(ASN_FLAGS) $<
 
-DSS.hrl DSS.erl: DSS.asn1
-PKCS-1.hrl PKCS-1.erl: PKCS-1.asn1
-
-$(EBIN)/ssh_file.$(EMULATOR): $(ASN_HRLS)
+$(EBIN)/ssh_file.$(EMULATOR) $(EBIN)/ssh_rsa.$(EMULATOR): $(ASN_HRLS)
 
 docs:
 
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 974145836c..150b7d86dd 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,13 +19,19 @@
 
 {"%VSN%",	
  [
-  {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []}]},
+  {"2.0.7", [{load_module, ssh_sftp, soft_purge, soft_purge, []}]},
+  {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_sftp, soft_purge, soft_purge, []}]},
   {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_sftp, soft_purge, soft_purge, []},
              {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]}
  ],
  [
-  {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []}]},
+  {"2.0.7", [{load_module, ssh_sftp, soft_purge, soft_purge, []}]},
+  {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_sftp, soft_purge, soft_purge, []}]},
   {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_sftp, soft_purge, soft_purge, []},
              {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]}
  ]
 }.
diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl
index 59e09fdd0f..f000558100 100755
--- a/lib/ssh/src/ssh_sftp.erl
+++ b/lib/ssh/src/ssh_sftp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -130,9 +130,9 @@ start_channel(Host, Port, Opts) ->
     end.
 
 stop_channel(Pid) ->
-    case process_info(Pid, [trap_exit]) of
-	[{trap_exit, Bool}] ->
-	    process_flag(trap_exit, true),
+    case is_process_alive(Pid) of
+	true ->
+	    OldValue = process_flag(trap_exit, true),
 	    link(Pid),
 	    exit(Pid, ssh_sftp_stop_channel),
 	    receive 
@@ -145,9 +145,9 @@ stop_channel(Pid) ->
 			    ok
 		    end
 	    end,
-	    process_flag(trap_exit, Bool),
+	    process_flag(trap_exit, OldValue),
 	    ok;
-	undefined ->
+	false ->
 	    ok
     end.
 
diff --git a/lib/ssh/test/Makefile b/lib/ssh/test/Makefile
index 5a2a6de24a..1820924ed6 100644
--- a/lib/ssh/test/Makefile
+++ b/lib/ssh/test/Makefile
@@ -115,7 +115,7 @@ release_tests_spec: opt
 	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)
 	$(INSTALL_DATA) ssh.spec ssh.cover $(RELSYSDIR)
 	$(INSTALL_DATA) $(HRL_FILES_NEEDED_IN_TEST) $(RELSYSDIR)
-	chmod -f -R u+w $(RELSYSDIR)
+	chmod -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
 release_docs_spec:
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index d79038df29..fe2b915d17 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 2.0.7
+SSH_VSN = 2.0.8
 APP_VSN    = "ssh-$(SSH_VSN)"
 
diff --git a/lib/ssl/Makefile b/lib/ssl/Makefile
index daad7dc3e6..a7a95004a6 100644
--- a/lib/ssl/Makefile
+++ b/lib/ssl/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2010. All Rights Reserved.
+# Copyright Ericsson AB 1999-2011. 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
@@ -25,7 +25,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 # Macros
 #
 
-SUB_DIRECTORIES = src c_src doc/src examples/certs examples/src
+SUB_DIRECTORIES = src  doc/src examples/certs examples/src
 
 include vsn.mk
 VSN = $(SSL_VSN)
diff --git a/lib/ssl/c_src/Makefile.dist b/lib/ssl/c_src/Makefile.dist
deleted file mode 100644
index 2468468921..0000000000
--- a/lib/ssl/c_src/Makefile.dist
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2009. 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.
-# 
-# %CopyrightEnd%
-#
-
-# Makefile for SSL on Unix
-# 
-# Placed in obj directory. 
-#
-CC = gcc
-	
-BINDIR = %BINDIR%
-LIBS = %LIBS%
-SSL_LIBDIR = %SSL_LIBDIR% 
-OBJS = %OBJS%
-
-$(BINDIR)/ssl_esock: $(OBJS)
-	$(CC) -L$(SSL_LIBDIR) -Wl,-R$(SSL_LIBDIR) -o $@ $^ \
-		$(LIBS) -lssl -lcrypto
diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in
deleted file mode 100644
index 6e413e7e8e..0000000000
--- a/lib/ssl/c_src/Makefile.in
+++ /dev/null
@@ -1,215 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1999-2011. 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.
-#
-# %CopyrightEnd%
-#
-
-#
-# Makefile only for Unix and Win32/Cygwin.
-# 
-
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-# ----------------------------------------------------
-# SSL locations and include options from configure
-# ----------------------------------------------------
-SSL_LIBDIR = @SSL_LIBDIR@
-SSL_INCLUDE = @SSL_INCLUDE@
-SSL_CRYPTO_LIBNAME = @SSL_CRYPTO_LIBNAME@
-SSL_SSL_LIBNAME = @SSL_SSL_LIBNAME@
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(SSL_VSN)
-
-# ----------------------------------------------------
-# Commands 
-# ----------------------------------------------------
-CC = @CC@
-LD = @LD@
-SHELL = /bin/sh
-LIBS = @LIBS@
-PLAIN_CFLAGS = @CFLAGS@
-
-# ----------------------------------------------------
-# Includes and libs
-# ----------------------------------------------------
-
-ALL_CFLAGS = @WFLAGS@ @CFLAGS@ @DEFS@ $(TYPE_FLAGS)
-TARGET = @host@
-
-ifeq ($(TYPE),debug)
-TYPEMARKER = .debug
-TYPE_FLAGS = -g -DDEBUG @DEBUG_FLAGS@
-else
-TYPEMARKER =
-TYPE_FLAGS = -O2
-endif
-
-PRIVDIR = ../priv
-BINDIR = $(PRIVDIR)/bin/$(TARGET)
-OBJDIR = $(PRIVDIR)/obj/$(TARGET)
-
-# ----------------------------------------------------
-# File suffixes
-# ----------------------------------------------------
-exe = @EXEEXT@
-obj = .@OBJEXT@
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/ssl-$(VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-OBJS = 	$(OBJDIR)/esock$(obj) \
-	$(OBJDIR)/debuglog$(obj) \
-	$(OBJDIR)/esock_poll$(obj) \
-	$(OBJDIR)/esock_osio$(obj) \
-	$(OBJDIR)/esock_utils$(obj) \
-	$(OBJDIR)/esock_posix_str$(obj) \
-	$(OBJDIR)/esock_openssl$(obj)
-
-PORT_PROGRAM = $(BINDIR)/ssl_esock$(exe)
-
-SKIP_BUILDING_BINARIES := false
-
-# Try to be BC for R10
-ifeq ($(findstring @SSL_,@SSL_DYNAMIC_ONLY@),@SSL_)
-DYNAMIC_CRYPTO_LIB=yes
-else
-DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
-endif
-
-
-ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
-
-ifneq ($(findstring win32,$(TARGET)),win32)
-SSL_MAKEFILE = $(OBJDIR)/Makefile
-else
-SSL_MAKEFILE =
-endif
-
-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
-
-ifeq ($(findstring @,$(CC_R_FLAG)),@)
-# Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
-# we try our best here instead...
-
-ifeq ($(findstring darwin,$(TARGET)),darwin)	# darwin: no flag
-CC_R_FLAG =
-else
-ifeq ($(findstring osf,$(TARGET)),osf)		# osf1: -Wl,-rpath,
-CC_R_FLAG = -Wl,-rpath,
-else						# Default: -Wl,-R
-CC_R_FLAG = -Wl,-R
-endif
-endif
-endif
-
-ifeq ($(strip $(CC_R_FLAG)),)
-CC_R_OPT =
-else
-CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR)
-endif
-
-SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@
-# Sigh...
-ifeq ($(findstring @,$(SSL_CC_RUNTIME_LIBRARY_PATH)),@)
-SSL_CC_RUNTIME_LIBRARY_PATH = $(CC_R_OPT)
-endif
-
-SSL_LINK_LIB=-L$(SSL_LIBDIR) -l$(SSL_SSL_LIBNAME) -l$(SSL_CRYPTO_LIBNAME)
-else 
-# not dynamic crypto lib (default from R11B-5)
-NEED_KERBEROS=@SSL_LINK_WITH_KERBEROS@
-NEED_ZLIB=@SSL_LINK_WITH_ZLIB@
-SSL_MAKEFILE =
-CC_R_OPT =
-SSL_CC_RUNTIME_LIBRARY_PATH=
-SSL_LINK_LIB = $(SSL_LIBDIR)/lib$(SSL_SSL_LIBNAME).a $(SSL_LIBDIR)/lib$(SSL_CRYPTO_LIBNAME).a 
-ifeq ($(NEED_KERBEROS),yes)
-SSL_LINK_LIB += @STATIC_KERBEROS_LIBS@
-endif
-ifeq ($(NEED_ZLIB),yes)
-SSL_LINK_LIB += @STATIC_ZLIB_LIBS@
-endif
-endif
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(OBJDIR) $(BINDIR) $(OBJS) $(PORT_PROGRAM) $(SSL_MAKEFILE)
-
-$(OBJDIR):
-	-@mkdir -p $(OBJDIR)
-
-$(BINDIR):
-	-@mkdir -p $(BINDIR)
-
-$(OBJDIR)/esock_openssl$(obj):	esock_openssl.c
-	$(CC) -c -o $@ $(ALL_CFLAGS) $(SSL_INCLUDE) $<
-
-$(OBJDIR)/%$(obj): %.c
-	$(CC) -c -o $@ $(ALL_CFLAGS) $<
-
-# Unix
-$(BINDIR)/ssl_esock: $(OBJS)
-	$(CC) $(PLAIN_CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(SSL_CC_RUNTIME_LIBRARY_PATH) $(SSL_LINK_LIB)
-
-# Win32/Cygwin
-$(BINDIR)/ssl_esock.exe: $(OBJS)
-	$(LD) $(SSL_CC_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -o $@ $^ -lwsock32 -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
-
-# Unix only, and only when linking statically
-$(SSL_MAKEFILE):
-	sed 	-e "s;%BINDIR%;../../bin/$(TARGET);" \
-		-e "s;%SSL_LIBDIR%;$(SSL_LIBDIR);" \
-		-e "s;%OBJS;$(OBJS);" \
-		-e "s;%LIBS%;$(LIBS);" ./Makefile.dist \
-		> $(OBJDIR)/Makefile
-
-
-clean:
-	rm -f $(PORT_PROGRAM) $(OBJS) core *~ $(SSL_MAKEFILE)
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
-	$(INSTALL_PROGRAM) $(PORT_PROGRAM) $(RELSYSDIR)/priv/bin
-ifneq ($(SSL_MAKEFILE),)
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/obj
-	$(INSTALL_DATA) $(OBJS) $(RELSYSDIR)/priv/obj
-	sed 	-e "s;%BINDIR%;../bin;" \
-		-e "s;%SSL_LIBDIR%;$(SSL_LIBDIR);" \
-		-e "s;%OBJS;$(OBJS);" \
-		-e "s;%LIBS%;$(LIBS);" ./Makefile.dist \
-		> $(RELSYSDIR)/priv/obj/Makefile
-endif
-
-release_docs_spec:
-
diff --git a/lib/ssl/c_src/Makefile.win32 b/lib/ssl/c_src/Makefile.win32
deleted file mode 100644
index 668cd2a28d..0000000000
--- a/lib/ssl/c_src/Makefile.win32
+++ /dev/null
@@ -1,147 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2009. 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.
-# 
-# %CopyrightEnd%
-#
-
-#
-# SSL - Makefile for Windows NT
-#
-# It is assumed that the following environment variables have been set:
-#
-# INCLUDE       X:\MSDEV\INCLUDE
-# LIB           X:\MSDEV\LIB
-#
-# so that standard include files, and the socket library can be found.
-#
-# When ssl_esock.exe is run, the PATH environment variable must contain
-# the name of a directory that contains ssleay32.dll and libeay32.dll,
-# and windows socket dll.
-#
-
-# Roots
-!ifndef OPENSSL_ROOT
-!	error "Makefile.win32: ssl: OPENSSL_ROOT not set"
-!endif
-
-TARGET = win32
-
-BINDIR = ..\priv\bin\$(TARGET)
-OBJDIR = ..\priv\obj\$(TARGET)
-
-!if !exist($(BINDIR)) 
-!	if [mkdir $(BINDIR)]
-!	error "SSL: cannot create BINDIR"
-!	endif
-!endif
-
-!if !exist($(OBJDIR))
-!	if [mkdir $(OBJDIR)]
-!	error "SSL: cannot create OBJDIR"
-!	endif
-!endif
-
-# Includes
-#
-OPENSSL_INCLUDE = $(OPENSSL_ROOT)\inc32
-
-INCLUDES = /I. /I$(OPENSSL_INCLUDE)
-
-# Libraries
-#
-OPENSSL_LIBDIR = $(OPENSSL_ROOT)\out32dll
-OPENSSL_LIBS = \
-	$(OPENSSL_LIBDIR)\ssleay32.lib \
-	$(OPENSSL_LIBDIR)\libeay32.lib 
-
-!ifdef ESOCK_WINSOCK2
-WINSOCK_LIB = ws2_32.lib 
-DEFS = -DESOCK_WINSOCK2
-!else
-WINSOCK_LIB = wsock32.lib
-!endif	
-
-# Compiler options
-# 
-# NOTE: Size of fd_set is set in esock_winsock.h but can be overridden
-# with a -D option here.
-#
-OPTS = /MDd /G5 /Ox /O2 /Ob2 /Z7
-DEFS = -D__WIN32__ -DWIN32 $(DEFS)
-CFLAGS = $(INCLUDES) /nologo $(OPTS) $(DEFS)
-
-# Object files
-#
-SSL_BASE_OBJS = \
-	$(OBJDIR)\esock.obj \
-	$(OBJDIR)\debuglog.obj \
-	$(OBJDIR)\esock_poll$(obj) \
-	$(OBJDIR)\esock_osio.obj \
-	$(OBJDIR)\esock_utils.obj \
-	$(OBJDIR)\esock_posix_str.obj
-
-OPENSSL_OBJS = \
-	$(OBJDIR)\esock_openssl.obj
-
-#
-# Targets
-#
-
-all:	$(SSL_BASE_OBJS) $(OPENSSL_OBJS) $(BINDIR)\ssl_esock.exe
-
-clean: 
-	del $(BINDIR)\*.exe
-	del $(OBJDIR)\*.obj
-
-# Inference rule .c.obj:
-#
-{.}.c{$(OBJDIR)}.obj:
-	$(CC) $(CFLAGS) /c /Fo$@ $(*B).c
-
-# Binary
-#
-$(BINDIR)\ssl_esock.exe:	$(SSL_BASE_OBJS) $(OPENSSL_OBJS)
-	$(CC) /nologo  $(SSL_BASE_OBJS) $(OPENSSL_OBJS) $(OPENSSL_LIBS) \
-		$(WINSOCK_LIB) /Fe$(BINDIR)\ssl_esock.exe
-
-
-
-# Dependencies
-#
-$(OBJDIR)\esock.o:	esock.h debuglog.h esock_ssl.h esock_osio.h \
-			esock_utils.h esock_winsock.h
-$(OBJDIR)\debuglog.o:	debuglog.h esock_ssl.h esock_utils.h
-$(OBJDIR)\esock_osio.o:	esock_osio.h esock.h debuglog.h esock_utils.h \
-			esock_winsock.h
-$(OBJDIR)\esock_utils.o:	esock_utils.h
-$(OBJDIR)\esock_posix_str.o:	esock_posix_str.h esock_winsock.h
-
-$(OBJDIR)\esock_openssl.o: 	esock.h esock_ssl.h debuglog.h esock_utils.h \
-		                $(OPENSSL_INCLUDE)\crypto.h \
-		                $(OPENSSL_INCLUDE)\ssl.h \
-				$(OPENSSL_INCLUDE)\err.h
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ssl/c_src/Makefile.win32.dist b/lib/ssl/c_src/Makefile.win32.dist
deleted file mode 100644
index 8510c44e08..0000000000
--- a/lib/ssl/c_src/Makefile.win32.dist
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2009. 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.
-# 
-# %CopyrightEnd%
-#
-	
-# Makefile.win32.dist for SSL
-# 
-# To be placed in obj directory. 
-#
-
-CC = cl
-
-BINDIR = %BINDIR%
-
-OPENSSL_LIBS = \
-	$(BINDIR)\ssleay32.lib \
-	$(BINDIR)\libeay32.lib 
-
-WINSOCK_LIB = ws2_32.lib 
-
-SSL_BASE_OBJS = esock.obj debuglog.obj esock_osio.obj esock_utils.obj \
-	        esock_posix_str.obj
-
-OPENSSL_OBJS = esock_openssl.obj
-
-$(BINDIR)\ssl_esock.exe:	$(SSL_BASE_OBJS) $(OPENSSL_OBJS)
-	$(CC) /nologo  $(SSL_BASE_OBJS) $(OPENSSL_OBJS) $(OPENSSL_LIBS) \
-		$(WINSOCK_LIB) /Fe$(BINDIR)\ssl_esock.exe
-
-
-
diff --git a/lib/ssl/c_src/debuglog.c b/lib/ssl/c_src/debuglog.c
deleted file mode 100644
index e2e55df4b2..0000000000
--- a/lib/ssl/c_src/debuglog.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*<copyright>
- * <year>1999-2008</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.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-/*
- * Purpose: Various routines for debug printouts and logs.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
-#include <time.h>
-#include "debuglog.h"
-#include "esock_utils.h"
-
-#ifndef __WIN32__
-static char tr_format_buf[256];
-static char *tr_format(const char *format);
-static int vfprintclistf(FILE *fp, const char *format, va_list args);
-#endif
-
-int debug = 0;
-int debugmsg = 0;
-FILE *ssllogfp = NULL;
-FILE *__locallogfp = NULL;
-
-void open_ssllog(char *path)
-{
-    ssllogfp = openlog(path);
-}
-
-void close_ssllog(void)
-{
-    if (ssllogfp)
-	closelog(ssllogfp);
-}
-
-FILE *openlog(char *s)
-{
-    FILE *fp;
-    time_t t = time(NULL);
-
-    if ((fp = fopen(s, "a"))) {
-	setbuf(fp, NULL);
-	fprintf(fp, "===== Opened [%s] %s", s, ctime(&t));
-    }
-    return fp;
-}
-
-void closelog(FILE *fp)
-{
-    time_t t = time(NULL);
-
-    if (fp) {
-	fprintf(fp, "Closed %s", ctime(&t));
-	fclose(fp);
-    }
-}
-
-int __debugprintf(const char *format, ...)
-{
-    va_list args;
-    int ret;
-#ifndef __WIN32__
-    char *newformat;
-
-    va_start(args, format);
-    newformat = tr_format(format);
-    ret = vfprintf(stderr, newformat, args);
-    if (newformat != format && newformat != tr_format_buf)
-	esock_free(newformat);
-#else
-    va_start(args, format);
-    ret = vfprintf(stderr, format, args);
-#endif
-    va_end(args);
-    if (ssllogfp) { 
-        va_start(args, format);
-	vfprintf(ssllogfp, format, args);
-        va_end(args);
-    }
-    return ret;
-}
-
-int __debugprintclistf(const char *format, ...)
-{
-    va_list args;
-    int ret;
-#ifndef __WIN32__
-    char *newformat;
-
-    va_start(args, format);
-    newformat = tr_format(format);
-    ret = vfprintclistf(stderr, newformat, args);
-    if (newformat != format && newformat != tr_format_buf)
-	esock_free(newformat);
-#else
-    va_start(args, format);
-    ret = vfprintclistf(stderr, format, args);
-#endif
-    if (ssllogfp) 
-	vfprintclistf(ssllogfp, format, args);
-    va_end(args);
-    return ret;
-}
-
-int __debuglogf(const char *format, ...)
-{
-    va_list args;
-    int ret;
-
-    va_start(args, format);
-    ret = vfprintf(__locallogfp, format, args);
-    va_end(args);
-    return ret;
-}
-
-#ifndef __WIN32__
-
-/* Insert `\r' before each `\n' i format */
-static char *tr_format(const char *format)
-{
-    char *newformat, *s, *t;
-    int len;
-
-    len = strlen(format);
-    if ((newformat = (len > 127) ? esock_malloc(len) : tr_format_buf)) {
-	for (s = (char *)format, t = newformat; *s; *t++ = *s++)
-	    if (*s == '\n') 
-		*t++ = '\r';
-	*t = '\0';
-    } else
-	newformat = (char *)format;
-    return newformat;
-}
-
-#endif
-
-/* This function is for printing arrays of characters with formats
- * %FPa or %FPb, where F and P are the ordinary specifiers for 
- * field width and precision, respectively. 
- * 
- * The conversion specifier `a' implies hex-string output, while 
- * the `b' specifier provides character output (for non-printable
- * characters a `.' is written.
- *
- * The F specifier contains the width for each character. The 
- * P specifier tells how many characters to print.
- *
- * Example: Suppose we have a function myprintf(char *format, ...)
- * that calls our vfprintclistf(), and that
- *
- * char buf[] = "h\r\n";
- * len = 3;
- *
- * Then 
- *
- * myprintf("%.2b", buf)         prints     "h."
- * myprintf("%2.3b", buf)        prints     "h . . "
- * myprintf("%3.*a", len, buf)   prints     "68 0d 0a"
- *  
- */
-
-static int vfprintclistf(FILE *fp, const char *format, va_list args)
-{
-
-    int i, len, width, prec, written = 0;
-    char *s, *prevs, *fstart;
-    unsigned char *buf;
-
-    if (!format || !*format)
-	return 0;
-    
-    /* %{[0-9]*|\*}{.{[0-9]*|\*}{a|b} */
-
-    prevs = (char *)format;	/* format is const */
-    s = strchr(format, '%');
-    while (s && *s) {
-	if (s - prevs > 0)
-	    written += fprintf(fp, "%.*s", s - prevs, prevs);
-	width = prec = 0;
-	fstart = s;
-	s++;
-	if (*s != '%') {	/* otherwise it is not a format */
-	    if (*s == '*') {	/* width in arg */
-		s++;
-		width = va_arg(args, int);
-	    } else if ((len = strspn(s, "0123456789"))) { /* const width */
-		width = atoi(s);
-		s += len;
-	    } else 
-		width = 0;
-	    if (*s == '.') {	/* precision specified */
-		s++;
-		if (*s == '*') { /* precision in arg */
-		    s++;
-		    prec = va_arg(args, int);
-		} else if ((len = strspn(s, "0123456789"))) { /* const prec */
-		    prec = atoi(s);
-		    s += len;
-		} else		/* no precision value, defaults to zero */
-		    prec = 0;
-	    }  else
-		prec = 0;	/* no precision defaults to zero */
-	    if (*s == 'a' || *s == 'b') { /* only valid specifiers */
-		buf = va_arg(args, unsigned char *);
-		if (*s == 'a') {
-		    for (i = 0; i < prec; i++) 
-			written += fprintf(fp, "%*.2x", width, buf[i]);
-		}else if (*s == 'b') {
-		    for (i = 0; i < prec; i++) {
-			if (isprint(buf[i]))
-			    written += fprintf(fp, "%*c", width, buf[i]);
-			else
-			    written += fprintf(fp, "%*c", width, '.');
-		    }
-		}
-	    } else {
-		fprintf(stderr, "fprintclistf: format \"%s\" invalid.\n", 
-			format);
-		va_end(args);
-		return written;
-	    }
-	}
-	s++;
-	/* Now s points to the next character after the format */
-	prevs = s;
-	s = strchr(s, '%');
-    }
-    if (format + strlen(format) + 1 - prevs > 0)
-	written += fprintf(fp, "%s", prevs);
-    return written;
-}
-
diff --git a/lib/ssl/c_src/debuglog.h b/lib/ssl/c_src/debuglog.h
deleted file mode 100644
index 5699e6b495..0000000000
--- a/lib/ssl/c_src/debuglog.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*<copyright>
- * <year>1998-2008</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.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-/*
- * Purpose:  Debug functions and macros.
- *
- */
-
-#ifndef __DEBUGLOG_H_
-#define __DEBUGLOG_H_
-
-#include <stdio.h>
-#include "esock_ssl.h"
-
-#define DEBUGF(x)  if (debug) __debugprintf x;
-#define DEBUGMSGF(x)  if (debugmsg) __debugprintclistf x;
-#define LOGF(fp, x) if (fp) { __locallogfp = fp; __debuglogf x; }
-#define SSLDEBUGF()  if (debug) { esock_ssl_print_errors_fp(stderr); \
-    if (ssllogfp) esock_ssl_print_errors_fp(ssllogfp); }
-
-int  debug;
-int  debugmsg;
-FILE *ssllogfp;
-FILE *__locallogfp;
-
-void open_ssllog(char *path);
-void close_ssllog(void);
-FILE *openlog(char *);
-void closelog(FILE *);
-int __debugprintf(const char *, ...);
-int __debugprintclistf(const char *, ...);
-int __debuglogf(const char *, ...);
-
-#endif
diff --git a/lib/ssl/c_src/esock.c b/lib/ssl/c_src/esock.c
deleted file mode 100644
index 78d08f7c29..0000000000
--- a/lib/ssl/c_src/esock.c
+++ /dev/null
@@ -1,1904 +0,0 @@
-/*<copyright>
- * <year>1999-2008</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.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-
-/*
- * Purpose:  Implementation of Secure Socket Layer (SSL).
- *
- * This is an "SSL proxy" for Erlang in the form of a port
- * program. 
- *
- * The implementation has borrowed somewhat from the original
- * implementation of `socket' by Claes Wikstr�m, and the former
- * implementation of `ssl_socket' by Helen Ariyan.
- *
- * All I/O is now non-blocking. 
- *
- * When a connection (cp) is in the state JOINED we have the following
- * picture:
- *
- *            proxy->fd                          fd
- *               |                               |
- *  proxy->eof   |  -------->  wq  ----------->  |   bp 
- *               |                               |
- *  Erlang       |                               |   SSL
- *               |                               |
- *  proxy->bp    |  <------ proxy->wq ---------  |   eof
- *               |                               |
- * 
- * We read from Erlang (proxy->fd) and write to SSL (fd); and read from 
- * SSL (fd) and write to Erlang (proxy->fd).  
- *
- * The variables bp (broken pipe) and eof (end of file) take the
- * values 0 and 1.
- *
- * What has been read and cannot be immediately written is put in a
- * write queue (wq). A wq is emptied before reads are continued, which
- * means that at most one chunk that is read can be in a wq.
- *
- * The proxy-to-ssl part of a cp is valid iff 
- *
- *         !bp && (wq.len > 0 || !proxy->eof).
- *
- * The ssl-to-proxy part of a cp is valid iff 
- *
- *         !proxy->bp && (proxy->wq.len > 0 || !eof). 
- *
- * The connection is valid if any of the above parts are valid, i.e.
- * invalid if both parts are invalid.
- *
- * Every SELECT_TIMEOUT second we try to write to those file
- * descriptors that have non-empty wq's (the only way to detect that a
- * far end has gone away is to write to it).
- *
- * STATE TRANSITIONS
- *
- * Below (*) means that the corresponding file descriptor is published
- * (i.e. kwown outside this port program) when the state is entered,
- * and thus cannot be closed without synchronization with the
- * ssl_server.
- *
- * Listen:
- *
- * STATE_NONE ---> (*) PASSIVE_LISTENING <---> ACTIVE_LISTENING
- *
- * Accept:
- *
- * STATE_NONE ---> SSL_ACCEPT ---> (*) CONNECTED ---> JOINED ---> 
- *  ---> SSL_SHUTDOWN ---> DEFUNCT
- *
- * Connect:
- *
- * STATE_NONE ---> (*) WAIT_CONNECT ---> SSL_CONNECT ---> CONNECTED ---> 
- *  ---> JOINED ---> SSL_SHUTDOWN ---> DEFUNCT
- * 
- * In states where file descriptors has been published, and where
- * something goes wrong, the state of the connection is set to
- * DEFUNCT. A connection in such a state can only be closed by a CLOSE
- * message from Erlang (a reception of such a message is registered in
- * cp->closed). The possible states are: WAIT_CONNECT, SSL_CONNECT,
- * CONNECTED, JOINED, and SSL_SHUTDOWN.
- *
- * A connection in state SSL_ACCEPT can be closed and removed without
- * synchronization.
- *
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#ifdef __WIN32__
-#include "esock_winsock.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <errno.h>
-
-#ifdef __WIN32__
-#include <process.h>
-#else
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <sys/time.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <fcntl.h>
-#endif
-
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff  /* Should be in <netinet/in.h>.  */
-#endif
-
-#include "esock.h"
-#include "debuglog.h"
-#include "esock_utils.h"
-#include "esock_ssl.h"
-#include "esock_osio.h"
-#include "esock_posix_str.h"
-#include "esock_poll.h"
-
-#define MAJOR_VERSION   2
-#define MINOR_VERSION   0
-#define MAXREPLYBUF	256
-#define RWBUFLEN	(32*1024)
-#define IS_CLIENT       0
-#define IS_SERVER       1
-#define SELECT_TIMEOUT  2	/* seconds */
-
-#define psx_errstr()	esock_posix_str(sock_errno())
-#define ssl_errstr()	esock_ssl_errstr
-
-#define PROXY_TO_SSL_VALID(cp) (!(cp)->bp && \
-				((cp)->wq.len > 0 || !(cp)->proxy->eof))
-
-#define SSL_TO_PROXY_VALID(cp) (!(cp)->proxy->bp && \
-				((cp)->proxy->wq.len > 0 || !(cp)->eof))
-
-#define JOINED_STATE_INVALID(cp) (!(PROXY_TO_SSL_VALID(cp)) && \
-				!(SSL_TO_PROXY_VALID(cp)))
-static int loop(void);
-static int set_poll_conns(Connection *cp, EsockPoll *ep, int verbose);
-static Connection *next_polled_conn(Connection *cp, Connection **cpnext,
-				    EsockPoll *ep, int set_wq_fds);
-
-static void leave_joined_state(Connection *cp);
-static void do_shutdown(Connection *cp);
-static void close_and_remove_connection(Connection *cp);
-static int reply(int cmd, char *fmt, ...);
-static int input(char *fmt, ...);
-static int put_pars(unsigned char *buf, char *fmt, va_list args);
-static int get_pars(unsigned char *buf, char *fmt, va_list args);
-static FD do_connect(char *lipstring, int lport, char *fipstring, int fport);
-static FD do_listen(char *ipstring, int lport, int backlog, int *aport);
-static FD do_accept(FD listensock, struct sockaddr *saddr, int *len);
-static void print_connections(void);
-static void dump_connections(void);
-static int check_num_sock_fds(FD fd); 
-static void safe_close(FD fd);
-static Connection *new_connection(int state, FD fd);
-static Connection *get_connection(FD fd);
-static void remove_connection(Connection *conn);
-static Proxy *get_proxy_by_peerport(int port);
-static Proxy *new_proxy(FD fd);
-static void remove_proxy(Proxy *proxy);
-static void ensure_write_queue(WriteQueue *wq, int size);
-static void clean_up(void);
-
-static Connection  *connections = NULL;
-static int num_sock_fds;	/* On UNIX all file descriptors */
-static Proxy *proxies = NULL;
-static int proxy_listensock = INVALID_FD;
-static int proxy_listenport = 0;
-static int proxy_backlog = 128;
-static int proxysock_last_err = 0;
-static int proxysock_err_cnt = 0;
-static char rwbuf[RWBUFLEN];
-static unsigned char *ebuf = NULL; /* Set by read_ctrl() */
-
-static char *connstr[] = {
-    "STATE_NONE", 
-    "ACTIVE_LISTENING",
-    "PASSIVE_LISTENING",
-    "CONNECTED",
-    "WAIT_CONNECT",
-    "SSL_CONNECT",
-    "SSL_ACCEPT",
-    "TRANSPORT_ACCEPT",
-    "JOINED",
-    "SSL_SHUTDOWN",
-    "DEFUNCT"
-};
-
-static char *originstr[] = {
-    "listen",
-    "accept",
-    "connect"
-};
-
-int main(int argc, char **argv) 
-{
-    char *logfile = NULL;
-    int i;
-    esock_version *vsn;
-    char *ciphers; 
-#ifdef __WIN32__
-    int pid;
-    WORD version;
-    WSADATA wsa_data;
-
-    set_binary_mode();
-    setvbuf(stderr, NULL, _IONBF, 0);
-    /* Two sockets for the stdin socket pipe (local thread). */
-    num_sock_fds = 2;		
-#else
-    pid_t pid;
-    num_sock_fds = 3;		/* 0, 1, 2 */
-#endif
-
-    pid = getpid();
-    i = 1;
-    while (i < argc) {
-	if (strcmp(argv[i], "-d") == 0) {
-	    debug = 1;
-	    i++;
-	} else if (strcmp(argv[i], "-dm") == 0) {
-	    debugmsg = 1;
-	    i++;
-	} else if (strcmp(argv[i], "-pp") == 0) {
-	    i++;
-	    proxy_listenport = atoi(argv[i]);
-	    i++;
-	} else if (strcmp(argv[i], "-pb") == 0) {
-	    i++;
-	    proxy_backlog = atoi(argv[i]);
-	    i++;
-	} else if (strcmp(argv[i], "-pv") == 0) {
-	    i++;
-	    protocol_version = atoi(argv[i]);
-	    i++;
-	} else if (strcmp(argv[i], "-dd") == 0) {
-	    i++;
-	    logfile = esock_malloc(strlen(argv[i]) + 64);
-	    sprintf(logfile, "%s/ssl_esock.%d.log", argv[i], (int)pid);
-	    i++;
-	} else if (strcmp(argv[i], "-ersa") == 0) {
-	    ephemeral_rsa = 1;
-	    i++;
-	} else if (strcmp(argv[i], "-edh") == 0) {
-	    ephemeral_dh = 1;
-	    i++;
-	}
-    }
-    if (debug || debugmsg) {
-	DEBUGF(("Starting ssl_esock\n"));
-	if (logfile) {
-	    open_ssllog(logfile);
-#ifndef __WIN32__
-	    num_sock_fds++;
-#endif
-	}
-	atexit(close_ssllog);
-	DEBUGF(("pid = %d\n", getpid()));
-    }
-    if (esock_ssl_init() < 0) {
-	fprintf(stderr, "esock: Could not do esock_ssl_init\n");
-	exit(EXIT_FAILURE);
-    }
-
-    atexit(esock_ssl_finish);
-
-#ifdef __WIN32__
-    /* Start Windows' sockets */
-    version = MAKEWORD(MAJOR_VERSION, MINOR_VERSION);
-    if (WSAStartup(version, &wsa_data) != 0) {
-	fprintf(stderr, "esock: Could not start up Windows' sockets\n");
-	exit(EXIT_FAILURE);
-    }
-    atexit((void (*)(void))WSACleanup);
-    if (LOBYTE(wsa_data.wVersion) < MAJOR_VERSION ||
-	(LOBYTE(wsa_data.wVersion) == MAJOR_VERSION && 
-	 HIBYTE(wsa_data.wVersion) < MINOR_VERSION)) {
-	fprintf(stderr, "esock: Windows socket version error. "
-		"Requested version:"
-		"%d.%d, version found: %d.%d\n", MAJOR_VERSION, 
-		MINOR_VERSION, LOBYTE(wsa_data.wVersion), 
-		HIBYTE(wsa_data.wVersion));
-	exit(EXIT_FAILURE);
-    }
-    DEBUGF(("Using Windows socket version: %d.%d\n", 
-	   LOBYTE(wsa_data.wVersion), HIBYTE(wsa_data.wVersion)));
-    DEBUGF(("Maximum number of sockets available: %d\n", 
-	    wsa_data.iMaxSockets));
- 
-    if (esock_osio_init() < 0) {
-	fprintf(stderr, "esock: Could not init osio\n");
-	exit(EXIT_FAILURE);
-    }
-    atexit(esock_osio_finish);
-#endif
-
-    /* Create the local proxy listen socket and set it to non-blocking */
-    proxy_listensock = do_listen("127.0.0.1", proxy_listenport, 
-				 proxy_backlog, &proxy_listenport);
-    if (proxy_listensock == INVALID_FD) {
-	fprintf(stderr, "esock: Cannot create local listen socket\n");
-	exit(EXIT_FAILURE);
-    }
-    SET_NONBLOCKING(proxy_listensock);
-    DEBUGF(("Local proxy listen socket: fd = %d, port = %d\n", 
-	   proxy_listensock, proxy_listenport));
-
-    vsn = esock_ssl_version();
-    ciphers = esock_ssl_ciphers();
-
-    /* Report: port number of the local proxy listen socket, the native
-     * os pid, the compile and lib versions of the ssl library, and 
-     * the list of available ciphers. */
-    reply(ESOCK_PROXY_PORT_REP, "24sss", proxy_listenport, (int)pid, 
-	  vsn->compile_version, vsn->lib_version, ciphers);
-
-    atexit(clean_up);
-
-    loop();
-
-    if (logfile) 
-	esock_free(logfile);
-    exit(EXIT_SUCCESS);
-}
-
-
-/*
- * Local functions
- *
- */
-
-static int loop(void)
-{
-    EsockPoll pollfd;
-    FD fd, msgsock, listensock, connectsock, proxysock;
-    int cc, wc, fport, lport, pport, length, backlog, intref, op;
-    int value;
-    char *lipstring, *fipstring;
-    char *flags;
-    char *protocol_vsn, *cipher;
-    unsigned char *cert, *bin;
-    int certlen, binlen;
-    struct sockaddr_in iserv_addr;
-    int sret = 1;
-    Connection *cp, *cpnext, *newcp;
-    Proxy *pp;
-    time_t last_time = 0, now = 0;
-    int set_wq_fds;
-
-    esock_poll_init(&pollfd);
-
-    while(1) {
-	esock_poll_zero(&pollfd);
-	esock_poll_fd_set_read(&pollfd, proxy_listensock);
-	esock_poll_fd_set_read(&pollfd, local_read_fd);
-
-	set_wq_fds = 0;
-
-	if (sret)		/* sret == 1 the first time. */
-	    DEBUGF(("==========LOOP=============\n"));
-
-	cc = set_poll_conns(connections, &pollfd, sret) + 1;
-
-	if (sret) {
-	    print_connections();
-	    DEBUGF(("Before poll/select: %d descriptor%s (total %d)\n",
-		    cc, (cc == 1) ? "" : "s", num_sock_fds));
-	}
-
-	sret = esock_poll(&pollfd, SELECT_TIMEOUT);
-	if (sret < 0) {
-	    DEBUGF(("select/poll error: %s\n", psx_errstr()));
-	    continue;
-	}
-	
-	time(&now);
-	if (now >= last_time + SELECT_TIMEOUT) {
-	    set_wq_fds = 1;
-	    last_time = now;
-	}
-	/*
-	 * First accept as many connections as possible on the
-	 * proxy listen socket. We record the peer port, which
-	 * is later used as a reference for joining a proxy 
-	 * connection with a network connection.
-	 */
-
-	if (esock_poll_fd_isset_read(&pollfd, proxy_listensock)) {
-	    while (1) {
-		length = sizeof(iserv_addr);
-		proxysock = do_accept(proxy_listensock, 
-				      (struct sockaddr *)&iserv_addr, 
-				      (int*)&length);
-		if(proxysock == INVALID_FD) {
-		    if (sock_errno() != ERRNO_BLOCK) {
-			/* We can here for example get the error
-			 * EMFILE, i.e. no more file descriptors
-			 * available, but we do not have any specific
-			 * connection to report the error to.  We
-			 * increment the error counter and saves the
-			 * last err.  
-			 */
-			proxysock_err_cnt++;
-			proxysock_last_err = sock_errno();
-			DEBUGF(("accept error (proxy_listensock): %s\n", 
-				psx_errstr()));
-		    }
-		    break;
-		} else {
-		    /* Get peer port number */
-/* 		    length = sizeof(iserv_addr); */
-/* 		    if (getpeername(proxysock, (struct sockaddr *)&iserv_addr,  */
-/* 				    &length) < 0) { */
-/* 			DEBUGF(("Can't get peername of proxy socket")); */
-/* 			safe_close(proxysock); */
-/* 		    } else { */
-			/* Add to pending proxy connections */
-			SET_NONBLOCKING(proxysock);
-			pp = new_proxy(proxysock);
-			pp->peer_port = ntohs(iserv_addr.sin_port);
-			DEBUGF(("-----------------------------------\n"));
-			DEBUGF(("[PROXY_LISTEN_SOCK] conn accepted: "
-				"proxyfd = %d, "
-			       "peer port = %d\n", proxysock, pp->peer_port));
-/* 		    } */
-		}
-	    }
-	}
-
-	/* 
-	 * Read control messages from Erlang
-	 */
-	if (esock_poll_fd_isset_read(&pollfd, local_read_fd)) {  
-	    cc = read_ctrl(&ebuf);
-	    if ( cc < 0 ) {
-		DEBUGF(("Read loop -1 or 0\n"));
-		return -1;
-	    } else if (cc == 0) {  /* not eof  */
-		DEBUGF(("GOT empty string \n"));
-
-	    } else {
-
-		switch((int)*ebuf) {
-
-		case ESOCK_SET_SEED_CMD:
-		    /* 
-		     * ebuf = {cmd(1), binary(N) }
-		     */
-		    input("b", &binlen, &bin);
-		    DEBUGF(("[SET_SEED_CMD]\n"));
-		    esock_ssl_seed(bin, binlen);
-		    /* no reply */
-		    break;
-
-		case ESOCK_GETPEERNAME_CMD:
-		    /* 
-		     * ebuf = {cmd(1), fd(4)}
-		     */
-		    input("4", &fd);
-		    DEBUGF(("[GETPEERNAME_CMD] fd = %d\n", fd)); 
-		    cp = get_connection(fd);
-		    length = sizeof(iserv_addr);
-		    if (!cp) {
-			sock_set_errno(ERRNO_NOTSOCK);
-			reply(ESOCK_GETPEERNAME_ERR, "4s", fd, psx_errstr());
-		    } else if (getpeername(fd, 
-					   (struct sockaddr *) &iserv_addr, 
-					   &length) < 0) {
-			reply(ESOCK_GETPEERNAME_ERR, "4s", fd, psx_errstr());
-		    } else {
-			/*
-			 * reply  = {cmd(1), fd(4), port(2), 
-			 * 	    ipstring(N), 0(1)}
-			 */
-			reply(ESOCK_GETPEERNAME_REP, "42s", fd, 
-			      ntohs(iserv_addr.sin_port), 
-			      inet_ntoa(iserv_addr.sin_addr));
-		    }
-		    break;
-
-		case ESOCK_GETSOCKNAME_CMD:
-		    /* 
-		     * ebuf = {cmd(1), fd(4)}
-		     */
-		    input("4", &fd);
-		    DEBUGF(("[GETSOCKNAME_CMD] fd = %d\n", fd)); 
-		    cp = get_connection(fd);
-		    length = sizeof(iserv_addr);
-		    if (!cp) {
-			sock_set_errno(ERRNO_NOTSOCK);
-			reply(ESOCK_GETSOCKNAME_ERR, "4s", fd, psx_errstr());
-		    } else if (getsockname(fd, 
-					   (struct sockaddr *)&iserv_addr, 
-					   &length) < 0) {
-			reply(ESOCK_GETSOCKNAME_ERR, "4s", fd, psx_errstr());
-		    } else {
-			/*
-			 * reply  = {cmd(1), fd(4), port(2), 
-			 * 	    ipstring(N), 0(1)}
-			 */
-			reply(ESOCK_GETSOCKNAME_REP, "42s", fd, 
-			      ntohs(iserv_addr.sin_port),
-			      inet_ntoa(iserv_addr.sin_addr));
-		    }
-		    break;
-
-		case ESOCK_GETCONNINFO_CMD:
-		    /* 
-		     * ebuf = {cmd(1), fd(4)}
-		     */
-		    input("4", &fd);
-		    DEBUGF(("[GETCONNINFO_CMD] fd = %d\n", fd)); 
-		    cp = get_connection(fd);
-		    if (!cp) {
-			sock_set_errno(ERRNO_NOTSOCK);
-			reply(ESOCK_GETCONNINFO_ERR, "4s", fd, psx_errstr());
-		    } else {
-			if (esock_ssl_getprotocol_version(cp,
-							  &protocol_vsn) < 0)
-			    reply(ESOCK_GETCONNINFO_ERR, "4s", fd, psx_errstr());
-			else if (esock_ssl_getcipher(cp, &cipher) < 0)
-			    reply(ESOCK_GETCONNINFO_ERR, "4s", fd, psx_errstr());
-			else
-			/*
-			 * reply  = {cmd(1), fd(4), protocol(N), 0(1),
-			 * 	    cipher(N), 0(1)}
-			 */
-			    reply(ESOCK_GETCONNINFO_REP, "4ss", fd, 
-				  protocol_vsn, cipher);
-		    }
-		    break;
-
-		case ESOCK_GETPEERCERT_CMD:
-		    /* 
-		     * ebuf = {cmd(1), fd(4)}
-		     */
-		    input("4", &fd);
-		    DEBUGF(("[GETPEERCERT_CMD] fd = %d\n", fd)); 
-		    cp = get_connection(fd);
-		    if (!cp) {
-			sock_set_errno(ERRNO_NOTSOCK);
-			reply(ESOCK_GETPEERCERT_ERR, "4s", fd, psx_errstr());
-		    } else {
-			if ((certlen = esock_ssl_getpeercert(cp, &cert)) < 0)
-			    reply(ESOCK_GETPEERCERT_ERR, "4s", fd, psx_errstr());
-			else {
-			    /*
-			     * reply  = {cmd(1), fd(4), certlen(4), cert(N)}
-			     */
-			    reply(ESOCK_GETPEERCERT_REP, "4b", fd, 
-				  certlen, cert);
-			    esock_free(cert);
-			}
-		    }
-		    break;
-
-		case ESOCK_CONNECT_CMD:
-		    /* 
-		     * ebuf = {cmd(1), intref(4), 
-		     * 	       lport(2), lipstring(N), 0(1),  -- local
-		     *         fport(2), fipstring(N), 0(1),  -- foreign
-		     * 	       flags(N), 0(1)}
-		     */
-		    input("42s2ss", &intref, &lport, &lipstring, 
-			  &fport, &fipstring, &flags);
-		    DEBUGF(("[CONNECT_CMD] intref = %d, "
-			    "lipstring = %s lport = %d, "
-			    "fipstring = %s fport = %d, "
-			    "flags = %s\n", intref, lipstring, lport,
-			    fipstring, fport, flags));
-		    connectsock = do_connect(lipstring, lport, 
-					     fipstring, fport);
-		    if(connectsock == INVALID_FD) {
-			reply(ESOCK_CONNECT_SYNC_ERR, "4s", intref, psx_errstr());
-			break;
-		    }
-		    DEBUGF(("  fd = %d\n", connectsock));
-		    cp = new_connection(ESOCK_WAIT_CONNECT, connectsock);
-		    cp->origin = ORIG_CONNECT;
-		    length = strlen(flags);
-		    cp->flags = esock_malloc(length + 1);
-		    strcpy(cp->flags, flags);
-		    DEBUGF(("-> WAIT_CONNECT fd = %d\n", connectsock));
-		    /* Publish connectsock */
-		    reply(ESOCK_CONNECT_WAIT_REP, "44", intref, connectsock);
-		    break;
-		    
-		case ESOCK_TERMINATE_CMD:
-		    /* 
-		     * ebuf = {cmd(1)}
-		     */
-		    exit(EXIT_SUCCESS);
-		    break;
-
-		case ESOCK_CLOSE_CMD:
-		    /* 
-		     * ebuf = {cmd(1), fd(4)}
-		     */
-		    input("4", &fd);
-		    if ((cp = get_connection(fd))) {
-			DEBUGF(("%s[CLOSE_CMD]: fd = %d\n", 
-				connstr[cp->state], fd));
-			if (cp->proxy)
-			    cp->proxy->bp = 1;
-			switch (cp->state) {
-			case ESOCK_JOINED:
-			    cp->close = 1;
-			    if (JOINED_STATE_INVALID(cp))
-				leave_joined_state(cp);
-			    break;
-			case ESOCK_SSL_SHUTDOWN:
-			    cp->close = 1;
-			    DEBUGF(("  close flag set\n"));
-			    break;
-			default:
-			    DEBUGF(("-> (removal)\n"));
-			    close_and_remove_connection(cp);
-			}
-		    } else 
-			DEBUGF(("[CLOSE_CMD]: ERROR: fd = %d not found\n", fd));
-		    break;
-
-		case ESOCK_SET_SOCKOPT_CMD:
-		    /* 
-		     * ebuf = {cmd(1), fd(4), op(1), on(1)}
-		     */
-		    input("411", &fd, &op, &value);
-		    switch(op) {
-		    case ESOCK_SET_TCP_NODELAY:
-			if(setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, 
-				      (void *)&value, sizeof(value)) < 0) {
-			    DEBUGF(("Error: setsockopt TCP_NODELAY\n"));
-			    reply(ESOCK_IOCTL_ERR, "4s", fd, psx_errstr());
-			} else {
-			    reply(ESOCK_IOCTL_OK, "4", fd);
-			}
-			break;
-		    default:
-			DEBUGF(("Error: set_sock_opt - Not implemented\n"));
-			sock_set_errno(ERRNO_OPNOTSUPP);
-			reply(ESOCK_IOCTL_ERR, "4", fd, psx_errstr());
-			break;
-		    }
-		    break;
-
-		case ESOCK_LISTEN_CMD:
-		    /* 
-		     * ebuf = {cmd(1), intref(4), lport(2), ipstring(N), 0(1),
-		     * 	       backlog(2), flags(N), 0(1)}
-		     */
-		    input("42s2s", &intref, &lport, &lipstring, &backlog,
-			  &flags);
-		    DEBUGF(("[LISTEN_CMD] intref = %d, port = %d, "
-			   "ipstring = %s, backlog = %d, flags = %s\n", 
-			   intref, lport, lipstring, backlog, flags));
-		    
-		    listensock = do_listen(lipstring, lport, backlog, &lport);
-		    if(listensock == INVALID_FD) {
-			reply(ESOCK_LISTEN_SYNC_ERR, "4s", intref, psx_errstr());
-			break;
-		    }
-		    cp = new_connection(ESOCK_PASSIVE_LISTENING, listensock);
-		    /* Flags may be an empty string */
-		    length = strlen(flags);
-		    cp->flags = esock_malloc(length + 1);
-		    strcpy(cp->flags, flags);
-
-		    cp->origin = ORIG_LISTEN;
-		    if (esock_ssl_listen_init(cp) < 0) {
-			DEBUGF(("esock_ssl_listen_init() failed.\n"));
-			reply(ESOCK_LISTEN_SYNC_ERR, "4s", intref, 
-			      ssl_errstr());
-			close_and_remove_connection(cp);
-			break;
-		    }
-		    DEBUGF(("-> PASSIVE_LISTENING (fd = %d)\n", listensock));
-		    /* Publish listensock */
-		    reply(ESOCK_LISTEN_REP, "442", intref, listensock,
-			  ntohs(iserv_addr.sin_port));
-		    break;
-
-		case ESOCK_TRANSPORT_ACCEPT_CMD:
-		    /* 
-		     * ebuf =  { op(1), fd(4), flags(N), 0(1)} 
-		     */
-		    input("4s", &fd, &flags);
-		    DEBUGF(("[TRANSPORT_ACCEPT_CMD] listenfd = %d, flags = %s\n", fd, 
-			   flags));
-		    cp = get_connection(fd);
-		    if (cp) {
-			 /* We store the flags in the listen socket's 
-			  * connection, and overwrite previous flags.
-			  */
-			if ((length = strlen(flags)) > 0) {
-			    if (cp->flags)
-				cp->flags = esock_realloc(cp->flags, 
-							  length + 1);
-			    else
-				cp->flags = esock_malloc(length + 1);
-			    strcpy(cp->flags, flags);
-			}
-			if (cp->flags && cp->flags[0] != '\0') {
-			    cp->acceptors++;
-			    cp->state = ESOCK_ACTIVE_LISTENING; 
-			    DEBUGF(("-> ACTIVE_LISTENING\n"));
-			    break;
-			}
-			DEBUGF(("ERROR: flags empty\n"));
-		    }
-		    reply(ESOCK_TRANSPORT_ACCEPT_ERR, "4s", fd, "ebadf");
-		    break;
-
-		case ESOCK_SSL_ACCEPT_CMD:
-		    input("4s", &fd, &flags);
-		    DEBUGF(("[SSL_ACCEPT_CMD] fd = %d, flags = %s\n", fd, flags));
-		    cp = get_connection(fd);
-		    if (cp)
-			cp->state = ESOCK_SSL_ACCEPT;
-		    //reply(ESOCK_SSL_ACCEPT_REP, "4", fd);
-		    break;
-
-		case ESOCK_NOACCEPT_CMD:
-		    /* 
-		     * ebuf = {cmd(1), fd(4)}
-		     */
-		    input("4", &fd);
-		    DEBUGF(("[NOACCEPT_CMD] listenfd = %d\n", fd));
-		    cp = get_connection(fd);
-		    if (cp && (--cp->acceptors <= 0)) {
-			cp->acceptors = 0;
-			cp->state = ESOCK_PASSIVE_LISTENING;
-			esock_poll_clear_event(&pollfd, fd);
-			DEBUGF(("-> PASSIVE_LISTENING\n"));
-		    }
-		    break;
-
-		case ESOCK_PROXY_JOIN_CMD:
-		    /*
-		     * ebuf = {cmd(1), fd(4), portnum(2)}
-		     *
-		     * fd      - file descriptor of a connection in state
-		     *           CONNECTED
-		     * portnum - port number of the Erlang proxy peer 
-		     */
-		    input("42", &fd, &pport);
-		    cp = get_connection(fd);
-		    pp = get_proxy_by_peerport(pport);
-		    if (cp && cp->state == ESOCK_CONNECTED && pp) {
-			DEBUGF(("CONNECTED[PROXY_JOIN_CMD] fd = %d "
-				"portnum = %d\n", fd, pport));
-			cp->proxy = pp;
-			pp->conn = cp;
-			reply(ESOCK_PROXY_JOIN_REP, "4", fd);
-			cp->state = ESOCK_JOINED;
-			DEBUGF(("-> JOINED\n"));
-			break;
-		    }
-		    if (!cp) {
-			DEBUGF(("[PROXY_JOIN_CMD] ERROR: No connection "
-				"having fd = %d\n", fd));
-			reply(ESOCK_PROXY_JOIN_ERR, "4s", fd, "ebadsocket");
-		    } else if (cp->state != ESOCK_CONNECTED) {
-			DEBUGF(("%s[PROXY_JOIN_CMD] ERROR: Bad state: "
-			       "fd = %d\n", connstr[cp->state], cp->fd));
-			reply(ESOCK_PROXY_JOIN_ERR, "4s", fd, "ebadstate");
-		    } else {
-			DEBUGF(("ERROR: No proxy: fd = %d, pport = %d\n",
-			       fd, pport));
-			if (proxysock_err_cnt > 0) {
-			    proxysock_err_cnt--;
-			    reply(ESOCK_PROXY_JOIN_ERR, "4s", fd, 
-				  esock_posix_str(proxysock_last_err));
-			} else {
-			    reply(ESOCK_PROXY_JOIN_ERR, "4s", fd, 
-				  "enoproxysocket");
-			}
-			cp->state = ESOCK_DEFUNCT;
-		    }
-		    break;
-
-		case ESOCK_DUMP_STATE_CMD:
-		    dump_connections();
-		  break;
- 
-                case ESOCK_SET_DEBUG_CMD:
-                  /* 
-                   * ebuf = {cmd(1), debug(1)}
-                   */
-                  input("1", &debug);
-                  break;
-		  
-		case ESOCK_SET_DEBUGMSG_CMD:
-                  /* 
-                   * ebuf = {cmd(1), debugmsg(1)}
-                   */
-                  input("1", &debugmsg);
-                  break;
-		  
-		default:
-		    fprintf(stderr, "esock: default value in loop %c\n", 
-			    *ebuf);
-		    exit(EXIT_FAILURE);
-		    break;
-		}
-	    }
-	}
-
-	/* Go through all connections that have their file descriptors
-           set. */
-
-	/* Note: We may remove the current connection (cp). Thus we
-	 * must be careful not to read cp->next after cp has been
-	 * removed.  */
-	for (cp = next_polled_conn(connections, &cpnext, &pollfd, set_wq_fds); 
-	     cp != NULL; 
-	     cp = next_polled_conn(cpnext, &cpnext, &pollfd, set_wq_fds)
-	     ) {
-
-	    switch(cp->state) {
-
-	    case ESOCK_PASSIVE_LISTENING:
-		DEBUGF(("-----------------------------------\n"));
-		fprintf(stderr, "esock: Got connect request while PASSIVE\n");
-		exit(EXIT_FAILURE);
-		break;
-		
-	    case ESOCK_ACTIVE_LISTENING:
-		/* new connect from network */
-		DEBUGF(("-----------------------------------\n"));
-		DEBUGF(("ACTIVE_LISTENING - trying to accept on %d\n", 
-		       cp->fd));
-		length = sizeof(iserv_addr);
-		msgsock = do_accept(cp->fd, (struct sockaddr*)&iserv_addr, 
-				    (int*)&length);
-		if(msgsock == INVALID_FD)  {
-		    DEBUGF(("accept error: %s\n", psx_errstr()));
-		    reply(ESOCK_TRANSPORT_ACCEPT_ERR, "4s", cp->fd, psx_errstr());
-		    break;
-		}
-		SET_NONBLOCKING(msgsock);
-		if (--cp->acceptors <= 0) {
-		    cp->acceptors = 0;
-		    cp->state = ESOCK_PASSIVE_LISTENING;
-		    DEBUGF(("-> PASSIVE_LISTENING\n"));
-		}
-		DEBUGF(("server accepted connection on fd %d\n", msgsock));
-		newcp = new_connection(ESOCK_TRANSPORT_ACCEPT, msgsock);
-		newcp->origin = ORIG_ACCEPT;
-		reply(ESOCK_TRANSPORT_ACCEPT_REP, "44", cp->fd, msgsock);
-		newcp->listen_fd = cp->fd; /* Needed for ESOCK_ACCEPT_ERR  */
-		length = strlen(cp->flags);
-		/* XXX new flags are not needed */
-		newcp->flags = esock_malloc(length + 1);
-		strcpy(newcp->flags, cp->flags); /* XXX Why? */
-		if (esock_ssl_accept_init(newcp, cp->opaque) < 0) {
-		    cp->errstr = ssl_errstr();
-		    break;
-		}
-		newcp->ssl_want = ESOCK_SSL_WANT_READ;
-		break;
-
-	    case ESOCK_SSL_ACCEPT:
-		/* SSL accept handshake. msgsock is *not* published yet. */
-		msgsock = cp->fd;
-		DEBUGF(("-----------------------------------\n"));
-		DEBUGF(("SSL_ACCEPT fd = %d\n", msgsock));
-		if (cp->errstr != NULL) { /* this means we got an error in ssl_accept_init */
-		    /* N.B.: The *listen fd* is reported. */
-		    reply(ESOCK_SSL_ACCEPT_ERR, "4s", msgsock, cp->errstr);
-		    close_and_remove_connection(cp);
-		    break;
-		}
-		if (esock_ssl_accept(cp) < 0) {
-		    if (sock_errno() != ERRNO_BLOCK) {
-			/* Handshake failed. */
-			reply(ESOCK_SSL_ACCEPT_ERR, "4s", msgsock,
-			      ssl_errstr());
-			DEBUGF(("ERROR: handshake: %s\n", ssl_errstr()));
-			close_and_remove_connection(cp);
-		    }
-		} else {
-		    /* SSL handshake successful: publish */
-		    reply(ESOCK_SSL_ACCEPT_REP, "4", msgsock);
-		    DEBUGF(("-> CONNECTED\n"));
-		    DEBUGF((" Session was %sreused.\n", 
-			    (esock_ssl_session_reused(cp)) ? "" : "NOT "));
-		    cp->state = ESOCK_CONNECTED;
-		}
-		break;
-
-	    case ESOCK_CONNECTED:
-		/* Should not happen. We do not read or write until
-		   the connection is in state JOINED. */
-		DEBUGF(("-----------------------------------\n"));
-		DEBUGF(("CONNECTED: Error: should not happen. fd = %d\n", 
-			cp->fd));
-		break;
-
-	    case ESOCK_JOINED:
-		/* 
-		 * Reading from Proxy, writing to SSL 
-		 */
-		if (esock_poll_fd_isset_write(&pollfd, cp->fd)) {
-		    /* If there is a write queue, write to ssl only */
-		    if (cp->wq.len > 0) { 
-			/* The write retry semantics of SSL_write in
-			 * the OpenSSL package is strange. Partial
-			 * writes never occur, only complete writes or
-			 * failures.  A failure, however, still
-			 * consumes all data written, although not all
-			 * encrypted data could be written to the
-			 * underlying socket. To retry a write we have
-			 * to provide the same buf and length as in
-			 * the original call, in our case rwbuf and
-			 * the original buffer length. Hence the
-			 * strange memcpy(). Note that wq.offset will
-			 * always be zero when we use OpenSSL.  
-			 */
-			DEBUGF(("-----------------------------------\n"));
-			DEBUGF(("JOINED: writing to ssl "
-				"fd = %d, from write queue only, wc = %d\n", 
-				cp->fd, cp->wq.len - cp->wq.offset));
-			memcpy(rwbuf, cp->wq.buf, cp->wq.len - cp->wq.offset);
-
-			/* esock_ssl_write sets cp->eof, cp->bp when return
-			 * value is zero */
-			wc = esock_ssl_write(cp, rwbuf, 
-					     cp->wq.len - cp->wq.offset);
-			if (wc < 0) {
-			    if (sock_errno() != ERRNO_BLOCK) {
-				/* Assume broken SSL pipe */
-				DEBUGF(("broken SSL pipe\n"));
-				cp->bp = 1;
-				shutdown(cp->proxy->fd, SHUTDOWN_READ);
-				cp->proxy->eof = 1;
-				if (JOINED_STATE_INVALID(cp)) {
-				    leave_joined_state(cp);
-				    break;
-				}
-			    }
-			} else if (wc == 0) {
-			    /* SSL broken pipe */
-			    DEBUGF(("broken SSL pipe\n"));
-			    cp->bp = 1;
-			    shutdown(cp->proxy->fd, SHUTDOWN_READ);
-			    cp->proxy->eof = 1;
-			    if (JOINED_STATE_INVALID(cp)) {
-				leave_joined_state(cp);
-				break;
-			    }
-			} else {
-			    cp->wq.offset += wc;
-			    if (cp->wq.offset == cp->wq.len)
-				cp->wq.len = 0;
-			}
-		    }
-		} else if (esock_poll_fd_isset_read(&pollfd, cp->proxy->fd)) {
-		    /* Read from proxy and write to SSL */
-		    DEBUGF(("-----------------------------------\n"));
-		    DEBUGF(("JOINED: reading from proxy, "
-			   "proxyfd = %d\n", cp->proxy->fd));
-		    cc = sock_read(cp->proxy->fd, rwbuf, RWBUFLEN); 
-		    DEBUGF(("read from proxyfd = %d, cc = %d\n", 
-			   cp->proxy->fd, cc));
-		    if (cc > 0) {
-			/* esock_ssl_write sets cp->eof, cp->bp when return
-			 * value is zero */
-			wc = esock_ssl_write(cp, rwbuf, cc);
-			if (wc < 0) {
-			    if (sock_errno() != ERRNO_BLOCK) {
-				/* Assume broken pipe */
-				DEBUGF(("broken SSL pipe\n"));
-				cp->bp = 1;
-				shutdown(cp->proxy->fd, SHUTDOWN_READ);
-				cp->proxy->eof = 1;
-				if (JOINED_STATE_INVALID(cp)) {
-				    leave_joined_state(cp);
-				    break;
-				}
-			    } else {
-				/* add to write queue */
-				DEBUGF(("adding all to write queue "
-					"%d bytes\n", cc));
-				ensure_write_queue(&cp->wq, cc);
-				memcpy(cp->wq.buf, rwbuf, cc);
-				cp->wq.len = cc;
-				cp->wq.offset = 0;
-			    }
-			} else if (wc == 0) {
-				/* Broken SSL pipe */
-				DEBUGF(("broken SSL pipe\n"));
-				cp->bp = 1;
-				shutdown(cp->proxy->fd, SHUTDOWN_READ);
-				cp->proxy->eof = 1;
-				if (JOINED_STATE_INVALID(cp)) {
-				    leave_joined_state(cp);
-				    break;
-				}
-			} else if (wc < cc) {
-			    /* add remainder to write queue */
-			    DEBUGF(("adding remainder to write queue "
-				    "%d bytes\n", cc - wc));
-			    ensure_write_queue(&cp->wq, cc - wc);
-			    memcpy(cp->wq.buf, rwbuf + wc, cc - wc);
-			    cp->wq.len = cc - wc;
-			    cp->wq.offset = 0;
-			} 
-		    } else {
-			/* EOF proxy or error */
-		       DEBUGF(("proxy eof or error %d\n", errno));
-			cp->proxy->eof = 1;
-			if (cp->wq.len == 0) {
-			    esock_ssl_shutdown(cp);
-			    cp->bp = 1;
-			}
-			if (JOINED_STATE_INVALID(cp)) {
-			    leave_joined_state(cp);
-			    break;
-			}
-		    }
-		}
-		/* 
-		 * Reading from SSL, writing to proxy 
-		 */
-		if (esock_poll_fd_isset_write(&pollfd, cp->proxy->fd)) {
-		    /* If there is a write queue, write to proxy only */
-		    if (cp->proxy->wq.len > 0) {
-			DEBUGF(("-----------------------------------\n"));
-			DEBUGF(("JOINED: writing to proxyfd = %d, "
-				"from write queue only, wc = %d\n", 
-				cp->proxy->fd, cp->proxy->wq.len - 
-				cp->proxy->wq.offset));
-			wc = sock_write(cp->proxy->fd, cp->proxy->wq.buf + 
-					cp->proxy->wq.offset,
-					cp->proxy->wq.len - 
-					cp->proxy->wq.offset);
-			if (wc < 0) {
-			    if (sock_errno() != ERRNO_BLOCK) {
-				/* Assume broken pipe */
-				DEBUGF(("broken proxy pipe\n"));
-				cp->proxy->bp = 1;
-				/* There is no SSL shutdown for read */
-				cp->eof = 1;
-				if (JOINED_STATE_INVALID(cp)) {
-				    leave_joined_state(cp);
-				    break;
-				}
-			    }
-			} else {
-			    cp->proxy->wq.offset += wc;
-			    if (cp->proxy->wq.offset == cp->proxy->wq.len)
-				cp->proxy->wq.len = 0;
-			}
-		    }
-		} else if (esock_poll_fd_isset_read(&pollfd, cp->fd)) {
-		    /* Read from SSL and write to proxy */
-		    DEBUGF(("-----------------------------------\n"));
-		    DEBUGF(("JOINED: read from ssl fd = %d\n",
-			   cp->fd));
-		    cc = esock_ssl_read(cp, rwbuf, RWBUFLEN);
-		    DEBUGF(("read from fd = %d, cc = %d\n", cp->fd, cc));
-		    if (cc > 0) {
-			wc = sock_write(cp->proxy->fd, rwbuf, cc);
-			if (wc < 0) {
-			    if (sock_errno() != ERRNO_BLOCK) {
-				DEBUGF(("broken proxy pipe\n"));
-				/* Assume broken pipe */
-				cp->proxy->bp = 1;
-				/* There is no SSL shutdown for read */
-				cp->eof = 1;
-				if (JOINED_STATE_INVALID(cp)) {
-				    leave_joined_state(cp);
-				    break;
-				}
-			    } else {
-				/* add all to write queue */
-				DEBUGF(("adding to write queue %d bytes\n", 
-					cc));
-				ensure_write_queue(&cp->proxy->wq, cc);
-				memcpy(cp->proxy->wq.buf, rwbuf, cc);
-				cp->proxy->wq.len = cc;
-				cp->proxy->wq.offset = 0;
-			    }
-			} else if (wc < cc) {
-			    /* add to write queue */
-			    DEBUGF(("adding to write queue %d bytes\n",
-				    cc - wc));
-			    ensure_write_queue(&cp->proxy->wq, cc - wc);
-			    memcpy(cp->proxy->wq.buf, rwbuf + wc, cc - wc);
-			    cp->proxy->wq.len = cc - wc;
-			    cp->proxy->wq.offset = 0;
-			} 
-		    } else if (cc == 0) {
-			/* SSL eof */
-			DEBUGF(("SSL eof\n"));
-			cp->eof = 1;
-			if (cp->proxy->wq.len == 0) {
-			    shutdown(cp->proxy->fd, SHUTDOWN_WRITE);
-			    cp->proxy->bp = 1;
-			}
-			if (JOINED_STATE_INVALID(cp)) {
-			    leave_joined_state(cp);
-			    break;
-			}
-		    } else {
-			/* This may very well happen when reading from SSL. */
-			DEBUGF(("NOTE: readmask set, cc < 0,  fd = %d, "
-				"is ok\n", cp->fd));
-		    }
-		}
-		break;
-
-	    case ESOCK_SSL_SHUTDOWN:
-		DEBUGF(("-----------------------------------\n"));
-		DEBUGF(("SSL_SHUTDOWN: fd = %d\n", cp->fd));
-		do_shutdown(cp);
-		break;
-
-	    case ESOCK_DEFUNCT:
-		DEBUGF(("-----------------------------------\n"));
-		DEBUGF(("DEFUNCT: ERROR: should not happen. fd = %d\n", 
-			cp->fd));
-		break;
-
-	    case ESOCK_WAIT_CONNECT:
-		/* New connection shows up */
-		connectsock = cp->fd;/* Is published */
-		DEBUGF(("-----------------------------------\n"));
-		DEBUGF(("WAIT_CONNECT fd = %d\n", connectsock));
-
-		/* If the connection did succeed it's possible to
-		 * fetch the peer name (UNIX); or failure shows in
-		 * exceptmask (WIN32). Sorry for the mess below, but
-		 * we have to have balanced paren's in #ifdefs in
-		 * order not to confuse Emacs' indentation.  */
-		length = sizeof(iserv_addr);
-		if (
-#ifdef __WIN32__
-		    esock_poll_fd_isset_exception(&pollfd, connectsock)
-#else
-		    getpeername(connectsock, (struct sockaddr *)&iserv_addr, 
-				&length) < 0
-#endif
-		    ) {
-		    sock_set_errno(ERRNO_CONNREFUSED);
-		    DEBUGF(("connect error: %s\n", psx_errstr()));
-		    reply(ESOCK_CONNECT_ERR, "4s", connectsock, psx_errstr());
-		    cp->state = ESOCK_DEFUNCT;
-		    break;
-		}
-		if (esock_ssl_connect_init(cp) < 0) {
-		    DEBUGF(("esock_ssl_connect_init() failed\n"));
-		    reply(ESOCK_CONNECT_ERR, "4s", connectsock, ssl_errstr());
-		    cp->state = ESOCK_DEFUNCT;
-		    break;
-		}
-		DEBUGF(("-> SSL_CONNECT\n"));
-		cp->state = ESOCK_SSL_CONNECT;
-		cp->ssl_want = ESOCK_SSL_WANT_WRITE;
-		break;
-
-	    case ESOCK_SSL_CONNECT:
-		/* SSL connect handshake. connectsock is published. */
-		connectsock = cp->fd;
-		DEBUGF(("-----------------------------------\n"));
-		DEBUGF(("SSL_CONNECT fd = %d\n", connectsock));
-		if (esock_ssl_connect(cp) < 0) {
-		    if (sock_errno() != ERRNO_BLOCK) {
-			/* Handshake failed */
-			DEBUGF(("ERROR: handshake: %s\n", ssl_errstr()));
-			reply(ESOCK_CONNECT_ERR, "4s", connectsock,
-			      ssl_errstr());
-			cp->state = ESOCK_DEFUNCT;
-		    }
-		} else {
-		    /* SSL connect handshake successful */
-		    DEBUGF(("-> CONNECTED\n"));
-		    reply(ESOCK_CONNECT_REP, "4", connectsock);
-		    cp->state = ESOCK_CONNECTED;
-		}
-		break;
-
-	    default:
-		DEBUGF(("ERROR: Connection in unknown state.\n"));
-	    }
-	}
-   }
-}
-
-static int set_poll_conns(Connection *cp, EsockPoll *ep, int verbose)
-{
-    int i = 0;
-    
-    if (verbose)
-	DEBUGF(("MASKS SET FOR FD: "));
-    while (cp) {
-	switch (cp->state) {
-	case ESOCK_ACTIVE_LISTENING:
-	    if (verbose)
-		DEBUGF(("%d (read) ", cp->fd));
-	    esock_poll_fd_set_read(ep, cp->fd);
-	    break;
-	case ESOCK_WAIT_CONNECT:
-	    if (verbose)
-		DEBUGF(("%d (write) ", cp->fd));
-	    esock_poll_fd_set_write(ep, cp->fd);
-#ifdef __WIN32__
-	    esock_poll_fd_set_exception(ep, cp->fd); /* Failure shows in exceptions */
-#endif
-	    break;
-	case ESOCK_SSL_CONNECT:
-	case ESOCK_SSL_ACCEPT:
-	    if (cp->ssl_want == ESOCK_SSL_WANT_READ) {
-		if (verbose)
-		    DEBUGF(("%d (read) ", cp->fd));
-		esock_poll_fd_set_read(ep, cp->fd);
-	    } else if (cp->ssl_want == ESOCK_SSL_WANT_WRITE) {
-		if (verbose)
-		    DEBUGF(("%d (write) ", cp->fd));
-		esock_poll_fd_set_write(ep, cp->fd);
-	    }
-	    break;
-	case ESOCK_JOINED:
-	    if (!cp->bp) {
-		if (cp->wq.len) {
-		    if (verbose)
-			DEBUGF(("%d (write) ", cp->fd));
-		    esock_poll_fd_set_write(ep, cp->fd);
-		} else if (!cp->proxy->eof) {
-		    if (verbose)
-			DEBUGF(("%d (read) ", cp->proxy->fd));
-		    esock_poll_fd_set_read(ep, cp->proxy->fd);
-		}
-	    }
-	    if (!cp->proxy->bp) {
-		if (cp->proxy->wq.len) {
-		    if (verbose)
-			DEBUGF(("%d (write) ", cp->proxy->fd));
-		    esock_poll_fd_set_write(ep, cp->proxy->fd);
-		} else if (!cp->eof) {
-		    if (verbose)
-			DEBUGF(("%d (read) ", cp->fd));
-		    esock_poll_fd_set_read(ep, cp->fd);
-		}
-	    }
-	    break;
-	case ESOCK_SSL_SHUTDOWN:
-	    if (cp->ssl_want == ESOCK_SSL_WANT_READ) {
-		if (verbose)
-		    DEBUGF(("%d (read) ", cp->fd));
-		esock_poll_fd_set_read(ep, cp->fd);
-	    } else if (cp->ssl_want == ESOCK_SSL_WANT_WRITE) {
-		if (verbose)
-		    DEBUGF(("%d (write) ", cp->fd));
-		esock_poll_fd_set_write(ep, cp->fd);
-	    }
-	    break;
-	default:
-	    break;
-	}
-	i++;
-	cp = cp->next;
-    }
-    if (verbose)
-	DEBUGF(("\n"));
-    return i;
-}
-
-
-static Connection *next_polled_conn(Connection *cp, Connection **cpnext,
-				    EsockPoll *ep, int set_wq_fds)
-{
-    while(cp) {
-	if (esock_poll_fd_isset_read(ep, cp->fd) ||
-	    (cp->proxy && esock_poll_fd_isset_read(ep, cp->proxy->fd)) ||
-	    (esock_poll_fd_isset_write(ep, cp->fd)) ||
-	    (cp->proxy && esock_poll_fd_isset_write(ep, cp->proxy->fd))
-#ifdef __WIN32__
-	    || esock_poll_fd_isset_exception(ep, cp->fd) /* Connect failure in WIN32 */
-#endif
-	    || (set_wq_fds && (cp->wq.len || 
-			       (cp->proxy && cp->proxy->wq.len)))
-	    || cp->errstr != NULL) {
-	    *cpnext = cp->next;
-	    return cp;
-	}
-	cp = cp->next;
-    }
-    *cpnext = NULL;
-    return NULL;
-}
-
-static void leave_joined_state(Connection *cp)
-{
-    shutdown(cp->proxy->fd, SHUTDOWN_ALL);
-    if (((cp->bp || cp->eof) && cp->clean) ||
-	(!cp->bp && !cp->eof)) {
-	DEBUGF(("-> SSL_SHUTDOWN\n"));
-	cp->state = ESOCK_SSL_SHUTDOWN;
-	cp->ssl_want = ESOCK_SSL_WANT_WRITE;
-	do_shutdown(cp);
-    } else if (cp->close) {
-	DEBUGF(("-> (removal)\n"));
-	close_and_remove_connection(cp);
-    } else {
-	DEBUGF(("-> DEFUNCT\n"));
-	cp->state = ESOCK_DEFUNCT;
-    }
-}
-
-/* We are always in state SHUTDOWN here */
-static void do_shutdown(Connection *cp)
-{
-    int ret;
-
-    ret = esock_ssl_shutdown(cp); 
-    if (ret < 0) {
-	if (sock_errno() == ERRNO_BLOCK) {
-	    return;
-	} else {
-	    /* Something is wrong -- close and remove or move to DEFUNCT */
-	    DEBUGF(("Error in SSL shutdown\n"));
-	    if (cp->close) {
-		DEBUGF(("-> (removal)\n"));
-		close_and_remove_connection(cp);
-	    } else {
-		DEBUGF(("-> DEFUNCT\n"));
-		cp->state = ESOCK_DEFUNCT;
-	    }
-	}
-    } else if (ret == 0) {
-	/* `close_notify' has been sent. Wait for reception of
-           same. */
-	return; 
-    } else if (ret == 1) {
-	/* `close_notify' has been sent, and received. */
-	if (cp->close) {
-	    DEBUGF(("-> (removal)\n"));
-	    close_and_remove_connection(cp);
-	} else {
-	    DEBUGF(("-> DEFUNCT\n"));
-	    cp->state = ESOCK_DEFUNCT;
-	}
-    }
-}
-
-static void close_and_remove_connection(Connection *cp)
-{
-    safe_close(cp->fd);
-    remove_connection(cp);
-}
-
-static int reply(int cmd, char *fmt, ...)
-{
-    static unsigned char replybuf[MAXREPLYBUF];
-    unsigned char *buf = replybuf;
-    va_list args;
-    int len;
-
-    va_start(args, fmt);
-    len = put_pars(NULL, fmt, args);
-    va_end(args);
-    len++;
-    if (len > sizeof(replybuf))
-	buf = esock_malloc(len);
-
-    PUT_INT8(cmd, buf);
-    va_start(args, fmt);
-    (void) put_pars(buf + 1, fmt, args);
-    va_end(args);
-    write_ctrl(buf, len);
-    if (buf != replybuf)
-	esock_free(buf);
-    return len;
-}
-
-static int input(char *fmt, ...)
-{
-    va_list args;
-    int len;
-
-    va_start(args, fmt);
-    len = get_pars(ebuf + 1, fmt, args);
-    va_end(args);
-    return len + 1;
-}
-
-static int put_pars(unsigned char *buf, char *fmt, va_list args)
-{
-    char *s, *str, *bin;
-    int val, len, pos = 0;
-
-    s = fmt;
-    while (*s) {
-	switch (*s) {
-	case '1':
-	    val = va_arg(args, int);
-	    if (buf)
-		PUT_INT8(val, buf + pos);
-	    pos++;
-	    break;
-	case '2':
-	    val = va_arg(args, int);
-	    if (buf)
-		PUT_INT16(val, buf + pos);
-	    pos += 2;
-	    break;
-	case '4':
-	    val = va_arg(args, int);
-	    if (buf)
-		PUT_INT32(val, buf + pos);
-	    pos += 4;
-	    break;
-	case 's':		/* string */
-	    str = va_arg(args, char *);
-	    if (buf)
-		strcpy((char *)(buf + pos), str);
-	    pos += strlen(str) + 1;
-	    break;
-	case 'b':		/* binary */
-	    len = va_arg(args, int);
-	    if (buf)
-		PUT_INT32(len, buf + pos);
-	    pos += 4;
-	    bin = va_arg(args, char *);
-	    if (buf)
-		memcpy(buf + pos, bin, len);
-	    pos += len;
-	    break;
-	default:
-	    fprintf(stderr, "esock: Invalid format character: %c\n", *s);
-	    exit(EXIT_FAILURE);
-	    break;
-	}
-	s++;
-    }
-    return pos;
-}
-
-
-static int get_pars(unsigned char *buf, char *fmt, va_list args)
-{
-    int *ip;
-    char *s, **strp, **bin;
-    int pos = 0;
-
-    s = fmt;
-    while (*s) {
-	switch (*s) {
-	case '1':
-	    ip = va_arg(args, int *);
-	    *ip = GET_INT8(buf + pos);
-	    pos++;
-	    break;
-	case '2':
-	    ip = va_arg(args, int *);
-	    *ip = GET_INT16(buf + pos);
-	    pos += 2;
-	    break;
-	case '4':
-	    ip = va_arg(args, int *);
-	    *ip = GET_INT32(buf + pos);
-	    pos += 4;
-	    break;
-	case 's':
-	    strp = va_arg(args, char **);
-	    *strp = (char *)(buf + pos);
-	    pos += strlen(*strp) + 1;
-	    break;
-	case 'b':
-	    ip = va_arg(args, int *);
-	    *ip = GET_INT32(buf + pos);
-	    pos += 4;
-	    bin = va_arg(args, char **);
-	    *bin = (char *)(buf + pos);
-	    pos += *ip;
-	    break;
-	default:
-	    fprintf(stderr, "esock: Invalid format character: %c\n", *s);
-	    exit(EXIT_FAILURE);
-	    break;
-	}
-	s++;
-    }
-    return pos;
-}
-
-static FD do_connect(char *lipstring, int lport, char *fipstring, int fport)
-{
-    struct sockaddr_in sock_addr;
-    long inaddr;
-    FD fd;
-   
-    if ((fd = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_FD) {
-	DEBUGF(("Error calling socket()\n"));
-	return fd;
-    }
-    if (check_num_sock_fds(fd) < 0) 
-	return INVALID_FD;
-    DEBUGF(("  fd = %d\n", fd));
-
-    /* local */
-    if ((inaddr = inet_addr(lipstring)) == INADDR_NONE) {
-	DEBUGF(("Error in inet_addr(): lipstring = %s\n", lipstring));
-	safe_close(fd);
-	sock_set_errno(ERRNO_ADDRNOTAVAIL);
-	return INVALID_FD;
-    }
-    memset(&sock_addr, 0, sizeof(sock_addr));
-    sock_addr.sin_family = AF_INET;
-    sock_addr.sin_addr.s_addr = inaddr;
-    sock_addr.sin_port = htons(lport);
-    if(bind(fd, (struct sockaddr*) &sock_addr, sizeof(sock_addr)) < 0) {
-	DEBUGF(("Error in bind()\n"));
-	safe_close(fd);
-	/* XXX Set error code for bind error */
-	return INVALID_FD;
-    }
-
-    /* foreign */
-    if ((inaddr = inet_addr(fipstring)) == INADDR_NONE) {
-	DEBUGF(("Error in inet_addr(): fipstring = %s\n", fipstring));
-	safe_close(fd);
-	sock_set_errno(ERRNO_ADDRNOTAVAIL);
-	return INVALID_FD;
-    }
-    memset(&sock_addr, 0, sizeof(sock_addr));
-    sock_addr.sin_family = AF_INET;
-    sock_addr.sin_addr.s_addr = inaddr;
-    sock_addr.sin_port = htons(fport);
-
-    SET_NONBLOCKING(fd);
-
-    if(connect(fd, (struct sockaddr*)&sock_addr, sizeof(sock_addr)) < 0) {
-	if (sock_errno() != ERRNO_PROGRESS && /* UNIX */
-	    sock_errno() != ERRNO_BLOCK) { /* WIN32 */
-	    DEBUGF(("Error in connect()\n"));
-	    safe_close(fd);
-	    return INVALID_FD;
-	}
-    }
-    return fd;
-}
-
-static FD do_listen(char *ipstring, int lport, int backlog, int *aport)
-{
-    static int one = 1;		/* Type must be int, not long */
-    struct sockaddr_in sock_addr;
-    long inaddr;
-    int length;
-    FD fd;
-    
-    if ((fd = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_FD) {
-	DEBUGF(("Error calling socket()\n"));
-	return fd;
-    }
-    if (check_num_sock_fds(fd) < 0) 
-	return INVALID_FD;
-    DEBUGF(("  fd = %d\n", fd));
-    if ((inaddr = inet_addr(ipstring)) == INADDR_NONE) {
-	DEBUGF(("Error in inet_addr(): ipstring = %s\n", ipstring));
-	safe_close(fd);
-	sock_set_errno(ERRNO_ADDRNOTAVAIL);
-	return INVALID_FD;
-    }
-    memset(&sock_addr, 0, sizeof(sock_addr));
-    sock_addr.sin_family = AF_INET;
-    sock_addr.sin_addr.s_addr = inaddr;
-    sock_addr.sin_port = htons(lport);
-
-    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(one));
-
-    if(bind(fd, (struct sockaddr*) &sock_addr, sizeof(sock_addr)) < 0) {
-	DEBUGF(("Error in bind()\n"));
-	safe_close(fd);
-	return INVALID_FD;
-    }
-    if (listen(fd, backlog) < 0) {
-	DEBUGF(("Error in listen()\n"));
-	safe_close(fd);
-	return INVALID_FD;
-    }
-    /* find out assigned local port number */
-    length = sizeof(sock_addr);
-    if (getsockname(fd, (struct sockaddr *)&sock_addr, &length) < 0) {
-	DEBUGF(("Error in getsockname()\n"));
-	safe_close(fd);
-	return INVALID_FD;
-    }
-    if (aport)
-	*aport = ntohs(sock_addr.sin_port);
-    return fd;
-}
-
-static FD do_accept(FD listensock, struct sockaddr *saddr, int *len)
-{
-    FD fd;
-
-    if ((fd = accept(listensock, saddr, len)) == INVALID_FD) {
-	DEBUGF(("Error calling accept()\n"));
-	return fd;
-    }
-    if (check_num_sock_fds(fd) < 0) 
-	return INVALID_FD;
-    return fd;
-}
-
-static Connection *new_connection(int state, FD fd)
-{
-    Connection *cp;
-    
-    if (!(cp = esock_malloc(sizeof(Connection))))
-	return NULL;
-    cp->state = state;
-    cp->acceptors = 0;
-    cp->fd = fd;
-    cp->listen_fd = INVALID_FD;
-    cp->proxy = NULL;
-    cp->opaque = NULL;
-    cp->ssl_want = 0;
-    cp->eof = 0;
-    cp->bp = 0;
-    cp->clean = 0;		/* XXX Used? */
-    cp->close = 0;
-    cp->origin = -1;
-    cp->flags = NULL;
-    cp->logfp = NULL;
-    cp->wq.size = 0;
-    cp->wq.buf = NULL;
-    cp->wq.len = 0;
-    cp->wq.offset = 0;
-    cp->next = connections;
-    cp->errstr = NULL;
-    connections = cp;
-    return cp;
-}
-
-
-static void print_connections(void)
-{
-    if (debug) {
-	Connection *cp = connections;
-	DEBUGF(("CONNECTIONS:\n"));
-	while (cp) {
-	    if (cp->state == ESOCK_JOINED) {
-		DEBUGF((" - %s [%8p] (origin = %s)\n"
-			"       (fd = %d, eof = %d, wq = %d, bp = %d)\n"
-			"       (proxyfd = %d, eof = %d, wq = %d, bp = %d)\n", 
-		       connstr[cp->state], cp, originstr[cp->origin],
-			cp->fd, cp->eof, cp->wq.len, cp->bp,
-			cp->proxy->fd, cp->proxy->eof, cp->proxy->wq.len, 
-			cp->proxy->bp));
-	    } else if (cp->state == ESOCK_ACTIVE_LISTENING) {
-		DEBUGF((" - %s [%8p] (fd = %d, acceptors = %d)\n", 
-		       connstr[cp->state], cp, cp->fd, cp->acceptors));
-	    } else {
- 		DEBUGF((" - %s [%8p] (fd = %d)\n", connstr[cp->state], cp, 
-		       cp->fd));
-	    }
-	    cp= cp->next;
-	}
-    }
-}
-
-static void dump_connections(void)
-{
-    Connection *cp = connections;
-    Proxy      *pp = proxies;
-    time_t t = time(NULL);
-    int length = 0;
-    struct sockaddr_in iserv_addr;
-
-    __debugprintf("CONNECTIONS %s", ctime(&t));
-    while (cp) {
-	if (cp->state == ESOCK_JOINED) {
-	    __debugprintf(" - %s [%8p] (origin = %s)\n"
-			  "       (fd = %d, eof = %d, wq = %d, bp = %d), close = %d\n"
-			  "       (proxyfd = %d, eof = %d, wq = %d, bp = %d)\n", 
-			  connstr[cp->state], cp, originstr[cp->origin],
-			  cp->fd, cp->eof, cp->wq.len, cp->bp, cp->close,
-			  cp->proxy->fd, cp->proxy->eof, cp->proxy->wq.len, 
-			  cp->proxy->bp);
-	} else if (cp->state == ESOCK_ACTIVE_LISTENING) {
-	    __debugprintf(" - %s [%8p] (fd = %d, acceptors = %d)\n", 
-			  connstr[cp->state], cp, cp->fd, cp->acceptors);
-	} else {
-	    __debugprintf(" - %s [%8p] (fd = %d)\n", connstr[cp->state], cp, 
-			  cp->fd);
-	}
-	length = sizeof(iserv_addr);
-	if ((cp->state == ESOCK_ACTIVE_LISTENING) ||
-	    (cp->state == ESOCK_PASSIVE_LISTENING)) {
-	    getsockname(cp->fd, (struct sockaddr *) &iserv_addr, &length);
-	    __debugprintf("       (ip = %s, port = %d)\n",
-			  inet_ntoa(iserv_addr.sin_addr),
-			  ntohs(iserv_addr.sin_port));
-	}
-	else {
-	    getsockname(cp->fd, (struct sockaddr *) &iserv_addr, &length);
-	    __debugprintf("       (local_ip = %s, local_port = %d)\n",
-			  inet_ntoa(iserv_addr.sin_addr),
-			  ntohs(iserv_addr.sin_port));
-	    length = sizeof(iserv_addr);
-	    getpeername(cp->fd, (struct sockaddr *) &iserv_addr, &length);
-	    __debugprintf("       (remote_ip = %s, remote_port = %d)\n",
-			  inet_ntoa(iserv_addr.sin_addr),
-			  ntohs(iserv_addr.sin_port));
-	}
-	cp=cp->next;
-    }
-  
-    __debugprintf("PROXIES\n");
-    while (pp) {
-	__debugprintf(" - fd = %d [%8p] (external_fd = %d, peer_port = %d,"
-		      " eof = %d)\n", pp->fd, pp, pp->conn->fd, pp->peer_port,
-		      pp->eof);
-    
-	pp= pp->next;
-    }
-}
-
-static Connection *get_connection(FD fd)
-{
-    Connection *cp = connections;
-    
-    while(cp) {
-	if(cp->fd == fd)
-	    return cp;
-	cp = cp->next;
-    }
-    return NULL;
-}
-
-/* 
- * Remove a connection from the list of connection, close the proxy
- * socket and free all resources. The main socket (fd) is *not* 
- * closed here, because the closing of that socket has to be synchronized
- * with the Erlang process controlling this port program.
- */
-static void remove_connection(Connection *conn)
-{
-    Connection **prev = &connections;
-    Connection *cp = connections; 
-    
-    while (cp) {
-	if(cp == conn) {
-	    DEBUGF(("remove_connection: fd = %d\n", cp->fd));
-	    esock_ssl_free(cp);	/* frees cp->opaque only */
-	    esock_free(cp->flags);
-	    closelog(cp->logfp); /* XXX num_sock_fds */
-	    esock_free(cp->wq.buf);
-	    if (cp->proxy) {
-		safe_close(cp->proxy->fd);
-		remove_proxy(cp->proxy);
-	    }
-	    *prev = cp->next;
-	    esock_free(cp);
-	    return;
-	}
-	prev = &cp->next;
-	cp = cp->next;
-    }
-}
-
-static Proxy *get_proxy_by_peerport(int port)
-{
-    Proxy *p = proxies;
-
-    while(p) {
-	if (p->peer_port == port)
-	    return p;
-	p = p->next;
-    }
-    return NULL;
-}
-
-static Proxy *new_proxy(FD fd)
-{
-    Proxy *p;
-
-    if (!(p = esock_malloc(sizeof(Proxy))))
-	return NULL;
-
-    p->fd = fd;
-    p->peer_port = -1;
-    p->eof = 0;
-    p->bp = 0;
-    p->conn = NULL;
-    p->wq.size = 0;
-    p->wq.buf = NULL;
-    p->wq.len = 0;
-    p->wq.offset = 0;
-    p->next = proxies;
-    proxies = p;
-    return p;
-}
-
-static void remove_proxy(Proxy *proxy)
-{
-    Proxy *p = proxies, **pp = &proxies;
-
-    while(p) {
-	if (p == proxy) {
-	    DEBUGF(("remove_proxyfd = %d\n", p->fd));
-	    esock_free(p->wq.buf);
-	    *pp = p->next;
-	    esock_free(p);
-	    return;
-	}
-	pp = &p->next;
-	p = p->next;
-    }
-}
-
-static int check_num_sock_fds(FD fd) 
-{
-    num_sock_fds++;		/* fd is valid */
-#ifdef USE_SELECT
-    if (num_sock_fds > FD_SETSIZE) {
-	num_sock_fds--;
-	sock_set_errno(ERRNO_MFILE);
-	safe_close(fd);
-	return -1;
-    }
-#endif
-    return 0;
-}
-
-static void safe_close(FD fd)
-{
-    int err;
-
-    err = sock_errno();
-    DEBUGF(("safe_close fd = %d\n", fd));
-    if (sock_close(fd) < 0) {
-	DEBUGF(("safe_close failed\n"));
-    } else {
-	num_sock_fds--;
-    }
-    sock_set_errno(err);
-}
-
-static void clean_up(void)
-{
-    Connection *cp, *cpnext;
-    Proxy *pp, *ppnext;
-
-    cp = connections;
-    while (cp) {
-	safe_close(cp->fd);
-	cpnext = cp->next;
-	remove_connection(cp);
-	cp = cpnext;
-    }
-    
-    pp = proxies;
-    while (pp) {
-	safe_close(pp->fd);
-	ppnext = pp->next;
-	remove_proxy(pp);
-	pp = ppnext;
-    }
-}
-
-static void ensure_write_queue(WriteQueue *wq, int size)
-{
-    if (wq->size < size) {
-	wq->buf = esock_realloc(wq->buf, size);
-	wq->size = size;
-    }
-}
-
-
-
-
-
-
-
diff --git a/lib/ssl/c_src/esock.h b/lib/ssl/c_src/esock.h
deleted file mode 100644
index 16c9faa530..0000000000
--- a/lib/ssl/c_src/esock.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/*<copyright>
- * <year>1999-2008</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.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-/*
- * Purpose:  Implementation of Secure Socket Layer (SSL).
- *
- */
-
-#ifndef ESOCK_H
-#define ESOCK_H
-
-#ifdef __WIN32__
-#include "esock_winsock.h"
-#endif
-#include <stdio.h>
-
-#ifdef __WIN32__
-#define INVALID_FD			INVALID_SOCKET
-
-#define sock_read(fd, buf, len)		recv((fd), (buf), (len), 0)
-#define sock_write(fd, buf, len)	send((fd), (buf), (len), 0)
-#define sock_close(fd)			closesocket(fd)
-#define sock_errno()			WSAGetLastError()
-#define sock_set_errno(err)		WSASetLastError(err)
-
-#define ERRNO_NONE			0
-#define ERRNO_BLOCK			WSAEWOULDBLOCK
-#define ERRNO_CONNREFUSED		WSAECONNREFUSED
-#define ERRNO_PROGRESS			WSAEINPROGRESS
-#define ERRNO_PROTONOSUPPORT		WSAEPROTONOSUPPORT
-#define ERRNO_INVAL			WSAEINVAL
-#define ERRNO_ADDRNOTAVAIL		WSAEADDRNOTAVAIL
-#define ERRNO_NOTSOCK			WSAENOTSOCK
-#define ERRNO_OPNOTSUPP			WSAEOPNOTSUPP
-#define ERRNO_MFILE			WSAEMFILE
-#define SET_BLOCKING(fd)	    do { \
-    					unsigned long zeroval = 0; \
-    					ioctlsocket((fd), FIONBIO, &zeroval); \
-				       } while (0)
-#define SET_NONBLOCKING(fd)	    do { \
-    					unsigned long oneval = 1; \
-    					ioctlsocket((fd), FIONBIO, &oneval); \
-				       } while (0)
-#else
-#define INVALID_FD			(-1)
-
-#define sock_read(fd, buf, len)		read((fd), (buf), (len))
-#define sock_write(fd, buf, len)	write((fd), (buf), (len))
-#define sock_close(fd)			close(fd)
-#define sock_errno()			errno
-#define sock_set_errno(err)		do {errno = (err);} while(0)
-
-#define ERRNO_NONE			0
-#define ERRNO_BLOCK			EAGAIN
-#define ERRNO_CONNREFUSED		ECONNREFUSED
-#define ERRNO_PROGRESS			EINPROGRESS
-#define ERRNO_PROTONOSUPPORT		EPROTONOSUPPORT
-#define ERRNO_INVAL			EINVAL
-#define ERRNO_ADDRNOTAVAIL		EADDRNOTAVAIL
-#define ERRNO_NOTSOCK			ENOTSOCK
-#define ERRNO_OPNOTSUPP			EOPNOTSUPP
-#define ERRNO_MFILE			EMFILE
-#define SET_BLOCKING(fd)        	fcntl((fd), F_SETFL, \
-                                      	fcntl((fd), F_GETFL, 0) & ~O_NONBLOCK)
-#define SET_NONBLOCKING(fd)     	fcntl((fd), F_SETFL, \
-                                      	fcntl((fd), F_GETFL, 0) | O_NONBLOCK)
-#endif
-
-#define GET_INT8(s)    ((s)[0])
-#define GET_INT16(s)   (((s)[0] << 8) | (s)[1])
-#define GET_INT32(s)   (((s)[0] << 24) | ((s)[1] << 16) | \
-			((s)[2] << 8) | (s)[3])
-
-#define PUT_INT8(x, s)  do { (s)[0] = x; } while(0)
-#define PUT_INT16(x, s) do { (s)[0] = ((x) >> 8) & 0xff; \
-			     (s)[1] = ((x) & 0xff); } while(0)
-#define PUT_INT32(x, s) do { (s)[0] = ((x) >> 24) & 0xff; \
-			     (s)[1] = ((x) >> 16) & 0xff; \
-			     (s)[2] = ((x) >> 8) & 0xff; \
-			     (s)[3] = (x) & 0xff; } while(0)
-
-/* type for Connections */
-#define ESOCK_STATE_NONE	0
-#define ESOCK_ACTIVE_LISTENING 	1
-#define ESOCK_PASSIVE_LISTENING 2
-#define ESOCK_CONNECTED		3
-#define ESOCK_WAIT_CONNECT	4
-#define ESOCK_SSL_CONNECT	5
-#define ESOCK_SSL_ACCEPT	6
-#define ESOCK_TRANSPORT_ACCEPT  7
-#define ESOCK_JOINED		8
-#define ESOCK_SSL_SHUTDOWN	9
-#define ESOCK_DEFUNCT	       10
-
-#ifdef __WIN32__
-    typedef SOCKET FD;
-#else
-    typedef int FD;
-#endif
-
-/* For the shutdown(fd, how) call */
-#ifdef __WIN32__
-#define SHUTDOWN_READ  SD_RECEIVE
-#define SHUTDOWN_WRITE SD_SEND
-#define SHUTDOWN_ALL   SD_BOTH
-#else
-#define SHUTDOWN_READ  0
-#define SHUTDOWN_WRITE 1
-#define SHUTDOWN_ALL   2
-#endif
-
-#define ORIG_LISTEN  0
-#define ORIG_ACCEPT  1
-#define ORIG_CONNECT 2
- 
-typedef struct {
-    int size;			/* Total size of buf */
-    unsigned char *buf;
-    int len;			/* Current number of bytes in buf */
-    int offset;			/* Bytes already written  */
-} WriteQueue;
-
-typedef struct _proxy Proxy;
-
-typedef struct Connection {
-    FD fd;
-    FD listen_fd;		/* Needed for async listen error */
-    unsigned char state;
-    int acceptors;		/* Count acceptors for listen socket */
-    Proxy *proxy;
-    void *opaque;		/* Any suitable ssl structure */
-    int ssl_want;		/* read/write flags */
-    int eof;			/* end of file (read) */
-    int bp;			/* broken pipe (write) */
-    int clean;			/* Clean SSL shutdown initiated */
-    int close;			/* Close if set */
-    int origin;			/* listen, accept or connect */
-    int encrypted;		/* 1 = SSL encrypted, 0 = normal, unencrypted tcp */
-    char *flags;		/* ssl parameters */
-    FILE *logfp;		/* connection log file (not used) */
-    WriteQueue wq;
-    struct Connection* next;
-    const char* errstr; 	/* only used to report errors from ssl_accept_init in SSL_ACCEPT */
-} Connection;
-
-struct _proxy {
-    FD fd;
-    int peer_port;
-    int eof;			/* end of file (read) */
-    int bp;			/* broken pipe (write) */
-    Connection *conn;
-    WriteQueue wq;
-    Proxy *next;
-};
-
-/* Commands, replies, and error responses */
-
-#define ESOCK_CONNECT_CMD	1
-#define ESOCK_CONNECT_WAIT_REP	2
-#define ESOCK_CONNECT_REP	3
-#define ESOCK_CONNECT_ERR	4
-
-#define ESOCK_TERMINATE_CMD	5
-#define ESOCK_CLOSE_CMD	        6
-
-#define ESOCK_LISTEN_CMD	7
-#define ESOCK_LISTEN_REP	8
-#define ESOCK_LISTEN_ERR	9
-
-#define ESOCK_TRANSPORT_ACCEPT_CMD 10
-#define ESOCK_NOACCEPT_CMD      11
-#define ESOCK_TRANSPORT_ACCEPT_REP 12
-#define ESOCK_TRANSPORT_ACCEPT_ERR 13
-
-#define ESOCK_FROMNET_CLOSE_REP 14
-
-#define ESOCK_CONNECT_SYNC_ERR	15
-#define ESOCK_LISTEN_SYNC_ERR	16
-
-#define ESOCK_PROXY_PORT_REP    23
-#define ESOCK_PROXY_JOIN_CMD	24
-#define ESOCK_PROXY_JOIN_REP	25
-#define ESOCK_PROXY_JOIN_ERR	26
-
-#define ESOCK_SET_SOCKOPT_CMD   27
-#define ESOCK_IOCTL_OK          28
-#define ESOCK_IOCTL_ERR		29
-
-#define ESOCK_GETPEERNAME_CMD   30
-#define ESOCK_GETPEERNAME_REP   31
-#define ESOCK_GETPEERNAME_ERR   32
-
-#define ESOCK_GETSOCKNAME_CMD   33
-#define ESOCK_GETSOCKNAME_REP   34
-#define ESOCK_GETSOCKNAME_ERR   35
-
-#define ESOCK_GETPEERCERT_CMD   36
-#define ESOCK_GETPEERCERT_REP   37
-#define ESOCK_GETPEERCERT_ERR   38
-
-#define ESOCK_GETVERSION_CMD    39
-#define ESOCK_GETVERSION_REP    40
-
-#define ESOCK_SET_SEED_CMD      41
-
-#define ESOCK_GETCONNINFO_CMD   42
-#define ESOCK_GETCONNINFO_REP   43
-#define ESOCK_GETCONNINFO_ERR   44
-
-#define ESOCK_SSL_ACCEPT_CMD     45
-#define ESOCK_SSL_ACCEPT_REP     46
-#define ESOCK_SSL_ACCEPT_ERR     47
-
-#define ESOCK_DUMP_STATE_CMD      48
-#define ESOCK_SET_DEBUG_CMD       49
-#define ESOCK_SET_DEBUGMSG_CMD    50
-
-
-/* Option codes  for ESOCK_SET_SOCKOPT_CMD */
-#define ESOCK_SET_TCP_NODELAY	1
-
-/* SSL want to read or write */
-#define ESOCK_SSL_WANT_READ	1
-#define ESOCK_SSL_WANT_WRITE	2
-
-/* Protocol version according to ssl_server */
-#define ESOCK_SSLv2		1
-#define ESOCK_SSLv3		2
-#define ESOCK_TLSv1		4
-
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ssl/c_src/esock_openssl.c b/lib/ssl/c_src/esock_openssl.c
deleted file mode 100644
index 2621c9934e..0000000000
--- a/lib/ssl/c_src/esock_openssl.c
+++ /dev/null
@@ -1,1213 +0,0 @@
-/*<copyright>
- * <year>1999-2008</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.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-/*
- * Purpose: Adaptions for the OpenSSL package.
- *
- * This file implements the functions defined in esock_ssl.h for
- * the OpenSSL package. 
- *
- * The following holds true for non-blockling I/O:
- *
- *   Function		Return values
- *   -------- 		-------------
- *   SSL_accept()       success: 1, failure: =<0
- *   SSL_connect()      success: 1, failure: =<0
- *   SSL_read()         success: >0, eof: 0, failure: <0 
- *   SSL_write()	success: > 0, failure: =<0 
- *   SSL_shutdown()	success: 1, not finished: 0
- *
- * If the return value of any of the above functions is `ret' and the
- * ssl connection is `ssl', the call
- *
- * 	ssl_error = SSL_get_error(ssl, ret);
- *
- * returns one of the following eight values:
- *
- *   SSL_ERROR_NONE			ret > 0
- *   SSL_ERROR_ZERO_RETURN		ret = 0
- *   SSL_ERROR_WANT_READ		ret < 0 and ssl wants to read
- *   SSL_ERROR_WANT_WRITE		ret < 0 and ssl wants to write
- *   SSL_ERROR_SYSCALL			ret < 0  or ret = 0
- *   SSL_ERROR_SSL			if there was an ssl internal error
- *   SSL_ERROR_WANT_X509_LOOKUP		ret < 0 and ssl wants x509 lookup 
- *   SSL_ERROR_WANT_CONNECT		ret < 0 and ssl wants connect
- *
- * It is the case that SSL_read() sometimes returns -1, even when the 
- * underlying file descriptor is ready for reading.
- * 
- * Also, sometimes we may have SSL_ERROR_SSL in SSL_accept() and SSL_connect()
- * when a retry should be done.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#ifndef __WIN32__
-# include <fcntl.h>
-# include <unistd.h>
-#endif
-
-#include "esock.h"
-#include "esock_ssl.h"
-#include "debuglog.h"
-#include "esock_utils.h"
-#include "esock_posix_str.h"
-
-#include <openssl/crypto.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-
-int ephemeral_rsa = 0;
-int ephemeral_dh = 0;		/* XXX Not used yet */
-int protocol_version = 0;
-
-char *esock_ssl_errstr = "";
-
-#define FLAGSBUFSIZE		512
-#define X509BUFSIZE		256
-#define DEFAULT_VERIFY_DEPTH	1
-
-#define SET_WANT(cp, ssl_error) \
-    switch((ssl_error)) { \
-    case SSL_ERROR_WANT_READ: \
-	(cp)->ssl_want = ESOCK_SSL_WANT_READ; \
-	break; \
-    case SSL_ERROR_WANT_WRITE: \
-	(cp)->ssl_want = ESOCK_SSL_WANT_WRITE; \
-	break; \
-    default: \
-    (cp)->ssl_want = 0; \
-	break; \
-    }
-
-#define RESET_ERRSTR() \
-    esock_ssl_errstr = "";
-
-#define MAYBE_SET_ERRSTR(s) \
-    if (!esock_ssl_errstr[0]) \
-	esock_ssl_errstr = (s);
-
-typedef struct {
-    int code;
-    char *text;
-} err_entry;
-
-typedef struct {
-    SSL_CTX *ctx;
-    char *passwd;
-    int verify_depth;
-} callback_data;
-
-static char *ssl_error_str(int error);
-static void end_ssl_call(int ret, Connection *cp, int ssl_error);
-static void check_shutdown(Connection *cp);
-static int set_ssl_parameters(Connection *cp, SSL_CTX *ctx);
-static int verify_callback(int ok, X509_STORE_CTX *ctx);
-static int passwd_callback(char *buf, int num, int rwflag, void *userdata);
-static void info_callback(const SSL *ssl, int where, int ret);
-static void callback_data_free(void *parent, void *ptr, 
-			       CRYPTO_EX_DATA *ad, 
-			       int idx, long arg1, void *argp);
-static RSA *tmp_rsa_callback(SSL *ssl, int is_export, int keylen);
-static void restrict_protocols(SSL_CTX *ctx);
-
-static err_entry errs[] = {    
-    {SSL_ERROR_NONE, "SSL_ERROR_NONE"},
-    {SSL_ERROR_ZERO_RETURN, "SSL_ERROR_ZERO_RETURN"}, 
-    {SSL_ERROR_WANT_READ, "SSL_ERROR_WANT_READ"}, 
-    {SSL_ERROR_WANT_WRITE, "SSL_ERROR_WANT_WRITE"}, 
-    {SSL_ERROR_SYSCALL, "SSL_ERROR_SYSCALL"},
-    {SSL_ERROR_SSL, "SSL_ERROR_SSL"},
-    {SSL_ERROR_WANT_X509_LOOKUP, "SSL_ERROR_WANT_X509_LOOKUP"},
-    {SSL_ERROR_WANT_CONNECT, "SSL_ERROR_WANT_CONNECT"}
-};
-
-static SSL_METHOD *method;	/* for listen and connect init */
-static char x509_buf[X509BUFSIZE]; /* for verify_callback */
-static int callback_data_index = -1; /* for ctx ex_data */
-static unsigned char randvec[1024]; /* XXX */
-
-#if defined(__WIN32__) || OPEN_MAX > 256
-# define FOPEN_WORKAROUND(var, expr) var = (expr)
-# define VOID_FOPEN_WORKAROUND(expr) expr
-#else
-/*
- * This is an ugly workaround. On Solaris, fopen() will return NULL if
- * it gets a file descriptor > 255. To avoid that, we'll make sure that
- * there is always one low-numbered file descriptor available when
- * fopen() is called.
- */
-static int reserved_fd;		/* Reserve a low-numbered file descriptor */
-# define USE_FOPEN_WORKAROUND 1
-
-# define FOPEN_WORKAROUND(var, expr)		\
-do {						\
-   close(reserved_fd);				\
-   var = (expr);				\
-   reserved_fd = open("/dev/null", O_RDONLY);	\
-} while (0)
-
-# define VOID_FOPEN_WORKAROUND(expr)		\
-do {						\
-   close(reserved_fd);				\
-   expr;					\
-   reserved_fd = open("/dev/null", O_RDONLY);	\
-} while (0)
-#endif
-
-esock_version *esock_ssl_version(void)
-{
-    static esock_version vsn;
-
-    vsn.compile_version = OPENSSL_VERSION_TEXT;
-    vsn.lib_version = SSLeay_version(SSLEAY_VERSION);
-    return &vsn;
-}
-
-char *esock_ssl_ciphers(void)
-{
-    SSL_CTX *ctx;
-    SSL *ssl;
-    char *ciphers;
-    const char *cp;
-    int i = 0, used = 0, len, incr = 1024;
-
-    if (!(ctx = SSL_CTX_new(method)))
-	return NULL;
-    restrict_protocols(ctx);
-    if (!(ssl = SSL_new(ctx))) {
-	SSL_CTX_free(ctx);
-	return NULL;
-    }
-
-    ciphers = esock_malloc(incr);
-    len = incr;
-    *ciphers = '\0';
-
-    while (1) {
-	if (!(cp = SSL_get_cipher_list(ssl, i)))
-	    break;
-	if (i > 0) {
-	    if (used == len) {
-		len += incr;
-		ciphers = esock_realloc(ciphers, len); 
-	    }
-	    strcat(ciphers, ":");
-	    used++;
-	}
-	if (strlen(cp) + used >= len) {
-	    len += incr;
-	    ciphers = esock_realloc(ciphers, len); 
-	}
-	strcat(ciphers, cp);
-	used += strlen(cp);
-	i++;
-    }
-    SSL_free(ssl);
-    SSL_CTX_free(ctx);
-    return ciphers;
-}
-
-void  esock_ssl_seed(void *buf, int len) 
-{
-    RAND_seed(buf, len);
-
-    /* XXX Maybe we should call RAND_status() and check if we have got
-     * enough randomness. 
-     */
-}
-
-int esock_ssl_init(void)
-{
-    method = SSLv23_method();	/* SSLv2, SSLv3 and TLSv1, may be restricted
-				 in listen and connect */
-    SSL_load_error_strings();
-    SSL_library_init();
-    esock_ssl_seed(randvec, sizeof(randvec));
-    callback_data_index = SSL_CTX_get_ex_new_index(0, "callback_data", 
-						 NULL, NULL, 
-						 callback_data_free);
-#ifdef USE_FOPEN_WORKAROUND
-    reserved_fd = open("/dev/null", O_RDONLY);
-    DEBUGF(("init: reserved_fd=%d\r\n", reserved_fd));
-#endif
-    return 0;
-}
-
-
-void esock_ssl_finish(void)
-{
-    /* Nothing */
-}
-
-
-void esock_ssl_free(Connection *cp)
-{
-    SSL *ssl = cp->opaque;
-    SSL_CTX *ctx;
-
-    if (ssl) {
-	ctx = SSL_get_SSL_CTX(ssl);
-	SSL_free(ssl);
-	if (cp->origin != ORIG_ACCEPT)
-	    SSL_CTX_free(ctx);
-	cp->opaque = NULL;
-    }
-}
-
-
-/*
- * Print SSL specific errors.
- */
-void esock_ssl_print_errors_fp(FILE *fp)
-{
-    ERR_print_errors_fp(fp);
-}
-
-
-int esock_ssl_accept_init(Connection *cp, void *listenssl)
-{
-    SSL_CTX *listenctx;
-    SSL *ssl;
-
-    RESET_ERRSTR();
-    MAYBE_SET_ERRSTR("esslacceptinit");
-
-    if(!listenssl) {
-	DEBUGF(("esock_ssl_accept_init: listenssl null\n"));
-	return -1;
-    }
-    if (!(listenctx = SSL_get_SSL_CTX(listenssl))) {
-	DEBUGF(("esock_ssl_accept_init: SSL_get_SSL_CTX\n"));
-	return -1;
-    }
-    if (!(ssl = cp->opaque = SSL_new(listenctx))) {
-	DEBUGF(("esock_ssl_accept_init: SSL_new(listenctx)\n"));
-	return -1;
-    }
-    SSL_set_fd(ssl, cp->fd);
-    return 0;
-
-}
-
-
-int esock_ssl_connect_init(Connection *cp)
-{
-    SSL_CTX *ctx;
-    SSL *ssl;
-
-    RESET_ERRSTR();
-    MAYBE_SET_ERRSTR("esslconnectinit");
-
-    if (!(ctx = SSL_CTX_new(method)))
-	return -1;
-    if (set_ssl_parameters(cp, ctx) < 0) {
-	SSL_CTX_free(ctx);
-	return -1;
-    }
-    restrict_protocols(ctx);
-    if (!(ssl = cp->opaque = SSL_new(ctx))) {
-	SSL_CTX_free(ctx);
-	return -1;
-    }
-    SSL_set_fd(ssl, cp->fd);
-    return 0;
-}
-
-
-int esock_ssl_listen_init(Connection *cp)
-{
-    SSL_CTX *ctx;
-    SSL *ssl;
-
-    RESET_ERRSTR();
-    MAYBE_SET_ERRSTR("essllisteninit");
-
-    if (!(ctx = SSL_CTX_new(method)))
-	return -1;
-    if (set_ssl_parameters(cp, ctx) < 0) {
-	SSL_CTX_free(ctx);
-	return -1;
-    }
-    restrict_protocols(ctx);
-
-    /* The allocation of ctx is for setting ssl parameters, so that
-     * accepts can inherit them. We allocate ssl to be able to
-     * refer to it via cp->opaque, but will not be used otherwise.
-     */
-    if (!(ssl = cp->opaque = SSL_new(ctx))) {
-	SSL_CTX_free(ctx);
-	return -1;
-    }
-    /* Set callback for temporary ephemeral RSA key generation.
-    * Note: for servers only. */
-    SSL_CTX_set_tmp_rsa_callback(ctx, tmp_rsa_callback);
-    return 0;
-}
-
-/* 
- * esock_ssl_accept(Connection *cp)
- *
- */
-int esock_ssl_accept(Connection *cp)
-{
-    int ret, ssl_error;
-    SSL *ssl = cp->opaque;
-
-    RESET_ERRSTR();
-
-    DEBUGF(("esock_ssl_accept: calling SSL_accept fd = %d\n"
-	    "  state before: %s\n", cp->fd, SSL_state_string(ssl)));
-    ret = SSL_accept(ssl);
-    DEBUGF(("  sock_errno %d errno %d \n", sock_errno(), errno));
-    ssl_error = SSL_get_error(ssl, ret);
-    DEBUGF(("  SSL_accept = %d\n"
-	    "  ssl_error: %s\n"
-	    "  state after: %s\n", 
-	    ret, ssl_error_str(ssl_error), SSL_state_string(ssl)));
-    DEBUGF(("    ret %d os error %s\n", ret, strerror(errno)));
-    if (ret > 0)
-	return ret;
-    else if (ret == 0) {
-	const char* f; int l; unsigned int e;
-	while ((e = ERR_get_error_line(&f, &l))) {
-	    DEBUGF(("    error %s:%d  %s\n", f, l, ssl_error_str(e)));
-	}
-	/* permanent accept error */
-	sock_set_errno(ERRNO_NONE);
-	MAYBE_SET_ERRSTR("esslaccept");
-	return -1;
-    }
-    end_ssl_call(ret, cp, ssl_error);
-    return ret;
-}
-
-/* 
- * esock_ssl_connect(Connection *cp)
- *
- */
-int esock_ssl_connect(Connection *cp)
-{
-    int ret, ssl_error;
-    SSL *ssl = cp->opaque;
-
-    RESET_ERRSTR();
-
-    DEBUGF(("esock_ssl_connect: calling SSL_connect fd = %d\n"
-	    "  state before: %s\n", cp->fd, SSL_state_string(ssl)));
-    ret = SSL_connect(ssl);
-    ssl_error = SSL_get_error(ssl, ret);
-    DEBUGF(("  SSL_connect() = %d\n"
-	    "  ssl_error: %s\n"
-	    "  state after: %s\n", 
-	    ret, ssl_error_str(ssl_error), SSL_state_string(ssl)));
-    if (ret > 0)
-	return ret;
-    else if (ret == 0) {
-	/* permanent connect error */
-	sock_set_errno(ERRNO_NONE);
-	MAYBE_SET_ERRSTR("esslconnect");
-	return -1;
-    }
-    end_ssl_call(ret, cp, ssl_error);
-    return ret;
-}
-
-
-int esock_ssl_session_reused(Connection *cp)
-{
-    SSL *ssl = cp->opaque;
-
-    return SSL_session_reused(ssl);
-}
-
-
-/* esock_ssl_read(Connection *cp, char *buf, int len)
- *
- * Read at most `len' chars into `buf'. Returns number of chars
- * read ( > 0), or 0 at EOF, or -1 on error. Sets cp->eof, cp->bp if
- * appropriate. 
- */
-
-int esock_ssl_read(Connection *cp, char *buf, int len)
-{
-    int ret, ssl_error;
-    SSL *ssl = cp->opaque;
-
-    RESET_ERRSTR();
-    DEBUGF(("esock_ssl_read: calling SSL_read fd = %d\n"
-	    "  state before: %s\n", cp->fd, SSL_state_string(ssl)));
-
-    ret = SSL_read(ssl, buf, len);
-    ssl_error = SSL_get_error(ssl, ret);
-
-    DEBUGF(("  SSL_read = %d\n"
-	    "  ssl_error: %s\n"
-	    "  state after: %s\n", 
-	    ret, ssl_error_str(ssl_error), SSL_state_string(ssl)));
-
-    if (ssl_error == SSL_ERROR_NONE) {
-	DEBUGMSGF(("message (hex) : [%3.*a]\n", ret, buf));
-	DEBUGMSGF(("message (char): [%3.*b]\n", ret, buf));
-    }
-    if (ret > 0)
-	return ret;
-    if (ret == 0) {
-	check_shutdown(cp);
-	return ret;
-    } 
-    end_ssl_call(ret, cp, ssl_error);
-    return ret;
-}
-
-/* 
- * esock_ssl_write(Connection *cp, char *buf, int len)
- *
- * Writes at most `len' chars from `buf'. Returns number of chars
- * written, or -1 on error.
- */
-int esock_ssl_write(Connection *cp, char *buf, int len)
-{
-    int ret, ssl_error;
-    SSL *ssl = cp->opaque;
-
-    RESET_ERRSTR();
-    DEBUGF(("esock_ssl_write: calling SSL_write fd = %d\n"
-	    "  state before: %s\n", cp->fd, SSL_state_string(ssl)));
-    ret = SSL_write(ssl, buf, len);
-    ssl_error = SSL_get_error(ssl, ret);
-    DEBUGF(("  SSL_write = %d\n"
-	    "  ssl_error: %s\n"
-	    "  state after: %s\n", 
-	    ret, ssl_error_str(ssl_error), SSL_state_string(ssl)));
-    if (ssl_error == SSL_ERROR_NONE) {
-	DEBUGMSGF(("message (hex) : [%3.*a]\n", ret, buf));
-	DEBUGMSGF(("message (char): [%3.*b]\n", ret, buf));
-    }
-    if (ret > 0)
-	return ret;
-    if (ret == 0) {
-	check_shutdown(cp);
-	return ret;
-    } 
-    end_ssl_call(ret, cp, ssl_error);
-    return ret;
-}
-
-
-int esock_ssl_shutdown(Connection *cp)
-{
-    int ret, ssl_error;
-    SSL *ssl = cp->opaque;
-
-    RESET_ERRSTR();
-    DEBUGF(("esock_ssl_shutdown: calling SSL_shutdown fd = %d\n"
-    "  state before: %s\n",  cp->fd, SSL_state_string(ssl)));
-    ret = SSL_shutdown(ssl);
-    ssl_error = SSL_get_error(ssl, ret);
-    DEBUGF(("  SSL_shutdown = %d\n"
-	    "  ssl_error: %s\n"
-	    "  state after: %s\n",
-	    ret, ssl_error_str(ssl_error), SSL_state_string(ssl)));
-    if (ret >= 0) {
-	check_shutdown(cp);
-	return ret;
-    }
-    end_ssl_call(ret, cp, ssl_error);
-    return ret;
-}
-
-
-/* Returns total number of bytes in DER encoded cert pointed to by
- * *buf, which is allocated by this function, unless return < 0.  
- * XXX X509_free ??
- */
-int esock_ssl_getpeercert(Connection *cp, unsigned char **buf)
-{
-    int len;
-    SSL *ssl = cp->opaque;
-    X509 *x509;
-    unsigned char *tmp;
-
-    RESET_ERRSTR();
-    if((x509 = SSL_get_peer_certificate(ssl)) == NULL) {
-	MAYBE_SET_ERRSTR("enopeercert"); /* XXX doc */
-	return -1;
-    }
-    
-    if ((len = i2d_X509(x509, NULL)) <= 0) {
-	MAYBE_SET_ERRSTR("epeercert");
-	return -1;
-    }
-
-    tmp = *buf = esock_malloc(len);
-
-    /* We must use a temporary value here, since i2d_X509(X509 *x,
-     * unsigned char **out) increments *out.  
-     */
-    if (i2d_X509(x509, &tmp) < 0) {
-	esock_free(tmp);
-	MAYBE_SET_ERRSTR("epeercert");
-	return -1;
-    }
-    return len;
-}
-
-/* Returns total number of bytes in chain of certs. Each cert begins
- * with a 4-bytes length. The last cert is ended with 4-bytes of
- * zeros. The result is returned in *buf, which is allocated unless
- * the return value is < 0.  
- * XXX X509_free ? sk_X509_free ? 
- * XXX X509_free is reference counting.
- */
-int esock_ssl_getpeercertchain(Connection *cp, unsigned char **buf)
-{
-    SSL *ssl = cp->opaque;
-    STACK_OF(X509) *x509_stack;
-    X509 *x509;
-    int num, i, totlen, pos, *der_len;
-    unsigned char *vbuf;
-
-    RESET_ERRSTR();
-    if((x509_stack = SSL_get_peer_cert_chain(ssl)) == NULL) {
-	MAYBE_SET_ERRSTR("enopeercertchain"); /* XXX doc */
-	return -1;
-    }
-    
-    num = sk_X509_num(x509_stack);
-    der_len = esock_malloc(num * sizeof(int));
-    totlen = 0;
-
-    for (i = 0; i < num; i++) {
-	x509 = sk_X509_value(x509_stack, i);
-	totlen += 4;
-	if ((der_len[i] = i2d_X509(x509, NULL)) < 0) {
-	    MAYBE_SET_ERRSTR("epeercertchain");
-	    esock_free(der_len);
-	    return -1;
-	}
-	totlen += der_len[i];
-    }
-    totlen += 4;
-
-    vbuf = *buf = esock_malloc(totlen);
-    pos = 0;
-
-    for (i = 0; i < num; i++) {
-	x509 = sk_X509_value(x509_stack, i);
-	PUT_INT32(der_len[i], vbuf);
-	vbuf += 4;
-	/* Note: i2d_X509 increments vbuf */
-	if (i2d_X509(x509, &vbuf) < 0) {
-	    MAYBE_SET_ERRSTR("epeercertchain");
-	    esock_free(*buf);
-	    esock_free(der_len);
-	    return -1;
-	}
-    }
-    esock_free(der_len);
-    return totlen;
-}
-
-
-int esock_ssl_getprotocol_version(Connection *cp, char **buf)
-{
-    SSL *ssl = cp->opaque;
-
-    RESET_ERRSTR();
-    if (!ssl) {
-	MAYBE_SET_ERRSTR("enoent");
-	return -1;
-    }
-    *buf = (char *) SSL_get_version(ssl);
-
-    return 0;
-}
-
-
-int esock_ssl_getcipher(Connection *cp, char **buf)
-{
-    SSL *ssl = cp->opaque;
-
-    RESET_ERRSTR();
-    if (!ssl) {
-	MAYBE_SET_ERRSTR("enoent");
-	return -1;
-    }
-    *buf = (char *) SSL_get_cipher(ssl);
-
-    return 0;
-}
-
-/* Local functions */
-
-static char *ssl_error_str(int ssl_error)
-{
-    int i;
-    static char buf[128];
-
-    for (i = 0; i < sizeof(errs)/sizeof(err_entry); i ++) {
-	if (ssl_error == errs[i].code)
-	    return errs[i].text;
-    }
-    sprintf(buf, "esock_openssl: SSL_error unknown: %d", ssl_error);
-    return buf;
-}
-
-void end_ssl_call(int ret, Connection *cp, int ssl_error)
-{
-    SET_WANT(cp, ssl_error);
-    switch (ssl_error) {
-    case SSL_ERROR_SYSCALL:
-	/* Typically sock_errno() is equal to ERRNO_BLOCK */
-	MAYBE_SET_ERRSTR(esock_posix_str(sock_errno()));
-	break;
-    case SSL_ERROR_SSL:
-	sock_set_errno(ERRNO_NONE);
-	MAYBE_SET_ERRSTR("esslerrssl");
-	break;
-    case SSL_ERROR_WANT_X509_LOOKUP:
-	SSLDEBUGF();
-	sock_set_errno(ERRNO_NONE);
-	MAYBE_SET_ERRSTR("ex509lookup");
-	break;
-    case SSL_ERROR_WANT_CONNECT:
-	SSLDEBUGF();
-	sock_set_errno(ERRNO_NONE);
-	MAYBE_SET_ERRSTR("ewantconnect");
-	break;
-    default:
-	break;
-    }
-}
-
-void check_shutdown(Connection *cp) 
-{
-    int sd_mode;
-    SSL *ssl = cp->opaque;
-
-    sd_mode = SSL_get_shutdown(ssl);
-    if (sd_mode & SSL_RECEIVED_SHUTDOWN)
-	cp->eof = 1;
-    if (sd_mode & SSL_SENT_SHUTDOWN) {
-	DEBUGF(("check_shutdown SSL_SENT_SHUTDOWN\n"));
-	cp->bp = 1;
-    }
-}
-
-/* 
- * set_ssl_parameters
- *
- * Set ssl parameters from connection structure. Only called for
- * listen and connect. 
- *
- * Note: The -cacertdir option is not documented.
- */
-static int set_ssl_parameters(Connection *cp, SSL_CTX *ctx)
-{
-    char *cacertfile = NULL, *cacertdir = NULL, *certfile = NULL;
-    char *keyfile = NULL, *ciphers = NULL, *password = NULL;
-    int verify = 0, verify_depth = DEFAULT_VERIFY_DEPTH, verify_mode;
-    int i, argc;
-    char **argv;
-    callback_data *cb_data;
-
-    RESET_ERRSTR();
-
-    argc = esock_build_argv(cp->flags, &argv);
-
-    DEBUGF(("Argv:\n"));
-    for (i = 0; i < argc; i++) {
-	DEBUGF(("%d:  %s\n", i, argv[i]));
-    }
-
-    for (i = 0; i < argc; i++) {
-	if (strcmp(argv[i], "-verify") == 0) {
-	    verify = atoi(argv[++i]);
-	} else if (strcmp(argv[i], "-depth") == 0) {
-	    verify_depth = atoi(argv[++i]);
-	} else if (strcmp(argv[i], "-log") == 0) {
-	    /* XXX  ignored: logging per connection not supported */
-	    i++;
-	} else if (strcmp(argv[i], "-certfile") == 0) {
-	    certfile = argv[++i];
-	} else if (strcmp(argv[i], "-keyfile") == 0) {
-	    keyfile = argv[++i];
-	} else if (strcmp(argv[i], "-password") == 0) {
-	    password = argv[++i];
-	} else if (strcmp(argv[i], "-cacertfile") == 0) {
-	    cacertfile = argv[++i];
-	} else if (strcmp(argv[i], "-cacertdir") == 0) {
-	    cacertdir = argv[++i];
-	} else if (strcmp(argv[i], "-d") == 0) {
-	    /* XXX  ignored: debug per connection not supported */
-	    i++;
-	} else if (strcmp(argv[i], "-ciphers") == 0) {
-	    ciphers = argv[++i];
-	} else {
-	    /* XXX Error: now ignored */
-	}
-    }
-    DEBUGF(("set_ssl_parameters: all arguments read\n"));
-
-    if (cp->origin == ORIG_LISTEN && !certfile) {
-	DEBUGF(("ERROR: Server must have certificate\n"));
-	MAYBE_SET_ERRSTR("enoservercert");
-	goto err_end;
-    }
-
-    /* Define callback data */
-    /* XXX Check for NULL */
-    cb_data = esock_malloc(sizeof(callback_data));
-    cb_data->ctx = ctx;
-    if (password) {
-	cb_data->passwd = esock_malloc(strlen(password) + 1);
-	strcpy(cb_data->passwd, password);
-    } else
-	cb_data->passwd = NULL;
-    cb_data->verify_depth = verify_depth;
-    SSL_CTX_set_ex_data(ctx, callback_data_index, cb_data);
-
-    /* password callback */
-    SSL_CTX_set_default_passwd_cb(ctx, passwd_callback);
-    SSL_CTX_set_default_passwd_cb_userdata(ctx, cb_data);
-
-    /* Set location for "trusted" certificates */
-    if (cacertfile || cacertdir) {
-	int res;
-	DEBUGF(("set_ssl_parameters: SSL_CTX_load_verify_locations\n"));
-	FOPEN_WORKAROUND(res, SSL_CTX_load_verify_locations(ctx, cacertfile,
-							    cacertdir));
-	if (!res) {
-	    DEBUGF(("ERROR: Cannot load verify locations\n"));
-	    MAYBE_SET_ERRSTR("ecacertfile");
-	    goto err_end;
-	}
-    } else {
-	int res;
-	DEBUGF(("set_ssl_parameters: SSL_CTX_set_default_verify_paths\n"));
-	FOPEN_WORKAROUND(res, SSL_CTX_set_default_verify_paths(ctx));
-	if (!res) {
-	    DEBUGF(("ERROR: Cannot set default verify paths\n"));
-	    MAYBE_SET_ERRSTR("ecacertfile");
-	    goto err_end;
-	}
-    }
-
-    /* For a server the following sets the list of CA distinguished
-     * names that it sends to its client when it requests the
-     * certificate from the client.  
-     * XXX The names of certs in cacertdir ignored.  
-     */
-    if (cp->origin == ORIG_LISTEN && cacertfile) {
-	DEBUGF(("set_ssl_parameters: SSL_CTX_set_client_CA_list\n"));
-	VOID_FOPEN_WORKAROUND(SSL_CTX_set_client_CA_list(ctx,
-			           SSL_load_client_CA_file(cacertfile)));
-	if (!SSL_CTX_get_client_CA_list(ctx)) {
-	    DEBUGF(("ERROR: Cannot set client CA list\n"));
-	    MAYBE_SET_ERRSTR("ecacertfile");
-	    goto err_end;
-	}
-    }
-
-    /* Use certificate file if key file has not been set. */
-    if (!keyfile)
-	keyfile = certfile;
-
-    if (certfile) {
-	int res;
-	DEBUGF(("set_ssl_parameters: SSL_CTX_use_certificate_file\n"));
-	FOPEN_WORKAROUND(res, SSL_CTX_use_certificate_file(ctx, certfile,
-							   SSL_FILETYPE_PEM));
-	if (res <= 0) {
-	    DEBUGF(("ERROR: Cannot set certificate file\n"));
-	    MAYBE_SET_ERRSTR("ecertfile");
-	    goto err_end;
-	}
-    }
-    if (keyfile) { 
-	int res;
-	DEBUGF(("set_ssl_parameters: SSL_CTX_use_PrivateKey_file\n"));
-	FOPEN_WORKAROUND(res, SSL_CTX_use_PrivateKey_file(ctx, keyfile, 
-					SSL_FILETYPE_PEM));
-	if (res <= 0) {
-	    DEBUGF(("ERROR: Cannot set private key file\n"));
-	    MAYBE_SET_ERRSTR("ekeyfile");
-	    goto err_end;
-	}
-    }
-    if(certfile && keyfile) {
-	DEBUGF(("set_ssl_parameters: SSL_CTX_check_private_key\n"));
-	if (!SSL_CTX_check_private_key(ctx)) {
-	    DEBUGF(("ERROR: Private key does not match the certificate\n")); 
-	    MAYBE_SET_ERRSTR("ekeymismatch");
-	    goto err_end;
-	}
-    }    
-
-    /* Ciphers */
-    if (ciphers) {
-	DEBUGF(("set_ssl_parameters: SSL_CTX_set_cipher_list\n"));
-	if (!SSL_CTX_set_cipher_list(ctx, ciphers)) {
-	    DEBUGF(("ERROR: Cannot set cipher list\n"));
-	    MAYBE_SET_ERRSTR("ecipher");
-	    goto err_end;
-	}
-    }
-
-    /* Verify depth */
-    DEBUGF(("set_ssl_parameters: SSL_CTX_set_verify_depth (depth = %d)\n", 
-	    verify_depth)); 
-    SSL_CTX_set_verify_depth(ctx, verify_depth);
-
-    /* Verify mode and callback */
-    /* XXX Why precisely these modes? */
-    switch (verify) {
-    case 0:
-	verify_mode = SSL_VERIFY_NONE;
-	break;
-    case 1:
-	verify_mode = SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE;
-	break;
-    case 2:
-	verify_mode = SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE|
-	    SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
-	break;
-    default:
-	verify_mode = SSL_VERIFY_NONE;
-    }
-    DEBUGF(("set_ssl_parameters: SSL_CTX_set_verify (verify = %d)\n", 
-	    verify)); 
-    SSL_CTX_set_verify(ctx, verify_mode, verify_callback);
-
-    /* Session id context. Should be an option really. */
-    if (cp->origin == ORIG_LISTEN) {
-	unsigned char *sid = "Erlang/OTP/ssl";
-	SSL_CTX_set_session_id_context(ctx, sid, strlen(sid));
-    }
-
-    /* info callback */
-    if (debug) 
-	SSL_CTX_set_info_callback(ctx, info_callback);
-
-    DEBUGF(("set_ssl_parameters: done\n"));
-    /* Free arg list */
-    for (i = 0; argv[i]; i++)
-	esock_free(argv[i]);
-    esock_free(argv);
-    return 0;
-
- err_end:
-    DEBUGF(("set_ssl_parameters: error\n"));
-    /* Free arg list */
-    for (i = 0; argv[i]; i++)
-	esock_free(argv[i]);
-    esock_free(argv);
-    return -1;
-}
-
-/* Call back functions */
-
-static int verify_callback(int ok, X509_STORE_CTX *x509_ctx)
-{
-    X509 *cert;
-    int cert_err, depth;
-    SSL *ssl;
-    SSL_CTX *ctx;
-    callback_data *cb_data;
-
-    cert = X509_STORE_CTX_get_current_cert(x509_ctx);
-    cert_err = X509_STORE_CTX_get_error(x509_ctx);
-    depth = X509_STORE_CTX_get_error_depth(x509_ctx);
-
-    ssl = X509_STORE_CTX_get_ex_data(x509_ctx, 
-				     SSL_get_ex_data_X509_STORE_CTX_idx());
-    ctx = SSL_get_SSL_CTX(ssl);
-    cb_data = SSL_CTX_get_ex_data(ctx, callback_data_index);
-
-    X509_NAME_oneline(X509_get_subject_name(cert), x509_buf, sizeof(x509_buf));
-    DEBUGF(("  +vfy: depth = %d\n", depth));
-    DEBUGF(("        subject = %s\n", x509_buf));
-    X509_NAME_oneline(X509_get_issuer_name(cert),  x509_buf, sizeof(x509_buf));
-    DEBUGF(("        issuer = %s\n", x509_buf));
-
-    if (!ok) {
-	DEBUGF(("  +vfy: error = %d [%s]\n", cert_err,
-		X509_verify_cert_error_string(cert_err)));
-	if (depth >= cb_data->verify_depth) 
-	    ok = 1;
-    }
-
-    switch (cert_err) {
-    case X509_V_OK:
-    case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
-	ok = 1;
-	break;
-    case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-    case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
-	MAYBE_SET_ERRSTR("enoissuercert");
-	break;
-    case X509_V_ERR_CERT_HAS_EXPIRED:
-	MAYBE_SET_ERRSTR("epeercertexpired");
-	break;
-    case X509_V_ERR_CERT_NOT_YET_VALID:
-    case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
-    case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
-	MAYBE_SET_ERRSTR("epeercertinvalid");
-	break;
-    case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
-	MAYBE_SET_ERRSTR("eselfsignedcert");
-	break;
-    case X509_V_ERR_CERT_CHAIN_TOO_LONG:
-	MAYBE_SET_ERRSTR("echaintoolong");
-	break;
-    default:
-	MAYBE_SET_ERRSTR("epeercert");
-	break;
-    }
-    DEBUGF(("  +vfy: return = %d\n",ok));
-    return ok;
-}
-
-static int passwd_callback(char *buf, int num, int rwflag, void *userdata)
-{
-    callback_data *cb_data = userdata;
-    int len;
-
-    if (cb_data && cb_data->passwd) {
-	DEBUGF(("  +passwd: %s\n", cb_data->passwd));
-	strncpy(buf, cb_data->passwd, num);
-	len = strlen(cb_data->passwd);
-	return len;
-    }
-    DEBUGF(("  +passwd: ERROR: No password set.\n"));
-    return 0;
-}
-
-static void info_callback(const SSL *ssl, int where, int ret)
-{
-    char *str;
-
-    if (where & SSL_CB_LOOP) {
-	DEBUGF(("  info: %s\n",SSL_state_string_long(ssl)));
-    } else if (where & SSL_CB_ALERT) {
-	str = (where & SSL_CB_READ) ? "read" : "write";
-	DEBUGF(("  info: SSL3 alert %s:%s:%s\n", str, 
-		SSL_alert_type_string_long(ret),
-		SSL_alert_desc_string_long(ret)));
-    } else if (where & SSL_CB_EXIT) {
-	if (ret == 0) {
-	    DEBUGF(("  info: failed in %s\n", SSL_state_string_long(ssl)));
-	} else if (ret < 0) {
-	    DEBUGF(("  info: error in %s\n", SSL_state_string_long(ssl)));
-	}
-    }
-}
-
-/* This function is called whenever a SSL_CTX *ctx structure is
- * freed. 
-*/
-static void callback_data_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, 
-			       int idx, long arg1, void *argp)
-{
-    callback_data *cb_data = ptr;
-    
-    if (cb_data) {
-	if (cb_data->passwd) 
-	    esock_free(cb_data->passwd);
-	esock_free(cb_data);
-    }
-}
-
-static RSA *tmp_rsa_callback(SSL *ssl, int is_export, int keylen)
-{
-    static RSA *rsa512 = NULL;
-    static RSA *rsa1024 = NULL;
-
-    switch (keylen) {
-    case 512:
-	if (!rsa512)
-	    rsa512 = RSA_generate_key(keylen, RSA_F4, NULL, NULL);
-	return rsa512;
-	break;
-    case 1024:
-	if (!rsa1024)
-	    rsa1024 = RSA_generate_key(keylen, RSA_F4, NULL, NULL);
-	return rsa1024;
-	break;
-    default:
-	if (rsa1024)
-	    return rsa1024;
-	if (rsa512)
-	    return rsa512;
-	rsa512 = RSA_generate_key(keylen, RSA_F4, NULL, NULL);
-	return rsa512;
-    }
-}
-
-/* Restrict protocols (SSLv2, SSLv3, TLSv1) */
-static void restrict_protocols(SSL_CTX *ctx)
-{
-    long options = 0;
-
-    if (protocol_version) {
-	if ((protocol_version & ESOCK_SSLv2) == 0) 
-	    options |= SSL_OP_NO_SSLv2;
-	if ((protocol_version & ESOCK_SSLv3) == 0) 
-	    options |= SSL_OP_NO_SSLv3;
-	if ((protocol_version & ESOCK_TLSv1) == 0) 
-	    options |= SSL_OP_NO_TLSv1;
-	SSL_CTX_set_options(ctx, options);
-    }
-}
-
-
-static unsigned char randvec [] = {
-    181, 177, 237, 240, 107, 24, 43, 148, 
-    105, 4, 248, 13, 199, 255, 23, 58, 
-    71, 181, 57, 151, 156, 25, 165, 7, 
-    73, 80, 80, 231, 70, 110, 96, 162, 
-    24, 205, 178, 178, 67, 122, 210, 180, 
-    92, 6, 156, 182, 84, 159, 85, 6, 
-    175, 66, 165, 167, 137, 34, 179, 237, 
-    77, 90, 87, 185, 21, 106, 92, 115, 
-    137, 65, 233, 42, 164, 153, 208, 133, 
-    160, 172, 129, 202, 46, 220, 98, 66, 
-    115, 66, 46, 28, 226, 200, 140, 145, 
-    207, 194, 58, 71, 56, 203, 113, 34, 
-    221, 116, 63, 114, 188, 210, 45, 238, 
-    200, 123, 35, 150, 2, 78, 160, 22, 
-    226, 167, 162, 10, 182, 75, 109, 97, 
-    86, 252, 93, 125, 117, 214, 220, 37, 
-    105, 160, 56, 158, 97, 57, 22, 14, 
-    73, 169, 111, 190, 222, 176, 14, 82, 
-    111, 42, 87, 90, 136, 236, 22, 209, 
-    156, 207, 40, 251, 88, 141, 51, 211, 
-    31, 158, 153, 91, 119, 83, 255, 60, 
-    55, 94, 5, 115, 119, 210, 224, 185, 
-    163, 163, 5, 3, 197, 106, 110, 206, 
-    109, 132, 50, 190, 177, 133, 175, 129, 
-    225, 161, 156, 244, 77, 150, 99, 38, 
-    17, 111, 46, 230, 152, 64, 50, 164, 
-    19, 78, 3, 164, 169, 175, 104, 97, 
-    103, 158, 91, 168, 186, 191, 73, 88, 
-    118, 112, 41, 188, 219, 0, 198, 209, 
-    206, 7, 5, 169, 127, 180, 80, 74, 
-    124, 4, 4, 108, 197, 67, 204, 29, 
-    101, 95, 174, 147, 64, 163, 89, 160, 
-    10, 5, 56, 134, 209, 69, 209, 55, 
-    214, 136, 45, 212, 113, 85, 159, 133, 
-    141, 249, 75, 40, 175, 91, 142, 13, 
-    179, 179, 51, 0, 136, 63, 148, 175, 
-    103, 162, 8, 214, 4, 24, 59, 71, 
-    9, 185, 48, 127, 159, 165, 8, 8, 
-    135, 151, 92, 214, 132, 151, 204, 169, 
-    24, 112, 229, 59, 236, 81, 238, 64, 
-    150, 196, 97, 213, 140, 159, 20, 24, 
-    79, 210, 191, 53, 130, 33, 157, 87, 
-    16, 180, 175, 217, 56, 123, 115, 196, 
-    130, 6, 155, 37, 220, 80, 232, 129, 
-    240, 57, 199, 249, 196, 152, 28, 111, 
-    124, 192, 59, 46, 29, 21, 178, 51, 
-    156, 17, 248, 61, 254, 80, 201, 131, 
-    203, 59, 227, 191, 71, 121, 134, 181, 
-    55, 79, 130, 225, 246, 36, 179, 224, 
-    189, 243, 200, 75, 73, 41, 251, 41, 
-    71, 251, 78, 146, 99, 101, 104, 69, 
-    18, 122, 65, 24, 232, 84, 246, 242, 
-    209, 18, 241, 114, 3, 65, 177, 99, 
-    49, 99, 215, 59, 9, 175, 195, 11, 
-    25, 46, 43, 120, 109, 179, 159, 250, 
-    239, 246, 135, 78, 2, 238, 214, 237, 
-    64, 170, 50, 44, 68, 67, 111, 232, 
-    225, 230, 224, 124, 76, 32, 52, 158, 
-    151, 54, 184, 135, 122, 66, 211, 215, 
-    121, 90, 124, 158, 55, 73, 116, 137, 
-    240, 15, 38, 31, 183, 86, 93, 49, 
-    148, 184, 125, 250, 155, 216, 84, 246, 
-    27, 172, 141, 54, 80, 158, 227, 254, 
-    189, 164, 238, 229, 68, 26, 231, 11, 
-    198, 222, 15, 141, 98, 8, 124, 219, 
-    60, 125, 170, 213, 114, 24, 189, 65, 
-    80, 186, 71, 126, 223, 153, 20, 141, 
-    110, 73, 173, 218, 214, 63, 205, 177, 
-    132, 115, 184, 28, 122, 232, 210, 72, 
-    237, 41, 93, 17, 152, 95, 242, 138, 
-    79, 98, 47, 197, 36, 17, 137, 230, 
-    15, 73, 193, 1, 181, 123, 0, 186, 
-    185, 135, 142, 200, 139, 78, 57, 145, 
-    191, 32, 98, 250, 113, 188, 71, 32, 
-    205, 81, 219, 99, 60, 87, 42, 95, 
-    249, 252, 121, 125, 246, 230, 74, 162, 
-    73, 59, 179, 142, 178, 47, 163, 161, 
-    236, 14, 123, 219, 18, 6, 102, 140, 
-    215, 210, 76, 9, 119, 147, 252, 63, 
-    13, 51, 161, 172, 180, 116, 212, 129, 
-    116, 237, 38, 64, 213, 222, 35, 14, 
-    183, 237, 78, 204, 250, 250, 5, 41, 
-    142, 5, 207, 154, 65, 183, 108, 82, 
-    1, 43, 149, 233, 89, 195, 25, 233, 
-    4, 34, 19, 122, 16, 58, 121, 5, 
-    118, 168, 22, 213, 49, 226, 163, 169, 
-    21, 78, 179, 232, 125, 216, 198, 147, 
-    245, 196, 199, 138, 185, 167, 179, 82, 
-    175, 53, 6, 162, 5, 141, 180, 212, 
-    95, 201, 234, 169, 111, 175, 138, 197, 
-    177, 246, 154, 41, 185, 201, 134, 187, 
-    88, 99, 231, 23, 190, 36, 72, 174, 
-    244, 185, 205, 50, 230, 226, 210, 119, 
-    175, 107, 109, 244, 12, 122, 84, 51, 
-    146, 95, 68, 74, 76, 212, 221, 103, 
-    244, 71, 63, 133, 149, 233, 48, 3, 
-    176, 168, 6, 98, 88, 226, 120, 190, 
-    205, 249, 38, 157, 205, 148, 250, 203, 
-    147, 62, 195, 229, 219, 109, 177, 119, 
-    120, 43, 165, 99, 253, 210, 180, 32, 
-    227, 180, 174, 64, 156, 139, 251, 53, 
-    205, 132, 210, 208, 3, 199, 115, 64, 
-    59, 27, 249, 164, 224, 191, 124, 241, 
-    142, 10, 19, 120, 227, 46, 174, 231, 
-    48, 65, 41, 56, 51, 38, 185, 95, 
-    250, 182, 100, 40, 196, 124, 173, 119, 
-    162, 148, 170, 34, 51, 68, 175, 60, 
-    242, 201, 225, 34, 146, 157, 159, 0, 
-    144, 148, 82, 72, 149, 53, 201, 10, 
-    248, 206, 154, 126, 33, 153, 56, 48, 
-    5, 90, 194, 22, 251, 173, 211, 202, 
-    203, 253, 112, 147, 188, 200, 142, 206, 
-    206, 175, 233, 76, 93, 104, 125, 41, 
-    64, 145, 202, 53, 130, 251, 23, 90, 
-    28, 199, 13, 128, 185, 154, 53, 194, 
-    195, 55, 80, 56, 151, 216, 195, 138, 
-    7, 170, 143, 236, 74, 141, 229, 174, 
-    32, 165, 131, 68, 174, 104, 35, 143, 
-    183, 41, 80, 191, 120, 79, 166, 240, 
-    123, 55, 60, 2, 128, 56, 4, 199, 
-    122, 85, 90, 76, 246, 29, 13, 6, 
-    126, 229, 14, 203, 244, 73, 121, 42, 
-    169, 35, 44, 202, 18, 69, 153, 120, 
-    141, 77, 124, 191, 215, 18, 115, 187, 
-    108, 246, 135, 151, 225, 192, 50, 89, 
-    128, 45, 39, 253, 149, 234, 203, 84, 
-    51, 174, 15, 237, 17, 57, 76, 81, 
-    39, 107, 40, 36, 22, 52, 92, 39};
diff --git a/lib/ssl/c_src/esock_osio.c b/lib/ssl/c_src/esock_osio.c
deleted file mode 100644
index 41c5271c16..0000000000
--- a/lib/ssl/c_src/esock_osio.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/*<copyright>
- * <year>1999-2008</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.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-/*
- * Purpose:  Std filedescriptors, break handler
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef __WIN32__
-#include "esock_winsock.h"
-#include <process.h>
-#include <io.h>
-#include <fcntl.h>
-#else
-#include <unistd.h>
-#include <signal.h>  
-#endif 
-
-#include "esock.h"
-#include "debuglog.h"
-#include "esock_utils.h"
-#include "esock_osio.h"
-
-#ifdef __WIN32__
-#define write	_write
-#define read	_read
-#define LOCALHOSTADDR	"127.0.0.1"
-#define LOCBUFSIZE      1024
-#endif
-
-#define PACKET_SIZE	4
-#define EBUFSIZE	256
-
-FD local_read_fd = 0;
-
-static int inc_rbuf(int size);
-static void free_rbuf(void);
-static int read_fill(unsigned char *buf, int len);
-#ifdef __WIN32__
-static int create_local_thread(void);
-static DWORD WINAPI local_thread(LPVOID lpvParam);
-static BOOL WINAPI signal_handler(DWORD ctrl);
-#endif
-
-static unsigned char *rbuf = NULL;
-static int rbuf_malloced = 0;
-#ifdef __WIN32__
-static unsigned long one = 1, zero = 0;
-static int local_portno;
-static char *local_buf;
-#endif
-
-int set_break_handler(void) 
-{
-#ifndef __WIN32__
-    struct sigaction act;
-
-    /* Ignore SIGPIPE signal */
-    sigemptyset(&act.sa_mask);
-    act.sa_flags = 0;
-    act.sa_handler = SIG_IGN;
-    sigaction(SIGPIPE, &act, NULL);
-    return 0;
-#else 
-    SetConsoleCtrlHandler(signal_handler, TRUE);
-    return 0;
-#endif
-}
-
-
-#ifdef __WIN32__
-
-int set_binary_mode(void)
-{
-    _setmode(0, _O_BINARY);
-    _setmode(1, _O_BINARY);
-    return 0;
-}
-
-int esock_osio_init(void)
-{
-    return create_local_thread();
-}
-
-void esock_osio_finish(void)
-{
-    sock_close(local_read_fd);
-}
-
-#endif
-
-int read_ctrl(unsigned char **ebufp)
-{
-    int tbh, cc;
-    unsigned char *mbuf;
-
-    if (inc_rbuf(EBUFSIZE) < 0) {
-	fprintf(stderr, "read_ctrl: cannot alloc rbuf\n");
-	return -1;
-    }
-    cc = read_fill(rbuf, PACKET_SIZE);
-    if (cc < 0) {
-	free_rbuf();
-	return -1;
-    }
-    if (cc == 0) {
-	free_rbuf();
-	return -1;		/* XXX 0 ?? */
-    }
-    tbh = GET_INT32(rbuf);
-
-    if (tbh > rbuf_malloced - 4) {
-	if (inc_rbuf(tbh + 4) < 0)
-	    return -1;
-    }
-    
-    mbuf = rbuf + PACKET_SIZE;
-    cc = read_fill(mbuf, tbh);
-    DEBUGF(("-----------------------------------\n"));
-    DEBUGF(("read_ctrl: cc = %d\n", cc));
-    if(cc > 0) {
-	DEBUGMSGF(("message (hex) : [%3.*a]\n", cc, mbuf));
-	DEBUGMSGF(("message (char): [%3.*b]\n", cc, mbuf));
-    }
-    *ebufp = mbuf;
-    return cc;
-}
-
-int write_ctrl(unsigned char *buf, int len)
-{
-    unsigned char lb[4];
-
-    PUT_INT32(len, lb);
-    DEBUGF(("write_ctrl: len = %d\n", len));
-    DEBUGMSGF(("message (hex) : [%3.*a] [%3.*a]\n", PACKET_SIZE, lb, 
-	       len, buf));
-    DEBUGMSGF(("message (char): [%3.*b] [%3.*b]\n", PACKET_SIZE, lb, 
-	       len, buf));
-
-    if (write(1, lb, PACKET_SIZE) != PACKET_SIZE) { /* XXX */
-	fprintf(stderr, "write_ctrl: Bad write \n");
-	return -1;
-    }
-    if (write(1, buf, len) != len) { /* XXX */
-	fprintf(stderr, "write_ctrl: Bad write \n");
-	return -1;
-    }
-    return len;
-}
-
-
-/* 
- * Local functions
- *
- */
-
-static int inc_rbuf(int size)
-{
-    unsigned char *nbuf;
-
-    if (rbuf_malloced >= size)
-	return 0;
-    if (rbuf != NULL)		
-	nbuf = esock_realloc(rbuf, size);
-    else
-	nbuf = esock_malloc(size);
-    if(nbuf != NULL) {
-	rbuf = nbuf;
-	rbuf_malloced = size;
-	return 0;
-    }
-    return -1;
-}
-
-static void free_rbuf(void) 
-{
-    if (rbuf != NULL) {
-	esock_free(rbuf);
-	rbuf = NULL;
-	rbuf_malloced = 0;
-    }
-}
-
-/* Fill buffer, return buffer length, 0 for EOF, < 0 for error. */
-
-static int read_fill(unsigned char *buf, int len)
-{
-    int i, got = 0;
-  
-    do {
-	if ((i = sock_read(local_read_fd, buf+got, len-got)) <= 0)
-	    return i;
-	got += i;
-    } while (got < len);
-    return len;
-}
-
-
-#ifdef __WIN32__
-
-/* 
- * This routine creates a local thread, which reads from standard input
- * and writes to a socket. 
- */
-
-static int create_local_thread(void)
-{
-    struct sockaddr_in iserv_addr;
-    SOCKET tmpsock;
-    int length;
-    unsigned threadaddr;
-
-    local_buf = esock_malloc(LOCBUFSIZE);
-    if ((tmpsock = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
- 	fprintf(stderr, "create_local_thread could not create socket.\n");
-	return -1;
-    }
-    memset(&iserv_addr, 0, sizeof(iserv_addr));
-    iserv_addr.sin_family = AF_INET;
-    iserv_addr.sin_addr.s_addr = inet_addr(LOCALHOSTADDR);
-    iserv_addr.sin_port = htons(0); /* Have any port */
-
-    if (bind(tmpsock, (struct sockaddr *) &iserv_addr, 
-	     sizeof(iserv_addr)) < 0) {
-	fprintf(stderr, "create_local_thread could not bind.\n");
-	closesocket(tmpsock);
-	return -1;
-    }
-    listen(tmpsock, 1);
-    length = sizeof(iserv_addr);
-    if (getsockname(tmpsock, (struct sockaddr *) &iserv_addr, &length) < 0) {
-	fprintf(stderr, "create_local_thread could not getsockname.\n");
-	closesocket(tmpsock);
-	return -1;
-    }
-    local_portno = ntohs(iserv_addr.sin_port);
-
-    if (_beginthreadex(NULL, 0, local_thread, NULL, 0, &threadaddr) == 0) {
-	fprintf(stderr, "create_local_thread could not _beginthreadex().\n");
-	closesocket(tmpsock);
-	return -1;
-    }
-    local_read_fd = accept(tmpsock, (struct sockaddr *) NULL, (int *) NULL);
-    if (local_read_fd == INVALID_FD) {
-	fprintf(stderr, "create_local_thread could not accept.\n");
-	closesocket(tmpsock);
-	return -1;
-    }
-    closesocket(tmpsock);
-    return 0;
-}
-
-static DWORD WINAPI local_thread(LPVOID lpvParam)
-{
-    SOCKET sock;
-    struct hostent *host;
-    char hostname[64];
-    struct sockaddr_in iserv_addr;
-    unsigned long addr;
-    int len;
-    HANDLE thread;
-
-    sock = socket(AF_INET, SOCK_STREAM, 0);
-    memset(&iserv_addr, 0, sizeof(struct sockaddr_in));
-    iserv_addr.sin_family = AF_INET;
-    iserv_addr.sin_addr.s_addr = inet_addr(LOCALHOSTADDR);
-    iserv_addr.sin_port = htons(local_portno);
-    if(connect(sock, (struct sockaddr*)&iserv_addr, sizeof iserv_addr) == 
-       SOCKET_ERROR) {
-	fprintf(stderr, "local_thread thread could not connect\n");
-	closesocket(sock);
-	return 0;
-    }
-    setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));
-
-    /* read from 0 and write to sock */
-    while (1) {
-	if ((len = read(0, local_buf, LOCBUFSIZE)) <= 0) {
-	    closesocket(sock);
-	    close(0);
-	    return 0;
-	}
-	if (send(sock, local_buf, len, 0) != len ) {
-	    closesocket(sock);
-	    close(0);
-	    return 0;
-	}
-    }
-    return 0;
-}
-
-/* Signal handler */
-
-static BOOL WINAPI signal_handler(DWORD ctrl)
-{
-    switch (ctrl) {
-    case CTRL_C_EVENT:
-    case CTRL_BREAK_EVENT:
-	break;
-    case CTRL_LOGOFF_EVENT:
-	if (!getenv("ERLSRV_SERVICE_NAME"))
-	    return FALSE;
-	break;
-    default:
-	exit(1);
-    }
-    return TRUE;
-}
-
-#endif
diff --git a/lib/ssl/c_src/esock_osio.h b/lib/ssl/c_src/esock_osio.h
deleted file mode 100644
index 8742c3b05b..0000000000
--- a/lib/ssl/c_src/esock_osio.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  %CopyrightBegin%
- *  
- *  Copyright Ericsson AB 1999-2009. 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.
- *  
- *  %CopyrightEnd%
- */
-
-#ifndef ESOCK_OSIO_H
-#define ESOCK_OSIO_H
-
-extern FD local_read_fd;
-
-#ifdef __WIN32__
-int set_binary_mode(void);
-int esock_osio_init(void);
-void esock_osio_finish(void);
-#endif
-int set_break_handler(void);
-int read_ctrl(unsigned char **ebufp);
-int write_ctrl(unsigned char *buf, int len);
-
-#endif
diff --git a/lib/ssl/c_src/esock_poll.c b/lib/ssl/c_src/esock_poll.c
deleted file mode 100644
index e982eba881..0000000000
--- a/lib/ssl/c_src/esock_poll.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*<copyright>
- * <year>2005-2008</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.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-
-/*
- * Purpose: Hide poll() and select() behind an API so that we
- * can use either one.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#ifdef __WIN32__
-#include "esock_winsock.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <errno.h>
-
-#ifdef __WIN32__
-#include <process.h>
-#else
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <sys/time.h>
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <fcntl.h>
-#endif
-
-#include "esock.h"
-#include "esock_ssl.h"
-#include "esock_utils.h"
-#include "esock_poll.h"
-#include "debuglog.h"
-
-#if !defined(USE_SELECT)
-
-/* At least on FreeBSD, we need POLLRDNORM for normal files, not POLLIN. */
-/* Whether this is a bug in FreeBSD, I don't know. */
-#ifdef POLLRDNORM
-#define POLL_INPUT	(POLLIN | POLLRDNORM)
-#else
-#define POLL_INPUT	POLLIN
-#endif
-
-static void poll_fd_set(EsockPoll *ep, FD fd, short events)
-{
-    int i, j;
-    int prev_num_fds = ep->num_fds;
-
-    if (ep->num_fds <= fd) {
-	ep->num_fds = fd + 64;
-	ep->fd_to_poll = (int *) esock_realloc(ep->fd_to_poll,
-					       ep->num_fds*sizeof(int));
-	for (j = prev_num_fds; j < ep->num_fds; j++)
-	    ep->fd_to_poll[j] = -1;
-    }
-    i = ep->fd_to_poll[fd];
-    if (i > 0 && i < ep->active && ep->fds[i].fd == fd) {
-	/* Already present in poll array */
-	ep->fds[i].events |= events;
-    } else {
-	/* Append to poll array */
-	if (ep->active >= ep->allocated) {
-	    ep->allocated *= 2;
-	    ep->fds = (struct pollfd *)
-		esock_realloc(ep->fds, ep->allocated*sizeof(struct pollfd));
-	}
-	ep->fd_to_poll[fd] = ep->active;
-	ep->fds[ep->active].fd = fd;
-	ep->fds[ep->active].events = events;
-	ep->fds[ep->active].revents = 0;
-	ep->active++;
-    }
-}
-
-static int poll_is_set(EsockPoll *ep, FD fd, short mask)
-{
-    if (fd >= ep->num_fds) {
-	return 0;
-    } else {
-	int i = ep->fd_to_poll[fd];
-	return 0 <= i && i < ep->active && ep->fds[i].fd == fd &&
-	    (ep->fds[i].revents & mask) != 0;
-    }
-}
-
-#endif
-
-void esock_poll_init(EsockPoll *ep)
-{
-#ifdef USE_SELECT
-    /* Nothing to do here */
-#else
-    ep->allocated = 2;
-    ep->fds = (struct pollfd *) esock_malloc(ep->allocated*sizeof(struct pollfd));
-    ep->num_fds = 1;
-    ep->fd_to_poll = esock_malloc(ep->num_fds*sizeof(int));
-#endif    
-}
-
-void esock_poll_zero(EsockPoll *ep)
-{
-#ifdef USE_SELECT
-    FD_ZERO(&ep->readmask);
-    FD_ZERO(&ep->writemask);
-    FD_ZERO(&ep->exceptmask);
-#else
-    int i;
-
-    for (i = 0; i < ep->num_fds; i++)
-	ep->fd_to_poll[i] = -1;
-    ep->active = 0;
-#endif    
-}
-
-void esock_poll_fd_set_read(EsockPoll *ep, FD fd)
-{
-#ifdef USE_SELECT
-    FD_SET(fd, &ep->readmask);
-#else
-    poll_fd_set(ep, fd, POLL_INPUT);
-#endif    
-}
-
-void esock_poll_fd_set_write(EsockPoll *ep, FD fd)
-{
-#ifdef USE_SELECT
-    FD_SET(fd, &ep->writemask);
-#else
-    poll_fd_set(ep, fd, POLLOUT);
-#endif    
-}
-
-int esock_poll_fd_isset_read(EsockPoll *ep, FD fd)
-{
-#ifdef USE_SELECT
-    return FD_ISSET(fd, &ep->readmask);
-#else
-    return poll_is_set(ep, fd, (POLL_INPUT|POLLHUP|POLLERR|POLLNVAL));
-#endif    
-}
-
-int esock_poll_fd_isset_write(EsockPoll *ep, FD fd)
-{
-#ifdef USE_SELECT
-    return FD_ISSET(fd, &ep->writemask);
-#else
-    return poll_is_set(ep, fd, (POLLOUT|POLLHUP|POLLERR|POLLNVAL));
-#endif    
-}
-
-#ifdef __WIN32__
-void esock_poll_fd_set_exception(EsockPoll *ep, FD fd)
-{
-    FD_SET(fd, &ep->exceptmask);
-}
-
-int esock_poll_fd_isset_exception(EsockPoll *ep, FD fd)
-{
-    return FD_ISSET(fd, &ep->exceptmask);
-}
-#endif
-
-int esock_poll(EsockPoll *ep, int seconds)
-{
-    int sret;
-
-#ifdef USE_SELECT
-    struct timeval tv;
-
-    tv.tv_sec = seconds;
-    tv.tv_usec = 0;
-    sret = select(FD_SETSIZE, &ep->readmask, &ep->writemask, &ep->exceptmask, &tv);
-    if (sret == 0) {
-	FD_ZERO(&ep->readmask);
-	FD_ZERO(&ep->writemask);
-	FD_ZERO(&ep->exceptmask);
-    }
-#else
-    sret = poll(ep->fds, ep->active, 1000*seconds);
-#endif
-    return sret;
-}
-
-void esock_poll_clear_event(EsockPoll* ep, FD fd)
-{
-#ifdef USE_SELECT
-    FD_CLR(fd, &ep->readmask);
-    FD_CLR(fd, &ep->writemask);
-    FD_CLR(fd, &ep->exceptmask);
-#else
-    int i = ep->fd_to_poll[fd];
-    if (i > 0 && ep->fds[i].fd == fd)
-	ep->fds[i].revents = 0;
-#endif
-}
diff --git a/lib/ssl/c_src/esock_poll.h b/lib/ssl/c_src/esock_poll.h
deleted file mode 100644
index 639976dfa9..0000000000
--- a/lib/ssl/c_src/esock_poll.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*<copyright>
- * <year>2005-2008</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.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-#ifndef ESOCK_POLL_SELECT_H
-#define ESOCK_POLL_SELECT_H
-
-#if !defined(USE_SELECT)
-#include <poll.h>
-#endif
-
-typedef struct esock_poll {
-#ifdef USE_SELECT
-    fd_set readmask;
-    fd_set writemask;
-    fd_set exceptmask;
-#else
-    int* fd_to_poll;		/* Map from fd to index into poll
-				 * descriptor array.
-				 */
-    int num_fds;		/* Number of entries in fd_to_poll. */
-    struct pollfd* fds;		/* Array of poll descriptors. */
-    int allocated;		/* Allocated number of fds. */
-    int active;			/* Active number of fds */
-#endif
-} EsockPoll;
-
-void esock_poll_init(EsockPoll *ep);
-void esock_poll_zero(EsockPoll *ep);
-
-void esock_poll_fd_set_read(EsockPoll *ep, FD fd);
-void esock_poll_fd_set_write(EsockPoll *ep, FD fd);
-
-void esock_poll_clear_event(EsockPoll *ep, FD fd);
-
-int esock_poll_fd_isset_read(EsockPoll *ep, FD fd);
-int esock_poll_fd_isset_write(EsockPoll *ep, FD fd);
-
-#ifdef __WIN32__
-void esock_poll_fd_set_exception(EsockPoll *ep, FD fd);
-int esock_poll_fd_isset_exception(EsockPoll *ep, FD fd);
-#endif
-
-int esock_poll(EsockPoll *ep, int seconds);
-#endif
diff --git a/lib/ssl/c_src/esock_posix_str.c b/lib/ssl/c_src/esock_posix_str.c
deleted file mode 100644
index 31062baaaf..0000000000
--- a/lib/ssl/c_src/esock_posix_str.c
+++ /dev/null
@@ -1,642 +0,0 @@
-/*
- * %ExternalCopyright%
- */
-
-/* 
- * Original: tclPosixStr.c --
- *
- *	This file contains procedures that generate strings
- *	corresponding to various POSIX-related codes, such
- *	as errno and signals.
- *
- * Copyright (c) 1991-1994 The Regents of the University of California.
- * Copyright (c) 1994-1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#) tclPosixStr.c 1.32 96/10/10 10:09:42
- */
-
-/* Copy of erl_posix_str.c */
-
-#ifdef __WIN32__
-#include "esock_winsock.h"
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include "esock_posix_str.h"
-
-/*
- *----------------------------------------------------------------------
- *
- * esock_posix_str --
- *
- *	Return a textual identifier for the given errno value.
- *
- * Results:
- *	This procedure returns a machine-readable textual identifier
- *	that corresponds to the current errno value (e.g. "eperm").
- *	The identifier is the same as the #define name in errno.h,
- *	except that it is in lowercase.
- *
- *----------------------------------------------------------------------
- */
-
-static char errstrbuf[32];
-
-char *esock_posix_str(int error)
-{
-    switch (error) {
-#ifdef E2BIG
-    case E2BIG: return "e2big";
-#endif
-#ifdef EACCES
-    case EACCES: return "eacces";
-#endif
-#ifdef EADDRINUSE
-    case EADDRINUSE: return "eaddrinuse";
-#endif
-#ifdef EADDRNOTAVAIL
-    case EADDRNOTAVAIL: return "eaddrnotavail";
-#endif
-#ifdef EADV
-    case EADV: return "eadv";
-#endif
-#ifdef EAFNOSUPPORT
-    case EAFNOSUPPORT: return "eafnosupport";
-#endif
-#ifdef EAGAIN
-    case EAGAIN: return "eagain";
-#endif
-#ifdef EALIGN
-    case EALIGN: return "ealign";
-#endif
-#if defined(EALREADY) && (!defined(EBUSY) || (EALREADY != EBUSY ))
-    case EALREADY: return "ealready";
-#endif
-#ifdef EBADE
-    case EBADE: return "ebade";
-#endif
-#ifdef EBADF
-    case EBADF: return "ebadf";
-#endif
-#ifdef EBADFD
-    case EBADFD: return "ebadfd";
-#endif
-#ifdef EBADMSG
-    case EBADMSG: return "ebadmsg";
-#endif
-#ifdef EBADR
-    case EBADR: return "ebadr";
-#endif
-#ifdef EBADRPC
-    case EBADRPC: return "ebadrpc";
-#endif
-#ifdef EBADRQC
-    case EBADRQC: return "ebadrqc";
-#endif
-#ifdef EBADSLT
-    case EBADSLT: return "ebadslt";
-#endif
-#ifdef EBFONT
-    case EBFONT: return "ebfont";
-#endif
-#ifdef EBUSY
-    case EBUSY: return "ebusy";
-#endif
-#ifdef ECHILD
-    case ECHILD: return "echild";
-#endif
-#ifdef ECHRNG
-    case ECHRNG: return "echrng";
-#endif
-#ifdef ECOMM
-    case ECOMM: return "ecomm";
-#endif
-#ifdef ECONNABORTED
-    case ECONNABORTED: return "econnaborted";
-#endif
-#ifdef ECONNREFUSED
-    case ECONNREFUSED: return "econnrefused";
-#endif
-#ifdef ECONNRESET
-    case ECONNRESET: return "econnreset";
-#endif
-#if defined(EDEADLK) && (!defined(EWOULDBLOCK) || (EDEADLK != EWOULDBLOCK))
-    case EDEADLK: return "edeadlk";
-#endif
-#if defined(EDEADLOCK) && (!defined(EDEADLK) || (EDEADLOCK != EDEADLK))
-    case EDEADLOCK: return "edeadlock";
-#endif
-#ifdef EDESTADDRREQ
-    case EDESTADDRREQ: return "edestaddrreq";
-#endif
-#ifdef EDIRTY
-    case EDIRTY: return "edirty";
-#endif
-#ifdef EDOM
-    case EDOM: return "edom";
-#endif
-#ifdef EDOTDOT
-    case EDOTDOT: return "edotdot";
-#endif
-#ifdef EDQUOT
-    case EDQUOT: return "edquot";
-#endif
-#ifdef EDUPPKG
-    case EDUPPKG: return "eduppkg";
-#endif
-#ifdef EEXIST
-    case EEXIST: return "eexist";
-#endif
-#ifdef EFAULT
-    case EFAULT: return "efault";
-#endif
-#ifdef EFBIG
-    case EFBIG: return "efbig";
-#endif
-#ifdef EHOSTDOWN
-    case EHOSTDOWN: return "ehostdown";
-#endif
-#ifdef EHOSTUNREACH
-    case EHOSTUNREACH: return "ehostunreach";
-#endif
-#if defined(EIDRM) && (!defined(EINPROGRESS) || (EIDRM != EINPROGRESS))
-    case EIDRM: return "eidrm";
-#endif
-#ifdef EINIT
-    case EINIT: return "einit";
-#endif
-#ifdef EINPROGRESS
-    case EINPROGRESS: return "einprogress";
-#endif
-#ifdef EINTR
-    case EINTR: return "eintr";
-#endif
-#ifdef EINVAL
-    case EINVAL: return "einval";
-#endif
-#ifdef EIO
-    case EIO: return "eio";
-#endif
-#ifdef EISCONN
-    case EISCONN: return "eisconn";
-#endif
-#ifdef EISDIR
-    case EISDIR: return "eisdir";
-#endif
-#ifdef EISNAME
-    case EISNAM: return "eisnam";
-#endif
-#ifdef ELBIN
-    case ELBIN: return "elbin";
-#endif
-#ifdef EL2HLT
-    case EL2HLT: return "el2hlt";
-#endif
-#ifdef EL2NSYNC
-    case EL2NSYNC: return "el2nsync";
-#endif
-#ifdef EL3HLT
-    case EL3HLT: return "el3hlt";
-#endif
-#ifdef EL3RST
-    case EL3RST: return "el3rst";
-#endif
-#ifdef ELIBACC
-    case ELIBACC: return "elibacc";
-#endif
-#ifdef ELIBBAD
-    case ELIBBAD: return "elibbad";
-#endif
-#ifdef ELIBEXEC
-    case ELIBEXEC: return "elibexec";
-#endif
-#ifdef ELIBMAX
-    case ELIBMAX: return "elibmax";
-#endif
-#ifdef ELIBSCN
-    case ELIBSCN: return "elibscn";
-#endif
-#ifdef ELNRNG
-    case ELNRNG: return "elnrng";
-#endif
-#if defined(ELOOP) && (!defined(ENOENT) || (ELOOP != ENOENT))
-    case ELOOP: return "eloop";
-#endif
-#ifdef EMFILE
-    case EMFILE: return "emfile";
-#endif
-#ifdef EMLINK
-    case EMLINK: return "emlink";
-#endif
-#ifdef EMSGSIZE
-    case EMSGSIZE: return "emsgsize";
-#endif
-#ifdef EMULTIHOP
-    case EMULTIHOP: return "emultihop";
-#endif
-#ifdef ENAMETOOLONG
-    case ENAMETOOLONG: return "enametoolong";
-#endif
-#ifdef ENAVAIL
-    case ENAVAIL: return "enavail";
-#endif
-#ifdef ENET
-    case ENET: return "enet";
-#endif
-#ifdef ENETDOWN
-    case ENETDOWN: return "enetdown";
-#endif
-#ifdef ENETRESET
-    case ENETRESET: return "enetreset";
-#endif
-#ifdef ENETUNREACH
-    case ENETUNREACH: return "enetunreach";
-#endif
-#ifdef ENFILE
-    case ENFILE: return "enfile";
-#endif
-#ifdef ENOANO
-    case ENOANO: return "enoano";
-#endif
-#if defined(ENOBUFS) && (!defined(ENOSR) || (ENOBUFS != ENOSR))
-    case ENOBUFS: return "enobufs";
-#endif
-#ifdef ENOCSI
-    case ENOCSI: return "enocsi";
-#endif
-#if defined(ENODATA) && (!defined(ECONNREFUSED) || (ENODATA != ECONNREFUSED))
-    case ENODATA: return "enodata";
-#endif
-#ifdef ENODEV
-    case ENODEV: return "enodev";
-#endif
-#ifdef ENOENT
-    case ENOENT: return "enoent";
-#endif
-#ifdef ENOEXEC
-    case ENOEXEC: return "enoexec";
-#endif
-#ifdef ENOLCK
-    case ENOLCK: return "enolck";
-#endif
-#ifdef ENOLINK
-    case ENOLINK: return "enolink";
-#endif
-#ifdef ENOMEM
-    case ENOMEM: return "enomem";
-#endif
-#ifdef ENOMSG
-    case ENOMSG: return "enomsg";
-#endif
-#ifdef ENONET
-    case ENONET: return "enonet";
-#endif
-#ifdef ENOPKG
-    case ENOPKG: return "enopkg";
-#endif
-#ifdef ENOPROTOOPT
-    case ENOPROTOOPT: return "enoprotoopt";
-#endif
-#ifdef ENOSPC
-    case ENOSPC: return "enospc";
-#endif
-#if defined(ENOSR) && (!defined(ENAMETOOLONG) || (ENAMETOOLONG != ENOSR))
-    case ENOSR: return "enosr";
-#endif
-#if defined(ENOSTR) && (!defined(ENOTTY) || (ENOTTY != ENOSTR))
-    case ENOSTR: return "enostr";
-#endif
-#ifdef ENOSYM
-    case ENOSYM: return "enosym";
-#endif
-#ifdef ENOSYS
-    case ENOSYS: return "enosys";
-#endif
-#ifdef ENOTBLK
-    case ENOTBLK: return "enotblk";
-#endif
-#ifdef ENOTCONN
-    case ENOTCONN: return "enotconn";
-#endif
-#ifdef ENOTDIR
-    case ENOTDIR: return "enotdir";
-#endif
-#if defined(ENOTEMPTY) && (!defined(EEXIST) || (ENOTEMPTY != EEXIST))
-    case ENOTEMPTY: return "enotempty";
-#endif
-#ifdef ENOTNAM
-    case ENOTNAM: return "enotnam";
-#endif
-#ifdef ENOTSOCK
-    case ENOTSOCK: return "enotsock";
-#endif
-#ifdef ENOTSUP
-    case ENOTSUP: return "enotsup";
-#endif
-#ifdef ENOTTY
-    case ENOTTY: return "enotty";
-#endif
-#ifdef ENOTUNIQ
-    case ENOTUNIQ: return "enotuniq";
-#endif
-#ifdef ENXIO
-    case ENXIO: return "enxio";
-#endif
-#if defined(EOPNOTSUPP) && (!defined(ENOTSUP) || EOPNOTSUPP != ENOTSUP)
-    case EOPNOTSUPP: return "eopnotsupp";
-#endif
-#ifdef EPERM
-    case EPERM: return "eperm";
-#endif
-#if defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT))
-    case EPFNOSUPPORT: return "epfnosupport";
-#endif
-#ifdef EPIPE
-    case EPIPE: return "epipe";
-#endif
-#ifdef EPROCLIM
-    case EPROCLIM: return "eproclim";
-#endif
-#ifdef EPROCUNAVAIL
-    case EPROCUNAVAIL: return "eprocunavail";
-#endif
-#ifdef EPROGMISMATCH
-    case EPROGMISMATCH: return "eprogmismatch";
-#endif
-#ifdef EPROGUNAVAIL
-    case EPROGUNAVAIL: return "eprogunavail";
-#endif
-#ifdef EPROTO
-    case EPROTO: return "eproto";
-#endif
-#ifdef EPROTONOSUPPORT
-    case EPROTONOSUPPORT: return "eprotonosupport";
-#endif
-#ifdef EPROTOTYPE
-    case EPROTOTYPE: return "eprototype";
-#endif
-#ifdef ERANGE
-    case ERANGE: return "erange";
-#endif
-#if defined(EREFUSED) && (!defined(ECONNREFUSED) || (EREFUSED != ECONNREFUSED))
-    case EREFUSED: return "erefused";
-#endif
-#ifdef EREMCHG
-    case EREMCHG: return "eremchg";
-#endif
-#ifdef EREMDEV
-    case EREMDEV: return "eremdev";
-#endif
-#ifdef EREMOTE
-    case EREMOTE: return "eremote";
-#endif
-#ifdef EREMOTEIO
-    case EREMOTEIO: return "eremoteio";
-#endif
-#ifdef EREMOTERELEASE
-    case EREMOTERELEASE: return "eremoterelease";
-#endif
-#ifdef EROFS
-    case EROFS: return "erofs";
-#endif
-#ifdef ERPCMISMATCH
-    case ERPCMISMATCH: return "erpcmismatch";
-#endif
-#ifdef ERREMOTE
-    case ERREMOTE: return "erremote";
-#endif
-#ifdef ESHUTDOWN
-    case ESHUTDOWN: return "eshutdown";
-#endif
-#ifdef ESOCKTNOSUPPORT
-    case ESOCKTNOSUPPORT: return "esocktnosupport";
-#endif
-#ifdef ESPIPE
-    case ESPIPE: return "espipe";
-#endif
-#ifdef ESRCH
-    case ESRCH: return "esrch";
-#endif
-#ifdef ESRMNT
-    case ESRMNT: return "esrmnt";
-#endif
-#ifdef ESTALE
-    case ESTALE: return "estale";
-#endif
-#ifdef ESUCCESS
-    case ESUCCESS: return "esuccess";
-#endif
-#if defined(ETIME) && (!defined(ELOOP) || (ETIME != ELOOP))
-    case ETIME: return "etime";
-#endif
-#if defined(ETIMEDOUT) && (!defined(ENOSTR) || (ETIMEDOUT != ENOSTR))
-    case ETIMEDOUT: return "etimedout";
-#endif
-#ifdef ETOOMANYREFS
-    case ETOOMANYREFS: return "etoomanyrefs";
-#endif
-#ifdef ETXTBSY
-    case ETXTBSY: return "etxtbsy";
-#endif
-#ifdef EUCLEAN
-    case EUCLEAN: return "euclean";
-#endif
-#ifdef EUNATCH
-    case EUNATCH: return "eunatch";
-#endif
-#ifdef EUSERS
-    case EUSERS: return "eusers";
-#endif
-#ifdef EVERSION
-    case EVERSION: return "eversion";
-#endif
-#if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
-    case EWOULDBLOCK: return "ewouldblock";
-#endif
-#ifdef EXDEV
-    case EXDEV: return "exdev";
-#endif
-#ifdef EXFULL
-    case EXFULL: return "exfull";
-#endif
-#ifdef WSAEINTR
-    case WSAEINTR: return "eintr";
-#endif
-#ifdef WSAEBADF
-    case WSAEBADF: return "ebadf";
-#endif
-#ifdef WSAEACCES
-    case WSAEACCES: return "eacces";
-#endif
-#ifdef WSAEFAULT
-    case WSAEFAULT: return "efault";
-#endif
-#ifdef WSAEINVAL
-    case WSAEINVAL: return "einval";
-#endif
-#ifdef WSAEMFILE
-    case WSAEMFILE: return "emfile";
-#endif
-#ifdef WSAEWOULDBLOCK  
-    case WSAEWOULDBLOCK: return "ewouldblock";
-#endif
-#ifdef WSAEINPROGRESS  
-    case WSAEINPROGRESS: return "einprogress";
-#endif
-#ifdef WSAEALREADY     
-    case WSAEALREADY: return "ealready";
-#endif
-#ifdef WSAENOTSOCK     
-    case WSAENOTSOCK: return "enotsock";
-#endif
-#ifdef WSAEDESTADDRREQ 
-    case WSAEDESTADDRREQ: return "edestaddrreq";
-#endif
-#ifdef WSAEMSGSIZE     
-    case WSAEMSGSIZE: return "emsgsize";
-#endif
-#ifdef WSAEPROTOTYPE   
-    case WSAEPROTOTYPE: return "eprototype";
-#endif
-#ifdef WSAENOPROTOOPT  
-    case WSAENOPROTOOPT: return "enoprotoopt";
-#endif
-#ifdef WSAEPROTONOSUPPORT
-    case WSAEPROTONOSUPPORT: return "eprotonosupport";
-#endif
-#ifdef WSAESOCKTNOSUPPORT
-    case WSAESOCKTNOSUPPORT: return "esocktnosupport";
-#endif
-#ifdef WSAEOPNOTSUPP   
-    case WSAEOPNOTSUPP: return "eopnotsupp";
-#endif
-#ifdef WSAEPFNOSUPPORT 
-    case WSAEPFNOSUPPORT: return "epfnosupport";
-#endif
-#ifdef WSAEAFNOSUPPORT 
-    case WSAEAFNOSUPPORT: return "eafnosupport";
-#endif
-#ifdef WSAEADDRINUSE   
-    case WSAEADDRINUSE: return "eaddrinuse";
-#endif
-#ifdef WSAEADDRNOTAVAIL
-    case WSAEADDRNOTAVAIL: return "eaddrnotavail";
-#endif
-#ifdef WSAENETDOWN    
-    case WSAENETDOWN: return "enetdown";
-#endif
-#ifdef WSAENETUNREACH 
-    case WSAENETUNREACH: return "enetunreach";
-#endif
-#ifdef WSAENETRESET   
-    case WSAENETRESET: return "enetreset";
-#endif
-#ifdef WSAECONNABORTED
-    case WSAECONNABORTED: return "econnaborted";
-#endif
-#ifdef WSAECONNRESET  
-    case WSAECONNRESET: return "econnreset";
-#endif
-#ifdef WSAENOBUFS     
-    case WSAENOBUFS: return "enobufs";
-#endif
-#ifdef WSAEISCONN     
-    case WSAEISCONN: return "eisconn";
-#endif
-#ifdef WSAENOTCONN    
-    case WSAENOTCONN: return "enotconn";
-#endif
-#ifdef WSAESHUTDOWN   
-    case WSAESHUTDOWN: return "eshutdown";
-#endif
-#ifdef WSAETOOMANYREFS
-    case WSAETOOMANYREFS: return "etoomanyrefs";
-#endif
-#ifdef WSAETIMEDOUT   
-    case WSAETIMEDOUT: return "etimedout";
-#endif
-#ifdef WSAECONNREFUSED
-    case WSAECONNREFUSED: return "econnrefused";
-#endif
-#ifdef WSAELOOP
-    case WSAELOOP: return "eloop";
-#endif
-#ifdef WSAENAMETOOLONG
-    case WSAENAMETOOLONG: return "enametoolong";
-#endif
-#ifdef WSAEHOSTDOWN
-    case WSAEHOSTDOWN: return "ehostdown";
-#endif
-#ifdef WSAEHOSTUNREACH
-    case WSAEHOSTUNREACH: return "ehostunreach";
-#endif
-#ifdef WSAENOTEMPTY
-    case WSAENOTEMPTY: return "enotempty";
-#endif
-#ifdef WSAEPROCLIM
-    case WSAEPROCLIM: return "eproclim";
-#endif
-#ifdef WSAEUSERS
-    case WSAEUSERS: return "eusers";
-#endif
-#ifdef WSAEDQUOT
-    case WSAEDQUOT: return "edquot";
-#endif
-#ifdef WSAESTALE
-    case WSAESTALE: return "estale";
-#endif
-#ifdef WSAEREMOTE
-    case WSAEREMOTE: return "eremote";
-#endif
-#ifdef WSASYSNOTREADY
-    case WSASYSNOTREADY: return "sysnotready";
-#endif
-#ifdef WSAVERNOTSUPPORTED
-    case WSAVERNOTSUPPORTED: return "vernotsupported";
-#endif
-#ifdef WSANOTINITIALISED
-    case WSANOTINITIALISED: return "notinitialised";
-#endif
-#ifdef WSAEDISCON
-    case WSAEDISCON: return "ediscon";
-#endif
-#ifdef WSAENOMORE
-    case WSAENOMORE: return "enomore";
-#endif
-#ifdef WSAECANCELLED
-    case WSAECANCELLED: return "ecancelled";
-#endif
-#ifdef WSAEINVALIDPROCTABLE
-    case WSAEINVALIDPROCTABLE: return "einvalidproctable";
-#endif
-#ifdef WSAEINVALIDPROVIDER
-    case WSAEINVALIDPROVIDER: return "einvalidprovider";
-#endif
-#ifdef WSAEPROVIDERFAILEDINIT
-    case WSAEPROVIDERFAILEDINIT: return "eproviderfailedinit";
-#endif
-#ifdef WSASYSCALLFAILURE
-    case WSASYSCALLFAILURE: return "syscallfailure";
-#endif
-#ifdef WSASERVICE_NOT_FOUND
-    case WSASERVICE_NOT_FOUND: return "service_not_found";
-#endif
-#ifdef WSATYPE_NOT_FOUND
-    case WSATYPE_NOT_FOUND: return "type_not_found";
-#endif
-#ifdef WSA_E_NO_MORE
-    case WSA_E_NO_MORE: return "e_no_more";
-#endif
-#ifdef WSA_E_CANCELLED
-    case WSA_E_CANCELLED: return "e_cancelled";
-#endif
-    default:
-	sprintf(errstrbuf, "unknown:%d", error); 
-	return errstrbuf;
-    }
-}
-
diff --git a/lib/ssl/c_src/esock_posix_str.h b/lib/ssl/c_src/esock_posix_str.h
deleted file mode 100644
index 53916c888a..0000000000
--- a/lib/ssl/c_src/esock_posix_str.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  %CopyrightBegin%
- *  
- *  Copyright Ericsson AB 1999-2009. 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.
- *  
- *  %CopyrightEnd%
- */
-
-/* esock_posix_str.h */
-
-#ifndef ESOCK_POSIX_STR_H
-#define ESOCK_POSIX_STR_H
-
-char *esock_posix_str(int error);
-
-#endif
-
diff --git a/lib/ssl/c_src/esock_ssl.h b/lib/ssl/c_src/esock_ssl.h
deleted file mode 100644
index 535e9a6491..0000000000
--- a/lib/ssl/c_src/esock_ssl.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*<copyright>
- * <year>1999-2008</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.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-/*
- * Purpose: Header file for adaptions to various SSL packages.
- */
-
-#ifndef ESOCK_SSL_H
-#define ESOCK_SSL_H
-
-#include <sys/types.h>
-#include <stdio.h>
-#include "esock.h"
-
-typedef struct {
-    const char *compile_version;/* version of OpenSSL when compiling esock */
-    const char *lib_version;	/* version of OpenSSL in library */
-} esock_version;
-
-/* Variables to be set by certain functions (see below) */
-char *esock_ssl_errstr;
-
-/* Ephemeral RSA and DH */
-int ephemeral_rsa, ephemeral_dh;
-
-/* Protocol version (sslv2, sslv3, tlsv1) */
-int protocol_version;
-
-/* version info */
-esock_version *esock_ssl_version(void);
-
-/* ciphers info */
-char *esock_ssl_ciphers(void);
-
-/* seeding */
-void esock_ssl_seed(void *buf, int len);
-
-/* Initialization and finalization of SSL */
-
-int esock_ssl_init(void);
-void esock_ssl_finish(void);
-
-/* Freeing of SSL resources for a connection */
-
-void esock_ssl_free(Connection *cp);
-
-/* Print error diagnostics to a file pointer */
-
-void esock_ssl_print_errors_fp(FILE *fp);
-
-/* All functions below have to return >= 0 on success, and < 0 on 
- * failure. 
- * 
- * If the return indicates a failure (return value < 0) and the failure
- * is temporary the error context (sock_errno()/sock_set_errno()) must
- * be set to ERRNO_BLOCK. 
- *
- * If the failure is permanent, the error context must be set to something
- * else than ERRNO_BLOCK, and `esock_ssl_errstr' must be set to point to
- * short diagnostic string describing the error.
- */
-
-int esock_ssl_accept_init(Connection *cp, void *listenssl);
-int esock_ssl_connect_init(Connection *cp);
-int esock_ssl_listen_init(Connection *cp);
-
-/* All functions below may involve non-blocking I/O with a temporary
- * failure.  Hence they have to have the error context set to
- * ERRNO_BLOCK, or else have esock_ssl_errstr set to point to a
- * diagnostic string, in case the return value is < 0. If the return
- * value is 0, cp->eof and cp->bp are set, if appropritate.
- */
-
-int esock_ssl_accept(Connection *cp);
-int esock_ssl_connect(Connection *cp);
-
-int esock_ssl_read(Connection *cp, char *buf, int len);
-int esock_ssl_write(Connection *cp, char *buf, int len);
-
-int esock_ssl_shutdown(Connection *cp);
-
-/* Peer certificate */
-
-int esock_ssl_getpeercert(Connection *cp, unsigned char **buf);
-int esock_ssl_getpeercertchain(Connection *cp, unsigned char **buf);
-
-/* Sessions */
-int esock_ssl_session_reused(Connection *cp);
-
-/* Protocol version and cipher of established connection */
-int esock_ssl_getprotocol_version(Connection *cp, char **buf);
-int esock_ssl_getcipher(Connection *cp, char **buf);
-
-#endif
diff --git a/lib/ssl/c_src/esock_utils.c b/lib/ssl/c_src/esock_utils.c
deleted file mode 100644
index 0098a4f5f6..0000000000
--- a/lib/ssl/c_src/esock_utils.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *  %CopyrightBegin%
- *  
- *  Copyright Ericsson AB 1999-2009. 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.
- *  
- *  %CopyrightEnd%
- */
-
-/*
- * Purpose: Safe memory allocation and other utilities.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "esock_utils.h"
-
-static char *strtok_quote(char *s1, const char *s2);
-
-
-void *esock_malloc(size_t size)
-{
-    void *p;
-
-    p = malloc(size);
-    if (!p) {
-	fprintf(stderr, "esock_malloc: cannot alloc %d bytes\n", size);
-	exit(EXIT_FAILURE);
-    }
-    return p;
-}
-
-void *esock_realloc(void *p, size_t size)
-{
-    void *np;
-
-    np = realloc(p, size);
-    if (!np) {
-	fprintf(stderr, "esock_realloc: cannot realloc %d bytes\n", size);
-	exit(EXIT_FAILURE);
-    }
-    return np;
-}
-
-void esock_free(void *p)
-{
-    free(p);
-}
-
-/* Builds an argv array from cmd. Spaces and tabs within double quotes
- * are not considered delimiters. Double quotes are removed.
- * 
- * The return value is argc, and the pointer to char ** is set. argc 
- * is non-negative, argv[0], ..., argv[argc - 1] are pointers to
- * strings, and argv[argc] == NULL.  All argv[0], ..., argv[argc - 1]
- * must be freed by the user, and also the argv pointer itself. 
- *
- * Example: cmd = abc"/program files/"olle nisse, results in 
- * argv[0] = abc/program files/olle, argv[1] = nisse, argc = 2.
- *
- */
-int esock_build_argv(char *cmd, char ***argvp)
-{
-    int argvsize = 10, argc = 0;
-    char *args, *tokp, *argp;
-    char **argv;
-
-    argv = esock_malloc(argvsize * sizeof(char *));
-    args = esock_malloc(strlen(cmd) + 1);
-    strcpy(args, cmd);
-    tokp = strtok_quote(args, " \t");
-    while (tokp != NULL) {
-	if (argc + 1 >= argvsize) {
-	    argvsize += 10;
-	    argv = esock_realloc(argv, argvsize * sizeof(char *));
-	}
-	argp = esock_malloc(strlen(tokp) + 1);
-	strcpy(argp, tokp);
-	argv[argc++] = argp;
-	tokp = strtok_quote(NULL, " \t");
-    }
-    esock_free(args);
-    argv[argc] = NULL;
-    *argvp = argv;
-    return argc;
-}
-
-/* strtok_quote
- * Works as strtok, but characters within pairs of double quotes are not 
- * considered as delimiters. Quotes are removed.
- */
-static char *strtok_quote(char *s1, const char *s2)
-{
-    static char *last;
-    char *s, *t, *u;
-
-    s = (s1) ? s1 : last;
-    if (!s) 
-	return last = NULL;
-
-    while (*s != '"' && *s != '\0' && strchr(s2, *s))
-	s++;
-    t = s;
-
-    while (1) {
-	if (*t == '"') {
-	    t++;
-	    while (*t != '"' && *t != '\0')
-		t++;
-	    if (*t == '\0') {
-		last = NULL;
-		goto end;
-	    }
-	    t++;
-	}
-	while(*t != '"' && *t != '\0' && !strchr(s2, *t))
-	    t++;
-	if (*t == '\0') {
-	    last = NULL;
-	    goto end;
-	} else if (*t != '"') {
-	    *t = '\0';
-	    last = t + 1;
-	    goto end;
-	}
-    }
-end:
-    /* Remove quotes */
-    u = t = s;
-    while (*u) {
-	if (*u == '"')
-	    u++;
-	else 
-	    *t++ = *u++;
-    }
-    *t = '\0';
-    return s;
-}
-
diff --git a/lib/ssl/c_src/esock_utils.h b/lib/ssl/c_src/esock_utils.h
deleted file mode 100644
index 99ed6c23e3..0000000000
--- a/lib/ssl/c_src/esock_utils.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  %CopyrightBegin%
- *  
- *  Copyright Ericsson AB 1999-2009. 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.
- *  
- *  %CopyrightEnd%
- */
-
-#ifndef ESOCK_UTILS_H
-#define ESOCK_UTILS_H
-
-#include <stdlib.h>
-
-void *esock_malloc(size_t size);
-void *esock_realloc(void *p, size_t size);
-void esock_free(void *p);
-int esock_build_argv(char *cmd, char ***argvp);
-
-#endif
-
-
diff --git a/lib/ssl/c_src/esock_winsock.h b/lib/ssl/c_src/esock_winsock.h
deleted file mode 100644
index 069782a18d..0000000000
--- a/lib/ssl/c_src/esock_winsock.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*<copyright>
- * <year>2003-2008</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.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-/*
- * Purpose:  Control winsock version and setting of FD_SETSIZE.
- *
- */
-
-/* Maybe set FD_SETSIZE */
-
-#ifdef ESOCK_WINSOCK2
-#include <winsock2.h>
-#else
-#include <winsock.h>
-/* These are defined in winsock2.h but not in winsock.h */
-#define SD_RECEIVE      0x00
-#define SD_SEND         0x01
-#define SD_BOTH         0x02
-#endif
-
diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile
index 3119d37af0..5d808d6727 100644
--- a/lib/ssl/doc/src/Makefile
+++ b/lib/ssl/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2010. All Rights Reserved.
+# Copyright Ericsson AB 1999-2011. 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
@@ -37,7 +37,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = refman.xml
-XML_REF3_FILES = ssl.xml old_ssl.xml ssl_session_cache_api.xml
+XML_REF3_FILES = ssl.xml ssl_session_cache_api.xml
 XML_REF6_FILES = ssl_app.xml
 
 XML_PART_FILES = release_notes.xml usersguide.xml
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index b2d17925fd..5df2632149 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -30,7 +30,59 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
   
-  <section>
+  <section><title>SSL 4.1.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    replace "a ssl" with "an ssl" reindent
+	    pkix_path_validation/3 Trivial documentation fixes
+	    (Thanks to Christian von Roques )</p>
+          <p>
+	    Own Id: OTP-9464</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Adds function clause to avoid denial of service attack.
+	    Thanks to Vinod for reporting this vulnerability.</p>
+          <p>
+	    Own Id: OTP-9364</p>
+        </item>
+        <item>
+          <p>
+	    Error handling code now takes care of inet:getopts/2 and
+	    inets:setopts/2 crashes. Thanks to Richard Jones for
+	    reporting this.</p>
+          <p>
+	    Own Id: OTP-9382</p>
+        </item>
+        <item>
+          <p>
+	    Support explicit use of packet option httph and httph_bin</p>
+          <p>
+	    Own Id: OTP-9461</p>
+        </item>
+        <item>
+          <p>
+	    Decoding of hello extensions could fail to come to the
+	    correct conclusion due to an error in a binary match
+	    pattern. Thanks to Ben Murphy.</p>
+          <p>
+	    Own Id: OTP-9589</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section>
     <title>SSL 4.1.5</title>
     
     <section><title>Improvements and New Features</title>
@@ -554,7 +606,7 @@
             Own Id: OTP-8224</p>
         </item>
         <item>
-            <p>A ssl:ssl_accept/3 could crash a connection if the
+            <p>An ssl:ssl_accept/3 could crash a connection if the
             timing was wrong.</p> <p>Removed info message if the
             socket closed without a proper disconnect from the ssl
             layer. </p> <p>ssl:send/2 is now blocking until the
@@ -770,7 +822,7 @@
         <item>
           <p>
             The new ssl implementation released as a alfa in this
-            version supports upgrading of a tcp connection to a ssl
+            version supports upgrading of a tcp connection to an ssl
             connection so that http client and servers may implement
             RFC 2817.</p>
           <p>
@@ -789,7 +841,7 @@
             very crippled as the control of the ssl-socket was deep
             down in openssl making it hard if not impossible to
             support all inet options, ipv6 and upgrade of a tcp
-            connection to a ssl connection. The alfa version has a
+            connection to an ssl connection. The alfa version has a
             few limitations that will be removed before the ssl-4.0
             release. Main differences and limitations in the alfa are
             listed below.</p>
diff --git a/lib/ssl/doc/src/old_ssl.xml b/lib/ssl/doc/src/old_ssl.xml
deleted file mode 100644
index 0d2e1afdbd..0000000000
--- a/lib/ssl/doc/src/old_ssl.xml
+++ /dev/null
@@ -1,709 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year><year>2010</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.
-
-    </legalnotice>
-
-    <title>ssl</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <responsible>Peter H&ouml;gfeldt</responsible>
-    <docno></docno>
-    <approved>Peter H&ouml;gfeldt</approved>
-    <checked></checked>
-    <date>2003-03-25</date>
-    <rev>D</rev>
-    <file>old_ssl.xml</file>
-  </header>
-  <module>old_ssl</module>
-  <modulesummary>Interface Functions for Secure Socket Layer</modulesummary>
-  <description>
-    <p>This module contains interface functions to the Secure Socket Layer.</p>
-  </description>
-
-  <section>
-    <title>General</title>
-
-    <p>This manual page describes functions that are defined
-      in the ssl module and represents the old ssl implementation
-      that coexists with the new one until it has been
-      totally phased out. </p>
-
-   <p>The old implementation can be
-      accessed by providing the option {ssl_imp, old} to the
-      ssl:connect and ssl:listen functions.</p>
-      
-    <p>The reader is advised to also read the <c>ssl(6)</c> manual page
-      describing the SSL application.
-      </p>
-    <warning>
-      <p>It is strongly advised to seed the random generator after
-        the ssl application has been started (see <c>seed/1</c>
-        below), and before any connections are established. Although
-        the port program interfacing to the ssl libraries does a
-        "random" seeding of its own in order to make everything work
-        properly, that seeding is by no means random for the world
-        since it has a constant value which is known to everyone
-        reading the source code of the port program.</p>
-    </warning>
-  </section>
-
-  <section>
-    <title>Common data types</title>
-    <p>The following datatypes are used in the functions below:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p><c>options() = [option()]</c></p>
-      </item>
-      <item>
-        <p><c>option() = socketoption() | ssloption()</c></p>
-      </item>
-      <item>
-        <p><c>socketoption() = {mode, list} | {mode, binary} |  binary | {packet, packettype()} | {header, integer()} | {nodelay, boolean()} | {active, activetype()} |  {backlog, integer()} | {ip, ipaddress()} | {port, integer()}</c></p>
-      </item>
-      <item>
-        <p><c>ssloption() = {verify, code()} | {depth, depth()} |  {certfile, path()} | {keyfile, path()} | {password, string()} | {cacertfile, path()} | {ciphers, string()}</c></p>
-      </item>
-      <item>
-        <p><c>packettype()</c>  (see inet(3))</p>
-      </item>
-      <item>
-        <p><c>activetype()</c>  (see inet(3))</p>
-      </item>
-      <item>
-        <p><c>reason() = atom() | {atom(), string()}</c></p>
-      </item>
-      <item>
-        <p><c>bytes() = [byte()]</c></p>
-      </item>
-      <item>
-        <p><c>string() = [byte()]</c></p>
-      </item>
-      <item>
-        <p><c>byte() = 0 | 1 | 2 | ... | 255</c></p>
-      </item>
-      <item>
-        <p><c>code() = 0 | 1 | 2</c></p>
-      </item>
-      <item>
-        <p><c>depth() = byte()</c></p>
-      </item>
-      <item>
-        <p><c>address() = hostname() | ipstring() | ipaddress()</c></p>
-      </item>
-      <item>
-        <p><c>ipaddress() = ipstring() | iptuple()</c></p>
-      </item>
-      <item>
-        <p><c>hostname() = string()</c></p>
-      </item>
-      <item>
-        <p><c>ipstring() = string()</c></p>
-      </item>
-      <item>
-        <p><c>iptuple() = {byte(), byte(), byte(), byte()}</c></p>
-      </item>
-      <item>
-        <p><c>sslsocket()</c></p>
-      </item>
-      <item>
-        <p><c>protocol() = sslv2 | sslv3 | tlsv1</c></p>
-      </item>
-      <item>
-        <p><c></c></p>
-      </item>
-    </list>
-    <p>The socket option <c>{backlog, integer()}</c> is for
-      <c>listen/2</c> only, and the option <c>{port, integer()}</c>
-      is for <c>connect/3/4</c> only. 
-      </p>
-    <p>The following socket options are set by default: <c>{mode, list}</c>, <c>{packet, 0}</c>, <c>{header, 0}</c>, <c>{nodelay, false}</c>, <c>{active, true}</c>, <c>{backlog, 5}</c>,
-      <c>{ip, {0,0,0,0}}</c>, and <c>{port, 0}</c>.
-      </p>
-    <p>Note that the options <c>{mode, binary}</c> and <c>binary</c>
-      are equivalent. Similarly <c>{mode, list}</c> and the absence of
-      option <c>binary</c> are equivalent. 
-      </p>
-    <p>The ssl options are for setting specific SSL parameters as follows:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p><c>{verify, code()}</c> Specifies type of verification:
-          0 = do not verify peer; 1 = verify peer, 2 = verify peer,
-          fail if no peer certificate.  The default value is 0.
-          </p>
-      </item>
-      <item>
-        <p><c>{depth, depth()}</c> Specifies the maximum
-          verification depth, i.e. how far in a chain of certificates
-          the verification process can proceed before the verification
-          is considered to fail. 
-          </p>
-        <p>Peer certificate = 0, CA certificate = 1, higher level CA
-          certificate = 2, etc.  The value 2 thus means that a chain
-          can at most contain peer cert, CA cert, next CA cert, and an
-          additional CA cert.
-          </p>
-        <p>The default value is 1.
-          </p>
-      </item>
-      <item>
-        <p><c>{certfile, path()}</c> Path to a file containing the
-          user's certificate.
-          chain of PEM encoded certificates.</p>
-      </item>
-      <item>
-        <p><c>{keyfile, path()}</c> Path to file containing user's
-          private PEM encoded key.</p>
-      </item>
-      <item>
-        <p><c>{password, string()}</c> String containing the user's
-          password. Only used if the private keyfile is password protected.</p>
-      </item>
-      <item>
-        <p><c>{cacertfile, path()}</c> Path to file containing PEM encoded
-          CA certificates (trusted certificates used for verifying a peer
-          certificate).</p>
-      </item>
-      <item>
-        <p><c>{ciphers, string()}</c> String of ciphers as a colon
-          separated list of ciphers. The function <c>ciphers/0</c> can
-          be used to find all available ciphers.</p>
-      </item>
-    </list>
-    <p>The type <c>sslsocket()</c> is opaque to the user.
-      </p>
-    <p>The owner of a socket is the one that created it by a call to
-      <c>transport_accept/[1,2]</c>,  <c>connect/[3,4]</c>,
-      or <c>listen/2</c>.
-      </p>
-    <p>When a socket is in active mode (the default), data from the
-      socket is delivered to the owner of the socket in the form of
-      messages:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p><c>{ssl, Socket, Data}</c></p>
-      </item>
-      <item>
-        <p><c>{ssl_closed, Socket}</c></p>
-      </item>
-      <item>
-        <p><c>{ssl_error, Socket, Reason}</c></p>
-      </item>
-    </list>
-    <p>A <c>Timeout</c> argument specifies a timeout in milliseconds. The 
-      default value for a <c>Timeout</c> argument is <c>infinity</c>.
-      </p>
-    <p>Functions listed below may return the value <c>{error, closed}</c>, which only indicates that the SSL socket is
-      considered closed for the operation in question. It is for
-      instance possible to have <c>{error, closed}</c> returned from
-      an call to <c>send/2</c>, and a subsequent call to <c>recv/3</c>
-      returning <c>{ok, Data}</c>.
-      </p>
-    <p>Hence a return value of <c>{error, closed}</c> must not be
-      interpreted as if the socket was completely closed. On the
-      contrary, in order to free all resources occupied by an SSL
-      socket, <c>close/1</c> must be called, or else the process owning
-      the socket has to terminate.
-      </p>
-    <p>For each SSL socket there is an Erlang process representing the
-      socket.  When a socket is opened, that process links to the
-      calling client process.  Implementations that want to detect
-      abnormal exits from the socket process by receiving <c>{'EXIT', Pid, Reason}</c> messages, should use the function <c>pid/1</c>
-      to retrieve the process identifier from the socket, in order to
-      be able to match exit messages properly.</p>
-  </section>
-  <funcs>
-    <func>
-      <name>ciphers() -> {ok, string()} | {error, enotstarted}</name>
-      <fsummary>Get supported ciphers.</fsummary>
-      <desc>
-        <p>Returns a string consisting of colon separated cipher
-          designations that are supported by the current SSL library
-          implementation.
-          </p>
-        <p>The SSL application has to be started to return the string
-          of ciphers.</p>
-      </desc>
-    </func>
-    <func>
-      <name>close(Socket) -> ok | {error, Reason}</name>
-      <fsummary>Close a socket returned by <c>transport_accept/[1,2]</c>, <c>connect/3/4</c>, or <c>listen/2</c>.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-      </type>
-      <desc>
-	<p>Closes a socket returned by <c>transport_accept/[1,2]</c>,
-	<c>connect/[3,4]</c>, or <c>listen/2</c></p>
-      </desc>
-    </func>
-    <func>
-      <name>connect(Address, Port, Options) -> {ok, Socket} | {error, Reason}</name>
-      <name>connect(Address, Port, Options, Timeout) -> {ok, Socket} | {error, Reason}</name>
-      <fsummary>Connect to <c>Port</c>at <c>Address</c>.</fsummary>
-      <type>
-        <v>Address = address()</v>
-        <v>Port = integer()</v>
-        <v>Options = [connect_option()]</v>
-        <v>connect_option() = {mode, list} | {mode, binary} | binary | {packet, packettype()} | {header, integer()} | {nodelay, boolean()} | {active, activetype()} | {ip, ipaddress()} | {port, integer()} | {verify, code()} | {depth, depth()} | {certfile, path()} | {keyfile, path()} | {password, string()} | {cacertfile, path()} | {ciphers, string()}</v>
-        <v>Timeout = integer()</v>
-        <v>Socket = sslsocket()</v>
-      </type>
-      <desc>
-        <p>Connects to <c>Port</c> at <c>Address</c>. If the optional 
-          <c>Timeout</c> argument is specified, and a connection could not
-          be established within the given time, <c>{error, timeout}</c> is
-          returned. The default value for <c>Timeout</c> is <c>infinity</c>.
-          </p>
-        <p>The <c>ip</c> and <c>port</c> options are for binding to a 
-          particular <em>local</em> address and port, respectively.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connection_info(Socket) -> {ok, {Protocol, Cipher}} | {error, Reason}</name>
-      <fsummary>Get current protocol version and cipher.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Protocol = protocol()</v>
-        <v>Cipher = string()</v>
-      </type>
-      <desc>
-        <p>Gets the chosen protocol version and cipher for an established
-          connection (accepted och connected). </p>
-      </desc>
-    </func>
-    <func>
-      <name>controlling_process(Socket, NewOwner) -> ok | {error, Reason}</name>
-      <fsummary>Assign a new controlling process to the socket.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>NewOwner = pid()</v>
-      </type>
-      <desc>
-        <p>Assigns a new controlling process to <c>Socket</c>. A controlling
-          process is the owner of a socket, and receives all messages from
-          the socket.</p>
-      </desc>
-    </func>
-    <func>
-      <name>format_error(ErrorCode) -> string()</name>
-      <fsummary>Return an error string.</fsummary>
-      <type>
-        <v>ErrorCode = term()</v>
-      </type>
-      <desc>
-        <p>Returns a diagnostic string describing an error.</p>
-      </desc>
-    </func>
-    <func>
-      <name>getopts(Socket, OptionsTags) -> {ok, Options} | {error, Reason}</name>
-      <fsummary>Get options set for socket</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>OptionTags = [optiontag()]()</v>
-      </type>
-      <desc>
-        <p>Returns the options the tags of which are <c>OptionTags</c> for
-          for the socket <c>Socket</c>. </p>
-      </desc>
-    </func>
-    <func>
-      <name>listen(Port, Options) -> {ok, ListenSocket} | {error, Reason}</name>
-      <fsummary>Set up a socket to listen on a port on the local host.</fsummary>
-      <type>
-        <v>Port = integer()</v>
-        <v>Options = [listen_option()]</v>
-        <v>listen_option() = {mode, list} | {mode, binary} | binary | {packet, packettype()} | {header, integer()} | {active, activetype()} | {backlog, integer()} | {ip, ipaddress()} | {verify, code()} | {depth, depth()} | {certfile, path()} | {keyfile, path()} | {password, string()} | {cacertfile, path()} | {ciphers, string()}</v>
-        <v>ListenSocket = sslsocket()</v>
-      </type>
-      <desc>
-        <p>Sets up a socket to listen on port <c>Port</c> at the local host.
-          If <c>Port</c> is zero, <c>listen/2</c> picks an available port
-          number (use <c>port/1</c> to retrieve it).
-          </p>
-        <p>The listen queue size defaults to 5. If a different value is 
-          wanted, the option <c>{backlog, Size}</c> should be added to the 
-          list of options.
-          </p>
-        <p>An empty <c>Options</c> list is considered an error, and
-          <c>{error, enooptions}</c> is returned.
-          </p>
-        <p>The returned <c>ListenSocket</c> can only be used in calls to 
-          <c>transport_accept/[1,2]</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>peercert(Socket) -> {ok, Cert} |  {error, Reason}</name>
-      <fsummary>Return the peer certificate.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Cert = binary()()</v>
-        <v>Subject = term()()</v>
-      </type>
-      <desc>
-	<p>Returns the DER encoded peer certificate, the certificate can be decoded with
-	  <c>public_key:pkix_decode_cert/2</c>.
-	</p>
-      </desc>
-    </func>
-    <func>
-      <name>peername(Socket) -> {ok, {Address, Port}} | {error, Reason}</name>
-      <fsummary>Return peer address and port.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Address = ipaddress()</v>
-        <v>Port = integer()</v>
-      </type>
-      <desc>
-        <p>Returns the address and port number of the peer.</p>
-      </desc>
-    </func>
-    <func>
-      <name>pid(Socket) -> pid()</name>
-      <fsummary>Return the pid of the socket process.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-      </type>
-      <desc>
-        <p>Returns the pid of the socket process. The returned pid should
-          only be used for receiving exit messages.</p>
-      </desc>
-    </func>
-    <func>
-      <name>recv(Socket, Length) -> {ok, Data} | {error, Reason}</name>
-      <name>recv(Socket, Length, Timeout) -> {ok, Data} | {error, Reason}</name>
-      <fsummary>Receive data on socket.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Length = integer() >= 0</v>
-        <v>Timeout = integer()</v>
-        <v>Data = bytes() | binary()</v>
-      </type>
-      <desc>
-        <p>Receives data on socket <c>Socket</c> when the socket is in
-          passive mode, i.e. when the option <c>{active, false}</c>
-          has been specified.
-          </p>
-        <p>A notable return value is <c>{error, closed}</c> which
-          indicates that the socket is closed.
-          </p>
-        <p>A positive value of the <c>Length</c> argument is only
-          valid when the socket is in raw mode (option <c>{packet, 0}</c> is set, and the option <c>binary</c> is <em>not</em>
-          set); otherwise it should be set to 0, whence all available
-          bytes are returned.
-          </p>
-        <p>If the optional <c>Timeout</c> parameter is specified, and
-          no data was available within the given time, <c>{error, timeout}</c> is returned. The default value for
-          <c>Timeout</c> is <c>infinity</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>seed(Data) -> ok | {error, Reason}</name>
-      <fsummary>Seed the ssl random generator.</fsummary>
-      <type>
-        <v>Data = iolist() | binary()</v>
-      </type>
-      <desc>
-        <p>Seeds the ssl random generator.
-          </p>
-        <p>It is strongly advised to seed the random generator after
-          the ssl application has been started, and before any
-          connections are established. Although the port program
-          interfacing to the OpenSSL libraries does a "random" seeding
-          of its own in order to make everything work properly, that
-          seeding is by no means random for the world since it has a 
-          constant value which is known to everyone reading the source
-          code of the seeding. 
-          </p>
-        <p>A notable return value is <c>{error, edata}}</c> indicating that
-          <c>Data</c> was not a binary nor an iolist.</p>
-      </desc>
-    </func>
-    <func>
-      <name>send(Socket, Data) -> ok | {error, Reason}</name>
-      <fsummary>Write data to a socket.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Data = iolist() | binary()</v>
-      </type>
-      <desc>
-        <p>Writes <c>Data</c> to <c>Socket</c>. </p>
-        <p>A notable return value is <c>{error, closed}</c> indicating that
-          the socket is closed.</p>
-      </desc>
-    </func>
-    <func>
-      <name>setopts(Socket, Options) -> ok | {error, Reason}</name>
-      <fsummary>Set socket options.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Options = [socketoption]()</v>
-      </type>
-      <desc>
-        <p>Sets options according to <c>Options</c> for the socket 
-          <c>Socket</c>. </p>
-      </desc>
-    </func>
-    <func>
-      <name>ssl_accept(Socket) -> ok | {error, Reason}</name>
-      <name>ssl_accept(Socket, Timeout) -> ok | {error, Reason}</name>
-      <fsummary>Perform server-side SSL handshake and key exchange</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Timeout = integer()</v>
-        <v>Reason = atom()</v>
-      </type>
-      <desc>
-        <p>The <c>ssl_accept</c> function establish the SSL connection
-          on the server side. It should be called directly after
-          <c>transport_accept</c>, in the spawned server-loop.</p>
-        <p>Note that the ssl connection is not complete until <c>ssl_accept</c>
-          has returned <c>true</c>, and if an error is returned, the socket
-          is unavailable and for instance <c>close/1</c> will crash.</p>
-      </desc>
-    </func>
-    <func>
-      <name>sockname(Socket) -> {ok, {Address, Port}} | {error, Reason}</name>
-      <fsummary>Return the local address and port.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Address = ipaddress()</v>
-        <v>Port = integer()</v>
-      </type>
-      <desc>
-        <p>Returns the local address and port number of the socket
-          <c>Socket</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>transport_accept(Socket) -> {ok, NewSocket} | {error, Reason}</name>
-      <name>transport_accept(Socket, Timeout) -> {ok, NewSocket} | {error, Reason}</name>
-      <fsummary>Accept an incoming connection and prepare for <c>ssl_accept</c></fsummary>
-      <type>
-        <v>Socket = NewSocket = sslsocket()</v>
-        <v>Timeout = integer()</v>
-        <v>Reason = atom()</v>
-      </type>
-      <desc>
-        <p>Accepts an incoming connection request on a listen socket.
-          <c>ListenSocket</c> must be a socket returned from <c>listen/2</c>.
-          The socket returned should be passed to <c>ssl_accept</c> to
-          complete ssl handshaking and establishing the connection.</p>
-        <warning>
-          <p>The socket returned can only be used with <c>ssl_accept</c>,
-            no traffic can be sent or received before that call.</p>
-        </warning>
-        <p>The accepted socket inherits the options set for <c>ListenSocket</c>
-          in <c>listen/2</c>.</p>
-        <p>The default value for <c>Timeout</c> is <c>infinity</c>. If 
-          <c>Timeout</c> is specified, and no connection is accepted within
-          the given time, <c>{error, timeout}</c> is returned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>version() -> {ok, {SSLVsn, CompVsn, LibVsn}}</name>
-      <fsummary>Return the version of SSL.</fsummary>
-      <type>
-        <v>SSLVsn = CompVsn = LibVsn = string()()</v>
-      </type>
-      <desc>
-        <p>Returns the SSL application version (<c>SSLVsn</c>), the library
-          version used when compiling the SSL application port program
-          (<c>CompVsn</c>), and the actual library version used when
-          dynamically linking in runtime (<c>LibVsn</c>).
-          </p>
-        <p>If the SSL application has not been started, <c>CompVsn</c> and
-          <c>LibVsn</c> are empty strings.
-          </p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>ERRORS</title>
-    <p>The possible error reasons and the corresponding diagnostic strings 
-      returned by <c>format_error/1</c> are either the same as those defined
-      in the <c>inet(3)</c> reference manual, or as follows:
-      </p>
-    <taglist>
-      <tag><c>closed</c></tag>
-      <item>
-        <p>Connection closed for the operation in question.
-          </p>
-      </item>
-      <tag><c>ebadsocket</c></tag>
-      <item>
-        <p>Connection not found (internal error).
-          </p>
-      </item>
-      <tag><c>ebadstate</c></tag>
-      <item>
-        <p>Connection not in connect state (internal error).
-          </p>
-      </item>
-      <tag><c>ebrokertype</c></tag>
-      <item>
-        <p>Wrong broker type (internal error).
-          </p>
-      </item>
-      <tag><c>ecacertfile</c></tag>
-      <item>
-        <p>Own CA certificate file is invalid.
-          </p>
-      </item>
-      <tag><c>ecertfile</c></tag>
-      <item>
-        <p>Own certificate file is invalid.
-          </p>
-      </item>
-      <tag><c>echaintoolong</c></tag>
-      <item>
-        <p>The chain of certificates provided by peer is too long.
-          </p>
-      </item>
-      <tag><c>ecipher</c></tag>
-      <item>
-        <p>Own list of specified ciphers is invalid.
-          </p>
-      </item>
-      <tag><c>ekeyfile</c></tag>
-      <item>
-        <p>Own private key file is invalid.
-          </p>
-      </item>
-      <tag><c>ekeymismatch</c></tag>
-      <item>
-        <p>Own private key does not match own certificate.
-          </p>
-      </item>
-      <tag><c>enoissuercert</c></tag>
-      <item>
-        <p>Cannot find certificate of issuer of certificate provided
-          by peer.
-          </p>
-      </item>
-      <tag><c>enoservercert</c></tag>
-      <item>
-        <p>Attempt to do accept without having set own certificate.
-          </p>
-      </item>
-      <tag><c>enotlistener</c></tag>
-      <item>
-        <p>Attempt to accept on a non-listening socket.
-          </p>
-      </item>
-      <tag><c>enoproxysocket</c></tag>
-      <item>
-        <p>No proxy socket found (internal error).
-          </p>
-      </item>
-      <tag><c>enooptions</c></tag>
-      <item>
-        <p>The list of options is empty.
-          </p>
-      </item>
-      <tag><c>enotstarted</c></tag>
-      <item>
-        <p>The SSL application has not been started.
-          </p>
-      </item>
-      <tag><c>eoptions</c></tag>
-      <item>
-        <p>Invalid list of options.
-          </p>
-      </item>
-      <tag><c>epeercert</c></tag>
-      <item>
-        <p>Certificate provided by peer is in error.
-          </p>
-      </item>
-      <tag><c>epeercertexpired</c></tag>
-      <item>
-        <p>Certificate provided by peer has expired.
-          </p>
-      </item>
-      <tag><c>epeercertinvalid</c></tag>
-      <item>
-        <p>Certificate provided by peer is invalid.
-          </p>
-      </item>
-      <tag><c>eselfsignedcert</c></tag>
-      <item>
-        <p>Certificate provided by peer is self signed.
-          </p>
-      </item>
-      <tag><c>esslaccept</c></tag>
-      <item>
-        <p>Server SSL handshake procedure between client and server failed.
-          </p>
-      </item>
-      <tag><c>esslconnect</c></tag>
-      <item>
-        <p>Client SSL handshake procedure between client and server failed.
-          </p>
-      </item>
-      <tag><c>esslerrssl</c></tag>
-      <item>
-        <p>SSL protocol failure. Typically because of a fatal alert 
-          from peer.
-          </p>
-      </item>
-      <tag><c>ewantconnect</c></tag>
-      <item>
-        <p>Protocol wants to connect, which is not supported in
-          this version of the SSL application.
-          </p>
-      </item>
-      <tag><c>ex509lookup</c></tag>
-      <item>
-        <p>Protocol wants X.509 lookup, which is not supported in
-          this version of the SSL application.
-          </p>
-      </item>
-      <tag><c>{badcall, Call}</c></tag>
-      <item>
-        <p>Call not recognized for current mode (active or passive) and
-          state of socket.
-          </p>
-      </item>
-      <tag><c>{badcast, Cast}</c></tag>
-      <item>
-        <p>Call not recognized for current mode (active or passive) and
-          state of socket. 
-          </p>
-      </item>
-      <tag><c>{badinfo, Info}</c></tag>
-      <item>
-        <p>Call not recognized for current mode (active or passive) and
-          state of socket.
-          </p>
-      </item>
-    </taglist>
-  </section>
-
-  <section>
-    <title>SEE ALSO</title>
-    <p>gen_tcp(3), inet(3) public_key(3) </p>
-  </section>
-  
-</erlref>
-
-
diff --git a/lib/ssl/doc/src/refman.xml b/lib/ssl/doc/src/refman.xml
index 68f84660f3..011819e82b 100644
--- a/lib/ssl/doc/src/refman.xml
+++ b/lib/ssl/doc/src/refman.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2010</year>
+      <year>1999</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -45,7 +45,6 @@
   </description>
   <xi:include href="ssl_app.xml"/>
   <xi:include href="ssl.xml"/>
-  <xi:include href="old_ssl.xml"/>
   <xi:include href="ssl_session_cache_api.xml"/>
 </application>
 
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 566068beaf..70122e4393 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -35,7 +35,7 @@
     <title>SSL</title>
 
     <list type="bulleted">
-      <item>ssl requires the crypto an public_key applications.</item>
+      <item>ssl requires the crypto and public_key applications.</item>
       <item>Supported SSL/TLS-versions are SSL-3.0 and TLS-1.0 </item>
       <item>For security reasons sslv2 is not supported.</item>
       <item>Ephemeral Diffie-Hellman cipher suites are supported
@@ -121,8 +121,6 @@
    <p> <c>hash() = md5 | sha
     </c></p>
 
-    <p><c>ssl_imp() = new | old - default is new.</c></p>
-    
   </section>
 
   <section>
@@ -177,9 +175,9 @@
       by the peer also.
       </item>
 
-      <tag>{ssl_imp, ssl_imp()}</tag>
-      <item>Specify which ssl implementation you want to use. Defaults to
-      new.
+      <tag>{ssl_imp, new | old}</tag>
+      <item>No longer has any meaning as the old implementation has
+      been removed, it will be ignored.
       </item>
 
       <tag>{secure_renegotiate, boolean()}</tag>
@@ -216,7 +214,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
 	application is encountered. Additionally it will be called
 	when a certificate is considered valid by the path validation
 	to allow access to each certificate in the path to the user
-	application. Note that the it will differentiate between the
+	application. Note that it will differentiate between the
 	peer certificate and CA certificates by using valid_peer or
 	valid as the second argument to the verify fun.  See <seealso
 	marker="public_key:cert_records">the public_key User's
@@ -326,10 +324,10 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
       </item>
 
       <tag>{fail_if_no_peer_cert, boolean()}</tag>
-      <item>Used together with {verify, verify_peer} by a ssl server.
+      <item>Used together with {verify, verify_peer} by an ssl server.
       If set to true, the server will fail if the client does not have
       a certificate to send, i.e. sends a empty certificate, if set to
-      false it will only fail if the client sends a invalid
+      false it will only fail if the client sends an invalid
       certificate (an empty certificate is considered valid).
       </item>
 
@@ -343,10 +341,10 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
       PeerCert, Compression, CipherSuite) -> boolean()}</tag>
       <item>Enables the ssl server to have a local policy
       for deciding if a session should be reused or not,
-      only meaning full if <c>reuse_sessions</c> is set to true.
+      only meaningful if <c>reuse_sessions</c> is set to true.
       SuggestedSessionId is a binary(),  PeerCert is a DER encoded
       certificate, Compression is an enumeration integer
-      and CipherSuite of type ciphersuite().      
+      and CipherSuite is of type ciphersuite().
       </item>
 
     </taglist>
@@ -355,7 +353,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
   <section>
     <title>General</title>
       
-    <p>When a ssl socket is in active mode (the default), data from the
+    <p>When an ssl socket is in active mode (the default), data from the
       socket is delivered to the owner of the socket in the form of
       messages:
     </p>
@@ -396,7 +394,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
       <name>connect(Socket, SslOptions, Timeout) -> {ok, SslSocket}
 	| {error, Reason}</name>
       <fsummary> Upgrades a gen_tcp, or
-	equivalent, connected socket to a ssl socket. </fsummary>
+	equivalent, connected socket to an ssl socket. </fsummary>
       <type>
         <v>Socket = socket()</v>
         <v>SslOptions = [ssloption()]</v>
@@ -405,7 +403,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
 	<v>Reason = term()</v>
       </type>
       <desc> <p>Upgrades a gen_tcp, or equivalent,
-	  connected socket to a ssl socket i.e. performs the
+	  connected socket to an ssl socket i.e. performs the
 	  client-side ssl handshake.</p>
     </desc>
     </func>
@@ -428,12 +426,12 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
 
     <func>
       <name>close(SslSocket) -> ok | {error, Reason}</name>
-      <fsummary>Close a ssl connection</fsummary>
+      <fsummary>Close an ssl connection</fsummary>
       <type>
 	  <v>SslSocket = sslsocket()</v>
 	  <v>Reason = term()</v>
       </type>
-      <desc><p>Close a ssl connection.</p>
+      <desc><p>Close an ssl connection.</p>
       </desc>
     </func>
 
@@ -450,7 +448,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
 	  <v>Reason = term()</v>
 	</type>
 	<desc><p>Assigns a new controlling process to the ssl-socket. A
-      controlling process is the owner of a ssl-socket, and receives
+      controlling process is the owner of an ssl-socket, and receives
       all messages from the socket.</p>
       </desc>
     </func>
@@ -496,14 +494,14 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
     <func>
       <name>listen(Port, Options) ->
 	{ok, ListenSocket} | {error, Reason}</name>
-      <fsummary>Creates a ssl listen socket.</fsummary>
+      <fsummary>Creates an ssl listen socket.</fsummary>
       <type>
 	<v>Port = integer()</v>
 	<v>Options = options()</v>
 	<v>ListenSocket = sslsocket()</v>
       </type>
       <desc>
-	<p>Creates a ssl listen socket.</p>
+	<p>Creates an ssl listen socket.</p>
       </desc>
     </func>
 
@@ -587,6 +585,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
           the socket is closed.</p>
       </desc>
     </func>
+
     <func>
       <name>setopts(Socket, Options) -> ok | {error, Reason}</name>
       <fsummary>Set socket options.</fsummary>
@@ -646,12 +645,12 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
       </type>
       <desc>
         <p> Upgrades a gen_tcp, or
-	  equivalent, socket to a ssl socket i.e. performs the
+	  equivalent, socket to an ssl socket i.e. performs the
 	ssl server-side handshake.</p>
-	<p><warning>Note that the listen socket should be in {active, false} mode
+	<warning><p>Note that the listen socket should be in {active, false} mode
 	before telling the client that the server is ready to upgrade
 	and calling this function, otherwise the upgrade may
-	or may not succeed depending on timing.</warning></p>
+	or may not succeed depending on timing.</p></warning>
       </desc>
     </func>
     
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index 7bcc12eb5f..4ae4ead3ee 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,36 +33,32 @@
   </header>
   <p>This chapter describes how the Erlang distribution can use 
     SSL to get additional verification and security.
-
-    <note><p>Note this
-    documentation is written for the old ssl implementation and
-    will be updated for the new one once this functionality is
-    supported by the new implementation.</p></note>
   </p>
 
   <section>
     <title>Introduction</title>
     <p>The Erlang distribution can in theory use almost any connection
       based protocol as bearer. A module that implements the protocol
-      specific parts of connection setup is however needed. The
+      specific parts of the connection setup is however needed. The
       default distribution module is <c>inet_tcp_dist</c> which is
       included in the Kernel application. When starting an
       Erlang node distributed, <c>net_kernel</c> uses this module to
       setup listen ports and connections. </p>
-    <p>In the SSL application there is an additional distribution
-      module, <c>inet_ssl_dist</c> which can be used as an
+
+      <p>In the SSL application there is an additional distribution
+      module, <c>inet_tls_dist</c> which can be used as an
       alternative. All distribution connections will be using SSL and
       all participating Erlang nodes in a distributed system must use
       this distribution module.</p>
-    <p>The security depends on how the connections are set up, one can
-      use key files or certificates to just get a encrypted
-      connection. One can also make the SSL package verify the
-      certificates of other nodes to get additional security. 
-      Cookies are however always used as they can be used to
-      differentiate between two different Erlang networks.</p>
+
+      <p>The security level depends on the parameters provided to the
+      SSL connection setup. Erlang node cookies are however always
+      used, as they can be used to differentiate between two different
+      Erlang networks.</p>
     <p>Setting up Erlang distribution over SSL involves some simple but
       necessary steps:</p>
-    <list type="bulleted">
+
+      <list type="bulleted">
       <item>Building boot scripts including the SSL application</item>
       <item>Specifying the distribution module for net_kernel</item>
       <item>Specifying security options and other SSL options</item>
@@ -77,122 +73,135 @@
       SASL application. Refer to the SASL documentations
       for more information on systools. This is only an example of
       what can be done.</p>
-    <p>The simplest boot script possible includes only the Kernel
+
+      <p>The simplest boot script possible includes only the Kernel
       and STDLIB applications. Such a script is located in the
       Erlang distributions bin directory. The source for the script
       can be found under the Erlang installation top directory under
-      <c><![CDATA[releases/<OTP version>start_clean.rel]]></c>. Copy that
+      <c><![CDATA[releases/<OTP version>/start_clean.rel]]></c>. Copy that
       script to another location (and preferably another name) 
-      and add the SSL application with its current version number
+      and add the applications crypto, public_key and SSL with their current version numbers
       after the STDLIB application.</p>
     <p>An example .rel file with SSL added may look like this:</p>
+
     <code type="none">
-{release, {"OTP  APN 181 01","P7A"}, {erts, "5.0"},
- [{kernel,"2.5"},
-  {stdlib,"1.8.1"},
-  {ssl,"2.2.1"}]}.    </code>
-    <p>Note that the version numbers surely will differ in your system.
-      Whenever one of the applications included in the script is
-      upgraded, the script has to be changed.</p>
-    <p>Assuming the above .rel file is stored in a file
-      <c>start_ssl.rel</c> in the current directory, a boot script 
-      can be built like this:</p>
-    <code type="none">
-1> systools:make_script("start_ssl",[]).    </code>
-    <p>There will now be a file <c>start_ssl.boot</c> in the current
-      directory. To test the boot script, start Erlang with the
-      <c>-boot</c> command line parameter specifying this boot script
-      (with its full path but without the <c>.boot</c> suffix), in
-      Unix it could look like this:</p>
-    <p></p>
-    <code type="none"><![CDATA[
+      {release, {"OTP  APN 181 01","R15A"}, {erts, "5.9"},
+      [{kernel,"2.15"},
+      {stdlib,"1.18"},
+      {crypto, "2.0.3"},
+      {public_key, "0.12"},
+      {ssl, "5.0"}
+      ]}.
+   </code>
+
+   <p>Note that the version numbers surely will differ in your system.
+   Whenever one of the applications included in the script is
+   upgraded, the script has to be changed.</p>
+   <p>Assuming the above .rel file is stored in a file
+   <c>start_ssl.rel</c> in the current directory, a boot script
+   can be built like this:</p>
+
+   <code type="none">
+   1> systools:make_script("start_ssl",[]).    </code>
+
+   <p>There will now be a file <c>start_ssl.boot</c> in the current
+   directory. To test the boot script, start Erlang with the
+   <c>-boot</c> command line parameter specifying this boot script
+   (with its full path but without the <c>.boot</c> suffix), in
+   Unix it could look like this:</p>
+   <p></p>
+
+   <code type="none"><![CDATA[
 $ erl -boot /home/me/ssl/start_ssl
 Erlang (BEAM) emulator version 5.0
  
 Eshell V5.0  (abort with ^G)
-1> whereis(ssl_server).
-<0.32.0>    ]]></code>
+1> whereis(ssl_manager).
+<0.41.0>    ]]></code>
     <p>The <c>whereis</c> function call verifies that the SSL
       application is really started.</p>
-    <p>As an alternative to building a bootscript, one can explicitly
-      add the path to the ssl <c>ebin</c> directory on the command
+
+      <p>As an alternative to building a bootscript, one can explicitly
+      add the path to the SSL <c>ebin</c> directory on the command
       line. This is done with the command line option <c>-pa</c>. This
-      works as the ssl application really need not be started for the
-      distribution to come up, a primitive version of the ssl server
-      is started by the distribution module itself, so as long as the
-      primitive code server can reach the code, the distribution will
+      works as the SSL application does not need to be started for the
+      distribution to come up, as a clone of the SSL application is
+      hooked into the kernel application, so as long as the
+      SSL applications code can be reached, the distribution will
       start. The <c>-pa</c> method is only recommended for testing
       purposes.</p>
+
+      <note><p>Note that the clone of the SSL application is necessary to
+      enable the use of the SSL code in such an early bootstage as
+      needed to setup the distribution, however this will make it
+      impossible to soft upgrade the SSL application.</p></note>
   </section>
 
   <section>
     <title>Specifying distribution module for net_kernel</title>
-    <p>The distribution module for SSL is named <c>inet_ssl_dist</c>
-      and is specified on the command line whit the <c>-proto_dist</c>
+    <p>The distribution module for SSL is named <c>inet_tls_dist</c>
+      and is specified on the command line with the <c>-proto_dist</c>
       option. The argument to <c>-proto_dist</c> should be the module
       name without the <c>_dist</c> suffix, so this distribution
-      module is specified with <c>-proto_dist inet_ssl</c> on the
+      module is specified with <c>-proto_dist inet_tls</c> on the
       command line.</p>
     <p></p>
+
     <p>Extending the command line from above gives us the following:</p>
     <code type="none">
-$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_ssl    </code>
-    <p>For the distribution to actually be started, we need to give
-      the emulator a name as well:</p>
+$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls    </code>
+
+<p>For the distribution to actually be started, we need to give
+the emulator a name as well:</p>
     <code type="none">
-$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_ssl -sname ssl_test
+$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls -sname ssl_test
 Erlang (BEAM) emulator version 5.0 [source]
  
 Eshell V5.0  (abort with ^G)
 (ssl_test@myhost)1>     </code>
     <p>Note however that a node started in this way will refuse to talk
-      to other nodes, as no certificates or key files are supplied
+      to other nodes, as no ssl parameters are supplied
       (see below).</p>
-    <p>When the SSL distribution starts, the OTP system is in its
-      early boot stage, why neither <c>application</c> nor <c>code</c>
-      are usable. As SSL needs to start a port program in this early
-      stage, it tries to determine the path to that program from the
-      primitive code loaders code path. If this fails, one need to
-      specify the directory where the port program resides. This can
-      be done either with an environment variable 
-      <c>ERL_SSL_PORTPROGRAM_DIR</c> or with the command line option
-      <c>-ssl_portprogram_dir</c>. The value should be the directory
-      where the <c>ssl_esock</c> port program is located. Note that
-      this option is never needed in a normal Erlang installation.</p>
   </section>
 
   <section>
-    <title>Specifying security options and other SSL options</title>
-    <p>For SSL to work, you either need certificate files or a
-      key file. Certificate files can be specified both when working as
-      client and as server (connecting or accepting). </p>
-    <p></p>
+    <title>Specifying SSL options</title> <p>For SSL to work, at least
+    a public key and certificate needs to be specified for the server
+    side.  In the following example the PEM-files consists of two
+    entries the servers certificate and its private key.</p>
+
     <p>On the <c>erl</c> command line one can specify options that the
-      ssl distribution will add when creation a socket. It is
-      mandatory to specify at least a key file or client and server
-      certificates. One can specify any <em>SSL option</em> on the
-      command line, but must not specify any socket options (like
-      packet size and such). The SSL options are listed in the
-      Reference Manual. The only difference between the
-      options in the reference manual and the ones that can be
-      specified to the distribution on the command line is that
-      <c>certfile</c> can (and usually needs to) be specified as
-      <c>client_certfile</c> and <c>server_certfile</c>. The
-      <c>client_certfile</c> is used when the distribution initiates a
-      connection to another node and the <c>server_certfile</c> is used
-      when accepting a connection from a remote node. </p>
-    <p>The command line argument for specifying the SSL options is named 
-      <c>-ssl_dist_opt</c> and should be followed by an even number of
-      SSL options/option values. The <c>-ssl_dist_opt</c> argument can
-      be repeated any number of times.</p>
-    <p>An example command line would now look something like this
+    SSL distribution will add when creating a socket.</p>
+
+    <p>One can specify the simpler SSL options certfile, keyfile,
+    password, cacertfile, verify, reuse_sessions,
+    secure_renegotiate, depth, hibernate_after and ciphers (use old
+    string format) by adding the prefix server_ or client_ to the
+    option name. The server can also take the options dhfile and
+    fail_if_no_peer_cert (also prefixed).
+    <c>client_</c>-prfixed options are used when the distribution initiates a
+    connection to another node and the <c>server_</c>-prefixed options are used
+    when accepting a connection from a remote node. </p>
+
+    <p> More complex options such as verify_fun are not available at
+    the moment but a mechanism to handle such options may be added in
+    a future release. </p>
+
+    <p> Raw socket options such as packet and size must not be specified on
+    the command line</p>.
+
+    <p>The command line argument for specifying the SSL options is named
+    <c>-ssl_dist_opt</c> and should be followed by pairs of
+    SSL options and their values. The <c>-ssl_dist_opt</c> argument can
+    be repeated any number of times.</p>
+
+      <p>An example command line would now look something like this
       (line breaks in the command are for readability, 
       they should not be there when typed):</p>
     <code type="none">
-$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_ssl 
-  -ssl_dist_opt client_certfile "/home/me/ssl/erlclient.pem" 
+$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls
   -ssl_dist_opt server_certfile "/home/me/ssl/erlserver.pem" 
-  -ssl_dist_opt verify 1 depth 1     
+  -ssl_dist_opt server_secure_renegotiate true client_secure_renegotiate true
   -sname ssl_test
 Erlang (BEAM) emulator version 5.0 [source]
  
@@ -211,12 +220,11 @@ Eshell V5.0  (abort with ^G)
       subsequent invocations of Erlang.</p>
     <p></p>
     <p>In a Unix (Bourne) shell it could look like this (line breaks for
-      readability):</p>
+      readability, they should not be there when typed):</p>
     <code type="none">
-$ ERL_FLAGS="-boot \\"/home/me/ssl/start_ssl\\" -proto_dist inet_ssl 
-  -ssl_dist_opt client_certfile \\"/home/me/ssl/erlclient.pem\\" 
-  -ssl_dist_opt server_certfile \\"/home/me/ssl/erlserver.pem\\" 
-  -ssl_dist_opt verify 1 -ssl_dist_opt depth 1"
+$ ERL_FLAGS="-boot /home/me/ssl/start_ssl -proto_dist inet_tls
+  -ssl_dist_opt server_certfile /home/me/ssl/erlserver.pem
+  -ssl_dist_opt server_secure_renegotiate true client_secure_renegotiate true"
 $ export ERL_FLAGS
 $ erl -sname ssl_test
 Erlang (BEAM) emulator version 5.0 [source]
@@ -227,15 +235,12 @@ Eshell V5.0  (abort with ^G)
  {progname,["erl "]},
  {sname,["ssl_test"]},
  {boot,["/home/me/ssl/start_ssl"]},
- {proto_dist,["inet_ssl"]},
- {ssl_dist_opt,["client_certfile","/home/me/ssl/erlclient.pem"]},
+ {proto_dist,["inet_tls"]},
  {ssl_dist_opt,["server_certfile","/home/me/ssl/erlserver.pem"]},
- {ssl_dist_opt,["verify","1"]},
- {ssl_dist_opt,["depth","1"]},
+ {ssl_dist_opt,["server_secure_renegotiate","true",
+                "client_secure_renegotiate","true"]
  {home,["/home/me"]}]    </code>
     <p>The <c>init:get_arguments()</c> call verifies that the correct
       arguments are supplied to the emulator. </p>
   </section>
 </chapter>
-
-
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml
index 6936408881..17268a634d 100644
--- a/lib/ssl/doc/src/ssl_protocol.xml
+++ b/lib/ssl/doc/src/ssl_protocol.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2010</year>
+      <year>2003</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -25,18 +25,18 @@
     <file>ssl_protocol.xml</file>
   </header>
   
-  <p>The erlang ssl application currently supports SSL 3.0 and TLS 1.0
+  <p>The erlang SSL application currently supports SSL 3.0 and TLS 1.0
   RFC 2246, and will in the future also support later versions of TLS.
   SSL 2.0 is not supported.
   </p>
 
-  <p>By default erlang ssl is run over the TCP/IP protocol even
-  though you could plug in an other reliable transport protocol
+  <p>By default erlang SSL is run over the TCP/IP protocol even
+  though you could plug in any other reliable transport protocol
   with the same API as gen_tcp.</p>
   
   <p>If a client and server wants to use an upgrade mechanism, such as
-  defined by RFC2817, to upgrade a regular TCP/IP connection to a ssl
-  connection the erlang ssl API supports this. This can be useful for
+  defined by RFC2817, to upgrade a regular TCP/IP connection to an SSL
+  connection the erlang SSL API supports this. This can be useful for
   things such as supporting HTTP and HTTPS on the same port and
   implementing virtual hosting.
   </p>
@@ -131,7 +131,7 @@
      connections. Sessions are used to avoid the expensive negotiation
      of new security parameters for each connection."</p>
 
-     <p>Session data is by default kept by the ssl application in a
+     <p>Session data is by default kept by the SSL application in a
      memory storage hence session data will be lost at application
      restart or takeover. Users may define their own callback module
      to handle session data storage if persistent data storage is
@@ -140,8 +140,8 @@
      possible to configure the amount of time the session data should be
      saved.</p>
 
-     <p>Ssl clients will by default try to reuse an available session,
-     ssl servers will by default agree to reuse sessions when clients
+     <p>SSL clients will by default try to reuse an available session,
+     SSL servers will by default agree to reuse sessions when clients
      ask to do so.</p>
 
    </section>
diff --git a/lib/ssl/doc/src/using_ssl.xml b/lib/ssl/doc/src/using_ssl.xml
index 605290b6f9..ab837a156a 100644
--- a/lib/ssl/doc/src/using_ssl.xml
+++ b/lib/ssl/doc/src/using_ssl.xml
@@ -56,7 +56,7 @@
       <code type="erl">1 server> ssl:start().
 ok</code>
       
-      <p>Create a ssl listen socket</p>
+      <p>Create an ssl listen socket</p>
       <code type="erl">2 server> {ok, ListenSocket} =
 ssl:listen(9999, [{certfile, "cert.pem"}, {keyfile, "key.pem"},{reuseaddr, true}]).
 {ok,{sslsocket, [...]}}</code>
@@ -90,7 +90,7 @@ ok</code>
     <section>
       <title>Upgrade example</title>
       
-      <note><p> To upgrade a TCP/IP connection to a ssl connection the
+      <note><p> To upgrade a TCP/IP connection to an ssl connection the
       client and server have to aggre to do so. Agreement
       may be accompliced by using a protocol such the one used by HTTP
       specified in RFC 2817.</p> </note>
@@ -114,7 +114,7 @@ ok</code>
       <code type="erl">2 client> {ok, Socket} = gen_tcp:connect("localhost", 9999,  [], infinity).</code>
       
       <p>Make sure active is set to false before trying
-      to upgrade a connection to a ssl connection, otherwhise
+      to upgrade a connection to an ssl connection, otherwhise
       ssl handshake messages may be deliverd to the wrong process.</p>
       <code type="erl">4 server> inet:setopts(Socket, [{active, false}]).
 ok</code>
@@ -124,7 +124,7 @@ ok</code>
 {certfile, "cert.pem"}, {keyfile, "key.pem"}]).
 {ok,{sslsocket,[...]}}</code>
       
-      <p> Upgrade to a ssl connection. Note that the client and server
+      <p> Upgrade to an ssl connection. Note that the client and server
       must agree upon the upgrade and the server must call
       ssl:accept/2 before the client calls ssl:connect/3.</p>
       <code type="erl">3 client>{ok, SSLSocket} = ssl:connect(Socket, [{cacertfile, "cacerts.pem"},
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index 7514ad2aa2..dc69b53b28 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2010. All Rights Reserved.
+# Copyright Ericsson AB 1999-2011. 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
@@ -41,12 +41,9 @@ MODULES= \
 	ssl \
 	ssl_alert \
 	ssl_app \
-	ssl_broker \
-	ssl_broker_sup \
-	ssl_server \
+	ssl_dist_sup\
 	ssl_sup \
-	ssl_prim \
-	inet_ssl_dist \
+	inet_tls_dist \
 	ssl_certificate\
 	ssl_certificate_db\
 	ssl_cipher \
@@ -62,9 +59,10 @@ MODULES= \
 	ssl_ssl2 \
 	ssl_ssl3 \
 	ssl_tls1 \
+	ssl_tls_dist_proxy
 
 INTERNAL_HRL_FILES = \
-	 ssl_int.hrl ssl_broker_int.hrl ssl_debug.hrl \
+	 ssl_debug.hrl \
 	 ssl_alert.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_internal.hrl \
 	 ssl_record.hrl
 
diff --git a/lib/ssl/src/inet_ssl_dist.erl b/lib/ssl/src/inet_ssl_dist.erl
deleted file mode 100644
index 6c0fbc0618..0000000000
--- a/lib/ssl/src/inet_ssl_dist.erl
+++ /dev/null
@@ -1,456 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2000-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
--module(inet_ssl_dist).
-
-%% Handles the connection setup phase with other Erlang nodes.
-
--export([childspecs/0, listen/1, accept/1, accept_connection/5,
-	 setup/5, close/1, select/1, is_node_name/1]).
-
-%% internal exports
-
--export([accept_loop/2,do_accept/6,do_setup/6, getstat/1,tick/1]).
-
--import(error_logger,[error_msg/2]).
-
--include("net_address.hrl").
-
-
-
--define(to_port(Socket, Data, Opts),
-	case ssl_prim:send(Socket, Data, Opts) of
-	    {error, closed} ->
-		self() ! {ssl_closed, Socket},
-	        {error, closed};
-	    R ->
-	        R
-        end).
-
-
--include("dist.hrl").
--include("dist_util.hrl").
-
-%% -------------------------------------------------------------
-%% This function should return a valid childspec, so that 
-%% the primitive ssl_server gets supervised
-%% -------------------------------------------------------------
-childspecs() ->
-    {ok, [{ssl_server_prim,{ssl_server, start_link_prim, []},
-	  permanent, 2000, worker, [ssl_server]}]}.
-
-
-%% ------------------------------------------------------------
-%%  Select this protocol based on node name
-%%  select(Node) => Bool
-%% ------------------------------------------------------------
-
-select(Node) ->
-    case split_node(atom_to_list(Node), $@, []) of
-	[_,_Host] -> true;
-	_ -> false
-    end.
-
-%% ------------------------------------------------------------
-%% Create the listen socket, i.e. the port that this erlang
-%% node is accessible through.
-%% ------------------------------------------------------------
-
-listen(Name) ->
-    case ssl_prim:listen(0, [{active, false}, {packet,4}] ++ 
-			 get_ssl_options(server)) of
-	{ok, Socket} ->
-	    TcpAddress = get_tcp_address(Socket),
-	    {_,Port} = TcpAddress#net_address.address,
-	    {ok, Creation} = erl_epmd:register_node(Name, Port),
-	    {ok, {Socket, TcpAddress, Creation}};
-	Error ->
-	    Error
-    end.
-
-%% ------------------------------------------------------------
-%% Accepts new connection attempts from other Erlang nodes.
-%% ------------------------------------------------------------
-
-accept(Listen) ->
-    spawn_link(?MODULE, accept_loop, [self(), Listen]).
-
-accept_loop(Kernel, Listen) ->
-    process_flag(priority, max),
-    case ssl_prim:accept(Listen) of
-	{ok, Socket} ->
-	    Kernel ! {accept,self(),Socket,inet,ssl},
-	    controller(Kernel, Socket),
-	    accept_loop(Kernel, Listen);
-	Error ->
-	    exit(Error)
-    end.
-
-controller(Kernel, Socket) ->
-    receive
-	{Kernel, controller, Pid} ->
-	    flush_controller(Pid, Socket),
-	    ssl_prim:controlling_process(Socket, Pid),
-	    flush_controller(Pid, Socket),
-	    Pid ! {self(), controller};
-	{Kernel, unsupported_protocol} ->
-	    exit(unsupported_protocol)
-    end.
-
-flush_controller(Pid, Socket) ->
-    receive
-	{ssl, Socket, Data} ->
-	    Pid ! {ssl, Socket, Data},
-	    flush_controller(Pid, Socket);
-	{ssl_closed, Socket} ->
-	    Pid ! {ssl_closed, Socket},
-	    flush_controller(Pid, Socket)
-    after 0 ->
-	    ok
-    end.
-
-%% ------------------------------------------------------------
-%% Accepts a new connection attempt from another Erlang node.
-%% Performs the handshake with the other side.
-%% ------------------------------------------------------------
-
-accept_connection(AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
-    spawn_link(?MODULE, do_accept,
-	       [self(), AcceptPid, Socket, MyNode,
-		Allowed, SetupTime]).
-
-%% Suppress dialyzer warning, we do not really care about old ssl code
-%% as we intend to remove it.
--spec(do_accept(_,_,_,_,_,_) -> no_return()).
-do_accept(Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
-    process_flag(priority, max),
-    receive
-	{AcceptPid, controller} ->
-	    Timer = dist_util:start_timer(SetupTime),
-	    case check_ip(Socket) of
-		true ->
-		    HSData = #hs_data{
-		      kernel_pid = Kernel,
-		      this_node = MyNode,
-		      socket = Socket,
-		      timer = Timer,
-		      this_flags = 0,
-		      allowed = Allowed,
-		      f_send = fun(S,D) -> ssl_prim:send(S,D) end,
-		      f_recv = fun(S,N,T) -> ssl_prim:recv(S,N,T) 
-			       end,
-		      f_setopts_pre_nodeup = 
-		      fun(S) ->
-			      ssl_prim:setopts(S, 
-					       [{active, false}])
-		      end,
-		      f_setopts_post_nodeup = 
-		      fun(S) ->
-			      ssl_prim:setopts(S, 
-					       [{deliver, port},
-						{active, true}])
-		      end,
-		      f_getll = fun(S) ->
-					ssl_prim:getll(S)
-				end,
-		      f_address = fun get_remote_id/2,
-		      mf_tick = fun ?MODULE:tick/1,
-		      mf_getstat = fun ?MODULE:getstat/1
-		     },
-		    dist_util:handshake_other_started(HSData);
-		{false,IP} ->
-		    error_msg("** Connection attempt from "
-			      "disallowed IP ~w ** ~n", [IP]),
-		    ?shutdown(no_node)
-	    end
-    end.
-
-%% ------------------------------------------------------------
-%% Get remote information about a Socket.
-%% ------------------------------------------------------------
-
-get_remote_id(Socket, Node) ->
-    {ok, Address} = ssl_prim:peername(Socket),
-    [_, Host] = split_node(atom_to_list(Node), $@, []),
-    #net_address {
-		  address = Address,
-		  host = Host,
-		  protocol = ssl,
-		  family = inet }.
-
-%% ------------------------------------------------------------
-%% Setup a new connection to another Erlang node.
-%% Performs the handshake with the other side.
-%% ------------------------------------------------------------
-
-setup(Node, Type, MyNode, LongOrShortNames,SetupTime) ->
-    spawn_link(?MODULE, do_setup, [self(),
-				   Node,
-				   Type,
-				   MyNode,
-				   LongOrShortNames,
-				   SetupTime]).
-
-%% Suppress dialyzer warning, we do not really care about old ssl code
-%% as we intend to remove it.
--spec(do_setup(_,_,_,_,_,_) -> no_return()).
-do_setup(Kernel, Node, Type, MyNode, LongOrShortNames,SetupTime) ->
-    process_flag(priority, max),
-    ?trace("~p~n",[{inet_ssl_dist,self(),setup,Node}]),
-    [Name, Address] = splitnode(Node, LongOrShortNames),
-    case inet:getaddr(Address, inet) of
-	{ok, Ip} ->
-	    Timer = dist_util:start_timer(SetupTime),
-	    case erl_epmd:port_please(Name, Ip) of
-		{port, TcpPort, Version} ->
-		    ?trace("port_please(~p) -> version ~p~n", 
-			   [Node,Version]),
-		    dist_util:reset_timer(Timer),
-		    case ssl_prim:connect(Ip, TcpPort, 
-					  [{active, false}, 
-					   {packet,4}] ++ 
-					  get_ssl_options(client)) of
-			{ok, Socket} ->
-			    HSData = #hs_data{
-			      kernel_pid = Kernel,
-			      other_node = Node,
-			      this_node = MyNode,
-			      socket = Socket,
-			      timer = Timer,
-			      this_flags = 0,
-			      other_version = Version,
-			      f_send = fun(S,D) -> 
-					       ssl_prim:send(S,D) 
-				       end,
-			      f_recv = fun(S,N,T) -> 
-					       ssl_prim:recv(S,N,T) 
-				       end,
-			      f_setopts_pre_nodeup = 
-			      fun(S) ->
-				      ssl_prim:setopts
-					(S, 
-					 [{active, false}])
-			      end,
-			      f_setopts_post_nodeup = 
-			      fun(S) ->
-				      ssl_prim:setopts
-					(S, 
-					 [{deliver, port},{active, true}])
-			      end,
-			      f_getll = fun(S) ->
-						ssl_prim:getll(S)
-					end,
-			      f_address = 
-			      fun(_,_) ->
-				      #net_address {
-				   address = {Ip,TcpPort},
-				   host = Address,
-				   protocol = ssl,
-				   family = inet}
-			      end,
-			      mf_tick = fun ?MODULE:tick/1,
-			      mf_getstat = fun ?MODULE:getstat/1,
-			      request_type = Type
-			     },
-			    dist_util:handshake_we_started(HSData);
-			_ ->
-			    %% Other Node may have closed since 
-			    %% port_please !
-			    ?trace("other node (~p) "
-				   "closed since port_please.~n", 
-				   [Node]),
-			    ?shutdown(Node)
-		    end;
-		_ ->
-		    ?trace("port_please (~p) "
-			   "failed.~n", [Node]),
-		    ?shutdown(Node)
-	    end;
-	_Other ->
-	    ?trace("inet_getaddr(~p) "
-		   "failed (~p).~n", [Node,Other]),
-	    ?shutdown(Node)
-    end.
-
-%%
-%% Close a socket.
-%%
-close(Socket) ->
-    ssl_prim:close(Socket).
-
-
-%% If Node is illegal terminate the connection setup!!
-splitnode(Node, LongOrShortNames) ->
-    case split_node(atom_to_list(Node), $@, []) of
-	[Name|Tail] when Tail =/= [] ->
-	    Host = lists:append(Tail),
-	    case split_node(Host, $., []) of
-		[_] when LongOrShortNames == longnames ->
-		    error_msg("** System running to use "
-			      "fully qualified "
-			      "hostnames **~n"
-			      "** Hostname ~s is illegal **~n",
-			      [Host]),
-		    ?shutdown(Node);
-		[_, _ | _] when LongOrShortNames == shortnames ->
-		    error_msg("** System NOT running to use fully qualified "
-			      "hostnames **~n"
-			      "** Hostname ~s is illegal **~n",
-			      [Host]),
-		    ?shutdown(Node);
-		_ ->
-		    [Name, Host]
-	    end;
-	[_] ->
-	    error_msg("** Nodename ~p illegal, no '@' character **~n",
-		      [Node]),
-	    ?shutdown(Node);
-	_ ->
-	    error_msg("** Nodename ~p illegal **~n", [Node]),
-	    ?shutdown(Node)
-    end.
-
-split_node([Chr|T], Chr, Ack) -> [lists:reverse(Ack)|split_node(T, Chr, [])];
-split_node([H|T], Chr, Ack)   -> split_node(T, Chr, [H|Ack]);
-split_node([], _, Ack)        -> [lists:reverse(Ack)].
-
-%% ------------------------------------------------------------
-%% Fetch local information about a Socket.
-%% ------------------------------------------------------------
-get_tcp_address(Socket) ->
-    {ok, Address} = ssl_prim:sockname(Socket),
-    {ok, Host} = inet:gethostname(),
-    #net_address {
-		  address = Address,
-		  host = Host,
-		  protocol = ssl,
-		  family = inet
-		 }.
-
-%% ------------------------------------------------------------
-%% Do only accept new connection attempts from nodes at our
-%% own LAN, if the check_ip environment parameter is true.
-%% ------------------------------------------------------------
-check_ip(Socket) ->
-    case application:get_env(check_ip) of
-	{ok, true} ->
-	    case get_ifs(Socket) of
-		{ok, IFs, IP} ->
-		    check_ip(IFs, IP);
-		_ ->
-		    ?shutdown(no_node)
-	    end;
-	_ ->
-	    true
-    end.
-
-get_ifs(Socket) ->
-    case ssl_prim:peername(Socket) of
-	{ok, {IP, _}} ->
-	    case ssl_prim:getif(Socket) of
-		{ok, IFs} -> {ok, IFs, IP};
-		Error     -> Error
-	    end;
-	Error ->
-	    Error
-    end.
-
-check_ip([{OwnIP, _, Netmask}|IFs], PeerIP) ->
-    case {mask(Netmask, PeerIP), mask(Netmask, OwnIP)} of
-	{M, M} -> true;
-	_      -> check_ip(IFs, PeerIP)
-    end;
-check_ip([], PeerIP) ->
-    {false, PeerIP}.
-    
-mask({M1,M2,M3,M4}, {IP1,IP2,IP3,IP4}) ->
-    {M1 band IP1,
-     M2 band IP2,
-     M3 band IP3,
-     M4 band IP4}.
-
-is_node_name(Node) when is_atom(Node) ->
-    case split_node(atom_to_list(Node), $@, []) of
-	[_, _Host] -> true;
-	_ -> false
-    end;
-is_node_name(_Node) ->
-    false.
-tick(Sock) ->
-    ?to_port(Sock,[],[force]).
-getstat(Socket) ->
-    case ssl_prim:getstat(Socket, [recv_cnt, send_cnt, send_pend]) of
-	{ok, Stat} ->
-	    split_stat(Stat,0,0,0);
-	Error ->
-	    Error
-    end.
-
-split_stat([{recv_cnt, R}|Stat], _, W, P) ->
-    split_stat(Stat, R, W, P);
-split_stat([{send_cnt, W}|Stat], R, _, P) ->
-    split_stat(Stat, R, W, P);
-split_stat([{send_pend, P}|Stat], R, W, _) ->
-    split_stat(Stat, R, W, P);
-split_stat([], R, W, P) ->
-    {ok, R, W, P}.
-
-
-get_ssl_options(Type) ->
-    case init:get_argument(ssl_dist_opt) of
-	{ok, Args} ->
-	    ssl_options(Type, Args);
-	_ ->
-	    []
-    end.
-
-ssl_options(_,[]) ->
-    [];
-ssl_options(server, [["server_certfile", Value]|T]) ->
-    [{certfile, Value} | ssl_options(server,T)];
-ssl_options(client, [["client_certfile", Value]|T]) ->
-    [{certfile, Value} | ssl_options(client,T)];
-ssl_options(server, [["server_cacertfile", Value]|T]) ->
-    [{cacertfile, Value} | ssl_options(server,T)];
-ssl_options(server, [["server_keyfile", Value]|T]) ->
-    [{keyfile, Value} | ssl_options(server,T)];
-ssl_options(Type, [["client_certfile", _Value]|T]) ->
-    ssl_options(Type,T);
-ssl_options(Type, [["server_certfile", _Value]|T]) ->
-    ssl_options(Type,T);
-ssl_options(Type, [[Item, Value]|T]) ->
-    [{atomize(Item),fixup(Value)} | ssl_options(Type,T)];
-ssl_options(Type, [[Item,Value |T1]|T2]) ->
-    ssl_options(atomize(Type),[[Item,Value],T1|T2]);
-ssl_options(_,_) ->
-    exit(malformed_ssl_dist_opt).
-    
-fixup(Value) ->
-    case catch list_to_integer(Value) of
-	{'EXIT',_} ->
-	    Value;
-	Int ->
-	    Int
-    end.
-
-atomize(List) when is_list(List) ->
-    list_to_atom(List);
-atomize(Atom) when is_atom(Atom) ->
-    Atom.
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl
new file mode 100644
index 0000000000..115527aae0
--- /dev/null
+++ b/lib/ssl/src/inet_tls_dist.erl
@@ -0,0 +1,275 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+-module(inet_tls_dist).
+
+-export([childspecs/0, listen/1, accept/1, accept_connection/5,
+	 setup/5, close/1, select/1, is_node_name/1]).
+
+-include_lib("kernel/include/net_address.hrl").
+-include_lib("kernel/include/dist.hrl").
+-include_lib("kernel/include/dist_util.hrl").
+
+childspecs() ->
+    {ok, [{ssl_dist_sup,{ssl_dist_sup, start_link, []},
+	   permanent, 2000, worker, [ssl_dist_sup]}]}.
+
+select(Node) ->
+    case split_node(atom_to_list(Node), $@, []) of
+	[_,_Host] -> 
+	    true;
+	_ -> 
+	    false
+    end.
+
+is_node_name(Node) when is_atom(Node) ->
+    select(Node);
+is_node_name(_) ->
+    false.
+
+listen(Name) ->
+    ssl_tls_dist_proxy:listen(Name).
+
+accept(Listen) ->
+    ssl_tls_dist_proxy:accept(Listen).
+
+accept_connection(AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
+    Kernel = self(),
+    spawn_link(fun() -> do_accept(Kernel, AcceptPid, Socket, 
+				  MyNode, Allowed, SetupTime) end).
+
+setup(Node, Type, MyNode, LongOrShortNames,SetupTime) ->
+    Kernel = self(),
+    spawn(fun() -> do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) end).
+		   
+do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
+    [Name, Address] = splitnode(Node, LongOrShortNames),
+    case inet:getaddr(Address, inet) of
+	{ok, Ip} ->
+	    Timer = dist_util:start_timer(SetupTime),
+	    case erl_epmd:port_please(Name, Ip) of
+		{port, TcpPort, Version} ->
+		    ?trace("port_please(~p) -> version ~p~n", 
+			   [Node,Version]),
+		    dist_util:reset_timer(Timer),
+		    case ssl_tls_dist_proxy:connect(Ip, TcpPort) of
+			{ok, Socket} ->
+			    HSData = connect_hs_data(Kernel, Node, MyNode, Socket, 
+						     Timer, Version, Ip, TcpPort, Address,
+						     Type),
+			    dist_util:handshake_we_started(HSData);
+			_ ->
+			    %% Other Node may have closed since 
+			    %% port_please !
+			    ?trace("other node (~p) "
+				   "closed since port_please.~n", 
+				   [Node]),
+			    ?shutdown(Node)
+		    end;
+		_ ->
+		    ?trace("port_please (~p) "
+			   "failed.~n", [Node]),
+		    ?shutdown(Node)
+	    end;
+	_Other ->
+	    ?trace("inet_getaddr(~p) "
+		   "failed (~p).~n", [Node,Other]),
+	    ?shutdown(Node)
+    end.
+
+close(Socket) ->
+    try
+	erlang:error(foo)
+    catch _:_ ->
+	    io:format("close called ~p ~p~n",[Socket, erlang:get_stacktrace()])
+    end,
+    gen_tcp:close(Socket),
+    ok.
+
+do_accept(Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
+    process_flag(priority, max),
+    receive
+	{AcceptPid, controller} ->
+	    Timer = dist_util:start_timer(SetupTime),
+	    case check_ip(Socket) of
+		true ->
+		    HSData = accept_hs_data(Kernel, MyNode, Socket, Timer, Allowed),
+		    dist_util:handshake_other_started(HSData);
+		{false,IP} ->
+		    error_logger:error_msg("** Connection attempt from "
+					   "disallowed IP ~w ** ~n", [IP]),
+		    ?shutdown(no_node)
+	    end
+    end.
+%% ------------------------------------------------------------
+%% Do only accept new connection attempts from nodes at our
+%% own LAN, if the check_ip environment parameter is true.
+%% ------------------------------------------------------------
+check_ip(Socket) ->
+    case application:get_env(check_ip) of
+	{ok, true} ->
+	    case get_ifs(Socket) of
+		{ok, IFs, IP} ->
+		    check_ip(IFs, IP);
+		_ ->
+		    ?shutdown(no_node)
+	    end;
+	_ ->
+	    true
+    end.
+
+get_ifs(Socket) ->
+    case inet:peername(Socket) of
+	{ok, {IP, _}} ->
+	    case inet:getif(Socket) of
+		{ok, IFs} -> {ok, IFs, IP};
+		Error     -> Error
+	    end;
+	Error ->
+	    Error
+    end.
+
+check_ip([{OwnIP, _, Netmask}|IFs], PeerIP) ->
+    case {mask(Netmask, PeerIP), mask(Netmask, OwnIP)} of
+	{M, M} -> true;
+	_      -> check_ip(IFs, PeerIP)
+    end;
+check_ip([], PeerIP) ->
+    {false, PeerIP}.
+
+mask({M1,M2,M3,M4}, {IP1,IP2,IP3,IP4}) ->
+    {M1 band IP1,
+     M2 band IP2,
+     M3 band IP3,
+     M4 band IP4};
+
+mask({M1,M2,M3,M4, M5, M6, M7, M8}, {IP1,IP2,IP3,IP4, IP5, IP6, IP7, IP8}) ->
+    {M1 band IP1,
+     M2 band IP2,
+     M3 band IP3,
+     M4 band IP4,
+     M5 band IP5,
+     M6 band IP6,
+     M7 band IP7,
+     M8 band IP8}.
+
+
+%% If Node is illegal terminate the connection setup!!
+splitnode(Node, LongOrShortNames) ->
+    case split_node(atom_to_list(Node), $@, []) of
+	[Name|Tail] when Tail =/= [] ->
+	    Host = lists:append(Tail),
+	    check_node(Name, Node, Host, LongOrShortNames);
+	[_] ->
+	    error_logger:error_msg("** Nodename ~p illegal, no '@' character **~n",
+		      [Node]),
+	    ?shutdown(Node);
+	_ ->
+	    error_logger:error_msg("** Nodename ~p illegal **~n", [Node]),
+	    ?shutdown(Node)
+    end.
+
+check_node(Name, Node, Host, LongOrShortNames) ->
+    case split_node(Host, $., []) of
+	[_] when LongOrShortNames == longnames ->
+	    error_logger:error_msg("** System running to use "
+		      "fully qualified "
+		      "hostnames **~n"
+		      "** Hostname ~s is illegal **~n",
+		      [Host]),
+	    ?shutdown(Node);
+	[_, _ | _] when LongOrShortNames == shortnames ->
+	    error_logger:error_msg("** System NOT running to use fully qualified "
+			      "hostnames **~n"
+		      "** Hostname ~s is illegal **~n",
+		      [Host]),
+	    ?shutdown(Node);
+	_ ->
+	    [Name, Host]
+    end.
+
+split_node([Chr|T], Chr, Ack) -> 
+    [lists:reverse(Ack)|split_node(T, Chr, [])];
+split_node([H|T], Chr, Ack) -> 
+    split_node(T, Chr, [H|Ack]);
+split_node([], _, Ack) -> 
+    [lists:reverse(Ack)].
+
+connect_hs_data(Kernel, Node, MyNode, Socket, Timer, Version, Ip, TcpPort, Address, Type) ->
+    common_hs_data(Kernel, MyNode, Socket, Timer, 
+		   #hs_data{other_node = Node,
+			    other_version = Version,
+			    f_address = 
+				fun(_,_) ->
+					#net_address{address = {Ip,TcpPort},
+						     host = Address,
+						     protocol = proxy,
+						     family = inet}
+				end,
+			    request_type = Type
+			   }).
+
+accept_hs_data(Kernel, MyNode, Socket, Timer, Allowed) ->
+    common_hs_data(Kernel, MyNode, Socket, Timer, #hs_data{
+					     allowed = Allowed,
+					     f_address = fun(S, N) -> 
+								 ssl_tls_dist_proxy:get_remote_id(S, N)
+							 end
+					    }).
+
+common_hs_data(Kernel, MyNode, Socket, Timer, HsData) ->
+    HsData#hs_data{
+      kernel_pid = Kernel,
+      this_node = MyNode,
+      socket = Socket,
+      timer = Timer,
+      this_flags = 0,
+      f_send = 
+	  fun(S,D) -> 
+		  gen_tcp:send(S,D) 
+	  end,
+      f_recv = 
+	  fun(S,N,T) -> 
+		  gen_tcp:recv(S,N,T) 
+	  end,
+      f_setopts_pre_nodeup = 
+	  fun(S) ->
+		  inet:setopts(S, [{active, false}, {packet, 4}])
+	  end,
+		   f_setopts_post_nodeup = 
+	  fun(S) -> 
+		  inet:setopts(S, [{deliver, port},{active, true}])
+	  end,
+      f_getll = 
+	  fun(S) -> 
+		  inet:getll(S) 
+	  end,
+      mf_tick = 
+	  fun(S) -> 
+		  gen_tcp:send(S, <<>>)
+	  end,
+      mf_getstat = 
+	  fun(S) ->
+		  {ok, Stats} = inet:getstat(S, [recv_cnt, send_cnt, send_pend]),
+		  R = proplists:get_value(recv_cnt, Stats, 0),
+		  W = proplists:get_value(send_cnt, Stats, 0),
+		  P = proplists:get_value(send_pend, Stats, 0),
+		  {ok, R,W,P}
+	  end}.
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index b9716786e6..13d5eaf4d7 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -4,11 +4,9 @@
     {modules, [ssl,
 	       ssl_app,
 	       ssl_sup,
-	       ssl_server,
-	       ssl_broker,
-	       ssl_broker_sup,
-	       ssl_prim,
-	       inet_ssl_dist,
+	       inet_tls_dist,
+	       ssl_tls_dist_proxy,
+	       ssl_dist_sup,
 	       ssl_tls1,
 	       ssl_ssl3,
 	       ssl_ssl2,
@@ -26,7 +24,7 @@
 	       ssl_certificate,
 	       ssl_alert
 	       ]},
-    {registered, [ssl_sup, ssl_server, ssl_broker_sup]},
+    {registered, [ssl_sup, ssl_manager]},
     {applications, [crypto, public_key, kernel, stdlib]},
     {env, []},
     {mod, {ssl_app, []}}]}.
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index a0aedbbbee..35f9410562 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -25,18 +25,15 @@
 
 -export([start/0, start/1, stop/0, transport_accept/1,
 	 transport_accept/2, ssl_accept/1, ssl_accept/2, ssl_accept/3,
-	 ciphers/0, cipher_suites/0, cipher_suites/1, close/1, shutdown/2,
+	 cipher_suites/0, cipher_suites/1, close/1, shutdown/2,
 	 connect/3, connect/2, connect/4, connection_info/1,
-	 controlling_process/2, listen/2, pid/1, peername/1, recv/2, recv/3,
-	 send/2, getopts/2, setopts/2, seed/1, sockname/1, peercert/1,
-	 peercert/2, version/0, versions/0, session_info/1, format_error/1,
+	 controlling_process/2, listen/2, pid/1, peername/1, peercert/1,
+	 recv/2, recv/3, send/2, getopts/2, setopts/2, sockname/1,
+	 versions/0, session_info/1, format_error/1,
 	 renegotiate/1]).
 
-%% Should be deprecated as soon as old ssl is removed
-%%-deprecated({pid, 1, next_major_release}).
--deprecated({peercert, 2, next_major_release}).
+-deprecated({pid, 1, next_major_release}).
 
--include("ssl_int.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl").
 -include("ssl_cipher.hrl").
@@ -49,9 +46,12 @@
 		 inet_ssl,          %% inet options for internal ssl socket 
 		 cb                 %% Callback info
 		}).
--type option()       :: socketoption() | ssloption() | transportoption().
--type socketoption() :: term(). %% See gen_tcp and inet, import spec later when there is one to import
--type ssloption()    :: {verify, verify_type()} |
+-type connect_option()           :: socket_connect_option() | ssl_option() | transport_option().
+-type socket_connect_option()    :: gen_tcp:connect_option().
+-type listen_option()            :: socket_listen_option() | ssl_option() | transport_option().
+-type socket_listen_option()     :: gen_tcp:listen_option().
+
+-type ssl_option()    :: {verify, verify_type()} |
 			{verify_fun, {fun(), InitialUserState::term()}} |
                         {fail_if_no_peer_cert, boolean()} | {depth, integer()} |
                         {cert, Der::binary()} | {certfile, path()} | {key, Der::binary()} |
@@ -66,7 +66,7 @@
 			string(). % (according to old API)
 -type ssl_imp()      :: new | old.
 
--type transportoption() :: {CallbackModule::atom(), DataTag::atom(), ClosedTag::atom()}.
+-type transport_option() :: {cb_info, {CallbackModule::atom(), DataTag::atom(), ClosedTag::atom()}}.
 
 
 %%--------------------------------------------------------------------
@@ -96,15 +96,15 @@ stop() ->
     application:stop(ssl).
 
 %%--------------------------------------------------------------------
--spec connect(host() | port(), [option()]) -> {ok, #sslsocket{}} |
+-spec connect(host() | port(), [connect_option()]) -> {ok, #sslsocket{}} |
 					      {error, reason()}.
--spec connect(host() | port(), [option()] | port_num(), timeout() | list()) ->
+-spec connect(host() | port(), [connect_option()] | inet:port_number(), timeout() | list()) ->
 		     {ok, #sslsocket{}} | {error, reason()}.
--spec connect(host() | port(), port_num(), list(), timeout()) ->
+-spec connect(host() | port(), inet:port_number(), list(), timeout()) ->
 		     {ok, #sslsocket{}} | {error, reason()}.
 
 %%
-%% Description: Connect to a ssl server.
+%% Description: Connect to an ssl server.
 %%--------------------------------------------------------------------
 connect(Socket, SslOptions) when is_port(Socket) ->
     connect(Socket, SslOptions, infinity).
@@ -131,59 +131,49 @@ connect(Socket, SslOptions0, Timeout) when is_port(Socket) ->
 connect(Host, Port, Options) ->
     connect(Host, Port, Options, infinity).
 
-connect(Host, Port, Options0, Timeout) ->
-    case proplists:get_value(ssl_imp, Options0, new) of
-        new ->
-            new_connect(Host, Port, Options0, Timeout);
-        old ->
-	    %% Allow the option reuseaddr to be present
-	    %% so that new and old ssl can be run by the same
-	    %% code, however the option will be ignored by old ssl
-	    %% that hardcodes reuseaddr to true in its portprogram.
-	    Options1 = proplists:delete(reuseaddr, Options0),
-	    Options  = proplists:delete(ssl_imp, Options1),
-            old_connect(Host, Port, Options, Timeout);
-	Value ->
-	    {error, {eoptions, {ssl_imp, Value}}}
+connect(Host, Port, Options, Timeout) ->
+    try handle_options(Options, client) of
+	{ok, Config} ->
+	    do_connect(Host,Port,Config,Timeout)
+    catch
+	throw:Error ->
+	    Error
     end.
 
 %%--------------------------------------------------------------------
--spec listen(port_num(), [option()]) ->{ok, #sslsocket{}} | {error, reason()}.
+-spec listen(inet:port_number(), [listen_option()]) ->{ok, #sslsocket{}} | {error, reason()}.
 		    
 %%
-%% Description: Creates a ssl listen socket.
+%% Description: Creates an ssl listen socket.
 %%--------------------------------------------------------------------
 listen(_Port, []) ->
     {error, enooptions};
 listen(Port, Options0) ->
-    case proplists:get_value(ssl_imp, Options0, new) of
-	new ->
-	    new_listen(Port, Options0);
-	old ->
-	    %% Allow the option reuseaddr to be present
-	    %% so that new and old ssl can be run by the same
-	    %% code, however the option will be ignored by old ssl
-	    %% that hardcodes reuseaddr to true in its portprogram.
-	    Options1 = proplists:delete(reuseaddr, Options0),
-	    Options  = proplists:delete(ssl_imp, Options1),
-	    old_listen(Port, Options);
-	Value ->
-	    {error, {eoptions, {ssl_imp, Value}}}
+    try
+	{ok, Config} = handle_options(Options0, server),
+	#config{cb={CbModule, _, _, _},inet_user=Options} = Config,
+	case CbModule:listen(Port, Options) of
+	    {ok, ListenSocket} ->
+		{ok, #sslsocket{pid = {ListenSocket, Config}, fd = new_ssl}};
+	    Err = {error, _} ->
+		Err
+	end
+    catch
+	Error = {error, _} ->
+	    Error
     end.
-
 %%--------------------------------------------------------------------
 -spec transport_accept(#sslsocket{}) -> {ok, #sslsocket{}} |
 					{error, reason()}.
 -spec transport_accept(#sslsocket{}, timeout()) -> {ok, #sslsocket{}} |
 						   {error, reason()}.
 %%
-%% Description: Performs transport accept on a ssl listen socket 
+%% Description: Performs transport accept on an ssl listen socket
 %%--------------------------------------------------------------------
 transport_accept(ListenSocket) ->
     transport_accept(ListenSocket, infinity).
 
-transport_accept(#sslsocket{pid = {ListenSocket, #config{cb=CbInfo, ssl=SslOpts}},
-                            fd = new_ssl}, Timeout) ->
+transport_accept(#sslsocket{pid = {ListenSocket, #config{cb=CbInfo, ssl=SslOpts}}}, Timeout) ->
     
     %% The setopt could have been invoked on the listen socket
     %% and options should be inherited.
@@ -205,35 +195,25 @@ transport_accept(#sslsocket{pid = {ListenSocket, #config{cb=CbInfo, ssl=SslOpts}
 	    end;
 	{error, Reason} ->
 	    {error, Reason}
-    end;
-
-transport_accept(#sslsocket{} = ListenSocket, Timeout) ->
-    ensure_old_ssl_started(),
-    {ok, Pid} = ssl_broker:start_broker(acceptor),
-    ssl_broker:transport_accept(Pid, ListenSocket, Timeout).
+    end.
 
 %%--------------------------------------------------------------------
 -spec ssl_accept(#sslsocket{}) -> ok | {error, reason()}.
--spec ssl_accept(#sslsocket{} | port(), timeout()| [option()]) ->
+-spec ssl_accept(#sslsocket{} | port(), timeout()| [ssl_option() | transport_option()]) ->
 			ok | {ok, #sslsocket{}} | {error, reason()}.
--spec ssl_accept(port(), [option()], timeout()) -> {ok, #sslsocket{}} | {error, reason()}.
+-spec ssl_accept(port(), [ssl_option()| transport_option()], timeout()) -> {ok, #sslsocket{}} | {error, reason()}.
 %%
-%% Description: Performs accept on a ssl listen socket. e.i. performs
+%% Description: Performs accept on an ssl listen socket. e.i. performs
 %%              ssl handshake. 
 %%--------------------------------------------------------------------
 ssl_accept(ListenSocket) ->
     ssl_accept(ListenSocket, infinity).
 
-ssl_accept(#sslsocket{fd = new_ssl} = Socket, Timeout) ->
+ssl_accept(#sslsocket{} = Socket, Timeout) ->
     ssl_connection:handshake(Socket, Timeout);
     
 ssl_accept(ListenSocket, SslOptions)  when is_port(ListenSocket) -> 
-    ssl_accept(ListenSocket, SslOptions, infinity);
-
-%% Old ssl
-ssl_accept(#sslsocket{} = Socket, Timeout)  ->
-    ensure_old_ssl_started(),
-    ssl_broker:ssl_accept(Socket, Timeout).
+    ssl_accept(ListenSocket, SslOptions, infinity).
 
 ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket) -> 
     EmulatedOptions = emulated_options(),
@@ -252,27 +232,20 @@ ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket) ->
 %%--------------------------------------------------------------------
 -spec  close(#sslsocket{}) -> term().
 %%
-%% Description: Close a ssl connection
+%% Description: Close an ssl connection
 %%--------------------------------------------------------------------  
-close(#sslsocket{pid = {ListenSocket, #config{cb={CbMod,_, _, _}}}, fd = new_ssl}) ->
+close(#sslsocket{pid = {ListenSocket, #config{cb={CbMod,_, _, _}}}}) ->
     CbMod:close(ListenSocket);
-close(#sslsocket{pid = Pid, fd = new_ssl}) ->
-    ssl_connection:close(Pid);
-close(Socket = #sslsocket{}) ->
-    ensure_old_ssl_started(),
-    ssl_broker:close(Socket).
+close(#sslsocket{pid = Pid}) ->
+    ssl_connection:close(Pid).
 
 %%--------------------------------------------------------------------
 -spec send(#sslsocket{}, iodata()) -> ok | {error, reason()}.
 %% 
 %% Description: Sends data over the ssl connection
 %%--------------------------------------------------------------------
-send(#sslsocket{pid = Pid, fd = new_ssl}, Data) ->
-    ssl_connection:send(Pid, Data);
-
-send(#sslsocket{} = Socket, Data) -> 
-    ensure_old_ssl_started(),
-    ssl_broker:send(Socket, Data).
+send(#sslsocket{pid = Pid}, Data) ->
+    ssl_connection:send(Pid, Data).
 
 %%--------------------------------------------------------------------
 -spec recv(#sslsocket{}, integer()) -> {ok, binary()| list()} | {error, reason()}.
@@ -283,11 +256,7 @@ send(#sslsocket{} = Socket, Data) ->
 recv(Socket, Length) ->
     recv(Socket, Length, infinity).
 recv(#sslsocket{pid = Pid, fd = new_ssl}, Length, Timeout) ->
-    ssl_connection:recv(Pid, Length, Timeout);
-
-recv(Socket = #sslsocket{}, Length, Timeout) ->
-    ensure_old_ssl_started(),
-    ssl_broker:recv(Socket, Length, Timeout).
+    ssl_connection:recv(Pid, Length, Timeout).
 
 %%--------------------------------------------------------------------
 -spec controlling_process(#sslsocket{}, pid()) -> ok | {error, reason()}.
@@ -295,13 +264,8 @@ recv(Socket = #sslsocket{}, Length, Timeout) ->
 %% Description: Changes process that receives the messages when active = true
 %% or once. 
 %%--------------------------------------------------------------------
-controlling_process(#sslsocket{pid = Pid, fd = new_ssl}, NewOwner) 
-  when is_pid(Pid) ->
-    ssl_connection:new_user(Pid, NewOwner);
-
-controlling_process(Socket, NewOwner) when is_pid(NewOwner) ->
-    ensure_old_ssl_started(),
-    ssl_broker:controlling_process(Socket, NewOwner).
+controlling_process(#sslsocket{pid = Pid}, NewOwner) when is_pid(Pid) ->
+    ssl_connection:new_user(Pid, NewOwner).
 
 %%--------------------------------------------------------------------
 -spec connection_info(#sslsocket{}) -> 	{ok, {tls_atom_version(), erl_cipher_suite()}} | 
@@ -309,81 +273,30 @@ controlling_process(Socket, NewOwner) when is_pid(NewOwner) ->
 %%
 %% Description: Returns ssl protocol and cipher used for the connection
 %%--------------------------------------------------------------------
-connection_info(#sslsocket{pid = Pid, fd = new_ssl}) ->
-    ssl_connection:info(Pid);
+connection_info(#sslsocket{pid = Pid}) ->
+    ssl_connection:info(Pid).
 
-connection_info(#sslsocket{} = Socket) -> 
-    ensure_old_ssl_started(),
-    ssl_broker:connection_info(Socket).
+%%--------------------------------------------------------------------
+-spec peername(#sslsocket{}) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}.
+%%
+%% Description: same as inet:peername/1.
+%%--------------------------------------------------------------------
+peername(#sslsocket{pid = Pid}) ->
+    ssl_connection:peername(Pid).
 
 %%--------------------------------------------------------------------
--spec peercert(#sslsocket{}) ->{ok, der_cert()} | {error, reason()}.
+-spec peercert(#sslsocket{}) ->{ok, DerCert::binary()} | {error, reason()}.
 %%
 %% Description: Returns the peercert.
 %%--------------------------------------------------------------------
-peercert(Socket) ->
-    peercert(Socket, []).
-
-peercert(#sslsocket{pid = Pid, fd = new_ssl}, Opts) ->
+peercert(#sslsocket{pid = Pid}) ->
     case ssl_connection:peer_certificate(Pid) of
 	{ok, undefined} ->
 	    {error, no_peercert};
-        {ok, BinCert} ->
-	    decode_peercert(BinCert, Opts);
-        {error, Reason}  ->
-            {error, Reason}
-    end;
-
-peercert(#sslsocket{} = Socket, Opts) ->
-    ensure_old_ssl_started(),
-    case ssl_broker:peercert(Socket) of
-        {ok, Bin} ->
-	    decode_peercert(Bin, Opts);
-        {error, Reason}  ->
-            {error, Reason}
-    end.
-
-
-decode_peercert(BinCert, Opts) ->
-    PKOpts = [case Opt of ssl -> otp; pkix -> plain end || 
-		 Opt <- Opts, Opt =:= ssl orelse Opt =:= pkix],
-    case PKOpts of
-	[Opt] ->
-	    select_part(Opt, public_key:pkix_decode_cert(BinCert, Opt), Opts);
-	[] ->
-	    {ok, BinCert}
+        Result ->
+	    Result
     end.
 
-select_part(otp, Cert, Opts) ->
-    case lists:member(subject, Opts) of 
-	true ->
-	    TBS = Cert#'OTPCertificate'.tbsCertificate,
-	    {ok, TBS#'OTPTBSCertificate'.subject};
-	false ->
-	    {ok, Cert}
-    end;
-
-select_part(plain, Cert, Opts) ->
-    case lists:member(subject, Opts) of 
-	true ->
-	    TBS = Cert#'Certificate'.tbsCertificate,
-	    {ok,  TBS#'TBSCertificate'.subject};
-	false ->
-	    {ok, Cert}
-    end.
-
-%%--------------------------------------------------------------------
--spec peername(#sslsocket{}) -> {ok, {tuple(), port_num()}} | {error, reason()}.
-%%
-%% Description: same as inet:peername/1.
-%%--------------------------------------------------------------------
-peername(#sslsocket{fd = new_ssl, pid = Pid}) ->
-    ssl_connection:peername(Pid);
-
-peername(#sslsocket{} = Socket) ->
-    ensure_old_ssl_started(),
-    ssl_broker:peername(Socket).
-
 %%--------------------------------------------------------------------
 -spec cipher_suites() -> [erl_cipher_suite()].
 -spec cipher_suites(erlang | openssl) -> [erl_cipher_suite()] | [string()].
@@ -402,13 +315,14 @@ cipher_suites(openssl) ->
     [ssl_cipher:openssl_suite_name(S) || S <- ssl_cipher:suites(Version)].
 
 %%--------------------------------------------------------------------
--spec getopts(#sslsocket{}, [atom()]) -> {ok, [{atom(), term()}]} | {error, reason()}.
+-spec getopts(#sslsocket{}, [gen_tcp:option_name()]) ->
+		     {ok, [gen_tcp:option()]} | {error, reason()}.
 %% 
 %% Description: Gets options
 %%--------------------------------------------------------------------
-getopts(#sslsocket{fd = new_ssl, pid = Pid}, OptionTags) when is_pid(Pid), is_list(OptionTags) ->
+getopts(#sslsocket{pid = Pid}, OptionTags) when is_pid(Pid), is_list(OptionTags) ->
     ssl_connection:get_opts(Pid, OptionTags);
-getopts(#sslsocket{fd = new_ssl, pid = {ListenSocket, _}}, OptionTags) when is_list(OptionTags) ->
+getopts(#sslsocket{pid = {ListenSocket, _}}, OptionTags) when is_list(OptionTags) ->
     try inet:getopts(ListenSocket, OptionTags) of
 	{ok, _} = Result ->
 	    Result;
@@ -418,18 +332,15 @@ getopts(#sslsocket{fd = new_ssl, pid = {ListenSocket, _}}, OptionTags) when is_l
 	_:_ ->
 	    {error, {eoptions, {inet_options, OptionTags}}}
     end;
-getopts(#sslsocket{fd = new_ssl}, OptionTags) ->
-    {error, {eoptions, {inet_options, OptionTags}}};
-getopts(#sslsocket{} = Socket, OptionTags) ->
-    ensure_old_ssl_started(),
-    ssl_broker:getopts(Socket, OptionTags).
+getopts(#sslsocket{}, OptionTags) ->
+    {error, {eoptions, {inet_options, OptionTags}}}.
 
 %%--------------------------------------------------------------------
--spec setopts(#sslsocket{},  [proplists:property()]) -> ok | {error, reason()}.
+-spec setopts(#sslsocket{},  [gen_tcp:option()]) -> ok | {error, reason()}.
 %% 
 %% Description: Sets options
 %%--------------------------------------------------------------------
-setopts(#sslsocket{fd = new_ssl, pid = Pid}, Options0) when is_pid(Pid), is_list(Options0)  ->
+setopts(#sslsocket{pid = Pid}, Options0) when is_pid(Pid), is_list(Options0)  ->
     try proplists:expand([{binary, [{mode, binary}]},
 			  {list, [{mode, list}]}], Options0) of
 	Options ->
@@ -439,7 +350,7 @@ setopts(#sslsocket{fd = new_ssl, pid = Pid}, Options0) when is_pid(Pid), is_list
 	    {error, {eoptions, {not_a_proplist, Options0}}}
     end;
 
-setopts(#sslsocket{fd = new_ssl, pid = {ListenSocket, _}}, Options) when is_list(Options) ->
+setopts(#sslsocket{pid = {ListenSocket, _}}, Options) when is_list(Options) ->
     try inet:setopts(ListenSocket, Options) of
 	ok ->
 	    ok;
@@ -449,46 +360,29 @@ setopts(#sslsocket{fd = new_ssl, pid = {ListenSocket, _}}, Options) when is_list
 	_:Error ->
 	    {error, {eoptions, {inet_options, Options, Error}}}
     end;
-setopts(#sslsocket{fd = new_ssl}, Options) ->
-    {error, {eoptions,{not_a_proplist, Options}}};
-setopts(#sslsocket{} = Socket, Options) ->
-    ensure_old_ssl_started(),
-    ssl_broker:setopts(Socket, Options).
+setopts(#sslsocket{}, Options) ->
+    {error, {eoptions,{not_a_proplist, Options}}}.
 
 %%---------------------------------------------------------------
 -spec shutdown(#sslsocket{}, read | write | read_write) ->  ok | {error, reason()}.
 %%		      
 %% Description: Same as gen_tcp:shutdown/2
 %%--------------------------------------------------------------------
-shutdown(#sslsocket{pid = {ListenSocket, #config{cb={CbMod,_, _, _}}}, fd = new_ssl}, How) ->
+shutdown(#sslsocket{pid = {ListenSocket, #config{cb={CbMod,_, _, _}}}}, How) ->
     CbMod:shutdown(ListenSocket, How);
-shutdown(#sslsocket{pid = Pid, fd = new_ssl}, How) ->
+shutdown(#sslsocket{pid = Pid}, How) ->
     ssl_connection:shutdown(Pid, How).
 
 %%--------------------------------------------------------------------
--spec sockname(#sslsocket{}) -> {ok, {tuple(), port_num()}} | {error, reason()}.
+-spec sockname(#sslsocket{}) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}.
 %%		     
 %% Description: Same as inet:sockname/1
 %%--------------------------------------------------------------------
-sockname(#sslsocket{fd = new_ssl, pid = {ListenSocket, _}}) ->
+sockname(#sslsocket{pid = {ListenSocket, _}}) ->
     inet:sockname(ListenSocket);
 
-sockname(#sslsocket{fd = new_ssl, pid = Pid}) ->
-    ssl_connection:sockname(Pid);
-
-sockname(#sslsocket{} = Socket) ->
-    ensure_old_ssl_started(),
-    ssl_broker:sockname(Socket).
-
-%%---------------------------------------------------------------
--spec seed(term()) ->term().
-%% 
-%% Description: Only used by old ssl.
-%%--------------------------------------------------------------------
-%% TODO: crypto:seed ?
-seed(Data) ->
-    ensure_old_ssl_started(),
-    ssl_server:seed(Data).
+sockname(#sslsocket{pid = Pid}) ->
+    ssl_connection:sockname(Pid).
 
 %%---------------------------------------------------------------
 -spec session_info(#sslsocket{}) -> {ok, list()} | {error, reason()}.
@@ -544,63 +438,6 @@ format_error(esslconnect) ->
 format_error({eoptions, Options}) ->
     lists:flatten(io_lib:format("Error in options list: ~p~n", [Options]));
 
-%%%%%%%%%%%%  START OLD SSL format_error %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-format_error(ebadsocket) ->
-    "Connection not found (internal error).";
-format_error(ebadstate) ->
-    "Connection not in connect state (internal error).";
-format_error(ebrokertype) ->
-    "Wrong broker type (internal error).";
-format_error(echaintoolong) ->
-    "The chain of certificates provided by peer is too long.";
-format_error(ecipher) ->
-    "Own list of specified ciphers is invalid.";
-format_error(ekeymismatch) ->
-    "Own private key does not match own certificate.";
-format_error(enoissuercert) ->
-    "Cannot find certificate of issuer of certificate provided by peer.";
-format_error(enoservercert) ->
-    "Attempt to do accept without having set own certificate.";
-format_error(enotlistener) ->
-    "Attempt to accept on a non-listening socket.";
-format_error(enoproxysocket) ->
-    "No proxy socket found (internal error or max number of file "
-        "descriptors exceeded).";
-format_error(enooptions) ->
-    "List of options is empty.";
-format_error(enotstarted) ->
-    "The SSL application has not been started.";
-format_error(eoptions) ->
-    "Invalid list of options.";
-format_error(epeercert) ->
-    "Certificate provided by peer is in error.";
-format_error(epeercertexpired) ->
-    "Certificate provided by peer has expired.";
-format_error(epeercertinvalid) ->
-    "Certificate provided by peer is invalid.";
-format_error(eselfsignedcert) ->
-    "Certificate provided by peer is self signed.";
-format_error(esslerrssl) ->
-    "SSL protocol failure. Typically because of a fatal alert from peer.";
-format_error(ewantconnect) ->
-    "Protocol wants to connect, which is not supported in this "
-        "version of the SSL application.";
-format_error(ex509lookup) ->
-    "Protocol wants X.509 lookup, which is not supported in this "
-        "version of the SSL application.";
-format_error({badcall, _Call}) ->
-    "Call not recognized for current mode (active or passive) and state "
-        "of socket.";
-format_error({badcast, _Cast}) ->
-    "Call not recognized for current mode (active or passive) and state "
-        "of socket.";
-
-format_error({badinfo, _Info}) ->
-    "Call not recognized for current mode (active or passive) and state "
-        "of socket.";
-
-%%%%%%%%%%%%%%%%%% END OLD SSL format_error %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 format_error(Error) ->
     case (catch inet:format_error(Error)) of
         "unkknown POSIX" ++ _ ->
@@ -614,16 +451,7 @@ format_error(Error) ->
 %%%--------------------------------------------------------------
 %%% Internal functions
 %%%--------------------------------------------------------------------
-new_connect(Address, Port, Options, Timeout) when is_list(Options) ->
-    try handle_options(Options, client) of
-	{ok, Config} ->
-	    do_new_connect(Address,Port,Config,Timeout)
-    catch 
-	throw:Error ->
-	    Error
-    end.
-
-do_new_connect(Address, Port,
+do_connect(Address, Port,
 	       #config{cb=CbInfo, inet_user=UserOpts, ssl=SslOpts,
 		       emulated=EmOpts,inet_ssl=SocketOpts},
 	       Timeout) ->
@@ -643,35 +471,9 @@ do_new_connect(Address, Port,
 	    {error, {eoptions, {inet_options, UserOpts}}}
     end.
 
-old_connect(Address, Port, Options, Timeout) ->
-    ensure_old_ssl_started(),
-    {ok, Pid} = ssl_broker:start_broker(connector),
-    ssl_broker:connect(Pid, Address, Port, Options, Timeout).
-
-new_listen(Port, Options0) ->
-    try 
-	{ok, Config} = handle_options(Options0, server),
-	#config{cb={CbModule, _, _, _},inet_user=Options} = Config,
-	case CbModule:listen(Port, Options) of
-	    {ok, ListenSocket} ->
-		{ok, #sslsocket{pid = {ListenSocket, Config}, fd = new_ssl}};
-	    Err = {error, _} ->
-		Err
-	end
-    catch 
-	Error = {error, _} ->
-	    Error
-    end.
-	    
-old_listen(Port, Options) ->
-    ensure_old_ssl_started(),
-    {ok, Pid} = ssl_broker:start_broker(listener),
-    ssl_broker:listen(Pid, Port, Options).
-
 handle_options(Opts0, _Role) ->
     Opts = proplists:expand([{binary, [{mode, binary}]},
 			     {list, [{mode, list}]}], Opts0),
-    
     ReuseSessionFun = fun(_, _, _, _) -> true end,
 
     DefaultVerifyNoneFun =
@@ -738,7 +540,8 @@ handle_options(Opts0, _Role) ->
       secure_renegotiate = handle_option(secure_renegotiate, Opts, false),
       renegotiate_at = handle_option(renegotiate_at, Opts, ?DEFAULT_RENEGOTIATE_AT),
       debug      = handle_option(debug, Opts, []),
-      hibernate_after = handle_option(hibernate_after, Opts, undefined)
+      hibernate_after = handle_option(hibernate_after, Opts, undefined),
+      erl_dist = handle_option(erl_dist, Opts, false)
      },
 
     CbInfo  = proplists:get_value(cb_info, Opts, {gen_tcp, tcp, tcp_closed, tcp_error}),    
@@ -747,7 +550,7 @@ handle_options(Opts0, _Role) ->
 		  depth, cert, certfile, key, keyfile,
 		  password, cacerts, cacertfile, dh, dhfile, ciphers,
 		  debug, reuse_session, reuse_sessions, ssl_imp,
-		  cb_info, renegotiate_at, secure_renegotiate, hibernate_after],
+		  cb_info, renegotiate_at, secure_renegotiate, hibernate_after, erl_dist],
     
     SockOpts = lists:foldl(fun(Key, PropList) -> 
 				   proplists:delete(Key, PropList)
@@ -764,8 +567,6 @@ handle_option(OptionName, Opts, Default) ->
 
 validate_option(versions, Versions)  ->
     validate_versions(Versions, Versions);
-validate_option(ssl_imp, Value) when Value == new; Value == old ->
-    Value;
 validate_option(verify, Value) 
   when Value == verify_none; Value == verify_peer ->
     Value;
@@ -858,6 +659,9 @@ validate_option(hibernate_after, undefined) ->
     undefined;
 validate_option(hibernate_after, Value) when is_integer(Value), Value >= 0 ->
     Value;
+validate_option(erl_dist,Value) when Value == true; 
+				     Value == false ->
+    Value;
 validate_option(Opt, Value) ->
     throw({error, {eoptions, {Opt, Value}}}).
     
@@ -905,7 +709,6 @@ emulated_options() ->
 
 internal_inet_values() ->
     [{packet_size,0},{packet, 0},{header, 0},{active, false},{mode,binary}].
-    %%[{packet, ssl},{header, 0},{active, false},{mode,binary}].
 
 socket_options(InetValues) ->
     #socket_options{
@@ -966,47 +769,14 @@ cipher_suites(Version, Ciphers0)  ->
 
 no_format(Error) ->    
     lists:flatten(io_lib:format("No format string for error: \"~p\" available.", [Error])).
-
-%% Start old ssl port program if needed.
-ensure_old_ssl_started() ->
-    case whereis(ssl_server) of
-	undefined ->
-	    (catch supervisor:start_child(ssl_sup, 
-				   {ssl_server, {ssl_server, start_link, []},
-				    permanent, 2000, worker, [ssl_server]}));
-	_ ->
-	    ok
-    end.
-
-%%%%%%%%%%%%%%%% Deprecated %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-ciphers() -> 
-    ensure_old_ssl_started(),
-    case (catch ssl_server:ciphers()) of
-        {'EXIT', _} ->
-            {error, enotstarted};
-        Res = {ok, _}  ->
-            Res
-    end.
-
-version() -> 
-    ensure_old_ssl_started(),
-    SSLVsn = ?VSN,
-    {CompVsn, LibVsn} = case (catch ssl_server:version()) of
-                            {'EXIT', _} ->
-                                {"", ""};
-                            {ok, Vsns}  ->
-                                Vsns
-                        end,
-    {ok, {SSLVsn, CompVsn, LibVsn}}.
-
                                 
 %% Only used to remove exit messages from old ssl
 %% First is a nonsense clause to provide some
-%% backward compability for orber that uses this
+%% backward compatibility for orber that uses this
 %% function in a none recommended way, but will
 %% work correctly if a valid pid is returned.
+%% Deprcated to be removed in r16
 pid(#sslsocket{fd = new_ssl}) ->
-    whereis(ssl_connection_sup);
+     whereis(ssl_connection_sup);
 pid(#sslsocket{pid = Pid}) ->
-    Pid.
+     Pid.
diff --git a/lib/ssl/src/ssl_broker.erl b/lib/ssl/src/ssl_broker.erl
deleted file mode 100644
index 7ef88baf2b..0000000000
--- a/lib/ssl/src/ssl_broker.erl
+++ /dev/null
@@ -1,1188 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2010. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-
-%%% Purpose : SSL broker
-
--module(ssl_broker).
--behaviour(gen_server).
-
-%% This module implements brokers for ssl. A broker is either a connector, 
-%% an acceptor, or a listener. All brokers are children to ssl_broker_sup,
-%% to which they are linked. Each broker is also linked to ssl_server, and
-%% to its client.
-%%
-%% The purpose of the broker is to set up SSL connections through calls to
-%% ssl_server and gen_tcp. All control information goes to the server,
-%% while all data is exchanged directly between gen_tcp and the port program
-%% of the ssl_server.
-%%
-%% A broker is created by a call to start_broker/3 (do *not* use start_link/4
-%% - it is for ssl_broker_sup to call that one), and then call listen/3, 
-%% accept/4, or connect/5. 
-%%
-%% The following table shows all functions dependency on status, active 
-%% mode etc.
-%%
-%% Permitted status transitions: 
-%%
-%%		nil	->	open 
-%%		open	->	closing | closed (termination)
-%%		closing	->	closed (termination)
-%%
-%% We are rather sloppy about nil, and consider open/closing == !closed,
-%% open/closing/closed === any  etc.
-%%
-%%
-%%	function/	 valid			mode		new
-%%	message		 status					state
-%%								
-%%	calls							
-%%	-----							
-%%	recv		 open			passive		ditto
-%%	send		 open			any		ditto
-%%	transport_accept nil			any		open
-%%      ssl_accept       nil                    any             open
-%%	connect		 nil			any		open
-%%	listen		 nil			any		open
-%%	peername	 open/closing		any		ditto
-%%	setopts		 open/closing		any		ditto
-%%	getopts		 open/closing		any		ditto
-%%	sockname	 open/closing		any		ditto
-%%	peercert	 open/closing		any		ditto
-%%	inhibit		 any			any		ditto
-%%	release		 any			any		ditto
-%%	close		 any			any		closed (1)
-%%
-%%	info							
-%%	----							
-%%	tcp		 open			active		ditto
-%%	tcp_closed	 open | closing		active		closing
-%%	tcp_error	 open | closing		active		closing
-%%
-%%	(1) We just terminate.
-%%
-%% TODO
-%%
-%% XXX Timeouts are not checked (integer or infinity).
-%%
-%% XXX The collector thing is not gen_server compliant.
-%%
-%% NOTE: There are three different "modes": (a) passive or active mode,
-%% specified as {active, bool()}, and (b) list or binary mode, specified 
-%% as {mode, list | binary}, and (c) encrypted or clear mode
-%%
-
--include("ssl_int.hrl").
-
-%% External exports 
-
--export([start_broker/1, start_broker/2, start_link/3,
-	 transport_accept/3, ssl_accept/2,
-	 close/1, connect/5, connection_info/1, controlling_process/2,
-	 listen/3, recv/3, send/2, getopts/2, getopts/3, setopts/2,
-	 sockname/1, peername/1, peercert/1]).
-
--export([listen_prim/5, connect_prim/8,
-	 transport_accept_prim/5, ssl_accept_prim/6]).
-
-%% Internal exports 
-
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 code_change/3, terminate/2, collector_init/1]).
-
--include("ssl_broker_int.hrl").
-
-%% start_broker(Type) -> {ok, Pid} | {error, Reason}
-%% start_broker(Type, GenOpts) -> {ok, Pid} | {error, Reason}
-%%            Type = accept | connect | listen
-%%            GenOpts = /standard gen_server options/
-%%
-%% This is the function to be called from the interface module ssl.erl.
-%% Links to the caller.
-%%
-start_broker(Type) ->
-    start_broker(Type, []).
-
-start_broker(Type, GenOpts) ->
-    case lists:member(Type, [listener, acceptor, connector]) of
-	true ->
-	    case supervisor:start_child(ssl_broker_sup, 
-					[self(), Type, GenOpts]) of
-		{ok, Pid} ->
-		    link(Pid),
-		    {ok, Pid};
-		{error, Reason} ->
-		    {error, Reason}
-	    end;
-	false  ->
-	    {error, ebrokertype}
-    end.
-
-%% start_link(Client, Type, GenOpts) -> {ok, Pid} | {error, Reason}
-%%	      
-%%	Type = accept | connect | listen
-%%	GenOpts = /standard gen_server options/
-%%
-%% This function is called by ssl_broker_sup and must *not* be called
-%% from an interface module (ssl.erl).
-
-start_link(Client, Type, GenOpts) ->
-    gen_server:start_link(?MODULE, [Client, Type], GenOpts).
-
-
-%% accept(Pid, ListenSocket, Timeout) -> {ok, Socket} | {error, Reason}
-%%  
-%% Types:   Pid = pid() of acceptor
-%%          ListenSocket = Socket = sslsocket()
-%% 	    Timeout = timeout()
-%%
-%% accept(Pid, ListenSocket, Timeout) 
-%%   when is_pid(Pid), is_record(ListenSocket, sslsocket) ->
-%%     Req = {accept, self(), ListenSocket, Timeout},
-%%     gen_server:call(Pid, Req, infinity).
-
-%% transport_accept(Pid, ListenSocket, Timeout) -> {ok, Socket} | 
-%% 						   {error, Reason}
-%%  
-%% Types:   Pid = pid() of acceptor
-%%          ListenSocket = Socket = sslsocket()
-%% 	    Timeout = timeout()
-%%
-transport_accept(Pid, #sslsocket{} = ListenSocket, Timeout) when is_pid(Pid) ->
-     Req = {transport_accept, self(), ListenSocket, Timeout},
-     gen_server:call(Pid, Req, infinity).
-
-%% ssl_accept(Pid, Socket, Timeout) -> {ok, Socket} | {error, Reason}
-%%
-%% Types:   Pid = pid() of acceptor
-%%          ListenSocket = Socket = sslsocket()
-%% 	    Timeout = timeout()
-%%
-ssl_accept(#sslsocket{pid = Pid} = Socket, Timeout) ->
-    Req = {ssl_accept, self(), Socket, Timeout},
-    gen_server:call(Pid, Req, infinity).
-
-%% close(Socket) -> ok | {error, Reason}
-%%  
-%% Types:   Socket = sslsocket() | pid()
-%%
-close(#sslsocket{pid = Pid}) ->
-    close(Pid);
-close(Pid) when is_pid(Pid) ->
-    gen_server:call(Pid, {close, self()}, infinity).
-
-%% connect(Pid, Address, Port, Opts, Timeout) -> {ok, Socket} | {error, Reason}
-%%  
-%% Types:   Pid = pid() of connector
-%%          Address  = string() | {byte(), byte(), byte(), byte()}
-%%          Port = int()
-%%          Opts = options()
-%% 	    Timeout = timeout()
-%%          Socket = sslsocket()
-%%
-connect(Pid, Address, Port, Opts, Timeout) when is_pid(Pid), is_list(Opts) ->
-    case are_connect_opts(Opts) of
-	true ->
-	    Req = {connect, self(), Address, Port, Opts, Timeout},
-	    gen_server:call(Pid, Req, infinity);
-	false  ->
-	    {error, eoptions}
-    end.
-
-%%
-%% connection_info(Socket) -> {ok, {Protocol, Cipher} | {error, Reason}
-%%
-connection_info(#sslsocket{pid = Pid}) ->
-    Req = {connection_info, self()},
-    gen_server:call(Pid, Req, infinity).
-
-%% controlling_process(Socket, NewOwner) -> ok | {error, Reason}
-
-controlling_process(#sslsocket{pid = Pid}, NewOwner) when is_pid(NewOwner) ->
-    case gen_server:call(Pid, {inhibit_msgs, self()}, infinity) of
-	ok ->
-	    transfer_messages(Pid, NewOwner),
-	    gen_server:call(Pid, {release_msgs, self(), NewOwner}, infinity);
-	Error ->
-	    Error
-    end.
-
-%% listen(Pid, Port, Opts) -> {ok, ListenSocket} | {error, Reason}
-%%  
-%% Types:   Pid = pid() of listener
-%%          Port = int()
-%%          Opts = options()
-%%          ListenSocket = sslsocket()
-%%
-listen(Pid, Port, Opts) when is_pid(Pid) ->
-    case are_listen_opts(Opts) of
-	true ->
-	    Req = {listen, self(), Port, Opts}, 
-	    gen_server:call(Pid, Req, infinity);
-	false  ->
-	    {error, eoptions}
-    end.
-
-
-%%
-%% peername(Socket) -> {ok, {Address, Port}} | {error, Reason}
-%%
-peername(#sslsocket{pid = Pid}) ->
-    Req = {peername, self()},
-    gen_server:call(Pid, Req, infinity).
-
-
-%% recv(Socket, Length, Timeout) -> {ok, Data} | {error, Reason}
-%%
-%% Types:   Socket = sslsocket()
-%%          Length = Timeout = integer()
-%%          Data = bytes() | binary()
-%%
-recv(#sslsocket{pid = Pid}, Length, Timeout) ->
-    Req = {recv, self(), Length, Timeout}, 
-    gen_server:call(Pid, Req, infinity).
-
-
-%% send(Socket, Data) -> ok | {error, Reason}
-%%  
-%% Types:   Socket = sslsocket()
-%%
-send(#sslsocket{pid = Pid}, Data) ->
-    gen_server:call(Pid, {send, self(), Data}, infinity).
-
-
-%% getopts(Socket, OptTags) -> {ok, Opts} | {error, einval}
-%%  
-%% Types:	Pid = pid() of broker
-%%  		Timeout = timeout()
-%%		OptTags = option_tags()
-%%		Opts = options()
-%%
-getopts(Socket, OptTags) ->
-    getopts(Socket, OptTags, infinity).
-
-getopts(#sslsocket{pid = Pid}, OptTags, Timeout) when is_list(OptTags) ->
-    Req = {getopts, self(), OptTags}, 
-    gen_server:call(Pid, Req, Timeout).
-
-
-%%
-%% setopts(Socket, Opts) -> ok | {error, Reason}
-%%
-setopts(#sslsocket{pid = Pid}, Opts) ->
-    Req = {setopts, self(), Opts},
-    gen_server:call(Pid, Req, infinity).
-
-%%
-%% sockname(Socket) -> {ok, {Address, Port}} | {error, Reason}
-%%
-sockname(#sslsocket{pid = Pid}) ->
-    Req = {sockname, self()},
-    gen_server:call(Pid, Req, infinity).
-
-
-%%
-%% peercert(Socket) -> {ok, Cert} | {error, Reason}
-%%
-peercert(#sslsocket{pid = Pid}) ->
-    Req = {peercert, self()},
-    gen_server:call(Pid, Req, infinity).
-
-%%
-%%  INIT
-%%
-
-%% init
-%%
-init([Client, Type]) ->
-    process_flag(trap_exit, true),
-    link(Client),
-    Debug = case application:get_env(ssl, edebug) of
-		{ok, true} -> 
-		    true;
-		_ ->
-		    case application:get_env(ssl, debug) of
-			{ok, true} ->
-			    true;
-			_  ->
-			    os:getenv("ERL_SSL_DEBUG") =/= false
-		    end
-	    end,
-    Server = whereis(ssl_server),
-    if 
-	is_pid(Server) ->
-	    link(Server),
-	    debug1(Debug, Type, "in start, client = ~w", [Client]),
-	    {ok, #st{brokertype = Type, server = Server, client = Client,
-		     collector = Client, debug = Debug}};
-	true  ->
-	    {stop, no_ssl_server}
-    end.
-
-
-%%
-%% HANDLE CALL
-%%
-
-%% recv - passive mode
-%%
-handle_call({recv, Client, Length, Timeout}, _From,
-	    #st{active = false, proxysock = Proxysock, status = Status} = St) ->
-    debug(St, "recv: client = ~w~n", [Client]),
-    if 
-	Status =/= open ->
- 	    {reply, {error, closed}, St};
-	true ->
-	    case gen_tcp:recv(Proxysock, Length, Timeout) of
-		{ok, Data} ->
-		    {reply, {ok, Data}, St};
-		{error, timeout} ->
-		    {reply, {error, timeout}, St};
-		{error, Reason} ->
-		    {reply, {error, Reason}, St#st{status = closing}}
-	    end
-    end;
-
-%% send
-%% 
-handle_call({send, Client, Data}, _From, St) ->
-    debug(St, "send: client = ~w~n", [Client]),
-    if 
-	St#st.status =/= open ->
- 	    {reply, {error, closed}, St};
-	true ->
-	    case gen_tcp:send(St#st.proxysock, Data) of
-		ok ->
-		    {reply, ok, St};
-		{error, _Reason} ->
-		    {reply, {error, closed}, St#st{status = closing}}
-	    end
-    end;
-
-%% transport_accept 
-%% 
-%% Client = pid of client 
-%% ListenSocket = sslsocket()
-%%
-handle_call({transport_accept, Client, ListenSocket, Timeout}, _From, St) ->
-    debug(St, "transport_accept: client = ~w, listensocket = ~w~n", 
-	  [Client, ListenSocket]),
-    case getopts(ListenSocket, tcp_listen_opt_tags(), ?DEF_TIMEOUT) of 
-	{ok, LOpts} ->
-	    case transport_accept_prim(
-		   ssl_server, ListenSocket#sslsocket.fd, LOpts, Timeout, St) of
-		{ok, ThisSocket, NSt} ->
-		    {reply, {ok, ThisSocket}, NSt};
-		{error, Reason, St} ->
-		    What = what(Reason),
-		    {stop, normal, {error, What}, St}
-	    end;
-	{error, Reason} ->
-	    What = what(Reason),
-	    {stop, normal, {error, What}, St}
-    end;
-
-%% ssl_accept 
-%% 
-%% Client = pid of client 
-%% ListenSocket = sslsocket()
-%%
-handle_call({ssl_accept, Client, Socket, Timeout}, _From, St) ->
-    debug(St, "ssl_accept: client = ~w, socket = ~w~n", [Client, Socket]),
-    case ssl_accept_prim(ssl_server, gen_tcp, Client, St#st.opts, Timeout, St#st{thissock=Socket}) of
-	{ok, Socket, NSt} ->
-	    {reply, ok, NSt};
-	{error, Reason, St} ->
-	    What = what(Reason),
-	    {stop, normal, {error, What}, St}
-    end;
-
-%% connect
-%%
-%% Client = client pid
-%% Address = hostname | ipstring | IP
-%% Port = integer()
-%% Opts = options()
-%%
-handle_call({connect, Client, Address, Port, Opts, Timeout}, _From, St) ->
-    debug(St, "connect: client = ~w, address = ~p, port = ~w~n",
-	  [Client, Address, Port]),
-    case connect_prim(ssl_server, gen_tcp, Client, Address, Port, Opts, 
-		      Timeout, St) of
-	{ok, Res, NSt} ->
-	    {reply, {ok, Res}, NSt};
-	{error, Reason, NSt} ->
-	    What = what(Reason),
-	    {stop, normal, {error, What}, NSt}
-    end;
-
-%% connection_info
-%%
-handle_call({connection_info, Client}, _From, St) ->
-    debug(St, "connection_info: client = ~w~n", [Client]),
-    Reply = ssl_server:connection_info(St#st.fd),
-    {reply, Reply, St};
-
-%% close from client
-%%
-handle_call({close, Client}, _From, St) ->
-    debug(St, "close: client = ~w~n", [Client]),
-    %% Terminate
-    {stop, normal, ok, St#st{status = closed}};
-
-%% listen
-%% 
-%% Client = pid of client
-%% Port = int()
-%% Opts = options()
-%%
-handle_call({listen, Client, Port, Opts}, _From, St) ->
-    debug(St, "listen: client = ~w, port = ~w~n",
-	  [Client, Port]),
-    case listen_prim(ssl_server, Client, Port, Opts, St) of
-	{ok, Res, NSt} ->
-	    {reply, {ok, Res}, NSt};
-	{error, Reason, NSt} ->
-	    What = what(Reason),
-	    {stop, normal, {error, What}, NSt}
-    end;
-
-%% peername
-%%
-handle_call({peername, Client}, _From, St) ->
-    debug(St, "peername: client = ~w~n", [Client]),
-    Reply = case ssl_server:peername(St#st.fd) of
-		{ok, {Address, Port}} ->
-		    {ok, At} = inet_parse:ipv4_address(Address),
-		    {ok, {At, Port}};
-		Error ->
-		    Error
-	    end,
-    {reply, Reply, St};
-
-%% setopts
-%%
-handle_call({setopts, Client, Opts0}, _From, St0) ->
-    debug(St0, "setopts: client = ~w~n", [Client]),
-    OptsOK = case St0#st.brokertype of
-		 listener ->
-		     are_opts(fun is_tcp_listen_opt/1, Opts0);
-		 acceptor ->
-		     are_opts(fun is_tcp_accept_opt/1, Opts0);
-		 connector ->
-		     are_opts(fun is_tcp_connect_opt/1, Opts0)
-	     end,
-    if 
-	OptsOK =:= false ->
-	    {reply, {error, eoptions}, St0};
-	true ->
-	    Opts1 = lists:keydelete(nodelay, 1, Opts0),
-	    case inet:setopts(St0#st.proxysock, Opts1) of
-		ok ->
-		    Opts2 = replace_opts(Opts1, St0#st.opts),
-		    Active = get_active(Opts2),
-		    St2 = St0#st{opts = Opts2, 
-				 active = Active},
-		    case get_nodelay(Opts0) of
-			empty ->
-			    {reply, ok, St2};
-			Bool ->
-			    case setnodelay(ssl_server, St0, Bool) of
-				ok ->
-				    Opts3 = replace_opts([{nodelay, Bool}],
-							 Opts2),
-				    St3 = St0#st{opts = Opts3, 
-						 active = Active},
-				    {reply, ok, St3};
-				{error, Reason} ->
-				    {reply, {error, Reason}, St2}
-			    end
-		    end;
-		{error, Reason} ->
-		    {reply, {error, Reason}, St0}
-	    end
-    end;
-
-%% sockname
-%%
-handle_call({sockname, Client}, _From, St) ->
-    debug(St, "sockname: client = ~w~n", [Client]),
-    Reply = case ssl_server:sockname(St#st.fd) of
-		{ok, {Address, Port}} ->
-		    {ok, At} = inet_parse:ipv4_address(Address),
-		    {ok, {At, Port}};
-		Error ->
-		    Error
-	    end,
-    {reply, Reply, St};
-
-%% peercert
-%%
-handle_call({peercert, Client}, _From, St) ->
-    debug(St, "peercert: client = ~w~n", [Client]),
-    Reply = ssl_server:peercert(St#st.fd),
-    {reply, Reply, St};
-
-%% inhibit msgs
-%%
-handle_call({inhibit_msgs, Client}, _From, #st{client = Client} = St) ->
-    debug(St, "inhibit_msgs: client = ~w~n", [Client]),
-    {ok, Collector} = start_collector(),
-    {reply, ok, St#st{collector = Collector}};
-
-%% release msgs
-%%
-handle_call({release_msgs, Client, NewClient}, _From,
-	    #st{client = Client, collector = Collector} = St) ->
-    debug(St, "release_msgs: client = ~w~n", [Client]),
-    unlink(Client),
-    link(NewClient),
-    release_collector(Collector, NewClient),
-    NSt = St#st{client = NewClient, collector = NewClient},
-    {reply, ok, NSt};
-
-%% getopts
-%%
-handle_call({getopts, Client, OptTags}, _From, St) ->
-    debug(St, "getopts: client = ~w~n", [Client]),
-    Reply = case are_opt_tags(St#st.brokertype, OptTags) of
-		true ->
-		    {ok, extract_opts(OptTags, St#st.opts)};
-		_ ->
-		    {error, einval}
-	    end,
-    {reply, Reply, St};
-
-%% bad call
-%%
-handle_call(Request, _From, St) ->
-    debug(St, "++++ ssl_broker: bad call: ~w~n", [Request]),
-    {reply, {error, {badcall, Request}}, St}.
-
-%%
-%% HANDLE CAST
-%%
-
-handle_cast(Request, St) ->
-    debug(St, "++++ ssl_broker: bad cast: ~w~n", [Request]),
-    {stop, {error, {badcast, Request}}, St}.
-
-%% 
-%% HANDLE INFO
-%%
-
-%% tcp - active mode
-%%
-%% The collector is different from client only during change of
-%% controlling process.
-%%
-handle_info({tcp, Socket, Data},
-	    #st{active = Active, collector = Collector, status = open,
-		proxysock = Socket, thissock = Thissock} = St) 
-  when Active =/= false ->
-    debug(St, "tcp: socket = ~w~n", [Socket]),
-    Msg = {ssl, Thissock, Data},
-    Collector ! Msg,
-    if
-	Active =:= once -> 
-	    {noreply, St#st{active = false}};
-	true -> 
-	    {noreply, St}
-    end;
-
-%% tcp_closed - from proxy socket, active mode
-%%
-%%
-handle_info({tcp_closed, Socket},
-	    #st{active = Active, collector = Collector,
-		proxysock = Socket, thissock = Thissock} = St) 
-  when Active =/= false ->
-    debug(St, "tcp_closed: socket = ~w~n", [Socket]),
-    Msg = {ssl_closed, Thissock},
-    Collector ! Msg,
-    if
-	Active =:= once -> 
-	    {noreply, St#st{status = closing, active = false}};
-	true ->
-	    {noreply, St#st{status = closing}}
-    end;
-
-%% tcp_error - from proxy socket, active mode
-%%
-%%
-handle_info({tcp_error, Socket, Reason},
-	    #st{active = Active, collector = Collector,
-		proxysock = Socket} = St) 
-  when Active =/= false ->
-    debug(St, "tcp_error: socket = ~w, reason = ~w~n", [Socket, Reason]),
-    Msg = {ssl_error, Socket, Reason},
-    Collector ! Msg,
-    if
-	Active =:= once -> 
-	    {noreply, St#st{status = closing, active = false}};
-	true ->
-	    {noreply, St#st{status = closing}}
-    end;
-
-%% EXIT - from client
-%% 
-%%
-handle_info({'EXIT', Client, Reason}, #st{client = Client} = St) ->
-    debug(St, "exit client: client = ~w, reason = ~w~n", [Client, Reason]),
-    {stop, normal, St#st{status = closed}};	% do not make noise
-
-%% EXIT - from server
-%%
-%%
-handle_info({'EXIT', Server, Reason}, #st{server = Server} = St) ->
-    debug(St, "exit server: reason = ~w~n", [Reason]),
-    {stop, Reason, St};
-
-%% handle info catch all
-%%
-handle_info(Info, St) ->
-    debug(St, " bad info: ~w~n", [Info]),
-    {stop, {error, {badinfo, Info}}, St}.
-
-
-%% terminate
-%%
-%% 
-terminate(Reason, St) ->
-    debug(St, "in terminate reason: ~w, state: ~w~n", [Reason, St]),
-    ok.
-
-%% code_change
-%%
-%%
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%
-%% Primitive interface
-%%
-listen_prim(ServerName, Client, Port, Opts, St) ->
-    LOpts = get_tcp_listen_opts(Opts),
-    SSLOpts = get_ssl_opts(Opts),
-    FlagStr =mk_ssl_optstr(SSLOpts),
-    BackLog = get_backlog(LOpts),
-    IP = get_ip(LOpts),
-    case ssl_server:listen_prim(ServerName, IP, Port, FlagStr, BackLog) of
-	{ok, ListenFd, _Port0} ->
-	    ThisSocket = #sslsocket{fd = ListenFd, pid = self()},
-	    StOpts = add_default_tcp_listen_opts(LOpts) ++
-		add_default_ssl_opts(SSLOpts),
-	    NSt = St#st{fd = ListenFd, 
-			active = get_active(LOpts), % irrelevant for listen
-			opts = StOpts,
-			thissock = ThisSocket, 
-			status = open},
-	    debug(St, "listen: ok: client = ~w, listenfd = ~w~n", 
-		  [Client, ListenFd]),
-	    {ok, ThisSocket, NSt};
-	{error, Reason} ->
-	    {error, Reason, St}
-    end.
-
-connect_prim(ServerName, TcpModule, Client, FAddress, FPort, Opts, 
-	     Timeout, St) ->
-    COpts = get_tcp_connect_opts(Opts),
-    SSLOpts = get_ssl_opts(Opts),
-    FlagStr = mk_ssl_optstr(SSLOpts),
-    case inet:getaddr(FAddress, inet) of
-	{ok, FIP} ->
-	    %% Timeout is gen_server timeout - hence catch
-	    LIP = get_ip(COpts),
-	    LPort = get_port(COpts),
-	    case (catch ssl_server:connect_prim(ServerName, 
-						LIP, LPort, FIP, FPort, 
-						FlagStr, Timeout)) of
-		{ok, Fd, ProxyPort} ->
-		    case connect_proxy(ServerName, TcpModule, Fd, 
-				       ProxyPort, COpts, Timeout) of
-			{ok, Socket} ->
-			    ThisSocket = #sslsocket{fd = Fd, pid = self()}, 
-			    StOpts = add_default_tcp_connect_opts(COpts) ++
-				add_default_ssl_opts(SSLOpts),
-			    NSt = St#st{fd = Fd, 
-					active = get_active(COpts),
-					opts = StOpts,
-					thissock = ThisSocket, 
-					proxysock = Socket, 
-					status = open},
-			    case get_nodelay(COpts) of
-				true -> setnodelay(ServerName, NSt, true);
-				_ -> ok
-			    end,
-			    debug(St, "connect: ok: client = ~w, fd = ~w~n",
-				  [Client, Fd]),
-			    {ok, ThisSocket, NSt};
-			{error, Reason} ->
-			    {error, Reason, St}
-		    end;
-		{'EXIT', Reason} ->
-		    {error, Reason, St};
-		{error, Reason} ->
-		    {error, Reason, St}
-	    end;
-	{error, Reason} ->
-	    {error, Reason, St}
-    end.
-
-transport_accept_prim(ServerName, ListenFd, LOpts, Timeout, St) -> 
-    AOpts = get_tcp_accept_opts(LOpts),
-    FlagStr = "",
-    %% Timeout is gen_server timeout - hence catch.
-    case (catch ssl_server:transport_accept_prim(ServerName, ListenFd,
-						 FlagStr, Timeout)) of 
-	{ok, Fd, ProxyPort} ->
-	    ThisSocket = #sslsocket{fd = Fd, pid = self()}, 
-	    NSt = St#st{fd = Fd, 
-			active = get_active(AOpts),
-			opts = AOpts,
-			thissock = ThisSocket,
-			proxyport = ProxyPort,
-			encrypted = false},
-	    debug(St, "transport_accept: ok: fd = ~w~n", [Fd]),
-	    {ok, ThisSocket, NSt};
-	{'EXIT', Reason} ->
-	    debug(St, "transport_accept: EXIT: Reason = ~w~n", [Reason]),
-	    {error, Reason, St};
-	{error, Reason} ->
-	    debug(St, "transport_accept: error: Reason = ~w~n", [Reason]),
-	    {error, Reason, St}
-    end.
-
-ssl_accept_prim(ServerName, TcpModule, Client, LOpts, Timeout, St) -> 
-    FlagStr = [],
-    SSLOpts = [],
-    AOpts = get_tcp_accept_opts(LOpts),
-    %% Timeout is gen_server timeout - hence catch.
-    debug(St, "ssl_accept_prim: self() ~w Client ~w~n", [self(), Client]),
-    Socket = St#st.thissock,
-    Fd = Socket#sslsocket.fd,
-    A = (catch ssl_server:ssl_accept_prim(ServerName, Fd, FlagStr, Timeout)),
-    debug(St, "ssl_accept_prim: ~w~n", [A]),
-    case A of 
-	ok ->
-	    B = connect_proxy(ServerName, TcpModule, Fd, 
-			       St#st.proxyport, AOpts, Timeout),
-	    debug(St, "ssl_accept_prim: connect_proxy ~w~n", [B]),
-	    case B of
-		{ok, Socket2} ->
-		    StOpts = add_default_tcp_accept_opts(AOpts) ++
-			add_default_ssl_opts(SSLOpts),
-		    NSt = St#st{opts = StOpts,
-				proxysock = Socket2,
-				encrypted = true,
-				status = open},
-		    case get_nodelay(AOpts) of
-			true -> setnodelay(ServerName, NSt, true);
-			_ -> ok
-		    end,
-		    debug(St, "transport_accept: ok: client = ~w, fd = ~w~n",
-			  [Client, Fd]),
-		    {ok, St#st.thissock, NSt};
-		{error, Reason} ->
-		    {error, Reason, St}
-	    end;
-	{'EXIT', Reason} ->
-	    {error, Reason, St};
-	{error, Reason} ->
-	    {error, Reason, St}
-    end.
-
-
-%%
-%% LOCAL FUNCTIONS
-%%
-
-%% 
-%% connect_proxy(Fd, ProxyPort, TOpts, Timeout) -> {ok, Socket} | 
-%%						   {error, Reason}
-%%
-connect_proxy(ServerName, TcpModule, Fd, ProxyPort, TOpts, Timeout) ->
-    case TcpModule:connect({127, 0, 0, 1}, ProxyPort, TOpts, Timeout) of
-	{ok, Socket} ->
-	    {ok, Port} = inet:port(Socket),
-	    A = ssl_server:proxy_join_prim(ServerName, Fd, Port),
-	    case A of
-		ok ->
-		    {ok, Socket};
-		Error ->
-		    Error
-	    end;
-	Error ->
-	    Error
-    end.
-
-
-setnodelay(ServerName, St, Bool) ->
-    case ssl_server:setnodelay_prim(ServerName, St#st.fd, Bool) of
-	ok ->
-	    case inet:setopts(St#st.proxysock, [{nodelay, Bool}]) of
-		ok ->
-		    ok;
-		{error, Reason} ->
-		    {error, Reason}
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-%%
-%% start_collector()
-%%
-%% A collector is a little process that keeps messages during change of
-%% controlling process. 
-%% XXX This is not gen_server compliant :-(.
-%%
-start_collector() ->
-    Pid = spawn_link(?MODULE, collector_init, [self()]),
-    {ok, Pid}.
-
-%%
-%% release_collector(Collector, NewOwner)
-%%
-release_collector(Collector, NewOwner) ->
-    Collector ! {release, self(), NewOwner},
-    receive
-	%% Reap collector
-	{'EXIT', Collector, normal} ->
-	    ok
-    end.
-
-%%
-%% collector_init(Broker) -> void()
-%%
-collector_init(Broker) ->
-    receive
-	{release, Broker, NewOwner} ->
-	    transfer_messages(Broker, NewOwner)
-    end.
-
-%% 
-%% transfer_messages(Pid, NewOwner) -> void()
-%%
-transfer_messages(Pid, NewOwner) ->    
-    receive
-	{ssl, Sock, Data} ->
-	    NewOwner ! {ssl, Sock, Data},
-	    transfer_messages(Pid, NewOwner);
-	{ssl_closed, Sock} ->
-	    NewOwner ! {ssl_closed, Sock},
-	    transfer_messages(Pid, NewOwner);
-	{ssl_error, Sock, Reason} ->
-	    NewOwner ! {ssl_error, Sock, Reason},
-	    transfer_messages(Pid, NewOwner)
-    after 0 ->
-	    ok
-    end.
-
-%%
-%% debug(St, Format, Args) -> void() - printouts
-%%
-debug(St, Format, Args) ->
-    debug1(St#st.debug, St#st.brokertype, Format, Args).
-
-debug1(true, Type, Format0, Args) ->
-    {_MS, S, MiS} = erlang:now(),
-    Secs = S rem 100, 
-    MiSecs = MiS div 1000,
-    Format = "++++ ~3..0w:~3..0w ssl_broker (~w)[~w]: " ++ Format0, 
-    io:format(Format, [Secs, MiSecs, self(), Type| Args]);
-debug1(_, _, _, _) ->
-    ok.
-
-%%
-%% what(Reason) -> What
-%% 
-what(Reason) when is_atom(Reason) ->
-    Reason;
-what({'EXIT', Reason}) ->
-    what(Reason);
-what({What, _Where}) when is_atom(What) ->
-    What;
-what(Reason) ->
-    Reason.
-
-
-%%
-%% OPTIONS
-%%
-%% Note that `accept' has no options when invoked, but get all its options
-%% by inheritance from `listen'. 
-%%
-
-are_opt_tags(listener, OptTags) ->
-    is_subset(OptTags, listen_opt_tags());
-are_opt_tags(acceptor, OptTags) ->
-    is_subset(OptTags, accept_opt_tags());
-are_opt_tags(connector, OptTags) ->
-    is_subset(OptTags, connect_opt_tags()).
-
-listen_opt_tags() ->				
-    tcp_listen_opt_tags() ++ ssl_opt_tags().
-
-accept_opt_tags() ->
-    tcp_gen_opt_tags().
-
-connect_opt_tags() ->
-    tcp_gen_opt_tags() ++ ssl_opt_tags().
-
-tcp_listen_opt_tags() ->				
-    tcp_gen_opt_tags() ++ tcp_listen_only_opt_tags().
-
-tcp_gen_opt_tags() ->
-    %% All except `reuseaddr' and `deliver'.	
-    [nodelay, active, packet, mode, header].	
-
-tcp_listen_only_opt_tags() ->
-    [ip, backlog].
-
-ssl_opt_tags() ->
-    %% XXX Should remove cachetimeout.
-    [verify, depth, certfile, password, cacertfile, ciphers, cachetimeout].
-
-%% Options
-
-%%
-%% are_*_opts(Opts) -> boolean()
-%%
-are_connect_opts(Opts) ->
-    are_opts(fun is_connect_opt/1, Opts).
-
-are_listen_opts(Opts) ->
-    are_opts(fun is_listen_opt/1, Opts).
-
-are_opts(F, Opts) ->
-    lists:all(F, transform_opts(Opts)).
-
-%%
-%% get_*_opts(Opts) -> Value
-%%
-get_tcp_accept_opts(Opts) ->
-    [O || O <- transform_opts(Opts), is_tcp_accept_opt(O)].
-
-get_tcp_connect_opts(Opts) ->
-    [O || O <- transform_opts(Opts), is_tcp_connect_opt(O)].
-
-get_tcp_listen_opts(Opts) ->
-    [O || O <- transform_opts(Opts), is_tcp_listen_opt(O)].
-
-get_ssl_opts(Opts) ->
-    [O || O <- transform_opts(Opts), is_ssl_opt(O)].
-
-get_active(Opts) ->
-    get_tagged_opt(active, Opts, true).
-
-get_backlog(Opts) ->
-    get_tagged_opt(backlog, Opts, ?DEF_BACKLOG).
-
-get_ip(Opts) ->
-    get_tagged_opt(ip, Opts, {0, 0, 0, 0}).
-
-get_port(Opts) ->
-    get_tagged_opt(port, Opts, 0).
-
-get_nodelay(Opts) ->
-    get_tagged_opt(nodelay, Opts, empty).
-
-%%
-%% add_default_*_opts(Opts) -> NOpts
-%%
-
-add_default_tcp_accept_opts(Opts) ->
-    add_default_opts(Opts, default_tcp_accept_opts()).
-
-add_default_tcp_connect_opts(Opts) ->
-    add_default_opts(Opts, default_tcp_connect_opts()).
-
-add_default_tcp_listen_opts(Opts) ->
-    add_default_opts(Opts, default_tcp_listen_opts()).
-
-add_default_ssl_opts(Opts) ->
-    add_default_opts(Opts, default_ssl_opts()).
-
-add_default_opts(Opts, DefOpts) ->
-    TOpts = transform_opts(Opts),
-    TOpts ++ [DP || {DTag, _DVal} = DP <- DefOpts,
-		    not lists:keymember(DTag, 1, TOpts)].
-
-default_tcp_accept_opts() ->
-    [O || O <- default_opts(), is_tcp_accept_opt(O)].
-
-default_tcp_connect_opts() ->
-    [O || O <- default_opts(), is_tcp_connect_opt(O)].
-
-default_tcp_listen_opts() ->
-    [O || O <- default_opts(), is_tcp_listen_opt(O)].
-
-default_ssl_opts() ->
-    [O || O <- default_opts(), is_ssl_opt(O)].
-
-default_opts() ->
-    [{mode, list}, {packet, 0}, {nodelay, false}, {active, true},
-     {backlog, ?DEF_BACKLOG}, {ip, {0, 0, 0, 0}},
-     {verify, 0}, {depth, 1}].
-
-
-%% Transform from old to new options, and also from old gen_tcp
-%% options to new ones. All returned options are tagged options.
-%%
-transform_opts(Opts) ->
-    lists:flatmap(fun transform_opt/1, Opts).
-
-transform_opt(binary) -> 	[{mode, binary}];
-transform_opt(list) -> 		[{mode, list}];
-transform_opt({packet, raw}) ->	[{packet, 0}];
-transform_opt(raw) -> 		[];
-transform_opt(Opt) -> 		[Opt].
-
-%% NOTE: The is_*_opt/1 functions must be applied on transformed options
-%% only.
-
-is_connect_opt(Opt) ->
-    is_tcp_connect_opt(Opt) or is_ssl_opt(Opt).
-
-is_listen_opt(Opt) ->
-    is_tcp_listen_opt(Opt) or is_ssl_opt(Opt).
-
-is_tcp_accept_opt(Opt) ->
-    is_tcp_gen_opt(Opt).
-
-is_tcp_connect_opt(Opt) ->
-    is_tcp_gen_opt(Opt) or is_tcp_connect_only_opt(Opt).
-
-is_tcp_listen_opt(Opt) ->
-    is_tcp_gen_opt(Opt) or is_tcp_listen_only_opt(Opt).
-
-%% General options supported by gen_tcp: All except `reuseaddr' and
-%% `deliver'.
-is_tcp_gen_opt({mode, list}) -> true;
-is_tcp_gen_opt({mode, binary}) -> true;
-is_tcp_gen_opt({header, Sz}) when is_integer(Sz), 0 =< Sz -> true; 
-is_tcp_gen_opt({packet, Sz}) when is_integer(Sz), 0 =< Sz, Sz =< 4-> true;
-is_tcp_gen_opt({packet, sunrm}) -> true;
-is_tcp_gen_opt({packet, asn1}) -> true;
-is_tcp_gen_opt({packet, cdr}) -> true;
-is_tcp_gen_opt({packet, fcgi}) -> true;
-is_tcp_gen_opt({packet, line}) -> true;
-is_tcp_gen_opt({packet, tpkt}) -> true;
-is_tcp_gen_opt({packet, http}) -> true;
-is_tcp_gen_opt({packet, httph}) -> true;
-is_tcp_gen_opt({nodelay, true}) -> true;
-is_tcp_gen_opt({nodelay, false}) -> true;
-is_tcp_gen_opt({active, true}) -> true;
-is_tcp_gen_opt({active, false}) -> true;
-is_tcp_gen_opt({active, once}) -> true;
-is_tcp_gen_opt({keepalive, true}) -> true;
-is_tcp_gen_opt({keepalive, false}) -> true;
-is_tcp_gen_opt({ip, Addr}) -> is_ip_address(Addr);
-is_tcp_gen_opt(_Opt) -> false.
-
-is_tcp_listen_only_opt({backlog, Size}) when is_integer(Size), 0 =< Size -> 
-    true;
-is_tcp_listen_only_opt({reuseaddr, Bool}) when is_boolean(Bool) ->
-    true;
-is_tcp_listen_only_opt(_Opt) -> false.
-
-is_tcp_connect_only_opt({port, Port}) when is_integer(Port), 0 =< Port -> true;
-is_tcp_connect_only_opt(_Opt) -> false.
-
-%% SSL options
-
-is_ssl_opt({verify, Code}) when 0 =< Code, Code =< 2 -> true;
-is_ssl_opt({depth, Depth}) when 0 =< Depth -> true;
-is_ssl_opt({certfile, String}) -> is_string(String);
-is_ssl_opt({keyfile, String}) -> is_string(String);
-is_ssl_opt({password, String}) -> is_string(String);
-is_ssl_opt({cacertfile, String}) -> is_string(String);
-is_ssl_opt({ciphers, String}) -> is_string(String);
-is_ssl_opt({cachetimeout, Timeout}) when Timeout >= 0 -> true;
-is_ssl_opt(_Opt) -> false.
-
-%% Various types
-is_string(String) when is_list(String) ->
-    lists:all(fun (C) when is_integer(C), 0 =< C, C =< 255 -> true; 
-		  (_C) -> false end, 
-	      String);
-is_string(_) ->
-    false.
-
-is_ip_address(Addr) when tuple_size(Addr) =:= 4 ->
-    is_string(tuple_to_list(Addr));
-is_ip_address(Addr) when is_list(Addr) ->
-    is_string(Addr);
-is_ip_address(_) ->
-    false.
-
-get_tagged_opt(Tag, Opts, Default) ->
-    case lists:keysearch(Tag, 1, Opts) of
-	{value, {_, Value}} ->
-	    Value;
-	_Other ->
-	    Default
-    end.
-
-%%
-%%  mk_ssl_optstr(Opts) -> string()
-%%
-%%  Makes a "command line" string of SSL options
-%%
-mk_ssl_optstr(Opts) ->
-    lists:flatten([mk_one_ssl_optstr(O) || O <- Opts]).
-
-mk_one_ssl_optstr({verify, Code}) ->
-    [" -verify ", integer_to_list(Code)];
-mk_one_ssl_optstr({depth, Depth}) ->
-    [" -depth ", integer_to_list(Depth)];
-mk_one_ssl_optstr({certfile, String}) -> 
-    [" -certfile ", String];
-mk_one_ssl_optstr({keyfile, String}) -> 
-    [" -keyfile ", String];
-mk_one_ssl_optstr({password, String}) -> 
-    [" -password ", String];
-mk_one_ssl_optstr({cacertfile, String}) ->
-    [" -cacertfile ", String];
-mk_one_ssl_optstr({ciphers, String}) -> 
-    [" -ciphers ", String];
-mk_one_ssl_optstr({cachetimeout, Timeout}) ->
-    [" -cachetimeout ", integer_to_list(Timeout)];
-mk_one_ssl_optstr(_) ->
-    "".
-
-extract_opts(OptTags, Opts) ->
-    [O || O = {Tag,_} <- Opts, lists:member(Tag, OptTags)].
-
-replace_opts(NOpts, Opts) ->
-    lists:foldl(fun({Key, Val}, Acc) -> 
-			lists:keyreplace(Key, 1, Acc, {Key, Val});
-		   %% XXX Check. Patch from Chandrashekhar Mullaparthi.
-		   (binary, Acc) ->
-			lists:keyreplace(mode, 1, Acc, {mode, binary})
-		end,
-		Opts, NOpts).
-
-%% Misc
-
-is_subset(A, B) ->
-    [] =:= A -- B.
diff --git a/lib/ssl/src/ssl_broker_int.hrl b/lib/ssl/src/ssl_broker_int.hrl
deleted file mode 100644
index b791485725..0000000000
--- a/lib/ssl/src/ssl_broker_int.hrl
+++ /dev/null
@@ -1,38 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2009. 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.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%
-
-%% Purpose: record definitions shared between ssl_prim.erl and ssl_broker.erl
-
--record(st, {brokertype = nil,	% connector | listener | acceptor
-	     server = nil, 	% pid of ssl_server
-	     client = nil, 	% client pid
-	     collector = nil, 	% client pid, or collector during change of 
-	     			% controlling process
-	     fd = nil, 		% fd of "external" socket in port program
-	     active = true, 	% true | false | once
-	     opts = [], 	% options
-	     thissock = nil,    % this sslsocket
-	     proxysock = nil, 	% local proxy socket within Erlang
-	     proxyport = nil,   % local port for proxy within Erlang
-	     status = nil,	% open | closing | closed 
-	     encrypted = false, %
-	     debug = false	%
-	    }).
diff --git a/lib/ssl/src/ssl_broker_sup.erl b/lib/ssl/src/ssl_broker_sup.erl
deleted file mode 100644
index 6d56a5fcf6..0000000000
--- a/lib/ssl/src/ssl_broker_sup.erl
+++ /dev/null
@@ -1,46 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2009. 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.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%
-
-%%% Purpose : Supervisor for brokers
-
--module(ssl_broker_sup).
-
--behaviour(supervisor).
-
--export([start_link/0]).
-
-%% supervisor callbacks
--export([init/1]).
-
-start_link() ->
-    supervisor:start_link({local, ssl_broker_sup}, ssl_broker_sup,
-			  []).
-
-init([]) ->
-    {ok, {{simple_one_for_one, 10, 3600}, 
-	  [{ssl_broker,
-	    {ssl_broker, start_link, []},
-	    temporary,
-	    100,
-	    worker,
-	    [ssl_broker]}
-	  ]}}.
-
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 21b021afb0..c772697f1d 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -34,7 +34,6 @@
 -include("ssl_record.hrl").
 -include("ssl_cipher.hrl"). 
 -include("ssl_internal.hrl").
--include("ssl_int.hrl").
 -include_lib("public_key/include/public_key.hrl"). 
 
 %% Internal application API
@@ -127,11 +126,11 @@ send(Pid, Data) ->
 recv(Pid, Length, Timeout) -> 
     sync_send_all_state_event(Pid, {recv, Length}, Timeout).
 %%--------------------------------------------------------------------
--spec connect(host(), port_num(), port(), {#ssl_options{}, #socket_options{}},
+-spec connect(host(), inet:port_number(), port(), {#ssl_options{}, #socket_options{}},
 	      pid(), tuple(), timeout()) ->
 		     {ok, #sslsocket{}} | {error, reason()}.
 %%
-%% Description: Connect to a ssl server.
+%% Description: Connect to an ssl server.
 %%--------------------------------------------------------------------
 connect(Host, Port, Socket, Options, User, CbInfo, Timeout) ->
     try start_fsm(client, Host, Port, Socket, Options, User, CbInfo,
@@ -141,11 +140,11 @@ connect(Host, Port, Socket, Options, User, CbInfo, Timeout) ->
 	    {error, ssl_not_started}
     end.
 %%--------------------------------------------------------------------
--spec ssl_accept(port_num(), port(), {#ssl_options{}, #socket_options{}}, 
+-spec ssl_accept(inet:port_number(), port(), {#ssl_options{}, #socket_options{}},
 				      pid(), tuple(), timeout()) ->
     {ok, #sslsocket{}} | {error, reason()}.
 %%
-%% Description: Performs accept on a ssl listen socket. e.i. performs
+%% Description: Performs accept on an ssl listen socket. e.i. performs
 %%              ssl handshake. 
 %%--------------------------------------------------------------------
 ssl_accept(Port, Socket, Opts, User, CbInfo, Timeout) ->
@@ -185,7 +184,7 @@ socket_control(Socket, Pid, CbModule) ->
 %%--------------------------------------------------------------------
 -spec close(pid()) -> ok | {error, reason()}.  
 %%
-%% Description:  Close a ssl connection
+%% Description:  Close an ssl connection
 %%--------------------------------------------------------------------
 close(ConnectionPid) ->
     case sync_send_all_state_event(ConnectionPid, close) of
@@ -212,14 +211,14 @@ shutdown(ConnectionPid, How) ->
 new_user(ConnectionPid, User) ->
     sync_send_all_state_event(ConnectionPid, {new_user, User}).
 %%--------------------------------------------------------------------
--spec sockname(pid()) -> {ok, {tuple(), port_num()}} | {error, reason()}.
+-spec sockname(pid()) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}.
 %%
 %% Description:  Same as inet:sockname/1
 %%--------------------------------------------------------------------
 sockname(ConnectionPid) ->
     sync_send_all_state_event(ConnectionPid, sockname).
 %%--------------------------------------------------------------------
--spec peername(pid()) -> {ok, {tuple(), port_num()}} | {error, reason()}.
+-spec peername(pid()) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}.
 %%
 %% Description:  Same as inet:peername/1
 %%--------------------------------------------------------------------
@@ -277,7 +276,7 @@ renegotiation(ConnectionPid) ->
 %%====================================================================
 
 %%--------------------------------------------------------------------
--spec start_link(atom(), host(), port_num(), port(), list(), pid(), tuple()) ->
+-spec start_link(atom(), host(), inet:port_number(), port(), list(), pid(), tuple()) ->
     {ok, pid()} | ignore |  {error, reason()}.
 %%
 %% Description: Creates a gen_fsm process which calls Module:init/1 to
@@ -1033,7 +1032,8 @@ code_change(_OldVsn, StateName, State, _Extra) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-start_fsm(Role, Host, Port, Socket, Opts,  User, {CbModule, _,_, _} = CbInfo, 
+start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_} = Opts,
+	  User, {CbModule, _,_, _} = CbInfo, 
 	  Timeout) -> 
     try 
 	{ok, Pid} = ssl_connection_sup:start_child([Role, Host, Port, Socket, 
@@ -1044,9 +1044,26 @@ start_fsm(Role, Host, Port, Socket, Opts,  User, {CbModule, _,_, _} = CbInfo,
     catch
 	error:{badmatch, {error, _} = Error} ->
 	    Error
+    end;
+
+start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = true},_} = Opts,
+	  User, {CbModule, _,_, _} = CbInfo, 
+	  Timeout) -> 
+    try 
+	{ok, Pid} = ssl_connection_sup:start_child_dist([Role, Host, Port, Socket, 
+							 Opts, User, CbInfo]), 
+	{ok, SslSocket} = socket_control(Socket, Pid, CbModule),
+	ok = handshake(SslSocket, Timeout),
+	{ok, SslSocket} 
+    catch
+	error:{badmatch, {error, _} = Error} ->
+	    Error
     end.
 
 ssl_init(SslOpts, Role) ->
+    
+    init_manager_name(SslOpts#ssl_options.erl_dist),
+
     {ok, CertDbRef, CertDbHandle, CacheHandle, OwnCert} = init_certificates(SslOpts, Role),
     PrivateKey =
 	init_private_key(CertDbHandle, SslOpts#ssl_options.key, SslOpts#ssl_options.keyfile,
@@ -1054,6 +1071,10 @@ ssl_init(SslOpts, Role) ->
     DHParams = init_diffie_hellman(CertDbHandle, SslOpts#ssl_options.dh, SslOpts#ssl_options.dhfile, Role),
     {ok, CertDbRef, CertDbHandle, CacheHandle, OwnCert, PrivateKey, DHParams}.
 
+init_manager_name(false) ->
+    put(ssl_manager, ssl_manager);
+init_manager_name(true) ->
+    put(ssl_manager, ssl_manager_dist).
 
 init_certificates(#ssl_options{cacerts = CaCerts,
 			       cacertfile = CACertFile,
@@ -1778,7 +1799,8 @@ format_reply(binary, _, N, Data) when N > 0 ->  % Header mode
 format_reply(binary, _, _, Data) ->  
     Data;
 format_reply(list, Packet, _, Data)
-  when Packet == http; Packet == {http, headers};  Packet == http_bin; Packet == {http_bin, headers} ->
+  when Packet == http; Packet == {http, headers};  Packet == http_bin; Packet == {http_bin, headers}; Packet == httph;
+       Packet == httph_bin->
     Data;
 format_reply(list, _,_, Data) ->
     binary_to_list(Data).
@@ -2090,7 +2112,9 @@ set_socket_opts(Socket, [{packet, Packet}| Opts], SockOpts, Other) when Packet =
 									Packet == tpkt;
 									Packet == line;
 									Packet == http;
-									Packet == http_bin ->
+									Packet == httph;
+									Packet == http_bin;
+									Packet == httph_bin ->
     set_socket_opts(Socket, Opts, 
 		    SockOpts#socket_options{packet = Packet}, Other);
 set_socket_opts(_, [{packet, _} = Opt| _], SockOpts, _) ->
diff --git a/lib/ssl/src/ssl_connection_sup.erl b/lib/ssl/src/ssl_connection_sup.erl
index e9328d5f7c..78cfda5e63 100644
--- a/lib/ssl/src/ssl_connection_sup.erl
+++ b/lib/ssl/src/ssl_connection_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -26,8 +26,8 @@
 -behaviour(supervisor).
 
 %% API
--export([start_link/0]).
--export([start_child/1]).
+-export([start_link/0, start_link_dist/0]).
+-export([start_child/1, start_child_dist/1]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -38,9 +38,15 @@
 start_link() ->
     supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 
+start_link_dist() ->
+    supervisor:start_link({local, ssl_connection_sup_dist}, ?MODULE, []).
+
 start_child(Args) ->
     supervisor:start_child(?MODULE, Args).
     
+start_child_dist(Args) ->
+    supervisor:start_child(ssl_connection_sup_dist, Args).
+    
 %%%=========================================================================
 %%%  Supervisor callback
 %%%=========================================================================
diff --git a/lib/ssl/src/ssl_dist_sup.erl b/lib/ssl/src/ssl_dist_sup.erl
new file mode 100644
index 0000000000..c1912401d7
--- /dev/null
+++ b/lib/ssl/src/ssl_dist_sup.erl
@@ -0,0 +1,84 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(ssl_dist_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callback
+-export([init/1]).
+
+%%%=========================================================================
+%%%  API
+%%%=========================================================================
+
+-spec start_link() -> {ok, pid()} | ignore | {error, term()}.
+			
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+%%%=========================================================================
+%%%  Supervisor callback
+%%%=========================================================================
+-spec init([]) -> {ok,  {SupFlags :: tuple(),  [ChildSpec :: tuple()]}}.
+
+init([]) ->    
+    SessionCertManager = session_and_cert_manager_child_spec(),
+    ConnetionManager = connection_manager_child_spec(),
+    ProxyServer = proxy_server_child_spec(),
+
+    {ok, {{one_for_all, 10, 3600}, [SessionCertManager, ConnetionManager,
+				    ProxyServer]}}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+session_and_cert_manager_child_spec() ->
+    Opts = ssl_sup:manager_opts(),
+    Name = ssl_manager_dist,  
+    StartFunc = {ssl_manager, start_link_dist, [Opts]},
+    Restart = permanent, 
+    Shutdown = 4000,
+    Modules = [ssl_manager],
+    Type = worker,
+    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
+
+connection_manager_child_spec() ->
+    Name = ssl_connection_dist,  
+    StartFunc = {ssl_connection_sup, start_link_dist, []},
+    Restart = permanent, 
+    Shutdown = 4000,
+    Modules = [ssl_connection],
+    Type = supervisor,
+    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
+
+proxy_server_child_spec() ->
+    Name = ssl_tls_dist_proxy,  
+    StartFunc = {ssl_tls_dist_proxy, start_link, []},
+    Restart = permanent, 
+    Shutdown = 4000,
+    Modules = [ssl_tls_dist_proxy],
+    Type = worker,
+    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
+
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 4e74aec4ac..f873a6a913 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -39,6 +39,8 @@
 	 encode_handshake/2, init_hashes/0, update_hashes/2,
 	 decrypt_premaster_secret/2]).
 
+-export([dec_hello_extensions/2]).
+
 -type tls_handshake() :: #client_hello{} | #server_hello{} |
 			 #server_hello_done{} | #certificate{} | #certificate_request{} |
 			 #client_key_exchange{} | #finished{} | #certificate_verify{} |
@@ -48,7 +50,7 @@
 %% Internal application API
 %%====================================================================
 %%--------------------------------------------------------------------
--spec client_hello(host(), port_num(), #connection_states{},
+-spec client_hello(host(), inet:port_number(), #connection_states{},
 		   #ssl_options{}, boolean(), der_cert()) -> #client_hello{}.
 %%
 %% Description: Creates a client hello message.
@@ -106,7 +108,7 @@ hello_request() ->
 
 %%--------------------------------------------------------------------
 -spec hello(#server_hello{} | #client_hello{}, #ssl_options{},
-	    #connection_states{} | {port_num(), #session{}, db_handle(),
+	    #connection_states{} | {inet:port_number(), #session{}, db_handle(),
  				    atom(), #connection_states{}, binary()},
  	    boolean()) -> {tls_version(), session_id(), #connection_states{}}| 
  			  {tls_version(), {resumed | new, #session{}}, 
@@ -383,8 +385,9 @@ master_secret(Version, #session{master_secret = Mastersecret},
 		      ConnectionStates, Role)
     catch
 	exit:Reason ->
-	    error_logger:error_report("Key calculation failed due to ~p",
-				      [Reason]),
+	    Report = io_lib:format("Key calculation failed due to ~p",
+				   [Reason]),
+	    error_logger:error_report(Report),
 	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
     end;
 
@@ -400,8 +403,9 @@ master_secret(Version, PremasterSecret, ConnectionStates, Role) ->
 		      SecParams, ConnectionStates, Role) 
     catch
 	exit:Reason ->
-	    error_logger:error_report("Master secret calculation failed"
-				      " due to ~p", [Reason]),
+	    Report = io_lib:format("Master secret calculation failed"
+				   " due to ~p", [Reason]),
+	    error_logger:error_report(Report),
 	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
     end.
 
@@ -910,9 +914,12 @@ dec_hello_extensions(<<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), Info:Len/binar
 		      end,	    
     dec_hello_extensions(Rest, [{renegotiation_info, 
 			   #renegotiation_info{renegotiated_connection = RenegotiateInfo}} | Acc]);
-dec_hello_extensions(<<?UINT16(_), ?UINT16(Len), _Unknown:Len, Rest/binary>>, Acc) ->
+
+%% Ignore data following the ClientHello (i.e.,
+%% extensions) if not understood.
+dec_hello_extensions(<<?UINT16(_), ?UINT16(Len), _Unknown:Len/binary, Rest/binary>>, Acc) ->
     dec_hello_extensions(Rest, Acc);
-%% Need this clause?
+%% This theoretically should not happen if the protocol is followed, but if it does it is ignored.
 dec_hello_extensions(_, Acc) ->
     Acc.
 
diff --git a/lib/ssl/src/ssl_int.hrl b/lib/ssl/src/ssl_int.hrl
deleted file mode 100644
index 3686deffce..0000000000
--- a/lib/ssl/src/ssl_int.hrl
+++ /dev/null
@@ -1,99 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2009. 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.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%
-
-%% op codes commands are in capital and reply codes in lower case 
-
--define(CONNECT,	1).
--define(CONNECT_WAIT,	2).
--define(CONNECT_REP,	3).
--define(CONNECT_ERR,	4).
-
--define(TERMINATE,	5).
--define(CLOSE,		6).
-
--define(LISTEN,		7).
--define(LISTEN_REP,	8).
--define(LISTEN_ERR,	9).
-
--define(TRANSPORT_ACCEPT, 10).
--define(NOACCEPT,	11).
--define(TRANSPORT_ACCEPT_REP, 12).
--define(TRANSPORT_ACCEPT_ERR, 13).
-
--define(FROMNET_CLOSE,	14).
-
--define(CONNECT_SYNC_ERR, 15).
--define(LISTEN_SYNC_ERR, 16).
-
--define(PROXY_PORT,	23).
--define(PROXY_JOIN,	24).
--define(PROXY_JOIN_REP,	25).
--define(PROXY_JOIN_ERR,	26).
-
--define(SET_SOCK_OPT,	27).
--define(IOCTL_OK,	28).
--define(IOCTL_ERR,	29).
-
--define(GETPEERNAME,	30).
--define(GETPEERNAME_REP, 31).
--define(GETPEERNAME_ERR, 32).
-
--define(GETSOCKNAME,	33).
--define(GETSOCKNAME_REP, 34).
--define(GETSOCKNAME_ERR, 35).
-
--define(GETPEERCERT,	36).
--define(GETPEERCERT_REP, 37).
--define(GETPEERCERT_ERR, 38).
-
--define(GETVERSION, 39).
--define(GETVERSION_REP, 40).
-
--define(SET_SEED, 41).
-
--define(GETCONNINFO, 42).
--define(GETCONNINFO_REP, 43).
--define(GETCONNINFO_ERR, 44).
-
--define(SSL_ACCEPT, 45).
--define(SSL_ACCEPT_REP, 46).
--define(SSL_ACCEPT_ERR, 47).
-
--define(DUMP_CMD,       48).
--define(DEBUG_CMD,      49).
--define(DEBUGMSG_CMD,   50).
-
-%% --------------
-
--define(SSLv2, 1).
--define(SSLv3, 2).
--define(TLSv1, 4).
-
-
-%% Set socket options codes  'SET_SOCK_OPT' 
--define(SET_TCP_NODELAY, 1).
-
--define(DEF_BACKLOG, 128).
-
--define(DEF_TIMEOUT, 10000).
-
--record(sslsocket, { fd = nil, pid = nil}).
-
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index cc66246068..18cfcdcd68 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -24,12 +24,14 @@
 
 -include_lib("public_key/include/public_key.hrl"). 
 
+%% Looks like it does for backwards compatibility reasons
+-record(sslsocket, {fd = nil, pid = nil}).
+
 -type reason()            :: term().
 -type reply()             :: term().
 -type msg()               :: term().
 -type from()              :: term().
--type host()		  :: string() | tuple().
--type port_num()	  :: integer().
+-type host()		  :: inet:ip_address() | inet:hostname().
 -type session_id()        :: 0 | binary().
 -type tls_version()       :: {integer(), integer()}.
 -type tls_atom_version()  :: sslv3 | tlsv1.
@@ -99,10 +101,12 @@
 	  renegotiate_at,
 	  secure_renegotiate,
 	  debug,
-	  hibernate_after % undefined if not hibernating,
+	  hibernate_after,% undefined if not hibernating,
                           % or number of ms of inactivity
 			  % after which ssl_connection will
                           % go into hibernation
+	  %% This option should only be set to true by inet_tls_dist
+	  erl_dist = false 
 	  }).
 
 -record(socket_options,
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index b02815bfd8..dcf310c535 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -27,7 +27,7 @@
 -include("ssl_internal.hrl").
 
 %% Internal application API
--export([start_link/1, 
+-export([start_link/1, start_link_dist/1,
 	 connection_init/2, cache_pem_file/2,
 	 lookup_trusted_cert/4, issuer_candidate/2, client_session_id/4,
 	 server_session_id/4,
@@ -66,10 +66,20 @@
 %%--------------------------------------------------------------------
 -spec start_link(list()) -> {ok, pid()} | ignore | {error, term()}.
 %%
-%% Description: Starts the server
+%% Description: Starts the ssl manager that takes care of sessions
+%% and certificate caching.
 %%--------------------------------------------------------------------
 start_link(Opts) ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [Opts], []).
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [?MODULE, Opts], []).
+
+%%--------------------------------------------------------------------
+-spec start_link_dist(list()) -> {ok, pid()} | ignore | {error, term()}.
+%%
+%% Description: Starts a special instance of the ssl manager to
+%% be used by the erlang distribution. Note disables soft upgrade!
+%%--------------------------------------------------------------------
+start_link_dist(Opts) ->
+    gen_server:start_link({local, ssl_manager_dist}, ?MODULE, [ssl_manager_dist, Opts], []).
 
 %%--------------------------------------------------------------------
 -spec connection_init(string()| {der, list()}, client | server) ->
@@ -113,7 +123,7 @@ lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer) ->
 issuer_candidate(PrevCandidateKey, DbHandle) ->
     ssl_certificate_db:issuer_candidate(PrevCandidateKey, DbHandle).
 %%--------------------------------------------------------------------
--spec client_session_id(host(), port_num(), #ssl_options{},
+-spec client_session_id(host(), inet:port_number(), #ssl_options{},
 			der_cert() | undefined) -> session_id().
 %%
 %% Description: Select a session id for the client.
@@ -122,7 +132,7 @@ client_session_id(Host, Port, SslOpts, OwnCert) ->
     call({client_session_id, Host, Port, SslOpts, OwnCert}).
 
 %%--------------------------------------------------------------------
--spec server_session_id(host(), port_num(), #ssl_options{},
+-spec server_session_id(host(), inet:port_number(), #ssl_options{},
 			der_cert()) -> session_id().
 %%
 %% Description: Select a session id for the server.
@@ -131,8 +141,8 @@ server_session_id(Port, SuggestedSessionId, SslOpts, OwnCert) ->
     call({server_session_id, Port, SuggestedSessionId, SslOpts, OwnCert}).
 
 %%--------------------------------------------------------------------
--spec register_session(port_num(), #session{}) -> ok.
--spec register_session(host(), port_num(), #session{}) -> ok.
+-spec register_session(inet:port_number(), #session{}) -> ok.
+-spec register_session(host(), inet:port_number(), #session{}) -> ok.
 %%
 %% Description: Make the session available for reuse.
 %%--------------------------------------------------------------------
@@ -142,8 +152,8 @@ register_session(Host, Port, Session) ->
 register_session(Port, Session) ->
     cast({register_session, Port, Session}).
 %%--------------------------------------------------------------------
--spec invalidate_session(port_num(), #session{}) -> ok.
--spec invalidate_session(host(), port_num(), #session{}) -> ok.
+-spec invalidate_session(inet:port_number(), #session{}) -> ok.
+-spec invalidate_session(host(), inet:port_number(), #session{}) -> ok.
 %%
 %% Description: Make the session unavailable for reuse. After
 %% a the session has been marked "is_resumable = false" for some while
@@ -166,7 +176,8 @@ invalidate_session(Port, Session) ->
 %%
 %% Description: Initiates the server
 %%--------------------------------------------------------------------
-init([Opts]) ->
+init([Name, Opts]) ->
+    put(ssl_manager, Name),
     process_flag(trap_exit, true),
     CacheCb = proplists:get_value(session_cb, Opts, ssl_session_cache),
     SessionLifeTime =  
@@ -376,10 +387,10 @@ code_change(_OldVsn, State, _Extra) ->
 %%% Internal functions
 %%--------------------------------------------------------------------
 call(Msg) ->
-    gen_server:call(?MODULE, {Msg, self()}, infinity).
+    gen_server:call(get(ssl_manager), {Msg, self()}, infinity).
 
 cast(Msg) ->
-    gen_server:cast(?MODULE, Msg).
+    gen_server:cast(get(ssl_manager), Msg).
  
 validate_session(Host, Port, Session, LifeTime) ->
     case ssl_session:valid_session(Session, LifeTime) of
@@ -399,9 +410,10 @@ validate_session(Port, Session, LifeTime) ->
 		    
 start_session_validator(Cache, CacheCb, LifeTime) ->
     spawn_link(?MODULE, init_session_validator, 
-	       [[Cache, CacheCb, LifeTime]]).
+	       [[get(ssl_manager), Cache, CacheCb, LifeTime]]).
 
-init_session_validator([Cache, CacheCb, LifeTime]) ->
+init_session_validator([SslManagerName, Cache, CacheCb, LifeTime]) ->
+    put(ssl_manager, SslManagerName),
     CacheCb:foldl(fun session_validation/2,
 		  LifeTime, Cache).
 
diff --git a/lib/ssl/src/ssl_prim.erl b/lib/ssl/src/ssl_prim.erl
deleted file mode 100644
index e3140a89d1..0000000000
--- a/lib/ssl/src/ssl_prim.erl
+++ /dev/null
@@ -1,173 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2009. 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.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%
-
-%% Purpose: Primitive interface to SSL, without broker process (used by 
-%% SSL distribution).
-
--module(ssl_prim).
-
--export([listen/2, connect/3, accept/1, close/1, send/2, send/3, recv/2, recv/3,
-	 getll/1, getstat/2, setopts/2, controlling_process/2, peername/1,
-	 sockname/1, getif/1]).
-
--include("ssl_int.hrl").
--include("ssl_broker_int.hrl").
-
-%-define(filter(Call), filter((catch Call))).
--define(filter(Call), filter(Call)).
-
-listen(Port, Opts) ->
-    St = newstate(listener),
-    ?filter(ssl_broker:listen_prim(ssl_server_prim, self(), Port, nonactive(Opts), St)).
-
-connect(Address, Port, Opts) ->
-    St = newstate(connector),
-    ?filter(ssl_broker:connect_prim(ssl_server_prim, inet_tcp, self(), Address, 
-				    Port, nonactive(Opts), infinity, St)).
-
-accept(#st{} = ListenSt0) ->
-    case transport_accept(ListenSt0) of
-	{ok, ListenSt1} ->
-	    ssl_accept(ListenSt0, ListenSt1);
-	Error ->
-	    Error
-    end.
-
-transport_accept(#st{opts = ListenOpts, thissock = ListenSocket}) ->
-    NewSt = newstate(acceptor),
-    ListenFd = ListenSocket#sslsocket.fd,
-    ?filter(ssl_broker:transport_accept_prim(ssl_server_prim, ListenFd,
-					     ListenOpts, infinity, NewSt)).
-
-ssl_accept(#st{opts = LOpts}, ListenSt1) ->
-    ?filter(ssl_broker:ssl_accept_prim(ssl_server_prim, gen_tcp, self(),
-				       LOpts, infinity, ListenSt1)).
-
-close(#st{fd = Fd}) when is_integer(Fd) ->
-    ssl_server:close_prim(ssl_server_prim, Fd),
-    ok;
-close(_) ->
-    ok.
-
-send(St, Data) ->
-    send(St, Data, []).
-
-send(#st{proxysock = Proxysock, status = open}, Data, Opts) ->
-    case inet_tcp:send(Proxysock, Data, Opts) of
-	ok ->
-	    ok;
-	{error, _} ->
-	    {error, closed}
-    end;
-send(#st{}, _Data, _Opts) ->
-    {error, closed}.
-
-recv(St, Length) ->
-    recv(St, Length, infinity).
-
-recv(#st{proxysock = Proxysock, status = open}, Length, Tmo) ->
-    inet_tcp:recv(Proxysock, Length, Tmo);
-recv(#st{}, _Length, _Tmo) ->
-    {error, closed}.
-
-getll(#st{proxysock = Proxysock, status = open})  ->
-    inet:getll(Proxysock);
-getll(#st{}) ->
-    {error, closed}.
-
-getstat(#st{proxysock = Proxysock, status = open}, Opts) ->
-    inet:getstat(Proxysock, Opts);
-getstat(#st{}, _Opts) ->
-    {error, closed}.
-
-setopts(#st{proxysock = Proxysock, status = open}, Opts) ->
-    case remove_supported(Opts) of
-	[] ->
-	    inet:setopts(Proxysock, Opts);
-	_ ->
-	    {error, enotsup}
-    end;
-setopts(#st{}, _Opts) ->
-    {error, closed}.
-
-
-controlling_process(#st{proxysock = Proxysock, status = open}, Pid)
-  when is_pid(Pid) ->
-    inet_tcp:controlling_process(Proxysock, Pid);
-controlling_process(#st{}, Pid) when is_pid(Pid) ->
-    {error, closed}.
-
-peername(#st{fd = Fd, status = open}) ->
-    case ssl_server:peername_prim(ssl_server_prim, Fd) of
-	{ok, {Address, Port}} ->
-	    {ok, At} = inet_parse:ipv4_address(Address),
-	    {ok, {At, Port}};
-	Error ->
-	    Error
-    end;
-peername(#st{}) ->
-    {error, closed}.
-
-sockname(#st{fd = Fd, status = open}) ->
-    case ssl_server:sockname_prim(ssl_server_prim, Fd) of
-	{ok, {Address, Port}} ->
-	    {ok, At} = inet_parse:ipv4_address(Address),
-	    {ok, {At, Port}};
-	Error ->
-	    Error
-    end;
-sockname(#st{}) ->
-    {error, closed}.
-
-getif(#st{proxysock = Proxysock, status = open}) ->
-    inet:getif(Proxysock);
-getif(#st{}) ->
-    {error, closed}.
-
-remove_supported([{active, _}|T]) ->
-    remove_supported(T);
-remove_supported([{packet,_}|T]) ->
-    remove_supported(T);
-remove_supported([{deliver,_}|T]) ->
-    remove_supported(T);
-remove_supported([H|T]) ->
-    [H | remove_supported(T)];
-remove_supported([]) ->
-    [].
-
-filter(Result) ->
-    case Result of
-	{ok, _Sock,St} ->
-	    {ok, St};
-        {error, Reason, _St} ->
-	    {error,Reason}
-    end.
-
-nonactive([{active,_}|T]) ->
-    nonactive(T);
-nonactive([H|T]) ->
-    [H | nonactive(T)];
-nonactive([]) ->
-    [{active, false}].
-
-newstate(Type) ->
-   #st{brokertype = Type, server = whereis(ssl_server_prim),
-       client = undefined, collector = undefined, debug = false}. 
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index 4c3c0b9c58..72091fdd5f 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -342,7 +342,7 @@ get_tls_records_aux(<<?BYTE(?CHANGE_CIPHER_SPEC),?BYTE(MajVer),?BYTE(MinVer),
     get_tls_records_aux(Rest, [#ssl_tls{type = ?CHANGE_CIPHER_SPEC,
 					version = {MajVer, MinVer},
 					fragment = Data} | Acc]);
-%% Matches a ssl v2 client hello message.
+%% Matches an ssl v2 client hello message.
 %% The server must be able to receive such messages, from clients that
 %% are willing to use ssl v3 or higher, but have ssl v2 compatibility.
 get_tls_records_aux(<<1:1, Length0:15, Data0:Length0/binary, Rest/binary>>,
diff --git a/lib/ssl/src/ssl_server.erl b/lib/ssl/src/ssl_server.erl
deleted file mode 100644
index b66e20a397..0000000000
--- a/lib/ssl/src/ssl_server.erl
+++ /dev/null
@@ -1,1378 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2009. 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.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%
-
-%%% Purpose : SSL server
-
-%%
-%% TODO
-%%
-%% XXX The ip option in listen is not general enough. It is assumed
-%%     to be a tuple, which is not always the case.
-
--module(ssl_server).
--behaviour(gen_server).
-
-%% External exports 
--export([start_link/0]).  
-
--export([transport_accept/2, transport_accept/3, ssl_accept/2, ssl_accept/3,
-	 ciphers/0, connect/5, connect/6,
-	 connection_info/1, close/1, listen/3, listen/4, peercert/1,
-	 peername/1, proxy_join/2, seed/1, setnodelay/2, sockname/1,
-	 version/0]).
-
--export([start_link_prim/0]).
--export([ssl_accept_prim/4, transport_accept_prim/4,
-	 connect_prim/7, close_prim/2, 
-	 listen_prim/5, proxy_join_prim/3, peername_prim/2, setnodelay_prim/3, 
-	 sockname_prim/2]).
-
--export([dump/0, dump/1]).
--export([enable_debug/0, disable_debug/0, set_debug/1]).
--export([enable_debugmsg/0, disable_debugmsg/0, set_debugmsg/1]).
-
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2, 
-	 code_change/3, terminate/2]).
-
--include("ssl_int.hrl").
-
--record(st, {
-	  port = [],			% port() of port program
-	  progpid = [],			% OS pid of port program
-	  debug = false,		% debug printout flag
-	  cons = [], 			% All brokers except pending accepts
-	  paccepts = [], 		% Pending accept brokers
-	  proxylsport = [], 		% proxy listen socket port
-	  intref = 0,			% internal reference counter
-	  compvsn = "",			% ssl compile library version
-	  libvsn = "",			% ssl library version
-	  ciphers = []			% available ciphers
-	 }).
-
-
-%% In all functions below IP is a four tuple, e.g. {192, 236, 52, 7}. 
-%% Port, Fd and ListenFd are integers; Flags is a string of characters.
-%%
-%% The prefixes F and L mean foreign and local, respectively. 
-%% Example: FIP (IP address for foreign end).
-
-%%
-%% start_link() -> {ok, Pid} | {error, Reason}
-%%
-start_link() ->
-    gen_server:start_link({local, ssl_server}, ssl_server, [], []).
-
-start_link_prim() ->
-    gen_server:start_link({local, ssl_server_prim}, ssl_server, [], []).
-
-%%
-%% transport_accept(ListenFd, Flags) -> {ok, Fd, ProxyLLPort} |
-%%			      {error, Reason}
-%%
-transport_accept(ListenFd, Flags) ->
-    transport_accept(ListenFd, Flags, infinity).
-transport_accept(ListenFd, Flags, Timeout) ->
-    transport_accept_prim(ssl_server,ListenFd, Flags, Timeout).
-
-transport_accept_prim(ServerName, ListenFd, Flags, Timeout) ->
-    Req = {transport_accept, self(), ListenFd, Flags}, 
-    gen_server:call(ServerName, Req, Timeout).
-
-%%
-%% ssl_accept(ListenFd, Flags) -> {ok, Fd, ProxyLLPort} |
-%%			      {error, Reason}
-%%
-ssl_accept(ListenFd, Flags) ->
-    ssl_accept(ListenFd, Flags, infinity).
-ssl_accept(ListenFd, Flags, Timeout) ->
-    ssl_accept_prim(ssl_server, ListenFd, Flags, Timeout).
-
-ssl_accept_prim(ServerName, Fd, Flags, Timeout) ->
-    Req = {ssl_accept, Fd, Flags}, 
-    gen_server:call(ServerName, Req, Timeout).
-
-%%
-%% ciphers() -> {ok, Ciphers} 
-%%
-ciphers() ->
-    gen_server:call(ssl_server, ciphers, infinity).
-
-%%
-%% close(Fd) -> ok
-%%
-close(Fd) -> 
-    close_prim(ssl_server, Fd).
-close_prim(ServerName, Fd) -> 
-    gen_server:call(ServerName, {close, self(), Fd}, infinity),
-    ok.
-
-%%
-%% connect(LIP, LPort, FIP, FPort, Flags) -> {ok, Fd, ProxyLFPort} |
-%%					 {error, Reason}
-%%
-connect(LIP, LPort, FIP, FPort, Flags) ->
-    connect(LIP, LPort, FIP, FPort, Flags, infinity).
-connect(LIP, LPort, FIP, FPort, Flags, Timeout) ->
-    connect_prim(ssl_server, LIP, LPort, FIP, FPort, Flags, Timeout).
-
-connect_prim(ServerName, LIP, LPort, FIP, FPort, Flags, Timeout) ->
-    Req = {connect, self(), LIP, LPort, FIP, FPort, Flags},
-    gen_server:call(ServerName, Req, Timeout).
-
-%%
-%% connection_info(Fd) -> {ok, {Protocol, Cipher}} | {error, Reason}
-%%
-connection_info(Fd) ->
-    Req = {connection_info, self(), Fd},
-    gen_server:call(ssl_server, Req, infinity).
-  
-%%
-%% listen(IP, LPort, Flags), 
-%% listen(IP, LPort, Flags, BackLog) -> {ok, ListenFd, LPort0} | 
-%%                                    {error, Reason}
-%%
-listen(IP, LPort, Flags) ->
-    listen(IP, LPort, Flags, ?DEF_BACKLOG).
-listen(IP, LPort, Flags, BackLog) ->
-    listen_prim(ssl_server, IP, LPort, Flags, BackLog).
-listen_prim(ServerName, IP, LPort, Flags, BackLog) ->
-    Req = {listen, self(), IP, LPort, Flags, BackLog},
-    gen_server:call(ServerName, Req, infinity).
-
-%%
-%% peercert(Fd) -> {ok, Cert} | {error, Reason}
-%%
-peercert(Fd) ->
-    Req = {peercert, self(), Fd},
-    gen_server:call(ssl_server, Req, infinity).
-
-%%
-%% peername(Fd) -> {ok, {Address, Port}} | {error, Reason}
-%%
-peername(Fd) ->
-    peername_prim(ssl_server, Fd).
-peername_prim(ServerName, Fd) ->
-    Req = {peername, self(), Fd},
-    gen_server:call(ServerName, Req, infinity).
-
-%%
-%% proxy_join(Fd, LPort) -> ok | {error, Reason}
-%%
-proxy_join(Fd, LPort) ->
-    proxy_join_prim(ssl_server, Fd, LPort).
-proxy_join_prim(ServerName, Fd, LPort) ->
-    Req = {proxy_join, self(), Fd, LPort},
-    gen_server:call(ServerName, Req, infinity).
-
-%%
-%%  seed(Data)
-%%
-seed(Data) ->
-    Req = {seed, Data},
-    gen_server:call(ssl_server, Req, infinity).
-    
-%%
-%%  set_nodelay(Fd, Boolean)
-%%
-setnodelay(Fd, Boolean) ->
-    setnodelay_prim(ssl_server, Fd, Boolean).
-setnodelay_prim(ServerName, Fd, Boolean) ->
-    Req = {setnodelay, self(), Fd, Boolean},
-    gen_server:call(ServerName, Req, infinity).
-    
-%%
-%% sockname(Fd) -> {ok, {Address, Port}} | {error, Reason}
-%%
-sockname(Fd) ->
-    sockname_prim(ssl_server, Fd).
-sockname_prim(ServerName, Fd) ->
-    Req = {sockname, self(), Fd},
-    gen_server:call(ServerName, Req, infinity).
-
-%%
-%% version() -> {ok, {CompVsn, LibVsn}} 
-%%
-version() ->
-    gen_server:call(ssl_server, version, infinity).
-
-
-enable_debug() ->
-    set_debug(true).
-
-disable_debug() ->
-    set_debug(false).
-
-set_debug(Bool) ->
-    set_debug(Bool, infinity).
-
-set_debug(Bool, Timeout) when is_boolean(Bool) ->
-    Req = {set_debug, Bool, self()},
-    gen_server:call(ssl_server, Req, Timeout).
-                
-enable_debugmsg() ->
-    set_debugmsg(true).
-
-disable_debugmsg() ->
-    set_debugmsg(false).
-
-set_debugmsg(Bool) ->
-    set_debugmsg(Bool, infinity).
-
-set_debugmsg(Bool, Timeout) when is_boolean(Bool) ->
-    Req = {set_debugmsg, Bool, self()},
-    gen_server:call(ssl_server, Req, Timeout).
-
-dump() ->
-    dump(infinity).
-
-dump(Timeout) ->
-    Req = {dump, self()}, 
-    gen_server:call(ssl_server, Req, Timeout).
-
-%%
-%% init
-%%
-init([]) ->
-    Debug = case application:get_env(ssl, edebug) of
-		{ok, true} -> 
-		    true;
-		_ ->
-		    case application:get_env(ssl, debug) of
-			{ok, true} ->
-			    true;
-			_  ->
-			    os:getenv("ERL_SSL_DEBUG") =/= false
-		    end
-	    end,
-    ProgDir = 
-	case init:get_argument(ssl_portprogram_dir) of
-	    {ok, [[D]]} ->
-		D;
-	    _ ->
-		find_priv_bin()
-	end,
-    {Program, Flags} = mk_cmd_line("ssl_esock"),
-    Cmd = filename:join(ProgDir, Program) ++ " " ++ Flags,
-    debug1(Debug, " start, Cmd =  ~s~n", [Cmd]), 
-    case (catch open_port({spawn, Cmd}, [binary, {packet, 4}])) of
-	Port when is_port(Port) ->
-	    process_flag(trap_exit, true), 
-	    receive 
-		{Port, {data, Bin}} ->
-		    {ProxyLLPort, ProgPid, CompVsn, LibVsn, Ciphers} = 
-			decode_msg(Bin, [int16, int32, string, string, 
-					 string]), 
-		    debug1(Debug, "port program pid = ~w~n", 
-			   [ProgPid]), 
-		    {ok, #st{port = Port, 
-			     proxylsport = ProxyLLPort,
-			     progpid = ProgPid, 
-			     debug = Debug, 
-			     compvsn = CompVsn, 
-			     libvsn = LibVsn,
-			     ciphers = Ciphers}};
-		{'EXIT', Port, Reason} ->
-		    {stop, Reason}
-	    end;
-	{'EXIT', Reason} ->
-	    {stop, Reason}
-    end.
-
-%%
-%% transport_accept
-%%
-handle_call({transport_accept, Broker, ListenFd, Flags}, From, St) ->
-    debug(St, "transport_accept: broker = ~w, listenfd = ~w~n", 
-	  [Broker, ListenFd]),
-    case get_by_fd(ListenFd, St#st.cons) of
-	{ok, {ListenFd, _, _}} ->
-	    send_cmd(St#st.port, ?TRANSPORT_ACCEPT, [int32(ListenFd), Flags, 0]),
-	    PAccepts = add({ListenFd, Broker, From}, St#st.paccepts),
-	    %%
-	    %% We reply when we get TRANSPORT_ACCEPT_REP or ASYNC_ACCEPT_ERR
-	    %% 
-	    {noreply, St#st{paccepts = PAccepts}};
-	_Other ->
-	    {reply, {error, ebadf}, St}
-    end;
-
-%%
-%% ssl_accept
-%%
-handle_call({ssl_accept, Fd, Flags}, From, St) ->
-    case replace_from_by_fd(Fd, St#st.cons, From) of
-	{ok, _, Cons} = _Rep ->
-	    send_cmd(St#st.port, ?SSL_ACCEPT, [int32(Fd), Flags, 0]),
-	    %% We reply when we get SSL_ACCEPT_REP or ASYNC_ACCEPT_ERR
-	    {noreply, St#st{cons = Cons}};
-	_Other ->
-	    {reply, {error, ebadf}, St}
-    end;
-
-%%
-%% version
-%%
-handle_call(ciphers, From, St) ->
-    debug(St, "ciphers: from = ~w~n", [From]),
-    {reply, {ok, St#st.ciphers}, St};
-
-%%
-%% connect
-%%
-handle_call({connect, Broker, LIP, LPort, FIP, FPort, Flags}, From, St) ->
-    debug(St, "connect: broker = ~w, ip = ~w, "
-	  "sport = ~w~n", [Broker, FIP, FPort]),
-    Port = St#st.port,
-    LIPStr = ip_to_string(LIP),
-    FIPStr = ip_to_string(FIP),
-    IntRef = new_intref(St),
-    send_cmd(Port, ?CONNECT, [int32(IntRef),
-			      int16(LPort), LIPStr, 0,
-			      int16(FPort), FIPStr, 0,
-			      Flags, 0]),
-    Cons = add({{intref, IntRef}, Broker, From}, St#st.cons),
-    %% We reply when we have got CONNECT_SYNC_ERR, or CONNECT_WAIT 
-    %% and CONNECT_REP, or CONNECT_ERR.
-    {noreply, St#st{cons = Cons, intref = IntRef}};
-
-%%
-%% connection_info
-%%
-handle_call({connection_info, Broker, Fd}, From, St) ->
-    debug(St, "connection_info: broker = ~w, fd = ~w~n",
-	  [Broker, Fd]),
-    case replace_from_by_fd(Fd, St#st.cons, From) of
-	{ok, _, Cons} ->
-	    send_cmd(St#st.port, ?GETCONNINFO, [int32(Fd)]),
-	    %% We reply when we get GETCONNINFO_REP or GETCONNINFO_ERR.
-	    {noreply, St#st{cons = Cons}};
-	_Other ->
-	    {reply, {error, ebadf}, St}
-    end;
-
-%%
-%% close
-%%
-handle_call({close, Broker, Fd}, _From, St) ->
-    debug(St, "close: broker = ~w, fd = ~w~n",
-	  [Broker, Fd]),
-    #st{port = Port, cons = Cons0, paccepts = PAccepts0} = St,
-    case delete_by_fd(Fd, Cons0) of
-	%% Must match Broker pid; fd may be reused already.
-	{ok, {Fd, Broker, _}, Cons} ->
-	    send_cmd(Port, ?CLOSE, int32(Fd)),
-	    %% If Fd is a listen socket fd, there might be pending
-	    %% accepts for that fd.
-	    case delete_all_by_fd(Fd, PAccepts0) of
-		{ok, DelAccepts, RemAccepts} ->
-		    %% Reply {error, closed} to all pending accepts
-		    lists:foreach(fun({_, _, AccFrom}) ->
-					  gen_server:reply(AccFrom,
-							   {error, closed})
-				  end, DelAccepts),
-		    {reply, ok,
-		     St#st{cons = Cons, paccepts = RemAccepts}};
-		_ ->
-		    {reply, ok, St#st{cons = Cons}}
-	    end;
-	_ ->
-	    {reply, ok, St}
-    end;
-
-%%
-%% listen
-%%
-handle_call({listen, Broker, IP, LPort, Flags, BackLog}, From, St) ->
-    debug(St, "listen: broker = ~w, IP = ~w, "
-	  "sport = ~w~n", [Broker, IP, LPort]),
-    Port = St#st.port,
-    IPStr = ip_to_string(IP),
-    IntRef = new_intref(St),
-    send_cmd(Port, ?LISTEN, [int32(IntRef), int16(LPort), IPStr, 0,
-			     int16(BackLog), Flags, 0]),
-    Cons = add({{intref, IntRef}, Broker, From}, St#st.cons),
-    %% We reply when we have got LISTEN_REP.
-    {noreply, St#st{cons = Cons, intref = IntRef}};
-
-%%
-%% peercert
-%%
-handle_call({peercert, Broker, Fd}, From, St) ->
-    debug(St, "peercert: broker = ~w, fd = ~w~n",
-	  [Broker, Fd]),
-    case replace_from_by_fd(Fd, St#st.cons, From) of 
-	{ok, _, Cons} ->
-	    send_cmd(St#st.port, ?GETPEERCERT, [int32(Fd)]),
-	    %% We reply when we get GETPEERCERT_REP or GETPEERCERT_ERR.
-	    {noreply, St#st{cons = Cons}};
-	_Other ->
-	    {reply, {error, ebadf}, St}
-    end;
-
-
-%%
-%% peername
-%%
-handle_call({peername, Broker, Fd}, From, St) ->
-    debug(St, "peername: broker = ~w, fd = ~w~n",
-	  [Broker, Fd]),
-    case replace_from_by_fd(Fd, St#st.cons, From) of 
-	{ok, _, Cons} ->
-	    send_cmd(St#st.port, ?GETPEERNAME, [int32(Fd)]),
-	    %% We reply when we get GETPEERNAME_REP or GETPEERNAME_ERR.
-	    {noreply, St#st{cons = Cons}};
-	_Other ->
-	    {reply, {error, ebadf}, St}
-    end;
-
-%%
-%% proxy join
-%%
-handle_call({proxy_join, Broker, Fd, LPort}, From, St) ->
-    debug(St, "proxy_join: broker = ~w, fd = ~w, "
-	  "sport = ~w~n", [Broker, Fd, LPort]),
-    case replace_from_by_fd(Fd, St#st.cons, From) of 
-	{ok, _, Cons} ->
-	    send_cmd(St#st.port, ?PROXY_JOIN, [int32(Fd), 
-						     int16(LPort)]), 
-	    %% We reply when we get PROXY_JOIN_REP, or PROXY_JOIN_ERR.
-	    {noreply, St#st{cons = Cons}};
-	_Other ->
-	    {reply, {error, ebadf}, St}
-    end;
-
-%%
-%% seed
-%%
-handle_call({seed, Data}, _From, St) when is_binary(Data) ->
-    send_cmd(St#st.port, ?SET_SEED, [int32(byte_size(Data)), Data]),
-    {reply, ok, St};
-
-handle_call({seed, Data}, From, St) ->
-    case catch list_to_binary(Data) of
-	{'EXIT', _} ->
-	    {reply, {error, edata}, St};
-	Bin  ->
-	    handle_call({seed, Bin}, From, St)
-    end;
-
-%%
-%% setnodelay
-%%
-handle_call({setnodelay, Broker, Fd, Boolean}, From, St) ->
-    debug(St, "setnodelay: broker = ~w, fd = ~w, "
-	  "boolean = ~w~n", [Broker, Fd, Boolean]),
-    case replace_from_by_fd(Fd, St#st.cons, From) of 
-	{ok, _, Cons} ->
-	    Val = if Boolean == true -> 1; true -> 0 end,
-	    send_cmd(St#st.port, ?SET_SOCK_OPT, 
-		     [int32(Fd), ?SET_TCP_NODELAY, Val]),
-	    %% We reply when we get IOCTL_OK or IOCTL_ERR.
-	    {noreply, St#st{cons = Cons}};
-	_Other ->
-	    {reply, {error, ebadf}, St}
-    end;
-
-%%
-%% sockname
-%%
-handle_call({sockname, Broker, Fd}, From, St) ->
-    debug(St, "sockname: broker = ~w, fd = ~w~n",
-	  [Broker, Fd]),
-    case replace_from_by_fd(Fd, St#st.cons, From) of 
-	{ok, _, Cons} ->
-	    send_cmd(St#st.port, ?GETSOCKNAME, [int32(Fd)]),
-	    %% We reply when we get GETSOCKNAME_REP or GETSOCKNAME_ERR.
-	    {noreply, St#st{cons = Cons}};
-	_Other ->
-	    {reply, {error, ebadf}, St}
-    end;
-
-%%
-%% version
-%%
-handle_call(version, From, St) ->
-    debug(St, "version: from = ~w~n", [From]),
-    {reply, {ok, {St#st.compvsn, St#st.libvsn}}, St};
-
-%%
-%% dump
-%%
-handle_call({dump, Broker}, _From, St) ->
-    debug(St, "dump: broker = ~w", [Broker]),
-    Port = St#st.port,
-    send_cmd(Port, ?DUMP_CMD, []),
-    {reply, ok, St};
-
-%%
-%% set_debug
-%%
-handle_call({set_debug, Bool, Broker}, _From, St) ->
-    debug(St, "set_debug: broker = ~w", [Broker]),
-   Value = case Bool of 
-                true ->
-                    1;
-                false ->
-                    0
-            end,
-    Port = St#st.port,
-    send_cmd(Port, ?DEBUG_CMD, [Value]),
-    {reply, ok, St};
-
-%%
-%% set_debugmsg
-%%
-handle_call({set_debugmsg, Bool, Broker}, _From, St) ->
-    debug(St, "set_debugmsg: broker = ~w", [Broker]),
-    Value = case Bool of 
-                true ->
-                    1;
-                false ->
-                    0
-            end,
-    Port = St#st.port,
-    send_cmd(Port, ?DEBUGMSG_CMD, [Value]),
-    {reply, ok, St};
-
-handle_call(Request, _From, St) ->
-    debug(St, "unexpected call: ~w~n", [Request]),
-    Reply = {error, {badcall, Request}},
-    {reply, Reply, St}.
-
-%%
-%% handle_cast(Msg, St)
-%%
-
-
-handle_cast(Msg, St) ->
-    debug(St, "unexpected cast: ~w~n", [Msg]),
-    {noreply, St}.
-
-%%
-%% handle_info(Info, St)
-%%
-
-%% Data from port
-%%
-handle_info({Port, {data, Bin}},
-	    #st{cons = StCons, paccepts = Paccepts,
-		port = Port, proxylsport = Proxylsport} = St) 
-  when is_binary(Bin) ->
-    %% io:format("++++ ssl_server got from port: ~w~n", [Bin]),
-    <<OpCode:8, _/binary>> = Bin,
-    case OpCode of
-	%%
-	%% transport_accept
-	%%
-	?TRANSPORT_ACCEPT_ERR when byte_size(Bin) >= 5 ->
-	    {ListenFd, Reason} = decode_msg(Bin, [int32, atom]),
-	    debug(St, "transport_accept_err: listenfd = ~w, "
-		  "reason = ~w~n", [ListenFd, Reason]),
-	    case delete_last_by_fd(ListenFd, Paccepts) of
-		{ok, {_, _, From}, PAccepts} ->
-		    gen_server:reply(From, {error, Reason}),
-		    {noreply, St#st{paccepts = PAccepts}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-	?TRANSPORT_ACCEPT_REP when byte_size(Bin) >= 9 ->
-	    {ListenFd, Fd} = decode_msg(Bin, [int32, int32]),
-	    debug(St, "transport_accept_rep: listenfd = ~w, "
-		  "fd = ~w~n", [ListenFd, Fd]),
-	    case delete_last_by_fd(ListenFd, Paccepts) of
-		{ok, {_, Broker, From}, PAccepts} ->
-		    Reply = {ok, Fd, Proxylsport},
-		    gen_server:reply(From, Reply),
-		    debug(St, "transport_accept_rep: From = ~w\n", [From]),
-		    Cons = add({Fd, Broker, From}, StCons),
-		    {noreply, St#st{cons = Cons, paccepts = PAccepts}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-	
-	%%
-	%% ssl_accept
-	%%
-	?SSL_ACCEPT_ERR when byte_size(Bin) >= 5 ->
-	    {Fd, Reason} = decode_msg(Bin, [int32, atom]),
-	    debug(St, "ssl_accept_err: listenfd = ~w, "
-		  "reason = ~w~n", [Fd, Reason]),
-	    %% JC: remove this?
-	    case delete_last_by_fd(Fd, StCons) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {error, Reason}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-	?SSL_ACCEPT_REP when byte_size(Bin) >= 5 ->
-	    Fd = decode_msg(Bin, [int32]),
-	    debug(St, "ssl_accept_rep: Fd = ~w\n", [Fd]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, ok),
-		    {noreply, St#st{cons = Cons}};
-		_ ->
-		    {noreply, St}
-	    end;
-
-	%%
-	%% connect
-	%%
-	?CONNECT_SYNC_ERR when byte_size(Bin) >= 5 ->
-	    {IntRef, Reason} = decode_msg(Bin, [int32, atom]),
-	    debug(St, "connect_sync_err: intref = ~w, "
-		  "reason = ~w~n", [IntRef, Reason]),
-	    case delete_by_intref(IntRef, StCons) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {error, Reason}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    {noreply, St}
-	    end;
-	?CONNECT_WAIT when byte_size(Bin) >= 9 ->  
-	    {IntRef, Fd} = decode_msg(Bin, [int32, int32]),
-	    debug(St, "connect_wait: intref = ~w, "
-		  "fd = ~w~n", [IntRef, Fd]),
-	    case replace_fd_by_intref(IntRef, StCons, Fd) of
-		{ok, _, Cons} ->
-		    %% We reply when we get CONNECT_REP or CONNECT_ERR
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% We have a new Fd which must be closed
-		    send_cmd(Port, ?CLOSE, int32(Fd)),
-		    {noreply, St}
-	    end;
-	?CONNECT_REP when byte_size(Bin) >= 5 ->  
-	    %% after CONNECT_WAIT
-	    Fd = decode_msg(Bin, [int32]),
-	    debug(St, "connect_rep: fd = ~w~n", [Fd]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {ok, Fd, Proxylsport}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    {noreply, St}
-	    end;
-	?CONNECT_ERR when byte_size(Bin) >= 5 ->
-	    {Fd, Reason} = decode_msg(Bin, [int32, atom]),
-	    debug(St, "connect_err: fd = ~w, "
-		  "reason = ~w~n", [Fd, Reason]),
-	    case delete_by_fd(Fd, StCons) of
-		{ok, {_, _, From}, Cons} ->
-		    %% Fd not yet published - hence close ourselves
-		    send_cmd(Port, ?CLOSE, int32(Fd)),
-		    gen_server:reply(From, {error, Reason}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-
-	%%
-	%% connection_info
-	%%
-	?GETCONNINFO_REP when byte_size(Bin) >= 5 ->
-	    {Fd, Protocol, Cipher} = decode_msg(Bin, [int32, string, string]),
-	    debug(St, "connection_info_rep: fd = ~w, "
-		  "protcol = ~p, ip = ~p~n", [Fd, Protocol, Cipher]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {ok, {protocol_name(Protocol),
-						 Cipher}}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-	?GETCONNINFO_ERR when byte_size(Bin) >= 5 ->
-	    {Fd, Reason} = decode_msg(Bin, [int32, atom]),
-	    debug(St, "connection_info_err: fd = ~w, "
-		  "reason = ~w~n", [Fd, Reason]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {error, Reason}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-
-	%%
-	%% listen
-	%%
-	?LISTEN_SYNC_ERR when byte_size(Bin) >= 5 ->
-	    {IntRef, Reason} = decode_msg(Bin, [int32, atom]),
-	    debug(St, "listen_sync_err: intref = ~w, "
-		  "reason = ~w~n", [IntRef, Reason]),
-	    case delete_by_intref(IntRef, StCons) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {error, Reason}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    {noreply, St}
-	    end;
-	?LISTEN_REP when byte_size(Bin) >= 11 ->  
-	    {IntRef, ListenFd, LPort} = decode_msg(Bin, [int32, int32, int16]),
-	    debug(St, "listen_rep: intref = ~w, "
-		  "listenfd = ~w, sport = ~w~n", [IntRef, ListenFd, LPort]),
-	    case replace_fd_from_by_intref(IntRef, StCons, ListenFd, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {ok, ListenFd, LPort}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% ListenFd has to be closed.
-		    send_cmd(Port, ?CLOSE, int32(ListenFd)),
-		    {noreply, St}
-	    end;
-
-	%%
-	%% proxy join
-	%%
-	?PROXY_JOIN_REP when byte_size(Bin) >= 5 -> 
-	    Fd = decode_msg(Bin, [int32]),
-	    debug(St, "proxy_join_rep: fd = ~w~n",
-		  [Fd]),
-	    case get_by_fd(Fd, StCons) of
-		{ok, {_, _, From}} ->
-		    gen_server:reply(From, ok),
-		    {noreply, St};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-	?PROXY_JOIN_ERR when byte_size(Bin) >= 5 -> 
-	    {Fd, Reason} = decode_msg(Bin, [int32, atom]),
-	    debug(St, "proxy_join_rep: fd = ~w, "
-		  "reason = ~w~n", [Fd, Reason]),
-	    case delete_by_fd(Fd, StCons) of
-		{ok, {_, _, From}, Cons} ->
-		    case Reason of
-			enoproxysocket ->	
-			    send_cmd(Port, ?CLOSE, int32(Fd));
-			_ ->
-			    ok
-			    %% Must not close Fd since it is published
-		    end,
-		    gen_server:reply(From, {error, Reason}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-
-	%%
-	%% peername
-	%%
-	?GETPEERNAME_REP when byte_size(Bin) >= 5 ->
-	    {Fd, LPort, IPString} = decode_msg(Bin, [int32, int16, string]),
-	    debug(St, "getpeername_rep: fd = ~w, "
-		  "sport = ~w, ip = ~p~n", [Fd, LPort, IPString]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {ok, {IPString, LPort}}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-	?GETPEERNAME_ERR when byte_size(Bin) >= 5 ->
-	    {Fd, Reason} = decode_msg(Bin, [int32, atom]),
-	    debug(St, "getpeername_err: fd = ~w, "
-		  "reason = ~w~n", [Fd, Reason]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {error, Reason}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-
-	%%
-	%% ioctl
-	%%
-	?IOCTL_OK when byte_size(Bin) >= 5 ->
-	    Fd = decode_msg(Bin, [int32]),
-	    debug(St, "ioctl_ok: fd = ~w~n",
-		  [Fd]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, ok),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-	?IOCTL_ERR when byte_size(Bin) >= 5 ->
-	    {Fd, Reason} = decode_msg(Bin, [int32, atom]),
-	    debug(St, "ioctl_err: fd = ~w, "
-		  "reason = ~w~n", [Fd, Reason]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {error, Reason}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-
-	%%
-	%% sockname
-	%%
-	?GETSOCKNAME_REP when byte_size(Bin) >= 5 ->
-	    {Fd, LPort, IPString} = decode_msg(Bin, [int32, int16, string]),
-	    debug(St, "getsockname_rep: fd = ~w, "
-		  "sport = ~w, ip = ~p~n", [Fd, LPort, IPString]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {ok, {IPString, LPort}}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-	?GETSOCKNAME_ERR when byte_size(Bin) >= 5 ->
-	    {Fd, Reason} = decode_msg(Bin, [int32, atom]),
-	    debug(St, "getsockname_err: fd = ~w, "
-		  "reason = ~w~n", [Fd, Reason]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {error, Reason}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-
-	%%
-	%% peercert
-	%%
-	?GETPEERCERT_REP when byte_size(Bin) >= 5 ->
-	    {Fd, Cert} = decode_msg(Bin, [int32, bin]),
-	    debug(St, "getpeercert_rep: fd = ~w~n", [Fd]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {ok, Cert}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end;
-	?GETPEERCERT_ERR when byte_size(Bin) >= 5 ->
-	    {Fd, Reason} = decode_msg(Bin, [int32, atom]),
-	    debug(St, "getpeercert_err: fd = ~w, reason = ~w~n", 
-		  [Fd, Reason]),
-	    case replace_from_by_fd(Fd, StCons, []) of
-		{ok, {_, _, From}, Cons} ->
-		    gen_server:reply(From, {error, Reason}),
-		    {noreply, St#st{cons = Cons}};
-		_Other ->
-		    %% Already closed
-		    {noreply, St}
-	    end
-    end;
-
-%%
-%% EXIT
-%%
-handle_info({'EXIT', Pid, Reason}, St) when is_pid(Pid) ->
-    debug(St, "exit pid = ~w, "
-	  "reason = ~w~n", [Pid, Reason]),
-    case delete_by_pid(Pid, St#st.cons) of
-	{ok, {{intref, _}, Pid, _}, Cons} ->
-	    {noreply, St#st{cons = Cons}};
-	{ok, {Fd, Pid, _}, Cons} ->
-	    send_cmd(St#st.port, ?CLOSE, int32(Fd)), 
-	    %% If Fd is a listen socket fd, there might be pending
-	    %% accepts for that fd.
-	    case delete_all_by_fd(Fd, St#st.paccepts) of
-		{ok, DelAccepts, RemAccepts} ->
-		    %% Reply {error, closed} to all pending accepts.
-		    lists:foreach(fun({_, _, From}) ->
-					  gen_server:reply(From, 
-							   {error, closed}) 
-				  end, DelAccepts),
-		    {noreply, 
-		     St#st{cons = Cons, paccepts = RemAccepts}};
-		_ ->
-		    {noreply, St#st{cons = Cons}}
-	    end;
-	_ ->
-	    case delete_by_pid(Pid, St#st.paccepts) of
-		{ok, {ListenFd, _, _}, PAccepts} ->
-		    %% decrement ref count in port program
-		    send_cmd(St#st.port, ?NOACCEPT, int32(ListenFd)),
-		    {noreply, St#st{paccepts = PAccepts}};
-		_ ->
-		    {noreply, St}
-	    end
-    end;
-
-%%
-%% 'badsig' means bad message to port. Port program is unaffected.
-%%
-handle_info({'EXIT', Port, badsig}, #st{port = Port} = St) ->
-    debug(St, "badsig!!!~n", []),
-    {noreply, St};
-
-handle_info({'EXIT', Port, Reason}, #st{port = Port} = St) ->
-    {stop, Reason, St};
-
-handle_info(Info, St) ->
-    debug(St, "unexpected info: ~w~n", [Info]),
-    {noreply, St}.
-
-%%
-%% terminate(Reason, St) -> any
-%%
-terminate(_Reason, _St) ->
-    ok.
-
-%% 
-%% code_change(OldVsn, St, Extra) -> {ok, NSt}
-%%
-code_change(_OldVsn, St, _Extra) ->
-    {ok, St}.
-
-%%%----------------------------------------------------------------------
-%%% Internal functions
-%%%----------------------------------------------------------------------
-
-%%
-%% Send binary command to sock
-%%
-send_cmd(Port, Cmd, Args) ->
-    Port ! {self(), {command, [Cmd| Args]}}.
-
-%%
-%% add(Descr, Cons) -> NCons
-%%
-add(D, L) -> 
-    [D| L].
-
-%%
-%% get_by_fd(Fd, Cons) -> {ok, Descr} | not_found
-%%
-get_by_fd(Fd, Cons) ->
-    get_by_pos(Fd, 1, Cons).
-
-%%
-%% delete_by_fd(Fd, Cons) -> {ok, OldDesc, NewCons} | not_found.
-%%
-delete_by_fd(Fd, Cons) ->
-    delete_by_pos(Fd, 1, Cons).
-
-%%
-%% delete_all_by_fd(Fd, Cons) -> {ok, DelCons, RemCons} | not_found.
-%%
-delete_all_by_fd(Fd, Cons) ->
-    delete_all_by_pos(Fd, 1, Cons).
-
-%%
-%% delete_by_intref(IntRef, Cons) -> {ok, OldDesc, NewCons} | not_found.
-%%
-delete_by_intref(IntRef, Cons) ->
-    delete_by_pos({intref, IntRef}, 1, Cons).
-
-%%
-%% delete_by_pid(Pid, Cons) -> {ok, OldDesc, NewCons} | not_found.
-%%
-delete_by_pid(Pid, Cons) ->
-    delete_by_pos(Pid, 2, Cons).
-
-%%
-%% delete_last_by_fd(Fd, Cons) -> {ok, OldDesc, NCons} | not_found
-%%
-delete_last_by_fd(Fd, Cons) ->
-    case dlbf(Fd, Cons) of 
-	{X, L} ->
-	    {ok, X, L};
-	_Other  ->
-	    not_found
-    end.
-
-dlbf(Fd, [H]) -> 
-    last_elem(Fd, H, []);
-dlbf(Fd, [H|T]) ->
-    case dlbf(Fd, T) of
-	{X, L} -> 
-	    {X, [H|L]};
-	L -> 
-	    last_elem(Fd, H, L)
-    end;
-dlbf(_Fd, []) ->  
-    [].
-
-last_elem(Fd, H, L) when element(1, H) == Fd ->
-    {H, L};
-last_elem(_, H, L) ->
-    [H|L].
-
-
-%%
-%% replace_from_by_fd(Fd, Cons, From) -> {ok, OldDesc, NewList} | not_found
-%%
-replace_from_by_fd(Fd, Cons, From) ->
-    replace_posn_by_pos(Fd, 1, Cons, [{From, 3}]).
-
-%%
-%% replace_fd_by_intref(IntRef, Cons, Fd) -> {ok, OldDesc, NewList} | not_f.
-%%
-replace_fd_by_intref(IntRef, Cons, Fd) ->
-    replace_posn_by_pos({intref, IntRef}, 1, Cons, [{Fd, 1}]).
-
-%%
-%% replace_fd_from_by_intref(IntRef, Cons, NFd, From) -> 
-%%					{ok, OldDesc, NewList} |  not_found
-%%
-replace_fd_from_by_intref(IntRef, Cons, NFd, From) ->
-    replace_posn_by_pos({intref, IntRef}, 1, Cons, [{NFd, 1}, {From, 3}]).
-
-
-%%
-%% All *_by_pos functions
-%%
-
-get_by_pos(Key, Pos, [H|_]) when element(Pos, H) == Key -> 
-    {ok, H};
-get_by_pos(Key, Pos, [_|T]) -> 
-    get_by_pos(Key, Pos, T);
-get_by_pos(_, _, []) -> 
-    not_found.
-
-delete_by_pos(Key, Pos, Cons) ->
-    case delete_by_pos1(Key, Pos, {not_found, Cons}) of
-	{not_found, _} ->
-	    not_found;
-	{ODesc, NCons} ->
-	    {ok, ODesc, NCons}
-    end.
-delete_by_pos1(Key, Pos, {_R, [H|T]}) when element(Pos, H) == Key ->
-    {H, T};
-delete_by_pos1(Key, Pos, {R, [H|T]}) ->
-    {R0, T0} = delete_by_pos1(Key, Pos, {R, T}),
-    {R0, [H| T0]};
-delete_by_pos1(_, _, {R, []}) ->
-    {R, []}.
-
-delete_all_by_pos(Key, Pos, Cons) ->
-    case lists:foldl(fun(H, {Ds, Rs}) when element(Pos, H) == Key ->
-			     {[H|Ds], Rs};
-			(H, {Ds, Rs}) ->
-			     {Ds, [H|Rs]} 
-		     end, {[], []}, Cons) of
-	{[], _} ->
-	    not_found;
-	{DelCons, RemCons} ->
-	    {ok, DelCons, RemCons}
-    end.
-
-replace_posn_by_pos(Key, Pos, Cons, Repls) ->
-    replace_posn_by_pos1(Key, Pos, Cons, Repls, []).
-
-replace_posn_by_pos1(Key, Pos, [H0| T], Repls, Acc)
-  when element(Pos, H0) =:= Key ->
-    H = lists:foldl(fun({Val, VPos}, Tuple) -> 
-			    setelement(VPos, Tuple, Val) 
-		    end, H0, Repls), 
-    {ok, H0, lists:reverse(Acc, [H| T])};
-replace_posn_by_pos1(Key, Pos, [H|T], Repls, Acc) ->
-    replace_posn_by_pos1(Key, Pos, T, Repls, [H| Acc]);
-replace_posn_by_pos1(_, _, [], _, _) ->
-    not_found.
-
-%%
-%% Binary/integer conversions
-%%
-int16(I) ->
-    %%[(I bsr 8) band 255, I band 255].
-    <<I:16>>.
-
-int32(I) -> 
-    %%     [(I bsr 24) band 255,
-    %%      (I bsr 16) band 255,
-    %%      (I bsr  8) band 255,
-    %%      I band 255].
-    <<I:32>>.
-
-%% decode_msg(Bin, Format) -> Tuple | integer() | atom() | string() | 
-%%				list of binaries()
-%%
-%% Decode message from binary
-%% Format = [spec()]
-%% spec() = int16 | int32 | string | atom | bin | bins
-%%
-%% Notice:  The first byte (op code) of the binary message is removed.
-%% Notice:  bins returns a *list* of binaries. 
-%%  
-decode_msg(<<_, Bin/binary>>, Format) ->
-    Dec = dec(Format, Bin),
-    case Dec of
-	[Dec1] -> Dec1;
-	_  -> list_to_tuple(Dec)
-    end.
-
-dec([], _) ->
-    [];
-dec([int16| F], <<N:16, Bin/binary>>) ->
-    [N| dec(F, Bin)];
-dec([int32| F], <<N:32, Bin/binary>>) ->
-    [N| dec(F, Bin)];
-dec([string| F], Bin0) ->
-    {Cs, Bin1} = dec_string(Bin0),
-    [Cs| dec(F, Bin1)];
-dec([atom|F], Bin0) ->
-    {Cs, Bin1} = dec_string(Bin0),
-    [list_to_atom(Cs)| dec(F, Bin1)];
-
-dec([bin|F], Bin) ->
-    {Bin1, Bin2} = dec_bin(Bin),
-    [Bin1| dec(F, Bin2)].
-
-%% NOTE: This clause is not actually used yet.
-%% dec([bins|F], <<N:32, Bin0/binary>>) ->
-%%     {Bins, Bin1} = dec_bins(N, Bin0),
-%%     [Bins| dec(F, Bin1)].
-
-dec_string(Bin) ->
-    dec_string(Bin, []).
-
-dec_string(<<0, Bin/binary>>, RCs) ->
-    {lists:reverse(RCs), Bin};
-dec_string(<<C, Bin/binary>>, RCs) ->
-    dec_string(Bin, [C| RCs]).
-
-dec_bin(<<L:32, Bin0/binary>>) ->
-    <<Bin1:L/binary, Bin2/binary>> = Bin0,
-    {Bin1, Bin2}.
-
-%% dec_bins(N, Bin) ->
-%%     dec_bins(N, Bin, []).
-
-%% dec_bins(0, Bin, Acc) ->
-%%     {lists:reverse(Acc), Bin};
-%% dec_bins(N, Bin0, Acc) when N > 0 ->
-%%     {Bin1, Bin2} = dec_bin(Bin0),
-%%     dec_bins(N - 1, Bin2, [Bin1| Acc]).
-
-%%
-%% new_intref
-%%
-new_intref(St) ->
-    (St#st.intref + 1) band 16#ffffffff.
-
-%%
-%% {Program, Flags} = mk_cmd_line(DefaultProgram)
-%%
-mk_cmd_line(Default) ->
-    {port_program(Default), 
-     lists:flatten([debug_flag(), " ", debug_port_flag(), " ",
-		    debugdir_flag(), " ", 
-		    msgdebug_flag(), " ", proxylsport_flag(), " ", 
-		    proxybacklog_flag(), " ", ephemeral_rsa_flag(), " ",
-		    ephemeral_dh_flag(), " ",
-		    protocol_version_flag(), " "])}.
-
-port_program(Default) ->
-    case application:get_env(ssl, port_program) of
-	{ok, Program} when is_list(Program) ->
-	    Program;
-	_Other ->
-	    Default
-    end.
-
-%%
-%% As this server may be started by the distribution, it is not safe to assume 
-%% a working code server, neither a working file server.
-%% I try to utilize the most primitive interfaces available to determine
-%% the directory of the port_program.
-%%
-find_priv_bin() ->
-    PrivDir = case (catch code:priv_dir(ssl)) of
-		  {'EXIT', _} ->
-		      %% Code server probably not startet yet
-		      {ok, P} = erl_prim_loader:get_path(),
-		      ModuleFile = atom_to_list(?MODULE) ++ extension(),
-		      Pd = (catch lists:foldl
-			    (fun(X,Acc) ->
-				     M = filename:join([X, ModuleFile]),
-				     %% The file server probably not started
-				     %% either, has to use raw interface.
-				     case file:raw_read_file_info(M) of 
-					 {ok,_} -> 
-					     %% Found our own module in the
-					     %% path, lets bail out with
-					     %% the priv_dir of this directory
-					     Y = filename:split(X),
-					     throw(filename:join
-						   (lists:sublist
-						    (Y,length(Y) - 1) 
-						    ++ ["priv"])); 
-					 _ -> 
-					     Acc 
-				     end 
-			     end,
-			     false,P)),
-		      case Pd of
-			  false ->
-			      exit(ssl_priv_dir_indeterminate);
-			  _ ->
-			      Pd
-		      end;
-		  Dir ->
-		      Dir
-	      end,
-    filename:join([PrivDir, "bin"]).
-
-extension() ->
-    %% erlang:info(machine) returns machine name as text in all uppercase
-    "." ++ string:to_lower(erlang:system_info(machine)).
-
-debug_flag() ->
-    case os:getenv("ERL_SSL_DEBUG") of
-	false ->
-	    get_env(debug, "-d");
-	_ ->
-	    "-d"
-    end.
-
-debug_port_flag() ->
-    case os:getenv("ERL_SSL_DEBUGPORT") of
-	false ->
-	    get_env(debug, "-d");
-	_ ->
-	    "-d"
-    end.
-
-msgdebug_flag() ->
-    case os:getenv("ERL_SSL_MSGDEBUG") of
-	false ->
-	    get_env(msgdebug, "-dm");
-	_  ->
-	    "-dm"
-    end.
-
-proxylsport_flag() ->
-    case application:get_env(ssl, proxylsport) of
-	{ok, PortNum} ->
-	    "-pp " ++ integer_to_list(PortNum);
-	_Other ->
-	    ""
-    end.
-
-proxybacklog_flag() ->
-    case application:get_env(ssl, proxylsbacklog) of
-	{ok, Size} ->
-	    "-pb " ++ integer_to_list(Size);
-	_Other ->
-	    ""
-    end.
-
-debugdir_flag() ->
-    case os:getenv("ERL_SSL_DEBUG") of
-	false ->
-	    case application:get_env(ssl, debugdir) of
-		{ok, Dir} when is_list(Dir) ->
-		    "-dd " ++ Dir;
-		_Other ->
-		    ""
-	    end;
-	_  ->
-	    "-dd ./"
-    end.
-    
-ephemeral_rsa_flag() ->
-    case application:get_env(ssl, ephemeral_rsa) of
-	{ok, true} ->
-	    "-ersa ";
-	_Other ->
-	    ""
-    end.
-
-ephemeral_dh_flag() ->
-    case application:get_env(ssl, ephemeral_dh) of
-	{ok, true} ->
-	    "-edh ";
-	_Other ->
-	    ""
-    end.
-
-protocol_version_flag() ->
-    case application:get_env(ssl, protocol_version) of
-	{ok, []} ->
-	    "";
-	{ok, Vsns} when is_list(Vsns) ->
-	    case transform_vsns(Vsns) of
-		N when (N > 0) ->
-		    "-pv " ++ integer_to_list(N);
-		_ ->
-		    ""
-	    end;
-	_Other ->
-	    ""
-    end.
-
-transform_vsns(Vsns) ->
-    transform_vsns(Vsns, 0).
-
-transform_vsns([sslv2| Vsns], I) ->
-    transform_vsns(Vsns, I bor ?SSLv2);
-transform_vsns([sslv3| Vsns], I) ->
-    transform_vsns(Vsns, I bor ?SSLv3);
-transform_vsns([tlsv1| Vsns], I) ->
-    transform_vsns(Vsns, I bor ?TLSv1);
-transform_vsns([_ | Vsns], I) ->
-    transform_vsns(Vsns, I);
-transform_vsns([], I) ->
-    I.
-
-protocol_name("SSLv2") -> sslv2;
-protocol_name("SSLv3") -> sslv3;
-protocol_name("TLSv1") -> tlsv1.
-
-get_env(Key, Val) ->
-    case application:get_env(ssl, Key) of
-	{ok, true} ->
-	    Val;
-	_Other ->
-	    ""
-    end.
-
-ip_to_string({A,B,C,D}) ->
-    [integer_to_list(A),$.,integer_to_list(B),$.,
-     integer_to_list(C),$.,integer_to_list(D)].
-
-debug(St, Format, Args) ->
-    debug1(St#st.debug, Format, Args).
-
-debug1(true, Format0, Args) ->
-    {_MS, S, MiS} = erlang:now(),
-    Secs = S rem 100, 
-    MiSecs = MiS div 1000,
-    Format = "++++ ~3..0w:~3..0w ssl_server (~w): " ++ Format0, 
-    io:format(Format, [Secs, MiSecs, self()| Args]);
-debug1(_, _, _) ->
-    ok.
diff --git a/lib/ssl/src/ssl_session.erl b/lib/ssl/src/ssl_session.erl
index 85c9fcb61c..bf738649f6 100644
--- a/lib/ssl/src/ssl_session.erl
+++ b/lib/ssl/src/ssl_session.erl
@@ -48,7 +48,7 @@ is_new(_ClientSuggestion, _ServerDecision) ->
     true.
 
 %%--------------------------------------------------------------------
--spec id({host(), port_num(), #ssl_options{}}, db_handle(), atom(),
+-spec id({host(), inet:port_number(), #ssl_options{}}, db_handle(), atom(),
 	 undefined | binary()) -> binary().
 %%
 %% Description: Should be called by the client side to get an id 
@@ -63,7 +63,7 @@ id(ClientInfo, Cache, CacheCb, OwnCert) ->
     end.
 
 %%--------------------------------------------------------------------
--spec id(port_num(), binary(), #ssl_options{}, db_handle(),
+-spec id(inet:port_number(), binary(), #ssl_options{}, db_handle(),
 	 atom(), seconds(), binary()) -> binary().
 %%
 %% Description: Should be called by the server side to get an id 
diff --git a/lib/ssl/src/ssl_session_cache.erl b/lib/ssl/src/ssl_session_cache.erl
index 66610817be..93969f628f 100644
--- a/lib/ssl/src/ssl_session_cache.erl
+++ b/lib/ssl/src/ssl_session_cache.erl
@@ -28,7 +28,7 @@
 -export([init/1, terminate/1, lookup/2, update/3, delete/2, foldl/3, 
 	 select_session/2]). 
 
--type key() :: {{host(), port_num()}, session_id()} |  {port_num(), session_id()}.
+-type key() :: {{host(), inet:port_number()}, session_id()} |  {inet:port_number(), session_id()}.
 
 %%--------------------------------------------------------------------
 -spec init(list()) -> db_handle(). %% Returns reference to the cache (opaque)
@@ -91,7 +91,7 @@ foldl(Fun, Acc0, Cache) ->
     ets:foldl(Fun, Acc0, Cache).
   
 %%--------------------------------------------------------------------
--spec select_session(db_handle(), {host(), port_num()} | port_num()) -> [#session{}].
+-spec select_session(db_handle(), {host(), inet:port_number()} | inet:port_number()) -> [#session{}].
 %%
 %% Description: Selects a session that could be reused. Should be callable
 %% from any process.
diff --git a/lib/ssl/src/ssl_ssl2.erl b/lib/ssl/src/ssl_ssl2.erl
index b1005b1acb..a9ab6a2678 100644
--- a/lib/ssl/src/ssl_ssl2.erl
+++ b/lib/ssl/src/ssl_ssl2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -20,7 +20,7 @@
 %%
 %%----------------------------------------------------------------------
 %% Purpose: Handles sslv2 hello as clients supporting sslv2 and higher 
-%% will send a sslv2 hello.
+%% will send an sslv2 hello.
 %%----------------------------------------------------------------------
 
 -module(ssl_ssl2).
diff --git a/lib/ssl/src/ssl_sup.erl b/lib/ssl/src/ssl_sup.erl
index 316ed8a4e9..cb10b1362a 100644
--- a/lib/ssl/src/ssl_sup.erl
+++ b/lib/ssl/src/ssl_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. 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
@@ -24,7 +24,7 @@
 -behaviour(supervisor).
 
 %% API
--export([start_link/0]).
+-export([start_link/0, manager_opts/0]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -51,17 +51,32 @@ init([]) ->
 
     %% Does not start any port programs so it does matter
     %% so much if it is not used!
-    Child2 = {ssl_broker_sup, {ssl_broker_sup, start_link, []},
-	      permanent, 2000, supervisor, [ssl_broker_sup]},
+    %% Child2 = {ssl_broker_sup, {ssl_broker_sup, start_link, []},
+    %% 	      permanent, 2000, supervisor, [ssl_broker_sup]},
 
 
     %% New ssl
     SessionCertManager = session_and_cert_manager_child_spec(),
     ConnetionManager = connection_manager_child_spec(),
 
-    {ok, {{one_for_all, 10, 3600}, [Child2, SessionCertManager,
-				    ConnetionManager]}}.
+    {ok, {{one_for_all, 10, 3600}, [SessionCertManager, ConnetionManager]}}.
 
+
+manager_opts() ->
+    CbOpts = case application:get_env(ssl, session_cb) of
+		 {ok, Cb} when is_atom(Cb) ->
+		     InitArgs = session_cb_init_args(),
+		     [{session_cb, Cb}, {session_cb_init_args, InitArgs}];
+		 _  ->
+		     []
+	     end,
+    case application:get_env(ssl, session_lifetime) of
+	{ok, Time} when is_integer(Time) ->
+	    [{session_lifetime, Time}| CbOpts];
+	_  ->
+	    CbOpts
+    end.
+    
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
@@ -86,21 +101,6 @@ connection_manager_child_spec() ->
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
 
-manager_opts() ->
-    CbOpts = case application:get_env(ssl, session_cb) of
-		 {ok, Cb} when is_atom(Cb) ->
-		     InitArgs = session_cb_init_args(),
-		     [{session_cb, Cb}, {session_cb_init_args, InitArgs}];
-		 _  ->
-		     []
-	     end,
-    case application:get_env(ssl, session_lifetime) of
-	{ok, Time} when is_integer(Time) ->
-	    [{session_lifetime, Time}| CbOpts];
-	_  ->
-	    CbOpts
-    end.
-    
 session_cb_init_args() ->
     case application:get_env(ssl, session_cb_init_args) of
 	{ok, Args} when is_list(Args) ->
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
new file mode 100644
index 0000000000..d63eada571
--- /dev/null
+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl
@@ -0,0 +1,325 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+-module(ssl_tls_dist_proxy).
+
+
+-export([listen/1, accept/1, connect/2, get_remote_id/2]).
+-export([init/1, start_link/0, handle_call/3, handle_cast/2, handle_info/2, 
+	 terminate/2, code_change/3, ssl_options/2]).
+
+-include_lib("kernel/include/net_address.hrl").
+
+-record(state, 
+	{listen,
+	 accept_loop
+	}).
+
+-define(PPRE, 4).
+-define(PPOST, 4).
+
+
+%%====================================================================
+%% Internal application API
+%%====================================================================
+
+listen(Name) ->
+    gen_server:call(?MODULE, {listen, Name}, infinity). 
+
+accept(Listen) ->
+    gen_server:call(?MODULE, {accept, Listen}, infinity).
+
+connect(Ip, Port) ->
+    gen_server:call(?MODULE, {connect, Ip, Port}, infinity).
+
+get_remote_id(Socket, Node) ->
+    gen_server:call(?MODULE, {get_remote_id, {Socket,Node}}, infinity).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+init([]) ->
+    process_flag(priority, max),
+    {ok, #state{}}.
+
+handle_call({listen, Name}, _From, State) ->
+    case gen_tcp:listen(0, [{active, false}, {packet,?PPRE}]) of
+	{ok, Socket} ->
+	    {ok, World} = gen_tcp:listen(0, [{active, false}, binary, {packet,?PPRE}]),
+	    TcpAddress = get_tcp_address(Socket),
+	    WorldTcpAddress = get_tcp_address(World),
+	    {_,Port} = WorldTcpAddress#net_address.address,
+	    {ok, Creation} = erl_epmd:register_node(Name, Port),
+	    {reply, {ok, {Socket, TcpAddress, Creation}},
+	     State#state{listen={Socket, World}}};
+	Error ->
+	    {reply, Error, State}
+    end;
+
+handle_call({accept, Listen}, {From, _}, State = #state{listen={_, World}}) ->
+    Self = self(),
+    ErtsPid = spawn_link(fun() -> accept_loop(Self, erts, Listen, From) end),
+    WorldPid = spawn_link(fun() -> accept_loop(Self, world, World, Listen) end),
+    {reply, ErtsPid, State#state{accept_loop={ErtsPid, WorldPid}}};
+
+handle_call({connect, Ip, Port}, {From, _}, State) ->
+    Me = self(),
+    Pid = spawn_link(fun() -> setup_proxy(Ip, Port, Me) end),
+    receive 
+	{Pid, go_ahead, LPort} -> 
+	    Res = {ok, Socket} = try_connect(LPort),
+	    ok = gen_tcp:controlling_process(Socket, From),
+	    flush_old_controller(From, Socket),
+	    {reply, Res, State};
+	{Pid, Error} ->
+	    {reply, Error, State}
+    end;
+
+handle_call({get_remote_id, {Socket,_Node}}, _From, State) ->
+    Address = get_tcp_address(Socket),
+    {reply, Address, State};
+
+handle_call(_What, _From, State) ->
+    {reply, ok, State}.
+
+handle_cast(_What, State) ->
+    {noreply, State}.
+
+handle_info(_What, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _St) ->
+    ok.
+
+code_change(_OldVsn, St, _Extra) ->
+    {ok, St}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+get_tcp_address(Socket) ->
+    {ok, Address} = inet:sockname(Socket),
+    {ok, Host} = inet:gethostname(),
+    #net_address{
+		  address = Address,
+		  host = Host,
+		  protocol = proxy,
+		  family = inet
+		}.
+
+accept_loop(Proxy, erts = Type, Listen, Extra) ->
+    process_flag(priority, max),
+    case gen_tcp:accept(Listen) of
+		{ok, Socket} ->
+		    Extra ! {accept,self(),Socket,inet,proxy},
+		    receive 
+			{_Kernel, controller, Pid} ->
+			    ok = gen_tcp:controlling_process(Socket, Pid),
+			    flush_old_controller(Pid, Socket),
+			    Pid ! {self(), controller};
+			{_Kernel, unsupported_protocol} ->
+			    exit(unsupported_protocol)
+		    end;
+		Error ->
+	    exit(Error)
+    end,
+    accept_loop(Proxy, Type, Listen, Extra);
+
+accept_loop(Proxy, world = Type, Listen, Extra) ->
+    process_flag(priority, max),
+    case gen_tcp:accept(Listen) of
+	{ok, Socket} ->
+	    Opts = get_ssl_options(server),
+	    case ssl:ssl_accept(Socket, Opts) of
+		{ok, SslSocket} ->
+		    PairHandler =
+			spawn_link(fun() ->
+					   setup_connection(SslSocket, Extra)
+				   end),
+		    ok = ssl:controlling_process(SslSocket, PairHandler),
+		    flush_old_controller(PairHandler, SslSocket);
+		_ ->
+		    gen_tcp:close(Socket)
+	    end;
+	Error ->
+	    exit(Error)
+    end,
+    accept_loop(Proxy, Type, Listen, Extra).
+
+try_connect(Port) ->
+    case gen_tcp:connect({127,0,0,1}, Port, [{active, false}, {packet,?PPRE}]) of
+	R = {ok, _S} ->
+	    R;
+	{error, _R} ->
+	    try_connect(Port)
+    end.
+
+setup_proxy(Ip, Port, Parent) ->
+    process_flag(trap_exit, true),
+    Opts = get_ssl_options(client),
+    case ssl:connect(Ip, Port, [{active, true}, binary, {packet,?PPRE}] ++ Opts) of
+	{ok, World} ->
+	    {ok, ErtsL} = gen_tcp:listen(0, [{active, true}, binary, {packet,?PPRE}]),
+	    #net_address{address={_,LPort}} = get_tcp_address(ErtsL),
+	    Parent ! {self(), go_ahead, LPort},
+	    case gen_tcp:accept(ErtsL) of
+		{ok, Erts} ->
+		    %% gen_tcp:close(ErtsL),
+		    loop_conn_setup(World, Erts);
+		Err ->
+		    Parent ! {self(), Err}
+	    end;
+	Err ->
+	    Parent ! {self(), Err}
+    end.
+
+setup_connection(World, ErtsListen) ->
+    process_flag(trap_exit, true),
+    TcpAddress = get_tcp_address(ErtsListen),
+    {_Addr,Port} = TcpAddress#net_address.address,
+    {ok, Erts} = gen_tcp:connect({127,0,0,1}, Port, [{active, true}, binary, {packet,?PPRE}]),
+    ssl:setopts(World, [{active,true}, {packet,?PPRE}]),
+    loop_conn_setup(World, Erts).
+
+loop_conn_setup(World, Erts) ->
+    receive 
+	{ssl, World, Data = <<$a, _/binary>>} ->
+	    gen_tcp:send(Erts, Data),
+	    ssl:setopts(World, [{packet,?PPOST}]),
+	    inet:setopts(Erts, [{packet,?PPOST}]),
+	    loop_conn(World, Erts);
+	{tcp, Erts, Data = <<$a, _/binary>>} ->
+	    ssl:send(World, Data),
+	    ssl:setopts(World, [{packet,?PPOST}]),
+	    inet:setopts(Erts, [{packet,?PPOST}]),
+	    loop_conn(World, Erts);
+	{ssl, World, Data = <<_, _/binary>>} ->
+	    gen_tcp:send(Erts, Data),
+	    loop_conn_setup(World, Erts);
+	{tcp, Erts, Data = <<_, _/binary>>} ->
+	    ssl:send(World, Data),
+	    loop_conn_setup(World, Erts);
+	{ssl, World, Data} ->
+	    gen_tcp:send(Erts, Data),
+	    loop_conn_setup(World, Erts);
+	{tcp, Erts, Data} ->
+	    ssl:send(World, Data),
+	    loop_conn_setup(World, Erts)
+    end.
+
+loop_conn(World, Erts) ->
+    receive 
+	{ssl, World, Data} ->
+	    gen_tcp:send(Erts, Data),
+	    loop_conn(World, Erts);
+	{tcp, Erts, Data} ->
+	    ssl:send(World, Data),
+	    loop_conn(World, Erts);
+	{tcp_closed, Erts} ->
+	    ssl:close(World);
+	{ssl_closed,  World} ->
+	    gen_tcp:close(Erts)
+	end.
+
+get_ssl_options(Type) ->
+    case init:get_argument(ssl_dist_opt) of
+	{ok, Args} ->
+	    [{erl_dist, true} | ssl_options(Type, lists:append(Args))];
+	_ ->
+	    [{erl_dist, true}]
+    end.
+
+ssl_options(_,[]) ->
+    [];
+ssl_options(server, ["client_" ++ _, _Value |T]) ->
+     ssl_options(server,T);
+ssl_options(client, ["server_" ++ _, _Value|T]) ->
+    ssl_options(client,T);
+ssl_options(server, ["server_certfile", Value|T]) ->
+    [{certfile, Value} | ssl_options(server,T)];
+ssl_options(client, ["client_certfile", Value | T]) ->
+    [{certfile, Value} | ssl_options(client,T)];
+ssl_options(server, ["server_cacertfile", Value|T]) ->
+    [{cacertfile, Value} | ssl_options(server,T)];
+ssl_options(client, ["client_cacertfile", Value|T]) ->
+     [{cacertfile, Value} | ssl_options(client,T)];
+ssl_options(server, ["server_keyfile", Value|T]) ->
+    [{keyfile, Value} | ssl_options(server,T)];
+ssl_options(client, ["client_keyfile", Value|T]) ->
+    [{keyfile, Value} | ssl_options(client,T)];
+ssl_options(server, ["server_password", Value|T]) ->
+    [{password, Value} | ssl_options(server,T)];
+ssl_options(client, ["client_password", Value|T]) ->
+    [{password, Value} | ssl_options(client,T)];
+ssl_options(server, ["server_verify", Value|T]) ->
+    [{verify, atomize(Value)} | ssl_options(server,T)];
+ssl_options(client, ["client_verify", Value|T]) ->
+     [{verify, atomize(Value)} | ssl_options(client,T)];
+ssl_options(server, ["server_reuse_sessions", Value|T]) ->
+    [{reuse_sessions, atomize(Value)} | ssl_options(server,T)];
+ssl_options(client, ["client_reuse_sessions", Value|T]) ->
+    [{reuse_sessions, atomize(Value)} | ssl_options(client,T)];
+ssl_options(server, ["server_secure_renegotiate", Value|T]) ->
+    [{secure_renegotiate, atomize(Value)} | ssl_options(server,T)];
+ssl_options(client, ["client_secure_renegotiate", Value|T]) ->
+    [{secure_renegotiate, atomize(Value)} | ssl_options(client,T)];
+ssl_options(server, ["server_depth", Value|T]) ->
+    [{depth, list_to_integer(Value)} | ssl_options(server,T)];
+ssl_options(client, ["client_depth", Value|T]) ->
+    [{depth, list_to_integer(Value)} | ssl_options(client,T)];
+ssl_options(server, ["server_hibernate_after", Value|T]) ->
+    [{hibernate_after, list_to_integer(Value)} | ssl_options(server,T)];
+ssl_options(client, ["client_hibernate_after", Value|T]) ->
+    [{hibernate_after, list_to_integer(Value)} | ssl_options(client,T)];
+ssl_options(server, ["server_ciphers", Value|T]) ->
+     [{ciphers, Value} | ssl_options(server,T)];
+ssl_options(client, ["client_ciphers", Value|T]) ->
+    [{ciphers, Value} | ssl_options(client,T)];
+ssl_options(server, ["server_dhfile", Value|T]) ->
+     [{dhfile, Value} | ssl_options(server,T)];
+ssl_options(server, ["server_fail_if_no_peer_cert", Value|T]) ->
+    [{fail_if_no_peer_cert, atomize(Value)} | ssl_options(server,T)];
+ssl_options(_,_) ->
+    exit(malformed_ssl_dist_opt).
+
+atomize(List) when is_list(List) ->
+    list_to_atom(List);
+atomize(Atom) when is_atom(Atom) ->
+    Atom.
+
+flush_old_controller(Pid, Socket) ->
+    receive
+	{tcp, Socket, Data} ->
+	    Pid ! {tcp, Socket, Data},
+	    flush_old_controller(Pid, Socket);
+	{tcp_closed, Socket} ->
+	    Pid ! {tcp_closed, Socket},
+	    flush_old_controller(Pid, Socket);
+	{ssl, Socket, Data} ->
+	    Pid ! {ssl, Socket, Data},
+	    flush_old_controller(Pid, Socket);
+	{ssl_closed, Socket} ->
+	    Pid ! {ssl_closed, Socket},
+	    flush_old_controller(Pid, Socket)
+    after 0 ->
+	    ok
+    end.
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
index 5be07cad2c..23a9a23190 100644
--- a/lib/ssl/test/Makefile
+++ b/lib/ssl/test/Makefile
@@ -35,32 +35,23 @@ VSN=$(GS_VSN)
 # ----------------------------------------------------
 
 MODULES = \
-        ssl_test_lib \
+	ssl_test_lib \
 	ssl_basic_SUITE \
+	ssl_handshake_SUITE \
 	ssl_packet_SUITE \
 	ssl_payload_SUITE \
 	ssl_to_openssl_SUITE \
 	ssl_session_cache_SUITE	\
-	ssl_test_MACHINE \
-	old_ssl_active_SUITE \
-	old_ssl_active_once_SUITE \
-	old_ssl_passive_SUITE \
-        old_ssl_verify_SUITE \
-	old_ssl_peer_cert_SUITE \
-	old_ssl_misc_SUITE \
-	old_ssl_protocol_SUITE \
-	old_transport_accept_SUITE \
-	old_ssl_dist_SUITE \
+	ssl_dist_SUITE \
 	make_certs\
 	erl_make_certs
 
 
 ERL_FILES = $(MODULES:%=%.erl)
 
-HRL_FILES = ssl_test_MACHINE.hrl 
+HRL_FILES =
 
 HRL_FILES_SRC = \
-	ssl_int.hrl \
 	ssl_internal.hrl\
 	ssl_alert.hrl \
 	ssl_handshake.hrl \
diff --git a/lib/ssl/test/old_ssl_active_SUITE.erl b/lib/ssl/test/old_ssl_active_SUITE.erl
deleted file mode 100644
index 52ff0bcc5d..0000000000
--- a/lib/ssl/test/old_ssl_active_SUITE.erl
+++ /dev/null
@@ -1,395 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
--module(old_ssl_active_SUITE).
-
--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,
-	 cinit_return_chkclose/1,
-	 sinit_return_chkclose/1,
-	 cinit_big_return_chkclose/1,
-	 sinit_big_return_chkclose/1,
-	 cinit_big_echo_chkclose/1,
-	 cinit_huge_echo_chkclose/1,
-	 sinit_big_echo_chkclose/1,
-	 cinit_few_echo_chkclose/1,
-	 cinit_many_echo_chkclose/1,
-	 cinit_cnocert/1
-	]).
-
--import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
-			   test_server_only/6]).
-
--include_lib("test_server/include/test_server.hrl").
--include("ssl_test_MACHINE.hrl").
-
--define(MANYCONNS, ssl_test_MACHINE:many_conns()).
-
-init_per_testcase(_Case, Config) ->
-    WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    WatchDog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [cinit_return_chkclose, sinit_return_chkclose,
-     cinit_big_return_chkclose, sinit_big_return_chkclose,
-     cinit_big_echo_chkclose, cinit_huge_echo_chkclose,
-     sinit_big_echo_chkclose, cinit_few_echo_chkclose,
-     cinit_many_echo_chkclose, cinit_cnocert].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_suite(doc) ->
-    "Want to se what Config contains, and record the number of available "
-	"file descriptors";
-init_per_suite(suite) ->
-    [];
-init_per_suite(Config) ->
-    io:format("Config: ~p~n", [Config]),
-    case os:type() of
-	{unix, _} ->
-	    ?line io:format("Max fd value: ~s", [os:cmd("ulimit -n")]);
-	_ ->
-	    ok
-    end, 
-    %% XXX Also record: Erlang/SSL version, version of OpenSSL, 
-    %% operating system, version of OTP, Erts, kernel and stdlib. 
-
-    %% Check if SSL exists. If this case fails, all other cases are skipped
-    case catch crypto:start() of
-	ok ->
-	    application:start(public_key),
-	    case ssl:start() of
-		ok -> ssl:stop();
-		{error, {already_started, _}} -> ssl:stop();
-		Error -> ?t:fail({failed_starting_ssl,Error})
-	    end,
-	    Config;
-	_Else ->
-	    {skip,"Could not start crypto!"}
-    end.
-
-end_per_suite(doc) ->
-    "This test case has no mission other than closing the conf case";
-end_per_suite(suite) ->
-    [];
-end_per_suite(Config) ->
-    crypto:stop(),
-    Config.
-
-cinit_return_chkclose(doc) ->
-    "Client sends 1000 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Both have certs.";
-cinit_return_chkclose(suite) ->
-    [];
-cinit_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE, 
-			    Config).
-
-sinit_return_chkclose(doc) ->
-    "Server sends 1000 bytes to client, that receives them, sends them "
-	"back, and closes. Server waits for close. Both have certs.";
-sinit_return_chkclose(suite) ->
-    [];
-sinit_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, [{ssl_imp, old}|SsslOpts]},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {send, DataSize}, {recv, DataSize},
-	     await_close],
-    CCmds = [{timeout, Timeout}, 
-	     {sslopts, [{ssl_imp, old}|CsslOpts]},
-	     {connect, {Host, LPort}},
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE, 
-			    Config).
-
-cinit_big_return_chkclose(doc) ->
-    "Client sends 50000 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Both have certs.";
-cinit_big_return_chkclose(suite) ->
-    [];
-cinit_big_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE, 
-			    Config).
-
-sinit_big_return_chkclose(doc) ->
-    "Server sends 50000 bytes to client, that receives them, sends them "
-	"back, and closes. Server waits for close. Both have certs.";
-sinit_big_return_chkclose(suite) ->
-    [];
-sinit_big_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    CCmds = [{timeout, Timeout}, 
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE, 
-			    Config).
-
-cinit_big_echo_chkclose(doc) ->
-    "Client sends 50000 bytes to server, that echoes them back "
-	"and closes. Client waits for close. Both have certs.";
-cinit_big_echo_chkclose(suite) ->
-    [];
-cinit_big_echo_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {echo, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE, 
-			    Config).
-
-cinit_huge_echo_chkclose(doc) ->
-    "Client sends 500000 bytes to server, that echoes them back "
-	"and closes. Client waits for close. Both have certs.";
-cinit_huge_echo_chkclose(suite) ->
-    [];
-cinit_huge_echo_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 500000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {echo, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE, 
-			    Config).
-
-sinit_big_echo_chkclose(doc) ->
-    "Server sends 50000 bytes to client, that echoes them back "
-	"and closes. Server waits for close. Both have certs.";
-sinit_big_echo_chkclose(suite) ->
-    [];
-sinit_big_echo_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    CCmds = [{timeout, Timeout}, 
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {echo, DataSize},
-	     close],
-
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE, 
-			    Config).
-
-
-%% This case is repeated several times.
-
-cinit_few_echo_chkclose(X) -> cinit_many_echo_chkclose(X, 7).
-
-cinit_many_echo_chkclose(X) -> cinit_many_echo_chkclose(X, ?MANYCONNS).
-
-cinit_many_echo_chkclose(doc, _NConns) ->
-    "N client sends 10000 bytes to server, that echoes them back "
-	"and closes. Clients wait for close. All have certs.";
-cinit_many_echo_chkclose(suite, _NConns) ->
-    [];
-cinit_many_echo_chkclose(Config, NConns) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 10000, LPort = 3456,
-    Timeout = 80000,
-
-    io:format("~w connections", [NConns]),
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {echo, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE, 
-			    Config).
-
-
-cinit_cnocert(doc) ->
-    "Client sends 1000 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Client has no cert, "
-	"but server has.";
-cinit_cnocert(suite) ->
-    [];
-cinit_cnocert(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3457,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {_CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE, 
-			    Config).
-
-
diff --git a/lib/ssl/test/old_ssl_active_once_SUITE.erl b/lib/ssl/test/old_ssl_active_once_SUITE.erl
deleted file mode 100644
index c7beadb301..0000000000
--- a/lib/ssl/test/old_ssl_active_once_SUITE.erl
+++ /dev/null
@@ -1,417 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2002-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
--module(old_ssl_active_once_SUITE).
-
--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,
-	 server_accept_timeout/1,
-	 cinit_return_chkclose/1,
-	 sinit_return_chkclose/1,
-	 cinit_big_return_chkclose/1,
-	 sinit_big_return_chkclose/1,
-	 cinit_big_echo_chkclose/1,
-	 cinit_huge_echo_chkclose/1,
-	 sinit_big_echo_chkclose/1,
-	 cinit_few_echo_chkclose/1,
-	 cinit_many_echo_chkclose/1,
-	 cinit_cnocert/1
-	]).
-
--import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
-			   test_server_only/6]).
--include_lib("test_server/include/test_server.hrl").
--include("ssl_test_MACHINE.hrl").
-
--define(MANYCONNS, ssl_test_MACHINE:many_conns()).
-
-init_per_testcase(_Case, Config) ->
-    WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    WatchDog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [server_accept_timeout, cinit_return_chkclose,
-     sinit_return_chkclose, cinit_big_return_chkclose,
-     sinit_big_return_chkclose, cinit_big_echo_chkclose,
-     cinit_huge_echo_chkclose, sinit_big_echo_chkclose,
-     cinit_few_echo_chkclose, cinit_many_echo_chkclose,
-     cinit_cnocert].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_suite(doc) ->
-    "Want to se what Config contains.";
-init_per_suite(suite) ->
-    [];
-init_per_suite(Config) ->
-    io:format("Config: ~p~n", [Config]),
-
-    %% Check if SSL exists. If this case fails, all other cases are skipped
-    case catch crypto:start() of
-	ok ->
-	    application:start(public_key),
-	    case ssl:start() of
-		ok -> ssl:stop();
-		{error, {already_started, _}} -> ssl:stop();
-		Error -> ?t:fail({failed_starting_ssl,Error})
-	    end,
-	    Config;
-	_Else ->
-	    {skip,"Could not start crypto"}
-    end.
-
-end_per_suite(doc) ->
-    "This test case has no mission other than closing the conf case";
-end_per_suite(suite) ->
-    [];
-end_per_suite(Config) ->
-    crypto:stop(),
-    Config.
-
-server_accept_timeout(doc) ->
-    "Server has one pending accept with timeout. Checks that return "
-	"value is {error, timeout}.";
-server_accept_timeout(suite) ->
-    [];
-server_accept_timeout(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    LPort = 3456,
-    Timeout = 40000, NConns = 1,
-    AccTimeout = 3000,
-
-    ?line {ok, {_, SsslOpts}} = mk_ssl_cert_opts(Config),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, once}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, AccTimeout}, 
-	     accept_timeout],
-    ?line test_server_only(NConns, LCmds, ACmds, Timeout, ?MODULE,
-			   Config).
-
-cinit_return_chkclose(doc) ->
-    "Client sends 1000 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Both have certs.";
-cinit_return_chkclose(suite) ->
-    [];
-cinit_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, once}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-    CCmds = [{timeout, Timeout},
-	     {sockopts, [{active, once}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-sinit_return_chkclose(doc) ->
-    "Server sends 1000 bytes to client, that receives them, sends them "
-	"back, and closes. Server waits for close. Both have certs.";
-sinit_return_chkclose(suite) ->
-    [];
-sinit_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, once}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, once}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-cinit_big_return_chkclose(doc) ->
-    "Client sends 50000 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Both have certs.";
-cinit_big_return_chkclose(suite) ->
-    [];
-cinit_big_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    %% Set {active, false} so that accept is passive to begin with. 
-    LCmds = [{sockopts, [{backlog, NConns}, {active, false}]},	
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {sockopts, [{active, once}]},	% {active, once} here.
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, once}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-sinit_big_return_chkclose(doc) ->
-    "Server sends 50000 bytes to client, that receives them, sends them "
-	"back, and closes. Server waits for close. Both have certs.";
-sinit_big_return_chkclose(suite) ->
-    [];
-sinit_big_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, once}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, once}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-cinit_big_echo_chkclose(doc) ->
-    "Client sends 50000 bytes to server, that echoes them back "
-	"and closes. Client waits for close. Both have certs.";
-cinit_big_echo_chkclose(suite) ->
-    [];
-cinit_big_echo_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, once}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {echo, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, once}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-cinit_huge_echo_chkclose(doc) ->
-    "Client sends 500000 bytes to server, that echoes them back "
-	"and closes. Client waits for close. Both have certs.";
-cinit_huge_echo_chkclose(suite) ->
-    [];
-cinit_huge_echo_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 500000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, once}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {echo, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, once}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-sinit_big_echo_chkclose(doc) ->
-    "Server sends 50000 bytes to client, that echoes them back "
-	"and closes. Server waits for close. Both have certs.";
-sinit_big_echo_chkclose(suite) ->
-    [];
-sinit_big_echo_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, once}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, once}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {echo, DataSize},
-	     close],
-
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-cinit_few_echo_chkclose(X) -> cinit_many_echo_chkclose(X, 7).
-
-cinit_many_echo_chkclose(X) -> cinit_many_echo_chkclose(X, ?MANYCONNS).
-
-cinit_many_echo_chkclose(doc, _NConns) ->
-    "client send 10000 bytes to server, that echoes them back "
-	"and closes. Clients wait for close. All have certs.";
-cinit_many_echo_chkclose(suite, _NConns) ->
-    [];
-cinit_many_echo_chkclose(Config, NConns) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 10000, LPort = 3456,
-    Timeout = 80000,
-
-    io:format("~w connections", [NConns]),
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, once}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {echo, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, once}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-cinit_cnocert(doc) ->
-    "Client sends 1000 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Client has no cert, "
-	"but server has.";
-cinit_cnocert(suite) ->
-    [];
-cinit_cnocert(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3457,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {_CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, once}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, once}]},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-
diff --git a/lib/ssl/test/old_ssl_misc_SUITE.erl b/lib/ssl/test/old_ssl_misc_SUITE.erl
deleted file mode 100644
index ea03e83867..0000000000
--- a/lib/ssl/test/old_ssl_misc_SUITE.erl
+++ /dev/null
@@ -1,117 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2003-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
--module(old_ssl_misc_SUITE).
-
--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,
-	 seed/1,
-	 app/1
-	]).
-
--import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
-			   test_server_only/6]).
--include_lib("test_server/include/test_server.hrl").
--include("ssl_test_MACHINE.hrl").
-
--define(MANYCONNS, 5).
-
-init_per_testcase(_Case, Config) ->
-    WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    WatchDog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [seed, app].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_suite(doc) ->
-    "Want to se what Config contains.";
-init_per_suite(suite) ->
-    [];
-init_per_suite(Config) ->
-    io:format("Config: ~p~n", [Config]),
-
-    %% Check if SSL exists. If this case fails, all other cases are skipped
-    case catch crypto:start() of
-	ok ->
-	    application:start(public_key),
-	    case ssl:start() of
-		ok -> ssl:stop();
-		{error, {already_started, _}} -> ssl:stop();
-		Error -> ?t:fail({failed_starting_ssl,Error})
-	    end,
-	    Config;
-	_Else ->
-	    {skip,"Could not start crypto!"}
-    end.
-
-end_per_suite(doc) ->
-    "This test case has no mission other than closing the conf case";
-end_per_suite(suite) ->
-    [];
-end_per_suite(Config) ->
-    crypto:stop(),
-    Config.
-
-seed(doc) ->
-    "Test that ssl:seed/1 works.";
-seed(suite) ->
-    [];
-seed(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {_, SsslOpts}} = mk_ssl_cert_opts(Config),
-
-    LCmds = [{seed, "tjosan"},
-	     {sockopts, [{backlog, NConns}, {active, once}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ?line test_server_only(NConns, LCmds, [], Timeout, ?MODULE,
-			   Config).
-
-app(doc) ->
-    "Test that the ssl app file is ok";
-app(suite) ->
-    [];
-app(Config) when list(Config) ->
-    ?line ok = test_server:app_test(ssl).
-
-
diff --git a/lib/ssl/test/old_ssl_passive_SUITE.erl b/lib/ssl/test/old_ssl_passive_SUITE.erl
deleted file mode 100644
index 7b54fe876a..0000000000
--- a/lib/ssl/test/old_ssl_passive_SUITE.erl
+++ /dev/null
@@ -1,382 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
--module(old_ssl_passive_SUITE).
-
--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,
-	 server_accept_timeout/1,
-	 cinit_return_chkclose/1,
-	 sinit_return_chkclose/1,
-	 cinit_big_return_chkclose/1,
-	 sinit_big_return_chkclose/1,
-	 cinit_big_echo_chkclose/1,
-	 sinit_big_echo_chkclose/1,
-	 cinit_few_echo_chkclose/1,
-	 cinit_many_echo_chkclose/1,
-	 cinit_cnocert/1
-	 ]).
-
--import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
-			   test_server_only/6]).
-
--include_lib("test_server/include/test_server.hrl").
--include("ssl_test_MACHINE.hrl").
-
--define(MANYCONNS, ssl_test_MACHINE:many_conns()).
-
-init_per_testcase(_Case, Config) ->
-    WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    WatchDog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [server_accept_timeout, cinit_return_chkclose,
-     sinit_return_chkclose, cinit_big_return_chkclose,
-     sinit_big_return_chkclose, cinit_big_echo_chkclose,
-     sinit_big_echo_chkclose, cinit_few_echo_chkclose,
-     cinit_many_echo_chkclose, cinit_cnocert].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_suite(doc) ->
-    "Want to se what Config contains.";
-init_per_suite(suite) ->
-    [];
-init_per_suite(Config) ->
-    io:format("Config: ~p~n", [Config]),
-
-    %% Check if SSL exists. If this case fails, all other cases are skipped
-    case catch crypto:start() of
-	ok ->
-	    application:start(public_key),
-	    case ssl:start() of
-		ok -> ssl:stop();
-		{error, {already_started, _}} -> ssl:stop();
-		Error -> ?t:fail({failed_starting_ssl,Error})
-	    end,
-	    Config;
-	_Else ->
-	    {skip,"Could not start crypto"}
-    end.
-
-end_per_suite(doc) ->
-    "This test case has no mission other than closing the conf case";
-end_per_suite(suite) ->
-    [];
-end_per_suite(Config) ->
-    crypto:stop(),
-    Config.
-
-server_accept_timeout(doc) ->
-    "Server has one pending accept with timeout. Checks that return "
-	"value is {error, timeout}.";
-server_accept_timeout(suite) ->
-    [];
-server_accept_timeout(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    LPort = 3456,
-    Timeout = 40000, NConns = 1,
-    AccTimeout = 3000,
-
-    ?line {ok, {_, SsslOpts}} = mk_ssl_cert_opts(Config),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, false}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, AccTimeout}, 
-	     accept_timeout],
-    ?line test_server_only(NConns, LCmds, ACmds, Timeout, ?MODULE, Config).
-
-cinit_return_chkclose(doc) ->
-    "Client sends 1000 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Both have certs.";
-cinit_return_chkclose(suite) ->
-    [];
-cinit_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, false}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-    CCmds = [{timeout, Timeout},
-	     {sockopts, [{active, false}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-sinit_return_chkclose(doc) ->
-    "Server sends 1000 bytes to client, that receives them, sends them "
-	"back, and closes. Server waits for close. Both have certs.";
-sinit_return_chkclose(suite) ->
-    [];
-sinit_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, false}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, false}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-cinit_big_return_chkclose(doc) ->
-    "Client sends 50000 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Both have certs.";
-cinit_big_return_chkclose(suite) ->
-    [];
-cinit_big_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, false}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, false}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-sinit_big_return_chkclose(doc) ->
-    "Server sends 50000 bytes to client, that receives them, sends them "
-	"back, and closes. Server waits for close. Both have certs.";
-sinit_big_return_chkclose(suite) ->
-    [];
-sinit_big_return_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, false}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, false}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-cinit_big_echo_chkclose(doc) ->
-    "Client sends 50000 bytes to server, that echoes them back "
-	"and closes. Client waits for close. Both have certs.";
-cinit_big_echo_chkclose(suite) ->
-    [];
-cinit_big_echo_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, false}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {echo, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, false}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-sinit_big_echo_chkclose(doc) ->
-    "Server sends 50000 bytes to client, that echoes them back "
-	"and closes. Server waits for close. Both have certs.";
-sinit_big_echo_chkclose(suite) ->
-    [];
-sinit_big_echo_chkclose(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 50000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, false}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, false}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {echo, DataSize},
-	     close],
-
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-
-cinit_few_echo_chkclose(X) -> cinit_many_echo_chkclose(X, 7).
-
-cinit_many_echo_chkclose(X) -> cinit_many_echo_chkclose(X, ?MANYCONNS).
-
-cinit_many_echo_chkclose(doc, _NConns) ->
-    "clients send 10000 bytes to server, that echoes them back "
-	"and closes. Clients wait for close. All have certs.";
-cinit_many_echo_chkclose(suite, _NConns) ->
-    [];
-cinit_many_echo_chkclose(Config, NConns) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 10000, LPort = 3456,
-    Timeout = 80000,
-
-    io:format("~w connections", [NConns]),
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, false}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {echo, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, false}]},
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
-cinit_cnocert(doc) ->
-    "Client sends 1000 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Client has no cert, "
-	"but server has.";
-cinit_cnocert(suite) ->
-    [];
-cinit_cnocert(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3457,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {_CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}, {active, false}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {recv, DataSize}, {send, DataSize}, 
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sockopts, [{active, false}]},
-	     {connect, {Host, LPort}},
-	     {send, DataSize}, {recv, DataSize}, 
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, ?MODULE,
-			    Config).
-
diff --git a/lib/ssl/test/old_ssl_peer_cert_SUITE.erl b/lib/ssl/test/old_ssl_peer_cert_SUITE.erl
deleted file mode 100644
index ee19bad175..0000000000
--- a/lib/ssl/test/old_ssl_peer_cert_SUITE.erl
+++ /dev/null
@@ -1,191 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2003-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
--module(old_ssl_peer_cert_SUITE).
-
--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,
-	 cinit_plain/1,
-	 cinit_both_verify/1,
-	 cinit_cnocert/1
-	 ]).
-
--import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
-			   test_server_only/6]).
--include_lib("test_server/include/test_server.hrl").
--include("ssl_test_MACHINE.hrl").
-
-
-init_per_testcase(_Case, Config) ->
-    WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    WatchDog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [cinit_plain, cinit_both_verify, cinit_cnocert].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_suite(doc) ->
-    "Want to se what Config contains.";
-init_per_suite(suite) ->
-    [];
-init_per_suite(Config) ->
-    io:format("Config: ~p~n", [Config]),
-
-    %% Check if SSL exists. If this case fails, all other cases are skipped
-    case catch crypto:start() of
-	ok ->
-	    application:start(public_key),
-	    case ssl:start() of
-		ok -> ssl:stop();
-		{error, {already_started, _}} -> ssl:stop();
-		Error -> ?t:fail({failed_starting_ssl,Error})
-	    end,
-	    Config;
-	_Else ->
-	    {skip,"Could not start crypto"}
-    end.
-
-end_per_suite(doc) ->
-    "This test case has no mission other than closing the conf case";
-end_per_suite(suite) ->
-    [];
-end_per_suite(Config) ->
-    crypto:stop(),
-    Config.
-
-cinit_plain(doc) ->
-    "Server closes after accept, Client waits for close. Both have certs "
-	"but both use the defaults for verify and depth, but still tries "
-	"to retreive each others certificates.";
-cinit_plain(suite) ->
-    [];
-cinit_plain(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts, SsslOpts}} = mk_ssl_cert_opts(Config),
-
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     nopeercert,
-	     {recv, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     peercert,
-	     {send, DataSize},
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, 
-			    ?MODULE, Config).
-
-cinit_both_verify(doc) ->
-    "Server closes after accept, Client waits for close. Both have certs "
-	"and both verify each other.";
-cinit_both_verify(suite) ->
-    [];
-cinit_both_verify(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts0, SsslOpts0}} = mk_ssl_cert_opts(Config),
-    ?line CsslOpts = [{verify, 2}, {depth, 2} | CsslOpts0],
-    ?line SsslOpts = [{verify, 2}, {depth, 3} | SsslOpts0],
-
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     peercert,
-	     {recv, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     peercert,
-	     {send, DataSize},
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, 
-			    ?MODULE, Config).
-
-cinit_cnocert(doc) ->
-    "Client has no cert. Nor the client, nor the server is verifying its "
-	"peer. Server closes, client waits for close.";
-cinit_cnocert(suite) ->
-    [];
-cinit_cnocert(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3457,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {_, SsslOpts0}} = mk_ssl_cert_opts(Config),
-    ?line SsslOpts = [{verify, 0}, {depth, 2} | SsslOpts0],
-
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {recv, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {connect, {Host, LPort}},
-	     peercert,
-	     {send, DataSize},
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout,
-			    ?MODULE, Config).
-
-
diff --git a/lib/ssl/test/old_ssl_protocol_SUITE.erl b/lib/ssl/test/old_ssl_protocol_SUITE.erl
deleted file mode 100644
index 9b9937c210..0000000000
--- a/lib/ssl/test/old_ssl_protocol_SUITE.erl
+++ /dev/null
@@ -1,185 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
--module(old_ssl_protocol_SUITE).
-
--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, 
-	 sslv2/1, sslv3/1, tlsv1/1, sslv2_sslv3/1,
-	 sslv2_tlsv1/1, sslv3_tlsv1/1, sslv2_sslv3_tlsv1/1]).
-
--import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
-			   test_server_only/6]).
--include_lib("test_server/include/test_server.hrl").
--include("ssl_test_MACHINE.hrl").
-
-
-init_per_testcase(_Case, Config) ->
-    WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    WatchDog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [sslv2, sslv3, tlsv1, sslv2_sslv3, sslv2_tlsv1,
-     sslv3_tlsv1, sslv2_sslv3_tlsv1].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_suite(doc) ->
-    "Want to se what Config contains.";
-init_per_suite(suite) ->
-    [];
-init_per_suite(Config) ->
-    io:format("Config: ~p~n", [Config]),
-
-    %% Check if SSL exists. If this case fails, all other cases are skipped
-    case catch crypto:start() of
-	ok ->
-	    application:start(public_key),
-	    case ssl:start() of
-		ok -> ssl:stop();
-		{error, {already_started, _}} -> ssl:stop();
-		Error -> ?t:fail({failed_starting_ssl,Error})
-	    end,
-	    Config;
-	_Else ->
-	    {skip,"Could not start crypto"}
-    end.
-
-end_per_suite(doc) ->
-    "This test case has no other purpose than closing the conf case.";
-end_per_suite(suite) ->
-    [];
-end_per_suite(Config) ->
-    crypto:stop(),
-    Config.
-
-%%%%%
-
-sslv2(doc) ->
-    "Client has no cert. Nor the client, nor the server is verifying its "
-	"peer. Server closes, client waits for close. "
-	"Client and server choose SSLv2."; 
-sslv2(suite) ->
-    [];
-sslv2(Config) when list(Config) ->
-    do_run_test(Config, [sslv2]).
-
-sslv3(doc) ->
-    "Client has no cert. Nor the client, nor the server is verifying its "
-	"peer. Server closes, client waits for close. "
-	"Client and server choose SSLv3."; 
-sslv3(suite) ->
-    [];
-sslv3(Config) when list(Config) ->
-    do_run_test(Config, [sslv3]).
-
-tlsv1(doc) ->
-    "Client has no cert. Nor the client, nor the server is verifying its "
-	"peer. Server closes, client waits for close. "
-	"Client and server choose TLSv1."; 
-tlsv1(suite) ->
-    [];
-tlsv1(Config) when list(Config) ->
-    do_run_test(Config, [tlsv1]).
-
-sslv2_sslv3(doc) ->
-    "Client has no cert. Nor the client, nor the server is verifying its "
-	"peer. Server closes, client waits for close. "
-	"Client and server choose between SSLv2 and SSLv3."; 
-sslv2_sslv3(suite) ->
-    [];
-sslv2_sslv3(Config) when list(Config) ->
-    do_run_test(Config, [sslv2, sslv3]).
-
-sslv2_tlsv1(doc) ->
-    "Client has no cert. Nor the client, nor the server is verifying its "
-	"peer. Server closes, client waits for close. "
-	"Client and server choose between SSLv2 and TLSv1."; 
-sslv2_tlsv1(suite) ->
-    [];
-sslv2_tlsv1(Config) when list(Config) ->
-    do_run_test(Config, [sslv2, tlsv1]).
-
-sslv3_tlsv1(doc) ->
-    "Client has no cert. Nor the client, nor the server is verifying its "
-	"peer. Server closes, client waits for close. "
-	"Client and server choose between SSLv3 and TLSv1."; 
-sslv3_tlsv1(suite) ->
-    [];
-sslv3_tlsv1(Config) when list(Config) ->
-    do_run_test(Config, [sslv3, tlsv1]).
-
-sslv2_sslv3_tlsv1(doc) ->
-    "Client has no cert. Nor the client, nor the server is verifying its "
-	"peer. Server closes, client waits for close. "
-	"Client and server choose between SSLv2, SSLv3, and TLSv1."; 
-sslv2_sslv3_tlsv1(suite) ->
-    [];
-sslv2_sslv3_tlsv1(Config) when list(Config) ->
-    do_run_test(Config, [sslv2, sslv3, tlsv1]).
-
-%%%%
-
-do_run_test(Config0, Protocols) ->
-    process_flag(trap_exit, true),
-    LPort = 3456,
-    Timeout = 40000, NConns = 1,
-    DataSize = 10,
-
-    ?line {ok, {_, SsslOpts0}} = mk_ssl_cert_opts(Config0),
-    ?line SsslOpts = [{verify, 0}, {depth, 2} | SsslOpts0],
-
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     connection_info,
-	     {recv, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {connect, {Host, LPort}},
-	     connection_info,
-	     {send, DataSize},
-	     await_close],
-    Config1 = [{env, [{protocol_version, Protocols}]} | Config0],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout,
-			    ?MODULE, Config1).
-
-
diff --git a/lib/ssl/test/old_ssl_verify_SUITE.erl b/lib/ssl/test/old_ssl_verify_SUITE.erl
deleted file mode 100644
index 4c11ea6850..0000000000
--- a/lib/ssl/test/old_ssl_verify_SUITE.erl
+++ /dev/null
@@ -1,153 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
--module(old_ssl_verify_SUITE).
-
--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,
-	 cinit_both_verify/1,
-	 cinit_cnocert/1
-	 ]).
-
--import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
-			   test_server_only/6]).
--include_lib("test_server/include/test_server.hrl").
--include("ssl_test_MACHINE.hrl").
-
-
-init_per_testcase(_Case, Config) ->
-    WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    WatchDog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [cinit_both_verify, cinit_cnocert].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_suite(doc) ->
-    "Want to se what Config contains.";
-init_per_suite(suite) ->
-    [];
-init_per_suite(Config) ->
-    io:format("Config: ~p~n", [Config]),
-
-    %% Check if SSL exists. If this case fails, all other cases are skipped
-    case catch crypto:start() of
-	ok ->
-	    application:start(public_key),
-	    case ssl:start() of
-		ok -> ssl:stop();
-		{error, {already_started, _}} -> ssl:stop();
-		Error -> ?t:fail({failed_starting_ssl,Error})
-	    end,
-	    Config;
-	_Else ->
-	    {skip,"Could not start crypto"}
-    end.
-
-end_per_suite(doc) ->
-    "This test case has no mission other than closing the conf case";
-end_per_suite(suite) ->
-    [];
-end_per_suite(Config) ->
-    crypto:stop(),
-    Config.
-
-cinit_both_verify(doc) ->
-    "Server closes after accept, Client waits for close. Both have certs "
-	"and both verify each other.";
-cinit_both_verify(suite) ->
-    [];
-cinit_both_verify(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3456,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {CsslOpts0, SsslOpts0}} = mk_ssl_cert_opts(Config),
-    ?line CsslOpts = [{verify, 2}, {depth, 2} | CsslOpts0],
-    ?line SsslOpts = [{verify, 2}, {depth, 3} | SsslOpts0],
-
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {recv, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {sslopts, CsslOpts},
-	     {connect, {Host, LPort}},
-	     {send, DataSize},
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, 
-			    ?MODULE, Config).
-
-cinit_cnocert(doc) ->
-    "Client has no cert. Nor the client, nor the server is verifying its "
-	"peer. Server closes, client waits for close.";
-cinit_cnocert(suite) ->
-    [];
-cinit_cnocert(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    DataSize = 1000, LPort = 3457,
-    Timeout = 40000, NConns = 1,
-
-    ?line {ok, {_, SsslOpts0}} = mk_ssl_cert_opts(Config),
-    ?line SsslOpts = [{verify, 0}, {depth, 2} | SsslOpts0],
-
-    ?line {ok, Host} = inet:gethostname(),
-
-    LCmds = [{sockopts, [{backlog, NConns}]},
-	     {sslopts, SsslOpts},
-	     {listen, LPort}, 
-	     wait_sync,
-	     lclose],
-    ACmds = [{timeout, Timeout}, 
-	     accept,
-	     {recv, DataSize},
-	     close],
-    CCmds = [{timeout, Timeout}, 
-	     {connect, {Host, LPort}},
-	     {send, DataSize},
-	     await_close],
-    ?line test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout,
-			    ?MODULE, Config).
-
-
diff --git a/lib/ssl/test/old_transport_accept_SUITE.erl b/lib/ssl/test/old_transport_accept_SUITE.erl
deleted file mode 100644
index 6f0c8e456b..0000000000
--- a/lib/ssl/test/old_transport_accept_SUITE.erl
+++ /dev/null
@@ -1,258 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2007-2011. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
--module(old_transport_accept_SUITE).
--include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
-
-%% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
--define(application, ssh).
-
--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,
-	 config/1,
-	 echo_once/1,
-	 echo_twice/1,
-	 close_before_ssl_accept/1,
-	 server/5,
-	 tolerant_server/5,
-	 client/5
-	]).
-
-init_per_testcase(_Case, Config) ->
-    WatchDog = ssl_test_lib:timetrap(?default_timeout),
-    [{watchdog, WatchDog}, {protomod, gen_tcp}, {serialize_accept, true}| 
-     Config].
-
-end_per_testcase(_Case, Config) ->
-    WatchDog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [config, echo_once, echo_twice, close_before_ssl_accept].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    try crypto:start() of
-	ok ->
-	    Config
-    catch _:_ ->
-	    {skip, "Crypto did not start"}
-    end.
-
-end_per_suite(_Config) ->
-    application:stop(crypto),
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-config(doc) ->
-    "Want to se what Config contains.";
-config(suite) ->
-    [];
-config(Config) ->
-    io:format("Config: ~p~n", [Config]),
-    ok.
-
-echo_once(doc) ->
-    "Client sends 256 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Both have certs.";
-echo_once(suite) ->
-    [];
-echo_once(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    LPort = 3456,
-    {ok, Host} = inet:gethostname(),
-    {ok, {COpts, SOpts}} = ssl_test_MACHINE:mk_ssl_cert_opts(Config),
-    N = 1,
-    Msg = lists:seq(0, 255),
-    Self = self(),
-    Params = "-pa " ++ filename:dirname(code:which(?MODULE)),
-    Node = start_node(server, Params),
-    CNode = start_node(client, Params),
-    Server = spawn_link(Node, ?MODULE, server, [Self, LPort, SOpts, Msg, N]),
-    Client = spawn_link(Node, ?MODULE, client, [Host, LPort, COpts, Msg, N]),
-    ok = receive
-	     {Server, listening} ->
-		 Client ! {Server, listening},
-		 ok;
-	     E ->
-		 io:format("bad receive (1) ~p\n", [E]),
-		 E
-	 end,
-    receive
-	{Server, done} ->
-	    ok
-    end,
-    test_server:stop_node(Node),
-    test_server:stop_node(CNode).
-
-close_before_ssl_accept(doc) ->
-    "Client sends 256 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Both have certs.";
-close_before_ssl_accept(suite) ->
-    [];
-close_before_ssl_accept(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    LPort = 3456,
-    {ok, Host} = inet:gethostname(),
-    {ok, {COpts, SOpts}} = ssl_test_MACHINE:mk_ssl_cert_opts(Config),
-    Msg = lists:seq(0, 255),
-    Self = self(),
-    Params = "-pa " ++ filename:dirname(code:which(?MODULE)),
-    Node = start_node(server, Params),
-    CNode = start_node(client, Params),
-    Server = spawn_link(Node, ?MODULE, tolerant_server,
-			[Self, LPort, SOpts, Msg, 2]),
-    Client = spawn_link(Node, ?MODULE, client,
-			[Host, LPort, COpts, Msg, 1]),
-    ok = receive
-	     {Server, listening} ->
-		 {ok, S} = gen_tcp:connect(Host, LPort, []),
-		 gen_tcp:close(S),
-		 Client ! {Server, listening},
-		 ok;
-	     E ->
-		 io:format("bad receive (1) ~p\n", [E]),
-		 E
-	 end,
-    receive
-	{Server, done} ->
-	    ok
-    end,
-    test_server:stop_node(Node),
-    test_server:stop_node(CNode).
-
-client(Host, LPort, COpts, Msg, N) ->
-    ok = receive
-	     {_Server, listening} ->
-		 ok;
-	     E ->
-		 io:format("bad receive (2) ~p\n", [E]),
-		 E
-	 end,
-    Opts = COpts ++ [{packet, raw}, {active, false}],
-    app(),
-    lists:foreach(fun(_) ->
-			  {ok, S} = ssl:connect(Host, LPort, Opts),
-			  ssl:send(S, Msg),
-			  {ok, Msg} = ssl:recv(S, length(Msg)),
-			  ssl:close(S)
-		  end, lists:seq(1, N)).
-
-echo_twice(doc) ->
-    "Two clients sends 256 bytes to server, that receives them, sends them "
-	"back, and closes. Client waits for close. Both have certs.";
-echo_twice(suite) ->
-    [];
-echo_twice(Config) when list(Config) ->
-    process_flag(trap_exit, true),
-    LPort = 3456,
-    {ok, Host} = inet:gethostname(),
-    {ok, {COpts, SOpts}} = ssl_test_MACHINE:mk_ssl_cert_opts(Config),
-    N = 2,
-    Msg = lists:seq(0, 255),
-    Self = self(),
-    Params = "-pa " ++ filename:dirname(code:which(?MODULE)),
-    Node = start_node(server, Params),
-    CNode = start_node(client, Params),
-    Server = spawn_link(Node, ?MODULE, server,
-			[Self, LPort, SOpts, Msg, N]),
-    Client = spawn_link(Node, ?MODULE, client,
-			[Host, LPort, COpts, Msg, N]),
-    ok = receive
-	     {Server, listening} ->
-		 Client ! {Server, listening},
-		 ok;
-	     E ->
-		 io:format("bad receive (3) ~p\n", [E]),
-		 E
-	 end,
-    receive
-	{Server, done} ->
-	    ok
-    end,
-    test_server:stop_node(Node),
-    test_server:stop_node(CNode).
-
-server(Client, Port, SOpts, Msg, N) ->
-    app(),
-    process_flag(trap_exit, true),
-    Opts = SOpts ++ [{packet, raw}, {active, false}],
-    {ok, LSock} = ssl:listen(Port, Opts),
-    Client ! {self(), listening},
-    server_loop(Client, LSock, Msg, N).
-
-server_loop(Client, _, _, 0) ->
-    Client ! {self(), done};
-server_loop(Client, LSock, Msg, N) ->
-    {ok, S} = ssl:transport_accept(LSock),
-    ok = ssl:ssl_accept(S),
-    %% P = ssl:controlling_process(S, Proxy),
-    {ok, Msg} = ssl:recv(S, length(Msg)),
-    ok = ssl:send(S, Msg),
-    ok = ssl:close(S),
-    server_loop(Client, LSock, Msg, N-1).
-
-tolerant_server(Client, Port, SOpts, Msg, N) ->
-    app(),
-    process_flag(trap_exit, true),
-    Opts = SOpts ++ [{packet, raw}, {active, false}],
-    {ok, LSock} = ssl:listen(Port, Opts),
-    Client ! {self(), listening},
-    tolerant_server_loop(Client, LSock, Msg, N).
-
-tolerant_server_loop(Client, _, _, 0) ->
-    Client ! {self(), done};
-tolerant_server_loop(Client, LSock, Msg, N) ->
-    {ok, S} = ssl:transport_accept(LSock),
-    case ssl:ssl_accept(S) of
-	ok ->
-	    %% P = ssl:controlling_process(S, Proxy),
-	    {ok, Msg} = ssl:recv(S, length(Msg)),
-	    ok = ssl:send(S, Msg),
-	    ok = ssl:close(S);
-	E ->
-	    io:format("ssl_accept error: ~p\n", [E])
-    end,
-    tolerant_server_loop(Client, LSock, Msg, N-1).
-
-app() ->
-    crypto:start(),
-    application:start(public_key),
-    ssl:start().
-
-start_node(Kind, Params) ->
-    S = atom_to_list(?MODULE)++"_" ++ atom_to_list(Kind),
-    {ok, Node} = test_server:start_node(list_to_atom(S), slave, [{args, Params}]),
-    Node.
-
diff --git a/lib/ssl/test/ssl.cover b/lib/ssl/test/ssl.cover
index 60774cc0f1..6b13e07a37 100644
--- a/lib/ssl/test/ssl.cover
+++ b/lib/ssl/test/ssl.cover
@@ -1,21 +1,4 @@
 {incl_app,ssl,details}.
 
-{excl_mods, ssl, [ssl_pkix_oid,
-		  'PKIX1Algorithms88', 
-		  'PKIX1Explicit88',
-		  'PKIX1Implicit88',
-		  'PKIXAttributeCertificate',
-		  'SSL-PKIX',
-		  ssl_pem,
-		  ssl_pkix,
-		  ssl_base64,
-		  ssl_broker,
-		  ssl_broker_int,
-		  ssl_broker_sup,
-		  ssl_debug,
-		  ssl_server,		
-		  ssl_prim,
-		  inet_ssl_dist,
-		  'OTP-PKIX'	
-		]}.
+{excl_mods, ssl, [ssl_debug]}.
 
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 37a021e7cf..a9109c5a6e 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -28,7 +28,6 @@
 -include_lib("public_key/include/public_key.hrl").
 
 -include("ssl_alert.hrl").
--include("ssl_int.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl").
 
@@ -207,8 +206,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [app, alerts, connection_info, protocol_versions,
      empty_protocol_versions, controlling_process,
-     controller_dies, client_closes_socket, peercert,
-     connect_dist, peername, sockname, socket_options,
+     controller_dies, client_closes_socket,
+     connect_dist, peername, peercert, sockname, socket_options,
      invalid_inet_get_option, invalid_inet_get_option_not_list,
      invalid_inet_get_option_improper_list,
      invalid_inet_set_option, invalid_inet_set_option_not_list,
@@ -253,7 +252,7 @@ all() ->
      unknown_server_ca_fail, der_input,
      unknown_server_ca_accept_verify_none,
      unknown_server_ca_accept_verify_peer,
-     unknown_server_ca_accept_backwardscompatibilty,
+     unknown_server_ca_accept_backwardscompatibility,
      %%different_ca_peer_sign,
      no_reuses_session_server_restart_new_cert,
      no_reuses_session_server_restart_new_cert_file, reuseaddr,
@@ -584,50 +583,6 @@ client_closes_socket(Config) when is_list(Config) ->
     ssl_test_lib:check_result(Server, {error,closed}).
 
 %%--------------------------------------------------------------------
-
-peercert(doc) -> 
-    [""];
-
-peercert(suite) -> 
-    [];
-
-peercert(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {?MODULE, peercert_result, []}},
-			   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port}, 
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {?MODULE, peercert_result, []}},
-			   {options, ClientOpts}]),
-    
-    CertFile = proplists:get_value(certfile, ServerOpts),
-    [{'Certificate', BinCert, _}]= ssl_test_lib:pem_to_der(CertFile),
-    ErlCert = public_key:pkix_decode_cert(BinCert, otp),
-       
-    ServerMsg = {{error, no_peercert}, {error, no_peercert}},
-    ClientMsg = {{ok, BinCert}, {ok, ErlCert}},
-    
-    test_server:format("Testcase ~p, Client ~p  Server ~p ~n", 
-		       [self(), Client, Server]),
-    
-    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-peercert_result(Socket) ->
-    Result1 = ssl:peercert(Socket),
-    Result2 = ssl:peercert(Socket, [ssl]), 
-    {Result1, Result2}.
-
-%%--------------------------------------------------------------------
 connect_dist(doc) -> 
     ["Test a simple connect as is used by distribution"];
 
@@ -708,6 +663,44 @@ peername_result(S) ->
     ssl:peername(S).
 
 %%--------------------------------------------------------------------
+peercert(doc) ->
+    [""];
+peercert(suite) ->
+    [];
+peercert(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+			   {mfa, {?MODULE, peercert_result, []}},
+			   {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {?MODULE, peercert_result, []}},
+			   {options, ClientOpts}]),
+
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    [{'Certificate', BinCert, _}]= ssl_test_lib:pem_to_der(CertFile),
+
+    ServerMsg = {error, no_peercert},
+    ClientMsg = {ok, BinCert},
+
+    test_server:format("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+peercert_result(Socket) ->
+    ssl:peercert(Socket).
+
+%%--------------------------------------------------------------------
 sockname(doc) -> 
     ["Test API function sockname/1"];
 
@@ -1528,7 +1521,6 @@ eoptions(Config) when is_list(Config) ->
 	    end,
 
     TestOpts = [{versions, [sslv2, sslv3]}, 
-		{ssl_imp, cool},
 		{verify, 4}, 
 		{verify_fun, function},
 		{fail_if_no_peer_cert, 0}, 
@@ -3282,11 +3274,11 @@ unknown_server_ca_accept_verify_peer(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-unknown_server_ca_accept_backwardscompatibilty(doc) ->
+unknown_server_ca_accept_backwardscompatibility(doc) ->
     ["Test that old style verify_funs will work"];
-unknown_server_ca_accept_backwardscompatibilty(suite) ->
+unknown_server_ca_accept_backwardscompatibility(suite) ->
     [];
-unknown_server_ca_accept_backwardscompatibilty(Config) when is_list(Config) ->
+unknown_server_ca_accept_backwardscompatibility(Config) when is_list(Config) ->
     ClientOpts =  ?config(client_opts, Config),
     ServerOpts =  ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
diff --git a/lib/ssl/test/old_ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 4544fb616a..23e9268f9b 100644
--- a/lib/ssl/test/old_ssl_dist_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -17,41 +17,32 @@
 %% %CopyrightEnd%
 %%
 
-%%
-
-
-%%%-------------------------------------------------------------------
-%%% File    : ssl_dist_SUITE.erl
-%%% Author  : Rickard Green
-%%% Description : Test that the Erlang distribution works over ssl.
-%%%
-%%% Created : 15 Nov 2007 by Rickard Green
-%%%-------------------------------------------------------------------
--module(old_ssl_dist_SUITE).
+-module(ssl_dist_SUITE).
 
 -include_lib("test_server/include/test_server.hrl").
 
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
 -define(DEFAULT_TIMETRAP_SECS, 240).
 
 -define(AWAIT_SLL_NODE_UP_TIMEOUT, 30000).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
--export([init_per_suite/1,
-	 end_per_suite/1,
-	 init_per_testcase/2,
-	 end_per_testcase/2]).
--export([cnct2tstsrvr/1]).
+-record(node_handle,
+	{connection_handler,
+	 socket,
+	 name,
+	 nodename}
+       ).
 
--export([basic/1]).
+%% Test server callback functions
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
--record(node_handle, {connection_handler, socket, name, nodename}).
+all() ->
+    [basic, payload, plain_options, plain_verify_options].
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [basic].
-
-groups() -> 
+groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
@@ -60,11 +51,12 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-
-init_per_suite(Config) ->
+init_per_suite(Config0) ->
     try crypto:start() of
 	ok ->
-	    add_ssl_opts_config(Config)
+	    Config = add_ssl_opts_config(Config0),
+	    setup_certs(Config),
+	    Config
     catch _:_ ->
 	    {skip, "Crypto did not start"}
     end.
@@ -73,85 +65,164 @@ end_per_suite(Config) ->
     application:stop(crypto),
     Config.
 
-init_per_testcase(Case, Config) when list(Config) ->
+init_per_testcase(Case, Config) when is_list(Config) ->
     Dog = ?t:timetrap(?t:seconds(?DEFAULT_TIMETRAP_SECS)),
     [{watchdog, Dog},{testcase, Case}|Config].
 
-end_per_testcase(_Case, Config) when list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                       %%
-%% Testcases                                                             %%
-%%                                                                       %%
-
+%%--------------------------------------------------------------------
+%% Test cases starts here.
+%%--------------------------------------------------------------------
 basic(doc) ->
     ["Test that two nodes can connect via ssl distribution"];
-basic(suite) ->
-    [];
 basic(Config) when is_list(Config) ->
-    ?line NH1 = start_ssl_node(Config),
-    ?line Node1 = NH1#node_handle.nodename,
-    ?line NH2 = start_ssl_node(Config),
-    ?line Node2 = NH2#node_handle.nodename,
+    NH1 = start_ssl_node(Config),
+    Node1 = NH1#node_handle.nodename,
+    NH2 = start_ssl_node(Config),
+    Node2 = NH2#node_handle.nodename,
 
-    ?line pong = apply_on_ssl_node(NH1, fun () -> net_adm:ping(Node2) end),
+    pong = apply_on_ssl_node(NH1, fun () -> net_adm:ping(Node2) end),
 
-    ?line [Node2] = apply_on_ssl_node(NH1, fun () -> nodes() end),
-    ?line [Node1] = apply_on_ssl_node(NH2, fun () -> nodes() end),
+    [Node2] = apply_on_ssl_node(NH1, fun () -> nodes() end),
+    [Node1] = apply_on_ssl_node(NH2, fun () -> nodes() end),
 
     %% The test_server node has the same cookie as the ssl nodes
     %% but it should not be able to communicate with the ssl nodes
     %% via the erlang distribution.
-    ?line pang = net_adm:ping(Node1),
-    ?line pang = net_adm:ping(Node2),
-
+    pang = net_adm:ping(Node1),
+    pang = net_adm:ping(Node2),
 
     %%
     %% Check that we are able to communicate over the erlang
     %% distribution between the ssl nodes.
     %%
-    ?line Ref = make_ref(),
-    ?line spawn(fun () ->
-			apply_on_ssl_node(
-			  NH1,
-			  fun () -> 
-				  tstsrvr_format("Hi from ~p!~n",
-						 [node()]),
-				  send_to_tstcntrl({Ref, self()}),
-				  receive
-				      {From, ping} ->
-					  From ! {self(), pong}
-				  end
-			  end)
-		end),
-    ?line receive
-	      {Ref, SslPid} ->
-		  ?line ok = apply_on_ssl_node(
-			       NH2,
-			       fun () ->
-				       tstsrvr_format("Hi from ~p!~n",
-						      [node()]),
-				       SslPid ! {self(), ping},
-				       receive
-					   {SslPid, pong} ->
-					       ok
-				       end
-			       end)
-	  end,
-
-    ?line stop_ssl_node(NH1),
-    ?line stop_ssl_node(NH2),
-    ?line success(Config).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                       %%
-%% Internal functions                                                    %%
-%%                                                                       %%
+    Ref = make_ref(),
+    spawn(fun () ->
+		  apply_on_ssl_node(
+		    NH1,
+		    fun () ->
+			    tstsrvr_format("Hi from ~p!~n", [node()]),
+			    send_to_tstcntrl({Ref, self()}),
+			    receive
+				{From, ping} ->
+				    tstsrvr_format("Received ping ~p!~n", [node()]),
+				    From ! {self(), pong}
+			    end
+		    end)
+	  end),
+     receive
+	 {Ref, SslPid} ->
+	     ok = apply_on_ssl_node(
+		    NH2,
+		    fun () ->
+			    tstsrvr_format("Hi from ~p!~n", [node()]),
+			    SslPid ! {self(), ping},
+			    receive
+				{SslPid, pong} ->
+				    ok
+			    end
+		    end)
+     end,
+    stop_ssl_node(NH1),
+    stop_ssl_node(NH2),
+    success(Config).
+
+%%--------------------------------------------------------------------
+payload(doc) ->
+    ["Test that send a lot of data between the ssl distributed noes"];
+payload(Config) when is_list(Config) ->
+    NH1 = start_ssl_node(Config),
+    Node1 = NH1#node_handle.nodename,
+    NH2 = start_ssl_node(Config),
+    Node2 = NH2#node_handle.nodename,
+
+    pong = apply_on_ssl_node(NH1, fun () -> net_adm:ping(Node2) end),
+
+    [Node2] = apply_on_ssl_node(NH1, fun () -> nodes() end),
+    [Node1] = apply_on_ssl_node(NH2, fun () -> nodes() end),
+
+    Ref = make_ref(),
+    spawn(fun () ->
+		  apply_on_ssl_node(
+		    NH1,
+		    fun () ->
+			    send_to_tstcntrl({Ref, self()}),
+			    receive
+				{From, Msg} ->
+				    From ! {self(), Msg}
+			    end
+		    end)
+	  end),
+     receive
+	 {Ref, SslPid} ->
+	     ok = apply_on_ssl_node(
+		    NH2,
+		    fun () ->
+			    Msg = crypto:rand_bytes(100000),
+			    SslPid ! {self(), Msg},
+			    receive
+				{SslPid, Msg} ->
+				    ok
+			    end
+		    end)
+     end,
+    stop_ssl_node(NH1),
+    stop_ssl_node(NH2),
+    success(Config).
+%%--------------------------------------------------------------------
+plain_options(doc) ->
+    ["Test specifying additional options"];
+plain_options(Config) when is_list(Config) ->
+    DistOpts = "-ssl_dist_opt server_secure_renegotiate true "
+	"client_secure_renegotiate true "
+	"server_reuse_sessions true client_reuse_sessions true  "
+	"client_verify verify_none server_verify verify_none "
+	"server_depth 1 client_depth 1 "
+	"server_hibernate_after 500 client_hibernate_after 500",
+
+    NH1 = start_ssl_node([{additional_dist_opts, DistOpts} | Config]),
+    Node1 = NH1#node_handle.nodename,
+    NH2 = start_ssl_node([{additional_dist_opts, DistOpts} | Config]),
+    Node2 = NH2#node_handle.nodename,
+
+    pong = apply_on_ssl_node(NH1, fun () -> net_adm:ping(Node2) end),
+
+    [Node2] = apply_on_ssl_node(NH1, fun () -> nodes() end),
+    [Node1] = apply_on_ssl_node(NH2, fun () -> nodes() end),
+
+    stop_ssl_node(NH1),
+    stop_ssl_node(NH2),
+    success(Config).
+%%--------------------------------------------------------------------
+plain_verify_options(doc) ->
+    ["Test specifying additional options"];
+plain_verify_options(Config) when is_list(Config) ->
+    DistOpts = "-ssl_dist_opt server_secure_renegotiate true "
+	"client_secure_renegotiate true "
+	"server_reuse_sessions true client_reuse_sessions true  "
+	"server_hibernate_after 500 client_hibernate_after 500",
+
+    NH1 = start_ssl_node([{additional_dist_opts, DistOpts}, {many_verify_opts, true} | Config]),
+    Node1 = NH1#node_handle.nodename,
+    NH2 = start_ssl_node([{additional_dist_opts, DistOpts}, {many_verify_opts, true} | Config]),
+    Node2 = NH2#node_handle.nodename,
+
+    pong = apply_on_ssl_node(NH1, fun () -> net_adm:ping(Node2) end),
+
+    [Node2] = apply_on_ssl_node(NH1, fun () -> nodes() end),
+    [Node1] = apply_on_ssl_node(NH2, fun () -> nodes() end),
+
+    stop_ssl_node(NH1),
+    stop_ssl_node(NH2),
+    success(Config).
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
 
-%%
 %% ssl_node side api
 %%
 
@@ -166,7 +237,7 @@ send_to_tstcntrl(Message) ->
 %% test_server side api
 %%
 
-apply_on_ssl_node(Node, M, F, A) when atom(M), atom(F), list(A) ->
+apply_on_ssl_node(Node, M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
     Ref = make_ref(),
     send_to_ssl_node(Node, {apply, self(), Ref, M, F, A}),
     receive
@@ -208,7 +279,7 @@ start_ssl_node(Config) ->
 start_ssl_node(Config, XArgs) ->
     Name = mk_node_name(Config),
     SSL = ?config(ssl_opts, Config),
-    SSLDistOpts = setup_dist_opts(Name, ?config(priv_dir, Config)),
+    SSLDistOpts = setup_dist_opts(Config),
     start_ssl_node_raw(Name, SSL ++ " " ++ SSLDistOpts ++ XArgs).
 
 start_ssl_node_raw(Name, Args) ->
@@ -218,7 +289,7 @@ start_ssl_node_raw(Name, Args) ->
     CmdLine = mk_node_cmdline(ListenPort, Name, Args),
     ?t:format("Attempting to start ssl node ~s: ~s~n", [Name, CmdLine]),
     case open_port({spawn, CmdLine}, []) of
-	Port when port(Port) ->
+	Port when is_port(Port) ->
 	    unlink(Port),
 	    erlang:port_close(Port),
 	    case await_ssl_node_up(Name, LSock) of
@@ -270,8 +341,8 @@ mk_node_cmdline(ListenPort, Name, Args) ->
     Prog ++ " "
 	++ Static ++ " "
 	++ NameSw ++ " " ++ Name ++ " "
-	++ "-pa " ++ Pa ++ " " 
- 	++ "-run application start crypto -run application start public_key "
+	++ "-pa " ++ Pa ++ " "
+	++ "-run application start crypto -run application start public_key "
 	++ "-run " ++ atom_to_list(?MODULE) ++ " cnct2tstsrvr "
 	++ host_name() ++ " "
 	++ integer_to_list(ListenPort) ++ " "
@@ -355,6 +426,7 @@ tstsrvr_con_loop(Name, Socket, Parent) ->
 		{format, FmtStr, ArgList} ->
 		    ?t:format(FmtStr, ArgList);
 		{message, Msg} ->
+		    ?t:format("Got message ~p", [Msg]),
 		    Parent ! Msg;
 		{apply_res, To, Ref, Res} ->
 		    To ! {Ref, Res};
@@ -376,7 +448,7 @@ tstsrvr_con_loop(Name, Socket, Parent) ->
 %%
 
 % cnct2tstsrvr() is called via command line arg -run ...
-cnct2tstsrvr([Host, Port]) when list(Host), list(Port) ->
+cnct2tstsrvr([Host, Port]) when is_list(Host), is_list(Port) ->
     %% Spawn connection handler on ssl node side
     ConnHandler
 	= spawn(fun () ->
@@ -419,7 +491,7 @@ notify_ssl_node_up(Socket) ->
 
 send_to_tstsrvr(Term) ->
     case catch ets:lookup_element(test_server_info, test_server_handler, 2) of
-	Hndlr when pid(Hndlr) ->
+	Hndlr when is_pid(Hndlr) ->
 	    Hndlr ! {relay_to_test_server, term_to_binary(Term)}, ok;
 	_ ->
 	    receive after 200 -> ok end,
@@ -499,9 +571,10 @@ do_append_files([F|Fs], RF) ->
     {ok, Data} = file:read_file(F),
     ok = file:write(RF, Data),
     do_append_files(Fs, RF).
-			    
-setup_dist_opts(Name, PrivDir) ->
-    NodeDir = filename:join([PrivDir, Name]),
+
+setup_certs(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    NodeDir = filename:join([PrivDir, "Certs"]),
     RGenDir = filename:join([NodeDir, "rand_gen"]),
     ok = file:make_dir(NodeDir),
     ok = file:make_dir(RGenDir),
@@ -516,11 +589,46 @@ setup_dist_opts(Name, PrivDir) ->
     CC = filename:join([CDir, "cert.pem"]),
     CK = filename:join([CDir, "key.pem"]),
     CKC = filename:join([CDir, "keycert.pem"]),
-    append_files([CK, CC], CKC),
-    "-proto_dist inet_ssl "
-	++ "-ssl_dist_opt server_certfile " ++ SKC ++ " "
-	++ "-ssl_dist_opt client_certfile " ++ CKC ++ " "
-.%	++ "-ssl_dist_opt verify 1 depth 1".
+    append_files([CK, CC], CKC).
+
+setup_dist_opts(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    DataDir = ?config(data_dir, Config),
+    Dhfile = filename:join([DataDir, "dHParam.pem"]),
+    NodeDir = filename:join([PrivDir, "Certs"]),
+    SDir = filename:join([NodeDir, "server"]),
+    CDir = filename:join([NodeDir, "client"]),
+    SC = filename:join([SDir, "cert.pem"]),
+    SK = filename:join([SDir, "key.pem"]),
+    SKC = filename:join([SDir, "keycert.pem"]),
+    SCA = filename:join([CDir, "cacerts.pem"]),
+    CC = filename:join([CDir, "cert.pem"]),
+    CK = filename:join([CDir, "key.pem"]),
+    CKC = filename:join([CDir, "keycert.pem"]),
+    CCA = filename:join([SDir, "cacerts.pem"]),
+
+    DistOpts = case  proplists:get_value(many_verify_opts, Config, false) of
+		   false ->
+		       "-proto_dist inet_tls "
+			   ++ "-ssl_dist_opt server_certfile " ++ SKC ++ " "
+			   ++ "-ssl_dist_opt client_certfile " ++ CKC ++ " ";
+		   true ->
+		       "-proto_dist inet_tls "
+			   ++ "-ssl_dist_opt server_certfile " ++ SC ++ " "
+			   ++ "-ssl_dist_opt server_keyfile " ++ SK ++ " "
+			   ++ "-ssl_dist_opt server_cacertfile " ++ SCA ++ " "
+			   ++ "-ssl_dist_opt server_verify verify_peer "
+			   ++ "-ssl_dist_opt server_fail_if_no_peer_cert true "
+			   ++ "-ssl_dist_opt server_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA "
+			   ++ "-ssl_dist_opt server_dhfile " ++ Dhfile ++ " "
+			   ++ "-ssl_dist_opt client_certfile " ++ CC ++ " "
+			   ++ "-ssl_dist_opt client_keyfile " ++ CK ++ " "
+			   ++ "-ssl_dist_opt client_cacertfile " ++ CCA ++ " "
+			   ++ "-ssl_dist_opt client_verify verify_peer "
+			   ++ "-ssl_dist_opt client_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA "
+	       end,
+    MoreOpts = proplists:get_value(additional_dist_opts, Config, []),
+    DistOpts ++ MoreOpts.
 
 %%
 %% Start scripts etc...
@@ -544,7 +652,7 @@ add_ssl_opts_config(Config) ->
 	SSL_VSN = vsn(ssl),
 	VSN_CRYPTO = vsn(crypto),
 	VSN_PKEY = vsn(public_key),
-	
+
 	SslDir = filename:join([LibDir, "ssl-" ++ SSL_VSN]),
 	{ok, _} = file:read_file_info(SslDir),
 	%% We are using an installed otp system, create the boot script.
diff --git a/lib/ssl/test/ssl_dist_SUITE_data/dHParam.pem b/lib/ssl/test/ssl_dist_SUITE_data/dHParam.pem
new file mode 100644
index 0000000000..feb581da30
--- /dev/null
+++ b/lib/ssl/test/ssl_dist_SUITE_data/dHParam.pem
@@ -0,0 +1,5 @@
+-----BEGIN DH PARAMETERS-----
+MIGHAoGBAMY5VmCZ22ZEy/KO8kjt94PH7ZtSG0Z0zitlMlvd4VsNkDzXsVeu+wkH
+FGDC3h3vgv6iwXGCbmrSOVk/FPZbzLhwZ8aLnkUFOBbOvVvb1JptQwOt8mf+eScG
+M2gGBktheQV5Nf1IrzOctG7VGt+neiqb/Y86uYCcDdL+M8++0qnLAgEC
+-----END DH PARAMETERS-----
diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl
new file mode 100644
index 0000000000..08c23b2d47
--- /dev/null
+++ b/lib/ssl/test/ssl_handshake_SUITE.erl
@@ -0,0 +1,67 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(ssl_handshake_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include("ssl_internal.hrl").
+-include("ssl_handshake.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> [
+	decode_hello_handshake,
+	decode_single_hello_extension_correctly,
+	decode_unknown_hello_extension_correctly].
+
+decode_hello_handshake(_Config) ->
+	HelloPacket = <<16#02, 16#00, 16#00,
+	16#44, 16#03, 16#03, 16#4e, 16#7f, 16#c1, 16#03, 16#35,
+	16#c2, 16#07, 16#b9, 16#4a, 16#58, 16#af, 16#34, 16#07,
+	16#a6, 16#7e, 16#ef, 16#52, 16#cb, 16#e0, 16#ea, 16#b7,
+	16#aa, 16#47, 16#c8, 16#c2, 16#2c, 16#66, 16#fa, 16#f8,
+	16#09, 16#42, 16#cf, 16#00, 16#c0, 16#30, 16#00, 16#00,
+	16#1c, 
+	16#00, 16#0b, 16#00, 16#04, 16#03, 16#00, 16#01, 16#02, % ec_point_formats
+	16#ff, 16#01, 16#00, 16#01, 16#00, %% renegotiate 
+	16#00, 16#23,
+	16#00, 16#00, 16#33, 16#74, 16#00, 16#07, 16#06, 16#73,
+	16#70, 16#64, 16#79, 16#2f, 16#32>>,
+	
+	{Records, _Buffer} = ssl_handshake:get_tls_handshake(HelloPacket, <<>>),
+	
+	{Hello, _Data} = hd(Records),
+	#renegotiation_info{renegotiated_connection = <<0>>} = Hello#server_hello.renegotiation_info.
+	
+decode_single_hello_extension_correctly(_Config) -> 
+	Renegotiation = <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(1), 0>>,
+	Extensions = ssl_handshake:dec_hello_extensions(Renegotiation, []),
+	[{renegotiation_info,#renegotiation_info{renegotiated_connection = <<0>>}}] = Extensions.
+	
+
+decode_unknown_hello_extension_correctly(_Config) ->
+	FourByteUnknown = <<16#CA,16#FE, ?UINT16(4), 3, 0, 1, 2>>,
+	Renegotiation = <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(1), 0>>,
+	Extensions = ssl_handshake:dec_hello_extensions(<<FourByteUnknown/binary, Renegotiation/binary>>, []),
+	[{renegotiation_info,#renegotiation_info{renegotiated_connection = <<0>>}}] = Extensions.
+	
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index d22d5d2954..9d2599b778 100644
--- a/lib/ssl/test/ssl_packet_SUITE.erl
+++ b/lib/ssl/test/ssl_packet_SUITE.erl
@@ -151,6 +151,9 @@ all() ->
      packet_cdr_decode, packet_cdr_decode_list,
      packet_http_decode, packet_http_decode_list,
      packet_http_bin_decode_multi, packet_http_error_passive,
+     packet_httph_active, packet_httph_bin_active,
+     packet_httph_active_once, packet_httph_bin_active_once,
+     packet_httph_passive, packet_httph_bin_passive,
      packet_line_decode, packet_line_decode_list,
      packet_asn1_decode, packet_asn1_decode_list,
      packet_tpkt_decode, packet_tpkt_decode_list,
@@ -1594,7 +1597,7 @@ client_http_decode(Socket, HttpRequest) ->
 %%--------------------------------------------------------------------
 packet_http_decode_list(doc) ->
     ["Test setting the packet option {packet, http}, {mode, list}"
-     "(Body will be litst too)"];
+     "(Body will be list too)"];
 packet_http_decode_list(suite) ->
     [];
 packet_http_decode_list(Config) when is_list(Config) ->
@@ -1804,7 +1807,304 @@ server_http_decode_error(Socket, HttpResponse) ->
     assert_packet_opt(Socket, http),
     ok = ssl:send(Socket, HttpResponse),
     ok.
+%%--------------------------------------------------------------------
+packet_httph_active(doc) ->
+    ["Test setting the packet option {packet, httph}"];
+packet_httph_active(suite) ->
+    [];
+packet_httph_active(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_active,
+					       []}},
+					{options, [{active, true},
+						   {packet, httph},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
 
+server_send_trailer(Socket, Trailer)->
+    ssl:send(Socket, Trailer),
+    ok.
+
+client_http_decode_trailer_active(Socket) ->
+    receive
+	{ssl, Socket,
+	 {http_header,36,'Content-Encoding',undefined,"gzip"}} ->
+	    ok;
+	Other1 ->
+	    exit({?LINE, Other1})
+    end,
+    receive
+	{ssl, Socket, http_eoh}  ->
+	    ok;
+	Other2 ->
+	    exit({?LINE, Other2})
+    end,
+    ok.
+
+%%--------------------------------------------------------------------
+packet_httph_bin_active(doc) ->
+    ["Test setting the packet option {packet, httph_bin}"];
+packet_httph_bin_active(suite) ->
+    [];
+packet_httph_bin_active(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_bin_active,
+					       []}},
+					{options, [{active, true},
+						   {packet, httph_bin},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+client_http_decode_trailer_bin_active(Socket) ->
+    receive
+	{ssl, Socket,
+	 {http_header,36,'Content-Encoding',undefined, <<"gzip">>}} ->
+	    ok;
+	Other1 ->
+	    exit({?LINE, Other1})
+    end,
+    receive
+	{ssl, Socket, http_eoh}  ->
+	    ok;
+	Other2 ->
+	    exit({?LINE, Other2})
+    end,
+    ok.
+%%--------------------------------------------------------------------
+packet_httph_active_once(doc) ->
+    ["Test setting the packet option {packet, httph}"];
+packet_httph_active_once(suite) ->
+    [];
+packet_httph_active_once(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_active_once,
+					       []}},
+					{options, [{active, false},
+						   {packet, httph},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+client_http_decode_trailer_active_once(Socket) ->
+    ssl:setopts(Socket, [{active, once}]),
+    receive
+	{ssl, Socket,
+	 {http_header,36,'Content-Encoding',undefined,"gzip"}} ->
+	    ok;
+	Other1 ->
+	    exit({?LINE, Other1})
+    end,
+    ssl:setopts(Socket, [{active, once}]),
+    receive
+	{ssl, Socket, http_eoh}  ->
+	    ok;
+	Other2 ->
+	    exit({?LINE, Other2})
+    end,
+    ok.
+%%--------------------------------------------------------------------
+packet_httph_bin_active_once(doc) ->
+    ["Test setting the packet option {packet, httph_bin}"];
+packet_httph_bin_active_once(suite) ->
+    [];
+packet_httph_bin_active_once(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_bin_active_once,
+					       []}},
+					{options, [{active, false},
+						   {packet, httph_bin},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+client_http_decode_trailer_bin_active_once(Socket) ->
+    ssl:setopts(Socket, [{active, once}]),
+    receive
+	{ssl, Socket,
+	 {http_header,36,'Content-Encoding',undefined, <<"gzip">>}} ->
+	    ok;
+	Other1 ->
+	    exit({?LINE, Other1})
+    end,
+    ssl:setopts(Socket, [{active, once}]),
+    receive
+	{ssl, Socket, http_eoh}  ->
+	    ok;
+	Other2 ->
+	    exit({?LINE, Other2})
+    end,
+    ok.
+
+%%--------------------------------------------------------------------
+
+packet_httph_passive(doc) ->
+    ["Test setting the packet option {packet, httph}"];
+packet_httph_passive(suite) ->
+    [];
+packet_httph_passive(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_passive,
+					       []}},
+					{options, [{active, false},
+						   {packet, httph},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+client_http_decode_trailer_passive(Socket) ->
+    {ok,{http_header,36,'Content-Encoding',undefined,"gzip"}} = ssl:recv(Socket, 0),
+    {ok, http_eoh} = ssl:recv(Socket, 0),
+    ok.
+
+%%--------------------------------------------------------------------
+packet_httph_bin_passive(doc) ->
+    ["Test setting the packet option {packet, httph_bin}"];
+packet_httph_bin_passive(suite) ->
+    [];
+packet_httph_bin_passive(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_bin_passive,
+					       []}},
+					{options, [{active, false},
+						   {packet, httph_bin},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+client_http_decode_trailer_bin_passive(Socket) ->
+    {ok,{http_header,36,'Content-Encoding',undefined,<<"gzip">>}} = ssl:recv(Socket, 0),
+    {ok, http_eoh} = ssl:recv(Socket, 0),
+    ok.
 
 %%--------------------------------------------------------------------
 packet_line_decode(doc) ->
diff --git a/lib/ssl/test/ssl_test_MACHINE.erl b/lib/ssl/test/ssl_test_MACHINE.erl
deleted file mode 100644
index e0ffa15d80..0000000000
--- a/lib/ssl/test/ssl_test_MACHINE.erl
+++ /dev/null
@@ -1,940 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2003-2010. 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
--module(ssl_test_MACHINE).
-
--export([many_conns/0, mk_ssl_cert_opts/1, test_one_listener/7, 
-	 test_server_only/6]).
-
--export([process_init/3, do_start/1]).
-
-
--include("test_server.hrl").
--include("ssl_test_MACHINE.hrl").
-
--define(WAIT_TIMEOUT, 10000).
--define(CLOSE_WAIT, 1000).
-
-%%
-%% many_conns() -> ManyConnections
-%%
-%% Choose a suitable number of "many connections" depending on platform
-%% and current limit for file descriptors.
-%%
-many_conns() ->
-    case os:type() of
-	{unix,_} -> many_conns_1();
-	_ -> 10
-    end.
-
-many_conns_1() ->
-    N0 = os:cmd("ulimit -n"),
-    N1 = lists:reverse(N0),
-    N2 = lists:dropwhile(fun($\r) -> true;
-			    ($\n) -> true;
-			    (_) -> false
-			 end, N1),
-    N = list_to_integer(lists:reverse(N2)),
-    lists:min([(N - 10) div 2, 501]).
-	
-%%
-%% mk_ssl_cert_opts(Config) -> {ok, {COpts, SOpts}}
-%%
-%% 
-mk_ssl_cert_opts(_Config) ->
-    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    COpts = [{ssl_imp, old},
-	     {cacertfile, filename:join([Dir, "client", "cacerts.pem"])}, 
-	     {certfile, filename:join([Dir, "client", "cert.pem"])}, 
-	     {keyfile, filename:join([Dir, "client", "key.pem"])}], 
-    SOpts = [{ssl_imp, old},
-	     {cacertfile, filename:join([Dir, "server", "cacerts.pem"])}, 
-	     {certfile, filename:join([Dir, "server", "cert.pem"])}, 
-	     {keyfile, filename:join([Dir, "server", "key.pem"])}], 
-    {ok, {COpts, SOpts}}.
-
-%%
-%% Cmds:
-%%		{protomod, gen_tcp | ssl}             		default = ssl
-%%		{serialize_accept, true | false}  	default = false
-%%		{timeout, Timeout}
-%%		{sockopts, Opts}
-%%		{sslopts, Opts}
-%%		{protocols, Protocols}  [sslv2|sslv3|tlsv1]
-%%		{listen, Port}
-%%		{lsock, LSock}		listen socket for acceptor
-%%		peercert
-%%		accept
-%%		{connect, {Host, Port}}
-%%		{recv, N}
-%%		{send, N}
-%%		{echo, N}		async echo back
-%%		close			close connection socket
-%%		{close, Time}		wait time and then close socket
-%%		lclose			close listen socket
-%%		await_close		wait for close
-%%		wait_sync		listener's wait for sync from parent
-%%		connection_info		
-%%		{exit, Reason}		exit
-%%
-%%
-%% We cannot have more than `backlog' acceptors at the same time.
-%%
-
-
-%%
-%% test_one_listener(NConns, LCmds, ACmds, CCmds, Timeout, Suite, Config)
-%%
-%% Creates one client and one server node, and runs one listener on
-%% the server node (according to LCmds), and creates NConns acceptors
-%% on the server node, and the same number of connectors on the client
-%% node. The acceptors and and connectors execute according to ACmds
-%% and CCmds, respectively.
-%%
-%% It is a good idea to have the backlog size in LCmds set to
-%% be at least as large as NConns.
-%%
-test_one_listener(NConns, LCmds0, ACmds0, CCmds0, Timeout, Suite, Config) ->
-    ProtoMod = get_protomod(Config), 
-    SerializeAccept = get_serialize_accept(Config), 
-    ?line {ok, {CNode, SNode}} = start_client_server_nodes(Suite),
-    case ProtoMod of
-	ssl -> 
-	    ?line ok = start_ssl([CNode, SNode], Config);
-	gen_tcp ->
-	    ok
-    end, 
-    LCmds = [{protomod, ProtoMod}| LCmds0], 
-    ACmds = [{protomod, ProtoMod}, {serialize_accept, SerializeAccept}| 
-	     ACmds0], 
-    CCmds = [{protomod, ProtoMod}| CCmds0], 
-
-    ?line {ok, Listener} = start_process(SNode, self(), LCmds, listener),
-    ?line {ok, LSock} = wait_lsock(Listener, ?WAIT_TIMEOUT),
-    ?line {ok, Accs0} = start_processes(NConns, SNode, self(), 
-				       [{lsock, LSock}| ACmds], acceptor),
-    Accs = case ProtoMod of 
-	       gen_tcp ->
-		   [Acc1| Accs1] = Accs0,
-		   Acc1 ! {continue_accept, self()},
-		   Accs1;
-	       ssl  ->
-		   Accs0
-	   end,
-    ?line {ok, Conns} = start_processes(NConns, CNode, self(), 
-					CCmds, connector),
-    ?line case wait_ack(Accs, Accs0 ++ Conns, Timeout) of
-	      ok ->
-		  ?line sync([Listener]),
-		  ?line wait_ack([], [Listener], ?WAIT_TIMEOUT);
-	      {error, Reason} ->
-		  ?line stop_node(SNode),
-		  ?line stop_node(CNode),
-		  exit(Reason)
-	  end,
-    ?line stop_node(SNode),
-    ?line stop_node(CNode),
-    ok.
-
-%%
-%% test_server_only(NConns, LCmds, ACmds, Timeout, Suite, Config)
-%%
-%% Creates only one server node, and runs one listener on
-%% the server node (according to LCmds), and creates NConns acceptors
-%% on the server node. The acceptors execute according to ACmds.
-%% There are no connectors.
-%%
-test_server_only(NConns, LCmds0, ACmds0, Timeout, Suite, Config) ->
-    ProtoMod = get_protomod(Config), 
-    ?line {ok, SNode} = start_server_node(Suite),
-    case ProtoMod of
-	ssl -> 
-	    ?line ok = start_ssl([SNode], Config);
-	gen_tcp ->
-	    ok
-    end, 
-    LCmds = [{protomod, ProtoMod}| LCmds0], 
-    ACmds = [{protomod, ProtoMod}| ACmds0], 
-    ?line {ok, Listener} = start_process(SNode, self(), LCmds, listener),
-    ?line {ok, LSock} = wait_lsock(Listener, ?WAIT_TIMEOUT),
-    ?line {ok, Accs0} = start_processes(NConns, SNode, self(), 
-				       [{lsock, LSock}| ACmds], acceptor),
-    Accs = case ProtoMod of 
-	       gen_tcp ->
-		   [Acc1| Accs1] = Accs0,
-		   Acc1 ! {continue_accept, self()},
-		   Accs1;
-	       ssl  ->
-		   Accs0
-	   end,
-    ?line case wait_ack(Accs, Accs0, Timeout) of
-	      ok ->
-		  ?line sync([Listener]),
-		  ?line wait_ack([], [Listener], ?WAIT_TIMEOUT);
-	      {error, Reason} ->
-		  ?line stop_node(SNode),
-		  exit(Reason)
-	  end,
-    ?line stop_node(SNode),
-    ok.
-
-%%
-%% start_client_server_nodes(Suite) -> {ok, {CNode, SNode}}
-%%
-start_client_server_nodes(Suite) ->
-    {ok, CNode} = start_client_node(Suite),
-    {ok, SNode} = start_server_node(Suite),
-    {ok, {CNode, SNode}}.
-
-start_client_node(Suite) ->
-    start_node(lists:concat([Suite, "_client"])).
-
-start_server_node(Suite) ->
-    start_node(lists:concat([Suite, "_server"])).
-
-%%
-%% start_ssl(Nodes, Config)
-%%
-start_ssl(Nodes, Config) -> 
-    Env0 = lists:flatten([Env00 || {env, Env00} <- Config]),
-    Env1 = case os:getenv("SSL_DEBUG") of
-	       false ->
-		   [];
-	       _ ->
-		   Dir = ?config(priv_dir, Config),
-		   [{debug, true}, {debugdir, Dir}]
-	   end,
-    Env = Env0 ++ Env1,
-    lists:foreach(
-      fun(Node) -> rpc:call(Node, ?MODULE, do_start, [Env]) end, Nodes),
-    ok.
-
-do_start(Env) ->
-    application:start(crypto),
-    application:start(public_key),
-    application:load(ssl),
-    lists:foreach(
-      fun({Par, Val}) -> application:set_env(ssl, Par, Val) end, Env),
-    application:start(ssl).
-
-    
-%%
-%% start_node(Name) -> {ok, Node}
-%% start_node(Name, ExtraParams) -> {ok, Node}
-%%
-start_node(Name) ->
-    start_node(Name, []).
-start_node(Name, ExtraParams) ->
-    Params = "-pa " ++ filename:dirname(code:which(?MODULE)) ++ " " ++
-	ExtraParams,
-    test_server:start_node(Name, slave, [{args, Params}]).
-
-stop_node(Node) ->
-    test_server:stop_node(Node).
-
-%%
-%% start_processes(N, Node, Parent, Cmds, Type) -> {ok, Pids}
-%%
-start_processes(M, Node, Parent, Cmds, Type) ->
-    start_processes1(0, M, Node, Parent, Cmds, Type, []).
-start_processes1(M, M, _, _, _, _, Pids) ->
-    {ok, lists:reverse(Pids)};
-start_processes1(N, M, Node, Parent, Cmds, Type, Pids) ->
-    {ok, Pid} = start_process(Node, Parent, Cmds, {Type, N + 1}),
-    start_processes1(N + 1, M, Node, Parent, Cmds, Type, [Pid| Pids]).
-
-%%
-%% start_process(Node, Parent, Cmds, Type) -> {ok, Pid}
-%%
-start_process(Node, Parent, Cmds0, Type) ->
-    Cmds = case os:type() of 
-	       {win32, _} ->
-		   lists:map(fun(close) -> {close, ?CLOSE_WAIT};
-				(Term) -> Term end, Cmds0);
-	       _ ->
-		   Cmds0
-	   end,
-    Pid = spawn_link(Node, ?MODULE, process_init, [Parent, Cmds, Type]),
-    {ok, Pid}.
-
-process_init(Parent, Cmds, Type) ->
-    ?debug("#### ~w start~n", [{Type, self()}]),
-    pre_main_loop(Cmds, #st{parent = Parent, type = Type}).
-
-%%
-%% pre_main_loop
-%%
-pre_main_loop([], St) ->
-    ?debug("#### ~w end~n", [{St#st.type, self()}]),
-    main_loop([], St);
-pre_main_loop(Cmds, St) ->
-    ?debug("#### ~w -> ~w~n", 
-	   [{St#st.type, self(), St#st.sock, St#st.port, 
-	     St#st.peer, St#st.active}, hd(Cmds)]),
-    main_loop(Cmds, St).
-    
-%%
-%% main_loop(Cmds, St)
-%%
-main_loop([{protomod, ProtoMod}| Cmds], St) ->
-    pre_main_loop(Cmds, St#st{protomod = ProtoMod});
-
-main_loop([{serialize_accept, Bool}| Cmds], St) ->
-    pre_main_loop(Cmds, St#st{serialize_accept = Bool});
-
-main_loop([{sockopts, Opts}| Cmds], St) ->
-    pre_main_loop(Cmds, St#st{sockopts = Opts});
-
-main_loop([{sslopts, Opts}| Cmds], St) ->
-    pre_main_loop(Cmds, St#st{sslopts = Opts});
-
-main_loop([{protocols, Protocols}| Cmds], St) ->
-    pre_main_loop(Cmds, St#st{protocols = Protocols});
-
-main_loop([{timeout, T}| Cmds], St) ->
-    pre_main_loop(Cmds, St#st{timeout = T});
-
-main_loop([{lsock, LSock}| Cmds], St) ->
-    pre_main_loop(Cmds, St#st{lsock = LSock});
-
-main_loop([{seed, Data}| Cmds], St) ->
-    case ssl:seed("tjosan") of
-	ok ->
-	    pre_main_loop(Cmds, St);
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in seed: error: ~w~n", 
-		   [St#st.type, self(), Reason]),
-	    exit(Reason)
-    end;
-
-main_loop([{listen, Port}| Cmds], St) ->
-    case listen(St, Port) of    
-	{ok, LSock} ->
-	    ack_lsock(St#st.parent, LSock),
-	    NSt = get_active(St#st{port = Port, sock = LSock, lsock = LSock}),
-	    pre_main_loop(Cmds, St);
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in listen: error: ~w~n", 
-		   [St#st.type, self(), Reason]),
-	    exit(Reason)
-    end;
-
-main_loop([accept| Cmds], St) ->
-    case St#st.serialize_accept of
-	true ->
-	    Parent = St#st.parent, 
-	    receive 
-		{continue_accept, Parent} ->
-		    ok
-	    end;
-	false ->
-	    ok
-    end,
-    case accept(St) of
-	{ok, Sock, Port, Peer} ->
-	    case St#st.serialize_accept of
-		true ->
-		    St#st.parent ! {one_accept_done, self()};
-		false ->
-		    ok
-	    end,
-	    NSt = get_active(St#st{sock = Sock, port = Port, peer = Peer}),
-	    pre_main_loop(Cmds, NSt);
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in accept: error: ~w~n", 
-		   [St#st.type, self(), Reason]),
-	    exit(Reason)
-    end;
-	
-main_loop([accept_timeout| Cmds], St) ->
-    case accept(St) of
-	{error, timeout} ->
-	    pre_main_loop(Cmds, St);
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in accept_timeout: error: ~w~n", 
-		   [St#st.type, self(), Reason]),
-	    exit(Reason)
-    end;
-	
-
-main_loop([{connect, {Host, Port}}| Cmds], St) ->
-    case connect(St, Host, Port) of
-	{ok, Sock, LPort, Peer} ->
-	    NSt = get_active(St#st{sock = Sock, port = LPort, peer = Peer}),
-	    pre_main_loop(Cmds, NSt);
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in connect: error: ~w~n", 
-		   [St#st.type, self(), Reason]),
-	    exit(Reason)
-    end;
-
-main_loop([connection_info| Cmds], St) ->
-    case connection_info(St) of
-	{ok, ProtoInfo} ->
-	    io:fwrite("Got connection_info:~n~p~n", [ProtoInfo]),
-	    pre_main_loop(Cmds, St);
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in connection_info: error: ~w~n", 
-		   [St#st.type, self(), Reason]),
-	    exit(Reason)
-    end;
-
-main_loop([peercert| Cmds], St) ->
-    case peercert(St) of
-	{ok, Cert} ->
-	    io:fwrite("Got cert:~n~p~n", [Cert]),
-	    pre_main_loop(Cmds, St);
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in peercert: error: ~w~n", 
-		   [St#st.type, self(), Reason]),
-	    exit(Reason)
-    end;
-
-main_loop([nopeercert| Cmds], St) ->
-    case peercert(St) of
-	{error, Reason} ->
-	    io:fwrite("Got no cert as expected. reason:~n~p~n", [Reason]),
-	    pre_main_loop(Cmds, St);
-	{ok, Cert} ->
-	    ?error("#### ~w(~w) in peercert: error: got cert: ~p~n", 
-		   [St#st.type, self(), Cert]),
-	    exit(peercert)
-    end;
-
-main_loop([{recv, N}| Cmds], St) ->
-    recv_loop([{recv, N}| Cmds], fun recv/1, St); % Returns to main_loop/2.
-
-main_loop([{send, N}| Cmds], St) ->
-    Msg = mk_msg(N),
-    case send(St, Msg) of 
-	ok ->
-	    pre_main_loop(Cmds, St);
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in send: error: ~w~n", 
-		   [St#st.type, self(), Reason]),
-	    exit(Reason)
-    end;
-
-main_loop([{echo, N}| Cmds], St) ->
-    recv_loop([{echo, N}| Cmds], fun echo/1, St); % Returns to main_loop/2.
-
-main_loop([{close, WaitTime}| Cmds], St) ->
-    wait(WaitTime),
-    pre_main_loop([close| Cmds], St);
-
-main_loop([close| Cmds], St) ->
-    case close(St) of
-	ok ->
-	    pre_main_loop(Cmds, St#st{sock = nil});
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in close: error: ~w~n", 
-		   [St#st.type, self(), Reason]),
-	    exit(Reason)
-    end;
-
-main_loop([lclose| Cmds], St) ->
-    case lclose(St) of
-	ok ->
-	    pre_main_loop(Cmds, St#st{lsock = nil});
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in lclose: error: ~w~n", 
-		   [St#st.type, self(), Reason]),
-	    exit(Reason)
-    end;
-
-main_loop([await_close| Cmds], St) ->
-    case await_close(St) of
-	ok ->
-	    pre_main_loop(Cmds, St#st{sock = nil});
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in await_close: error: ~w~n", 
-		   [St#st.type, self(), Reason]),
-	    exit(Reason)
-    end;
-
-main_loop([wait_sync| Cmds], St) ->
-    wait_sync(St),
-    pre_main_loop(Cmds, St);
-
-main_loop({exit, Reason}, _St) ->
-    exit(Reason);
-
-main_loop([], _St) ->
-    ok.
-
-%%
-%% recv_loop(Cmds, F, St)
-%%
-%% F = recv/1 | echo/1
-%%
-recv_loop([{_Tag, 0}| Cmds], _, St) ->
-    pre_main_loop(Cmds, St);
-recv_loop([{_Tag, N}| _Cmds], _, St) when N < 0 ->
-    ?error("#### ~w(~w) in recv_loop: error: too much: ~w~n", 
-	   [St#st.type, self(), N]),
-    exit(toomuch);                               % XXX or {error, Reason}?
-recv_loop([{Tag, N}| Cmds], F, St) ->
-    case F(St) of
-	{ok, Len} ->
-	    NSt = St#st{active = new_active(St#st.active)},
-	    if
-		Len == N ->
-		    pre_main_loop(Cmds, NSt);
-		true ->
-		    ?debug("#### ~w -> ~w~n", 
-			   [{NSt#st.type, self(), NSt#st.sock, NSt#st.port, 
-			     NSt#st.peer, NSt#st.active}, {Tag, N - Len}]),
-		    recv_loop([{Tag, N - Len}| Cmds], F, NSt)
-	    end;
-	{error, Reason} ->
-	    ?error("#### ~w(~w) in recv_loop: error: ~w, ~w bytes remain~n", 
-		   [St#st.type, self(), Reason, N]),
-	    exit(Reason)
-    end.
-
-new_active(once) ->
-    false;
-new_active(A) ->
-    A.
-
-get_active(St) ->
-    A = case proplists:get_value(active, St#st.sockopts, undefined) of
-	    undefined ->
-		Mod = case St#st.protomod of
-			  ssl ->
-			      ssl;
-			  gen_tcp ->
-			      inet
-		      end, 
-		{ok, [{active, Ax}]} = Mod:getopts(St#st.sock, [active]),
-		Ax;
-	    Ay ->
-		Ay
-	end,
-    ?debug("#### ~w(~w) get_active: ~p\n", [St#st.type, self(), A]),
-    St#st{active = A}.
-
-
-%%
-%% SOCKET FUNCTIONS
-%%
-
-%%
-%% ssl
-%%
-
-%%
-%% listen(St, LPort) -> {ok, LSock} | {error, Reason}
-%%
-listen(St, LPort) ->
-    case St#st.protomod of
-	ssl ->
-	    ssl:listen(LPort, [{ssl_imp, old} | St#st.sockopts ++ St#st.sslopts]);
-	gen_tcp ->
-	    gen_tcp:listen(LPort, St#st.sockopts)
-    end.
-
-%%
-%% accept(St) -> {ok, Sock} | {error, Reason}
-%%
-accept(St) ->
-    case St#st.protomod of
-	ssl ->
-	    case ssl:transport_accept(St#st.lsock, St#st.timeout) of
-		{ok, Sock} ->
-		    case ssl:ssl_accept(Sock, St#st.timeout) of			
-			ok ->
-			    {ok, Port} = ssl:sockname(Sock),
-			    {ok, Peer} = ssl:peername(Sock),
-			    {ok, Sock, Port, Peer};
-			Other  ->
-			    Other
-		    end;
-		Other  ->
-		    Other
-	    end;
-	gen_tcp ->
-	    case gen_tcp:accept(St#st.lsock, St#st.timeout) of
-		{ok, Sock} ->
-		    {ok, Port} = inet:port(Sock),
-		    {ok, Peer} = inet:peername(Sock),
-		    {ok, Sock, Port, Peer};
-		Other  ->
-		    Other
-	    end
-    end.
-
-%%
-%% connect(St, Host, Port) -> {ok, Sock} | {error, Reason}
-%%
-connect(St, Host, Port) ->
-    
-    case St#st.protomod of
-	ssl ->
-	    case ssl:connect(Host, Port, 
-			     [{ssl_imp, old} | St#st.sockopts ++ St#st.sslopts], 
-			     St#st.timeout) of
-		{ok, Sock} ->
-		    {ok, LPort} = ssl:sockname(Sock),
-		    {ok, Peer} = ssl:peername(Sock),
-		    {ok, Sock, LPort, Peer};
-		Other  ->
-		    Other
-	    end;
-	gen_tcp ->
-	    case gen_tcp:connect(Host, Port, St#st.sockopts, St#st.timeout) of
-		{ok, Sock} ->
-		    {ok, LPort} = inet:port(Sock),
-		    {ok, Peer} = inet:peername(Sock),
-		    {ok, Sock, LPort, Peer};
-		Other  ->
-		    Other
-	    end
-    end.
-
-%%
-%% peercert(St) -> {ok, Cert} | {error, Reason}
-%%
-peercert(St) ->
-    case St#st.protomod of
-	ssl ->
-	    ssl:peercert(St#st.sock, [ssl]);
-	gen_tcp  ->
-	    {ok, <<>>}
-    end.
-
-%%
-%% connection_info(St) -> {ok, ProtoInfo} | {error, Reason}
-%%
-connection_info(St) ->
-    case St#st.protomod of
-	ssl ->
-	    case ssl:connection_info(St#st.sock) of
-		Res = {ok, {Proto, _}} ->
-		    case St#st.protocols of
-			[] ->
-			    Res;
-			Protocols ->
-			    case lists:member(Proto, Protocols) of
-				true ->
-				    Res;
-				false ->
-				    {error, Proto}
-			    end
-		    end;
-		Error ->
-		    Error
-	    end;
-	gen_tcp  ->
-	    {ok, <<>>}
-    end.
-
-%%
-%% close(St) -> ok | {error, Reason}
-%%
-
-close(St) ->
-    Mod = St#st.protomod,
-    case St#st.sock of
-	nil ->
-	    ok;
-	_ ->
-	    Mod:close(St#st.sock)
-    end.
-
-%%
-%% lclose(St) -> ok | {error, Reason}
-%%
-lclose(St) ->
-    Mod = St#st.protomod,
-    case St#st.lsock of
-	nil ->
-	    ok;
-	_ ->
-	    Mod:close(St#st.lsock)
-    end.
-
-%%
-%% recv(St) = {ok, Len} | {error, Reason}
-%%
-recv(St) ->
-    case do_recv(St) of
-	{ok, Msg} ->
-	    {ok, length(Msg)};
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-do_recv(St) when St#st.active == false ->
-    %% First check that we do *not* have any ssl/gen_tcp messages in the
-    %% message queue, then call the receive function.
-    Sock = St#st.sock,
-    case St#st.protomod of
-	ssl ->
-	    receive 
-		M = {ssl, Sock, _Msg} ->
-		    {error, {unexpected_messagex, M}};
-		M = {ssl_closed, Sock} ->
-		    {error, {unexpected_message, M}};
-		M = {ssl_error, Sock, _Reason} ->
-		    {error, {unexpected_message, M}}
-	    after 0 ->
-		    ssl:recv(St#st.sock, 0, St#st.timeout)
-	    end;
-	gen_tcp  ->
-	    receive 
-		M = {tcp, Sock, _Msg} ->
-		    {error, {unexpected_message, M}};
-		M = {tcp_closed, Sock} ->
-		    {error, {unexpected_message, M}};
-		M = {tcp_error, Sock, _Reason} ->
-		    {error, {unexpected_message, M}}
-	    after 0 ->
-		    gen_tcp:recv(St#st.sock, 0, St#st.timeout)
-	    end
-    end;
-do_recv(St) ->
-    Sock = St#st.sock,
-    Timeout = St#st.timeout,
-    case St#st.protomod of
-	ssl ->
-	    receive 
-		{ssl, Sock, Msg} ->
-		    {ok, Msg};
-		{ssl_closed, Sock} ->
-		    {error, closed};
-		{ssl_error, Sock, Reason} ->
-		    {error, Reason}
-	    after Timeout ->
-		    {error, timeout}
-	    end;
-	gen_tcp  ->
-	    receive 
-		{tcp, Sock, Msg} ->
-		    {ok, Msg};
-		{tcp_closed, Sock} ->
-		    {error, closed};
-		{tcp_error, Sock, Reason} ->
-		    {error, Reason}
-	    after Timeout ->
-		    {error, timeout}
-	    end
-    end.
-
-%%
-%% echo(St) = {ok, Len} | {error, Reason}
-%%
-echo(St) ->
-    Sock = St#st.sock,
-    case do_recv(St) of
-	{ok, Msg} ->
-	    Mod = St#st.protomod, 
-	    case Mod:send(Sock, Msg) of
-		ok ->
-		    {ok, length(Msg)};
-		{error, Reason} ->
-		    {error, Reason}
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-%%
-%% send(St, Msg) -> ok | {error, Reason}
-%%
-send(St, Msg) ->
-    Mod = St#st.protomod,
-    Mod:send(St#st.sock, Msg).
-
-%%
-%% await_close(St) -> ok | {error, Reason}
-%%
-await_close(St) when St#st.active == false ->
-    %% First check that we do *not* have any ssl/gen_tcp messages in the
-    %% message queue, then call the receive function.
-    Sock = St#st.sock,
-    Res = case St#st.protomod of
-	      ssl ->
-		  receive 
-		      M = {ssl, Sock, _Msg0} ->
-			  {error, {unexpected_message, M}};
-		      M = {ssl_closed, Sock} ->
-			  {error, {unexpected_message, M}};
-		      M = {ssl_error, Sock, _Reason} ->
-			  {error, {unexpected_message, M}}
-		  after 0 ->
-			  ok
-		  end;
-	      gen_tcp  ->
-		  receive 
-		      M = {tcp, Sock, _Msg0} ->
-			  {error, {unexpected_message, M}};
-		      M = {tcp_closed, Sock} ->
-			  {error, {unexpected_message, M}};
-		      M = {tcp_error, Sock, _Reason} ->
-			  {error, {unexpected_message, M}}
-		  after 0 ->
-			  ok
-		  end
-	  end,
-    case Res of
-	ok ->
-	    Mod = St#st.protomod, 
-	    case Mod:recv(St#st.sock, 0, St#st.timeout) of
-		{ok, _Msg} ->
-		    {error, toomuch};
-		{error, _} ->
-		    ok
-	    end;
-	_  ->
-	    Res
-    end;
-await_close(St) ->
-    Sock = St#st.sock,
-    Timeout = St#st.timeout,
-    case St#st.protomod of 
-	ssl ->
-	    receive 
-		{ssl, Sock, _Msg} ->
-		    {error, toomuch};
-		{ssl_closed, Sock} ->
-		    ok;
-		{ssl_error, Sock, Reason} ->
-		    {error, Reason}
-	    after Timeout ->
-		    {error, timeout}
-	    end;
-	gen_tcp  ->
-	    receive 
-		{tcp, Sock, _Msg} ->
-		    {error, toomuch};
-		{tcp_closed, Sock} ->
-		    ok;
-		{tcp_error, Sock, Reason} ->
-		    {error, Reason}
-	    after Timeout ->
-		    {error, timeout}
-	    end
-    end.
-
-
-%%
-%% HELP FUNCTIONS
-%%
-
-wait_ack(_, [], _) ->
-    ok;
-wait_ack(AccPids0, Pids, Timeout) ->
-    ?debug("#### CONTROLLER: waiting for ~w~n", [Pids]),
-    receive
-	{one_accept_done, Pid} ->
-	    case lists:delete(Pid, AccPids0) of
-		[] ->
-		    wait_ack([], Pids, Timeout);
-		[AccPid| AccPids1] ->
-		    AccPid ! {continue_accept, self()},
-		    wait_ack(AccPids1, Pids, Timeout)
-	    end;
-	{'EXIT', Pid, normal} ->
-	    wait_ack(AccPids0, lists:delete(Pid, Pids), Timeout);
-	{'EXIT', Pid, Reason} ->
-	    ?error("#### CONTROLLER got abnormal exit: ~w, ~w~n", 
-		   [Pid, Reason]),
-	    {error, Reason}
-    after Timeout ->
-	    ?error("#### CONTROLLER exiting because of timeout = ~w~n", 
-		   [Timeout]),
-	    {error, Timeout}
-    end.
-
-
-%%
-%% ack_lsock(Pid, LSock)
-%%
-ack_lsock(Pid, LSock) ->
-    Pid ! {lsock, self(), LSock}.
-
-wait_lsock(Pid, Timeout) ->
-    receive
-	{lsock, Pid, LSock} ->
-	    {ok, LSock}
-    after Timeout ->
-	    exit(timeout)
-    end.
-
-%%
-%% sync(Pids)
-%%
-sync(Pids) ->
-    lists:foreach(fun (Pid) -> Pid ! {self(), sync} end, Pids).
-
-%%
-%% wait_sync(St)
-%%
-wait_sync(St) ->
-    Pid = St#st.parent, 
-    receive
-	{Pid, sync} ->
-	    ok
-    end.
-
-%% 
-%% wait(Time)
-%%
-wait(Time) ->
-    receive
-    after Time ->
-	    ok
-    end.
-
-%%
-%% mk_msg(Size)
-%%
-mk_msg(Size) ->
-    mk_msg(0, Size, []).
-
-mk_msg(_, 0, Acc) ->
-    Acc;
-mk_msg(Pos, Size, Acc) ->
-    C = (((Pos + Size) rem 256) - 1) band 255,
-    mk_msg(Pos, Size - 1, [C| Acc]).
-
-%%
-%% get_protomod(Config)
-%%
-get_protomod(Config) ->
-    case lists:keysearch(protomod, 1, Config) of
-	{value, {_, ProtoMod}} ->
-	    ProtoMod;
-	false  ->
-	    ssl
-    end.
-
-%%
-%% get_serialize_accept(Config)
-%%
-get_serialize_accept(Config) ->
-    case lists:keysearch(serialize_accept, 1, Config) of
-	{value, {_, Val}} ->
-	    Val;
-	false  ->
-	    false
-    end.
-
diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml
index 013e94c393..db65eb3848 100644
--- a/lib/stdlib/doc/src/beam_lib.xml
+++ b/lib/stdlib/doc/src/beam_lib.xml
@@ -88,7 +88,6 @@
         it is recommended that it contains at least 32 characters and
         that both upper and lower case letters as well as digits and
         special characters are used.</p>
-      <p></p>
       <p>The default type -- and currently the only type -- of crypto
         algorithm is <c>des3_cbc</c>, three rounds of DES. The key string
         will be scrambled using <c>erlang:md5/1</c> to generate
diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml
index 2512c84e18..215ec154ed 100644
--- a/lib/stdlib/doc/src/dets.xml
+++ b/lib/stdlib/doc/src/dets.xml
@@ -1006,8 +1006,7 @@ ok
       <name name="table" arity="2"/>
       <fsummary>Return a QLC query handle.</fsummary>
       <desc>
-        <p><marker id="qlc_table"></marker>
-          Returns a QLC (Query List
+        <p><marker id="qlc_table"></marker>Returns a QLC (Query List
           Comprehension) query handle. The module <c>qlc</c>
           implements a query language aimed mainly at Mnesia but Ets
           tables, Dets tables, and lists are also recognized by <c>qlc</c>
@@ -1105,7 +1104,7 @@ fun(X) -> {continue, X} end.            </pre>
             <p>Terminate the traversal and return <c>[<anno>Value</anno> | Acc]</c>.</p>
           </item>
         </taglist>
-        <p>Any other value returned by <c><anno>Fun</anno></c> terminates the
+        <p>Any other value <c><anno>OtherValue</anno></c> returned by <c><anno>Fun</anno></c> terminates the
           traversal and is immediately returned.
           </p>
       </desc>
diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml
index 929620bb88..fe166dbd01 100644
--- a/lib/stdlib/doc/src/erl_tar.xml
+++ b/lib/stdlib/doc/src/erl_tar.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -89,9 +89,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="add"></marker>
-<c>add/3</c> function adds a file to a tar file
-          that has been opened for writing by
+        <p>The <marker id="add"></marker><c>add/3</c> function adds
+           a file to a tar file that has been opened for writing by
           <seealso marker="#open">open/1</seealso>.</p>
         <taglist>
           <tag><c>dereference</c></tag>
@@ -138,8 +137,8 @@
         <v>TarDescriptor = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="close"></marker>
-<c>close/1</c> function closes a tar file
+        <p>The <marker id="close"></marker><c>close/1</c> function
+          closes a tar file
           opened by <seealso marker="#open">open/1</seealso>.</p>
       </desc>
     </func>
@@ -151,11 +150,12 @@
         <v>FileList = [Filename|{NameInArchive, binary()},{NameInArchive, Filename}]</v>
         <v>Filename = filename()</v>
         <v>NameInArchive = filename()</v>
-        <v>RetValue = ok|{error,{Name,Reason}} &lt;V>Reason = term()</v>
+        <v>RetValue = ok|{error,{Name,Reason}}</v>
+        <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="create_2"></marker>
-<c>create/2</c> function creates a tar file and
+        <p>The <marker id="create_2"></marker><c>create/2</c> function
+          creates a tar file and
           archives the files whose names are given in <c>FileList</c> into it.
           The files may either be read from disk or given as
           binaries.</p>
@@ -171,11 +171,11 @@
         <v>NameInArchive = filename()</v>
         <v>OptionList = [Option]</v>
         <v>Option = compressed|cooked|dereference|verbose</v>
-        <v>RetValue = ok|{error,{Name,Reason}} &lt;V>Reason = term()</v>
+        <v>RetValue = ok|{error,{Name,Reason}}</v>
+        <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="create_3"></marker>
-<c>create/3</c> function 
+        <p>The <marker id="create_3"></marker><c>create/3</c> function
           creates a tar file and archives the files whose names are given
           in <c>FileList</c> into it. The files may either be read from
           disk or given as binaries.</p>
@@ -220,9 +220,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="extract_1"></marker>
-<c>extract/1</c> function extracts
-          all files from a tar archive.</p>
+        <p>The <marker id="extract_1"></marker><c>extract/1</c> function
+          extracts all files from a tar archive.</p>
         <p>If the <c>Name</c> argument is given as "<c>{binary,Binary}</c>",
           the contents of the binary is assumed to be a tar archive.
           </p>
@@ -250,9 +249,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="extract_2"></marker>
-<c>extract/2</c> function extracts
-          files from a tar archive.</p>
+        <p>The <marker id="extract_2"></marker><c>extract/2</c> function
+          extracts files from a tar archive.</p>
         <p>If the <c>Name</c> argument is given as "<c>{binary,Binary}</c>",
           the contents of the binary is assumed to be a tar archive.
           </p>
@@ -322,8 +320,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="format_error_1"></marker>
-<c>format_error/1</c> converts
+        <p>The <marker id="format_error_1"></marker><c>format_error/1</c>
+          function converts
           an error reason term to a human-readable error message string.</p>
       </desc>
     </func>
@@ -339,8 +337,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="open"></marker>
-<c>open/2</c> function creates a tar file for writing.
+        <p>The <marker id="open"></marker><c>open/2</c> function creates
+         a tar file for writing.
         (Any existing file with the same name will be truncated.)</p>
         <p>By convention, the name of a tar file should end in "<c>.tar</c>".
           To abide to the convention, you'll need to add "<c>.tar</c>" yourself
@@ -373,7 +371,6 @@
             You should not rely on the specific contents of the <c>TarDescriptor</c>
             term, as it may change in future versions as more features are added
             to the <c>erl_tar</c> module.</p>
-          <p></p>
         </warning>
       </desc>
     </func>
@@ -386,9 +383,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="table_1"></marker>
-<c>table/1</c> function retrieves
-          the names of all files in the tar file <c>Name</c>.</p>
+        <p>The <marker id="table_1"></marker><c>table/1</c> function
+          retrieves the names of all files in the tar file <c>Name</c>.</p>
       </desc>
     </func>
     <func>
@@ -398,9 +394,8 @@
         <v>Name = filename()</v>
       </type>
       <desc>
-        <p>The           <marker id="table_2"></marker>
-<c>table/2</c> function retrieves
-          the names of all files in the tar file <c>Name</c>.</p>
+        <p>The <marker id="table_2"></marker><c>table/2</c> function
+          retrieves the names of all files in the tar file <c>Name</c>.</p>
       </desc>
     </func>
     <func>
@@ -410,8 +405,7 @@
         <v>Name = filename()</v>
       </type>
       <desc>
-        <p>The           <marker id="t_1"></marker>
-<c>t/1</c> function prints the names
+        <p>The <marker id="t_1"></marker><c>t/1</c> function prints the names
           of all files in the tar file <c>Name</c> to the Erlang shell.
           (Similar to "<c>tar&nbsp;t</c>".)</p>
       </desc>
@@ -423,8 +417,8 @@
         <v>Name = filename()</v>
       </type>
       <desc>
-        <p>The           <marker id="tt_1"></marker>
-<c>tt/1</c> function prints names and
+        <p>The <marker id="tt_1"></marker><c>tt/1</c> function prints
+          names and
           information about all files in the tar file <c>Name</c> to
           the Erlang shell. (Similar to "<c>tar&nbsp;tv</c>".)</p>
       </desc>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 8c952708c5..efd9514db6 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -512,8 +512,10 @@ Error: fun containing local Erlang function calls
               of the reference counter, keeping track of how many times
               the table has been fixed by the process.</p>
             <p>If the table never has been fixed, the call returns
-              <c>false</c>.</p>
-          </item>
+              <c>false</c>.</p></item>
+          <item><p><c>Item=stats, Value=tuple()</c>          <br></br>
+	  Returns internal statistics about set, bag and duplicate_bag tables on an internal format used by OTP test suites.
+	  Not for production use.</p></item>
         </list>
       </desc>
     </func>
@@ -658,9 +660,9 @@ ets:is_compiled_ms(Broken).</code>
           table. The difference being the same as between <c>=:=</c>
           and <c>==</c>. As an example, one might insert an object
           with the
-          <c>integer()</c><c>1</c> as a key in an <c>ordered_set</c>
+          <c>integer()</c> <c>1</c> as a key in an <c>ordered_set</c>
           and get the object returned as a result of doing a
-          <c>lookup/2</c> with the <c>float()</c><c>1.0</c> as the
+          <c>lookup/2</c> with the <c>float()</c> <c>1.0</c> as the
           key to search for.</p>
         <p>If the table is of type <c>set</c> or <c>ordered_set</c>,
           the function returns either the empty list or a list with one
@@ -943,7 +945,7 @@ ets:select(Table,MatchSpec),</code>
           table is named or not. If one or more options are left out,
           the default values are used. This means that not specifying
           any options (<c>[]</c>) is the same as specifying
-          <c>[set,protected,{keypos,1},{heir,none},{write_concurrency,false},{read_concurrency,false}]</c>.</p>
+          <c>[set, protected, {keypos,1}, {heir,none}, {write_concurrency,false}, {read_concurrency,false}]</c>.</p>
         <list type="bulleted">
           <item>
             <p><c>set</c>
@@ -960,7 +962,7 @@ ets:select(Table,MatchSpec),</code>
               <c>ordered_set</c> tables regard keys as equal when they
               <em>compare equal</em>, not only when they match. This
               means that to an <c>ordered_set</c>, the
-              <c>integer()</c><c>1</c> and the <c>float()</c><c>1.0</c> are regarded as equal. This also means that the
+              <c>integer()</c> <c>1</c> and the <c>float()</c> <c>1.0</c> are regarded as equal. This also means that the
               key used to lookup an element not necessarily
               <em>matches</em> the key in the elements returned, if
               <c>float()</c>'s and <c>integer()</c>'s are mixed in
diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml
index 38de51322f..f91fac9c82 100644
--- a/lib/stdlib/doc/src/gb_sets.xml
+++ b/lib/stdlib/doc/src/gb_sets.xml
@@ -61,7 +61,6 @@
       and do the same thing in the <c>sets</c> and <c>ordsets</c>
       modules. That is, by only changing the module name for each call,
       you can try out different set representations.</p>
-    <p></p>
     <list type="bulleted">
       <item>
         <p><c>add_element/2</c></p>
diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml
index 4900a8f0ef..421eeb4fd3 100644
--- a/lib/stdlib/doc/src/gen_fsm.xml
+++ b/lib/stdlib/doc/src/gen_fsm.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -430,7 +430,6 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
       denote a state of the state machine. <em>state data</em> is used
       to denote the internal state of the Erlang process which
       implements the state machine.</p>
-    <p></p>
   </section>
   <funcs>
     <func>
@@ -639,9 +638,9 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
         <v>StateName = atom()</v>
         <v>StateData = term()</v>
         <v>Result = {next_state,NextStateName,NewStateData}</v> 
-	<v>&nbsp;>&nbsp;| {next_state,NextStateName,NewStateData,Timeout}</v> 
-	<v>&nbsp;>&nbsp;| {next_state,NextStateName,NewStateData,hibernate}</v>
-        <v>&nbsp;>&nbsp;| {stop,Reason,NewStateData}</v>
+	<v>&nbsp;&nbsp;| {next_state,NextStateName,NewStateData,Timeout}</v>
+	<v>&nbsp;&nbsp;| {next_state,NextStateName,NewStateData,hibernate}</v>
+        <v>&nbsp;&nbsp;| {stop,Reason,NewStateData}</v>
         <v>&nbsp;NextStateName = atom()</v>
         <v>&nbsp;NewStateData = term()</v>
         <v>&nbsp;Timeout = int()>0 | infinity</v>
diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml
index 6f3ed7af98..7042c84437 100644
--- a/lib/stdlib/doc/src/lists.xml
+++ b/lib/stdlib/doc/src/lists.xml
@@ -240,7 +240,7 @@ flatmap(Fun, List1) ->
     <func>
       <name name="keydelete" arity="3"/>
       <fsummary>Delete an element from a list of tuples</fsummary>
-      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
         <p>Returns a copy of <c><anno>TupleList1</anno></c> where the first
           occurrence of a tuple whose <c><anno>N</anno></c>th element compares equal to
@@ -266,7 +266,7 @@ flatmap(Fun, List1) ->
     <func>
       <name name="keymap" arity="3"/>
       <fsummary>Map a function over a list of tuples</fsummary>
-      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
         <p>Returns a list of tuples where, for each tuple in
           <c><anno>TupleList1</anno></c>, the <c><anno>N</anno></c>th element <c><anno>Term1</anno></c> of the tuple
@@ -298,7 +298,7 @@ flatmap(Fun, List1) ->
     <func>
       <name name="keymerge" arity="3"/>
       <fsummary>Merge two key-sorted lists of tuples</fsummary>
-      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
         <p>Returns the sorted list formed by merging <c><anno>TupleList1</anno></c>
           and <c><anno>TupleList2</anno></c>. The merge is performed on
@@ -312,7 +312,7 @@ flatmap(Fun, List1) ->
     <func>
       <name name="keyreplace" arity="4"/>
       <fsummary>Replace an element in a list of tuples</fsummary>
-      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
         <p>Returns a copy of <c><anno>TupleList1</anno></c> where the first
           occurrence of a <c>T</c> tuple whose <c><anno>N</anno></c>th element
@@ -342,7 +342,7 @@ flatmap(Fun, List1) ->
     <func>
       <name name="keysort" arity="2"/>
       <fsummary>Sort a list of tuples</fsummary>
-      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
         <p>Returns a list containing the sorted elements of the list
           <c><anno>TupleList1</anno></c>. Sorting is performed on the <c><anno>N</anno></c>th
@@ -352,7 +352,7 @@ flatmap(Fun, List1) ->
     <func>
       <name name="keystore" arity="4"/>
       <fsummary>Store an element in a list of tuples</fsummary>
-      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
         <p>Returns a copy of <c><anno>TupleList1</anno></c> where the first
           occurrence of a tuple <c>T</c> whose <c><anno>N</anno></c>th element
@@ -366,7 +366,7 @@ flatmap(Fun, List1) ->
     <func>
       <name name="keytake" arity="3"/>
       <fsummary>Extract an element from a list of tuples</fsummary>
-      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
         <p>Searches the list of tuples <c><anno>TupleList1</anno></c> for a tuple
           whose <c><anno>N</anno></c>th element compares equal to <c><anno>Key</anno></c>.
@@ -500,7 +500,7 @@ flatmap(Fun, List1) ->
     <func>
       <name name="nth" arity="2"/>
       <fsummary>Return the Nth element of a list</fsummary>
-      <type_desc variable="N">1..length(List)</type_desc>
+      <type_desc variable="N">1..length(<anno>List</anno>)</type_desc>
       <desc>
         <p>Returns the <c><anno>N</anno></c>th element of <c><anno>List</anno></c>. For example:</p>
         <pre>
@@ -511,7 +511,7 @@ c</pre>
     <func>
       <name name="nthtail" arity="2"/>
       <fsummary>Return the Nth tail of a list</fsummary>
-      <type_desc variable="N">0..length(List)</type_desc>
+      <type_desc variable="N">0..length(<anno>List</anno>)</type_desc>
       <desc>
         <p>Returns the <c><anno>N</anno></c>th tail of <c><anno>List</anno></c>, that is, the sublist of
           <c><anno>List</anno></c> starting at <c><anno>N</anno>+1</c> and continuing up to
@@ -630,7 +630,7 @@ length(lists:seq(From, To, Incr)) == (To-From+Incr) div Incr</code>
     <func>
       <name name="split" arity="2"/>
       <fsummary>Split a list into two lists</fsummary>
-      <type_desc variable="N">0..length(List1)</type_desc>
+      <type_desc variable="N">0..length(<anno>List1</anno>)</type_desc>
       <desc>
         <p>Splits <c><anno>List1</anno></c> into <c><anno>List2</anno></c> and <c><anno>List3</anno></c>.
           <c><anno>List2</anno></c> contains the first <c><anno>N</anno></c> elements and
@@ -670,7 +670,7 @@ splitwith(Pred, List) ->
     <func>
       <name name="sublist" arity="3"/>
       <fsummary>Return a sub-list starting at a given position and with a given number of elements</fsummary>
-      <type_desc variable="Start">1..(length(List1)+1)</type_desc>
+      <type_desc variable="Start">1..(length(<anno>List1</anno>)+1)</type_desc>
       <desc>
         <p>Returns the sub-list of <c><anno>List1</anno></c> starting at <c><anno>Start</anno></c>
           and with (max) <c><anno>Len</anno></c> elements. It is not an error for
@@ -732,7 +732,7 @@ splitwith(Pred, List) ->
     <func>
       <name name="ukeymerge" arity="3"/>
       <fsummary>Merge two key-sorted lists of tuples, removing duplicates</fsummary>
-      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
         <p>Returns the sorted list formed by merging <c><anno>TupleList1</anno></c>
           and <c><anno>TupleList2</anno></c>. The merge is performed on the
@@ -746,7 +746,7 @@ splitwith(Pred, List) ->
     <func>
       <name name="ukeysort" arity="2"/>
       <fsummary>Sort a list of tuples, removing duplicates</fsummary>
-      <type_desc variable="N">1..tuple_size(Tuple)</type_desc>
+      <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
         <p>Returns a list containing the sorted elements of the list
           <c><anno>TupleList1</anno></c> where all but the first tuple of the
diff --git a/lib/stdlib/doc/src/make.dep b/lib/stdlib/doc/src/make.dep
deleted file mode 100644
index 48ee6209ef..0000000000
--- a/lib/stdlib/doc/src/make.dep
+++ /dev/null
@@ -1,40 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: array.tex base64.tex beam_lib.tex book.tex \
-		c.tex calendar.tex dets.tex dict.tex digraph.tex \
-		digraph_utils.tex epp.tex erl_eval.tex erl_expand_records.tex \
-		erl_id_trans.tex erl_internal.tex erl_lint.tex \
-		erl_parse.tex erl_pp.tex erl_scan.tex erl_tar.tex \
-		ets.tex file_sorter.tex filelib.tex filename.tex \
-		gb_sets.tex gb_trees.tex gen_event.tex gen_fsm.tex \
-		gen_server.tex io.tex io_lib.tex io_protocol.tex \
-		lib.tex lists.tex log_mf_h.tex math.tex ms_transform.tex \
-		orddict.tex ordsets.tex part.tex pg.tex pool.tex \
-		proc_lib.tex proplists.tex qlc.tex queue.tex \
-		random.tex re.tex ref_man.tex regexp.tex sets.tex \
-		shell.tex shell_default.tex slave.tex sofs.tex \
-		stdlib_app.tex string.tex supervisor.tex supervisor_bridge.tex \
-		sys.tex timer.tex unicode.tex unicode_usage.tex \
-		win32reg.tex zip.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: ushell1.ps
-
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 60c0b91212..d9c220b996 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -30,6 +30,168 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 1.17.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    erl_tar:extract failed when executed inside a directory
+	    with some parent directory to which the user has no read
+	    access. This has been corrected.</p>
+          <p>
+	    Own Id: OTP-9368</p>
+        </item>
+        <item>
+	    <p> A bug in <c>erl_scan:set_attribute/3</c> has been
+	    fixed. </p>
+          <p>
+	    Own Id: OTP-9412</p>
+        </item>
+        <item>
+	    <p> The contract of <c>io_lib:fread()</c> has been
+	    corrected. </p>
+          <p>
+	    Own Id: OTP-9413 Aux Id: seq11873 </p>
+        </item>
+        <item>
+          <p>
+	    A crash in io_lib:fread/2 when end of input data was
+	    encountered while trying to match literal characters,
+	    which should return {more,_,_,_} but instead crashed, has
+	    been corrected. Reported by Klas Johansson.</p>
+          <p>
+	    A similar peculiarity for io:fread when encountering end
+	    of file before any field data has also been corrected.</p>
+          <p>
+	    Own Id: OTP-9439</p>
+        </item>
+        <item>
+	    <p> The contract of <c>timer:now_diff()</c> has been
+	    corrected. (Thanks to Alex Morarash). </p>
+          <p>
+	    Own Id: OTP-9450</p>
+        </item>
+        <item>
+          <p>
+	    Fix minor typo in gen_fsm documentation (Thanks to Haitao
+	    Li)</p>
+          <p>
+	    Own Id: OTP-9456</p>
+        </item>
+        <item>
+	    <p>The contracts of <c>zip:zip_list_dir/1</c> and
+	    <c>zip:zip_get/2</c> have been corrected. </p>
+          <p>
+	    Own Id: OTP-9471 Aux Id: seq11887, OTP-9472 </p>
+        </item>
+        <item>
+	    <p> A bug in <c>zip:zip_open()</c> has been fixed. </p>
+          <p>
+	    Own Id: OTP-9472 Aux Id: seq11887, OTP-9471 </p>
+        </item>
+        <item>
+          <p>
+	    Fix trivial documentation errors(Thanks to Matthias Lang)</p>
+          <p>
+	    Own Id: OTP-9498</p>
+        </item>
+        <item>
+          <p>
+	    Add a proplist() type</p>
+          <p>
+	    Recently I was adding specs to an API and found that
+	    there is no canonical proplist() type defined. (Thanks to
+	    Ryan Zezeski)</p>
+          <p>
+	    Own Id: OTP-9499</p>
+        </item>
+        <item>
+          <p>
+	    fix supervisors restarting temporary children</p>
+          <p>
+	    In the current implementation of supervisors, temporary
+	    children should never be restarted. However, when a
+	    temporary child is restarted as part of a one_for_all or
+	    rest_for_one strategy where the failing process is not
+	    the temporary child, the supervisor still tries to
+	    restart it.</p>
+          <p>
+	    Because the supervisor doesn't keep some of the MFA
+	    information of temporary children, this causes the
+	    supervisor to hit its restart limit and crash.</p>
+          <p>
+	    This patch fixes the behaviour by inserting a clause in
+	    terminate_children/2-3 (private function) that will omit
+	    temporary children when building a list of killed
+	    processes, to avoid having the supervisor trying to
+	    restart them again.</p>
+          <p>
+	    Only supervisors in need of restarting children used the
+	    list, so the change should be of no impact for the
+	    functions that called terminate_children/2-3 only to kill
+	    all children.</p>
+          <p>
+	    The documentation has been modified to make this
+	    behaviour more explicit. (Thanks to Fred Hebert)</p>
+          <p>
+	    Own Id: OTP-9502</p>
+        </item>
+        <item>
+          <p>
+	    fix broken edoc annotations (Thanks to Richard Carlsson)</p>
+          <p>
+	    Own Id: OTP-9516</p>
+        </item>
+        <item>
+	    <p> XML files have been corrected. </p>
+          <p>
+	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
+        </item>
+        <item>
+          <p>
+	    Handle rare race in the crypto key server functionality</p>
+          <p>
+	    Own Id: OTP-9586</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Types and specifications have been added. </p>
+          <p>
+	    Own Id: OTP-9356</p>
+        </item>
+        <item>
+	    <p> The contracts of the <c>queue</c> module have been
+	    modified. </p>
+          <p>
+	    Own Id: OTP-9418</p>
+        </item>
+        <item>
+	    <p> Contracts in STDLIB and Kernel have been improved and
+	    type errors have been corrected. </p>
+          <p>
+	    Own Id: OTP-9485</p>
+        </item>
+        <item>
+          <p>
+	    Types for several BIFs have been extended/corrected. Also
+	    the types for types for <c>lists:keyfind/3</c>,
+	    <c>lists:keysearch/3</c>, and <c>lists:keyemember/3</c>
+	    have been corrected. The incorrect/incomplete types could
+	    cause false dialyzer warnings.</p>
+          <p>
+	    Own Id: OTP-9496</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 1.17.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -2632,7 +2794,7 @@
             that is, also when starting a gen_server, gen_fsm etc. </p>
           <p>This limitation has now been properly documented and the
             behavior of the <c>gen_fsm</c>, <c>gen_server</c>, and
-            <c>proc_lib</c><c>start</c> and <c>start_link</c>
+            <c>proc_lib</c> <c>start</c> and <c>start_link</c>
             functions when providing this option has been changed
             from hanging indefinitely to failing with reason
             <c>badarg</c>.</p>
@@ -2749,7 +2911,6 @@
             <c>join</c> option that can be used to force QLC to use a
             particular kind of join in some QLC expression.</p>
           <p>Several other changes have also been included:</p>
-          <p></p>
           <list type="bulleted">
             <item>
               <p>The new <c>tmpdir</c> option of <c>cursor/2</c>,
diff --git a/lib/stdlib/doc/src/qlc.xml b/lib/stdlib/doc/src/qlc.xml
index 6a45ade447..ce50631ca9 100644
--- a/lib/stdlib/doc/src/qlc.xml
+++ b/lib/stdlib/doc/src/qlc.xml
@@ -688,7 +688,6 @@ ets:match_spec_run(ets:lookup(86033, {2,2}),
     </datatype>
     <datatype>
       <name name="tmp_file_usage"></name>
-      <desc><p></p></desc>
     </datatype>
   </datatypes>
 
diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml
index 93affc3191..1b8fa44883 100644
--- a/lib/stdlib/doc/src/random.xml
+++ b/lib/stdlib/doc/src/random.xml
@@ -136,6 +136,11 @@
       <c>random_seed</c> to remember the current seed.</p>
     <p>If a process calls <c>uniform/0</c> or <c>uniform/1</c> without
       setting a seed first, <c>seed/0</c> is called automatically.</p>
+    <p>The implementation changed in R15. Upgrading to R15 will break
+      applications that expect a specific output for a given seed. The output
+      is still deterministic number series, but different compared to releases
+      older than R15. The seed <c>{0,0,0}</c> will for example no longer
+      produce a flawed series of only zeros.</p>
   </section>
 </erlref>
 
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index 009aa60faa..30514dfee9 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -59,7 +59,6 @@
       processes are started in order from left to right according to
       this list. When the supervisor terminates, it first terminates
       its child processes in reversed start order, from right to left.</p>
-    <p></p>
     <p>A supervisor can have one of the following <em>restart strategies</em>:</p>
     <list type="bulleted">
       <item>
@@ -94,6 +93,10 @@
           instead the child specification identifier is used,
           <c>terminate_child/2</c> will return
           <c>{error,simple_one_for_one}</c>.</p>
+        <p>Because a <c>simple_one_for_one</c> supervisor could have many
+        children, it shuts them all down at same time. So, order in which they
+        are stopped is not defined. For the same reason, it could have an
+        overhead with regards to the <c>Shutdown</c> strategy.</p>
       </item>
     </list>
     <p>To prevent a supervisor from getting into an infinite loop of
@@ -150,9 +153,12 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
         <p><c>Restart</c> defines when a terminated child process
           should be restarted. A <c>permanent</c> child process should
           always be restarted, a <c>temporary</c> child process should
-          never be restarted and a <c>transient</c> child process
-          should be restarted only if it terminates abnormally, i.e.
-          with another exit reason than <c>normal</c>.</p>
+          never be restarted (even when the supervisor's restart strategy
+          is <c>rest_for_one</c> or <c>one_for_all</c> and a sibling's
+          death causes the temporary process to be terminated) and a
+          <c>transient</c> child process should be restarted only if
+          it terminates abnormally, i.e. with another exit reason
+          than <c>normal</c>.</p>
       </item>
       <item>
         <p><c>Shutdown</c> defines how a child process should be
@@ -167,7 +173,15 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           <c>exit(Child,kill)</c>.</p>
         <p>If the child process is another supervisor, <c>Shutdown</c>
           should be set to <c>infinity</c> to give the subtree ample
-          time to shutdown.</p>
+          time to shutdown. It is also allowed to set it to <c>infinity</c>,
+          if the child process is a worker.</p>
+        <warning>
+          <p>Be careful by setting the <c>Shutdown</c> strategy to
+          <c>infinity</c> when the child process is a worker. Because, in this
+          situation, the termination of the supervision tree depends on the
+          child process, it must be implemented in a safe way and its cleanup
+          procedure must always return.</p>
+        </warning>
         <p><em>Important note on simple-one-for-one supervisors:</em>
           The dynamically created child processes of a
           simple-one-for-one supervisor are not explicitly killed,
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index b741ab7db1..0c1e398dc4 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -84,7 +84,7 @@
       <name name="send_after" arity="3"/>
       <fsummary>Send <c>Message</c>to <c>Pid</c>after a specified <c>Time</c>.</fsummary>
       <desc>
-        <p></p>
+        <p>
         <taglist>
           <tag><c>send_after/3</c></tag>
           <item>
@@ -98,6 +98,7 @@
             <p>Same as <c>send_after(<anno>Time</anno>, self(), <anno>Message</anno>)</c>.</p>
           </item>
         </taglist>
+        </p>
       </desc>
     </func>
     <func>
@@ -107,7 +108,7 @@
       <name name="exit_after" arity="3"/>
       <fsummary>Send an exit signal with <c>Reason</c>after a specified <c>Time</c>.</fsummary>
       <desc>
-        <p></p>
+        <p>
         <taglist>
           <tag><c>exit_after/3</c></tag>
           <item>
@@ -128,6 +129,7 @@
             <p>Same as <c>exit_after(<anno>Time</anno>, self(), kill)</c>.     </p>
           </item>
         </taglist>
+        </p>
       </desc>
     </func>
     <func>
@@ -144,7 +146,7 @@
       <name name="send_interval" arity="3"/>
       <fsummary>Send <c>Message</c>repeatedly at intervals of <c>Time</c>.</fsummary>
       <desc>
-        <p></p>
+        <p>
         <taglist>
           <tag><c>send_interval/3</c></tag>
           <item>
@@ -158,6 +160,7 @@
             <p>Same as <c>send_interval(<anno>Time</anno>, self(), <anno>Message</anno>)</c>.</p>
           </item>
         </taglist>
+        </p>
       </desc>
     </func>
     <func>
@@ -188,7 +191,7 @@
       Function, Arguments)</c> or <c>apply(Fun, Arguments)</c></fsummary>
       <type_desc variable="Time">In microseconds</type_desc>
       <desc>
-        <p></p>
+        <p>
         <taglist>
           <tag><c>tc/3</c></tag>
           <item>
@@ -209,6 +212,7 @@
           </item>
 
         </taglist>
+        </p>
       </desc>
     </func>
     <func>
@@ -254,7 +258,6 @@
   <section>
     <title>Examples</title>
     <p>This example illustrates  how to print out "Hello World!" in 5 seconds:</p>
-    <p></p>
     <pre>
       1> <input>timer:apply_after(5000, io, format, ["~nHello World!~n", []]).</input>
       {ok,TRef}
diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml
index d02763f75c..1001ebbae4 100644
--- a/lib/stdlib/doc/src/unicode.xml
+++ b/lib/stdlib/doc/src/unicode.xml
@@ -203,8 +203,7 @@
 	     <item>greater than <c>16#10FFFF</c>
 	     (the maximum unicode character),</item>
 	     <item>in the range <c>16#D800</c> to <c>16#DFFF</c>
-	     (invalid unicode range)</item>
-	     <item>or equal to 16#FFFE or 16#FFFF (non characters)</item>
+	       (invalid range reserved for UTF-16 surrogate pairs)</item>
 	   </list>
 	   is found.
 	   </item>
diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index 416df1f02c..0fa7de0a5c 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1999</year>
-      <year>2010</year>
+      <year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -52,7 +52,7 @@
 <tag>UCS-4</tag>
 <item>Basically the same as UTF-32, but without some Unicode semantics, defined by IEEE and has little use as a separate encoding standard. For all normal (and possibly abnormal) usages, UTF-32 and UCS-4 are interchangeable.</item>
 </taglist>
-<p>Certain ranges of characters are left unused and certain ranges are even deemed invalid. The most notable invalid range is 16#D800 - 16#DFFF, as the UTF-16 encoding does not allow for encoding of these numbers. It can be speculated that the UTF-16 encoding standard was, from the beginning, expected to be able to hold all Unicode characters in one 16-bit entity, but then had to be extended, leaving a whole in the Unicode range to cope with backward compatibility.</p>
+<p>Certain ranges of characters are left unused and certain ranges are even deemed invalid. The most notable invalid range is 16#D800 - 16#DFFF, as the UTF-16 encoding does not allow for encoding of these numbers. It can be speculated that the UTF-16 encoding standard was, from the beginning, expected to be able to hold all Unicode characters in one 16-bit entity, but then had to be extended, leaving a hole in the Unicode range to cope with backward compatibility.</p>
 <p>Additionally, the codepoint 16#FEFF is used for byte order marks (BOM's) and use of that character is not encouraged in other contexts than that. It actually is valid though, as the character "ZWNBS" (Zero Width Non Breaking Space). BOM's are used to identify encodings and byte order for programs where such parameters are not known in advance. Byte order marks are more seldom used than one could expect, put their use is becoming more widely spread as they provide the means for programs to make educated guesses about the Unicode format of a certain file.</p>
 </section>
 <section>
diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml
index b03fc7f4e2..cf0d581352 100644
--- a/lib/stdlib/doc/src/zip.xml
+++ b/lib/stdlib/doc/src/zip.xml
@@ -243,12 +243,10 @@
       <name name="extract" arity="2"/>
       <fsummary>Extract files from a zip archive</fsummary>
       <desc>
-        <p>The           <marker id="unzip_1"></marker>
-<c>unzip/1</c> function extracts
-          all files from a zip archive. The
-                    <marker id="unzip_2"></marker>
-<c>unzip/2</c> function provides options
-          to extract some files, and more.</p>
+        <p>The <marker id="unzip_1"></marker><c>unzip/1</c> function extracts
+          all files from a zip archive.
+          The <marker id="unzip_2"></marker><c>unzip/2</c> function provides
+           options to extract some files, and more.</p>
         <p>If the <c><anno>Archive</anno></c> argument is given as a binary,
           the contents of the binary is assumed to be a zip archive,
           otherwise it should be a filename.</p>
@@ -413,8 +411,8 @@
       <name name="zip_open" arity="2"/>
       <fsummary>Open an archive and return a handle to it</fsummary>
       <desc>
-        <p>The           <marker id="zip_open"></marker>
-<c>zip_open</c> function opens a
+        <p>The <marker id="zip_open"></marker><c>zip_open</c> function
+          opens a
           zip archive, and reads and saves its directory. This
           means that subsequently reading files from the archive will be
           faster than unzipping files one at a time with <c>unzip</c>.</p>
@@ -436,8 +434,7 @@
       <name name="zip_get" arity="2"/>
       <fsummary>Extract files from an open archive</fsummary>
       <desc>
-        <p>The           <marker id="zip_get"></marker>
-<c>zip_get</c> function extracts
+        <p>The <marker id="zip_get"></marker><c>zip_get</c> function extracts
           one or all files from an open archive.</p>
         <p>The files will be unzipped to memory or to file, depending on
           the options given to the <c>zip_open</c> function when the
@@ -448,9 +445,8 @@
       <name name="zip_close" arity="1"/>
       <fsummary>Close an open archive</fsummary>
       <desc>
-        <p>The           <marker id="zip_close"></marker>
-<c>zip_close/1</c> function closes
-          a zip archive, previously opened with <c>zip_open</c>. All
+        <p>The <marker id="zip_close"></marker><c>zip_close/1</c> function
+          closes a zip archive, previously opened with <c>zip_open</c>. All
           resources are closed, and the handle should not be used after
           closing.</p>
       </desc>
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index d9c645d787..e9a5e6831e 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -224,7 +224,7 @@ version(File) ->
       MD5 :: binary().
 
 md5(File) ->
-    case catch read_significant_chunks(File) of
+    case catch read_significant_chunks(File, md5_chunks()) of
 	{ok, {Module, Chunks0}} ->
 	    Chunks = filter_funtab(Chunks0),
 	    {ok, {Module, erlang:md5([C || {_Id, C} <- Chunks])}};
@@ -395,7 +395,7 @@ strip_fils(Files) ->
 
 %% -> {ok, {Mod, FileName}} | {ok, {Mod, binary()}} | throw(Error)
 strip_file(File) ->
-    {ok, {Mod, Chunks}} = read_significant_chunks(File),
+    {ok, {Mod, Chunks}} = read_significant_chunks(File, significant_chunks()),
     {ok, Stripped0} = build_module(Chunks),
     Stripped = compress(Stripped0),
     case File of
@@ -453,8 +453,8 @@ is_useless_chunk("CInf") -> true;
 is_useless_chunk(_) -> false.
 
 %% -> {ok, {Module, Chunks}} | throw(Error)
-read_significant_chunks(File) ->
-    case read_chunk_data(File, significant_chunks(), [allow_missing_chunks]) of
+read_significant_chunks(File, ChunkList) ->
+    case read_chunk_data(File, ChunkList, [allow_missing_chunks]) of
 	{ok, {Module, Chunks0}} ->
 	    Mandatory = mandatory_chunks(),
 	    Chunks = filter_significant_chunks(Chunks0, Mandatory, File, Module),
@@ -835,12 +835,15 @@ file_error(FileName, {error, Reason}) ->
 error(Reason) ->
     throw({error, ?MODULE, Reason}).
 
-
-%% The following chunks are significant when calculating the MD5 for a module,
-%% and also the modules that must be retained when stripping a file.
-%% They are listed in the order that they should be MD5:ed.
+%% The following chunks must be kept when stripping a BEAM file.
 
 significant_chunks() ->
+    ["Line" | md5_chunks()].
+
+%% The following chunks are significant when calculating the MD5
+%% for a module. They are listed in the order that they should be MD5:ed.
+
+md5_chunks() ->
     ["Atom", "Code", "StrT", "ImpT", "ExpT", "FunT", "LitT"].
 
 %% The following chunks are mandatory in every Beam file.
@@ -893,13 +896,17 @@ call_crypto_server(Req) ->
 	gen_server:call(?CRYPTO_KEY_SERVER, Req, infinity)
     catch
 	exit:{noproc,_} ->
-	    start_crypto_server(),
-	    erlang:yield(),
-	    call_crypto_server(Req)
+	    %% Not started.
+	    call_crypto_server_1(Req);
+	exit:{normal,_} ->
+	    %% The process finished just as we called it.
+	    call_crypto_server_1(Req)
     end.
 
-start_crypto_server() ->
-    gen_server:start({local,?CRYPTO_KEY_SERVER}, ?MODULE, [], []).
+call_crypto_server_1(Req) ->
+    gen_server:start({local,?CRYPTO_KEY_SERVER}, ?MODULE, [], []),
+    erlang:yield(),
+    call_crypto_server(Req).
 
 -spec init([]) -> {'ok', #state{}}.
 
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index febfdd6285..a920921a5e 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -797,7 +797,7 @@ appcall(App, M, F, Args) ->
     catch
 	error:undef ->
 	    case erlang:get_stacktrace() of
-		[{M,F,Args}|_] ->
+		[{M,F,Args,_}|_] ->
 		    Arity = length(Args),
 		    io:format("Call to ~w:~w/~w in application ~w failed.\n",
 			      [M,F,Arity,App]);
diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index 671b5a9dd4..c0f9ce34b0 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -411,7 +411,8 @@ init_table(Tab, InitFun) ->
       InitFun :: fun((Arg) -> Res),
       Arg :: read | close,
       Res :: end_of_input | {[object()], InitFun} | {Data, InitFun} | term(),
-      Options :: [{min_no_slots,no_slots()} | {format,term | bchunk}],
+      Options :: Option | [Option],
+      Option :: {min_no_slots,no_slots()} | {format,term | bchunk},
       Reason :: term(),
       Data :: binary() | tuple().
 
@@ -871,11 +872,15 @@ to_ets(DTab, ETab) ->
 -spec traverse(Name, Fun) -> Return | {'error', Reason} when
       Name :: tab_name(),
       Fun :: fun((Object) -> FunReturn),
-      FunReturn :: 'continue' | {'continue', Val} | {'done', Value},
+      Object :: object(),
+      FunReturn :: 'continue'
+                 | {'continue', Val}
+                 | {'done', Value}
+                 | OtherValue,
+      Return :: [term()] | OtherValue,
       Val :: term(),
       Value :: term(),
-      Object :: object(),
-      Return :: [term()],
+      OtherValue :: term(),
       Reason :: term().
 
 traverse(Tab, Fun) ->
@@ -1749,17 +1754,6 @@ system_code_change(State, _Module, _OldVsn, _Extra) ->
 %%% Internal functions
 %%%----------------------------------------------------------------------
 
-constants(FH, FileName) ->
-    Version = FH#fileheader.version,
-    if 
-        Version =< 8 ->
-            dets_v8:constants();
-        Version =:= 9 ->
-            dets_v9:constants();
-        true ->
-            throw({error, {not_a_dets_file, FileName}})
-    end.
-
 %% -> {ok, Fd, fileheader()} | throw(Error)
 read_file_header(FileName, Access, RamFile) ->
     BF = if
@@ -1837,7 +1831,11 @@ do_bchunk_init(Head, Tab) ->
 		    {H2, {error, old_version}};
 		Parms ->
                     L = dets_utils:all_allocated(H2),
-                    C0 = #dets_cont{no_objs = default, bin = <<>>, alloc = L},
+                    Bin = if
+                              L =:= <<>> -> eof;
+                              true -> <<>>
+                          end,
+                    C0 = #dets_cont{no_objs = default, bin = Bin, alloc = L},
 		    BinParms = term_to_binary(Parms),
 		    {H2, {C0#dets_cont{tab = Tab, proc = self(),what = bchunk},
                           [BinParms]}}
@@ -2470,10 +2468,23 @@ fopen2(Fname, Tab) ->
 	    %% Fd is not always closed upon error, but exit is soon called.
 	    {ok, Fd, FH} = read_file_header(Fname, Acc, Ram),
             Mod = FH#fileheader.mod,
-	    case Mod:check_file_header(FH, Fd) of
-		{error, not_closed} ->
-		    io:format(user,"dets: file ~p not properly closed, "
-			      "repairing ...~n", [Fname]),
+            Do = case Mod:check_file_header(FH, Fd) of
+                     {ok, Head1, ExtraInfo} ->
+                         Head2 = Head1#head{filename = Fname},
+                         try {ok, Mod:init_freelist(Head2, ExtraInfo)}
+                         catch
+                             throw:_ ->
+                                 {repair, " has bad free lists, repairing ..."}
+                         end;
+                     {error, not_closed} ->
+                         M = " not properly closed, repairing ...",
+                         {repair, M};
+                     Else ->
+                         Else
+                 end,
+            case Do of
+		{repair, Mess} ->
+                    io:format(user, "dets: file ~p~s~n", [Fname, Mess]),
                     Version = default,
                     case fsck(Fd, Tab, Fname, FH, default, default, Version) of
                         ok ->
@@ -2481,9 +2492,9 @@ fopen2(Fname, Tab) ->
                         Error ->
                             throw(Error)
                     end;
-		{ok, Head, ExtraInfo} ->
+		{ok, Head} ->
 		    open_final(Head, Fname, Acc, Ram, ?DEFAULT_CACHE, 
-			       Tab, ExtraInfo, false);
+			       Tab, false);
 		{error, Reason} ->
 		    throw({error, {Reason, Fname}})
 	    end;
@@ -2515,12 +2526,13 @@ fopen_existing_file(Tab, OpenArgs) ->
     V9 = (Version =:= 9) or (Version =:= default),
     MinF = (MinSlots =:= default) or (MinSlots =:= FH#fileheader.min_no_slots),
     MaxF = (MaxSlots =:= default) or (MaxSlots =:= FH#fileheader.max_no_slots),
-    Do = case (FH#fileheader.mod):check_file_header(FH, Fd) of
+    Mod = (FH#fileheader.mod),
+    Wh = case Mod:check_file_header(FH, Fd) of
 	     {ok, Head, true} when Rep =:= force, Acc =:= read_write,
 				   FH#fileheader.version =:= 9,
 				   FH#fileheader.no_colls =/= undefined,
 				   MinF, MaxF, V9 ->
-		 {compact, Head};
+		 {compact, Head, true};
              {ok, _Head, _Extra} when Rep =:= force, Acc =:= read ->
                  throw({error, {access_mode, Fname}});
 	     {ok, Head, need_compacting} when Acc =:= read ->
@@ -2550,6 +2562,17 @@ fopen_existing_file(Tab, OpenArgs) ->
 	     {error, Reason} ->
 		 throw({error, {Reason, Fname}})
 	 end,
+    Do = case Wh of
+             {Tag, Hd, Extra} when Tag =:= final; Tag =:= compact ->
+                 Hd1 = Hd#head{filename = Fname},
+                 try {Tag, Mod:init_freelist(Hd1, Extra)}
+                 catch
+                     throw:_ ->
+                         {repair, " has bad free lists, repairing ..."}
+                 end;
+             Else ->
+                 Else
+         end,
     case Do of
 	_ when FH#fileheader.type =/= Type ->
 	    throw({error, {type_mismatch, Fname}});
@@ -2558,8 +2581,7 @@ fopen_existing_file(Tab, OpenArgs) ->
 	{compact, SourceHead} ->
 	    io:format(user, "dets: file ~p is now compacted ...~n", [Fname]),
 	    {ok, NewSourceHead} = open_final(SourceHead, Fname, read, false,
-					     ?DEFAULT_CACHE, Tab, true,
-                                             Debug),
+					     ?DEFAULT_CACHE, Tab, Debug),
 	    case catch compact(NewSourceHead) of
 		ok ->
 		    erlang:garbage_collect(),
@@ -2579,9 +2601,9 @@ fopen_existing_file(Tab, OpenArgs) ->
 		      Version, OpenArgs);
 	_ when FH#fileheader.version =/= Version, Version =/= default ->
 	    throw({error, {version_mismatch, Fname}});
-	{final, H, EI} ->
+	{final, H} ->
 	    H1 = H#head{auto_save = Auto},
-	    open_final(H1, Fname, Acc, Ram, CacheSz, Tab, EI, Debug)
+	    open_final(H1, Fname, Acc, Ram, CacheSz, Tab, Debug)
     end.
 
 do_repair(Fd, Tab, Fname, FH, MinSlots, MaxSlots, Version, OpenArgs) ->
@@ -2595,19 +2617,16 @@ do_repair(Fd, Tab, Fname, FH, MinSlots, MaxSlots, Version, OpenArgs) ->
     end.
 
 %% -> {ok, head()} | throw(Error)
-open_final(Head, Fname, Acc, Ram, CacheSz, Tab, ExtraInfo, Debug) ->
+open_final(Head, Fname, Acc, Ram, CacheSz, Tab, Debug) ->
     Head1 = Head#head{access = Acc,
 		      ram_file = Ram,
 		      filename = Fname,
 		      name = Tab,
 		      cache = dets_utils:new_cache(CacheSz)},
     init_disk_map(Head1#head.version, Tab, Debug),
-    Mod = Head#head.mod,
-    Mod:cache_segps(Head1#head.fptr, Fname, Head1#head.next),
-    Ftab = Mod:init_freelist(Head1, ExtraInfo),
+    (Head1#head.mod):cache_segps(Head1#head.fptr, Fname, Head1#head.next),
     check_growth(Head1),
-    NewHead = Head1#head{freelists = Ftab},
-    {ok, NewHead}.
+    {ok, Head1}.
 
 %% -> {ok, head()} | throw(Error)
 fopen_init_file(Tab, OpenArgs) ->
@@ -3134,8 +3153,12 @@ init_scan(Head, NoObjs) ->
     check_safe_fixtable(Head),
     FreeLists = dets_utils:get_freelists(Head),
     Base = Head#head.base,
-    {From, To} = dets_utils:find_next_allocated(FreeLists, Base, Base),
-    #dets_cont{no_objs = NoObjs, bin = <<>>, alloc = {From, To, <<>>}}.
+    case dets_utils:find_next_allocated(FreeLists, Base, Base) of
+        {From, To} ->
+            #dets_cont{no_objs = NoObjs, bin = <<>>, alloc = {From,To,<<>>}};
+        none ->
+            #dets_cont{no_objs = NoObjs, bin = eof, alloc = <<>>}
+    end.
 
 check_safe_fixtable(Head) ->
     case (Head#head.fixed =:= false) andalso 
@@ -3236,18 +3259,20 @@ view(FileName) ->
     case catch read_file_header(FileName, read, false) of
         {ok, Fd, FH} ->
 	    Mod = FH#fileheader.mod,
-	    case Mod:check_file_header(FH, Fd) of
-		{ok, H0, ExtraInfo} ->
-		    Ftab = Mod:init_freelist(H0, ExtraInfo),
-		    {_Bump, Base} = constants(FH, FileName),
-		    H = H0#head{freelists=Ftab, base = Base},
-		    v_free_list(H),
-		    Mod:v_segments(H),
-		    file:close(Fd);
-		X ->
-		    file:close(Fd),
-		    X
-	    end;
+            try Mod:check_file_header(FH, Fd) of
+                {ok, H0, ExtraInfo} ->
+                    Mod = FH#fileheader.mod,
+                    case Mod:check_file_header(FH, Fd) of
+                        {ok, H0, ExtraInfo} ->
+                            H = Mod:init_freelist(H0, ExtraInfo),
+                            v_free_list(H),
+                            Mod:v_segments(H),
+                            ok;
+                        X ->
+                            X
+                    end
+            after file:close(Fd)
+            end;
 	X -> 
 	    X
     end.
diff --git a/lib/stdlib/src/dets.hrl b/lib/stdlib/src/dets.hrl
index fbffc9d008..a3f99357a2 100644
--- a/lib/stdlib/src/dets.hrl
+++ b/lib/stdlib/src/dets.hrl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -92,6 +92,7 @@
 %% Info extracted from the file header.
 -record(fileheader, {
 	  freelist,
+          fl_base,
 	  cookie,
 	  closed_properly,
 	  type,
diff --git a/lib/stdlib/src/dets_v8.erl b/lib/stdlib/src/dets_v8.erl
index af36958c1c..3e962a1c8b 100644
--- a/lib/stdlib/src/dets_v8.erl
+++ b/lib/stdlib/src/dets_v8.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -21,7 +21,7 @@
 %% Dets files, implementation part. This module handles versions up to
 %% and including 8(c). To be called from dets.erl only.
 
--export([constants/0, mark_dirty/1, read_file_header/2,
+-export([mark_dirty/1, read_file_header/2,
          check_file_header/2, do_perform_save/1, initiate_file/11,
          init_freelist/2, fsck_input/4,
          bulk_input/3, output_objs/4, write_cache/1, may_grow/3,
@@ -163,7 +163,7 @@
 %% The 8(c) version uses a different hashing algorithm, erlang:phash
 %% (former versions use erlang:hash).
 %% Version 8(b) files are only converted to version 8(c) if repair is
-%% done, so we need compatability with 8(b) for a _long_ time.
+%% done, so we need compatibility with 8(b) for a _long_ time.
 %%
 %% There are known bugs due to the fact that keys and objects are
 %% sometimes compared (==) and sometimes matched (=:=). The version
@@ -196,10 +196,6 @@
 %%-define(DEBUGF(X,Y), io:format(X, Y)).
 -define(DEBUGF(X,Y), void).
 
-%% {Bump}
-constants() ->
-    {?BUMP, ?BASE}.
-
 %% -> ok | throw({NewHead,Error})
 mark_dirty(Head) ->
     Dirty = [{?CLOSED_PROPERLY_POS, <<?NOT_PROPERLY_CLOSED:32>>}],
@@ -308,8 +304,9 @@ init_freelist(Head, {convert_freelist,_Version}) ->
     Pos = Head#head.freelists_p,
     case catch prterm(Head, Pos, ?OHDSZ) of
 	{0, _Sz, Term}  ->
-	    FreeList = lists:reverse(Term),
-	    dets_utils:init_slots_from_old_file(FreeList, Ftab);
+	    FreeList1 = lists:reverse(Term),
+            FreeList = dets_utils:init_slots_from_old_file(FreeList1, Ftab),
+            Head#head{freelists = FreeList, base = ?BASE};
 	_ ->
 	    throw({error, {bad_freelists, Head#head.filename}})
     end;
@@ -318,7 +315,7 @@ init_freelist(Head, _) ->
     Pos = Head#head.freelists_p,
     case catch prterm(Head, Pos, ?OHDSZ) of
 	{0, _Sz, Term}  ->
-	    Term;
+            Head#head{freelists = Term, base = ?BASE};
 	_ ->
 	    throw({error, {bad_freelists, Head#head.filename}})
     end.
@@ -331,6 +328,7 @@ read_file_header(Fd, FileName) ->
     {ok, EOF} = dets_utils:position_close(Fd, FileName, eof),
     {ok, <<FileSize:32>>} = dets_utils:pread_close(Fd, FileName, EOF-4, 4),
     FH = #fileheader{freelist = Freelist,
+                     fl_base = ?BASE,
 		     cookie = Cookie,
 		     closed_properly = CP,
 		     type = dets_utils:code_to_type(Type2),
@@ -413,7 +411,7 @@ check_file_header(FH, Fd) ->
 	      version = ?FILE_FORMAT_VERSION,
 	      mod = ?MODULE,
 	      bump = ?BUMP,
-	      base = ?BASE},
+	      base = FH#fileheader.fl_base},
 	    {ok, H, ExtraInfo};
 	Error ->
 	    Error
diff --git a/lib/stdlib/src/dets_v9.erl b/lib/stdlib/src/dets_v9.erl
index 132af01f79..f577b4410f 100644
--- a/lib/stdlib/src/dets_v9.erl
+++ b/lib/stdlib/src/dets_v9.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -21,7 +21,7 @@
 %% Dets files, implementation part. This module handles version 9.
 %% To be called from dets.erl only.
 
--export([constants/0, mark_dirty/1, read_file_header/2,
+-export([mark_dirty/1, read_file_header/2,
          check_file_header/2, do_perform_save/1, initiate_file/11,
          prep_table_copy/9, init_freelist/2, fsck_input/4,
          bulk_input/3, output_objs/4, bchunk_init/2,
@@ -70,6 +70,17 @@
 %%    16     MD5-sum for the 44 plus 112 bytes before the MD5-sum.
 %%           (FreelistsPointer, Cookie and ClosedProperly are not digested.)
 %%    128    Reserved for future versions. Initially zeros.
+%%           Version 9(d), introduced in R15A, has instead:
+%%    112    28 counters for the buddy system sizes (as for 9(b)).
+%%    16     MD5-sum for the 44 plus 112 bytes before the MD5-sum.
+%%           (FreelistsPointer, Cookie and ClosedProperly are not digested.)
+%%    4      Base of the buddy system.
+%%           0 (zero) if the base is equal to ?BASE. Compatible with R14B.
+%%           File size at the end of the file is RealFileSize - Base.
+%%           The reason for modifying file size is that when a file created
+%%           by R15 is read by R14 a repair takes place immediately, which
+%%           is acceptable when downgrading.
+%%    124    Reserved for future versions. Initially zeros.
 %%  ---
 %%  ------------------ end of file header
 %%    4*256  SegmentArray Pointers.
@@ -86,7 +97,7 @@
 %%  -----------------------------
 %%    ???    Free lists
 %%  -----------------------------
-%%    4      File size, in bytes. 
+%%    4      File size, in bytes. See 9(d) obove.
 
 %%  Before we can find an object we must find the slot where the
 %%  object resides. Each slot is a (possibly empty) list (or chain) of
@@ -177,14 +188,14 @@
 %%% File header
 %%%
 
--define(RESERVED, 128).        % Reserved for future use.
+-define(RESERVED, 124).        % Reserved for future use.
 
 -define(COLL_CNTRS, (28*4)).     % Counters for the buddy system.
 -define(MD5SZ, 16).
+-define(FL_BASE, 4).
 
--define(HEADSZ, 
-        56+?COLL_CNTRS+?MD5SZ). % The size of the file header, in bytes,
-                                % not including the reserved part.
+-define(HEADSZ, 56+?COLL_CNTRS  % The size of the file header, in bytes,
+            +?MD5SZ+?FL_BASE).  % not including the reserved part.
 -define(HEADEND, (?HEADSZ+?RESERVED)). 
                                % End of header and reserved area.
 -define(SEGSZ, 512).           % Size of a segment, in words. SZOBJP*SEGSZP.
@@ -270,10 +281,6 @@
 %%-define(DEBUGF(X,Y), io:format(X, Y)).
 -define(DEBUGF(X,Y), void).
 
-%% {Bump}
-constants() ->
-    {?BUMP, ?BASE}.
-
 %% -> ok | throw({NewHead,Error})
 mark_dirty(Head) ->
     Dirty = [{?CLOSED_PROPERLY_POS, <<?NOT_PROPERLY_CLOSED:32>>}],
@@ -356,7 +363,7 @@ init_file(Fd, Tab, Fname, Type, Kp, MinSlots, MaxSlots, Ram, CacheSz,
       cache = dets_utils:new_cache(CacheSz),
       version = ?FILE_FORMAT_VERSION,
       bump = ?BUMP,
-      base = ?BASE,
+      base = ?BASE, % to be overwritten
       mod = ?MODULE
      },
 
@@ -378,13 +385,20 @@ init_file(Fd, Tab, Fname, Type, Kp, MinSlots, MaxSlots, Ram, CacheSz,
     {Head1, Ws1} = init_parts(Head0, 0, no_parts(Next), Zero, []),
     NoSegs = no_segs(Next),
 
-    {Head, WsI, WsP} = init_segments(Head1, 0, NoSegs, Zero, [], []),
+    {Head2, WsI, WsP} = init_segments(Head1, 0, NoSegs, Zero, [], []),
     Ws2 = if
 	      DoInitSegments -> WsP ++ WsI;
 	      true -> WsP
 	 end,
     dets_utils:pwrite(Fd, Fname, [W0 | lists:append(Ws1) ++ Ws2]),
-    true = hash_invars(Head),
+    true = hash_invars(Head2),
+    %% The allocations that have been made so far (parts, segments)
+    %% are permanent; the table will never shrink. Therefore the base
+    %% of the Buddy system can be set to the first free object.
+    %% This is used in allocate_all(), see below.
+    {_, Where, _} = dets_utils:alloc(Head2, ?BUMP),
+    NewFtab = dets_utils:init_alloc(Where),
+    Head = Head2#head{freelists = NewFtab, base = Where},
     {ok, Head}.
 
 %% Returns a power of two not less than 256.
@@ -451,8 +465,9 @@ read_file_header(Fd, FileName) ->
       Version:32,    M:32,       Next:32,       Kp:32,
       NoObjects:32,  NoKeys:32,  MinNoSlots:32, MaxNoSlots:32,
       HashMethod:32, N:32, NoCollsB:?COLL_CNTRS/binary, 
-      MD5:?MD5SZ/binary>> = Bin,
-    <<_:12/binary,MD5DigestedPart:(?HEADSZ-?MD5SZ-12)/binary,_/binary>> = Bin,
+      MD5:?MD5SZ/binary, FlBase:32>> = Bin,
+    <<_:12/binary,MD5DigestedPart:(?HEADSZ-?MD5SZ-?FL_BASE-12)/binary,
+      _/binary>> = Bin,
     {ok, EOF} = dets_utils:position_close(Fd, FileName, eof),
     {ok, <<FileSize:32>>} = dets_utils:pread_close(Fd, FileName, EOF-4, 4),
     {CL, <<>>} = lists:foldl(fun(LSz, {Acc,<<NN:32,R/binary>>}) -> 
@@ -468,8 +483,12 @@ read_file_header(Fd, FileName) ->
 	    true ->
 		lists:reverse(CL)
 	end,
-			     
+    Base = case FlBase of
+               0 -> ?BASE;
+               _ -> FlBase
+           end,
     FH = #fileheader{freelist = FreeList,
+                     fl_base = Base,
 		     cookie = Cookie,
 		     closed_properly = CP,
 		     type = dets_utils:code_to_type(Type2),
@@ -486,7 +505,7 @@ read_file_header(Fd, FileName) ->
                      read_md5 = MD5,
                      has_md5 = <<0:?MD5SZ/unit:8>> =/= MD5,
                      md5 = erlang:md5(MD5DigestedPart),
-		     trailer = FileSize,
+		     trailer = FileSize + FlBase,
 		     eof = EOF,
 		     n = N,
 		     mod = ?MODULE},
@@ -544,7 +563,7 @@ check_file_header(FH, Fd) ->
 	      version = ?FILE_FORMAT_VERSION,
 	      mod = ?MODULE,
 	      bump = ?BUMP,
-	      base = ?BASE},
+	      base = FH#fileheader.fl_base},
 	    {ok, H, ExtraInfo};
 	Error ->
 	    Error
@@ -1185,41 +1204,25 @@ write_loop(Head, BytesToWrite, Bin) ->
     write_loop(Head, BytesToWrite, SmallBin).
 
 %% By allocating bigger objects before smaller ones, holes in the
-%% buddy system memory map are avoided. Unfortunately, the segments
-%% are always allocated first, so if there are objects bigger than a
-%% segment, there is a hole to handle. (Haven't considered placing the
-%% segments among other objects of the same size.)
+%% buddy system memory map are avoided.
 allocate_all_objects(Head, SizeT) ->
     DTL = lists:reverse(lists:keysort(1, ets:tab2list(SizeT))),
     MaxSz = element(1, hd(DTL)),
-    SegSize = ?ACTUAL_SEG_SIZE,
-    {Head1, HSz, HN, HA} = alloc_hole(MaxSz, Head, SegSize),
-    {Head2, NL} = allocate_all(Head1, DTL, []),
+    {Head1, NL} = allocate_all(Head, DTL, []),
     %% Find the position that will be the end of the file by allocating
     %% a minimal object.
-    {_Head, EndOfFile, _} = dets_utils:alloc(Head2, ?BUMP),
-    Head3 = free_hole(Head2, HSz, HN, HA),
-    NewHead = Head3#head{maxobjsize = max_objsize(Head3#head.no_collections)},
+    {_Head, EndOfFile, _} = dets_utils:alloc(Head1, ?BUMP),
+    NewHead = Head1#head{maxobjsize = max_objsize(Head1#head.no_collections)},
     {NewHead, NL, MaxSz, EndOfFile}.
 
-alloc_hole(LSize, Head, SegSz) when ?POW(LSize-1) > SegSz ->
-    Size = ?POW(LSize-1),
-    {_, SegAddr, _} = dets_utils:alloc(Head, adjsz(SegSz)),
-    {_, Addr, _} = dets_utils:alloc(Head, adjsz(Size)),
-    N = (Addr - SegAddr) div SegSz,
-    Head1 = dets_utils:alloc_many(Head, SegSz, N, SegAddr),
-    {Head1, SegSz, N, SegAddr};
-alloc_hole(_MaxSz, Head, _SegSz) ->
-    {Head, 0, 0, 0}.
-
-free_hole(Head, _Size, 0, _Addr) ->
-    Head;
-free_hole(Head, Size, N, Addr) ->
-    {Head1, _} = dets_utils:free(Head, Addr, adjsz(Size)),
-    free_hole(Head1, Size, N-1, Addr+Size).
-
 %% One (temporary) file for each buddy size, write all objects of that
 %% size to the file.
+%%
+%% Before R15 a "hole" was needed before the first bucket if the size
+%% of the biggest bucket was greater than the size of a segment. The
+%% hole proved to be a problem with almost full tables with huge
+%% buckets. Since R15 the hole is no longer needed due to the fact
+%% that the base of the Buddy system is flexible.
 allocate_all(Head, [{?FSCK_SEGMENT,_,Data,_}], L) ->
     %% And one file for the segments...
     %% Note that space for the array parts and the segments has
@@ -1593,23 +1596,28 @@ do_perform_save(H) ->
     H1 = H#head{freelists_p = FreeListsPointer},
     {FLW, FLSize} = free_lists_to_file(H1),
     FileSize = FreeListsPointer + FLSize + 4,
-    ok = dets_utils:write(H1, [FLW | <<FileSize:32>>]),
+    AdjustedFileSize = case H#head.base of
+                           ?BASE -> FileSize;
+                           Base -> FileSize - Base
+                       end,
+    ok = dets_utils:write(H1, [FLW | <<AdjustedFileSize:32>>]),
     FileHeader = file_header(H1, FreeListsPointer, ?CLOSED_PROPERLY),
     case dets_utils:debug_mode() of
         true -> 
-            TmpHead = H1#head{freelists = init_freelist(H1, true), 
-                              fixed = false},
+            TmpHead0 = init_freelist(H1#head{fixed = false}, true),
+            TmpHead = TmpHead0#head{base = H1#head.base},
             case 
                 catch dets_utils:all_allocated_as_list(TmpHead)
                       =:= dets_utils:all_allocated_as_list(H1)
-                of
+            of
                 true -> 
                     dets_utils:pwrite(H1, [{0, FileHeader}]);
                 _ -> 
+                    throw(
                     dets_utils:corrupt_reason(H1, {failed_to_save_free_lists,
                                                    FreeListsPointer,
                                                    TmpHead#head.freelists,
-                                                   H1#head.freelists})
+                                                   H1#head.freelists}))
             end;
         false ->
             dets_utils:pwrite(H1, [{0, FileHeader}])
@@ -1648,7 +1656,11 @@ file_header(Head, FreeListsPointer, ClosedProperly, NoColls) ->
               true -> erlang:md5(DigH);
               false -> <<0:?MD5SZ/unit:8>>
           end,
-    [H1, DigH, MD5 | <<0:?RESERVED/unit:8>>].
+    Base = case Head#head.base of
+               ?BASE -> <<0:32>>;
+               FlBase -> <<FlBase:32>>
+           end,
+    [H1, DigH, MD5, Base | <<0:?RESERVED/unit:8>>].
 
 %% Going through some trouble to avoid creating one single binary for
 %% the free lists. If the free lists are huge, binary_to_term and
@@ -1695,8 +1707,8 @@ free_lists_from_file(H, Pos) ->
     case catch bin_to_tree([], H, start, FL, -1, []) of
 	{'EXIT', _} ->
 	    throw({error, {bad_freelists, H#head.filename}});
-	Reply ->
-	    Reply
+        Ftab ->
+            H#head{freelists = Ftab, base = ?BASE}
     end.
 
 bin_to_tree(Bin, H, LastPos, Ftab, A0, L) ->
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index d804c1dee5..ccc14610d7 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -267,8 +267,10 @@ init_server(Pid, Name, File, AtLocation, Path, Pdm, Pre) ->
     case user_predef(Pdm, Ms0) of
 	{ok,Ms1} ->
 	    epp_reply(Pid, {ok,self()}),
+            %% ensure directory of current source file is first in path
+            Path1 = [filename:dirname(Name) | Path],
 	    St = #epp{file=File, location=AtLocation, delta=0, name=Name,
-                      name2=Name, path=Path, macs=Ms1, pre_opened = Pre},
+                      name2=Name, path=Path1, macs=Ms1, pre_opened = Pre},
 	    From = wait_request(St),
 	    enter_file_reply(From, Name, AtLocation, AtLocation),
 	    wait_req_scan(St);
@@ -360,18 +362,18 @@ wait_req_skip(St, Sis) ->
     From = wait_request(St),
     skip_toks(From, St, Sis).
 
-%% enter_file(Path, FileName, IncludeToken, From, EppState)
+%% enter_file(FileName, IncludeToken, From, EppState)
 %% leave_file(From, EppState)
 %%  Handle entering and leaving included files. Notify caller when the
 %%  current file is changed. Note it is an error to exit a file if we are
 %%  in a conditional. These functions never return.
 
-enter_file(_Path, _NewName, Inc, From, St)
+enter_file(_NewName, Inc, From, St)
   when length(St#epp.sstk) >= 8 ->
     epp_reply(From, {error,{abs_loc(Inc),epp,{depth,"include"}}}),
     wait_req_scan(St);
-enter_file(Path, NewName, Inc, From, St) ->
-    case file:path_open(Path, NewName, [read]) of
+enter_file(NewName, Inc, From, St) ->
+    case file:path_open(St#epp.path, NewName, [read]) of
 	{ok,NewF,Pname} ->
             Loc = start_loc(St#epp.location),
 	    wait_req_scan(enter_file2(NewF, Pname, From, St, Loc));
@@ -384,13 +386,16 @@ enter_file(Path, NewName, Inc, From, St) ->
 %%  Set epp to use this file and "enter" it.
 
 enter_file2(NewF, Pname, From, St, AtLocation) ->
-    enter_file2(NewF, Pname, From, St, AtLocation, []).
-
-enter_file2(NewF, Pname, From, St, AtLocation, ExtraPath) ->
     Loc = start_loc(AtLocation),
     enter_file_reply(From, Pname, Loc, AtLocation),
     Ms = dict:store({atom,'FILE'}, {none,[{string,Loc,Pname}]}, St#epp.macs),
-    Path = St#epp.path ++ ExtraPath,
+    %% update the head of the include path to be the directory of the new
+    %% source file, so that an included file can always include other files
+    %% relative to its current location (this is also how C does it); note
+    %% that the directory of the parent source file (the previous head of
+    %% the path) must be dropped, otherwise the path used within the current
+    %% file will depend on the order of file inclusions in the parent files
+    Path = [filename:dirname(Pname) | tl(St#epp.path)],
     #epp{file=NewF,location=Loc,name=Pname,delta=0,
          sstk=[St|St#epp.sstk],path=Path,macs=Ms}.
 
@@ -655,7 +660,7 @@ scan_undef(_Toks, Undef, From, St) ->
 scan_include([{'(',_Llp},{string,_Lf,NewName0},{')',_Lrp},{dot,_Ld}], Inc,
 	     From, St) ->
     NewName = expand_var(NewName0),
-    enter_file(St#epp.path, NewName, Inc, From, St);
+    enter_file(NewName, Inc, From, St);
 scan_include(_Toks, Inc, From, St) ->
     epp_reply(From, {error,{abs_loc(Inc),epp,{bad,include}}}),
     wait_req_scan(St).
@@ -684,12 +689,11 @@ scan_include_lib([{'(',_Llp},{string,_Lf,NewName0},{')',_Lrp},{dot,_Ld}],
 	{error,_E1} ->
 	    case catch find_lib_dir(NewName) of
 		{LibDir, Rest} when is_list(LibDir) ->
-		    LibName = filename:join([LibDir | Rest]),
+		    LibName = fname_join([LibDir | Rest]),
 		    case file:open(LibName, [read]) of
 			{ok,NewF} ->
-			    ExtraPath = [filename:dirname(LibName)],
 			    wait_req_scan(enter_file2(NewF, LibName, From,
-                                                      St, Loc, ExtraPath));
+                                                      St, Loc));
 			{error,_E2} ->
 			    epp_reply(From,
 				      {error,{abs_loc(Inc),epp,
@@ -1154,7 +1158,12 @@ expand_var1(NewName) ->
     [[$$ | Var] | Rest] = filename:split(NewName),
     Value = os:getenv(Var),
     true = Value =/= false,
-    {ok, filename:join([Value | Rest])}.
+    {ok, fname_join([Value | Rest])}.
+
+fname_join(["." | [_|_]=Rest]) ->
+    fname_join(Rest);
+fname_join(Components) ->
+    filename:join(Components).
 
 %% The line only. (Other tokens may have the column and text as well...)
 loc_attr(Line) when is_integer(Line) ->
diff --git a/lib/stdlib/src/erl_compile.erl b/lib/stdlib/src/erl_compile.erl
index abff37e4bc..ff032b129c 100644
--- a/lib/stdlib/src/erl_compile.erl
+++ b/lib/stdlib/src/erl_compile.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -41,7 +41,6 @@ compiler(".idl") ->    {ic,              compile};
 compiler(".asn1") ->   {asn1ct,          compile_asn1};
 compiler(".asn") ->    {asn1ct,          compile_asn};
 compiler(".py") ->     {asn1ct,          compile_py};
-compiler(".xml") ->    {xmerl_scan,      process};
 compiler(_) ->         no.
 
 %% Entry from command line.
diff --git a/lib/stdlib/src/erl_eval.erl b/lib/stdlib/src/erl_eval.erl
index 515ea2ebb7..4f4fa16040 100644
--- a/lib/stdlib/src/erl_eval.erl
+++ b/lib/stdlib/src/erl_eval.erl
@@ -621,7 +621,7 @@ eval_generate(Term, _P, _Bs0, _Lf, _Ef, _CompFun, _Acc) ->
     erlang:raise(error, {bad_generator,Term}, stacktrace()).
 
 eval_b_generate(<<_/bitstring>>=Bin, P, Bs0, Lf, Ef, CompFun, Acc) ->
-    Mfun = fun(L, R, Bs) -> match1(L, R, Bs, Bs0) end,
+    Mfun = match_fun(Bs0),
     Efun = fun(Exp, Bs) -> expr(Exp, Bs, Lf, Ef, none) end,
     case eval_bits:bin_gen(P, Bin, new_bindings(), Bs0, Mfun, Efun) of
 	{match, Rest, Bs1} ->
@@ -1024,7 +1024,7 @@ match1({tuple,_,_}, _, _Bs, _BBs) ->
     throw(nomatch);
 match1({bin, _, Fs}, <<_/bitstring>>=B, Bs0, BBs) ->
     eval_bits:match_bits(Fs, B, Bs0, BBs,
-			 fun(L, R, Bs) -> match1(L, R, Bs, BBs) end,
+			 match_fun(BBs),
 			 fun(E, Bs) -> expr(E, Bs, none, none, none) end);
 match1({bin,_,_}, _, _Bs, _BBs) ->
     throw(nomatch);
@@ -1053,6 +1053,12 @@ match1({op,Line,Op,L,R}, Term, Bs, BBs) ->
 match1(_, _, _Bs, _BBs) ->
     throw(invalid).
 
+match_fun(BBs) ->
+    fun(match, {L,R,Bs}) -> match1(L, R, Bs, BBs);
+       (binding, {Name,Bs}) -> binding(Name, Bs);
+       (add_binding, {Name,Val,Bs}) -> add_binding(Name, Val, Bs)
+    end.
+
 match_tuple([E|Es], Tuple, I, Bs0, BBs) ->
     {match,Bs} = match1(E, element(I, Tuple), Bs0, BBs),
     match_tuple(Es, Tuple, I+1, Bs, BBs);
diff --git a/lib/stdlib/src/erl_expand_records.erl b/lib/stdlib/src/erl_expand_records.erl
index eada563914..20fd247cea 100644
--- a/lib/stdlib/src/erl_expand_records.erl
+++ b/lib/stdlib/src/erl_expand_records.erl
@@ -35,7 +35,7 @@
 		 trecords=sets:new(), % Typed records
 		 uses_types=false,    % Are there -spec or -type in the module
                  strict_ra=[],        % strict record accesses
-                 checked_ra=[]        % succesfully accessed records
+                 checked_ra=[]        % successfully accessed records
                 }).
 
 -spec(module(AbsForms, CompileOptions) -> AbsForms when
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index 478f05e792..cd3b531d10 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -262,8 +262,8 @@ bif(bitsize, 1) -> true;
 bif(bit_size, 1) -> true;
 bif(bitstring_to_list, 1) -> true;
 bif(byte_size, 1) -> true;
+bif(check_old_code, 1) -> true;
 bif(check_process_code, 2) -> true;
-bif(concat_binary, 1) -> true;
 bif(date, 0) -> true;
 bif(delete_module, 1) -> true;
 bif(demonitor, 1) -> true;
@@ -405,7 +405,6 @@ old_bif(bit_size, 1) -> true;
 old_bif(bitstring_to_list, 1) -> true;
 old_bif(byte_size, 1) -> true;
 old_bif(check_process_code, 2) -> true;
-old_bif(concat_binary, 1) -> true;
 old_bif(date, 0) -> true;
 old_bif(delete_module, 1) -> true;
 old_bif(disconnect_node, 1) -> true;
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index dd0b9bc2ab..78b996d94b 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -123,6 +123,7 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
                called= [] :: [{fa(),line()}],		%Called functions
                usage = #usage{}		:: #usage{},
 	       specs = dict:new()	:: dict(),	%Type specifications
+	       callbacks = dict:new()   :: dict(),      %Callback types
 	       types = dict:new()	:: dict(),	%Type definitions
 	       exp_types=gb_sets:empty():: gb_set()	%Exported types
               }).
@@ -310,8 +311,6 @@ format_error({conflicting_behaviours,{Name,Arity},B,FirstL,FirstB}) ->
 format_error({undefined_behaviour_func, {Func,Arity}, Behaviour}) ->
     io_lib:format("undefined callback function ~w/~w (behaviour '~w')",
 		  [Func,Arity,Behaviour]);
-format_error({undefined_behaviour_func, {Func,Arity,_Spec}, Behaviour}) ->
-    format_error({undefined_behaviour_func, {Func,Arity}, Behaviour});
 format_error({undefined_behaviour,Behaviour}) ->
     io_lib:format("behaviour ~w undefined", [Behaviour]);
 format_error({undefined_behaviour_callbacks,Behaviour}) ->
@@ -320,6 +319,9 @@ format_error({undefined_behaviour_callbacks,Behaviour}) ->
 format_error({ill_defined_behaviour_callbacks,Behaviour}) ->
     io_lib:format("behaviour ~w callback functions erroneously defined",
 		  [Behaviour]);
+format_error({behaviour_info, {_M,F,A}}) ->
+    io_lib:format("cannot define callback attibute for ~w/~w when "
+                  "behaviour_info is defined",[F,A]);
 %% --- types and specs ---
 format_error({singleton_typevar, Name}) ->
     io_lib:format("type variable ~w is only used once (is unbound)", [Name]);
@@ -348,12 +350,16 @@ format_error({type_syntax, Constr}) ->
     io_lib:format("bad ~w type", [Constr]);
 format_error({redefine_spec, {M, F, A}}) ->
     io_lib:format("spec for ~w:~w/~w already defined", [M, F, A]);
+format_error({redefine_callback, {M, F, A}}) ->
+    io_lib:format("callback ~w:~w/~w already defined", [M, F, A]);
 format_error({spec_fun_undefined, {M, F, A}}) ->
     io_lib:format("spec for undefined function ~w:~w/~w", [M, F, A]);
 format_error({missing_spec, {F,A}}) ->
     io_lib:format("missing specification for function ~w/~w", [F, A]);
 format_error(spec_wrong_arity) ->
     "spec has the wrong arity";
+format_error(callback_wrong_arity) ->
+    "callback has the wrong arity";
 format_error({imported_predefined_type, Name}) ->
     io_lib:format("referring to built-in type ~w as a remote type; "
 		  "please take out the module name", [Name]);
@@ -747,6 +753,8 @@ attribute_state({attribute,L,opaque,{TypeName,TypeDef,Args}}, St) ->
     type_def(opaque, L, TypeName, TypeDef, Args, St);
 attribute_state({attribute,L,spec,{Fun,Types}}, St) ->
     spec_decl(L, Fun, Types, St);
+attribute_state({attribute,L,callback,{Fun,Types}}, St) ->
+    callback_decl(L, Fun, Types, St);
 attribute_state({attribute,L,on_load,Val}, St) ->
     on_load(L, Val, St);
 attribute_state({attribute,_L,_Other,_Val}, St) -> % Ignore others
@@ -840,7 +848,8 @@ post_traversal_check(Forms, St0) ->
     StB = check_unused_types(Forms, StA),
     StC = check_untyped_records(Forms, StB),
     StD = check_on_load(StC),
-    check_unused_records(Forms, StD).
+    StE = check_unused_records(Forms, StD),
+    check_callback_information(StE).
 
 %% check_behaviour(State0) -> State
 %% Check that the behaviour attribute is valid.
@@ -1139,6 +1148,23 @@ check_unused_records(Forms, St0) ->
             St0
     end.
 
+check_callback_information(#lint{callbacks = Callbacks,
+				 defined = Defined} = State) ->
+    case gb_sets:is_member({behaviour_info,1}, Defined) of
+	false -> State;
+	true ->
+	    case dict:size(Callbacks) of
+		0 -> State;
+		_ ->
+		    CallbacksList = dict:to_list(Callbacks),
+		    FoldL =
+			fun({Fa,Line},St) ->
+				add_error(Line, {behaviour_info, Fa}, St)
+			end,
+		    lists:foldl(FoldL, State, CallbacksList)
+	    end
+    end.
+
 %% For storing the import list we use the orddict module.
 %% We know an empty set is [].
 
@@ -2770,6 +2796,20 @@ spec_decl(Line, MFA0, TypeSpecs, St0 = #lint{specs = Specs, module = Mod}) ->
 	false -> check_specs(TypeSpecs, Arity, St1)
     end.
 
+%% callback_decl(Line, Fun, Types, State) -> State.
+
+callback_decl(Line, MFA0, TypeSpecs,
+	      St0 = #lint{callbacks = Callbacks, module = Mod}) ->
+    MFA = case MFA0 of
+	      {F, Arity} -> {Mod, F, Arity};
+	      {_M, _F, Arity} -> MFA0
+	  end,
+    St1 = St0#lint{callbacks = dict:store(MFA, Line, Callbacks)},
+    case dict:is_key(MFA, Callbacks) of
+	true -> add_error(Line, {redefine_callback, MFA}, St1);
+	false -> check_specs(TypeSpecs, Arity, St1)
+    end.
+
 check_specs([FunType|Left], Arity, St0) ->
     {FunType1, CTypes} =
 	case FunType of
@@ -3275,6 +3315,8 @@ modify_line1({attribute,L,record,{Name,Fields}}, Mf) ->
     {attribute,Mf(L),record,{Name,modify_line1(Fields, Mf)}};
 modify_line1({attribute,L,spec,{Fun,Types}}, Mf) ->
     {attribute,Mf(L),spec,{Fun,modify_line1(Types, Mf)}};
+modify_line1({attribute,L,callback,{Fun,Types}}, Mf) ->
+    {attribute,Mf(L),callback,{Fun,modify_line1(Types, Mf)}};
 modify_line1({attribute,L,type,{TypeName,TypeDef,Args}}, Mf) ->
     {attribute,Mf(L),type,{TypeName,modify_line1(TypeDef, Mf),
 			   modify_line1(Args, Mf)}};
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index bd5d65a1e1..709bd83e6f 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -62,7 +62,7 @@ char integer float atom string var
 '==' '/=' '=<' '<' '>=' '>' '=:=' '=/=' '<='
 '<<' '>>'
 '!' '=' '::' '..' '...'
-'spec' % helper
+'spec' 'callback' % helper
 dot.
 
 Expect 2.
@@ -77,6 +77,7 @@ attribute -> '-' atom attr_val               : build_attribute('$2', '$3').
 attribute -> '-' atom typed_attr_val         : build_typed_attribute('$2','$3').
 attribute -> '-' atom '(' typed_attr_val ')' : build_typed_attribute('$2','$4').
 attribute -> '-' 'spec' type_spec            : build_type_spec('$2', '$3').
+attribute -> '-' 'callback' type_spec        : build_type_spec('$2', '$3').
 
 type_spec -> spec_fun type_sigs : {'$1', '$2'}.
 type_spec -> '(' spec_fun type_sigs ')' : {'$2', '$3'}.
@@ -549,6 +550,8 @@ Erlang code.
       ErrorInfo :: error_info().
 parse_form([{'-',L1},{atom,L2,spec}|Tokens]) ->
     parse([{'-',L1},{'spec',L2}|Tokens]);
+parse_form([{'-',L1},{atom,L2,callback}|Tokens]) ->
+    parse([{'-',L1},{'callback',L2}|Tokens]);
 parse_form(Tokens) ->
     parse(Tokens).
 
@@ -603,7 +606,8 @@ build_typed_attribute({atom,La,Attr},_) ->
         _      -> ret_err(La, "bad attribute")
     end.
 
-build_type_spec({spec,La}, {SpecFun, TypeSpecs}) ->
+build_type_spec({Kind,La}, {SpecFun, TypeSpecs})
+  when (Kind =:= spec) or (Kind =:= callback) ->
     NewSpecFun =
 	case SpecFun of
 	    {atom, _, Fun} ->
@@ -617,7 +621,7 @@ build_type_spec({spec,La}, {SpecFun, TypeSpecs}) ->
 		%% Old style spec. Allow this for now.
 		{Mod,Fun,Arity}
 	    end,
-    {attribute,La,spec,{NewSpecFun, TypeSpecs}}.
+    {attribute,La,Kind,{NewSpecFun, TypeSpecs}}.
 
 find_arity_from_specs([Spec|_]) ->
     %% Use the first spec to find the arity. If all are not the same,
diff --git a/lib/stdlib/src/error_logger_tty_h.erl b/lib/stdlib/src/error_logger_tty_h.erl
index 435e57aa0e..fa13fbb2bd 100644
--- a/lib/stdlib/src/error_logger_tty_h.erl
+++ b/lib/stdlib/src/error_logger_tty_h.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -34,10 +34,12 @@
 	 handle_event/2, handle_call/2, handle_info/2,
 	 terminate/2, code_change/3]).
 
+-export([write_event/2]).
+
 %% This one is used when we takeover from the simple error_logger.
 init({[], {error_logger, Buf}}) ->
     User = set_group_leader(),
-    write_events(Buf),
+    write_events(Buf,io),
     {ok, {User, error_logger}};
 %% This one is used if someone took over from us, and now wants to
 %% go back.
@@ -52,7 +54,7 @@ init([]) ->
 handle_event({_Type, GL, _Msg}, State) when node(GL) =/= node() ->
     {ok, State};
 handle_event(Event, State) ->
-    write_event(tag_event(Event)),
+    write_event(tag_event(Event),io),
     {ok, State}.
 
 handle_info({'EXIT', User, _Reason}, {User, PrevHandler}) ->
@@ -64,10 +66,10 @@ handle_info({'EXIT', User, _Reason}, {User, PrevHandler}) ->
 	     PrevHandler, go_back}
     end;
 handle_info({emulator, GL, Chars}, State) when node(GL) == node() ->
-    write_event(tag_event({emulator, GL, Chars})),
+    write_event(tag_event({emulator, GL, Chars}),io),
     {ok, State};
 handle_info({emulator, noproc, Chars}, State) ->
-    write_event(tag_event({emulator, noproc, Chars})),
+    write_event(tag_event({emulator, noproc, Chars}),io),
     {ok, State};
 handle_info(_, State) ->
     {ok, State}.
@@ -97,65 +99,65 @@ set_group_leader() ->
 tag_event(Event) ->    
     {erlang:localtime(), Event}.
 
-write_events(Events) -> write_events1(lists:reverse(Events)).
+write_events(Events,IOMod) -> write_events1(lists:reverse(Events),IOMod).
 
-write_events1([Event|Es]) ->
-    write_event(Event),
-    write_events1(Es);
-write_events1([]) ->
+write_events1([Event|Es],IOMod) ->
+    write_event(Event,IOMod),
+    write_events1(Es,IOMod);
+write_events1([],_IOMod) ->
     ok.
 
-write_event({Time, {error, _GL, {Pid, Format, Args}}}) ->
+write_event({Time, {error, _GL, {Pid, Format, Args}}},IOMod) ->
     T = write_time(maybe_utc(Time)),
     case catch io_lib:format(add_node(Format,Pid), Args) of
 	S when is_list(S) ->
-	    format(T ++ S);
+	    format(IOMod, T ++ S);
 	_ ->
 	    F = add_node("ERROR: ~p - ~p~n", Pid),
-	    format(T ++ F, [Format,Args])
+	    format(IOMod, T ++ F, [Format,Args])
     end;
-write_event({Time, {emulator, _GL, Chars}}) ->
+write_event({Time, {emulator, _GL, Chars}},IOMod) ->
     T = write_time(maybe_utc(Time)),
     case catch io_lib:format(Chars, []) of
 	S when is_list(S) ->
-	    format(T ++ S);
+	    format(IOMod, T ++ S);
 	_ ->
-	    format(T ++ "ERROR: ~p ~n", [Chars])
+	    format(IOMod, T ++ "ERROR: ~p ~n", [Chars])
     end;
-write_event({Time, {info, _GL, {Pid, Info, _}}}) ->
+write_event({Time, {info, _GL, {Pid, Info, _}}},IOMod) ->
     T = write_time(maybe_utc(Time)),
-    format(T ++ add_node("~p~n",Pid),[Info]);
-write_event({Time, {error_report, _GL, {Pid, std_error, Rep}}}) ->
+    format(IOMod, T ++ add_node("~p~n",Pid),[Info]);
+write_event({Time, {error_report, _GL, {Pid, std_error, Rep}}},IOMod) ->
     T = write_time(maybe_utc(Time)),
     S = format_report(Rep),
-    format(T ++ S ++ add_node("", Pid));
-write_event({Time, {info_report, _GL, {Pid, std_info, Rep}}}) ->
+    format(IOMod, T ++ S ++ add_node("", Pid));
+write_event({Time, {info_report, _GL, {Pid, std_info, Rep}}},IOMod) ->
     T = write_time(maybe_utc(Time), "INFO REPORT"),
     S = format_report(Rep),
-    format(T ++ S ++ add_node("", Pid));
-write_event({Time, {info_msg, _GL, {Pid, Format, Args}}}) ->
+    format(IOMod, T ++ S ++ add_node("", Pid));
+write_event({Time, {info_msg, _GL, {Pid, Format, Args}}},IOMod) ->
     T = write_time(maybe_utc(Time), "INFO REPORT"),
     case catch io_lib:format(add_node(Format,Pid), Args) of
 	S when is_list(S) ->
-	    format(T ++ S);
+	    format(IOMod, T ++ S);
 	_ ->
 	    F = add_node("ERROR: ~p - ~p~n", Pid),
-	    format(T ++ F, [Format,Args])
+	    format(IOMod, T ++ F, [Format,Args])
     end;
-write_event({Time, {warning_report, _GL, {Pid, std_warning, Rep}}}) ->
+write_event({Time, {warning_report, _GL, {Pid, std_warning, Rep}}},IOMod) ->
     T = write_time(maybe_utc(Time), "WARNING REPORT"),
     S = format_report(Rep),
-    format(T ++ S ++ add_node("", Pid));
-write_event({Time, {warning_msg, _GL, {Pid, Format, Args}}}) ->
+    format(IOMod, T ++ S ++ add_node("", Pid));
+write_event({Time, {warning_msg, _GL, {Pid, Format, Args}}},IOMod) ->
     T = write_time(maybe_utc(Time), "WARNING REPORT"),
     case catch io_lib:format(add_node(Format,Pid), Args) of
 	S when is_list(S) ->
-	    format(T ++ S);
+	    format(IOMod, T ++ S);
 	_ ->
 	    F = add_node("ERROR: ~p - ~p~n", Pid),
-	    format(T ++ F, [Format,Args])
+	    format(IOMod, T ++ F, [Format,Args])
     end;
-write_event({_Time, _Error}) ->
+write_event({_Time, _Error},_IOMod) ->
     ok.
 
 maybe_utc(Time) ->
@@ -178,8 +180,9 @@ maybe_utc(Time) ->
             Time
     end.
 
-format(String)       -> io:format(user, String, []).
-format(String, Args) -> io:format(user, String, Args).
+format(IOMod, String)       -> format(IOMod, String, []).
+format(io_lib, String, Args) -> io_lib:format(String, Args);
+format(io, String, Args) -> io:format(user, String, Args).
 
 format_report(Rep) when is_list(Rep) ->
     case string_p(Rep) of
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index d67617260e..ad49d89908 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -62,10 +62,10 @@
 -type zip_create_option() :: term().
 -type section() ::
 	  shebang
-	| {shebang, shebang()}
+	| {shebang, shebang() | default | undefined}
 	| comment
-	| {comment, comment()}
-	| {emu_args, emu_args()}
+	| {comment, comment() | default | undefined}
+	| {emu_args, emu_args() | undefined}
 	| {source, file:filename() | binary()}
 	| {beam, file:filename() | binary()}
 	| {archive, file:filename() | binary()}
@@ -866,7 +866,7 @@ hidden_apply(App, M, F, Args) ->
     catch
 	error:undef ->
 	    case erlang:get_stacktrace() of
-		[{M,F,Args} | _] ->
+		[{M,F,Args,_} | _] ->
 		    Arity = length(Args),
 		    Text = io_lib:format("Call to ~w:~w/~w in application ~w failed.\n",
 					 [M, F, Arity, App]),
diff --git a/lib/stdlib/src/eval_bits.erl b/lib/stdlib/src/eval_bits.erl
index 2cbd6cdae7..f40904df1c 100644
--- a/lib/stdlib/src/eval_bits.erl
+++ b/lib/stdlib/src/eval_bits.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -31,15 +31,16 @@
 %% @type evalfun(). A closure which evaluates an expression given an
 %% environment
 %%
-%% @type matchfun(). A closure which performs a match given a value, a
-%% pattern and an environment
+%% @type matchfun(). A closure which depending on its first argument
+%% can perform a match (given a value, a pattern and an environment),
+%% lookup a variable in the bindings, or add a new binding
 %%
-%% @type field() represents a field in a "bin"
+%% @type field(). Represents a field in a "bin".
 
 %%% Part 1: expression evaluation (binary construction)
 
 %% @spec expr_grp(Fields::[field()], Bindings::bindings(), 
-%%                EvalFun::evalfun()) -> 
+%%                EvalFun::evalfun(), term(), term()) ->
 %%                  {value, binary(), bindings()}
 %%
 %% @doc Returns a tuple with {value,Bin,Bs} where Bin is the binary
@@ -144,7 +145,8 @@ eval_exp_field(Val, Size, Unit, binary, _, _) ->
 bin_gen({bin,_,Fs}, Bin, Bs0, BBs0, Mfun, Efun) ->
     bin_gen(Fs, Bin, Bs0, BBs0, Mfun, Efun, true).
 
-bin_gen([F|Fs], Bin, Bs0, BBs0, Mfun, Efun, Flag) ->
+bin_gen([F|Fs], Bin, Bs0, BBs0, Mfun, Efun, Flag)
+  when is_function(Mfun, 2), is_function(Efun, 2) ->
     case bin_gen_field(F, Bin, Bs0, BBs0, Mfun, Efun) of
         {match,Bs,BBs,Rest} ->
             bin_gen(Fs, Rest, Bs, BBs, Mfun, Efun, Flag);
@@ -175,14 +177,14 @@ bin_gen_field({bin_element,Line,VE,Size0,Options0},
     {Size1, [Type,{unit,Unit},Sign,Endian]} = 
         make_bit_type(Line, Size0, Options0),
     V = erl_eval:partial_eval(VE),
-    match_check_size(Size1, BBs0),
+    match_check_size(Mfun, Size1, BBs0),
     {value, Size, _BBs} = Efun(Size1, BBs0),
     case catch get_value(Bin, Type, Size, Unit, Sign, Endian) of
         {Val,<<_/bitstring>>=Rest} ->
             NewV = coerce_to_float(V, Type),
-            case catch Mfun(NewV, Val, Bs0) of
+            case catch Mfun(match, {NewV,Val,Bs0}) of
                 {match,Bs} ->
-                    BBs = add_bin_binding(NewV, Bs, BBs0),
+                    BBs = add_bin_binding(Mfun, NewV, Bs, BBs0),
                     {match,Bs,BBs,Rest};
                 _ ->
                     {nomatch,Rest}
@@ -192,9 +194,9 @@ bin_gen_field({bin_element,Line,VE,Size0,Options0},
     end.
 
 %%% Part 3: binary pattern matching 
-%% @spec match_bits(Fields::[field()], Bin::binary()
+%% @spec match_bits(Fields::[field()], Bin::binary(),
 %%                  GlobalEnv::bindings(), LocalEnv::bindings(),  
-%%                  MatchFun::matchfun(),EvalFun::evalfun()) -> 
+%%                  MatchFun::matchfun(),EvalFun::evalfun(), term()) ->
 %%                  {match, bindings()} 
 %% @doc Used to perform matching. If the match succeeds a new
 %% environment is returned. If the match have some syntactic or
@@ -205,7 +207,8 @@ bin_gen_field({bin_element,Line,VE,Size0,Options0},
 match_bits(Fs, Bin, Bs0, BBs, Mfun, Efun, _) ->
     match_bits(Fs, Bin, Bs0, BBs, Mfun, Efun).
 
-match_bits(Fs, Bin, Bs0, BBs, Mfun, Efun) ->
+match_bits(Fs, Bin, Bs0, BBs, Mfun, Efun)
+  when is_function(Mfun, 2), is_function(Efun, 2) ->
     case catch match_bits_1(Fs, Bin, Bs0, BBs, Mfun, Efun) of
         {match,Bs} -> {match,Bs};
         invalid -> throw(invalid);
@@ -230,12 +233,12 @@ match_field_1({bin_element,Line,VE,Size0,Options0},
         make_bit_type(Line, Size0, Options0),
     V = erl_eval:partial_eval(VE),
     Size2 = erl_eval:partial_eval(Size1),
-    match_check_size(Size2, BBs0),
+    match_check_size(Mfun, Size2, BBs0),
     {value, Size, _BBs} = Efun(Size2, BBs0),
     {Val,Rest} = get_value(Bin, Type, Size, Unit, Sign, Endian),
     NewV = coerce_to_float(V, Type),
-    {match,Bs} = Mfun(NewV, Val, Bs0),
-    BBs = add_bin_binding(NewV, Bs, BBs0),
+    {match,Bs} = Mfun(match, {NewV,Val,Bs0}),
+    BBs = add_bin_binding(Mfun, NewV, Bs, BBs0),
     {Bs,BBs,Rest}.
 
 %% Almost identical to the one in sys_pre_expand.
@@ -249,12 +252,12 @@ coerce_to_float({integer,L,I}=E, float) ->
 coerce_to_float(E, _Type) -> 
     E.
 
-add_bin_binding({var,_,'_'}, _Bs, BBs) ->
+add_bin_binding(_, {var,_,'_'}, _Bs, BBs) ->
     BBs;
-add_bin_binding({var,_,Name}, Bs, BBs) ->
-    {value,Value} = erl_eval:binding(Name, Bs),
-    erl_eval:add_binding(Name, Value, BBs);
-add_bin_binding(_, _Bs, BBs) ->
+add_bin_binding(Mfun, {var,_,Name}, Bs, BBs) ->
+    {value,Value} = Mfun(binding, {Name,Bs}),
+    Mfun(add_binding, {Name,Value,BBs});
+add_bin_binding(_, _, _Bs, BBs) ->
     BBs.
 
 get_value(Bin, integer, Size, Unit, Sign, Endian) ->
@@ -327,20 +330,20 @@ make_bit_type(_Line, Size, Type0) -> %Size evaluates to an integer or 'all'
         {error,Reason} -> error(Reason)
     end.
 
-match_check_size({var,_,V}, Bs) -> 
-    case erl_eval:binding(V, Bs) of
+match_check_size(Mfun, {var,_,V}, Bs) ->
+    case Mfun(binding, {V,Bs}) of
         {value,_} -> ok;
 	unbound -> throw(invalid) % or, rather, error({unbound,V})
     end;
-match_check_size({atom,_,all}, _Bs) ->
+match_check_size(_, {atom,_,all}, _Bs) ->
     ok;
-match_check_size({atom,_,undefined}, _Bs) ->
+match_check_size(_, {atom,_,undefined}, _Bs) ->
     ok;
-match_check_size({integer,_,_}, _Bs) ->
+match_check_size(_, {integer,_,_}, _Bs) ->
     ok;
-match_check_size({value,_,_}, _Bs) ->
+match_check_size(_, {value,_,_}, _Bs) ->
     ok;	%From the debugger.
-match_check_size(_, _Bs) -> 
+match_check_size(_, _, _Bs) ->
     throw(invalid).
 
 %% error(Reason) -> exception thrown
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl
index 1c4a73680b..9879b76391 100644
--- a/lib/stdlib/src/gen_event.erl
+++ b/lib/stdlib/src/gen_event.erl
@@ -36,8 +36,6 @@
 	 add_handler/3, add_sup_handler/3, delete_handler/3, swap_handler/3,
 	 swap_sup_handler/3, which_handlers/1, call/3, call/4, wake_hib/4]).
 
--export([behaviour_info/1]).
-
 -export([init_it/6,
 	 system_continue/3,
 	 system_terminate/4,
@@ -60,14 +58,6 @@
 %%%  API
 %%%=========================================================================
 
--spec behaviour_info(atom()) -> 'undefined' | [{atom(), arity()}].
-
-behaviour_info(callbacks) ->
-    [{init,1},{handle_event,2},{handle_call,2},{handle_info,2},
-     {terminate,2},{code_change,3}];
-behaviour_info(_Other) ->
-    undefined.
-
 %% gen_event:start(Handler) -> {ok, Pid} | {error, What}
 %%   gen_event:add_handler(Handler, Mod, Args) -> ok | Other
 %%      gen_event:notify(Handler, Event) -> ok
@@ -78,41 +68,36 @@ behaviour_info(_Other) ->
 %%   gen_event:which_handler(Handler) -> [Mod]
 %% gen_event:stop(Handler) -> ok 
 
-
-%% handlers must export
-%% Mod:init(Args) -> {ok, State} | Other
-%% Mod:handle_event(Event, State) -> 
-%%    {ok, State'} | remove_handler | {swap_handler,Args1,State1,Mod2,Args2}
-%% Mod:handle_info(Info, State) ->
-%%    {ok, State'} | remove_handler | {swap_handler,Args1,State1,Mod2,Args2}
-%% Mod:handle_call(Query, State) -> 
-%%    {ok, Reply, State'} | {remove_handler, Reply} | 
-%%    {swap_handler, Reply, Args1,State1,Mod2,Args2}
-%% Mod:terminate(Args, State) -> Val
-
-
-%% add_handler(H, Mod, Args) -> ok | Other
-%%    Mod:init(Args) -> {ok, State} | Other
-
-%% delete_handler(H, Mod, Args) -> Val
-%%    Mod:terminate(Args, State) -> Val
-
-%% notify(H, Event) 
-%%    Mod:handle_event(Event, State) ->
-%%         {ok, State1}
-%%         remove_handler
-%%               Mod:terminate(remove_handler, State) is called
-%%               the return value is ignored
-%%         {swap_handler, Args1, State1, Mod2, Args2}
-%%               State2 = Mod:terminate(Args1, State1) is called
-%%               the return value is chained into the new module and
-%%               Mod2:init({Args2, State2}) is called
-%%         Other
-%%               Mod:terminate({error, Other}, State) is called
-%%               The return value is ignored
-%% call(H, Mod, Query) -> Val
-%% call(H, Mod, Query, Timeout) -> Val
-%%      Mod:handle_call(Query, State) -> as above
+-callback init(InitArgs :: term()) ->
+    {ok, State :: term()} |
+    {ok, State :: term(), hibernate}.
+-callback handle_event(Event :: term(), State :: term()) ->
+    {ok, NewState :: term()} |
+    {ok, NewState :: term(), hibernate} |
+    {swap_handler, Args1 :: term(), NewState :: term(),
+     Handler2 :: (atom() | {atom(), Id :: term()}), Args2 :: term()} |
+    remove_handler.
+-callback handle_call(Request :: term(), State :: term()) ->
+    {ok, Reply :: term(), NewState :: term()} |
+    {ok, Reply :: term(), NewState :: term(), hibernate} |
+    {swap_handler, Reply :: term(), Args1 :: term(), NewState :: term(),
+     Handler2 :: (atom() | {atom(), Id :: term()}), Args2 :: term()} |
+    {remove_handler, Reply :: term()}.
+-callback handle_info(Info :: term(), State :: term()) ->
+    {ok, NewState :: term()} |
+    {ok, NewState :: term(), hibernate} |
+    {swap_handler, Args1 :: term(), NewState :: term(),
+     Handler2 :: (atom() | {atom(), Id :: term()}), Args2 :: term()} |
+    remove_handler.
+-callback terminate(Args :: (term() | {stop, Reason :: term()} |
+                             stop | remove_handler |
+                             {error, {'EXIT', Reason :: term()}} |
+                             {error, term()}),
+                    State :: term()) ->
+    term().
+-callback code_change(OldVsn :: (term() | {down, term()}),
+                      State :: term(), Extra :: term()) ->
+    {ok, NewState :: term()}.
 
 %%---------------------------------------------------------------------------
 
@@ -667,16 +652,16 @@ report_error(_Handler, {swapped,_,_}, _, _, _)      -> ok;
 report_error(Handler, Reason, State, LastIn, SName) ->
     Reason1 = 
 	case Reason of
-	    {'EXIT',{undef,[{M,F,A}|MFAs]}} ->
+	    {'EXIT',{undef,[{M,F,A,L}|MFAs]}} ->
 		case code:is_loaded(M) of
 		    false ->
-			{'module could not be loaded',[{M,F,A}|MFAs]};
+			{'module could not be loaded',[{M,F,A,L}|MFAs]};
 		    _ ->
 			case erlang:function_exported(M, F, length(A)) of
 			    true ->
-				{undef,[{M,F,A}|MFAs]};
+				{undef,[{M,F,A,L}|MFAs]};
 			    false ->
-				{'function not exported',[{M,F,A}|MFAs]}
+				{'function not exported',[{M,F,A,L}|MFAs]}
 			end
 		end;
 	    {'EXIT',Why} ->
diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl
index f2f1365d3d..3db8c9f4f2 100644
--- a/lib/stdlib/src/gen_fsm.erl
+++ b/lib/stdlib/src/gen_fsm.erl
@@ -113,8 +113,6 @@
 	 start_timer/2,send_event_after/2,cancel_timer/1,
 	 enter_loop/4, enter_loop/5, enter_loop/6, wake_hib/6]).
 
--export([behaviour_info/1]).
-
 %% Internal exports
 -export([init_it/6,
 	 system_continue/3,
@@ -128,13 +126,38 @@
 %%% Interface functions.
 %%% ---------------------------------------------------
 
--spec behaviour_info(atom()) -> 'undefined' | [{atom(), arity()}].
-
-behaviour_info(callbacks) ->
-    [{init,1},{handle_event,3},{handle_sync_event,4},{handle_info,3},
-     {terminate,3},{code_change,4}];
-behaviour_info(_Other) ->
-    undefined.
+-callback init(Args :: term()) ->
+    {ok, StateName :: atom(), StateData :: term()} |
+    {ok, StateName :: atom(), StateData :: term(), timeout() | hibernate} |
+    {stop, Reason :: term()} | ignore.
+-callback handle_event(Event :: term(), StateName :: atom(),
+                       StateData :: term()) ->
+    {next_state, NextStateName :: atom(), NewStateData :: term()} |
+    {next_state, NextStateName :: atom(), NewStateData :: term(),
+     timeout() | hibernate} |
+    {stop, Reason :: term(), NewStateData :: term()}.
+-callback handle_sync_event(Event :: term(), From :: {pid(), Tag :: term()},
+                            StateName :: atom(), StateData :: term()) ->
+    {reply, Reply :: term(), NextStateName :: atom(), NewStateData :: term()} |
+    {reply, Reply :: term(), NextStateName :: atom(), NewStateData :: term(),
+     timeout() | hibernate} |
+    {next_state, NextStateName :: atom(), NewStateData :: term()} |
+    {next_state, NextStateName :: atom(), NewStateData :: term(),
+     timeout() | hibernate} |
+    {stop, Reason :: term(), Reply :: term(), NewStateData :: term()} |
+    {stop, Reason :: term(), NewStateData :: term()}.
+-callback handle_info(Info :: term(), StateName :: atom(),
+                      StateData :: term()) ->
+    {next_state, NextStateName :: atom(), NewStateData :: term()} |
+    {next_state, NextStateName :: atom(), NewStateData :: term(),
+     timeout() | hibernate} |
+    {stop, Reason :: normal | term(), NewStateData :: term()}.
+-callback terminate(Reason :: normal | shutdown | {shutdown, term()}
+		    | term(), StateName :: atom(), StateData :: term()) ->
+    term().
+-callback code_change(OldVsn :: term() | {down, term()}, StateName :: atom(),
+		      StateData :: term(), Extra :: term()) ->
+    {ok, NextStateName :: atom(), NewStateData :: term()}.
 
 %%% ---------------------------------------------------
 %%% Starts a generic state machine.
@@ -561,16 +584,16 @@ terminate(Reason, Name, Msg, Mod, StateName, StateData, Debug) ->
 error_info(Reason, Name, Msg, StateName, StateData, Debug) ->
     Reason1 = 
 	case Reason of
-	    {undef,[{M,F,A}|MFAs]} ->
+	    {undef,[{M,F,A,L}|MFAs]} ->
 		case code:is_loaded(M) of
 		    false ->
-			{'module could not be loaded',[{M,F,A}|MFAs]};
+			{'module could not be loaded',[{M,F,A,L}|MFAs]};
 		    _ ->
 			case erlang:function_exported(M, F, length(A)) of
 			    true ->
 				Reason;
 			    false ->
-				{'function not exported',[{M,F,A}|MFAs]}
+				{'function not exported',[{M,F,A,L}|MFAs]}
 			end
 		end;
 	    _ ->
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 09d94a9c40..dd0ef74f30 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -94,8 +94,6 @@
 	 multi_call/2, multi_call/3, multi_call/4,
 	 enter_loop/3, enter_loop/4, enter_loop/5, wake_hib/5]).
 
--export([behaviour_info/1]).
-
 %% System exports
 -export([system_continue/3,
 	 system_terminate/4,
@@ -111,13 +109,32 @@
 %%%  API
 %%%=========================================================================
 
--spec behaviour_info(atom()) -> 'undefined' | [{atom(), arity()}].
-
-behaviour_info(callbacks) ->
-    [{init,1},{handle_call,3},{handle_cast,2},{handle_info,2},
-     {terminate,2},{code_change,3}];
-behaviour_info(_Other) ->
-    undefined.
+-callback init(Args :: term()) ->
+    {ok, State :: term()} | {ok, State :: term(), timeout() | hibernate} |
+    {stop, Reason :: term()} | ignore.
+-callback handle_call(Request :: term(), From :: {pid(), Tag :: term()},
+                      State :: term()) ->
+    {reply, Reply :: term(), NewState :: term()} |
+    {reply, Reply :: term(), NewState :: term(), timeout() | hibernate} |
+    {noreply, NewState :: term()} |
+    {noreply, NewState :: term(), timeout() | hibernate} |
+    {stop, Reason :: term(), Reply :: term(), NewState :: term()} |
+    {stop, Reason :: term(), NewState :: term()}.
+-callback handle_cast(Request :: term(), State :: term()) ->
+    {noreply, NewState :: term()} |
+    {noreply, NewState :: term(), timeout() | hibernate} |
+    {stop, Reason :: term(), NewState :: term()}.
+-callback handle_info(Info :: timeout() | term(), State :: term()) ->
+    {noreply, NewState :: term()} |
+    {noreply, NewState :: term(), timeout() | hibernate} |
+    {stop, Reason :: term(), NewState :: term()}.
+-callback terminate(Reason :: (normal | shutdown | {shutdown, term()} |
+                               term()),
+                    State :: term()) ->
+    term().
+-callback code_change(OldVsn :: (term() | {down, term()}), State :: term(),
+                      Extra :: term()) ->
+    {ok, NewState :: term()}.
 
 %%%  -----------------------------------------------------------------
 %%% Starts a generic server.
@@ -729,16 +746,16 @@ error_info(_Reason, application_controller, _Msg, _State, _Debug) ->
 error_info(Reason, Name, Msg, State, Debug) ->
     Reason1 = 
 	case Reason of
-	    {undef,[{M,F,A}|MFAs]} ->
+	    {undef,[{M,F,A,L}|MFAs]} ->
 		case code:is_loaded(M) of
 		    false ->
-			{'module could not be loaded',[{M,F,A}|MFAs]};
+			{'module could not be loaded',[{M,F,A,L}|MFAs]};
 		    _ ->
 			case erlang:function_exported(M, F, length(A)) of
 			    true ->
 				Reason;
 			    false ->
-				{'function not exported',[{M,F,A}|MFAs]}
+				{'function not exported',[{M,F,A,L}|MFAs]}
 			end
 		end;
 	    _ ->
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 165e03e506..0252cdf742 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -109,9 +109,9 @@ fwrite(Format, Args) ->
 fread(Chars, Format) ->
     io_lib_fread:fread(Chars, Format).
 
--spec fread(Continuation, String, Format) -> Return when
+-spec fread(Continuation, CharSpec, Format) -> Return when
       Continuation :: continuation() | [],
-      String :: string(),
+      CharSpec :: string() | eof,
       Format :: string(),
       Return :: {'more', Continuation1 :: continuation()}
               | {'done', Result, LeftOverChars :: string()},
diff --git a/lib/stdlib/src/lib.erl b/lib/stdlib/src/lib.erl
index c303ae60b5..314fd60903 100644
--- a/lib/stdlib/src/lib.erl
+++ b/lib/stdlib/src/lib.erl
@@ -173,12 +173,12 @@ format_fun(Fun) when is_function(Fun) ->
 
 analyze_exception(error, Term, Stack) ->
     case {is_stacktrace(Stack), Stack, Term} of
-        {true, [{_M,_F,As}=MFA|MFAs], function_clause} when is_list(As) -> 
-            {Term,[MFA],MFAs};
-        {true, [{shell,F,A}], function_clause} when is_integer(A) ->
+        {true, [{_,_,As,_}=MFAL|MFAs], function_clause} when is_list(As) ->
+            {Term,[MFAL],MFAs};
+        {true, [{shell,F,A,_}], function_clause} when is_integer(A) ->
             {Term, [{F,A}], []};
-        {true, [{_M,_F,_AorAs}=MFA|MFAs], undef} ->
-            {Term,[MFA],MFAs};
+        {true, [{_,_,_,_}=MFAL|MFAs], undef} ->
+            {Term,[MFAL],MFAs};
 	{true, _, _} ->
 	    {Term,[],Stack};
 	{false, _, _} ->
@@ -194,9 +194,11 @@ analyze_exception(_Class, Term, Stack) ->
 
 is_stacktrace([]) ->
     true;
-is_stacktrace([{M,F,A}|Fs]) when is_atom(M), is_atom(F), is_integer(A) ->
+is_stacktrace([{M,F,A,I}|Fs])
+  when is_atom(M), is_atom(F), is_integer(A), is_list(I) ->
     is_stacktrace(Fs);
-is_stacktrace([{M,F,As}|Fs]) when is_atom(M), is_atom(F), length(As) >= 0 ->
+is_stacktrace([{M,F,As,I}|Fs])
+  when is_atom(M), is_atom(F), length(As) >= 0, is_list(I) ->
     is_stacktrace(Fs);
 is_stacktrace(_) ->
     false.
@@ -225,9 +227,9 @@ explain_reason(function_clause, error, [{F,A}], _PF, _S) ->
     %% Shell commands
     FAs = io_lib:fwrite(<<"~w/~w">>, [F, A]),
     [<<"no function clause matching call to ">> | FAs];
-explain_reason(function_clause, error=Cl, [{M,F,As}], PF, S) ->
+explain_reason(function_clause, error=Cl, [{M,F,As,Loc}], PF, S) ->
     Str = <<"no function clause matching ">>,
-    format_errstr_call(Str, Cl, {M,F}, As, PF, S);
+    [format_errstr_call(Str, Cl, {M,F}, As, PF, S),$\s|location(Loc)];
 explain_reason(if_clause, error, [], _PF, _S) ->
     <<"no true branch found when evaluating an if expression">>;
 explain_reason(noproc, error, [], _PF, _S) ->
@@ -242,11 +244,11 @@ explain_reason({try_clause,V}, error=Cl, [], PF, S) ->
     %% "there is no try clause with a true guard sequence and a
     %% pattern matching..."
     format_value(V, <<"no try clause matching ">>, Cl, PF, S);
-explain_reason(undef, error, [{M,F,A}], _PF, _S) ->
+explain_reason(undef, error, [{M,F,A,_}], _PF, _S) ->
     %% Only the arity is displayed, not the arguments, if there are any.
     io_lib:fwrite(<<"undefined function ~s">>, 
                   [mfa_to_string(M, F, n_args(A))]);
-explain_reason({shell_undef,F,A}, error, [], _PF, _S) ->
+explain_reason({shell_undef,F,A,_}, error, [], _PF, _S) ->
     %% Give nicer reports for undefined shell functions
     %% (but not when the user actively calls shell_default:F(...)).
     io_lib:fwrite(<<"undefined shell command ~s/~w">>, [F, n_args(A)]);
@@ -292,17 +294,19 @@ argss(I) ->
     io_lib:fwrite(<<"~w arguments">>, [I]).
 
 format_stacktrace1(S0, Stack0, PF, SF) ->
-    Stack1 = lists:dropwhile(fun({M,F,A}) -> SF(M, F, A)
+    Stack1 = lists:dropwhile(fun({M,F,A,_}) -> SF(M, F, A)
                              end, lists:reverse(Stack0)),
     S = ["  " | S0],
     Stack = lists:reverse(Stack1),
     format_stacktrace2(S, Stack, 1, PF).
 
-format_stacktrace2(S, [{M,F,A}|Fs], N, PF) when is_integer(A) ->
-    [io_lib:fwrite(<<"~s~s ~s">>, 
-                   [sep(N, S), origin(N, M, F, A), mfa_to_string(M, F, A)])
+format_stacktrace2(S, [{M,F,A,L}|Fs], N, PF) when is_integer(A) ->
+    [io_lib:fwrite(<<"~s~s ~s ~s">>,
+                   [sep(N, S), origin(N, M, F, A),
+		    mfa_to_string(M, F, A),
+		    location(L)])
      | format_stacktrace2(S, Fs, N + 1, PF)];
-format_stacktrace2(S, [{M,F,As}|Fs], N, PF) when is_list(As) ->
+format_stacktrace2(S, [{M,F,As,_}|Fs], N, PF) when is_list(As) ->
     A = length(As),
     CalledAs = [S,<<"   called as ">>],
     C = format_call("", CalledAs, {M,F}, As, PF),
@@ -313,6 +317,16 @@ format_stacktrace2(S, [{M,F,As}|Fs], N, PF) when is_list(As) ->
 format_stacktrace2(_S, [], _N, _PF) ->
     "".
 
+location(L) ->
+    File = proplists:get_value(file, L),
+    Line = proplists:get_value(line, L),
+    if
+	File =/= undefined, Line =/= undefined ->
+	    io_lib:format("(~s, line ~w)", [File, Line]);
+	true ->
+	    ""
+    end.
+
 sep(1, S) -> S;
 sep(_, S) -> [$\n | S].
 
diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl
index bba46e4cb6..e73c087753 100644
--- a/lib/stdlib/src/lists.erl
+++ b/lib/stdlib/src/lists.erl
@@ -628,9 +628,10 @@ keydelete3(_, _, []) -> [].
 -spec keyreplace(Key, N, TupleList1, NewTuple) -> TupleList2 when
       Key :: term(),
       N :: pos_integer(),
-      TupleList1 :: [tuple()],
-      TupleList2 :: [tuple()],
-      NewTuple :: tuple().
+      TupleList1 :: [Tuple],
+      TupleList2 :: [Tuple],
+      NewTuple :: Tuple,
+      Tuple :: tuple().
 
 keyreplace(K, N, L, New) when is_integer(N), N > 0, is_tuple(New) ->
     keyreplace3(K, N, L, New).
@@ -660,9 +661,10 @@ keytake(_K, _N, [], _L) -> false.
 -spec keystore(Key, N, TupleList1, NewTuple) -> TupleList2 when
       Key :: term(),
       N :: pos_integer(),
-      TupleList1 :: [tuple()],
-      TupleList2 :: [tuple(), ...],
-      NewTuple :: tuple().
+      TupleList1 :: [Tuple],
+      TupleList2 :: [Tuple, ...],
+      NewTuple :: Tuple,
+      Tuple :: tuple().
 
 keystore(K, N, L, New) when is_integer(N), N > 0, is_tuple(New) ->
     keystore2(K, N, L, New).
@@ -740,8 +742,9 @@ keysort_1(_I, X, _EX, [], R) ->
       TupleList1 :: [T1],
       TupleList2 :: [T2],
       TupleList3 :: [(T1 | T2)],
-      T1 :: tuple(),
-      T2 :: tuple().
+      T1 :: Tuple,
+      T2 :: Tuple,
+      Tuple :: tuple().
 
 keymerge(Index, T1, L2) when is_integer(Index), Index > 0 -> 
     case L2 of
@@ -842,8 +845,9 @@ ukeysort_1(_I, X, _EX, []) ->
       TupleList1 :: [T1],
       TupleList2 :: [T2],
       TupleList3 :: [(T1 | T2)],
-      T1 :: tuple(),
-      T2 :: tuple().
+      T1 :: Tuple,
+      T2 :: Tuple,
+      Tuple :: tuple().
 
 ukeymerge(Index, L1, T2) when is_integer(Index), Index > 0 ->
     case L1 of
@@ -873,8 +877,9 @@ rukeymerge(Index, T1, L2) when is_integer(Index), Index > 0 ->
 -spec keymap(Fun, N, TupleList1) -> TupleList2 when
       Fun :: fun((Term1 :: term()) -> Term2 :: term()),
       N :: pos_integer(),
-      TupleList1 :: [tuple()],
-      TupleList2 :: [tuple()].
+      TupleList1 :: [Tuple],
+      TupleList2 :: [Tuple],
+      Tuple :: tuple().
 
 keymap(Fun, Index, [Tup|Tail]) ->
    [setelement(Index, Tup, Fun(element(Index, Tup)))|keymap(Fun, Index, Tail)];
diff --git a/lib/stdlib/src/ms_transform.erl b/lib/stdlib/src/ms_transform.erl
index 48e22e53fa..63b397f3a5 100644
--- a/lib/stdlib/src/ms_transform.erl
+++ b/lib/stdlib/src/ms_transform.erl
@@ -333,17 +333,18 @@ form({function,Line,Name0,Arity0,Clauses0}) ->
 form(AnyOther) ->
     AnyOther.
 function(Name, Arity, Clauses0) ->
-    {Clauses1,_} = clauses(Clauses0,gb_sets:new()),
+    Clauses1 = clauses(Clauses0),
     {Name,Arity,Clauses1}.
-clauses([C0|Cs],Bound) ->
-    {C1,Bound1} = clause(C0,Bound),
-    {C2,Bound2} = clauses(Cs,Bound1),
-    {[C1|C2],Bound2};
-clauses([],Bound) -> {[],Bound}.
+clauses([C0|Cs]) ->
+    C1 = clause(C0,gb_sets:new()),
+    C2 = clauses(Cs),
+    [C1|C2];
+clauses([]) -> [].
+
 clause({clause,Line,H0,G0,B0},Bound) ->
     {H1,Bound1} = copy(H0,Bound),
-    {B1,Bound2} = copy(B0,Bound1),
-    {{clause,Line,H1,G0,B1},Bound2}.
+    {B1,_Bound2} = copy(B0,Bound1),
+    {clause,Line,H1,G0,B1}.
 
 copy({call,Line,{remote,_Line2,{atom,_Line3,ets},{atom,_Line4,fun2ms}},
       As0},Bound) ->
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 39d017d430..c1285dab60 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -330,22 +330,22 @@ obsolete_1(erlang, fault, 2) ->
 obsolete_1(file, rawopen, 2) ->
     {removed, "deprecated (will be removed in R13B); use file:open/2 with the raw option"};
 
-obsolete_1(http, request, 1) 	      -> {deprecated,{httpc,request,1},"R15B"};
-obsolete_1(http, request, 2) 	      -> {deprecated,{httpc,request,2},"R15B"};
-obsolete_1(http, request, 4) 	      -> {deprecated,{httpc,request,4},"R15B"};
-obsolete_1(http, request, 5) 	      -> {deprecated,{httpc,request,5},"R15B"};
-obsolete_1(http, cancel_request, 1)   -> {deprecated,{httpc,cancel_request,1},"R15B"};
-obsolete_1(http, cancel_request, 2)   -> {deprecated,{httpc,cancel_request,2},"R15B"};
-obsolete_1(http, set_option, 2)       -> {deprecated,{httpc,set_option,2},"R15B"};
-obsolete_1(http, set_option, 3)       -> {deprecated,{httpc,set_option,3},"R15B"};
-obsolete_1(http, set_options, 1)      -> {deprecated,{httpc,set_options,1},"R15B"};
-obsolete_1(http, set_options, 2)      -> {deprecated,{httpc,set_options,2},"R15B"};
-obsolete_1(http, verify_cookies, 2)   -> {deprecated,{httpc,verify_cookies,2},"R15B"};
-obsolete_1(http, verify_cookies, 3)   -> {deprecated,{httpc,verify_cookies,3},"R15B"};
-obsolete_1(http, cookie_header, 1)    -> {deprecated,{httpc,cookie_header,1},"R15B"};
-obsolete_1(http, cookie_header, 2)    -> {deprecated,{httpc,cookie_header,2},"R15B"};
-obsolete_1(http, stream_next, 1)      -> {deprecated,{httpc,stream_next,1},"R15B"};
-obsolete_1(http, default_profile, 0)  -> {deprecated,{httpc,default_profile,0},"R15B"};
+obsolete_1(http, request, 1) 	      -> {removed,{httpc,request,1},"R15B"};
+obsolete_1(http, request, 2) 	      -> {removed,{httpc,request,2},"R15B"};
+obsolete_1(http, request, 4) 	      -> {removed,{httpc,request,4},"R15B"};
+obsolete_1(http, request, 5) 	      -> {removed,{httpc,request,5},"R15B"};
+obsolete_1(http, cancel_request, 1)   -> {removed,{httpc,cancel_request,1},"R15B"};
+obsolete_1(http, cancel_request, 2)   -> {removed,{httpc,cancel_request,2},"R15B"};
+obsolete_1(http, set_option, 2)       -> {removed,{httpc,set_option,2},"R15B"};
+obsolete_1(http, set_option, 3)       -> {removed,{httpc,set_option,3},"R15B"};
+obsolete_1(http, set_options, 1)      -> {removed,{httpc,set_options,1},"R15B"};
+obsolete_1(http, set_options, 2)      -> {removed,{httpc,set_options,2},"R15B"};
+obsolete_1(http, verify_cookies, 2)   -> {removed,{httpc,store_cookies,2},"R15B"};
+obsolete_1(http, verify_cookies, 3)   -> {removed,{httpc,store_cookies,3},"R15B"};
+obsolete_1(http, cookie_header, 1)    -> {removed,{httpc,cookie_header,1},"R15B"};
+obsolete_1(http, cookie_header, 2)    -> {removed,{httpc,cookie_header,2},"R15B"};
+obsolete_1(http, stream_next, 1)      -> {removed,{httpc,stream_next,1},"R15B"};
+obsolete_1(http, default_profile, 0)  -> {removed,{httpc,default_profile,0},"R15B"};
 
 obsolete_1(httpd, start, 0) 	      -> {removed,{inets,start,[2,3]},"R14B"};
 obsolete_1(httpd, start, 1) 	      -> {removed,{inets,start,[2,3]},"R14B"};
@@ -449,7 +449,7 @@ obsolete_1(ssl_pkix, decode_cert, A) when A =:= 1; A =:= 2 ->
 
 %% Added in R13B04.
 obsolete_1(erlang, concat_binary, 1) ->
-    {deprecated,{erlang,list_to_binary,1},"R15B"};
+    {removed,{erlang,list_to_binary,1},"R15B"};
 
 %% Added in R14A.
 obsolete_1(ssl, peercert, 2) ->
@@ -461,6 +461,18 @@ obsolete_1(public_key, pem_to_der, 1) ->
 obsolete_1(public_key, decode_private_key, A) when A =:= 1; A =:= 2 ->
     {deprecated,{public_key,pem_entry_decode,1},"R15A"};
 
+%% Added in R14B03.
+obsolete_1(docb_gen, _, _) ->
+    {deprecated,"the DocBuilder application is deprecated (will be removed in R15B)"};
+obsolete_1(docb_transform, _, _) ->
+    {deprecated,"the DocBuilder application is deprecated (will be removed in R15B)"};
+obsolete_1(docb_xml_check, _, _) ->
+    {deprecated,"the DocBuilder application is deprecated (will be removed in R15B)"};
+
+%% Added in R15B
+obsolete_1(asn1rt, F, _) when F == load_driver; F == unload_driver ->
+    {deprecated,"deprecated (will be removed in R16A); has no effect as drivers are no longer used."};
+
 obsolete_1(_, _, _) ->
     no.
 
diff --git a/lib/stdlib/src/proplists.erl b/lib/stdlib/src/proplists.erl
index 68697d0da2..e3eda5d932 100644
--- a/lib/stdlib/src/proplists.erl
+++ b/lib/stdlib/src/proplists.erl
@@ -49,9 +49,10 @@
 
 %% ---------------------------------------------------------------------
 
--export_type([property/0]).
+-export_type([property/0, proplist/0]).
 
 -type property()   :: atom() | tuple().
+-type proplist()  :: [property()].
 
 %% ---------------------------------------------------------------------
 
diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index 5ca04ff023..f5e180b4bd 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -123,7 +123,7 @@
 
 -record(setup, {parent}).
 
--define(THROWN_ERROR, {?MODULE, throw_error, _}).
+-define(THROWN_ERROR, {?MODULE, throw_error, _, _}).
 
 -export_type([query_handle/0]).
 
@@ -3701,7 +3701,8 @@ lookup_join(F1, C1, LuF, C2, Rev) ->
 maybe_error_logger(allowed, _) ->
     ok;
 maybe_error_logger(Name, Why) ->
-    [_, _, {?MODULE,maybe_error_logger,_} | Stacktrace] = expand_stacktrace(),
+    [_, _, {?MODULE,maybe_error_logger,_,_} | Stacktrace] =
+	expand_stacktrace(),
     Trimmer = fun(M, _F, _A) -> M =:= erl_eval end,
     Formater = fun(Term, I) -> io_lib:print(Term, I, 80, -1) end,
     X = lib:format_stacktrace(1, Stacktrace, Trimmer, Formater),
@@ -3720,7 +3721,7 @@ expand_stacktrace() ->
 expand_stacktrace(D) ->
     _ = erlang:system_flag(backtrace_depth, D),
     {'EXIT', {foo, Stacktrace}} = (catch erlang:error(foo)),
-    L = lists:takewhile(fun({M,_,_}) -> M =/= ?MODULE 
+    L = lists:takewhile(fun({M,_,_,_}) -> M =/= ?MODULE
                         end, lists:reverse(Stacktrace)),
     if
         length(L) < 3 andalso length(Stacktrace) =:= D ->
diff --git a/lib/stdlib/src/random.erl b/lib/stdlib/src/random.erl
index dbb524cc74..d7b51a151c 100644
--- a/lib/stdlib/src/random.erl
+++ b/lib/stdlib/src/random.erl
@@ -26,6 +26,10 @@
 -export([seed/0, seed/1, seed/3, uniform/0, uniform/1,
 	 uniform_s/1, uniform_s/2, seed0/0]).
 
+-define(PRIME1, 30269).
+-define(PRIME2, 30307).
+-define(PRIME3, 30323).
+
 %%-----------------------------------------------------------------------
 %% The type of the state
 
@@ -44,7 +48,11 @@ seed0() ->
 -spec seed() -> ran().
 
 seed() ->
-    reseed(seed0()).
+    case seed_put(seed0()) of
+	undefined -> seed0();
+	{_,_,_} = Tuple -> Tuple
+    end.	
+
 
 %% seed({A1, A2, A3}) 
 %%  Seed random number generation 
@@ -66,17 +74,15 @@ seed({A1, A2, A3}) ->
       A3 :: integer().
 
 seed(A1, A2, A3) ->
-    put(random_seed, 
-	{abs(A1) rem 30269, abs(A2) rem 30307, abs(A3) rem 30323}).
+    seed_put({(abs(A1) rem (?PRIME1-1)) + 1,   % Avoid seed numbers that are
+	      (abs(A2) rem (?PRIME2-1)) + 1,   % even divisors of the
+	      (abs(A3) rem (?PRIME3-1)) + 1}). % corresponding primes.
 
 
--spec reseed(ran()) -> ran().
-
-reseed({A1, A2, A3}) ->
-    case seed(A1, A2, A3) of
-	undefined -> seed0();
-	{_,_,_} = Tuple -> Tuple
-    end.	
+-spec seed_put(ran()) -> 'undefined' | ran().
+     
+seed_put(Seed) ->
+    put(random_seed, Seed).
 
 %% uniform()
 %%  Returns a random float between 0 and 1.
@@ -88,11 +94,11 @@ uniform() ->
 		       undefined -> seed0();
 		       Tuple -> Tuple
 		   end,
-    B1 = (A1*171) rem 30269,
-    B2 = (A2*172) rem 30307,
-    B3 = (A3*170) rem 30323,
+    B1 = (A1*171) rem ?PRIME1,
+    B2 = (A2*172) rem ?PRIME2,
+    B3 = (A3*170) rem ?PRIME3,
     put(random_seed, {B1,B2,B3}),
-    R = A1/30269 + A2/30307 + A3/30323,
+    R = B1/?PRIME1 + B2/?PRIME2 + B3/?PRIME3,
     R - trunc(R).
 
 %% uniform(N) -> I
@@ -116,10 +122,10 @@ uniform(N) when is_integer(N), N >= 1 ->
       State1 :: ran().
 
 uniform_s({A1, A2, A3}) ->
-    B1 = (A1*171) rem 30269,
-    B2 = (A2*172) rem 30307,
-    B3 = (A3*170) rem 30323,
-    R = A1/30269 + A2/30307 + A3/30323,
+    B1 = (A1*171) rem ?PRIME1,
+    B2 = (A2*172) rem ?PRIME2,
+    B3 = (A3*170) rem ?PRIME3,
+    R = B1/?PRIME1 + B2/?PRIME2 + B3/?PRIME3,
     {R - trunc(R), {B1,B2,B3}}.
 
 %% uniform_s(N, State) -> {I, NewState}
diff --git a/lib/stdlib/src/re.erl b/lib/stdlib/src/re.erl
index e08258a535..99bcbd722e 100644
--- a/lib/stdlib/src/re.erl
+++ b/lib/stdlib/src/re.erl
@@ -573,10 +573,10 @@ ucompile(RE,Options) ->
 	re:compile(unicode:characters_to_binary(RE,unicode),Options)
     catch
 	error:AnyError ->
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,Loc}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [RE,Options])),
-	    erlang:raise(error,AnyError,[{Mod,compile,L}|Rest])
+	    erlang:raise(error,AnyError,[{Mod,compile,L,Loc}|Rest])
     end.
 	
 
@@ -585,10 +585,10 @@ urun(Subject,RE,Options) ->
 	urun2(Subject,RE,Options)
     catch
 	error:AnyError ->
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,Loc}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [Subject,RE,Options])),
-	    erlang:raise(error,AnyError,[{Mod,run,L}|Rest])
+	    erlang:raise(error,AnyError,[{Mod,run,L,Loc}|Rest])
     end.
 
 urun2(Subject0,RE0,Options0) ->
@@ -625,20 +625,20 @@ grun(Subject,RE,{Options,NeedClean}) ->
 	grun2(Subject,RE,{Options,NeedClean})
     catch
 	error:AnyError ->
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,Loc}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [Subject,RE,Options])),
-	    erlang:raise(error,AnyError,[{Mod,run,L}|Rest])
+	    erlang:raise(error,AnyError,[{Mod,run,L,Loc}|Rest])
     end;
 grun(Subject,RE,{Options,NeedClean,OrigRE}) ->
     try
 	grun2(Subject,RE,{Options,NeedClean})
     catch
 	error:AnyError ->
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,Loc}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [Subject,OrigRE,Options])),
-	    erlang:raise(error,AnyError,[{Mod,run,L}|Rest])
+	    erlang:raise(error,AnyError,[{Mod,run,L,Loc}|Rest])
     end.
 
 grun2(Subject,RE,{Options,NeedClean}) ->
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index e3e23e09bc..964697cae6 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -1088,7 +1088,7 @@ shell_default(F,As,Bs) ->
     end.
 
 shell_undef(F,A) ->
-    erlang:error({shell_undef,F,A}).
+    erlang:error({shell_undef,F,A,[]}).
 
 local_func_handler(Shell, RT, Ef) ->
     H = fun(Lf) -> 
diff --git a/lib/stdlib/src/sofs.erl b/lib/stdlib/src/sofs.erl
index d38b8ab37a..34eb224647 100644
--- a/lib/stdlib/src/sofs.erl
+++ b/lib/stdlib/src/sofs.erl
@@ -81,7 +81,8 @@
 -define(ORDTAG, 'OrdSet').
 
 -record(?TAG, {data = [] :: list(), type = type :: term()}).
--record(?ORDTAG, {orddata = {} :: tuple(), ordtype = type :: term()}).
+-record(?ORDTAG, {orddata = {} :: tuple() | atom(),
+                  ordtype = type :: term()}).
 
 -define(LIST(S), (S)#?TAG.data).
 -define(TYPE(S), (S)#?TAG.type).
@@ -375,7 +376,7 @@ to_sets(S) when ?IS_ORDSET(S) ->
 
 -spec(no_elements(ASet) -> NoElements when
       ASet :: a_set() | ordset(),
-      NoElements :: pos_integer()).
+      NoElements :: non_neg_integer()).
 no_elements(S) when ?IS_SET(S) ->
     length(?LIST(S));
 no_elements(S) when ?IS_ORDSET(S), is_tuple(?ORDTYPE(S)) ->
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index e60706ed05..f20ea18fd0 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -27,8 +27,6 @@
 	 which_children/1, count_children/1,
 	 check_childspecs/1]).
 
--export([behaviour_info/1]).
-
 %% Internal exports
 -export([init/1, handle_call/3, handle_info/2, terminate/2, code_change/3]).
 -export([handle_cast/2]).
@@ -90,14 +88,12 @@
 
 -define(is_simple(State), State#state.strategy =:= simple_one_for_one).
 
-%%--------------------------------------------------------------------------
-
--spec behaviour_info(atom()) -> 'undefined' | [{atom(), arity()}].
-
-behaviour_info(callbacks) ->
-    [{init,1}];
-behaviour_info(_Other) ->
-    undefined.
+-callback init(Args :: term()) ->
+    {ok, {{RestartStrategy :: strategy(),
+           MaxR            :: non_neg_integer(),
+           MaxT            :: non_neg_integer()},
+           [ChildSpec :: child_spec()]}}
+    | ignore.
 
 %%% ---------------------------------------------------
 %%% This is a general process supervisor built upon gen_server.erl.
@@ -519,9 +515,12 @@ handle_info(Msg, State) ->
 %%
 -spec terminate(term(), state()) -> 'ok'.
 
+terminate(_Reason, #state{children=[Child]} = State) when ?is_simple(State) ->
+    terminate_dynamic_children(Child, dynamics_db(Child#child.restart_type,
+                                                  State#state.dynamics),
+                               State#state.name);
 terminate(_Reason, State) ->
-    terminate_children(State#state.children, State#state.name),
-    ok.
+    terminate_children(State#state.children, State#state.name).
 
 %%
 %% Change code for the supervisor.
@@ -661,6 +660,9 @@ do_restart(_, normal, Child, State) ->
 do_restart(_, shutdown, Child, State) ->
     NState = state_del_child(Child, State),
     {ok, NState};
+do_restart(_, {shutdown, _Term}, Child, State) ->
+    NState = state_del_child(Child, State),
+    {ok, NState};
 do_restart(transient, Reason, Child, State) ->
     report_error(child_terminated, Reason, Child, State#state.name),
     restart(Child, State);
@@ -735,6 +737,13 @@ restart(one_for_all, Child, State) ->
 terminate_children(Children, SupName) ->
     terminate_children(Children, SupName, []).
 
+%% Temporary children should not be restarted and thus should
+%% be skipped when building the list of terminated children, although
+%% we do want them to be shut down as many functions from this module
+%% use this function to just clear everything.
+terminate_children([Child = #child{restart_type=temporary} | Children], SupName, Res) ->
+    do_terminate(Child, SupName),
+    terminate_children(Children, SupName, Res);
 terminate_children([Child | Children], SupName, Res) ->
     NChild = do_terminate(Child, SupName),
     terminate_children(Children, SupName, [NChild | Res]);
@@ -824,8 +833,109 @@ monitor_child(Pid) ->
 	    %% that will be handled in shutdown/2. 
 	    ok   
     end.
-    
-   
+
+
+%%-----------------------------------------------------------------
+%% Func: terminate_dynamic_children/3
+%% Args: Child    = child_rec()
+%%       Dynamics = ?DICT() | ?SET()
+%%       SupName  = {local, atom()} | {global, atom()} | {pid(),Mod}
+%% Returns: ok
+%%
+%%
+%% Shutdown all dynamic children. This happens when the supervisor is
+%% stopped. Because the supervisor can have millions of dynamic children, we
+%% can have an significative overhead here.
+%%-----------------------------------------------------------------
+terminate_dynamic_children(Child, Dynamics, SupName) ->
+    {Pids, EStack0} = monitor_dynamic_children(Child, Dynamics),
+    Sz = ?SETS:size(Pids),
+    EStack = case Child#child.shutdown of
+                 brutal_kill ->
+                     ?SETS:fold(fun(P, _) -> exit(P, kill) end, ok, Pids),
+                     wait_dynamic_children(Child, Pids, Sz, undefined, EStack0);
+                 infinity ->
+                     ?SETS:fold(fun(P, _) -> exit(P, shutdown) end, ok, Pids),
+                     wait_dynamic_children(Child, Pids, Sz, undefined, EStack0);
+                 Time ->
+                     ?SETS:fold(fun(P, _) -> exit(P, shutdown) end, ok, Pids),
+                     TRef = erlang:start_timer(Time, self(), kill),
+                     wait_dynamic_children(Child, Pids, Sz, TRef, EStack0)
+             end,
+    %% Unrool stacked errors and report them
+    ?DICT:fold(fun(Reason, Ls, _) ->
+                       report_error(shutdown_error, Reason,
+                                    Child#child{pid=Ls}, SupName)
+               end, ok, EStack).
+
+
+monitor_dynamic_children(#child{restart_type=temporary}, Dynamics) ->
+    ?SETS:fold(fun(P, {Pids, EStack}) ->
+                       case monitor_child(P) of
+                           ok ->
+                               {?SETS:add_element(P, Pids), EStack};
+                           {error, normal} ->
+                               {Pids, EStack};
+                           {error, Reason} ->
+                               {Pids, ?DICT:append(Reason, P, EStack)}
+                       end
+               end, {?SETS:new(), ?DICT:new()}, Dynamics);
+monitor_dynamic_children(#child{restart_type=RType}, Dynamics) ->
+    ?DICT:fold(fun(P, _, {Pids, EStack}) ->
+                       case monitor_child(P) of
+                           ok ->
+                               {?SETS:add_element(P, Pids), EStack};
+                           {error, normal} when RType =/= permanent ->
+                               {Pids, EStack};
+                           {error, Reason} ->
+                               {Pids, ?DICT:append(Reason, P, EStack)}
+                       end
+               end, {?SETS:new(), ?DICT:new()}, Dynamics).
+
+
+wait_dynamic_children(_Child, _Pids, 0, undefined, EStack) ->
+    EStack;
+wait_dynamic_children(_Child, _Pids, 0, TRef, EStack) ->
+	%% If the timer has expired before its cancellation, we must empty the
+	%% mail-box of the 'timeout'-message.
+    erlang:cancel_timer(TRef),
+    receive
+        {timeout, TRef, kill} ->
+            EStack
+    after 0 ->
+            EStack
+    end;
+wait_dynamic_children(#child{shutdown=brutal_kill} = Child, Pids, Sz,
+                      TRef, EStack) ->
+    receive
+        {'DOWN', _MRef, process, Pid, killed} ->
+            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+                                  TRef, EStack);
+
+        {'DOWN', _MRef, process, Pid, Reason} ->
+            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+                                  TRef, ?DICT:append(Reason, Pid, EStack))
+    end;
+wait_dynamic_children(#child{restart_type=RType} = Child, Pids, Sz,
+                      TRef, EStack) ->
+    receive
+        {'DOWN', _MRef, process, Pid, shutdown} ->
+            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+                                  TRef, EStack);
+
+        {'DOWN', _MRef, process, Pid, normal} when RType =/= permanent ->
+            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+                                  TRef, EStack);
+
+        {'DOWN', _MRef, process, Pid, Reason} ->
+            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+                                  TRef, ?DICT:append(Reason, Pid, EStack));
+
+        {timeout, TRef, kill} ->
+            ?SETS:fold(fun(P, _) -> exit(P, kill) end, ok, Pids),
+            wait_dynamic_children(Child, Pids, Sz-1, undefined, EStack)
+    end.
+
 %%-----------------------------------------------------------------
 %% Child/State manipulating functions.
 %%-----------------------------------------------------------------
@@ -1047,7 +1157,7 @@ validRestartType(RestartType) -> throw({invalid_restart_type, RestartType}).
 
 validShutdown(Shutdown, _) 
   when is_integer(Shutdown), Shutdown > 0 -> true;
-validShutdown(infinity, supervisor)    -> true;
+validShutdown(infinity, _)             -> true;
 validShutdown(brutal_kill, _)          -> true;
 validShutdown(Shutdown, _)             -> throw({invalid_shutdown, Shutdown}).
 
@@ -1128,12 +1238,19 @@ report_error(Error, Reason, Child, SupName) ->
     error_logger:error_report(supervisor_report, ErrorMsg).
 
 
-extract_child(Child) ->
+extract_child(Child) when is_pid(Child#child.pid) ->
     [{pid, Child#child.pid},
      {name, Child#child.name},
      {mfargs, Child#child.mfargs},
      {restart_type, Child#child.restart_type},
      {shutdown, Child#child.shutdown},
+     {child_type, Child#child.child_type}];
+extract_child(Child) ->
+    [{nb_children, length(Child#child.pid)},
+     {name, Child#child.name},
+     {mfargs, Child#child.mfargs},
+     {restart_type, Child#child.restart_type},
+     {shutdown, Child#child.shutdown},
      {child_type, Child#child.child_type}].
 
 report_progress(Child, SupName) ->
diff --git a/lib/stdlib/src/supervisor_bridge.erl b/lib/stdlib/src/supervisor_bridge.erl
index 555cb5a66f..e8405ab9a4 100644
--- a/lib/stdlib/src/supervisor_bridge.erl
+++ b/lib/stdlib/src/supervisor_bridge.erl
@@ -22,15 +22,14 @@
 
 %% External exports
 -export([start_link/2, start_link/3]).
--export([behaviour_info/1]).
 %% Internal exports
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2]).
 -export([code_change/3]).
 
-behaviour_info(callbacks) ->
-    [{init,1},{terminate,2}];
-behaviour_info(_Other) ->
-    undefined.
+-callback init(Args :: term()) ->
+    {ok, Pid :: pid(), State :: term()} | ignore | {error, Error :: term()}.
+-callback terminate(Reason :: (shutdown | term()), State :: term()) ->
+    Ignored :: term().
 
 %%%-----------------------------------------------------------------
 %%% This is a rewrite of supervisor_bridge from BS.3.
diff --git a/lib/stdlib/src/sys.erl b/lib/stdlib/src/sys.erl
index 8ab72c9b50..f34201604c 100644
--- a/lib/stdlib/src/sys.erl
+++ b/lib/stdlib/src/sys.erl
@@ -154,7 +154,7 @@ log_to_file(Name, FileName, Timeout) ->
 -spec statistics(Name, Flag) -> 'ok' | {'ok', Statistics} when
       Name :: name(),
       Flag :: 'true' | 'false' | 'get',
-      Statistics :: [StatisticsTuple],
+      Statistics :: [StatisticsTuple] | no_statistics,
       StatisticsTuple :: {'start_time', DateTime1}
                        | {'current_time', DateTime2}
                        | {'reductions', non_neg_integer()}
@@ -168,7 +168,7 @@ statistics(Name, Flag) ->
 -spec statistics(Name, Flag, Timeout) -> 'ok' | {'ok', Statistics} when
       Name :: name(),
       Flag :: 'true' | 'false' | 'get',
-      Statistics :: [StatisticsTuple],
+      Statistics :: [StatisticsTuple] | no_statistics,
       StatisticsTuple :: {'start_time', DateTime1}
                        | {'current_time', DateTime2}
                        | {'reductions', non_neg_integer()}
diff --git a/lib/stdlib/src/timer.erl b/lib/stdlib/src/timer.erl
index e3d6c905b6..689e42051f 100644
--- a/lib/stdlib/src/timer.erl
+++ b/lib/stdlib/src/timer.erl
@@ -199,7 +199,7 @@ tc(M, F, A) ->
 %% Calculate the time difference (in microseconds) of two
 %% erlang:now() timestamps, T2-T1.
 %%
--spec now_diff(T1, T2) -> Tdiff when
+-spec now_diff(T2, T1) -> Tdiff when
       T1 :: erlang:timestamp(),
       T2 :: erlang:timestamp(),
       Tdiff :: integer().
diff --git a/lib/stdlib/src/unicode.erl b/lib/stdlib/src/unicode.erl
index a5d9965ca2..e9b90befe6 100644
--- a/lib/stdlib/src/unicode.erl
+++ b/lib/stdlib/src/unicode.erl
@@ -73,7 +73,7 @@ characters_to_list_int(ML, Encoding) ->
 			   _ ->
 			       badarg
 		       end,
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [ML,Encoding])),
 	    erlang:raise(error,TheError,[{Mod,characters_to_list,L}|Rest])
@@ -109,7 +109,7 @@ characters_to_binary(ML) ->
 			   _ ->
 			       badarg
 		       end,
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [ML])),
 	    erlang:raise(error,TheError,[{Mod,characters_to_binary,L}|Rest])
@@ -127,7 +127,7 @@ characters_to_binary_int(ML,InEncoding) ->
 			   _ ->
 			       badarg
 		       end,
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [ML,InEncoding])),
 	    erlang:raise(error,TheError,[{Mod,characters_to_binary,L}|Rest])
@@ -159,7 +159,7 @@ characters_to_binary(ML, latin1, Uni) when is_binary(ML) and ((Uni =:= utf8) or
 				       _ ->
 					   badarg
 				   end,
-			{'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+			{'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 			    (catch erlang:error(new_stacktrace,
 						[ML,latin1,Uni])),
 			erlang:raise(error,TheError,
@@ -181,7 +181,7 @@ characters_to_binary(ML,Uni,latin1) when is_binary(ML) and ((Uni =:= utf8) or
 				       _ ->
 					   badarg
 				   end,
-			{'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+			{'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 			    (catch erlang:error(new_stacktrace,
 						[ML,Uni,latin1])),
 			erlang:raise(error,TheError,
@@ -200,7 +200,7 @@ characters_to_binary(ML, InEncoding, OutEncoding) ->
 			   _ ->
 			       badarg
 		       end,
-	    {'EXIT',{new_stacktrace,[{Mod,_,L}|Rest]}} = 
+	    {'EXIT',{new_stacktrace,[{Mod,_,L,_}|Rest]}} =
 		(catch erlang:error(new_stacktrace,
 				    [ML,InEncoding,OutEncoding])),
 	    erlang:raise(error,TheError,[{Mod,characters_to_binary,L}|Rest])
diff --git a/lib/stdlib/src/zip.erl b/lib/stdlib/src/zip.erl
index 524d709431..c82c8159b6 100644
--- a/lib/stdlib/src/zip.erl
+++ b/lib/stdlib/src/zip.erl
@@ -223,7 +223,7 @@ openzip_open(F, Options) ->
 do_openzip_open(F, Options) ->
     Opts = get_openzip_options(Options),
     #openzip_opts{output = Output, open_opts = OpO, cwd = CWD} = Opts,
-    Input = get_zip_input(F),
+    Input = get_input(F),
     In0 = Input({open, F, OpO -- [write]}, []),
     {[#zip_comment{comment = C} | Files], In1} =
 	get_central_dir(In0, fun raw_file_info_etc/5, Input),
@@ -489,7 +489,7 @@ do_list_dir(F, Options) ->
 %% Print zip directory in short form
 
 -spec(t(Archive) -> ok when
-      Archive :: file:name() | binary | ZipHandle,
+      Archive :: file:name() | binary() | ZipHandle,
       ZipHandle :: pid()).
 
 t(F) when is_pid(F) -> zip_t(F);
@@ -513,7 +513,7 @@ do_t(F, RawPrint) ->
 %% Print zip directory in long form (like ls -l)
 
 -spec(tt(Archive) -> ok when
-      Archive :: file:name() | binary | ZipHandle,
+      Archive :: file:name() | binary() | ZipHandle,
       ZipHandle :: pid()).
 
 tt(F) when is_pid(F) -> zip_tt(F);
@@ -1174,7 +1174,7 @@ zip_get(Pid) when is_pid(Pid) ->
 zip_close(Pid) when is_pid(Pid) ->
     request(self(), Pid, close).
 
--spec(zip_get(FileName, ZipHandle) -> {ok, [Result]} | {error, Reason} when
+-spec(zip_get(FileName, ZipHandle) -> {ok, Result} | {error, Reason} when
       FileName :: file:name(),
       ZipHandle :: pid(),
       Result :: file:name() | {file:name(), binary()},
@@ -1183,7 +1183,7 @@ zip_close(Pid) when is_pid(Pid) ->
 zip_get(FileName, Pid) when is_pid(Pid) ->
     request(self(), Pid, {get, FileName}).
 
--spec(zip_list_dir(ZipHandle) -> Result | {error, Reason} when
+-spec(zip_list_dir(ZipHandle) -> {ok, Result} | {error, Reason} when
       Result :: [zip_comment() | zip_file()],
       ZipHandle :: pid(),
       Reason :: term()).
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile
index 5502c69fa5..aa6a660c34 100644
--- a/lib/stdlib/test/Makefile
+++ b/lib/stdlib/test/Makefile
@@ -65,6 +65,7 @@ MODULES= \
 	stdlib_SUITE \
 	string_SUITE \
 	supervisor_1 \
+	supervisor_2 \
 	naughty_child \
 	shell_SUITE \
 	supervisor_SUITE \
diff --git a/lib/stdlib/test/beam_lib_SUITE.erl b/lib/stdlib/test/beam_lib_SUITE.erl
index 4ccc863795..5df19ca7f1 100644
--- a/lib/stdlib/test/beam_lib_SUITE.erl
+++ b/lib/stdlib/test/beam_lib_SUITE.erl
@@ -181,7 +181,8 @@ error(Conf) when is_list(Conf) ->
     ?line verify(not_a_beam_file, beam_lib:info(<<"short">>)),
 
     ?line {Binary1, _} = split_binary(Binary, byte_size(Binary)-10),
-    ?line verify(chunk_too_big, beam_lib:chunks(Binary1, ["Abst"])),
+    LastChunk = last_chunk(Binary),
+    ?line verify(chunk_too_big, beam_lib:chunks(Binary1, [LastChunk])),
     ?line Chunks = chunk_info(Binary),
     ?line {value, {_, AbstractStart, _}} = lists:keysearch("Abst", 1, Chunks),
     ?line {Binary2, _} = split_binary(Binary, AbstractStart),
@@ -205,6 +206,12 @@ error(Conf) when is_list(Conf) ->
     ?line file:delete(ACopy),
     ok.
 
+last_chunk(Bin) ->
+    L = beam_lib:info(Bin),
+    {chunks,Chunks} = lists:keyfind(chunks, 1, L),
+    {Last,_,_} = lists:last(Chunks),
+    Last.
+
 do_error(BeamFile, ACopy) ->
     % evil tests
     ?line Chunks = chunk_info(BeamFile),
@@ -242,8 +249,8 @@ cmp(doc) -> ["Compare contents of BEAM files and directories"];
 cmp(Conf) when is_list(Conf) ->
     ?line PrivDir = ?privdir,
 
-    ?line Dir1 = filename:join(PrivDir, dir1),
-    ?line Dir2 = filename:join(PrivDir, dir2),
+    ?line Dir1 = filename:join(PrivDir, "dir1"),
+    ?line Dir2 = filename:join(PrivDir, "dir2"),
 
     ok = file:make_dir(Dir1),
     ok = file:make_dir(Dir2),
@@ -292,8 +299,8 @@ cmp_literals(doc) -> ["Compare contents of BEAM files having literals"];
 cmp_literals(Conf) when is_list(Conf) ->
     ?line PrivDir = ?privdir,
 
-    ?line Dir1 = filename:join(PrivDir, dir1),
-    ?line Dir2 = filename:join(PrivDir, dir2),
+    ?line Dir1 = filename:join(PrivDir, "dir1"),
+    ?line Dir2 = filename:join(PrivDir, "dir2"),
 
     ok = file:make_dir(Dir1),
     ok = file:make_dir(Dir2),
@@ -330,6 +337,7 @@ strip(Conf) when is_list(Conf) ->
     ?line {Source2D1, BeamFile2D1} = make_beam(PrivDir, simple2, concat),
     ?line {Source3D1, BeamFile3D1} = make_beam(PrivDir, make_fun, make_fun),
     ?line {Source4D1, BeamFile4D1} = make_beam(PrivDir, constant, constant),
+    ?line {Source5D1, BeamFile5D1} = make_beam(PrivDir, lines, lines),
 
     ?line NoOfTables = length(ets:all()),
     ?line P0 = pps(),
@@ -360,13 +368,25 @@ strip(Conf) when is_list(Conf) ->
     ?line {module, make_fun} = code:load_abs(filename:rootname(BeamFile3D1)),
     ?line {module, constant} = code:load_abs(filename:rootname(BeamFile4D1)),
 
+    %% check that line number information is still present after stripping
+    ?line {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
+    ?line {'EXIT',{badarith,[{lines,t,1,Info}|_]}} =
+	(catch lines:t(atom)),
+    ?line true = code:delete(lines),
+    ?line false = code:purge(lines),
+    ?line {ok, {lines,BeamFile5D1}} = beam_lib:strip(BeamFile5D1),
+    ?line {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
+    ?line {'EXIT',{badarith,[{lines,t,1,Info}|_]}} =
+	(catch lines:t(atom)),
+
     ?line true = (P0 == pps()),
     ?line NoOfTables = length(ets:all()),
 
     ?line delete_files([SourceD1, BeamFileD1, 
 			Source2D1, BeamFile2D1, 
 			Source3D1, BeamFile3D1,
-			Source4D1, BeamFile4D1]),
+			Source4D1, BeamFile4D1,
+			Source5D1, BeamFile5D1]),
     ok.
 
 
@@ -381,7 +401,7 @@ otp_6711(Conf) when is_list(Conf) ->
         (catch {a, beam_lib:strip_files([3])}),
 
     ?line PrivDir = ?privdir,
-    ?line Dir = filename:join(PrivDir, dir),
+    ?line Dir = filename:join(PrivDir, "dir"),
     ?line Lib = filename:join(Dir, "lib"),
     ?line App = filename:join(Lib, "app"),
     ?line EBin = filename:join(App, "ebin"),
@@ -417,8 +437,8 @@ building(doc) -> "Testing building of BEAM files.";
 building(Conf) when is_list(Conf) ->
     ?line PrivDir = ?privdir,
 
-    ?line Dir1 = filename:join(PrivDir, b_dir1),
-    ?line Dir2 = filename:join(PrivDir, b_dir2),
+    ?line Dir1 = filename:join(PrivDir, "b_dir1"),
+    ?line Dir2 = filename:join(PrivDir, "b_dir2"),
 
     ok = file:make_dir(Dir1),
     ok = file:make_dir(Dir2),
@@ -571,8 +591,18 @@ do_encrypted_abstr(Beam, Key) ->
     ?line {ok,{simple,[{"Abst",Abst}]}} = beam_lib:chunks(Beam, ["Abst"]),
 
     ?line {ok,cleared} = beam_lib:clear_crypto_key_fun(),
+
+    %% Try to force a stop/start race.
+    ?line start_stop_race(10000),
+
     ok.
 
+start_stop_race(0) ->
+    ok;
+start_stop_race(N) ->
+    {error,_} = beam_lib:crypto_key_fun(bad_fun),
+    undefined = beam_lib:clear_crypto_key_fun(),
+    start_stop_race(N-1).
 
 bad_fun(F) ->
     {error,E} = beam_lib:crypto_key_fun(F),
@@ -688,7 +718,7 @@ chunk_info(File) ->
     Chunks.
     
 make_beam(Dir, Module, F) ->
-    ?line FileBase = filename:join(Dir, Module),
+    ?line FileBase = filename:join(Dir, atom_to_list(Module)),
     ?line Source = FileBase ++ ".erl",
     ?line BeamFile = FileBase ++ ".beam",
     ?line simple_file(Source, Module, F),
@@ -773,6 +803,12 @@ simple_file(File, Module, constant2) ->
 			"t(A) -> "
 			"    {a,b,[2,3],x,y}. "]),
     ok = file:write_file(File, B);
+simple_file(File, Module, lines) ->
+    B = list_to_binary(["-module(", atom_to_list(Module), ").\n"
+			"-export([t/1]).\n"
+			"t(A) ->\n"
+			"    A+1.\n"]),
+    ok = file:write_file(File, B);
 simple_file(File, Module, F) ->
     B = list_to_binary(["-module(", atom_to_list(Module), "). "
 			"-export([t/0]). "
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index 698070368f..6f77cff2b9 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -34,6 +34,8 @@
 -define(datadir(Conf), ?config(data_dir, Conf)).
 -endif.
 
+-compile(r13). % OTP-9607
+
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
 	 not_run/1, newly_started/1, basic_v8/1, basic_v9/1,
@@ -53,7 +55,7 @@
          simultaneous_open/1, insert_new/1, repair_continuation/1,
          otp_5487/1, otp_6206/1, otp_6359/1, otp_4738/1, otp_7146/1,
          otp_8070/1, otp_8856/1, otp_8898/1, otp_8899/1, otp_8903/1,
-         otp_8923/1, otp_9282/1]).
+         otp_8923/1, otp_9282/1, otp_9607/1]).
 
 -export([dets_dirty_loop/0]).
 
@@ -112,7 +114,7 @@ all() ->
 	     many_clients, otp_4906, otp_5402, simultaneous_open,
 	     insert_new, repair_continuation, otp_5487, otp_6206,
 	     otp_6359, otp_4738, otp_7146, otp_8070, otp_8856, otp_8898,
-	     otp_8899, otp_8903, otp_8923, otp_9282]
+	     otp_8899, otp_8903, otp_8923, otp_9282, otp_9607]
     end.
 
 groups() -> 
@@ -554,7 +556,11 @@ dets_dirty_loop() ->
 	{From, [write, Name, Value]} ->
 	    Ret = dets:insert(Name, Value),
 	    From ! {self(), Ret},
-	    dets_dirty_loop()
+	    dets_dirty_loop();
+        {From, [close, Name]} ->
+            Ret = dets:close(Name),
+            From ! {self(), Ret},
+            dets_dirty_loop()
     end.
 
 
@@ -1516,7 +1522,7 @@ repair(Config, V) ->
     if 
         V =:= 8 ->
             %% first estimated number of objects is wrong, repair once more
-            ?line {ok, Fd} = file:open(Fname, read_write),
+            ?line {ok, Fd} = file:open(Fname, [read,write]),
             NoPos = HeadSize - 8,  % no_objects
             ?line file:pwrite(Fd, NoPos, <<0:32>>), % NoItems
             ok = file:close(Fd),
@@ -1568,8 +1574,10 @@ repair(Config, V) ->
     ?line FileSize = dets:info(TabRef, memory),
     ?line ok = dets:close(TabRef),
     crash(Fname, FileSize+20),
-    ?line {error, {bad_freelists, Fname}} = 
+    %% Used to return bad_freelists, but that changed in OTP-9622
+    ?line {ok, TabRef} =
 	dets:open_file(TabRef, [{file,Fname},{version,V}]),
+    ?line ok = dets:close(TabRef),
     ?line file:delete(Fname),
 
     %% File not closed, opening with read and read_write access tried.
@@ -1857,10 +1865,10 @@ fixtable(Config, Version) when is_list(Config) ->
     ?line {ok, _} = dets:open_file(T, Args),
 
     %% badarg
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true]}|_]}} =
-	(catch dets:safe_fixtable(no_table,true)),
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[T,undefined]}|_]}} =
-	(catch dets:safe_fixtable(T,undefined)),
+    ?line check_badarg(catch dets:safe_fixtable(no_table,true),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:safe_fixtable(T,undefined),
+		       dets, safe_fixtable, [T,undefined]),
 
     %% The table is not allowed to grow while the elements are inserted:
 
@@ -1940,22 +1948,22 @@ match(Config, Version) ->
 
     %% match, badarg
     MSpec = [{'_',[],['$_']}],
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true]}|_]}} = 
-	(catch dets:match(no_table, '_')),
-    ?line {'EXIT', {badarg, [{dets,match,[T,'_',not_a_number]}|_]}} = 
-	(catch dets:match(T, '_', not_a_number)),
+    ?line check_badarg(catch dets:match(no_table, '_'),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:match(T, '_', not_a_number),
+		       dets, match, [T,'_',not_a_number]),
     ?line {EC1, _} = dets:select(T, MSpec, 1),
-    ?line {'EXIT', {badarg, [{dets,match,[EC1]}|_]}} = 
-	(catch dets:match(EC1)),
+    ?line check_badarg(catch dets:match(EC1),
+		       dets, match, [EC1]),
 
     %% match_object, badarg
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true]}|_]}} = 
-	(catch dets:match_object(no_table, '_')),
-    ?line {'EXIT', {badarg, [{dets,match_object,[T,'_',not_a_number]}|_]}} = 
-	(catch dets:match_object(T, '_', not_a_number)),
+    ?line check_badarg(catch dets:match_object(no_table, '_'),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:match_object(T, '_', not_a_number),
+		       dets, match_object, [T,'_',not_a_number]),
     ?line {EC2, _} = dets:select(T, MSpec, 1),
-    ?line {'EXIT', {badarg, [{dets,match_object,[EC2]}|_]}} = 
-	(catch dets:match_object(EC2)),
+    ?line check_badarg(catch dets:match_object(EC2),
+		       dets, match_object, [EC2]),
 
     dets:safe_fixtable(T, true),
     ?line {[_, _], C1} = dets:match_object(T, '_', 2),
@@ -2118,17 +2126,17 @@ select(Config, Version) ->
 
     %% badarg
     MSpec = [{'_',[],['$_']}],
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true]}|_]}} = 
-	(catch dets:select(no_table, MSpec)),
-    ?line {'EXIT', {badarg, [{dets,select,[T,<<17>>]}|_]}} = 
-	(catch dets:select(T, <<17>>)),
-    ?line {'EXIT', {badarg, [{dets,select,[T,[]]}|_]}} = 
-	(catch dets:select(T, [])),
-    ?line {'EXIT', {badarg, [{dets,select,[T,MSpec,not_a_number]}|_]}} = 
-	(catch dets:select(T, MSpec, not_a_number)),
+    ?line check_badarg(catch dets:select(no_table, MSpec),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:select(T, <<17>>),
+		       dets, select, [T,<<17>>]),
+    ?line check_badarg(catch dets:select(T, []),
+		       dets, select, [T,[]]),
+    ?line check_badarg(catch dets:select(T, MSpec, not_a_number),
+		       dets, select, [T,MSpec,not_a_number]),
     ?line {EC, _} = dets:match(T, '_', 1),
-    ?line {'EXIT', {badarg, [{dets,select,[EC]}|_]}} = 
-	(catch dets:select(EC)),
+    ?line check_badarg(catch dets:select(EC),
+		       dets, select, [EC]),
 
     AllSpec = [{'_',[],['$_']}],
 
@@ -2210,8 +2218,8 @@ update_counter(Config) when is_list(Config) ->
     ?line file:delete(Fname),
     P0 = pps(),
 
-    ?line {'EXIT', {badarg, [{dets,update_counter,[no_table,1,1]}|_]}} = 
-	(catch dets:update_counter(no_table, 1, 1)),
+    ?line check_badarg(catch dets:update_counter(no_table, 1, 1),
+		       dets, update_counter, [no_table,1,1]),
 
     Args = [{file,Fname},{keypos,2}],
     ?line {ok, _} = dets:open_file(T, [{type,set} | Args]),
@@ -2254,66 +2262,66 @@ badarg(Config) when is_list(Config) ->
     %% badargs are tested in match, select and fixtable too.
 
     %% open
-    ?line {'EXIT', {badarg, [{dets,open_file,[{a,tuple},[]]}|_]}} = 
-	(catch dets:open_file({a,tuple},[])),
-    ?line {'EXIT', {badarg, [{dets,open_file,[{a,tuple}]}|_]}} = 
-	(catch dets:open_file({a,tuple})),
-    ?line {'EXIT', {badarg, [{dets,open_file,[file,[foo]]}|_]}} = 
-	(catch dets:open_file(file,[foo])),
-    ?line {'EXIT', {badarg,[{dets,open_file,[{hej,san},[{type,set}|3]]}|_]}} =
-	(catch dets:open_file({hej,san},[{type,set}|3])),
+    ?line check_badarg(catch dets:open_file({a,tuple},[]),
+		       dets, open_file, [{a,tuple},[]]),
+    ?line check_badarg(catch dets:open_file({a,tuple}),
+		       dets, open_file,[{a,tuple}]),
+    ?line check_badarg(catch dets:open_file(file,[foo]),
+		       dets, open_file, [file,[foo]]),
+    ?line check_badarg(catch dets:open_file({hej,san},[{type,set}|3]),
+		       dets, open_file, [{hej,san},[{type,set}|3]]),
 
     %% insert
-    ?line {'EXIT', {badarg, [{dets,insert,[no_table,{1,2}]}|_]}} = 
-	(catch dets:insert(no_table, {1,2})),
-    ?line {'EXIT', {badarg, [{dets,insert,[no_table,[{1,2}]]}|_]}} = 
-	(catch dets:insert(no_table, [{1,2}])),
-    ?line {'EXIT', {badarg, [{dets,insert,[T,{1,2}]}|_]}} = 
-	(catch dets:insert(T, {1,2})),
-    ?line {'EXIT', {badarg, [{dets,insert,[T,[{1,2}]]}|_]}} = 
-	(catch dets:insert(T, [{1,2}])),
-    ?line {'EXIT', {badarg, [{dets,insert,[T,[{1,2,3}|3]]}|_]}} = 
-	      (catch dets:insert(T, [{1,2,3} | 3])),
+    ?line check_badarg(catch dets:insert(no_table, {1,2}),
+		       dets, insert, [no_table,{1,2}]),
+    ?line check_badarg(catch dets:insert(no_table, [{1,2}]),
+		       dets, insert, [no_table,[{1,2}]]),
+    ?line check_badarg(catch dets:insert(T, {1,2}),
+		       dets, insert, [T,{1,2}]),
+    ?line check_badarg(catch dets:insert(T, [{1,2}]),
+		       dets, insert, [T,[{1,2}]]),
+    ?line check_badarg(catch dets:insert(T, [{1,2,3} | 3]),
+		       dets, insert, [T,[{1,2,3}|3]]),
 
     %% lookup{_keys}
-    ?line {'EXIT', {badarg, [{dets,lookup_keys,[badarg,[]]}|_]}} = 
-	(catch dets:lookup_keys(T, [])),
-    ?line {'EXIT', {badarg, [{dets,lookup,[no_table,1]}|_]}} = 
-	(catch dets:lookup(no_table, 1)),
-    ?line {'EXIT', {badarg, [{dets,lookup_keys,[T,[1|2]]}|_]}} = 
-	(catch dets:lookup_keys(T, [1 | 2])),
+    ?line check_badarg(catch dets:lookup_keys(T, []),
+		       dets, lookup_keys, [badarg,[]]),
+    ?line check_badarg(catch dets:lookup(no_table, 1),
+		       dets, lookup, [no_table,1]),
+    ?line check_badarg(catch dets:lookup_keys(T, [1 | 2]),
+		       dets, lookup_keys, [T,[1|2]]),
 
     %% member
-    ?line {'EXIT', {badarg, [{dets,member,[no_table,1]}|_]}} = 
-	(catch dets:member(no_table, 1)),
+    ?line check_badarg(catch dets:member(no_table, 1),
+		       dets, member, [no_table,1]),
 
     %% sync
-    ?line {'EXIT', {badarg, [{dets,sync,[no_table]}|_]}} = 
-	(catch dets:sync(no_table)),
+    ?line check_badarg(catch dets:sync(no_table),
+		       dets, sync, [no_table]),
 
     %% delete{_keys}
-    ?line {'EXIT', {badarg, [{dets,delete,[no_table,1]}|_]}} = 
-	(catch dets:delete(no_table, 1)),
+    ?line check_badarg(catch dets:delete(no_table, 1),
+		       dets, delete, [no_table,1]),
 
     %% delete_object
-    ?line {'EXIT', {badarg, [{dets,delete_object,[no_table,{1,2,3}]}|_]}} = 
-	(catch dets:delete_object(no_table, {1,2,3})),
-    ?line {'EXIT', {badarg, [{dets,delete_object,[T,{1,2}]}|_]}} = 
-	(catch dets:delete_object(T, {1,2})),
-    ?line {'EXIT', {badarg, [{dets,delete_object,[no_table,[{1,2,3}]]}|_]}} = 
-	(catch dets:delete_object(no_table, [{1,2,3}])),
-    ?line {'EXIT', {badarg, [{dets,delete_object,[T,[{1,2}]]}|_]}} = 
-	(catch dets:delete_object(T, [{1,2}])),
-    ?line {'EXIT', {badarg, [{dets,delete_object,[T,[{1,2,3}|3]]}|_]}} = 
-	(catch dets:delete_object(T, [{1,2,3} | 3])),
+    ?line check_badarg(catch dets:delete_object(no_table, {1,2,3}),
+		       dets, delete_object, [no_table,{1,2,3}]),
+    ?line check_badarg(catch dets:delete_object(T, {1,2}),
+		       dets, delete_object, [T,{1,2}]),
+    ?line check_badarg(catch dets:delete_object(no_table, [{1,2,3}]),
+		       dets, delete_object, [no_table,[{1,2,3}]]),
+    ?line check_badarg(catch dets:delete_object(T, [{1,2}]),
+		       dets, delete_object, [T,[{1,2}]]),
+    ?line check_badarg(catch dets:delete_object(T, [{1,2,3} | 3]),
+		       dets, delete_object, [T,[{1,2,3}|3]]),
 
     %% first,next,slot
-    ?line {'EXIT', {badarg, [{dets,first,[no_table]}|_]}} =
-	(catch dets:first(no_table)),
-    ?line {'EXIT', {badarg, [{dets,next,[no_table,1]}|_]}} =
-	(catch dets:next(no_table, 1)),
-    ?line {'EXIT', {badarg, [{dets,slot,[no_table,0]}|_]}} =
-	(catch dets:slot(no_table, 0)),
+    ?line check_badarg(catch dets:first(no_table),
+		       dets, first, [no_table]),
+    ?line check_badarg(catch dets:next(no_table, 1),
+		       dets, next, [no_table,1]),
+    ?line check_badarg(catch dets:slot(no_table, 0),
+		       dets, slot, [no_table,0]),
 
     %% info
     ?line undefined = dets:info(no_table),
@@ -2321,27 +2329,27 @@ badarg(Config) when is_list(Config) ->
     ?line undefined = dets:info(T, foo),
 
     %% match_delete
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true]}|_]}} = 
-	(catch dets:match_delete(no_table, '_')),
+    ?line check_badarg(catch dets:match_delete(no_table, '_'),
+		       dets, safe_fixtable, [no_table,true]),
 
     %% delete_all_objects
-    ?line {'EXIT', {badarg, [{dets,delete_all_objects,[no_table]}|_]}} = 
-	(catch dets:delete_all_objects(no_table)),
+    ?line check_badarg(catch dets:delete_all_objects(no_table),
+		       dets, delete_all_objects, [no_table]),
 
     %% select_delete
     MSpec = [{'_',[],['$_']}],
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true]}|_]}} = 
-	(catch dets:select_delete(no_table, MSpec)),
-    ?line {'EXIT', {badarg, [{dets,select_delete,[T, <<17>>]}|_]}} = 
-	(catch dets:select_delete(T, <<17>>)),
+    ?line check_badarg(catch dets:select_delete(no_table, MSpec),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:select_delete(T, <<17>>),
+		       dets, select_delete, [T, <<17>>]),
 
     %% traverse, fold
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true]}|_]}} = 
-	(catch dets:traverse(no_table, fun(_) -> continue end)),
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true]}|_]}} = 
-	(catch dets:foldl(fun(_, A) -> A end, [], no_table)),
-    ?line {'EXIT', {badarg, [{dets,safe_fixtable,[no_table,true]}|_]}} = 
-	(catch dets:foldr(fun(_, A) -> A end, [], no_table)),
+    ?line check_badarg(catch dets:traverse(no_table, fun(_) -> continue end),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:foldl(fun(_, A) -> A end, [], no_table),
+		       dets, safe_fixtable, [no_table,true]),
+    ?line check_badarg(catch dets:foldr(fun(_, A) -> A end, [], no_table),
+		       dets, safe_fixtable, [no_table,true]),
 
     %% close
     ?line ok = dets:close(T),
@@ -2349,15 +2357,16 @@ badarg(Config) when is_list(Config) ->
     ?line {error, not_owner} = dets:close(T),
 
     %% init_table
-    ?line {'EXIT', {badarg,[{dets,init_table,[no_table,_,[]]}|_]}} =
-	(catch dets:init_table(no_table, fun(X) -> X end)),
-    ?line {'EXIT', {badarg,[{dets,init_table,[no_table,_,[]]}|_]}} =
-	(catch dets:init_table(no_table, fun(X) -> X end, [])),
+    IF = fun(X) -> X end,
+    ?line check_badarg(catch dets:init_table(no_table, IF),
+		       dets, init_table, [no_table,IF,[]]),
+    ?line check_badarg(catch dets:init_table(no_table, IF, []),
+		       dets, init_table, [no_table,IF,[]]),
 
     %% from_ets
     Ets = ets:new(ets,[]),
-    ?line {'EXIT', {badarg,[{dets,from_ets,[no_table,_]}|_]}} =
-	(catch dets:from_ets(no_table, Ets)),
+    ?line check_badarg(catch dets:from_ets(no_table, Ets),
+		       dets, from_ets, [no_table,Ets]),
     ets:delete(Ets),
 
     ?line {ok, T} = dets:open_file(T, Args),
@@ -3247,7 +3256,7 @@ otp_5402(suite) ->
     [];
 otp_5402(Config) when is_list(Config) ->
     Tab = otp_5402,
-    ?line File = filename:join([cannot, write, this, file]),
+    ?line File = filename:join(["cannot", "write", "this", "file"]),
 
     %% close
     ?line{ok, T} = dets:open_file(Tab, [{ram_file,true},
@@ -3879,15 +3888,96 @@ some_calls(Tab, Config) ->
     ?line ok = dets:close(T),
     file:delete(File).
 
+otp_9607(doc) ->
+    ["OTP-9607. Test downgrading the slightly changed format."];
+otp_9607(suite) ->
+    [];
+otp_9607(Config) when is_list(Config) ->
+    %% Note: the bug is about almost full tables. The fix of that
+    %% problem is *not* tested here.
+    Version = r13b,
+    case ?t:is_release_available(atom_to_list(Version)) of
+        true ->
+            T = otp_9607,
+            File = filename(T, Config),
+            Key = a,
+            Value = 1,
+            Args = [{file,File}],
+            ?line {ok, T} = dets:open_file(T, Args),
+            ?line ok = dets:insert(T, {Key, Value}),
+            ?line ok = dets:close(T),
+
+            ?line Call = fun(P, A) ->
+                                 P ! {self(), A},
+                                 receive
+                                     {P, Ans} ->
+                                         Ans
+                                 after 5000 ->
+                                         exit(other_process_dead)
+                                 end
+                         end,
+            %% Create a file on the modified format, read the file
+            %% with an emulator that doesn't know about the modified
+            %% format.
+            ?line {ok, Node} = start_node_rel(Version, Version, slave),
+            ?line Pid = rpc:call(Node, erlang, spawn,
+                                 [?MODULE, dets_dirty_loop, []]),
+            ?line {error,{needs_repair, File}} =
+                Call(Pid, [open, T, Args++[{repair,false}]]),
+            io:format("Expect repair:~n"),
+            ?line {ok, T} = Call(Pid, [open, T, Args]),
+            ?line [{Key,Value}] = Call(Pid, [read, T, Key]),
+            ?line ok = Call(Pid, [close, T]),
+            file:delete(File),
+
+            %% Create a file on the unmodified format. Modify the file
+            %% using an emulator that must not turn the file into the
+            %% modified format. Read the file and make sure it is not
+            %% repaired.
+            ?line {ok, T} = Call(Pid, [open, T, Args]),
+            ?line ok = Call(Pid, [write, T, {Key,Value}]),
+            ?line [{Key,Value}] = Call(Pid, [read, T, Key]),
+            ?line ok = Call(Pid, [close, T]),
+
+            Key2 = b,
+            Value2 = 2,
+
+            ?line {ok, T} = dets:open_file(T, Args),
+            ?line [{Key,Value}] = dets:lookup(T, Key),
+            ?line ok = dets:insert(T, {Key2,Value2}),
+            ?line ok = dets:close(T),
+
+            ?line {ok, T} = Call(Pid, [open, T, Args++[{repair,false}]]),
+            ?line [{Key2,Value2}] = Call(Pid, [read, T, Key2]),
+            ?line ok = Call(Pid, [close, T]),
+
+            ?t:stop_node(Node),
+            file:delete(File),
+            ok;
+        false ->
+	    {skipped, "No support for old node"}
+    end.
+
+
+
 %%
 %% Parts common to several test cases
 %% 
 
+start_node_rel(Name, Rel, How) ->
+    Release = [{release, atom_to_list(Rel)}],
+    ?line Pa = filename:dirname(code:which(?MODULE)),
+    ?line test_server:start_node(Name, How,
+                                 [{args,
+                                   " -kernel net_setuptime 100 "
+                                   " -pa " ++ Pa},
+                                  {erl, Release}]).
+
 crash(File, Where) ->
     crash(File, Where, 10).
 
 crash(File, Where, What) when is_integer(What) ->
-    ?line {ok, Fd} = file:open(File, read_write),
+    ?line {ok, Fd} = file:open(File, [read,write]),
     ?line file:position(Fd, Where),
     ?line ok = file:write(Fd, [What]),
     ?line ok = file:close(Fd).
@@ -4031,7 +4121,7 @@ writable(Fname) ->
     ?line file:write_file_info(Fname, Info#file_info{mode = Mode}).
 
 truncate(File, Where) ->
-    ?line {ok, Fd} = file:open(File, read_write),
+    ?line {ok, Fd} = file:open(File, [read,write]),
     ?line file:position(Fd, Where),
     ?line ok = file:truncate(Fd),
     ?line ok = file:close(Fd).
@@ -4268,6 +4358,11 @@ bad_object({error,{{bad_object,_}, FileName}}, FileName) ->
 bad_object({error,{{{bad_object,_,_},_,_,_}, FileName}}, FileName) ->
     ok. % Debug.
 
+check_badarg({'EXIT', {badarg, [{M,F,Args,_} | _]}}, M, F, Args) ->
+    true;
+check_badarg({'EXIT', {badarg, [{M,F,A,_} | _]}}, M, F, Args)  ->
+    true = test_server:is_native(M) andalso length(Args) =:= A.
+
 check_pps(P0) ->
     case pps() of
         P0 ->
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index 9b024a5b49..f79414db49 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -20,7 +20,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
 
--export([rec_1/1, predef_mac/1,
+-export([rec_1/1, include_local/1, predef_mac/1,
 	 upcase_mac_1/1, upcase_mac_2/1,
 	 variable_1/1, otp_4870/1, otp_4871/1, otp_5362/1,
          pmod/1, not_circular/1, skip_header/1, otp_6277/1, otp_7702/1,
@@ -63,7 +63,7 @@ end_per_testcase(_, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [rec_1, {group, upcase_mac}, predef_mac,
+    [rec_1, {group, upcase_mac}, include_local, predef_mac,
      {group, variable}, otp_4870, otp_4871, otp_5362, pmod,
      not_circular, skip_header, otp_6277, otp_7702, otp_8130,
      overload_mac, otp_8388, otp_8470, otp_8503, otp_8562,
@@ -97,6 +97,22 @@ rec_1(Config) when is_list(Config) ->
     ?line check_errors(List),
     ok.
 
+include_local(doc) ->
+    [];
+include_local(suite) ->
+    [];
+include_local(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line File = filename:join(DataDir, "include_local.erl"),
+    %% include_local.erl includes include/foo.hrl which
+    %% includes bar.hrl (also in include/) without requiring
+    %% any additional include path, and overriding any file
+    %% of the same name that the path points to
+    ?line {ok, List} = epp:parse_file(File, [DataDir], []),
+    ?line {value, {attribute,_,a,{true,true}}} =
+	lists:keysearch(a,3,List),
+    ok.
+
 %%% Here is a little reimplementation of epp:parse_file, which times out
 %%% after 4 seconds if the epp server doesn't respond. If we use the
 %%% regular epp:parse_file, the test case will time out, and then epp
@@ -234,16 +250,23 @@ otp_4871(Config) when is_list(Config) ->
     %% so there are some sanity checks before killing.
     ?line {ok,Epp} = epp:open(File, []),
     timer:sleep(1),
-    ?line {current_function,{epp,_,_}} = process_info(Epp, current_function),
+    ?line true = current_module(Epp, epp),
     ?line {monitored_by,[Io]} = process_info(Epp, monitored_by),
-    ?line {current_function,{file_io_server,_,_}} =
-	process_info(Io, current_function),
+    ?line true = current_module(Io, file_io_server),
     ?line exit(Io, emulate_crash),
     timer:sleep(1),
     ?line {error,{_Line,epp,cannot_parse}} = otp_4871_parse_file(Epp),
     ?line epp:close(Epp),
     ok.
 
+current_module(Pid, Mod) ->
+    case process_info(Pid, current_function) of
+        {current_function, undefined} ->
+            true = test_server:is_native(Mod);
+        {current_function, {Mod, _, _}} ->
+            true
+    end.
+
 otp_4871_parse_file(Epp) ->
     case epp:parse_erl_form(Epp) of
 	{ok,_} -> otp_4871_parse_file(Epp);
@@ -1280,7 +1303,7 @@ eval_tests(Config, Fun, Tests) ->
 
 
 check_test(Config, Test) ->
-    Filename = 'epp_test.erl',
+    Filename = "epp_test.erl",
     ?line PrivDir = ?config(priv_dir, Config),
     ?line File = filename:join(PrivDir, Filename),
     ?line ok = file:write_file(File, Test),
@@ -1293,7 +1316,7 @@ check_test(Config, Test) ->
 
 compile_test(Config, Test0) ->
     Test = [<<"-module(epp_test). -compile(export_all). ">>, Test0],
-    Filename = 'epp_test.erl',
+    Filename = "epp_test.erl",
     ?line PrivDir = ?config(priv_dir, Config),
     ?line File = filename:join(PrivDir, Filename),
     ?line ok = file:write_file(File, Test),
diff --git a/lib/stdlib/test/epp_SUITE_data/bar.hrl b/lib/stdlib/test/epp_SUITE_data/bar.hrl
new file mode 100644
index 0000000000..01c527d549
--- /dev/null
+++ b/lib/stdlib/test/epp_SUITE_data/bar.hrl
@@ -0,0 +1,4 @@
+%% should not be included from include/foo.hrl even though the
+%% include path points here - include/bar.hrl overrides it
+
+-define(BAR_HRL, false).
diff --git a/lib/stdlib/test/epp_SUITE_data/include/bar.hrl b/lib/stdlib/test/epp_SUITE_data/include/bar.hrl
new file mode 100644
index 0000000000..038d3c900e
--- /dev/null
+++ b/lib/stdlib/test/epp_SUITE_data/include/bar.hrl
@@ -0,0 +1,3 @@
+%% included from foo.hrl in same directory
+
+-define(BAR_HRL, true).
diff --git a/lib/stdlib/test/epp_SUITE_data/include/foo.hrl b/lib/stdlib/test/epp_SUITE_data/include/foo.hrl
new file mode 100644
index 0000000000..a6dfa3d18a
--- /dev/null
+++ b/lib/stdlib/test/epp_SUITE_data/include/foo.hrl
@@ -0,0 +1,4 @@
+%% includes bar.hrl in same directory
+
+-define(FOO_HRL, true).
+-include("bar.hrl").
diff --git a/lib/stdlib/test/epp_SUITE_data/include_local.erl b/lib/stdlib/test/epp_SUITE_data/include_local.erl
new file mode 100644
index 0000000000..c8e155a064
--- /dev/null
+++ b/lib/stdlib/test/epp_SUITE_data/include_local.erl
@@ -0,0 +1,6 @@
+
+-module(include_local).
+
+-include("include/foo.hrl").
+
+-a({?FOO_HRL, ?BAR_HRL}).
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index 0bcf3c5b71..784c7cb86e 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -1189,7 +1189,7 @@ lfh() ->
     {eval, fun(F, As, Bs) -> local_func(F, As, Bs) end}.
 
 local_func(F, As0, Bs0) when is_atom(F) ->
-    {As,Bs} = erl_eval:expr_list(As0, Bs0, {eval,lfh()}),
+    {As,Bs} = erl_eval:expr_list(As0, Bs0, lfh()),
     case erlang:function_exported(?MODULE, F, length(As)) of
 	true ->
 	    {value,apply(?MODULE, F, As),Bs};
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index f980d52e4e..9041adbe5c 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -2981,7 +2981,7 @@ run_test(Conf, Test0, Warnings0) ->
     run_test2(Conf, Test, Warnings0).
 
 run_test2(Conf, Test, Warnings0) ->
-    Filename = 'lint_test.erl',
+    Filename = "lint_test.erl",
     DataDir = ?privdir,
     File = filename:join(DataDir, Filename),
     Opts = case Warnings0 of
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 9341300f90..2f4958760b 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -795,21 +795,26 @@ t_ets_dets(Config, Opts) ->
     ?line true = ets:from_dets(ETab,DTab),
     ?line 3000 = ets:info(ETab,size),
     ?line ets:delete(ETab),
-    ?line {'EXIT',{badarg,[{ets,to_dets,[ETab,DTab]}|_]}} =
-	(catch ets:to_dets(ETab,DTab)),
-    ?line {'EXIT',{badarg,[{ets,from_dets,[ETab,DTab]}|_]}} =
-	(catch ets:from_dets(ETab,DTab)),
+    ?line check_badarg(catch ets:to_dets(ETab,DTab),
+		       ets, to_dets, [ETab,DTab]),
+    ?line check_badarg(catch ets:from_dets(ETab,DTab),
+		       ets, from_dets, [ETab,DTab]),
     ?line ETab2 = ets_new(x,Opts),
     ?line filltabint(ETab2,3000),
     ?line dets:close(DTab),
-    ?line {'EXIT',{badarg,[{ets,to_dets,[ETab2,DTab]}|_]}} =
-	(catch ets:to_dets(ETab2,DTab)),
-    ?line {'EXIT',{badarg,[{ets,from_dets,[ETab2,DTab]}|_]}} =
-	(catch ets:from_dets(ETab2,DTab)),
+    ?line check_badarg(catch ets:to_dets(ETab2,DTab),
+		       ets, to_dets, [ETab2,DTab]),
+    ?line check_badarg(catch ets:from_dets(ETab2,DTab),
+		       ets, from_dets, [ETab2,DTab]),
     ?line ets:delete(ETab2),
     ?line (catch file:delete(Fname)),
     ok.
 
+check_badarg({'EXIT', {badarg, [{M,F,Args,_} | _]}}, M, F, Args) ->
+    true;
+check_badarg({'EXIT', {badarg, [{M,F,A,_} | _]}}, M, F, Args)  ->
+    true = test_server:is_native(M) andalso length(Args) =:= A.
+
 t_delete_all_objects(doc) ->
     ["Test ets:delete_all_objects/1"];
 t_delete_all_objects(suite) ->
@@ -819,6 +824,14 @@ t_delete_all_objects(Config) when is_list(Config) ->
     repeat_for_opts(t_delete_all_objects_do),
     ?line verify_etsmem(EtsMem).
 
+get_kept_objects(T) ->
+    case ets:info(T,stats) of
+	false ->
+	    0;
+	{_,_,_,_,_,_,KO}  ->
+	    KO
+    end.
+
 t_delete_all_objects_do(Opts) ->
     ?line T=ets_new(x,Opts),
     ?line filltabint(T,4000),
@@ -828,10 +841,10 @@ t_delete_all_objects_do(Opts) ->
     ?line true = ets:delete_all_objects(T),
     ?line '$end_of_table' = ets:next(T,O),
     ?line 0 = ets:info(T,size),
-    ?line 4000 = ets:info(T,kept_objects),
+    ?line 4000 = get_kept_objects(T),
     ?line ets:safe_fixtable(T,false),
     ?line 0 = ets:info(T,size),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     ?line filltabint(T,4000),
     ?line 4000 = ets:info(T,size),
     ?line true = ets:delete_all_objects(T),
@@ -861,10 +874,10 @@ t_delete_object_do(Opts) ->
     ?line ets:delete_object(T,{First, integer_to_list(First)}),
     ?line Next = ets:next(T,First),
     ?line 3999 = ets:info(T,size),
-    ?line 1 = ets:info(T,kept_objects),
+    ?line 1 = get_kept_objects(T),
     ?line ets:safe_fixtable(T,false),
     ?line 3999 = ets:info(T,size),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     ?line ets:delete(T),
     ?line T1 = ets_new(x,[ordered_set | Opts]),
     ?line filltabint(T1,4000),
@@ -2644,7 +2657,7 @@ maybe_sort(L) when is_list(L) ->
 %maybe_sort({'EXIT',{Reason, [{Module, Function, _}|_]}}) ->
 %    {'EXIT',{Reason, [{Module, Function, '_'}]}};
 maybe_sort({'EXIT',{Reason, List}}) when is_list(List) ->
-    {'EXIT',{Reason, lists:map(fun({Module, Function, _}) ->
+    {'EXIT',{Reason, lists:map(fun({Module, Function, _, _}) ->
 				       {Module, Function, '_'}
 			       end,
 			       List)}};
@@ -2717,7 +2730,8 @@ ordered_do(Opts) ->
 		      9,10,11,12,
 		      1,2,3,4,
 		      17,18,19,20,
-		      13,14,15,16
+		      13,14,15,16,
+		      1 bsl 33
 		     ],
     ?line lists:foreach(fun(X) ->
 			  ets:insert(T,{X,integer_to_list(X)})
@@ -2732,13 +2746,14 @@ ordered_do(Opts) ->
     ?line S2 = L2,
     ?line [{1,"1"}] = ets:slot(T,0),
     ?line [{28,"28"}] = ets:slot(T,27),
+    ?line [{1 bsl 33,_}] = ets:slot(T,28),
     ?line 27 = ets:prev(T,28),
     ?line [{7,"7"}] = ets:slot(T,6),
-    ?line '$end_of_table' = ets:next(T,28),
+    ?line '$end_of_table' = ets:next(T,1 bsl 33),
     ?line [{12,"12"}] = ets:slot(T,11),
-    ?line '$end_of_table' = ets:slot(T,28),
+    ?line '$end_of_table' = ets:slot(T,29),
     ?line [{1,"1"}] = ets:slot(T,0),
-    ?line 28 = ets:prev(T,29),
+    ?line 28 = ets:prev(T,1 bsl 33),
     ?line 1 = ets:next(T,0),
     ?line pick_all_forward(T),
     ?line [{7,"7"}] = ets:slot(T,6),
@@ -4969,7 +4984,7 @@ grow_pseudo_deleted_do(Type) ->
 				     [true]}]),
     Left = Mult*(Mod-1),
     ?line Left = ets:info(T,size),
-    ?line Mult = ets:info(T,kept_objects),
+    ?line Mult = get_kept_objects(T),
     filltabstr(T,Mult),
     spawn_opt(fun()-> ?line true = ets:info(T,fixed),
 		       Self ! start,
@@ -4983,7 +4998,7 @@ grow_pseudo_deleted_do(Type) ->
     ?line true = ets:safe_fixtable(T,false),
     io:format("Unfix table done. ~p nitems=~p\n",[now(),ets:info(T,size)]),
     ?line false = ets:info(T,fixed),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     ?line done = receive_any(),
     %%verify_table_load(T), % may fail if concurrency is poor (genny)
     ets:delete(T),
@@ -5010,7 +5025,7 @@ shrink_pseudo_deleted_do(Type) ->
 				     [{'>', '$1', Half}],
 				     [true]}]),    
     ?line Half = ets:info(T,size),
-    ?line Half = ets:info(T,kept_objects),
+    ?line Half = get_kept_objects(T),
     spawn_opt(fun()-> ?line true = ets:info(T,fixed),
 		      Self ! start,
 		      io:format("Starting to delete... ~p\n",[now()]),
@@ -5023,7 +5038,7 @@ shrink_pseudo_deleted_do(Type) ->
     ?line true = ets:safe_fixtable(T,false),
     io:format("Unfix table done. ~p nitems=~p\n",[now(),ets:info(T,size)]),
     ?line false = ets:info(T,fixed),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     ?line done = receive_any(),
     %%verify_table_load(T), % may fail if concurrency is poor (genny)
     ets:delete(T),
@@ -5139,7 +5154,7 @@ smp_fixed_delete_do() ->
     ?line 0 = ets:info(T,size),
     ?line true = ets:info(T,fixed),
     ?line Buckets = num_of_buckets(T),
-    ?line NumOfObjs = ets:info(T,kept_objects),
+    ?line NumOfObjs = get_kept_objects(T),
     ets:safe_fixtable(T,false),
     %% Will fail as unfix does not shrink the table:
     %%?line Mem = ets:info(T,memory),
@@ -5171,7 +5186,7 @@ smp_unfix_fix_do() ->
     Left = NumOfObjs - Deleted,
     ?line Left = ets:info(T,size),
     ?line true = ets:info(T,fixed),
-    ?line Deleted = ets:info(T,kept_objects),
+    ?line Deleted = get_kept_objects(T),
     
     {Child, Mref} = 
 	spawn_opt(fun()-> ?line true = ets:info(T,fixed),
@@ -5188,7 +5203,7 @@ smp_unfix_fix_do() ->
 				       end,
 				       Deleted),
 			  ?line 0 = ets:info(T,size),
-			  ?line true = ets:info(T,kept_objects) >= Left,		      
+			  ?line true = get_kept_objects(T) >= Left,		      
 			  ?line done = receive_any()
 		  end, 
 		  [link, monitor, {scheduler,2}]),
@@ -5201,7 +5216,7 @@ smp_unfix_fix_do() ->
     Child ! done,
     {'DOWN', Mref, process, Child, normal} = receive_any(),
     ?line false = ets:info(T,fixed),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     %%verify_table_load(T),
     ets:delete(T),
     process_flag(scheduler,0).
@@ -5239,7 +5254,7 @@ otp_8166_do(WC) ->
     ZombieCrPid ! quit,    
     {'DOWN', ZombieCrMref, process, ZombieCrPid, normal} = receive_any(),
     ?line false = ets:info(T,fixed),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     %%verify_table_load(T),
     ets:delete(T),
     process_flag(scheduler,0).
@@ -5306,7 +5321,7 @@ otp_8166_zombie_creator(T,Deleted) ->
 
 verify_table_load(T) ->
     ?line Stats = ets:info(T,stats),
-    ?line {Buckets,AvgLen,StdDev,ExpSD,_MinLen,_MaxLen} = Stats,
+    ?line {Buckets,AvgLen,StdDev,ExpSD,_MinLen,_MaxLen,_} = Stats,
     ?line ok = if
 		   AvgLen > 7 ->
 		       io:format("Table overloaded: Stats=~p\n~p\n",
@@ -5918,7 +5933,7 @@ very_big_num(0, Result) ->
     ?line Result.
 
 make_port() ->
-    ?line open_port({spawn, efile}, [eof]).
+    ?line open_port({spawn, "efile"}, [eof]).
 
 make_pid() ->
     ?line spawn_link(?MODULE, sleeper, []).
diff --git a/lib/stdlib/test/file_sorter_SUITE.erl b/lib/stdlib/test/file_sorter_SUITE.erl
index 80d4ea5fdc..74c08912be 100644
--- a/lib/stdlib/test/file_sorter_SUITE.erl
+++ b/lib/stdlib/test/file_sorter_SUITE.erl
@@ -89,7 +89,7 @@ basic(suite) ->
 basic(Config) when is_list(Config) ->
     Fmt = binary,
     Arg = {format,Fmt},
-    Foo = outfile(foo, Config),
+    Foo = outfile("foo", Config),
     P0 = pps(),
 
     ?line F1s = [F1] = to_files([[]], Fmt, Config),
@@ -455,7 +455,7 @@ inout(suite) ->
     [];
 inout(Config) when is_list(Config) ->
     BTF = {format, binary_term},
-    Foo = outfile(foo, Config),
+    Foo = outfile("foo", Config),
 
     %% Input is fun.
     End = fun(read) -> end_of_input end,
@@ -522,7 +522,7 @@ many(doc) ->
 many(suite) ->
     [];
 many(Config) when is_list(Config) ->
-    Foo = outfile(foo, Config),
+    Foo = outfile("foo", Config),
     PrivDir = ?privdir(Config),
     P0 = pps(),
 
@@ -587,7 +587,7 @@ misc(suite) ->
     [];
 misc(Config) when is_list(Config) ->
     BTF = {format, binary_term},
-    Foo = outfile(foo, Config),
+    Foo = outfile("foo", Config),
     FFoo = filename:absname(Foo),
     P0 = pps(),
 
@@ -704,7 +704,7 @@ misc(Config) when is_list(Config) ->
 sort(Fmt, XArgs, Config) ->
     Args = make_args(Fmt, [{size,5} | XArgs]),
     TmpArgs = [{tmpdir,?privdir(Config)} | Args],
-    Foo = outfile(foo, Config),
+    Foo = outfile("foo", Config),
 
     %% Input is a fun. Output is a fun.
     ?line [] = file_sorter:sort(input([], 2, Fmt), output([], Fmt), Args),
@@ -777,7 +777,7 @@ sort(Fmt, XArgs, Config) ->
 keysort(Fmt, XArgs, Config) ->
     Args = make_args(Fmt, [{size,50}, {no_files, 2} | XArgs]),
     TmpArgs = Args ++ [{tmpdir,?privdir(Config)}],
-    Foo = outfile(foo, Config),
+    Foo = outfile("foo", Config),
 
     %% Input is files. Output is a file.
     ?line ok = file_sorter:keysort(2, [], Foo, Args),
@@ -836,7 +836,7 @@ keysort(Fmt, XArgs, Config) ->
 
 merge(Fmt, XArgs, Config) ->
     Args = make_args(Fmt, [{size,5} | XArgs]),
-    Foo = outfile(foo, Config),
+    Foo = outfile("foo", Config),
 
     %% Input is a file. Output is a fun.
     ?line [] = file_sorter:merge([], output([], Fmt), Args),
@@ -873,7 +873,7 @@ merge(Fmt, XArgs, Config) ->
 
 keymerge(Fmt, XArgs, Config) ->
     Args = make_args(Fmt, [{size,50}, {no_files, 2} | XArgs]),
-    Foo = outfile(foo, Config),
+    Foo = outfile("foo", Config),
 
     %% Input is files. Output is a file.
     ?line ok = file_sorter:keymerge(2, [], Foo, Args),
diff --git a/lib/stdlib/test/filelib_SUITE.erl b/lib/stdlib/test/filelib_SUITE.erl
index a355097fe2..1de639a166 100644
--- a/lib/stdlib/test/filelib_SUITE.erl
+++ b/lib/stdlib/test/filelib_SUITE.erl
@@ -97,11 +97,12 @@ wildcard_errors(Config) when is_list(Config) ->
 
 wcc(Wc, Error) ->
     {'EXIT',{{badpattern,Error},
-	     [{filelib,compile_wildcard,1}|_]}} = (catch filelib:compile_wildcard(Wc)),
+	     [{filelib,compile_wildcard,1,_}|_]}} =
+	(catch filelib:compile_wildcard(Wc)),
     {'EXIT',{{badpattern,Error},
-	     [{filelib,wildcard,1}|_]}} = (catch filelib:wildcard(Wc)),
+	     [{filelib,wildcard,1,_}|_]}} = (catch filelib:wildcard(Wc)),
     {'EXIT',{{badpattern,Error},
-	     [{filelib,wildcard,2}|_]}} = (catch filelib:wildcard(Wc, ".")).
+	     [{filelib,wildcard,2,_}|_]}} = (catch filelib:wildcard(Wc, ".")).
 
 do_wildcard_1(Dir, Wcf0) ->
     do_wildcard_2(Dir, Wcf0),
@@ -243,7 +244,7 @@ otp_5960(doc) ->
     ["Test that filelib:ensure_dir/1 returns ok or {error,Reason}"];
 otp_5960(Config) when is_list(Config) ->
     ?line PrivDir = ?config(priv_dir, Config),
-    ?line Dir = filename:join(PrivDir, otp_5960_dir),
+    ?line Dir = filename:join(PrivDir, "otp_5960_dir"),
     ?line Name1 = filename:join(Dir, name1),
     ?line Name2 = filename:join(Dir, name2),
     ?line ok = filelib:ensure_dir(Name1), % parent is created
@@ -268,7 +269,7 @@ otp_5960(Config) when is_list(Config) ->
 
 ensure_dir_eexist(Config) when is_list(Config) ->
     ?line PrivDir = ?config(priv_dir, Config),
-    ?line Dir = filename:join(PrivDir, ensure_dir_eexist),
+    ?line Dir = filename:join(PrivDir, "ensure_dir_eexist"),
     ?line Name = filename:join(Dir, "same_name_as_file_and_dir"),
     ?line ok = filelib:ensure_dir(Name),
     ?line ok = file:write_file(Name, <<"some string\n">>),
diff --git a/lib/stdlib/test/ms_transform_SUITE.erl b/lib/stdlib/test/ms_transform_SUITE.erl
index 4e5df12798..c9688354b1 100644
--- a/lib/stdlib/test/ms_transform_SUITE.erl
+++ b/lib/stdlib/test/ms_transform_SUITE.erl
@@ -39,6 +39,7 @@
 -export([float_1_function/1]).
 -export([action_function/1]).
 -export([warnings/1]).
+-export([no_warnings/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 init_per_testcase(_Func, Config) ->
@@ -55,7 +56,7 @@ all() ->
     [from_shell, basic_ets, basic_dbg, records,
      record_index, multipass, bitsyntax, record_defaults,
      andalso_orelse, float_1_function, action_function,
-     warnings, top_match, old_guards, autoimported,
+     warnings, no_warnings, top_match, old_guards, autoimported,
      semicolon].
 
 groups() -> 
@@ -155,6 +156,34 @@ warnings(Config) when is_list(Config) ->
 	compile_ww(Prog7),
     ok.
 
+no_warnings(suite) ->
+    [];
+no_warnings(doc) ->
+    ["Check that variables bound in other function clauses don't generate "
+     "warning"];
+no_warnings(Config) when is_list(Config) ->
+    ?line setup(Config),
+    Prog = <<"tmp(X) when X > 100 ->\n",
+	     "   Y=X,\n"
+	     "   Y;\n"
+	     "tmp(X) ->\n"
+	     "   ets:fun2ms(fun(Y) ->\n"
+	     "                  {X, 3*Y}\n"
+	     "              end)">>,
+    ?line [] = compile_no_ww(Prog),
+
+    Prog2 = <<"tmp(X) when X > 100 ->\n",
+	     "   Y=X,\n"
+	     "   Y;\n"
+	     "tmp(X) when X < 200 ->\n"
+	     "   ok;\n"
+	     "tmp(X) ->\n"
+	     "   ets:fun2ms(fun(Y) ->\n"
+	     "                  {X, 3*Y}\n"
+	     "              end)">>,
+    ?line [] = compile_no_ww(Prog2),
+    ok.
+
 andalso_orelse(suite) ->
     [];
 andalso_orelse(doc) ->
@@ -842,6 +871,20 @@ compile_ww(Records,Expr) ->
 					       nowarn_unused_record]),
     Wlist.
 
+compile_no_ww(Expr) ->
+    Prog = <<
+	"-module(tmp).\n",
+    "-include_lib(\"stdlib/include/ms_transform.hrl\").\n",
+    "-export([tmp/1]).\n\n",
+    Expr/binary,".\n">>,
+    FN=temp_name(),
+    file:write_file(FN,Prog),
+    {ok,Forms} = epp:parse_file(FN,"",""),
+    {ok,tmp,_Bin,Wlist} = compile:forms(Forms,[return_warnings,
+					       nowarn_unused_vars,
+					       nowarn_unused_record]),
+    Wlist.
+
 do_eval(String) ->
     {done,{ok,T,_},[]} = erl_scan:tokens(
 			   [],
diff --git a/lib/stdlib/test/proc_lib_SUITE.erl b/lib/stdlib/test/proc_lib_SUITE.erl
index 1565aa9bba..c95089117c 100644
--- a/lib/stdlib/test/proc_lib_SUITE.erl
+++ b/lib/stdlib/test/proc_lib_SUITE.erl
@@ -328,7 +328,7 @@ otp_6345(doc) ->
     ["'monitor' spawn_opt option"];
 otp_6345(Config) when is_list(Config) ->
     Opts = [link,monitor],
-    {'EXIT', {badarg,[{proc_lib,check_for_monitor,_}|_Stack]}} =
+    {'EXIT', {badarg,[{proc_lib,check_for_monitor,_,_}|_Stack]}} =
 	(catch proc_lib:start(?MODULE, otp_6345_init, [self()],
 			      1000, Opts)),
     ok.
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index c4817c0d38..3b2e637c84 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -454,115 +454,115 @@ error_handling(Config) when is_list(Config) ->
     % The malformed precomiled RE is detected after 
     % the trap to re:grun from grun, in the grun function clause
     % that handles precompiled expressions
-    ?line {'EXIT',{badarg,[{re,run,["apa",{1,2,3,4},[global]]},
-			   {?MODULE, error_handling,1} | _]}} = 
+    ?line {'EXIT',{badarg,[{re,run,["apa",{1,2,3,4},[global]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:run("apa",{1,2,3,4},[global])),
     % An invalid capture list will also cause a badarg late, 
     % but with a non pre compiled RE, the exception should be thrown by the
     % grun function clause that handles RE's compiled implicitly by
     % the run/3 BIF before trapping.
-    ?line {'EXIT',{badarg,[{re,run,["apa","p",[{capture,[1,{a}]},global]]},
-			   {?MODULE, error_handling,1} | _]}} = 
+    ?line {'EXIT',{badarg,[{re,run,["apa","p",[{capture,[1,{a}]},global]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:run("apa","p",[{capture,[1,{a}]},global])),
     % And so the case of a precompiled expression together with
     % a compile-option (binary and list subject):
     ?line {ok,RE} = re:compile("(p)"),
     ?line {match,[[{1,1},{1,1}]]} = re:run(<<"apa">>,RE,[global]),
     ?line {match,[[{1,1},{1,1}]]} = re:run("apa",RE,[global]),
-    {'EXIT',{badarg,[{re,run,
-                     [<<"apa">>,
-                      {re_pattern,1,0,_},
-                      [global,unicode]]},
-		     {?MODULE, error_handling,1} | _]}} =
+    ?line {'EXIT',{badarg,[{re,run,
+			    [<<"apa">>,
+			     {re_pattern,1,0,_},
+			     [global,unicode]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:run(<<"apa">>,RE,[global,unicode])),
-    {'EXIT',{badarg,[{re,run,
-                     ["apa",
-                      {re_pattern,1,0,_},
-                      [global,unicode]]},
-		     {?MODULE, error_handling,1} | _]}} =
+    ?line {'EXIT',{badarg,[{re,run,
+			    ["apa",
+			     {re_pattern,1,0,_},
+			     [global,unicode]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:run("apa",RE,[global,unicode])),
     ?line {'EXIT',{badarg,_}} = (catch re:run("apa","(p",[])),
     ?line {'EXIT',{badarg,_}} = (catch re:run("apa","(p",[global])),
     % The replace errors:
-    ?line {'EXIT',{badarg,[{re,replace,["apa",{1,2,3,4},"X",[]]},
-			   {?MODULE, error_handling,1} | _]}} =
+    ?line {'EXIT',{badarg,[{re,replace,["apa",{1,2,3,4},"X",[]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:replace("apa",{1,2,3,4},"X",[])),
-    ?line {'EXIT',{badarg,[{re,replace,["apa",{1,2,3,4},"X",[global]]},
-			   {?MODULE, error_handling,1} | _]}} =
+    ?line {'EXIT',{badarg,[{re,replace,["apa",{1,2,3,4},"X",[global]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:replace("apa",{1,2,3,4},"X",[global])),
     ?line {'EXIT',{badarg,[{re,replace,
 			    ["apa",
 			     {re_pattern,1,0,_},
 			     "X",
-			     [unicode]]},
-			   {?MODULE, error_handling,1} | _]}} =
+			     [unicode]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:replace("apa",RE,"X",[unicode])),
     ?line <<"aXa">> = iolist_to_binary(re:replace("apa","p","X",[])),
     ?line {'EXIT',{badarg,[{re,replace,
-			    ["apa","p","X",[{capture,all,binary}]]},
-			   {?MODULE, error_handling,1} | _]}} =
+			    ["apa","p","X",[{capture,all,binary}]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","p","X",
 					  [{capture,all,binary}]))),
     ?line {'EXIT',{badarg,[{re,replace,
-			    ["apa","p","X",[{capture,all}]]},
-			   {?MODULE, error_handling,1} | _]}} =
+			    ["apa","p","X",[{capture,all}]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","p","X",
 					  [{capture,all}]))),
     ?line {'EXIT',{badarg,[{re,replace,
-			    ["apa","p","X",[{return,banana}]]},
-			   {?MODULE, error_handling,1} | _]}} =
+			    ["apa","p","X",[{return,banana}]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","p","X",
 					  [{return,banana}]))),
     ?line {'EXIT',{badarg,_}} = (catch re:replace("apa","(p","X",[])),
     % Badarg, not compile error.
     ?line {'EXIT',{badarg,[{re,replace,
-			    ["apa","(p","X",[{return,banana}]]},
-			   {?MODULE, error_handling,1} | _]}} =
+			    ["apa","(p","X",[{return,banana}]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","(p","X",
 					  [{return,banana}]))),
     % And the split errors:
     ?line [<<"a">>,<<"a">>] = (catch re:split("apa","p",[])),
     ?line [<<"a">>,<<"p">>,<<"a">>] = (catch re:split("apa",RE,[])),
-    ?line {'EXIT',{badarg,[{re,split,["apa","p",[global]]},
-			   {?MODULE, error_handling,1} | _]}} = 
+    ?line {'EXIT',{badarg,[{re,split,["apa","p",[global]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:split("apa","p",[global])),
-    ?line {'EXIT',{badarg,[{re,split,["apa","p",[{capture,all}]]},
-			   {?MODULE, error_handling,1} | _]}} = 
+    ?line {'EXIT',{badarg,[{re,split,["apa","p",[{capture,all}]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:split("apa","p",[{capture,all}])),
-    ?line {'EXIT',{badarg,[{re,split,["apa","p",[{capture,all,binary}]]},
-			   {?MODULE, error_handling,1} | _]}} = 
+    ?line {'EXIT',{badarg,[{re,split,["apa","p",[{capture,all,binary}]],_},
+			   {?MODULE, error_handling,1,_} | _]}} =
 	(catch re:split("apa","p",[{capture,all,binary}])),
-    ?line {'EXIT',{badarg,[{re,split,["apa",{1,2,3,4},[]]},
-			   {?MODULE, error_handling,1} | _]}} =
+    ?line {'EXIT',{badarg,[{re,split,["apa",{1,2,3,4},[]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:split("apa",{1,2,3,4})),
-    ?line {'EXIT',{badarg,[{re,split,["apa",{1,2,3,4},[]]},
-			   {?MODULE, error_handling,1} | _]}} =
+    ?line {'EXIT',{badarg,[{re,split,["apa",{1,2,3,4},[]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:split("apa",{1,2,3,4},[])),
     ?line {'EXIT',{badarg,[{re,split,
 			    ["apa",
 			     RE,
-			     [unicode]]},
-			   {?MODULE, error_handling,1} | _]}} =
+			     [unicode]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:split("apa",RE,[unicode])),
     ?line {'EXIT',{badarg,[{re,split,
 			    ["apa",
 			     RE,
-			     [{return,banana}]]},
-			   {?MODULE, error_handling,1} | _]}} =
+			     [{return,banana}]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:split("apa",RE,[{return,banana}])),
     ?line {'EXIT',{badarg,[{re,split,
 			    ["apa",
 			     RE,
-			     [banana]]},
-			   {?MODULE, error_handling,1} | _]}} =
+			     [banana]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:split("apa",RE,[banana])),
     ?line {'EXIT',{badarg,_}} = (catch re:split("apa","(p")),
     %Exception on bad argument, not compilation error
     ?line {'EXIT',{badarg,[{re,split,
 			    ["apa",
 			     "(p",
-			     [banana]]},
-			   {?MODULE, error_handling,1} | _]}} = 
+			     [banana]],_},
+			   {?MODULE,error_handling,1,_} | _]}} =
 	(catch re:split("apa","(p",[banana])),
     ?t:timetrap_cancel(Dog),
     ok.
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 8273377ba1..b6019b86f0 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -2388,12 +2388,12 @@ otp_6554(Config) when is_list(Config) ->
         comm_err(<<"V = lists:seq(1, 20), case V of a -> ok end.">>),
     ?line "exception error: no function clause matching" = 
         comm_err(<<"fun(P) when is_pid(P) -> true end(a).">>),
-    ?line "exception error: {function_clause,[{erl_eval,do_apply,[unproper|list]}"++_ =
+    ?line "exception error: {function_clause," =
         comm_err(<<"erlang:error(function_clause, [unproper | list]).">>),
     ?line "exception error: function_clause" =
         comm_err(<<"erlang:error(function_clause, 4).">>),
     %% Cheating:
-    ?line "exception error: no function clause matching erl_eval:do_apply(4)" = 
+    ?line "exception error: no function clause matching erl_eval:do_apply(4)" ++ _ = 
         comm_err(<<"erlang:error(function_clause, [4]).">>),
     ?line "exception error: no function clause matching" ++ _ = 
         comm_err(<<"fun(a, b, c, d) -> foo end"
@@ -2406,7 +2406,7 @@ otp_6554(Config) when is_list(Config) ->
         comm_err(<<"fun(P, q) when is_pid(P) -> true end(a, b).">>),
     ?line "exception error: no function clause matching lists:reverse(" ++ _ = 
         comm_err(<<"F=fun() -> hello end, lists:reverse(F).">>),
-    ?line "exception error: no function clause matching lists:reverse(34)" = 
+    ?line "exception error: no function clause matching lists:reverse(34) (lists.erl, line " ++ _ = 
         comm_err(<<"lists:reverse(34).">>),
     ?line "exception error: no true branch found when evaluating an if expression" = 
         comm_err(<<"if length([a,b]) > 17 -> a end.">>),
diff --git a/lib/stdlib/test/sofs_SUITE.erl b/lib/stdlib/test/sofs_SUITE.erl
index d6f88a655e..73b282149a 100644
--- a/lib/stdlib/test/sofs_SUITE.erl
+++ b/lib/stdlib/test/sofs_SUITE.erl
@@ -1879,11 +1879,11 @@ digraph(Conf) when is_list(Conf) ->
 
     ?line {'EXIT', {badarg, _}} = 
         (catch family_to_digraph(set([a]))),
-    ?line {'EXIT', {badarg, [{sofs,family_to_digraph,[_,_]}|_]}} =
+    ?line {'EXIT', {badarg, [{sofs,family_to_digraph,[_,_],_}|_]}} =
         (catch family_to_digraph(set([a]), [foo])),
-    ?line {'EXIT', {badarg, [{sofs,family_to_digraph,[_,_]}|_]}} =
+    ?line {'EXIT', {badarg, [{sofs,family_to_digraph,[_,_],_}|_]}} =
         (catch family_to_digraph(F, [foo])),
-    ?line {'EXIT', {cyclic, [{sofs,family_to_digraph,[_,_]}|_]}} =
+    ?line {'EXIT', {cyclic, [{sofs,family_to_digraph,[_,_],_}|_]}} =
         (catch family_to_digraph(family([{a,[a]}]),[acyclic])),
 
     ?line G1 = family_to_digraph(E),
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl
index 1dcd4be21e..6969c095a0 100644
--- a/lib/stdlib/test/string_SUITE.erl
+++ b/lib/stdlib/test/string_SUITE.erl
@@ -273,9 +273,9 @@ words(Config) when is_list(Config) ->
     ?line 2 = string:words("2.35", $.),
     ?line 100 = string:words(string:copies(". ", 100)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:chars(hej)),
+    ?line {'EXIT',_} = (catch string:chars(hej, 1)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:chars("hej", " ")),
+    ?line {'EXIT',_} = (catch string:chars("hej", 1, " ")),
     ok.
 
 
diff --git a/lib/stdlib/test/supervisor_1.erl b/lib/stdlib/test/supervisor_1.erl
index 3198be0fed..f819594c46 100644
--- a/lib/stdlib/test/supervisor_1.erl
+++ b/lib/stdlib/test/supervisor_1.erl
@@ -62,6 +62,12 @@ handle_info(die, State) ->
 handle_info(stop, State) ->
     {stop, normal, State};
 
+handle_info({'EXIT',_,shutdown}, State) ->
+    {stop, shutdown, State};
+
+handle_info({'EXIT',_,{shutdown,Term}}, State) ->
+    {stop, {shutdown,Term}, State};
+
 handle_info({sleep, Time}, State) ->
     io:format("FOO: ~p~n", [Time]),
     timer:sleep(Time),
diff --git a/lib/ssl/test/ssl_test_MACHINE.hrl b/lib/stdlib/test/supervisor_2.erl
index e78b33f505..67aacf5a9c 100644
--- a/lib/ssl/test/ssl_test_MACHINE.hrl
+++ b/lib/stdlib/test/supervisor_2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -16,24 +16,27 @@
 %%
 %% %CopyrightEnd%
 %%
+%% Description: Simulates the behaviour that a child process may have.
+%% Is used by the supervisor_SUITE test suite.
+-module(supervisor_2).
 
--record(st, {protomod = ssl, 
-	     serialize_accept = false,
-	     parent = nil,
-	     type = nil,
-	     active = nil,
-	     port = 0,
-	     peer = nil,
-	     lsock = nil,
-	     sock = nil,
-	     timeout = infinity,
-	     sockopts = [],
-	     sslopts = [],
-	     protocols = []}).
+-export([start_child/1, init/1]).
 
-%%-define(debug(X, Y), io:format(X, Y)).
--define(debug(X, Y), ok).
--define(error(X, Y), io:format(X, Y)).
+-export([handle_call/3, handle_info/2, terminate/2]).
 
--define(DEFAULT_TIMEOUT, 240000).
+start_child(Time) when is_integer(Time), Time > 0 ->
+    gen_server:start_link(?MODULE, Time, []).
 
+init(Time) ->
+    process_flag(trap_exit, true),
+    {ok, Time}.
+
+handle_call(Req, _From, State) ->
+    {reply, Req, State}.
+
+handle_info(_, State) ->
+    {noreply, State}.
+
+terminate(_Reason, Time) ->
+    timer:sleep(Time),
+    ok.
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index ff5e4c629a..e709cf62ba 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -41,8 +41,10 @@
 %% Tests concept permanent, transient and temporary 
 -export([ permanent_normal/1, transient_normal/1,
 	  temporary_normal/1,
+	  permanent_shutdown/1, transient_shutdown/1,
+	  temporary_shutdown/1,
 	  permanent_abnormal/1, transient_abnormal/1,
-	  temporary_abnormal/1]).
+	  temporary_abnormal/1, temporary_bystander/1]).
 
 %% Restart strategy tests 
 -export([ one_for_one/1,
@@ -50,7 +52,7 @@
 	  one_for_all_escalation/1,
 	  simple_one_for_one/1, simple_one_for_one_escalation/1,
 	  rest_for_one/1, rest_for_one_escalation/1,
-	  simple_one_for_one_extra/1]).
+	  simple_one_for_one_extra/1, simple_one_for_one_shutdown/1]).
 
 %% Misc tests
 -export([child_unlink/1, tree/1, count_children_memory/1,
@@ -71,10 +73,11 @@ all() ->
      {group, restart_simple_one_for_one},
      {group, restart_rest_for_one},
      {group, normal_termination},
+     {group, shutdown_termination},
      {group, abnormal_termination}, child_unlink, tree,
      count_children_memory, do_not_save_start_parameters_for_temporary_children,
      do_not_save_child_specs_for_temporary_children,
-     simple_one_for_one_scale_many_temporary_children].
+     simple_one_for_one_scale_many_temporary_children, temporary_bystander].
 
 groups() -> 
     [{sup_start, [],
@@ -86,6 +89,8 @@ groups() ->
        sup_stop_brutal_kill]},
      {normal_termination, [],
       [permanent_normal, transient_normal, temporary_normal]},
+     {shutdown_termination, [],
+      [permanent_shutdown, transient_shutdown, temporary_shutdown]},
      {abnormal_termination, [],
       [permanent_abnormal, transient_abnormal,
        temporary_abnormal]},
@@ -94,8 +99,8 @@ groups() ->
      {restart_one_for_all, [],
       [one_for_all, one_for_all_escalation]},
      {restart_simple_one_for_one, [],
-      [simple_one_for_one, simple_one_for_one_extra,
-       simple_one_for_one_escalation]},
+      [simple_one_for_one, simple_one_for_one_shutdown,
+       simple_one_for_one_extra, simple_one_for_one_escalation]},
      {restart_rest_for_one, [],
       [rest_for_one, rest_for_one_escalation]}].
 
@@ -204,8 +209,8 @@ sup_start_fail(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 
 sup_stop_infinity(doc) ->
-    ["See sup_stop/1 when Shutdown = infinity, this walue is only allowed "
-     "for children of type supervisor"];
+    ["See sup_stop/1 when Shutdown = infinity, this walue is allowed "
+     "for children of type supervisor _AND_ worker"];
 sup_stop_infinity(suite) -> [];
 
 sup_stop_infinity(Config) when is_list(Config) ->
@@ -216,12 +221,13 @@ sup_stop_infinity(Config) when is_list(Config) ->
     Child2 = {child2, {supervisor_1, start_child, []}, permanent,
 	      infinity, worker, []},
     {ok, CPid1} = supervisor:start_child(sup_test, Child1),
+    {ok, CPid2} = supervisor:start_child(sup_test, Child2),
     link(CPid1),
-    {error, {invalid_shutdown,infinity}} =
-	supervisor:start_child(sup_test, Child2),
+    link(CPid2),
 
     terminate(Pid, shutdown),
-    check_exit_reason(CPid1, shutdown).
+    check_exit_reason(CPid1, shutdown),
+    check_exit_reason(CPid2, shutdown).
 
 %%-------------------------------------------------------------------------
 
@@ -453,9 +459,8 @@ child_specs(Config) when is_list(Config) ->
     B2 = {child, {m,f,[a]}, prmanent, 1000, worker, []}, 
     B3 = {child, {m,f,[a]}, permanent, -10, worker, []},
     B4 = {child, {m,f,[a]}, permanent, 10, wrker, []},
-    B5 = {child, {m,f,[a]}, permanent, infinity, worker, []},
-    B6 = {child, {m,f,[a]}, permanent, 1000, worker, dy},
-    B7 = {child, {m,f,[a]}, permanent, 1000, worker, [1,2,3]},
+    B5 = {child, {m,f,[a]}, permanent, 1000, worker, dy},
+    B6 = {child, {m,f,[a]}, permanent, 1000, worker, [1,2,3]},
 
     %% Correct child specs!
     %% <Modules> (last parameter in a child spec) can be [] as we do 
@@ -464,6 +469,7 @@ child_specs(Config) when is_list(Config) ->
     C2 = {child, {m,f,[a]}, permanent, 1000, supervisor, []},
     C3 = {child, {m,f,[a]}, temporary, 1000, worker, dynamic},
     C4 = {child, {m,f,[a]}, transient, 1000, worker, [m]},
+    C5 = {child, {m,f,[a]}, permanent, infinity, worker, [m]},
 
     {error, {invalid_mfa,mfa}} = supervisor:start_child(sup_test, B1),
     {error, {invalid_restart_type, prmanent}} =
@@ -472,9 +478,8 @@ child_specs(Config) when is_list(Config) ->
 	= supervisor:start_child(sup_test, B3),
     {error, {invalid_child_type,wrker}}
 	= supervisor:start_child(sup_test, B4),
-    {error, _} = supervisor:start_child(sup_test, B5),
     {error, {invalid_modules,dy}}
-	= supervisor:start_child(sup_test, B6),
+	= supervisor:start_child(sup_test, B5),
 
     {error, {invalid_mfa,mfa}} = supervisor:check_childspecs([B1]),
     {error, {invalid_restart_type,prmanent}} =
@@ -482,15 +487,15 @@ child_specs(Config) when is_list(Config) ->
     {error, {invalid_shutdown,-10}} = supervisor:check_childspecs([B3]),
     {error, {invalid_child_type,wrker}}
 	= supervisor:check_childspecs([B4]),
-    {error, _} = supervisor:check_childspecs([B5]),
-    {error, {invalid_modules,dy}} = supervisor:check_childspecs([B6]),
+    {error, {invalid_modules,dy}} = supervisor:check_childspecs([B5]),
     {error, {invalid_module, 1}} =
-	supervisor:check_childspecs([B7]),
+	supervisor:check_childspecs([B6]),
 
     ok = supervisor:check_childspecs([C1]),
     ok = supervisor:check_childspecs([C2]),
     ok = supervisor:check_childspecs([C3]),
     ok = supervisor:check_childspecs([C4]),
+    ok = supervisor:check_childspecs([C5]),
     ok.
 
 %%-------------------------------------------------------------------------
@@ -549,6 +554,87 @@ temporary_normal(Config) when is_list(Config) ->
     [0,0,0,0] = get_child_counts(sup_test).
 
 %%-------------------------------------------------------------------------
+permanent_shutdown(doc) ->
+    ["A permanent child should always be restarted"];
+permanent_shutdown(suite) -> [];
+permanent_shutdown(Config) when is_list(Config) ->
+    {ok, SupPid} = start_link({ok, {{one_for_one, 2, 3600}, []}}),
+    Child1 = {child1, {supervisor_1, start_child, []}, permanent, 1000,
+	      worker, []},
+
+    {ok, CPid1} = supervisor:start_child(sup_test, Child1),
+
+    terminate(SupPid, CPid1, child1, shutdown),
+
+    [{child1, CPid2 ,worker,[]}] = supervisor:which_children(sup_test),
+    case is_pid(CPid2) of
+	true ->
+	    ok;
+	false ->
+	    test_server:fail({permanent_child_not_restarted, Child1})
+    end,
+    [1,1,0,1] = get_child_counts(sup_test),
+
+    terminate(SupPid, CPid2, child1, {shutdown, some_info}),
+
+    [{child1, CPid3 ,worker,[]}] = supervisor:which_children(sup_test),
+    case is_pid(CPid3) of
+	true ->
+	    ok;
+	false ->
+	    test_server:fail({permanent_child_not_restarted, Child1})
+    end,
+
+    [1,1,0,1] = get_child_counts(sup_test).
+
+%%-------------------------------------------------------------------------
+transient_shutdown(doc) ->
+    ["A transient child should not be restarted if it exits with " 
+     "reason shutdown or {shutdown,Term}"];
+transient_shutdown(suite) -> [];
+transient_shutdown(Config) when is_list(Config) ->
+    {ok, SupPid} = start_link({ok, {{one_for_one, 2, 3600}, []}}),
+    Child1 = {child1, {supervisor_1, start_child, []}, transient, 1000,
+	      worker, []},
+
+    {ok, CPid1} = supervisor:start_child(sup_test, Child1),
+
+    terminate(SupPid, CPid1, child1, shutdown),
+
+    [{child1,undefined,worker,[]}] = supervisor:which_children(sup_test),
+    [1,0,0,1] = get_child_counts(sup_test),
+
+    {ok, CPid2} = supervisor:restart_child(sup_test, child1),
+
+    terminate(SupPid, CPid2, child1, {shutdown, some_info}),
+
+    [{child1,undefined,worker,[]}] = supervisor:which_children(sup_test),
+    [1,0,0,1] = get_child_counts(sup_test).
+
+%%-------------------------------------------------------------------------
+temporary_shutdown(doc) ->
+    ["A temporary process should never be restarted"];
+temporary_shutdown(suite) -> [];
+temporary_shutdown(Config) when is_list(Config) ->
+    {ok, SupPid} = start_link({ok, {{one_for_one, 2, 3600}, []}}),
+    Child1 = {child1, {supervisor_1, start_child, []}, temporary, 1000,
+	      worker, []},
+
+    {ok, CPid1} = supervisor:start_child(sup_test, Child1),
+
+    terminate(SupPid, CPid1, child1, shutdown),
+
+    [] = supervisor:which_children(sup_test),
+    [0,0,0,0] = get_child_counts(sup_test),
+
+    {ok, CPid2} = supervisor:start_child(sup_test, Child1),
+
+    terminate(SupPid, CPid2, child1, {shutdown, some_info}),
+
+    [] = supervisor:which_children(sup_test),
+    [0,0,0,0] = get_child_counts(sup_test).
+
+%%-------------------------------------------------------------------------
 permanent_abnormal(doc) ->
     ["A permanent child should always be restarted"];
 permanent_abnormal(suite) -> [];
@@ -607,6 +693,37 @@ temporary_abnormal(Config) when is_list(Config) ->
     [0,0,0,0] = get_child_counts(sup_test).
 
 %%-------------------------------------------------------------------------
+temporary_bystander(doc) ->
+    ["A temporary process killed as part of a rest_for_one or one_for_all "
+     "restart strategy should not be restarted given its args are not "
+     " saved. Otherwise the supervisor hits its limit and crashes."];
+temporary_bystander(suite) -> [];
+temporary_bystander(_Config) ->
+    Child1 = {child1, {supervisor_1, start_child, []}, permanent, 100,
+	      worker, []},
+    Child2 = {child2, {supervisor_1, start_child, []}, temporary, 100,
+	      worker, []},
+    {ok, SupPid1} = supervisor:start_link(?MODULE, {ok, {{one_for_all, 2, 300}, []}}),
+    {ok, SupPid2} = supervisor:start_link(?MODULE, {ok, {{rest_for_one, 2, 300}, []}}),
+    unlink(SupPid1), % otherwise we crash with it
+    unlink(SupPid2), % otherwise we crash with it
+    {ok, CPid1} = supervisor:start_child(SupPid1, Child1),
+    {ok, _CPid2} = supervisor:start_child(SupPid1, Child2),
+    {ok, CPid3} = supervisor:start_child(SupPid2, Child1),
+    {ok, _CPid4} = supervisor:start_child(SupPid2, Child2),
+    terminate(SupPid1, CPid1, child1, normal),
+    terminate(SupPid2, CPid3, child1, normal),
+    timer:sleep(350),
+    catch link(SupPid1),
+    catch link(SupPid2),
+    %% The supervisor would die attempting to restart child2
+    true = erlang:is_process_alive(SupPid1),
+    true = erlang:is_process_alive(SupPid2),
+    %% Child2 has not been restarted
+    [{child1, _, _, _}] = supervisor:which_children(SupPid1),
+    [{child1, _, _, _}] = supervisor:which_children(SupPid2).
+
+%%-------------------------------------------------------------------------
 one_for_one(doc) ->
     ["Test the one_for_one base case."];
 one_for_one(suite) -> [];
@@ -751,6 +868,38 @@ simple_one_for_one(Config) when is_list(Config) ->
     terminate(SupPid, Pid4, Id4, abnormal),
     check_exit([SupPid]).
 
+
+%%-------------------------------------------------------------------------
+simple_one_for_one_shutdown(doc) ->
+    ["Test simple_one_for_one children shutdown accordingly to the "
+     "supervisor's shutdown strategy."];
+simple_one_for_one_shutdown(suite) -> [];
+simple_one_for_one_shutdown(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ShutdownTime = 1000,
+    Child = {child, {supervisor_2, start_child, []},
+             permanent, 2*ShutdownTime, worker, []},
+    {ok, SupPid} = start_link({ok, {{simple_one_for_one, 2, 3600}, [Child]}}),
+
+    %% Will be gracefully shutdown
+    {ok, _CPid1} = supervisor:start_child(sup_test, [ShutdownTime]),
+    {ok, _CPid2} = supervisor:start_child(sup_test, [ShutdownTime]),
+
+    %% Will be killed after 2*ShutdownTime milliseconds
+    {ok, _CPid3} = supervisor:start_child(sup_test, [5*ShutdownTime]),
+
+    {T, ok} = timer:tc(fun terminate/2, [SupPid, shutdown]),
+    if T < 1000*ShutdownTime ->
+            %% Because supervisor's children wait before exiting, it can't
+            %% terminate quickly
+            test_server:fail({shutdown_too_short, T});
+       T >= 1000*5*ShutdownTime ->
+            test_server:fail({shutdown_too_long, T});
+       true ->
+            check_exit([SupPid])
+    end.
+
+
 %%-------------------------------------------------------------------------
 simple_one_for_one_extra(doc) -> 
     ["Tests automatic restart of children " 
@@ -1251,6 +1400,13 @@ terminate(_, ChildPid, _, shutdown) ->
 	{'DOWN', Ref, process, ChildPid, shutdown} ->
 	    ok
     end;
+terminate(_, ChildPid, _, {shutdown, Term}) ->
+    Ref = erlang:monitor(process, ChildPid),
+    exit(ChildPid, {shutdown, Term}),
+    receive
+	{'DOWN', Ref, process, ChildPid, {shutdown, Term}} ->
+	    ok
+    end;
 terminate(_, ChildPid, _, normal) ->
     Ref = erlang:monitor(process, ChildPid),
     ChildPid ! stop,
diff --git a/lib/stdlib/test/supervisor_bridge_SUITE.erl b/lib/stdlib/test/supervisor_bridge_SUITE.erl
index f2dbad0b3b..c4d696564d 100644
--- a/lib/stdlib/test/supervisor_bridge_SUITE.erl
+++ b/lib/stdlib/test/supervisor_bridge_SUITE.erl
@@ -158,7 +158,7 @@ internal_loop(State) ->
 terminate(Reason,{Parent,Worker}) ->
     %% This func knows about supervisor_bridge
     io:format("Terminating bridge...\n"),
-    exit(kill,Worker),
+    exit(Worker,kill),
     Parent ! {dying,Reason},
     anything.
 
diff --git a/lib/stdlib/test/sys_SUITE.erl b/lib/stdlib/test/sys_SUITE.erl
index 72b089aa3f..fe039e8bcc 100644
--- a/lib/stdlib/test/sys_SUITE.erl
+++ b/lib/stdlib/test/sys_SUITE.erl
@@ -71,7 +71,7 @@ log_to_file(Config) when is_list(Config) ->
     ?line ok = sys:log_to_file(?server,TempName),
     ?line {ok,-44} = public_call(44),
     ?line ok = sys:log_to_file(?server,false),
-    ?line {ok,Fd} = file:open(TempName,read),
+    ?line {ok,Fd} = file:open(TempName,[read]),
     ?line Msg1 = io:get_line(Fd,''),
     ?line Msg2 = io:get_line(Fd,''),
     ?line file:close(Fd),
diff --git a/lib/stdlib/test/tar_SUITE.erl b/lib/stdlib/test/tar_SUITE.erl
index e32704ca65..9ad3936928 100644
--- a/lib/stdlib/test/tar_SUITE.erl
+++ b/lib/stdlib/test/tar_SUITE.erl
@@ -65,7 +65,7 @@ borderline(Config) when is_list(Config) ->
 
     ?line {ok, Cwd} = file:get_cwd(),
     ?line RootDir = ?config(priv_dir, Config),
-    ?line TempDir = remove_prefix(Cwd++"/", filename:join(RootDir, borderline)),
+    ?line TempDir = remove_prefix(Cwd++"/", filename:join(RootDir, "borderline")),
     ?line ok = file:make_dir(TempDir),
 
     ?line Record = 512,
@@ -283,17 +283,16 @@ long_names(doc) ->
 long_names(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
     ?line Long = filename:join(DataDir, "long_names.tar"),
+    run_in_short_tempdir(Config,
+			 fun() -> do_long_names(Long) end).
 
+do_long_names(Long) ->
     %% Try table/2 and extract/2.
     ?line case erl_tar:table(Long, [verbose]) of
 	      {ok,List} when is_list(List) ->
 		  ?line io:format("~p\n", [List])
 	  end,
 
-
-    %% To avoid getting too long paths for Windows to handle, extract into
-    %% the current directory (which is the test_server directory). Its path
-    %% is quite a bit shorter than the path to priv_dir.
     ?line {ok,Cwd} = file:get_cwd(),
     ?line ok = erl_tar:extract(Long),
     ?line Base = filename:join([Cwd, "original_software", "written_by",
@@ -312,29 +311,28 @@ long_names(Config) when is_list(Config) ->
     ?line "Here"++_ = binary_to_list(First),
     ?line "And"++_ = binary_to_list(Second),
 
-    %% Clean up.
-    ?line delete_files([filename:join(Cwd, "original_software"),EmptyDir]),
-
     ok.
 
 create_long_names(doc) ->
     ["Creates a tar file from a deep directory structure (filenames are ",
      "longer than 100 characters)."];
 create_long_names(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line ok = file:set_cwd(PrivDir),
-    Dirs = [aslfjkshjkhliuf,
-	    asdhjfehnbfsky,
-	    sahajfskdfhsz,
-	    asldfkdlfy4y8rchg,
-	    f7nafhjgffagkhsfkhsjk,
-	    dfjasldkfjsdkfjashbv],
+    run_in_short_tempdir(Config, fun create_long_names/0).
+    
+create_long_names() ->
+    ?line {ok,Dir} = file:get_cwd(),
+    Dirs = ["aslfjkshjkhliuf",
+	    "asdhjfehnbfsky",
+	    "sahajfskdfhsz",
+	    "asldfkdlfy4y8rchg",
+	    "f7nafhjgffagkhsfkhsjk",
+	    "dfjasldkfjsdkfjashbv"],
 
     ?line DeepDir = make_dirs(Dirs, []),
     ?line AFile = filename:join(DeepDir, "a_file"),
     ?line Hello = "hello, world\n",
     ?line ok = file:write_file(AFile, Hello),
-    ?line TarName = filename:join(PrivDir,  "my_tar_with_long_names.tar"),
+    ?line TarName = filename:join(Dir,  "my_tar_with_long_names.tar"),
     ?line ok = erl_tar:create(TarName, [AFile]),
 
     %% Print contents.
@@ -347,9 +345,6 @@ create_long_names(Config) when is_list(Config) ->
     ?line {ok, Bin} = file:read_file(filename:join(ExtractDir, AFile)),
     ?line Hello = binary_to_list(Bin),
 
-    %% Clean up.
-    ?line delete_files([ExtractDir,TarName,hd(Dirs)]),
-
     ok.
 
 make_dirs([Dir|Rest], []) ->
@@ -487,7 +482,7 @@ extract_from_binary_compressed(Config) when is_list(Config) ->
     
     %% Trying extracting from a binary.
     ?line ok = erl_tar:extract({binary,Bin}, [compressed,{cwd,ExtractDir}]),
-    ?line {ok,List} = file:list_dir(filename:join(ExtractDir, ddll_SUITE_data)),
+    ?line {ok,List} = file:list_dir(filename:join(ExtractDir, "ddll_SUITE_data")),
     ?line io:format("~p\n", [List]),
     ?line 19 = length(List),
 
@@ -676,7 +671,7 @@ cooked_compressed(Config) when is_list(Config) ->
 		  end, List),
 
     %% Clean up.
-    ?line delete_files([filename:join(PrivDir, ddll_SUITE_data)]),
+    ?line delete_files([filename:join(PrivDir, "ddll_SUITE_data")]),
     ok.
 
 memory(doc) ->
@@ -734,3 +729,42 @@ delete_files([Item|Rest]) ->
     end,
     delete_files(Rest).
 
+%% Move to a temporary directory with as short name as possible and
+%% execute Fun. Remove the directory and any files in it afterwards.
+%% This is necessary because pathnames on Windows may be limited to
+%% 260 characters.
+run_in_short_tempdir(Config, Fun) ->
+    {ok,Cwd} = file:get_cwd(),
+    PrivDir0 = ?config(priv_dir, Config),
+
+    %% Normalize name to make sure that there is no slash at the end.
+    PrivDir = filename:absname(PrivDir0),
+
+    %% We need a base directory with a much shorter pathname than
+    %% priv_dir. We KNOW that priv_dir is located four levels below
+    %% the directory that common_test puts the ct_run.* directories
+    %% in. That fact is not documented, but an usually reliable source
+    %% assured me that the directory structure is unlikely to change
+    %% in future versions of common_test because of backward
+    %% compatibility (tools developed by users of common_test depend
+    %% on the current directory layout).
+    Base = lists:foldl(fun(_, D) ->
+			       filename:dirname(D)
+		       end, PrivDir, [1,2,3,4]),
+
+    Dir = make_temp_dir(Base, 0),
+    ok = file:set_cwd(Dir),
+    io:format("Running test in ~s\n", [Dir]),
+    try
+	Fun()
+    after
+	file:set_cwd(Cwd),
+	delete_files([Dir])
+    end.
+
+make_temp_dir(Base, I) ->
+    Name = filename:join(Base, integer_to_list(I, 36)),
+    case file:make_dir(Name) of
+	ok -> Name;
+	{error,eexist} -> make_temp_dir(Base, I+1)
+    end.
diff --git a/lib/stdlib/test/unicode_SUITE.erl b/lib/stdlib/test/unicode_SUITE.erl
index 9aa800209d..4055af2741 100644
--- a/lib/stdlib/test/unicode_SUITE.erl
+++ b/lib/stdlib/test/unicode_SUITE.erl
@@ -322,7 +322,7 @@ roundtrips(Config) when is_list(Config) ->
 ex_roundtrips(Config) when is_list(Config) ->
     ?line L1 = ranges(0, 16#D800 - 1, 
 		      erlang:system_info(context_reductions) * 11),
-    ?line L2 = ranges(16#DFFF + 1, 16#FFFE - 1, 
+    ?line L2 = ranges(16#DFFF + 1, 16#10000 - 1,
 		      erlang:system_info(context_reductions) * 11),
     %?line L3 = ranges(16#FFFF + 1, 16#10FFFF, 
     %		      erlang:system_info(context_reductions) * 11),
@@ -569,7 +569,6 @@ utf16_illegal_sequences_bif(Config) when is_list(Config) ->
 ex_utf16_illegal_sequences_bif(Config) when is_list(Config) ->
     ?line utf16_fail_range_bif_simple(16#10FFFF+1, 16#10FFFF+512), %Too large.
     ?line utf16_fail_range_bif(16#D800, 16#DFFF),		%Reserved for UTF-16.
-    ?line utf16_fail_range_bif(16#FFFE, 16#FFFF),		%Non-characters.
 
     ?line lonely_hi_surrogate_bif(16#D800, 16#DBFF,incomplete),
     ?line lonely_hi_surrogate_bif(16#DC00, 16#DFFF,error),
@@ -644,7 +643,6 @@ utf8_illegal_sequences_bif(Config) when is_list(Config) ->
 ex_utf8_illegal_sequences_bif(Config) when is_list(Config) ->
     ?line fail_range_bif(16#10FFFF+1, 16#10FFFF+512), %Too large.
     ?line fail_range_bif(16#D800, 16#DFFF),		%Reserved for UTF-16.
-    ?line fail_range_bif(16#FFFE, 16#FFFF),		%Reserved (BOM).
 
     %% Illegal first character.
     ?line [fail_bif(<<I,16#8F,16#8F,16#8F>>,unicode) || I <- lists:seq(16#80, 16#BF)],
diff --git a/lib/stdlib/test/zip_SUITE.erl b/lib/stdlib/test/zip_SUITE.erl
index d5f2cd52d4..7233c061ef 100644
--- a/lib/stdlib/test/zip_SUITE.erl
+++ b/lib/stdlib/test/zip_SUITE.erl
@@ -375,7 +375,8 @@ zip_options(Config) when is_list(Config) ->
     ok = file:set_cwd(?config(data_dir, Config)),
 
     %% Create a zip archive
-    {ok, Zip} = zip:zip("filename_not_used.zip", Names, [memory, {cwd, PrivDir}]),
+    {ok, {_,Zip}} =
+        zip:zip("filename_not_used.zip", Names, [memory, {cwd, PrivDir}]),
 
     %% Open archive
     {ok, ZipSrv} = zip:zip_open(Zip, [memory]),
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 9d4ed17774..2f0ecd3863 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 1.17.5
+STDLIB_VSN = 1.18
diff --git a/lib/syntax_tools/doc/Makefile b/lib/syntax_tools/doc/Makefile
index 6afd16f669..d9981de880 100644
--- a/lib/syntax_tools/doc/Makefile
+++ b/lib/syntax_tools/doc/Makefile
@@ -78,12 +78,3 @@ release_docs_spec: docs
 
 
 release_spec:
-
-
-
-# ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-#-include make.dep
-
-
diff --git a/lib/syntax_tools/doc/src/make.dep b/lib/syntax_tools/doc/src/make.dep
deleted file mode 100644
index acc76857bb..0000000000
--- a/lib/syntax_tools/doc/src/make.dep
+++ /dev/null
@@ -1,22 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex chapter.tex epp_dodger.tex erl_comment_scan.tex \
-		erl_prettypr.tex erl_recomment.tex erl_syntax.tex \
-		erl_syntax_lib.tex erl_tidy.tex igor.tex part.tex \
-		prettypr.tex ref_man.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index ec2dd762b8..5948f7ada3 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2010</year>
+      <year>2007</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/syntax_tools/src/erl_tidy.erl b/lib/syntax_tools/src/erl_tidy.erl
index 1cfdc7234a..09efc9c392 100644
--- a/lib/syntax_tools/src/erl_tidy.erl
+++ b/lib/syntax_tools/src/erl_tidy.erl
@@ -103,7 +103,7 @@ dir(Dir) ->
 %%   <dt>{regexp, string()}</dt>
 %%
 %%       <dd>The value denotes a regular expression (see module
-%%       `regexp').  Tidying will only be applied to those
+%%       `re').  Tidying will only be applied to those
 %%       regular files whose names match this pattern. The default
 %%       value is `".*\\.erl$"', which matches normal
 %%       Erlang source file names.</dd>
@@ -124,7 +124,7 @@ dir(Dir) ->
 %%
 %% See the function {@link file/2} for further options.
 %%
-%% @see //stdlib/regexp
+%% @see //stdlib/re
 %% @see file/2
 
 -record(dir, {follow_links = false :: boolean(),
diff --git a/lib/test_server/doc/src/Makefile b/lib/test_server/doc/src/Makefile
index c7ba415e5b..f0be284324 100644
--- a/lib/test_server/doc/src/Makefile
+++ b/lib/test_server/doc/src/Makefile
@@ -133,9 +133,3 @@ release_docs_spec: docs
 release_spec:
 
 release_tests_spec:
-
-# ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-include make.dep
diff --git a/lib/test_server/doc/src/make.dep b/lib/test_server/doc/src/make.dep
deleted file mode 100644
index ee9100bd08..0000000000
--- a/lib/test_server/doc/src/make.dep
+++ /dev/null
@@ -1,24 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: basics_chapter.tex book.tex example_chapter.tex \
-		part.tex ref_man.tex run_test_chapter.tex \
-		test_server_app.tex test_server_ctrl.tex \
-		test_server.tex test_spec_chapter.tex \
-		write_framework_chapter.tex \
-		write_test_chapter.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/test_server/doc/src/notes.xml b/lib/test_server/doc/src/notes.xml
index 50923b1b03..beeff55ffe 100644
--- a/lib/test_server/doc/src/notes.xml
+++ b/lib/test_server/doc/src/notes.xml
@@ -32,6 +32,150 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Test_Server 3.4.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    An error in how comments are colored in the test suite
+	    overview html log file has been corrected. As result, a
+	    new framework callback function, format_comment/1, has
+	    been introduced.</p>
+          <p>
+	    Own Id: OTP-9237</p>
+        </item>
+        <item>
+          <p>
+	    Test Server did not release SASL TTY handlers
+	    (sasl_report_tty_h and error_logger_tty_h) properly after
+	    each test run. This error has been fixed.</p>
+          <p>
+	    Own Id: OTP-9311</p>
+        </item>
+        <item>
+          <p>
+	    Automatically generated init- and end-configuration
+	    functions for test case groups caused incorrect execution
+	    order of test cases. This has been corrected.</p>
+          <p>
+	    Own Id: OTP-9369</p>
+        </item>
+        <item>
+          <p>
+	    If ct:log/2 was called with bad arguments, this could
+	    cause the Common Test IO handling process to crash. This
+	    fault has been corrected.</p>
+          <p>
+	    Own Id: OTP-9371 Aux Id: OTP-8933 </p>
+        </item>
+        <item>
+          <p>
+	    A bug has been fixed that made Test Server call the
+	    end_tc/3 framework function with an incorrect module name
+	    as first argument.</p>
+          <p>
+	    Own Id: OTP-9379 Aux Id: seq11863 </p>
+        </item>
+        <item>
+          <p>
+	    If end_per_testcase caused a timetrap timeout, the actual
+	    test case status was discarded and the test case logged
+	    as successful (even if the case had actually failed
+	    before the call to end_per_testcase). This fault has been
+	    fixed.</p>
+          <p>
+	    Own Id: OTP-9397</p>
+        </item>
+        <item>
+          <p>
+	    If a timetrap timeout occured during execution of of a
+	    function in a lib module (i.e. a function called directly
+	    or indirectly from a test case), the Suite argument in
+	    the end_tc/3 framework callback function would not
+	    correctly contain the name of the test suite, but the lib
+	    module. (This would only happen if the lib module was
+	    compiled with ct.hrl included). This error has been
+	    solved.</p>
+          <p>
+	    Own Id: OTP-9398</p>
+        </item>
+        <item>
+          <p>
+	    Add a proplist() type</p>
+          <p>
+	    Recently I was adding specs to an API and found that
+	    there is no canonical proplist() type defined. (Thanks to
+	    Ryan Zezeski)</p>
+          <p>
+	    Own Id: OTP-9499</p>
+        </item>
+        <item>
+	    <p> XML files have been corrected. </p>
+          <p>
+	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
+        </item>
+        <item>
+          <p>
+	    If a test suite would start with a test case group
+	    defined without the init_per_group/2 and end_per_group/2
+	    function, init_per_suite/1 would not execute initially
+	    and logging of the test run would fail. This error has
+	    been fixed.</p>
+          <p>
+	    Own Id: OTP-9584</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A new option, 'logopts', has been introduced, to make it
+	    possible to modify some aspects of the logging behaviour
+	    in Common Test (or Test Server). For example, whenever an
+	    io printout is made, test_server adds newline (\n) to the
+	    end of the output string. This may not always be a
+	    preferred action and can therefore be disabled by means
+	    of "ct_run ... -logopts no_nl" (or ct:run_test([...,
+	    {logopts,[no_nl]}])). A new framework callback function,
+	    get_logopts/0, has been introduced (see the ct_framework
+	    module for details).</p>
+          <p>
+	    Own Id: OTP-9372 Aux Id: OTP-9396 </p>
+        </item>
+        <item>
+          <p>
+	    A new option, 'logopts', has been introduced, to make it
+	    possible to modify some aspects of the logging behaviour
+	    in Common Test (or Test Server). For example, if the html
+	    version of the test suite source code should not be
+	    generated during the test run (and consequently be
+	    unavailable in the log file system), the feature may be
+	    disabled by means of "ct_run ... -logopts no_src" (or
+	    ct:run_test([..., {logopts,[no_src]}])). A new framework
+	    callback function, get_logopts/0, has been introduced
+	    (see the ct_framework module for details).</p>
+          <p>
+	    Own Id: OTP-9396 Aux Id: seq11869, OTP-9372 </p>
+        </item>
+        <item>
+          <p>
+	    It is now possible to use a tuple {M,F,A}, or a fun, as
+	    timetrap specification in the suite info function or test
+	    case info functions. The function must return a valid
+	    timeout value, as documented in the common_test man page
+	    and in the User's Guide.</p>
+          <p>
+	    Own Id: OTP-9501 Aux Id: seq11894 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Test_Server 3.4.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/test_server/doc/src/ts.xml b/lib/test_server/doc/src/ts.xml
index 496ad3667a..f9b48d8372 100644
--- a/lib/test_server/doc/src/ts.xml
+++ b/lib/test_server/doc/src/ts.xml
@@ -77,7 +77,7 @@
         </p>
     <p><c>ts:install/0</c> is used if the target platform is the
         same as the controller host, i.e. if you run on "local target"
-        and no options are needed. Then running <c>ts:install/0</c><c>ts</c> 
+        and no options are needed. Then running <c>ts:install/0</c> <c>ts</c>
 	will run an autoconf script for your current
         environment and set up the necessary variables needed by the
         test suites.
diff --git a/lib/test_server/include/test_server.hrl b/lib/test_server/include/test_server.hrl
index 4b96d84ace..36e7e1f83d 100644
--- a/lib/test_server/include/test_server.hrl
+++ b/lib/test_server/include/test_server.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -20,11 +20,10 @@
 -ifdef(line_trace).
 -line_trace(true).
 -define(line,
-	put(test_server_loc,{?MODULE,?LINE}),
 	io:format(lists:concat([?MODULE,",",integer_to_list(?LINE),": ~p"]),
 		  [erlang:now()]),).
 -else.
--define(line,put(test_server_loc,{?MODULE,?LINE}),).
+-define(line,).
 -endif.
 -define(t,test_server).
 -define(config,test_server:lookup_config).
diff --git a/lib/test_server/include/test_server_line.hrl b/lib/test_server/include/test_server_line.hrl
index 60ef860883..3c309d3ee5 100644
--- a/lib/test_server/include/test_server_line.hrl
+++ b/lib/test_server/include/test_server_line.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -16,5 +16,4 @@
 %% 
 %% %CopyrightEnd%
 %%
--compile({parse_transform,test_server_line}).
 
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
index 63a585d526..4bc51873c2 100644
--- a/lib/test_server/src/Makefile
+++ b/lib/test_server/src/Makefile
@@ -43,7 +43,6 @@ MODULES= test_server_ctrl \
 	 test_server_node \
 	 test_server \
 	 test_server_sup \
-	 test_server_line \
 	 test_server_h \
 	 erl2html2 \
 	 vxworks_client
diff --git a/lib/test_server/src/test_server.app.src b/lib/test_server/src/test_server.app.src
index af2d4dc2cb..7e87583a7b 100644
--- a/lib/test_server/src/test_server.app.src
+++ b/lib/test_server/src/test_server.app.src
@@ -24,7 +24,6 @@
 	     test_server_ctrl,
 	     test_server,
 	     test_server_h,
-	     test_server_line,
 	     test_server_node,
 	     test_server_sup
 	    ]},
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 591329b361..49f97686a0 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -612,6 +612,7 @@ do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
     print(minor, "Current directory is ~p\n", [Cwd]),
     print_timestamp(minor,"Started at "),
     TCCallback = get(test_server_testcase_callback),
+    LogOpts = get(test_server_logopts),
     Ref = make_ref(),
     OldGLeader = group_leader(),
     %% Set ourself to group leader for the spawned process
@@ -621,7 +622,7 @@ do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
 	  fun() ->
 		  run_test_case_eval(Mod, Func, Args, Name, Ref,
 				     RunInit, TimetrapData,
-				     TCCallback)
+				     LogOpts, TCCallback)
 	  end),
     group_leader(OldGLeader, self()),
     put(test_server_detected_fail, []),
@@ -733,15 +734,23 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 	    print(Detail,Format,Args),
 	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 	{comment,NewComment} ->
+	    NewComment1 = test_server_ctrl:to_string(NewComment),
+	    NewComment2 = test_server_sup:framework_call(format_comment,
+							 [NewComment1],
+							 NewComment1),
 	    Terminate1 =
 		case Terminate of
 		    {true,{Time,Value,Loc,Opts,_OldComment}} ->
-			{true,{Time,Value,mod_loc(Loc),Opts,NewComment}};
+			{true,{Time,Value,mod_loc(Loc),Opts,NewComment2}};
 		    Other ->
 			Other
 		end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate1,NewComment,CurrConf);
-	{set_curr_conf,NewCurrConf} ->
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate1,NewComment2,CurrConf);
+	{read_comment,From} ->
+	    From ! {self(),read_comment,Comment},
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
+	{set_curr_conf,From,NewCurrConf} ->
+	    From ! {self(),set_curr_conf,ok},
 	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,NewCurrConf);
 	{'EXIT',Pid,{Ref,Time,Value,Loc,Opts}} ->
 	    RetVal = {Time/1000000,Value,mod_loc(Loc),Opts,Comment},
@@ -753,13 +762,12 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 		    case mod_loc(Loc) of
 			{FwMod,FwFunc,framework} ->
 			    %% timout during framework call
-			    spawn_fw_call(FwMod,FwFunc,Pid,
+			    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
 					  {framework_error,{timetrap,TVal}},
 					  unknown,self(),Comment),
 			    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
 						  Comment,undefined);
 			Loc1 ->
-			    {Mod,Func} = get_mf(Loc1),
 			    %% call end_per_testcase on a separate process,
 			    %% only so that the user has a chance to clean up
 			    %% after init_per_testcase, even after a timetrap timeout
@@ -775,11 +783,13 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 							  TVal),
 					{EndConfPid,{Mod,Func},Conf};
 				    _ ->
+					{Mod,Func} = get_mf(Loc1),
 					%% The framework functions mustn't execute on this
 					%% group leader process or io will cause deadlock,
 					%% so we spawn a dedicated process for the operation
 					%% and let the group leader go back to handle io.
-					spawn_fw_call(Mod,Func,Pid,{timetrap_timeout,TVal},
+					spawn_fw_call(Mod,Func,CurrConf,Pid,
+						      {timetrap_timeout,TVal},
 						      Loc1,self(),Comment),
 					undefined
 				end,
@@ -790,12 +800,13 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 		    case mod_loc(Loc) of
 			{FwMod,FwFunc,framework} ->
 			    %% timout during framework call
-			    spawn_fw_call(FwMod,FwFunc,Pid,
+			    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
 					  {framework_error,{timetrap,TVal}},
 					  unknown,self(),Comment);
 			Loc1 ->
 			    {Mod,_Func} = get_mf(Loc1),
-			    spawn_fw_call(Mod,InitOrEnd,Pid,{timetrap_timeout,TVal},
+			    spawn_fw_call(Mod,InitOrEnd,CurrConf,Pid,
+					  {timetrap_timeout,TVal},
 					  Loc1,self(),Comment)
 		    end,
 		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
@@ -804,13 +815,12 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 		    case mod_loc(AbortLoc) of
 			{FwMod,FwFunc,framework} ->
 			    %% abort during framework call
-			    spawn_fw_call(FwMod,FwFunc,Pid,
+			    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
 					  {framework_error,ErrorMsg},
 					  unknown,self(),Comment),
 			    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
 						  Comment,undefined);
 			Loc1 ->
-			    {Mod,Func} = get_mf(Loc1),
 			    %% call end_per_testcase on a separate process, only so
 			    %% that the user has a chance to clean up after init_per_testcase,
 			    %% even after abortion
@@ -828,7 +838,8 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 							  TVal),
 					{EndConfPid,{Mod,Func},Conf};
 				    _ ->
-					spawn_fw_call(Mod,Func,Pid,ErrorMsg,
+					{Mod,Func} = get_mf(Loc1),
+					spawn_fw_call(Mod,Func,CurrConf,Pid,ErrorMsg,
 						      Loc1,self(),Comment),
 					undefined
 				end,
@@ -839,17 +850,18 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 		    %% result of an exit(TestCase,kill) call, which is the
 		    %% only way to abort a testcase process that traps exits
 		    %% (see abort_current_testcase)
-		    spawn_fw_call(undefined,undefined,Pid,testcase_aborted_or_killed,
+		    spawn_fw_call(undefined,undefined,CurrConf,Pid,
+				  testcase_aborted_or_killed,
 				  unknown,self(),Comment),
 		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 		{fw_error,{FwMod,FwFunc,FwError}} ->
-		    spawn_fw_call(FwMod,FwFunc,Pid,{framework_error,FwError},
+		    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,{framework_error,FwError},
 				  unknown,self(),Comment),
 		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 		_Other ->
 		    %% the testcase has terminated because of Reason (e.g. an exit
 		    %% because a linked process failed)
-		    spawn_fw_call(undefined,undefined,Pid,Reason,
+		    spawn_fw_call(undefined,undefined,CurrConf,Pid,Reason,
 				  unknown,self(),Comment),
 		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf)
 	    end;
@@ -857,7 +869,7 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 	    case CurrConf of
 		{EndConfPid,{Mod,Func},_Conf} ->
 		    {_Mod,_Func,TCPid,TCExitReason,Loc} = Data,
-		    spawn_fw_call(Mod,Func,TCPid,TCExitReason,Loc,self(),Comment),
+		    spawn_fw_call(Mod,Func,CurrConf,TCPid,TCExitReason,Loc,self(),Comment),
 		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,undefined);
 		_ ->
 		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf)
@@ -928,7 +940,7 @@ call_end_conf(Mod,Func,TCPid,TCExitReason,Loc,Conf,TVal) ->
 				    ok
 			    end,
 			    Supervisor ! {self(),end_conf}
-		       end,
+		    end,
 		Pid = spawn_link(EndConfApply),
 		receive
 		    {Pid,end_conf} ->
@@ -941,50 +953,72 @@ call_end_conf(Mod,Func,TCPid,TCExitReason,Loc,Conf,TVal) ->
 	end,
     spawn_link(EndConfProc).
 
-spawn_fw_call(Mod,{init_per_testcase,Func},Pid,{timetrap_timeout,TVal}=Why,
+spawn_fw_call(Mod,{init_per_testcase,Func},_,Pid,{timetrap_timeout,TVal}=Why,
 	      Loc,SendTo,Comment) ->
     FwCall =
 	fun() ->
-	    Skip = {skip,{failed,{Mod,init_per_testcase,Why}}},
-	    %% if init_per_testcase fails, the test case
-	    %% should be skipped
-	    case catch do_end_tc_call(Mod,Func,{Pid,Skip,[[]]},Why) of
-		{'EXIT',FwEndTCErr} ->
-		    exit({fw_notify_done,end_tc,FwEndTCErr});
-		_ ->
-		    ok
-	    end,
-	    %% finished, report back
-	    SendTo ! {self(),fw_notify_done,
-		      {TVal/1000,Skip,Loc,[],Comment}}
+		Skip = {skip,{failed,{Mod,init_per_testcase,Why}}},
+		%% if init_per_testcase fails, the test case
+		%% should be skipped
+		case catch do_end_tc_call(Mod,Func, Loc, {Pid,Skip,[[]]}, Why) of
+		    {'EXIT',FwEndTCErr} ->
+			exit({fw_notify_done,end_tc,FwEndTCErr});
+		    _ ->
+			ok
+		end,
+		%% finished, report back
+		SendTo ! {self(),fw_notify_done,
+			  {TVal/1000,Skip,Loc,[],Comment}}
 	end,
     spawn_link(FwCall);
 
-spawn_fw_call(Mod,{end_per_testcase,Func},Pid,{timetrap_timeout,TVal}=Why,
-	      Loc,SendTo,_Comment) ->
+spawn_fw_call(Mod,{end_per_testcase,Func},EndConf,Pid,
+	      {timetrap_timeout,TVal}=Why,_Loc,SendTo,Comment) ->
+    %%! This is a temporary fix that keeps Test Server alive during
+    %%! execution of a parallel test case group, when sometimes
+    %%! this clause gets called with EndConf == undefined. See OTP-9594
+    %%! for more info.
+    EndConf1 = if EndConf == undefined ->
+		       [{tc_status,{failed,{Mod,end_per_testcase,Why}}}];
+		  true ->
+		       EndConf
+	       end,
     FwCall =
 	fun() ->
-	    Conf = [{tc_status,ok}],
-	    %% if end_per_testcase fails, the test case should be
-	    %% reported successful with a warning printed as comment
-	    case catch do_end_tc_call(Mod,Func,{Pid,
-						{failed,{Mod,end_per_testcase,Why}},
-						[Conf]}, Why) of
-		{'EXIT',FwEndTCErr} ->
-		    exit({fw_notify_done,end_tc,FwEndTCErr});
-		_ ->
-		    ok
-	    end,
-	    %% finished, report back
-	    SendTo ! {self(),fw_notify_done,
-		      {TVal/1000,{error,{Mod,end_per_testcase,Why}},Loc,[],
-		       ["<font color=\"red\">"
-			"WARNING: end_per_testcase timed out!"
-			"</font>"]}}
+		{RetVal,Report} =
+		    case proplists:get_value(tc_status, EndConf1) of
+			undefined ->
+			    E = {failed,{Mod,end_per_testcase,Why}},
+			    {E,E};
+			E = {failed,Reason} ->
+			    {E,{error,Reason}};
+			Result ->
+			    E = {failed,{Mod,end_per_testcase,Why}},
+			    {Result,E}
+		    end,
+		FailLoc = proplists:get_value(tc_fail_loc, EndConf1),
+		case catch do_end_tc_call(Mod,Func, FailLoc,
+					  {Pid,Report,[EndConf1]}, Why) of
+		    {'EXIT',FwEndTCErr} ->
+			exit({fw_notify_done,end_tc,FwEndTCErr});
+		    _ ->
+			ok
+		end,
+		%% if end_per_testcase fails a warning should be
+		%% printed as comment
+		Comment1 = if Comment == "" -> "";
+			      true -> Comment ++ "<br>"
+			   end,
+		%% finished, report back
+		SendTo ! {self(),fw_notify_done,
+			  {TVal/1000,RetVal,FailLoc,[],
+			   [Comment1,"<font color=\"red\">"
+			    "WARNING: end_per_testcase timed out!"
+			    "</font>"]}}
 	end,
     spawn_link(FwCall);
 
-spawn_fw_call(FwMod,FwFunc,_Pid,{framework_error,FwError},_,SendTo,_Comment) ->
+spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo,_Comment) ->
     FwCall =
 	fun() ->
 		test_server_sup:framework_call(report, [framework_error,
@@ -999,7 +1033,7 @@ spawn_fw_call(FwMod,FwFunc,_Pid,{framework_error,FwError},_,SendTo,_Comment) ->
 	end,
     spawn_link(FwCall);
 
-spawn_fw_call(Mod,Func,Pid,Error,Loc,SendTo,Comment) ->
+spawn_fw_call(Mod,Func,_,Pid,Error,Loc,SendTo,Comment) ->
     FwCall =
 	fun() ->
 		case catch fw_error_notify(Mod,Func,[],
@@ -1011,7 +1045,8 @@ spawn_fw_call(Mod,Func,Pid,Error,Loc,SendTo,Comment) ->
 			ok
 		end,
 		Conf = [{tc_status,{failed,timetrap_timeout}}],
-		case catch do_end_tc_call(Mod,Func,{Pid,Error,[Conf]},Error) of
+		case catch do_end_tc_call(Mod,Func, Loc,
+					  {Pid,Error,[Conf]},Error) of
 		    {'EXIT',FwEndTCErr} ->
 			exit({fw_notify_done,end_tc,FwEndTCErr});
 		    _ ->
@@ -1072,8 +1107,9 @@ job_proxy_msgloop() ->
 %% or sends a message {failed, File, Line} to it's group_leader
 
 run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
-		   TimetrapData, TCCallback) ->
-    put(test_server_multiply_timetraps,TimetrapData),
+		   TimetrapData, LogOpts, TCCallback) ->
+    put(test_server_multiply_timetraps, TimetrapData),
+    put(test_server_logopts, LogOpts),
 
     {{Time,Value},Loc,Opts} =
 	case test_server_sup:framework_call(init_tc,[?pl2a(Mod),Func,Args0],
@@ -1081,22 +1117,26 @@ run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
 	    {ok,Args} ->
 		run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback);
 	    Error = {error,_Reason} ->
-		NewResult = do_end_tc_call(Mod,Func,{Error,Args0},
+		Where = {Mod,Func},
+		NewResult = do_end_tc_call(Mod,Func, Where, {Error,Args0},
 					   {skip,{failed,Error}}),
-		{{0,NewResult},{Mod,Func},[]};
+		{{0,NewResult},Where,[]};
 	    {fail,Reason} ->
 		Conf = [{tc_status,{failed,Reason}} | hd(Args0)],
+		Where = {Mod,Func},
 		fw_error_notify(Mod, Func, Conf, Reason),
-		NewResult = do_end_tc_call(Mod,Func, {{error,Reason},[Conf]},
+		NewResult = do_end_tc_call(Mod,Func, Where, {{error,Reason},[Conf]},
 					   {fail,Reason}),
-		{{0,NewResult},{Mod,Func},[]};
+		{{0,NewResult},Where,[]};
 	    Skip = {skip,_Reason} ->
-		NewResult = do_end_tc_call(Mod,Func,{Skip,Args0},Skip),
-		{{0,NewResult},{Mod,Func},[]};
+		Where = {Mod,Func},
+		NewResult = do_end_tc_call(Mod,Func, Where, {Skip,Args0}, Skip),
+		{{0,NewResult},Where,[]};
 	    {auto_skip,Reason} ->
-		NewResult = do_end_tc_call(Mod, Func, {{skip,Reason},Args0},
+		Where = {Mod,Func},
+		NewResult = do_end_tc_call(Mod,Func, Where, {{skip,Reason},Args0},
 					   {skip,{fw_auto_skip,Reason}}),
-		{{0,NewResult},{Mod,Func},[]}
+		{{0,NewResult},Where,[]}
 	end,
     exit({Ref,Time,Value,Loc,Opts}).
 
@@ -1110,18 +1150,19 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 		Skip = {skip,Reason} ->
 		    Line = get_loc(),
 		    Conf = [{tc_status,{skipped,Reason}}],
-		    NewRes = do_end_tc_call(Mod,Func,{Skip,[Conf]}, Skip),
+		    NewRes = do_end_tc_call(Mod,Func, Line, {Skip,[Conf]}, Skip),
 		    {{0,NewRes},Line,[]};
 		{skip_and_save,Reason,SaveCfg} ->
 		    Line = get_loc(),
 		    Conf = [{tc_status,{skipped,Reason}},{save_config,SaveCfg}],
-		    NewRes = do_end_tc_call(Mod, Func, {{skip,Reason},[Conf]},
-					    {skip, Reason}),
+		    NewRes = do_end_tc_call(Mod,Func, Line, {{skip,Reason},[Conf]},
+					    {skip,Reason}),
 		    {{0,NewRes},Line,[]};
 		FailTC = {fail,Reason} ->       % user fails the testcase
 		    EndConf = [{tc_status,{failed,Reason}} | hd(Args)],
 		    fw_error_notify(Mod, Func, EndConf, Reason),
-		    NewRes = do_end_tc_call(Mod, Func, {{error,Reason},[EndConf]},
+		    NewRes = do_end_tc_call(Mod,Func, {Mod,Func},
+					    {{error,Reason},[EndConf]},
 					    FailTC),
 		    {{0,NewRes},{Mod,Func},[]};
 		{ok,NewConf} ->
@@ -1129,47 +1170,61 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 		    %% call user callback function if defined
 		    NewConf1 = user_callback(TCCallback, Mod, Func, init, NewConf),
 		    %% save current state in controller loop
-		    group_leader() ! {set_curr_conf,{{Mod,Func},NewConf1}},
+		    sync_send(group_leader(),set_curr_conf,{{Mod,Func},NewConf1},
+			      5000, fun() -> exit(no_answer_from_group_leader) end),
 		    put(test_server_loc, {Mod,Func}),
 		    %% execute the test case
 		    {{T,Return},Loc} = {ts_tc(Mod, Func, [NewConf1]),get_loc()},
 		    {EndConf,TSReturn,FWReturn} =
 			case Return of
 			    {E,TCError} when E=='EXIT' ; E==failed ->
+				ModLoc = mod_loc(Loc),
 				fw_error_notify(Mod, Func, NewConf1,
-						TCError, mod_loc(Loc)),
-				{[{tc_status,{failed,TCError}}|NewConf1],
+						TCError, ModLoc),
+				{[{tc_status,{failed,TCError}},
+				  {tc_fail_loc,ModLoc}|NewConf1],
 				 Return,{error,TCError}};
 			    SaveCfg={save_config,_} ->
 				{[{tc_status,ok},SaveCfg|NewConf1],Return,ok};
 			    {skip_and_save,Why,SaveCfg} ->
 				Skip = {skip,Why},
-				{[{tc_status,{skipped,Why}},{save_config,SaveCfg}|NewConf1],
+				{[{tc_status,{skipped,Why}},
+				  {save_config,SaveCfg}|NewConf1],
 				 Skip,Skip};
 			    {skip,Why} ->
 				{[{tc_status,{skipped,Why}}|NewConf1],Return,Return};
 			    _ ->
 				{[{tc_status,ok}|NewConf1],Return,ok}
 			end,
-		    %% clear current state in controller loop
-		    group_leader() ! {set_curr_conf,undefined},
 		    %% call user callback function if defined
 		    EndConf1 = user_callback(TCCallback, Mod, Func, 'end', EndConf),
+		    %% update current state in controller loop
+		    sync_send(group_leader(),set_curr_conf,EndConf1,
+			      5000, fun() -> exit(no_answer_from_group_leader) end),
 		    {FWReturn1,TSReturn1,EndConf2} =
 			case end_per_testcase(Mod, Func, EndConf1) of
 			    SaveCfg1={save_config,_} ->
 				{FWReturn,TSReturn,[SaveCfg1|lists:keydelete(save_config,1,
 									     EndConf1)]};
-			    {fail,ReasonToFail} ->                % user has failed the testcase
+			    {fail,ReasonToFail} ->
+				%% user has failed the testcase
 				fw_error_notify(Mod, Func, EndConf1, ReasonToFail),
 				{{error,ReasonToFail},{failed,ReasonToFail},EndConf1};
-			    {failed,{_,end_per_testcase,_}} = Failure -> % unexpected termination
+			    {failed,{_,end_per_testcase,_}} = Failure when FWReturn == ok ->
+				%% unexpected termination in end_per_testcase
+				%% report this as the result to the framework
 				{Failure,TSReturn,EndConf1};
 			    _ ->
+				%% test case result should be reported to framework
+				%% no matter the status of end_per_testcase
 				{FWReturn,TSReturn,EndConf1}
 			end,
+		    %% clear current state in controller loop
+		    sync_send(group_leader(),set_curr_conf,undefined,
+			      5000, fun() -> exit(no_answer_from_group_leader) end),
 		    put(test_server_init_or_end_conf,undefined),
-		    case do_end_tc_call(Mod, Func, {FWReturn1,[EndConf2]}, TSReturn1) of
+		    case do_end_tc_call(Mod,Func, Loc,
+					{FWReturn1,[EndConf2]}, TSReturn1) of
 			{failed,Reason} = NewReturn ->
 			    fw_error_notify(Mod,Func,EndConf2, Reason),
 			    {{T,NewReturn},{Mod,Func},[]};
@@ -1193,18 +1248,43 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 	    %% call user callback function if defined
 	    Return1 = user_callback(TCCallback, Mod, Func, 'end', Return),
 	    {Return2,Opts} = process_return_val([Return1], Mod, Func,
-						Args1, Loc, Return1),
+						Args1, {Mod,Func}, Return1),
 	    {{T,Return2},Loc,Opts}
     end.
 
-do_end_tc_call(M,F,Res,Return) ->
+do_end_tc_call(M,F, Loc, Res, Return) ->
+    FwMod = os:getenv("TEST_SERVER_FRAMEWORK"),
+    {Mod,Func} =
+	if FwMod == M ; FwMod == "undefined"; FwMod == false ->
+		{M,F};
+	   is_list(Loc) and (length(Loc)>1) ->
+		%% If failure in other module (M) than suite, try locate
+		%% suite name in Loc list and call end_tc with Suite:TestCase
+		%% instead of M:F.
+		GetSuite = fun(S,TC) ->
+				   case lists:reverse(atom_to_list(S)) of
+				       [$E,$T,$I,$U,$S,$_|_]  -> [{S,TC}];
+				      _ -> []
+				   end
+			  end,
+		case lists:flatmap(fun({S,TC,_})   -> GetSuite(S,TC);
+				      ({{S,TC},_}) -> GetSuite(S,TC);
+				      ({S,TC})     -> GetSuite(S,TC);
+				      (_)          -> []
+				   end, Loc) of
+		    [] ->
+			{M,F};
+		    [FoundSuite|_] ->
+			FoundSuite
+		end;
+	   true ->
+		{M,F}
+	end,
+
     Ref = make_ref(),
-    case os:getenv("TEST_SERVER_FRAMEWORK") of
-	FW when FW == "ct_framework";
-		FW == "undefined";
-		FW == false ->
+    if FwMod == "ct_framework" ; FwMod == "undefined"; FwMod == false ->
 	    case test_server_sup:framework_call(
-		   end_tc, [?pl2a(M),F,Res, Return], ok) of
+		   end_tc, [?pl2a(Mod),Func,Res, Return], ok) of
 		{fail,FWReason} ->
 		    {failed,FWReason};
 		ok ->
@@ -1217,9 +1297,9 @@ do_end_tc_call(M,F,Res,Return) ->
 		NewReturn ->
 		    NewReturn
 	    end;
-	Other ->
-	    case test_server_sup:framework_call(
-		   end_tc, [Other,F,Res], Ref) of
+       true ->
+	    case test_server_sup:framework_call(FwMod, end_tc,
+						[?pl2a(Mod),Func,Res], Ref) of
 		{fail,FWReason} ->
 		    {failed,FWReason};
 		_Else ->
@@ -1242,7 +1322,7 @@ process_return_val([Return], M,F,A, Loc, Final) when is_list(Return) ->
 	true ->		     % must be return value from end conf case
 	    process_return_val1(Return, M,F,A, Loc, Final, []);
 	false -> % must be Config value from init conf case
-	    case do_end_tc_call(M,F,{ok,A}, Return) of
+	    case do_end_tc_call(M, F, Loc, {ok,A}, Return) of
 		{failed, FWReason} = Failed ->
 		    fw_error_notify(M,F,A, FWReason),
 		    {Failed, []};
@@ -1259,8 +1339,9 @@ process_return_val1([Failed={E,TCError}|_], M,F,A=[Args], Loc, _, SaveOpts)
   when E=='EXIT';
        E==failed ->
     fw_error_notify(M,F,A, TCError, mod_loc(Loc)),
-    case do_end_tc_call(M,F,{{error,TCError},
-			     [[{tc_status,{failed,TCError}}|Args]]}, Failed) of
+    case do_end_tc_call(M,F, Loc, {{error,TCError},
+				   [[{tc_status,{failed,TCError}}|Args]]},
+			Failed) of
 	{failed,FWReason} ->
 	    {{failed,FWReason},SaveOpts};
 	NewReturn ->
@@ -1277,8 +1358,8 @@ process_return_val1([RetVal={Tag,_}|Opts], M,F,A, Loc, _, SaveOpts) when Tag==sk
     process_return_val1(Opts, M,F,A, Loc, RetVal, SaveOpts);
 process_return_val1([_|Opts], M,F,A, Loc, Final, SaveOpts) ->
     process_return_val1(Opts, M,F,A, Loc, Final, SaveOpts);
-process_return_val1([], M,F,A, _Loc, Final, SaveOpts) ->
-    case do_end_tc_call(M,F,{Final,A}, Final) of
+process_return_val1([], M,F,A, Loc, Final, SaveOpts) ->
+    case do_end_tc_call(M,F, Loc, {Final,A}, Final) of
 	{failed,FWReason} ->
 	    {{failed,FWReason},SaveOpts};
 	NewReturn ->
@@ -1307,57 +1388,62 @@ init_per_testcase(Mod, Func, Args) ->
 	false -> code:load_file(Mod);
 	_ -> ok
     end,
-    %% init_per_testcase defined, returns new configuration
-    case erlang:function_exported(Mod,init_per_testcase,2) of
+    case erlang:function_exported(Mod, init_per_testcase, 2) of
 	true ->
-	    case catch my_apply(Mod, init_per_testcase, [Func|Args]) of
-		{'$test_server_ok',{Skip,Reason}} when Skip==skip;
-						       Skip==skipped ->
-		    {skip,Reason};
-		{'$test_server_ok',Res={skip_and_save,_,_}} ->
-		    Res;
-		{'$test_server_ok',NewConf} when is_list(NewConf) ->
-		    case lists:filter(fun(T) when is_tuple(T) -> false;
-					 (_) -> true end, NewConf) of
-			[] ->
-			    {ok,NewConf};
-			Bad ->
-			    group_leader() ! {printout,12,
-					      "ERROR! init_per_testcase has returned "
-					      "bad elements in Config: ~p\n",[Bad]},
-			    {skip,{failed,{Mod,init_per_testcase,bad_return}}}
-		    end;
-		{'$test_server_ok',Res={fail,_Reason}} ->
-		    Res;
-		{'$test_server_ok',_Other} ->
-		    group_leader() ! {printout,12,
-				      "ERROR! init_per_testcase did not return "
-				      "a Config list.\n",[]},
-		    {skip,{failed,{Mod,init_per_testcase,bad_return}}};
-		{'EXIT',Reason} ->
-		    Line = get_loc(),
-		    FormattedLoc = test_server_sup:format_loc(mod_loc(Line)),
-		    group_leader() ! {printout,12,
-				      "ERROR! init_per_testcase crashed!\n"
-				      "\tLocation: ~s\n\tReason: ~p\n",
-				      [FormattedLoc,Reason]},
-		    {skip,{failed,{Mod,init_per_testcase,Reason}}};
-		Other ->
-		    Line = get_loc(),
-		    FormattedLoc = test_server_sup:format_loc(mod_loc(Line)),
-		    group_leader() ! {printout,12,
-				      "ERROR! init_per_testcase thrown!\n"
-				      "\tLocation: ~s\n\tReason: ~p\n",
-				      [FormattedLoc, Other]},
-		    {skip,{failed,{Mod,init_per_testcase,Other}}}
-	    end;
+	    do_init_per_testcase(Mod, [Func|Args]);
 	false ->
-%% Optional init_per_testcase not defined
-%% keep quiet.
+	    %% Optional init_per_testcase is not defined -- keep quiet.
 	    [Config] = Args,
 	    {ok, Config}
     end.
 
+do_init_per_testcase(Mod, Args) ->
+    try	apply(Mod, init_per_testcase, Args) of
+	{Skip,Reason} when Skip =:= skip; Skip =:= skipped ->
+	    {skip,Reason};
+	{skip_and_save,_,_}=Res ->
+	    Res;
+	NewConf when is_list(NewConf) ->
+	    case lists:filter(fun(T) when is_tuple(T) -> false;
+				 (_) -> true end, NewConf) of
+		[] ->
+		    {ok,NewConf};
+		Bad ->
+		    group_leader() ! {printout,12,
+				      "ERROR! init_per_testcase has returned "
+				      "bad elements in Config: ~p\n",[Bad]},
+		    {skip,{failed,{Mod,init_per_testcase,bad_return}}}
+	    end;
+	{fail,_Reason}=Res ->
+	    Res;
+	_Other ->
+	    group_leader() ! {printout,12,
+			      "ERROR! init_per_testcase did not return "
+			      "a Config list.\n",[]},
+	    {skip,{failed,{Mod,init_per_testcase,bad_return}}}
+    catch
+	throw:Other ->
+	    set_loc(erlang:get_stacktrace()),
+	    Line = get_loc(),
+	    FormattedLoc = test_server_sup:format_loc(mod_loc(Line)),
+	    group_leader() ! {printout,12,
+			      "ERROR! init_per_testcase thrown!\n"
+			      "\tLocation: ~s\n\tReason: ~p\n",
+			      [FormattedLoc, Other]},
+	    {skip,{failed,{Mod,init_per_testcase,Other}}};
+	_:Reason0 ->
+	    Stk = erlang:get_stacktrace(),
+	    Reason = {Reason0,Stk},
+	    set_loc(Stk),
+	    Line = get_loc(),
+	    FormattedLoc = test_server_sup:format_loc(mod_loc(Line)),
+	    group_leader() ! {printout,12,
+			      "ERROR! init_per_testcase crashed!\n"
+			      "\tLocation: ~s\n\tReason: ~p\n",
+			      [FormattedLoc,Reason]},
+	    {skip,{failed,{Mod,init_per_testcase,Reason}}}
+    end.
+
 end_per_testcase(Mod, Func, Conf) ->
     case erlang:function_exported(Mod,end_per_testcase,2) of
 	true ->
@@ -1375,57 +1461,87 @@ end_per_testcase(Mod, Func, Conf) ->
 do_end_per_testcase(Mod,EndFunc,Func,Conf) ->
     put(test_server_init_or_end_conf,{EndFunc,Func}),
     put(test_server_loc, {Mod,{EndFunc,Func}}),
-    case catch my_apply(Mod, EndFunc, [Func,Conf]) of
-	{'$test_server_ok',SaveCfg={save_config,_}} ->
+    try Mod:EndFunc(Func, Conf) of
+	{save_config,_}=SaveCfg ->
 	    SaveCfg;
-	{'$test_server_ok',{fail,_}=Fail} ->
+	{fail,_}=Fail ->
 	    Fail;
-	{'$test_server_ok',_} ->
-	    ok;
-	{'EXIT',Reason} = Why ->
-	    comment(io_lib:format("<font color=\"red\">"
-				  "WARNING: ~w crashed!"
-				  "</font>\n",[EndFunc])),
+	_ ->
+	    ok
+    catch
+	throw:Other ->
+	    Comment0 = case read_comment() of
+			   ""  -> "";
+			   Cmt -> Cmt ++ "<br>"
+		       end,
+	    set_loc(erlang:get_stacktrace()),
+	    comment(io_lib:format("~s<font color=\"red\">"
+				  "WARNING: ~w thrown!"
+				  "</font>\n",[Comment0,EndFunc])),
 	    group_leader() ! {printout,12,
-			      "WARNING: ~w crashed!\n"
+			      "WARNING: ~w thrown!\n"
 			      "Reason: ~p\n"
 			      "Line: ~s\n",
-			      [EndFunc, Reason,
+			      [EndFunc, Other,
 			       test_server_sup:format_loc(
 				 mod_loc(get_loc()))]},
-	    {failed,{Mod,end_per_testcase,Why}};
-	Other ->
-	    comment(io_lib:format("<font color=\"red\">"
-				  "WARNING: ~w thrown!"
-				  "</font>\n",[EndFunc])),
+	    {failed,{Mod,end_per_testcase,Other}};
+	  Class:Reason ->
+	    Stk = erlang:get_stacktrace(),
+	    set_loc(Stk),
+	    Why = case Class of
+		      exit -> {'EXIT',Reason};
+		      error -> {'EXIT',{Reason,Stk}}
+		  end,
+	    Comment0 = case read_comment() of
+			   ""  -> "";
+			   Cmt -> Cmt ++ "<br>"
+		       end,
+	    comment(io_lib:format("~s<font color=\"red\">"
+				  "WARNING: ~w crashed!"
+				  "</font>\n",[Comment0,EndFunc])),
 	    group_leader() ! {printout,12,
-			      "WARNING: ~w thrown!\n"
+			      "WARNING: ~w crashed!\n"
 			      "Reason: ~p\n"
 			      "Line: ~s\n",
-			      [EndFunc, Other,
+			      [EndFunc, Reason,
 			       test_server_sup:format_loc(
 				 mod_loc(get_loc()))]},
-	    {failed,{Mod,end_per_testcase,Other}}
+	    {failed,{Mod,end_per_testcase,Why}}
     end.
 
 get_loc() ->
-    case catch test_server_line:get_lines() of
-	[] ->
-	    get(test_server_loc);
-	{'EXIT',_} ->
-	    get(test_server_loc);
-	Loc ->
-	    Loc
-    end.
+    get(test_server_loc).
 
 get_loc(Pid) ->
-    {dictionary,Dict} = process_info(Pid, dictionary),
-    lists:foreach(fun({Key,Val}) -> put(Key,Val) end,Dict),
+    [{current_stacktrace,Stk0},{dictionary,Dict}] =
+	process_info(Pid, [current_stacktrace,dictionary]),
+    lists:foreach(fun({Key,Val}) -> put(Key, Val) end, Dict),
+    Stk = [rewrite_loc_item(Loc) || Loc <- Stk0],
+    put(test_server_loc, Stk),
     get_loc().
 
-get_mf([{M,F,_}|_]) -> {M,F};
-get_mf([{M,F}|_])   -> {M,F};
-get_mf(_)           -> {undefined,undefined}.
+%% find the latest known Suite:Testcase
+get_mf(MFs) ->
+    get_mf(MFs, {undefined,undefined}).
+
+get_mf([MF|MFs], Found) when is_tuple(MF) ->
+    ModFunc = {Mod,_} = case MF of
+			    {M,F,_} -> {M,F};
+			    MF -> MF
+			end,
+    case is_suite(Mod) of
+	true -> ModFunc;
+	false -> get_mf(MFs, ModFunc)
+    end;
+get_mf(_, Found) ->
+    Found.
+
+is_suite(Mod) ->
+    case lists:reverse(atom_to_list(Mod)) of
+	"ETIUS" ++ _ -> true;
+	_ -> false
+    end.
 
 mod_loc(Loc) ->
     %% handle diff line num versions
@@ -1498,16 +1614,22 @@ lookup_config(Key,Config) ->
 %% timer:tc/3
 ts_tc(M, F, A) ->
     Before = erlang:now(),
-    Val = (catch my_apply(M, F, A)),
+    Result = try
+		 apply(M, F, A)
+	     catch
+		 Type:Reason ->
+		     Stk = erlang:get_stacktrace(),
+		     set_loc(Stk),
+		     case Type of
+			 throw ->
+			     {failed,{thrown,Reason}};
+			 error ->
+			     {'EXIT',{Reason,Stk}};
+			 exit ->
+			     {'EXIT',Reason}
+		     end
+	     end,
     After = erlang:now(),
-    Result = case Val of
-		 {'$test_server_ok', R} ->
-		     R; % test case ok
-		 {'EXIT',_Reason} = R ->
-		     R; % test case crashed
-		 Other ->
-		     {failed, {thrown,Other}} % test case was thrown
-	  end,
     Elapsed =
 	(element(1,After)*1000000000000
 	 +element(2,After)*1000000+element(3,After)) -
@@ -1515,8 +1637,12 @@ ts_tc(M, F, A) ->
 	 +element(2,Before)*1000000+element(3,Before)),
     {Elapsed, Result}.
 
-my_apply(M, F, A) ->
-    {'$test_server_ok',apply(M, F, A)}.
+set_loc(Stk) ->
+    Loc = [rewrite_loc_item(I) || {_,_,_,_}=I <- Stk],
+    put(test_server_loc, Loc).
+
+rewrite_loc_item({M,F,_,Loc}) ->
+    {M,F,proplists:get_value(line, Loc, 0)}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1679,7 +1805,16 @@ adjusted_sleep(MSecs) ->
 %% to read when using this function, rather than exit directly.
 fail(Reason) ->
     comment(cast_to_list(Reason)),
-    exit({suite_failed,Reason}).
+    try
+	exit({suite_failed,Reason})
+    catch
+	Class:R ->
+	    case erlang:get_stacktrace() of
+		[{?MODULE,fail,1,_}|Stk] -> ok;
+		Stk -> ok
+	    end,
+	    erlang:raise(Class, R, Stk)
+    end.
 
 cast_to_list(X) when is_list(X) -> X;
 cast_to_list(X) when is_atom(X) -> atom_to_list(X);
@@ -1693,7 +1828,16 @@ cast_to_list(X) -> lists:flatten(io_lib:format("~p", [X])).
 %% Immediately calls exit. Included because test suites are easier
 %% to read when using this function, rather than exit directly.
 fail() ->
-    exit(suite_failed).
+    try
+	exit(suite_failed)
+    catch
+	Class:R ->
+	    case erlang:get_stacktrace() of
+		[{?MODULE,fail,0,_}|Stk] -> ok;
+		Stk -> ok
+	    end,
+	    erlang:raise(Class, R, Stk)
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% break(Comment) -> ok
@@ -1845,11 +1989,54 @@ time_ms({seconds,N}) -> seconds(N);
 time_ms({Other,_N}) ->
     format("=== ERROR: Invalid time specification: ~p. "
 	   "Should be seconds, minutes, or hours.~n", [Other]),
-    exit({invalid_time_spec,Other});
+    exit({invalid_time_format,Other});
 time_ms(Ms) when is_integer(Ms) -> Ms;
 time_ms(infinity) -> infinity;
-time_ms(Other) -> exit({invalid_time_spec,Other}).
+time_ms(Fun) when is_function(Fun) ->
+    time_ms_apply(Fun);
+time_ms({M,F,A}=MFA) when is_atom(M), is_atom(F), is_list(A) ->
+    time_ms_apply(MFA);
+time_ms(Other) -> exit({invalid_time_format,Other}).
+
+time_ms_apply(Func) ->
+    time_ms_apply(Func, [5000,30000,60000,infinity]).
+
+time_ms_apply(Func, TOs) ->
+    Apply = fun() ->
+		    case Func of
+			{M,F,A} ->
+			    exit({self(),apply(M, F, A)});
+			Fun ->
+			    exit({self(),Fun()})
+		    end
+	    end,
+    Pid = spawn(Apply),
+    Ref = monitor(process, Pid),
+    time_ms_wait(Func, Pid, Ref, TOs).
 
+time_ms_wait(Func, Pid, Ref, [TO|TOs]) ->
+    receive
+	{'DOWN',Ref,process,Pid,{Pid,Result}} ->
+	    time_ms_check(Result);
+	{'DOWN',Ref,process,Pid,Error} ->
+	    exit({timetrap_error,Error})
+    after
+	TO ->
+	    format("=== WARNING: No return from timetrap function ~p~n", [Func]),
+	    time_ms_wait(Func, Pid, Ref, TOs)
+    end;
+%% this clause will never execute if 'infinity' is in TOs list, that's ok!
+time_ms_wait(Func, Pid, Ref, []) ->
+    demonitor(Ref),
+    exit(Pid, kill),
+    exit({timetrap_error,{no_return_from_timetrap_function,Func}}).
+
+time_ms_check(MFA = {M,F,A}) when is_atom(M), is_atom(F), is_list(A) ->
+    exit({invalid_time_format,MFA});
+time_ms_check(Fun) when is_function(Fun) ->
+    exit({invalid_time_format,Fun});
+time_ms_check(Other) ->
+    time_ms(Other).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% timetrap_cancel(Handle) -> ok
@@ -1897,6 +2084,19 @@ hours(N)   -> trunc(N * 1000 * 60 * 60).
 minutes(N) -> trunc(N * 1000 * 60).
 seconds(N) -> trunc(N * 1000).
 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% sync_send(Pid,Tag,Msg,Timeout,DoAfter) -> Result
+%%
+sync_send(Pid,Tag,Msg,Timeout,DoAfter) ->
+    Pid ! {Tag,self(),Msg},
+    receive
+	{Pid,Tag,Result} ->
+	    Result
+    after Timeout ->
+	    DoAfter()
+    end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% timecall(M,F,A) -> {Time,Val}
 %% Time = float()
@@ -2283,6 +2483,21 @@ comment(String) ->
     group_leader() ! {comment,String},
     ok.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% read_comment() -> string()
+%%
+%% Read the current comment string stored in
+%% state during test case execution.
+read_comment() ->
+    MsgLooper = group_leader(),
+    MsgLooper ! {read_comment,self()},
+    receive
+	{MsgLooper,read_comment,Comment} ->
+	    Comment
+    after
+	5000 ->
+	    ""
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% os_type() -> OsType
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index de9b962dfc..4fad86d16d 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -173,7 +173,7 @@
 %%% TEST_SERVER INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -export([output/2, print/2, print/3, print_timestamp/2]).
 -export([start_node/3, stop_node/1, wait_for_node/1, is_release_available/1]).
--export([format/1, format/2, format/3]).
+-export([format/1, format/2, format/3, to_string/1]).
 -export([get_target_info/0]).
 -export([get_hosts/0]).
 -export([get_target_os_type/0]).
@@ -1297,6 +1297,7 @@ terminate(_Reason, State) ->
     end,
     kill_all_jobs(State#state.jobs),
     test_server_node:stop(State#state.target_info),
+    test_server_h:restore(),
     ok.
 
 kill_all_jobs([{_Name,JobPid}|Jobs]) ->
@@ -1349,6 +1350,10 @@ init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev},
     put(test_server_minor_level, MinLev),
     put(test_server_random_seed, proplists:get_value(random_seed, ExtraTools)),
     put(test_server_testcase_callback, TCCallback),
+    %% before first print, read and set logging options
+    LogOpts = test_server_sup:framework_call(get_logopts, [], []),
+    put(test_server_logopts, LogOpts),
+    put(test_server_log_nl, not lists:member(no_nl, LogOpts)),
     StartedExtraTools = start_extra_tools(ExtraTools),
     {TimeMy,Result} = ts_tc(Mod, Func, Args),
     put(test_server_common_io_handler, undefined),
@@ -1664,6 +1669,11 @@ do_test_cases(TopCases, SkipCases,
 	      Config, TimetrapData) when is_list(TopCases),
 					 is_tuple(TimetrapData) ->
     start_log_file(),
+    FwMod =
+	case os:getenv("TEST_SERVER_FRAMEWORK") of
+	    FW when FW =:= false; FW =:= "undefined" -> ?MODULE;
+	    FW -> list_to_atom(FW)
+	end,
     case collect_all_cases(TopCases, SkipCases) of
 	{error,Why} ->
 	    print(1, "Error starting: ~p", [Why]),
@@ -1676,11 +1686,11 @@ do_test_cases(TopCases, SkipCases,
 	    put(test_server_cases, N),
 	    put(test_server_case_num, 0),
 	    TestSpec =
-		add_init_and_end_per_suite(TestSpec0, undefined, undefined),
-
+		add_init_and_end_per_suite(TestSpec0, undefined, undefined, FwMod),
 	    TI = get_target_info(),
-	    print(1, "Starting test~s", [print_if_known(N, {", ~w test cases",[N]},
-							{" (with repeated test cases)",[]})]),
+	    print(1, "Starting test~s",
+		  [print_if_known(N, {", ~w test cases",[N]},
+				  {" (with repeated test cases)",[]})]),
 	    Test = get(test_server_name),
 	    test_server_sup:framework_call(report, [tests_start,{Test,N}]),
 
@@ -1709,13 +1719,12 @@ do_test_cases(TopCases, SkipCases,
 	    print(html, "<br>Used Erlang ~s in <tt>~s</tt>.\n",
 		  [erlang:system_info(version), code:root_dir()]),
 
-	    case os:getenv("TEST_SERVER_FRAMEWORK") of
-		FW when FW =:= false; FW =:= "undefined" ->
+	    if FwMod == ?MODULE ->
 		    print(html, "<p>Target:<br>\n"),
 		    print_who(TI#target_info.host, TI#target_info.username),
 		    print(html, "<br>Used Erlang ~s in <tt>~s</tt>.\n",
 			  [TI#target_info.version, TI#target_info.root_dir]);
-		_ ->
+		true ->
 		    case test_server_sup:framework_call(target_info, []) of
 			TargetInfo when is_list(TargetInfo),
 			                length(TargetInfo) > 0 ->
@@ -1884,11 +1893,12 @@ start_minor_log_file1(Mod, Func, LogDir, AbsName) ->
 	      []),
 
     SrcListing = downcase(cast_to_list(Mod)) ++ ?src_listing_ext,
-    case filelib:is_file(filename:join(LogDir, SrcListing)) of
-	true ->
+    case {filelib:is_file(filename:join(LogDir, SrcListing)),
+	  lists:member(no_src, get(test_server_logopts))} of
+	{true,false} ->
 	    print(Lev, "<a href=\"~s#~s\">source code for ~p:~p/1</a>\n",
 		  [SrcListing,Func,Mod,Func]);
-	false -> ok
+	_ -> ok
     end,
 
     io:fwrite(Fd, "<pre>\n", []),
@@ -2005,54 +2015,69 @@ copy_html_file(Src, DestDir) ->
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% add_init_and_end_per_suite(TestSpec, Mod, Ref) -> NewTestSpec
+%% add_init_and_end_per_suite(TestSpec, Mod, Ref, FwMod) -> NewTestSpec
 %%
 %% Expands TestSpec with an initial init_per_suite, and a final
 %% end_per_suite element, per each discovered suite in the list.
 
-add_init_and_end_per_suite([{make,_,_}=Case|Cases], LastMod, LastRef) ->
-    [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef)];
-add_init_and_end_per_suite([{skip_case,{{Mod,all},_}}=Case|Cases], LastMod, LastRef)
-  when Mod =/= LastMod ->
+add_init_and_end_per_suite([{make,_,_}=Case|Cases], LastMod, LastRef, FwMod) ->
+    [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)];
+add_init_and_end_per_suite([{skip_case,{{Mod,all},_}}=Case|Cases], LastMod,
+			   LastRef, FwMod) when Mod =/= LastMod ->
     {PreCases, NextMod, NextRef} =
 	do_add_end_per_suite_and_skip(LastMod, LastRef, Mod),
-    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
-add_init_and_end_per_suite([{skip_case,{{Mod,_},_}}=Case|Cases], LastMod, LastRef)
-  when Mod =/= LastMod ->
+    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef, FwMod)];
+add_init_and_end_per_suite([{skip_case,{{Mod,_},_}}=Case|Cases], LastMod,
+			   LastRef, FwMod) when Mod =/= LastMod ->
     {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod),
-    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
-add_init_and_end_per_suite([{skip_case,{conf,_,{Mod,_},_}}=Case|Cases], LastMod, LastRef)
-  when Mod =/= LastMod ->
+    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef, FwMod)];
+add_init_and_end_per_suite([{skip_case,{conf,_,{Mod,_},_}}=Case|Cases], LastMod,
+			   LastRef, FwMod) when Mod =/= LastMod ->
     {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod),
-    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
-add_init_and_end_per_suite([{skip_case,_}=Case|Cases], LastMod, LastRef) ->
-    [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef)];
-add_init_and_end_per_suite([{conf,_,_,{Mod,_}}=Case|Cases], LastMod, LastRef)
-  when Mod =/= LastMod ->
+    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef, FwMod)];
+add_init_and_end_per_suite([{skip_case,_}=Case|Cases], LastMod, LastRef, FwMod) ->
+    [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)];
+add_init_and_end_per_suite([{conf,Ref,Props,{FwMod,Func}}=Case|Cases], LastMod,
+			   LastRef, FwMod) ->
+    %% if Mod == FwMod, this conf test is (probably) a test case group where
+    %% the init- and end-functions are missing in the suite, and if so,
+    %% the suite name should be stored as {suite,Suite} in Props
+    case proplists:get_value(suite, Props) of
+	Suite when Suite =/= undefined, Suite =/= LastMod ->
+	    {PreCases, NextMod, NextRef} =
+		do_add_init_and_end_per_suite(LastMod, LastRef, Suite),
+	    Case1 = {conf,Ref,proplists:delete(suite,Props),{FwMod,Func}},
+	    PreCases ++ [Case1|add_init_and_end_per_suite(Cases, NextMod,
+							  NextRef, FwMod)];
+	_ ->
+	    [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)]
+    end;
+add_init_and_end_per_suite([{conf,_,_,{Mod,_}}=Case|Cases], LastMod,
+			   LastRef, FwMod) when Mod =/= LastMod, Mod =/= FwMod ->
     {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod),
-    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
-add_init_and_end_per_suite([{conf,_,_,_}=Case|Cases], LastMod, LastRef) ->
-    [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef)];
-add_init_and_end_per_suite([{Mod,_}=Case|Cases], LastMod, LastRef)
-  when Mod =/= LastMod ->
+    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef, FwMod)];
+add_init_and_end_per_suite([{conf,_,_,_}=Case|Cases], LastMod, LastRef, FwMod) ->
+    [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)];
+add_init_and_end_per_suite([{Mod,_}=Case|Cases], LastMod, LastRef, FwMod)
+  when Mod =/= LastMod, Mod =/= FwMod ->
     {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod),
-    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
-add_init_and_end_per_suite([{Mod,_,_}=Case|Cases], LastMod, LastRef)
-  when Mod =/= LastMod ->
+    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef, FwMod)];
+add_init_and_end_per_suite([{Mod,_,_}=Case|Cases], LastMod, LastRef, FwMod)
+  when Mod =/= LastMod, Mod =/= FwMod ->
     {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod),
-    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
-add_init_and_end_per_suite([Case|Cases], LastMod, LastRef)->
-    [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef)];
-add_init_and_end_per_suite([], _LastMod, undefined) ->
+    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef, FwMod)];
+add_init_and_end_per_suite([Case|Cases], LastMod, LastRef, FwMod)->
+    [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)];
+add_init_and_end_per_suite([], _LastMod, undefined, _FwMod) ->
     [];
-add_init_and_end_per_suite([], _LastMod, skipped_suite) ->
+add_init_and_end_per_suite([], _LastMod, skipped_suite, _FwMod) ->
     [];
-add_init_and_end_per_suite([], LastMod, LastRef) ->
+add_init_and_end_per_suite([], LastMod, LastRef, _FwMod) ->
     [{conf,LastRef,[],{LastMod,end_per_suite}}].
 
 do_add_init_and_end_per_suite(LastMod, LastRef, Mod) ->
@@ -2101,7 +2126,12 @@ run_test_cases(TestSpec, Config, TimetrapData) ->
 
     maybe_open_job_sock(),
 
-    html_convert_modules(TestSpec, Config),
+    case lists:member(no_src, get(test_server_logopts)) of
+	true ->
+	    ok;
+	false ->
+	    html_convert_modules(TestSpec, Config)
+    end,
 
     run_test_cases_loop(TestSpec, [Config], TimetrapData, [], []),
 
@@ -2310,7 +2340,8 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 		    handle_test_case_io_and_status(),
 		    set_io_buffering(undefined),
 		    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, false, SkipMode),
-		    test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
+		    test_server_sup:framework_call(report, [tc_auto_skip,
+							    {?pl2a(Mod),Func,Comment}]),
 		    run_test_cases_loop(Cases, Config, TimetrapData, ParentMode,
 					delete_status(Ref, Status));
 		_ ->
@@ -2318,7 +2349,8 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 		    %% parallel group (io buffering is active)
 		    wait_for_cases(Ref),
 		    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, true, SkipMode),
-		    test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
+		    test_server_sup:framework_call(report, [tc_auto_skip,
+							    {?pl2a(Mod),Func,Comment}]),
 		    case CurrIOHandler of
 			{Ref,_} ->
 			    %% current_io_handler was set by start conf of this
@@ -3959,8 +3991,11 @@ progress(ok, _CaseNum, Mod, Func, _Loc, RetVal, Time,
 	case RetVal of
 	    {comment,RetComment} ->
 		String = to_string(RetComment),
+		HtmlCmt = test_server_sup:framework_call(format_comment,
+							 [String],
+							 String),
 		print(major, "=result        ok: ~s", [String]),
-		"<td>" ++ String ++ "</td>";
+		"<td>" ++ HtmlCmt ++ "</td>";
 	    _ ->
 		print(major, "=result        ok", []),
 		case Comment0 of
@@ -4345,14 +4380,18 @@ output_to_fd(Fd, [$=|Msg], internal) ->
     io:put_chars(Fd, [$=]),
     io:put_chars(Fd, Msg),
     io:put_chars(Fd, "\n");
+
 output_to_fd(Fd, Msg, internal) ->
     io:put_chars(Fd, [$=,$=,$=,$ ]),
     io:put_chars(Fd, Msg),
     io:put_chars(Fd, "\n");
+
 output_to_fd(Fd, Msg, _Sender) ->
     io:put_chars(Fd, Msg),
-    io:put_chars(Fd, "\n").
-
+    case get(test_server_log_nl) of
+	false -> ok;
+	_     -> io:put_chars(Fd, "\n")
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% timestamp_filename_get(Leader) -> string()
@@ -4665,7 +4704,7 @@ collect_case_invoke(Mod, Case, MFA, St) ->
 		    collect_subcases(Mod, Case, MFA, St, Suite)
 	    end;
 	_ ->
-	    Suite = test_server_sup:framework_call(get_suite, [?pl2a(Mod),Case],[]),
+	    Suite = test_server_sup:framework_call(get_suite, [?pl2a(Mod),Case], []),
 	    collect_subcases(Mod, Case, MFA, St, Suite)
     end.
 
@@ -4674,13 +4713,13 @@ collect_subcases(Mod, Case, MFA, St, Suite) ->
 	[] when Case == all -> {ok,[],St};
 	[] when element(1, Case) == conf -> {ok,[],St};
 	[] -> {ok,[MFA],St};
-%%%! --- START Kept for backwards compatibilty ---
+%%%! --- START Kept for backwards compatibility ---
 %%%! Requirements are not used
 	{req,ReqList} ->
 	    collect_case_deny(Mod, Case, MFA, ReqList, [], St);
 	{req,ReqList,SubCases} ->
 	    collect_case_deny(Mod, Case, MFA, ReqList, SubCases, St);
-%%%! --- END Kept for backwards compatibilty ---
+%%%! --- END Kept for backwards compatibility ---
 	{Skip,Reason} when Skip==skip; Skip==skipped ->
 	    {ok,[{skip_case,{MFA,Reason}}],St};
 	{error,Reason} ->
diff --git a/lib/test_server/src/test_server_line.erl b/lib/test_server/src/test_server_line.erl
deleted file mode 100644
index 848a9c23dd..0000000000
--- a/lib/test_server/src/test_server_line.erl
+++ /dev/null
@@ -1,387 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-2010. 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.
-%%
-%% %CopyrightEnd%
-%%
--module(test_server_line).
-
-%% User interface
--export([get_lines/0]).
--export([clear/0]).
-
-%% Parse transform functions
--export([parse_transform/2]).
--export(['$test_server_line'/3]).
--export(['$test_server_lineQ'/3]).
--export([trace_line/3]).
-
--define(TEST_SERVER_LINE_SIZE, 10).
-%-define(STORAGE_FUNCTION, '$test_server_line').
--define(STORAGE_FUNCTION, '$test_server_lineQ').
-
--include("test_server.hrl").
-
--record(vars, {module,                      % atom() Module name
-	       function,                    % atom() Function name
-	       arity,                       % int()  Function arity
-	       lines,                       % [int()]  seen lines
-	       is_guard=false,              % boolean()
-	       no_lines=[],                 % [{atom(),integer()}] 
-					    %    Functions to exclude
-	       line_trace=false
-	      }).
-
-
-
-
-%% Process dictionary littering variant
-%%
-
-'$test_server_line'(Mod, Func, Line) ->
-    {Prev,Next} = 
-	case get('$test_server_line') of
-	    I when is_integer(I) ->
-		if  1 =< I, I < ?TEST_SERVER_LINE_SIZE -> {I,I+1};
-		    true -> {?TEST_SERVER_LINE_SIZE,1}
-		end;
-	    _ -> {?TEST_SERVER_LINE_SIZE,1}
-	end,
-    PrevTag = {'$test_server_line',Prev},
-    case get(PrevTag) of
-	{Mod,Func,_} -> put(PrevTag, {Mod,Func,Line});
-	_ -> 
-	    put({'$test_server_line',Next}, {Mod,Func,Line}),
-	    put('$test_server_line', Next)
-    end, ok.
-
-test_server_line_get() ->
-    case get('$test_server_line') of
-	I when is_integer(I), 1 =< I, I =< ?TEST_SERVER_LINE_SIZE ->
-	    test_server_line_get_1(?TEST_SERVER_LINE_SIZE, I, []);
-	_ -> []
-    end.
-
-test_server_line_get_1(0, _I, R) ->
-    R;
-test_server_line_get_1(Cnt, I, R) ->
-    J = if  I < ?TEST_SERVER_LINE_SIZE -> I+1;
-	    true -> 1 end,
-    case get({'$test_server_line',J}) of
-	undefined -> 
-	    %% Less than ?TEST_SERVER_LINE_SIZE number of lines stored
-	    %% Start from line 1 and stop at actutual number of lines
-	    case get({'$test_server_line',1}) of 
-		undefined -> R; % no lines at all stored
-		E -> test_server_line_get_1(I-1,1,[E|R])
-	    end;
-	E -> 
-	    test_server_line_get_1(Cnt-1, J, [E|R])
-    end.
-
-test_server_line_clear() ->
-    Is = lists:seq(1,?TEST_SERVER_LINE_SIZE),
-    lists:foreach(fun (I) -> erase({'$test_server_line',I}) end, Is),
-    erase('$test_server_line'),
-    ok.
-
-
-%% Queue variant, uses just one process dictionary entry
-%%
-
-'$test_server_lineQ'(Mod, Func, Line) ->		
-    case get('$test_server_lineQ') of
-	{I,Q} when is_integer(I), 1 =< I, I =< ?TEST_SERVER_LINE_SIZE -> 
-	    case queue:head(Q) of
-		{Mod,Func,_} ->
-		    %% Replace queue head
-		    put('$test_server_lineQ',
-			{I,queue:cons({Mod,Func,Line}, queue:tail(Q))});
-		_ when I < ?TEST_SERVER_LINE_SIZE ->
-		    put('$test_server_lineQ',
-			{I+1,queue:cons({Mod,Func,Line}, Q)});
-		_ -> 
-		    %% Waste last in queue
-		    put('$test_server_lineQ',
-			{I,queue:cons({Mod,Func,Line}, queue:lait(Q))})
-	    end;
-	_ -> 
-	    Q = queue:new(),
-	    put('$test_server_lineQ', {1,queue:cons({Mod,Func,Line}, Q)})
-    end, ok.
-
-%test_server_lineQ_get() ->
-%    case get('$test_server_lineQ') of
-%	{I,Q} when integer(I), 1 =< I, I =< ?TEST_SERVER_LINE_SIZE -> 
-%	    queue:to_list(Q);
-%	_ -> []
-%    end.
-
-test_server_lineQ_clear() ->
-    erase('$test_server_lineQ'),
-    ok.
-
-
-%% Get line - check if queue or dictionary is used, then get the lines
-%%
-
-get_lines() ->
-    case get('$test_server_lineQ') of
-	{I,Q} when is_integer(I), 1 =< I, I =< ?TEST_SERVER_LINE_SIZE -> 
-	    queue:to_list(Q);
-	_ -> 
-	    test_server_line_get()
-    end.
-	
-%% Clear all dictionary entries
-%%
-clear() ->
-    test_server_line_clear(),
-    test_server_lineQ_clear().
-
-
-trace_line(Mod,Func,Line) ->
-    io:format(lists:concat([Mod,":",Func,",",integer_to_list(Line),": ~p"]),
-	      [erlang:now()]).
-
-
-%%%=================================================================
-%%%========= ****   PARSE TRANSFORM    **** ========================
-%%%=================================================================
-parse_transform(Forms, _Options) ->
-    transform(Forms, _Options).
-
-%% forms(Fs) -> lists:map(fun (F) -> form(F) end, Fs).
-
-transform(Forms, _Options)->
-    Vars0 = #vars{},
-    {ok, MungedForms, _Vars} = transform(Forms, [], Vars0),
-    MungedForms.
-    
-
-transform([Form|Forms], MungedForms, Vars) ->
-    case munge(Form, Vars) of
-	ignore ->
-	    transform(Forms, MungedForms, Vars);
-	{MungedForm, Vars2} ->
-	    transform(Forms, [MungedForm|MungedForms], Vars2)
-    end;
-transform([], MungedForms, Vars) ->
-    {ok, lists:reverse(MungedForms), Vars}.
-
-%% This code traverses the abstract code, stored as the abstract_code
-%% chunk in the BEAM file, as described in absform(3) for Erlang/OTP R8B
-%% (Vsn=abstract_v2).
-%% The abstract format after preprocessing differs slightly from the abstract
-%% format given eg using epp:parse_form, this has been noted in comments.
-munge(Form={attribute,_,module,Module}, Vars) ->
-    Vars2 = Vars#vars{module=Module},
-    {Form, Vars2};
-
-munge(Form={attribute,_,no_lines,Funcs}, Vars) ->
-    Vars2 = Vars#vars{no_lines=Funcs},
-    {Form, Vars2};
-
-munge(Form={attribute,_,line_trace,_}, Vars) ->
-    Vars2 = Vars#vars{line_trace=true},
-    {Form, Vars2};
-
-munge({function,0,module_info,_Arity,_Clauses}, _Vars) ->
-    ignore; % module_info will be added again when the forms are recompiled
-munge(Form = {function,Line,Function,Arity,Clauses}, Vars) ->
-    case lists:member({Function,Arity},Vars#vars.no_lines) of
-	true ->
-	    %% Line numbers in this function shall not be stored
-	    {Form,Vars};
-	false ->
-	    Vars2 = Vars#vars{function=Function,
-			      arity=Arity,
-			      lines=[]},
-	    {MungedClauses, Vars3} = munge_clauses(Clauses, Vars2, []),
-	    {{function,Line,Function,Arity,MungedClauses}, Vars3}
-    end;
-munge(Form, Vars) -> % attributes
-    {Form, Vars}.
-
-munge_clauses([{clause,Line,Pattern,Guards,Body}|Clauses], Vars, MClauses) ->
-    {MungedGuards, _Vars} = munge_exprs(Guards, Vars#vars{is_guard=true},[]),
-    {MungedBody, Vars2} = munge_body(Body, Vars, []),
-    munge_clauses(Clauses, Vars2,
-		  [{clause,Line,Pattern,MungedGuards,MungedBody}|
-		   MClauses]);
-munge_clauses([], Vars, MungedClauses) -> 
-    {lists:reverse(MungedClauses), Vars}.
-
-munge_body([Expr|Body], Vars, MungedBody) ->
-    %% Here is the place to add a call to storage function!
-    Line = element(2, Expr),
-    Lines = Vars#vars.lines,
-    case lists:member(Line,Lines) of
-	true -> % already a bump at this line!
-	    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-	    munge_body(Body, Vars2, [MungedExpr|MungedBody]);
-	false ->
-	    Bump = {call, 0, {remote,0,
-			      {atom,0,?MODULE},
-			      {atom,0,?STORAGE_FUNCTION}},
-		    [{atom,0,Vars#vars.module},
-		     {atom, 0, Vars#vars.function},
-		     {integer, 0, Line}]},
-	    Lines2 = [Line|Lines],
-	    
-	    {MungedExpr, Vars2} = munge_expr(Expr, Vars#vars{lines=Lines2}),
-	    MungedBody2 = 
-		if Vars#vars.line_trace ->
-			LineTrace = {call, 0, {remote,0,
-					       {atom,0,?MODULE},
-					       {atom,0,trace_line}},
-				     [{atom,0,Vars#vars.module},
-				      {atom, 0, Vars#vars.function},
-				      {integer, 0, Line}]},
-			[MungedExpr,LineTrace,Bump|MungedBody];
-		   true ->
-			[MungedExpr,Bump|MungedBody]
-		end,
-	    munge_body(Body, Vars2, MungedBody2)
-    end;
-munge_body([], Vars, MungedBody) ->
-    {lists:reverse(MungedBody), Vars}.
-
-munge_expr({match,Line,ExprL,ExprR}, Vars) ->
-    {MungedExprL, Vars2} = munge_expr(ExprL, Vars),
-    {MungedExprR, Vars3} = munge_expr(ExprR, Vars2),
-    {{match,Line,MungedExprL,MungedExprR}, Vars3};
-munge_expr({tuple,Line,Exprs}, Vars) ->
-    {MungedExprs, Vars2} = munge_exprs(Exprs, Vars, []),
-    {{tuple,Line,MungedExprs}, Vars2};
-munge_expr({record,Line,Expr,Exprs}, Vars) ->
-    %% Only for Vsn=raw_abstract_v1
-    {MungedExprName, Vars2} = munge_expr(Expr, Vars),
-    {MungedExprFields, Vars3} = munge_exprs(Exprs, Vars2, []),
-    {{record,Line,MungedExprName,MungedExprFields}, Vars3};
-munge_expr({record_field,Line,ExprL,ExprR}, Vars) ->
-    %% Only for Vsn=raw_abstract_v1
-    {MungedExprL, Vars2} = munge_expr(ExprL, Vars),
-    {MungedExprR, Vars3} = munge_expr(ExprR, Vars2),
-    {{record_field,Line,MungedExprL,MungedExprR}, Vars3};
-munge_expr({cons,Line,ExprH,ExprT}, Vars) ->
-    {MungedExprH, Vars2} = munge_expr(ExprH, Vars),
-    {MungedExprT, Vars3} = munge_expr(ExprT, Vars2),
-    {{cons,Line,MungedExprH,MungedExprT}, Vars3};
-munge_expr({op,Line,Op,ExprL,ExprR}, Vars) ->
-    {MungedExprL, Vars2} = munge_expr(ExprL, Vars),
-    {MungedExprR, Vars3} = munge_expr(ExprR, Vars2),
-    {{op,Line,Op,MungedExprL,MungedExprR}, Vars3};
-munge_expr({op,Line,Op,Expr}, Vars) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    {{op,Line,Op,MungedExpr}, Vars2};
-munge_expr({'catch',Line,Expr}, Vars) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    {{'catch',Line,MungedExpr}, Vars2};
-munge_expr({call,Line1,{remote,Line2,ExprM,ExprF},Exprs},
-	   Vars) when Vars#vars.is_guard==false->
-    {MungedExprM, Vars2} = munge_expr(ExprM, Vars),
-    {MungedExprF, Vars3} = munge_expr(ExprF, Vars2),
-    {MungedExprs, Vars4} = munge_exprs(Exprs, Vars3, []),
-    {{call,Line1,{remote,Line2,MungedExprM,MungedExprF},MungedExprs}, Vars4};
-munge_expr({call,Line1,{remote,_Line2,_ExprM,ExprF},Exprs},
-	   Vars) when Vars#vars.is_guard==true ->
-    %% Difference in abstract format after preprocessing: BIF calls in guards
-    %% are translated to {remote,...} (which is not allowed as source form)
-    %% NOT NECESSARY FOR Vsn=raw_abstract_v1
-    munge_expr({call,Line1,ExprF,Exprs}, Vars);
-munge_expr({call,Line,Expr,Exprs}, Vars) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    {MungedExprs, Vars3} = munge_exprs(Exprs, Vars2, []),
-    {{call,Line,MungedExpr,MungedExprs}, Vars3};
-munge_expr({lc,Line,Expr,LC}, Vars) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    {MungedLC, Vars3} = munge_lc(LC, Vars2, []),
-    {{lc,Line,MungedExpr,MungedLC}, Vars3};
-munge_expr({block,Line,Body}, Vars) ->
-    {MungedBody, Vars2} = munge_body(Body, Vars, []),
-    {{block,Line,MungedBody}, Vars2};
-munge_expr({'if',Line,Clauses}, Vars) -> 
-    {MungedClauses,Vars2} = munge_clauses(Clauses, Vars, []),
-    {{'if',Line,MungedClauses}, Vars2};
-munge_expr({'case',Line,Expr,Clauses}, Vars) ->
-    {MungedExpr,Vars2} = munge_expr(Expr,Vars),
-    {MungedClauses,Vars3} = munge_clauses(Clauses, Vars2, []),
-    {{'case',Line,MungedExpr,MungedClauses}, Vars3};
-munge_expr({'receive',Line,Clauses}, Vars) -> 
-    {MungedClauses,Vars2} = munge_clauses(Clauses, Vars, []),
-    {{'receive',Line,MungedClauses}, Vars2};
-munge_expr({'receive',Line,Clauses,Expr,Body}, Vars) ->
-    {MungedClauses,Vars2} = munge_clauses(Clauses, Vars, []),
-    {MungedExpr, Vars3} = munge_expr(Expr, Vars2),
-    {MungedBody, Vars4} = munge_body(Body, Vars3, []),
-    {{'receive',Line,MungedClauses,MungedExpr,MungedBody}, Vars4};
-munge_expr({'try',Line,Exprs,Clauses,CatchClauses,After}, Vars) ->
-    {MungedExprs, Vars1} = munge_exprs(Exprs, Vars, []),
-    {MungedClauses, Vars2} = munge_clauses(Clauses, Vars1, []),
-    {MungedCatchClauses, Vars3} = munge_clauses(CatchClauses, Vars2, []),
-    {MungedAfter, Vars4} = munge_body(After, Vars3, []),
-    {{'try',Line,MungedExprs,MungedClauses,MungedCatchClauses,MungedAfter}, 
-     Vars4};
-%% Difference in abstract format after preprocessing: Funs get an extra
-%% element Extra.
-%% NOT NECESSARY FOR Vsn=raw_abstract_v1
-munge_expr({'fun',Line,{function,Name,Arity},_Extra}, Vars) ->
-    {{'fun',Line,{function,Name,Arity}}, Vars};
-munge_expr({'fun',Line,{clauses,Clauses},_Extra}, Vars) ->
-    {MungedClauses,Vars2}=munge_clauses(Clauses, Vars, []),
-    {{'fun',Line,{clauses,MungedClauses}}, Vars2};
-munge_expr({'fun',Line,{clauses,Clauses}}, Vars) ->
-    %% Only for Vsn=raw_abstract_v1
-    {MungedClauses,Vars2}=munge_clauses(Clauses, Vars, []),
-    {{'fun',Line,{clauses,MungedClauses}}, Vars2};
-munge_expr({bc,Line,Expr,LC}, Vars) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    {MungedLC, Vars3} = munge_lc(LC, Vars2, []),
-    {{bc,Line,MungedExpr,MungedLC}, Vars3};
-munge_expr(Form, Vars) -> % var|char|integer|float|string|atom|nil|bin|eof
-    {Form, Vars}.
-
-munge_exprs([Expr|Exprs], Vars, MungedExprs) when Vars#vars.is_guard==true,
-						  is_list(Expr) ->
-    {MungedExpr, _Vars} = munge_exprs(Expr, Vars, []),
-    munge_exprs(Exprs, Vars, [MungedExpr|MungedExprs]);
-munge_exprs([Expr|Exprs], Vars, MungedExprs) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    munge_exprs(Exprs, Vars2, [MungedExpr|MungedExprs]);
-munge_exprs([], Vars, MungedExprs) ->
-    {lists:reverse(MungedExprs), Vars}.
-
-munge_lc([{generate,Line,Pattern,Expr}|LC], Vars, MungedLC) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    munge_lc(LC, Vars2, [{generate,Line,Pattern,MungedExpr}|MungedLC]);
-munge_lc([{b_generate,Line,Pattern,Expr}|LC], Vars, MungedLC) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    munge_lc(LC, Vars2, [{b_generate,Line,Pattern,MungedExpr}|MungedLC]);
-munge_lc([Expr|LC], Vars, MungedLC) ->
-    {MungedExpr, Vars2} = munge_expr(Expr, Vars),
-    munge_lc(LC, Vars2, [MungedExpr|MungedLC]);
-munge_lc([], Vars, MungedLC) ->
-    {lists:reverse(MungedLC), Vars}.
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index 53dfb45e3a..875f45eea6 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -26,7 +26,7 @@
 	 cleanup_crash_dumps/0, crash_dump_dir/0, tar_crash_dumps/0,
 	 get_username/0, get_os_family/0, 
 	 hostatom/0, hostatom/1, hoststr/0, hoststr/1,
-	 framework_call/2,framework_call/3,
+	 framework_call/2,framework_call/3,framework_call/4,
 	 format_loc/1, package_str/1, package_atom/1,
 	 call_trace/1]).
 -include("test_server_internal.hrl").
@@ -51,18 +51,19 @@ timetrap(Timeout0, Scale, Pid) ->
     Timeout = if not Scale -> Timeout0;
 		 true -> test_server:timetrap_scale_factor() * Timeout0
 	      end,
+    TruncTO = trunc(Timeout),
     receive
-    after trunc(Timeout) ->
-	    Line = test_server:get_loc(Pid),
+    after TruncTO ->
+	    MFLs = test_server:get_loc(Pid),
 	    Mon = erlang:monitor(process, Pid),
 	    Trap = 
 		case get(test_server_init_or_end_conf) of
 		    undefined ->
-			{timetrap_timeout,trunc(Timeout),Line};
+			{timetrap_timeout,TruncTO,MFLs};
 		    InitOrEnd ->
-			{timetrap_timeout,trunc(Timeout),Line,InitOrEnd}
+			{timetrap_timeout,TruncTO,MFLs,InitOrEnd}
 		end,
-	    exit(Pid,Trap),
+	    exit(Pid, Trap),
 	    receive
 		{'DOWN', Mon, process, Pid, _} ->
 		    ok
@@ -540,8 +541,9 @@ format_loc({Mod,Func}) when is_atom(Func) ->
 format_loc({Mod,Line}) when is_integer(Line) -> 
     %% ?line macro is used
     ModStr = package_str(Mod),
-    case lists:reverse(ModStr) of
-	[$E,$T,$I,$U,$S,$_|_]  ->
+    case {lists:member(no_src, get(test_server_logopts)),
+	  lists:reverse(ModStr)} of
+	{false,[$E,$T,$I,$U,$S,$_|_]}  ->
 	    io_lib:format("{~s,<a href=\"~s~s#~w\">~w</a>}",
 			  [ModStr,downcase(ModStr),?src_listing_ext,
 			   round_to_10(Line),Line]);
@@ -557,8 +559,9 @@ format_loc1([{Mod,Func,Line}|Rest]) ->
     ["              ",format_loc1({Mod,Func,Line}),",\n"|format_loc1(Rest)];
 format_loc1({Mod,Func,Line}) ->
     ModStr = package_str(Mod),
-    case lists:reverse(ModStr) of
-	[$E,$T,$I,$U,$S,$_|_]  ->
+    case {lists:member(no_src, get(test_server_logopts)),
+	  lists:reverse(ModStr)} of
+	{false,[$E,$T,$I,$U,$S,$_|_]}  ->
 	    io_lib:format("{~s,~w,<a href=\"~s~s#~w\">~w</a>}",
 			  [ModStr,Func,downcase(ModStr),?src_listing_ext,
 			   round_to_10(Line),Line]);
diff --git a/lib/test_server/src/ts.config b/lib/test_server/src/ts.config
index f021f5958b..cf3d269616 100644
--- a/lib/test_server/src/ts.config
+++ b/lib/test_server/src/ts.config
@@ -12,7 +12,7 @@
 %  "10.10.0.1",				        %IP string
 %  {10,10,0,1},				        %IP tuple
 %  ["my_ip4_host"],				%Any aliases
-%  "::ffff:10.10.0.1",			        %IPv6 string (compatibilty addr)
+%  "::ffff:10.10.0.1",			        %IPv6 string (compatibility addr)
 %  {0,0,0,0,0,65535,2570,1}		        %IPv6 tuple
 % }}.
 
diff --git a/lib/test_server/src/ts_erl_config.erl b/lib/test_server/src/ts_erl_config.erl
index 640c8ddc9f..3b41f90d55 100644
--- a/lib/test_server/src/ts_erl_config.erl
+++ b/lib/test_server/src/ts_erl_config.erl
@@ -222,7 +222,6 @@ erl_interface(Vars,OsType) ->
 		end,
     CrossCompile = case OsType of
 		       vxworks -> "true";
-		       ose ->     "true";
 		       _ ->       "false"
 		   end,
     [{erl_interface_libpath, filename:nativename(LibPath)},
@@ -329,8 +328,6 @@ sock_libraries({win32, _}) ->
 sock_libraries({unix, _}) ->
     "";	% Included in general libraries if needed.
 sock_libraries(vxworks) ->
-    "";
-sock_libraries(ose) ->
     "".
 
 link_library(LibName,{win32, _}) ->
@@ -339,8 +336,6 @@ link_library(LibName,{unix, _}) ->
     "lib" ++ LibName ++ ".a";
 link_library(LibName,vxworks) ->
     "lib" ++ LibName ++ ".a";
-link_library(_LibName,ose) ->
-    "";
 link_library(_LibName,_Other) ->
     exit({link_library, not_supported}).
 
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl
index c5444a342f..a41916fd0a 100644
--- a/lib/test_server/src/ts_install_cth.erl
+++ b/lib/test_server/src/ts_install_cth.erl
@@ -49,8 +49,7 @@
 
 -include_lib("kernel/include/file.hrl").
 
--type proplist() :: list({atom(),term()}).
--type config() :: proplist().
+-type config() :: proplists:proplist().
 -type reason() :: term().
 -type skip_or_fail() :: {skip, reason()} |
                         {auto_skip, reason()} |
@@ -65,19 +64,19 @@ id(_Opts) ->
     ?MODULE.
 
 %% @doc Always called before any other callback function.
--spec init(Id :: term(), Opts :: proplist()) ->
-    State :: #state{}.
+-spec init(Id :: term(), Opts :: proplists:proplist()) ->
+    {ok, State :: #state{}}.
 init(_Id, Opts) ->
     Nodenames = proplists:get_value(nodenames, Opts, 0),
     Nodes = proplists:get_value(nodes, Opts, 0),
     TSConfDir = proplists:get_value(ts_conf_dir, Opts),
     TargetSystem = proplists:get_value(target_system, Opts, install_local),
     InstallOpts = proplists:get_value(install_opts, Opts, []),
-    #state{ nodenames = Nodenames,
-	    nodes = Nodes,
-	    ts_conf_dir = TSConfDir,
-	    target_system = TargetSystem, 
-	    install_opts = InstallOpts }.
+    {ok, #state{ nodenames = Nodenames,
+		 nodes = Nodes,
+		 ts_conf_dir = TSConfDir,
+		 target_system = TargetSystem, 
+		 install_opts = InstallOpts } }.
 
 %% @doc Called before init_per_suite is called.
 -spec pre_init_per_suite(Suite :: atom(),
diff --git a/lib/test_server/test/Makefile b/lib/test_server/test/Makefile
index ab72a9d579..198440bb17 100644
--- a/lib/test_server/test/Makefile
+++ b/lib/test_server/test/Makefile
@@ -85,7 +85,7 @@ release_spec: opt
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(COVERFILE) $(RELSYSDIR)
-	$(INSTALL_DATA) test_server.spec test_server.cover $(RELSYSDIR)
+	$(INSTALL_DATA) test_server_test_lib.hrl test_server.spec test_server.cover $(RELSYSDIR)
 	chmod -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index 4c344717f0..a8532b08ab 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -119,6 +119,11 @@ test_server_conf02_SUITE(Config) ->
 run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc, 
 		      NUsrSkip, NAutoSkip, 
 		      NActualSkip, NActualFail, NActualSucc, Config) ->
+
+    ct:log("See test case log files under:~n~p~n",
+	   [filename:join([proplists:get_value(priv_dir, Config),
+			   SuiteName++".logs"])]),
+
     Node = proplists:get_value(node, Config),
     {ok,_Pid} = rpc:call(Node,test_server_ctrl, start, []),
     rpc:call(Node,
@@ -132,6 +137,7 @@ run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc,
 	  end),
     
     rpc:call(Node,test_server_ctrl, stop, []),
+
     {ok,#suite{ n_cases = NCases,
 		n_cases_failed = NFail,
 		n_cases_expected = NExpected, 
diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk
index 1dd4a84ce9..563c1b6db6 100644
--- a/lib/test_server/vsn.mk
+++ b/lib/test_server/vsn.mk
@@ -1,2 +1,2 @@
-TEST_SERVER_VSN = 3.4.4
+TEST_SERVER_VSN = 3.4.5
 
diff --git a/lib/toolbar/doc/src/make.dep b/lib/toolbar/doc/src/make.dep
deleted file mode 100644
index d93ff2a315..0000000000
--- a/lib/toolbar/doc/src/make.dep
+++ /dev/null
@@ -1,26 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex part.tex ref_man.tex toolbar.tex \
-		toolbar_chapter.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: bar.ps create_tool.ps
-
diff --git a/lib/toolbar/doc/src/notes.xml b/lib/toolbar/doc/src/notes.xml
index e2a3c22684..ffca2c5fbf 100644
--- a/lib/toolbar/doc/src/notes.xml
+++ b/lib/toolbar/doc/src/notes.xml
@@ -31,6 +31,22 @@
   <p>This document describes the changes made to the Toolbar
     application.</p>
 
+<section><title>Toolbar 1.4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Improve spelling throughout documentation, code comments
+	    and error messages</p>
+          <p>
+	    Own Id: OTP-9555</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Toolbar 1.4.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/toolbar/src/toolbar_toolconfig.erl b/lib/toolbar/src/toolbar_toolconfig.erl
index 7d8f2b4d21..6dccb7ba72 100644
--- a/lib/toolbar/src/toolbar_toolconfig.erl
+++ b/lib/toolbar/src/toolbar_toolconfig.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -126,7 +126,7 @@ loop(S,Window) ->
 				    show_info(Window,Info),
 				    move_focus(Window,file);
 				
-				%% Erronous version number -- Notify user
+				%% Erroneous version number -- Notify user
 				{error,version} ->
 				    Win = Window#tfwindow.window,
 				    tool_utils:notify(Win,[FileName,
@@ -136,7 +136,7 @@ loop(S,Window) ->
 				_Error ->
 				    Win = Window#tfwindow.window,
 				    tool_utils:notify(Win,[FileName,
-				       "File is on erronous format"])
+				       "File is in erroneous format"])
 			    end;
 				
 			%% The file can not be read, show default values
diff --git a/lib/toolbar/vsn.mk b/lib/toolbar/vsn.mk
index 47d18e29f0..105303d785 100644
--- a/lib/toolbar/vsn.mk
+++ b/lib/toolbar/vsn.mk
@@ -1,4 +1,4 @@
-TOOLBAR_VSN = 1.4.1
+TOOLBAR_VSN = 1.4.2
 
 
 
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
index 65a7f5f424..6921193154 100644
--- a/lib/tools/c_src/Makefile.in
+++ b/lib/tools/c_src/Makefile.in
@@ -142,7 +142,9 @@ EMEM_OBJS = $(addprefix $(EMEM_OBJ_DIR)/,$(notdir $(EMEM_SRCS:.c=.o)))
 # Misc targets
 #
 
-all: $(CREATE_DIRS) erts_lib $(PROGS) $(DRIVERS)
+_create_dirs := $(shell mkdir -p $(CREATE_DIRS))
+
+all: erts_lib $(PROGS) $(DRIVERS)
 
 erts_lib:
 	cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)
@@ -158,13 +160,6 @@ clean:
 .PHONY: all erts_lib docs clean
 
 #
-# Make dir targets
-#
-
-$(CREATE_DIRS):
-	$(MKDIR) -p $@
-
-#
 # Object targets
 #
 
diff --git a/lib/tools/doc/src/eprof.xml b/lib/tools/doc/src/eprof.xml
index 6d68c90768..1dbc41ec8e 100644
--- a/lib/tools/doc/src/eprof.xml
+++ b/lib/tools/doc/src/eprof.xml
@@ -147,7 +147,7 @@
       </type>
       <desc>
         <p>This function ensures that the results displayed by
-          <c>analyse/0</c> and <c>total_analyse/0</c> are printed both to
+			<c>analyze/0,1,2</c> are printed both to
           the file <c>File</c> and the screen.</p>
       </desc>
     </func>
diff --git a/lib/tools/doc/src/instrument.xml b/lib/tools/doc/src/instrument.xml
index 12877994de..b7e48ea306 100644
--- a/lib/tools/doc/src/instrument.xml
+++ b/lib/tools/doc/src/instrument.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -342,7 +342,7 @@
         <p>Stores the current memory allocation map on the file
           <c>File</c>. Returns <c>true</c> if the emulator has been
           started with the "<c>+Mim true</c>" command-line argument, and
-          the map was successfuly stored; otherwise, <c>false</c>. The
+          the map was successfully stored; otherwise, <c>false</c>. The
           contents of the file can later be read using
           <seealso marker="#read_memory_data/1">read_memory_data/1</seealso>.
           <em>NOTE:</em><c>store_memory_data/0</c> blocks execution of
@@ -360,7 +360,7 @@
         <p>Stores the current memory status on the file
           <c>File</c>. Returns <c>true</c> if the emulator has been
           started with the "<c>+Mis true</c>", or "<c>+Mim true</c>"
-          command-line arguments, and the data was successfuly stored;
+          command-line arguments, and the data was successfully stored;
           otherwise, <c>false</c>. The contents of the file can later be
           read using
           <seealso marker="#read_memory_status/1">read_memory_status/1</seealso>.</p>
diff --git a/lib/tools/doc/src/make.dep b/lib/tools/doc/src/make.dep
deleted file mode 100644
index 11fa090d6f..0000000000
--- a/lib/tools/doc/src/make.dep
+++ /dev/null
@@ -1,33 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex cover.tex cover_chapter.tex cprof.tex \
-		cprof_chapter.tex eprof.tex erlang_mode.tex \
-		erlang_mode_chapter.tex fprof.tex fprof_chapter.tex \
-		instrument.tex make.tex part.tex ref_man.tex \
-		tags.tex xref.tex xref_chapter.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-cprof.tex: ../../../../system/doc/definitions/term.defs
-
-xref.tex: ../../../../system/doc/definitions/term.defs
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: venn1.ps venn2.ps
-
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 02d92fc4e7..17506fb6e2 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -30,6 +30,44 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 2.6.6.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Teach the emacs mode to compile yecc and leex files</p>
+          <p>
+	    If visiting a .yrl or .xrl file in emacs with
+	    erlang-mode, then the `erlang-compile' function (normally
+	    bound to C-c C-k), now knows how to compile yecc and leex
+	    files, and then, if that compilation succeeds, also
+	    compiles the resulting .erl files.</p>
+          <p>
+	    Also introduce a `erlang-compile-command-function-alist'
+	    to make it possible to hook in other functions for
+	    computing compilation commands/expressions, depending on
+	    file name. (Thanks to Tomas Abrahamsson )</p>
+          <p>
+	    Own Id: OTP-9503</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Bugs in xref(3) have been fixed. (Thanks to Matthias
+	    Lang.) </p>
+          <p>
+	    Own Id: OTP-9416</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 2.6.6.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 6728bef2a4..bc7a190fb4 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -523,6 +523,32 @@ This is an elisp list of options. Each option can be either:
 - a string
 Example: '(bin_opt_info (i . \"/path1/include\") (i . \"/path2/include\"))")
 
+(defvar erlang-compile-command-function-alist
+  '((".erl\\'" . inferior-erlang-compute-erl-compile-command)
+    (".xrl\\'" . inferior-erlang-compute-leex-compile-command)
+    (".yrl\\'" . inferior-erlang-compute-yecc-compile-command)
+    ("." . inferior-erlang-compute-erl-compile-command))
+  "*Alist of filename patterns vs corresponding compilation functions.
+Each element looks like (REGEXP . FUNCTION). Compiling a file whose name
+matches REGEXP specifies FUNCTION to use to compute the compilation
+command. The FUNCTION will be called with two arguments: module name and
+default compilation options, like output directory. The FUNCTION
+is expected to return a string.")
+
+(defvar erlang-leex-compile-opts '()
+  "*Options to pass to leex when compiling xrl files.
+This is an elisp list of options. Each option can be either:
+- an atom
+- a dotted pair
+- a string")
+
+(defvar erlang-yecc-compile-opts '()
+  "*Options to pass to yecc when compiling yrl files.
+This is an elisp list of options. Each option can be either:
+- an atom
+- a dotted pair
+- a string")
+
 (eval-and-compile
   (defvar erlang-regexp-modern-p
     (if (> erlang-emacs-major-version 21) t nil)
@@ -1199,7 +1225,7 @@ Lock syntax table.  The effect is that `apply' in the atom
       `( (char-after (1- (or ,pos (point)))))))
 
 ;; defvar some obsolete variables, which we still support for
-;; backwardscompatibility reasons.
+;; backwards compatibility reasons.
 (eval-when-compile
   (defvar comment-indent-hook)
   (defvar dabbrev-case-fold-search)
@@ -5276,6 +5302,22 @@ unless the optional NO-DISPLAY is non-nil."
       (file-name-as-directory buffer-dir))))
 
 (defun inferior-erlang-compute-compile-command (module-name opts)
+  (let ((ccfn erlang-compile-command-function-alist)
+	(res (inferior-erlang-compute-erl-compile-command module-name opts))
+	ccfn-entry
+	done)
+    (if (not (null (buffer-file-name)))
+	(while (and (not done) (not (null ccfn)))
+	  (setq ccfn-entry (car ccfn))
+	  (setq ccfn (cdr ccfn))
+	  (if (string-match (car ccfn-entry) (buffer-file-name))
+	      (let ((c-fn (cdr ccfn-entry)))
+		(setq done t)
+		(if (not (null c-fn))
+		    (setq result (funcall c-fn module-name opts)))))))
+    result))
+
+(defun inferior-erlang-compute-erl-compile-command (module-name opts)
   (let* ((out-dir-opt (assoc 'outdir opts))
 	 (out-dir     (cdr out-dir-opt)))
     (if erlang-compile-use-outdir
@@ -5299,6 +5341,48 @@ unless the optional NO-DISPLAY is non-nil."
 		      (remq out-dir-opt opts))
 	 tmpvar tmpvar tmpvar2)))))
 
+(defun inferior-erlang-compute-leex-compile-command (module-name opts)
+  (let ((file-name        (buffer-file-name))
+	(erl-compile-expr (inferior-erlang-remove-any-trailing-dot
+			   (inferior-erlang-compute-erl-compile-command
+			    module-name opts))))
+    (format (concat "f(LErr1__), f(LErr2__), "
+		    "case case leex:file(\"%s\", [%s]) of"
+		    " ok -> ok;"
+		    " {ok,_} -> ok;"
+		    " {ok,_,_} -> ok;"
+		    " LErr1__ -> LErr1__ "
+		    "end of"
+		    " ok -> %s;"
+		    " LErr2__ -> LErr2__ "
+		    "end.")
+	    file-name
+	    (inferior-erlang-format-comma-opts erlang-leex-compile-opts)
+	    erl-compile-expr)))
+
+(defun inferior-erlang-compute-yecc-compile-command (module-name opts)
+  (let ((file-name        (buffer-file-name))
+	(erl-compile-expr (inferior-erlang-remove-any-trailing-dot
+			   (inferior-erlang-compute-erl-compile-command
+			    module-name opts))))
+    (format (concat "f(YErr1__), f(YErr2__), "
+		    "case case yecc:file(\"%s\", [%s]) of"
+		    " {ok,_} -> ok;"
+		    " {ok,_,_} -> ok;"
+		    " YErr1__ -> YErr1__ "
+		    "end of"
+		    " ok -> %s;"
+		    " YErr2__ -> YErr2__ "
+		    "end.")
+	    file-name
+	    (inferior-erlang-format-comma-opts erlang-yecc-compile-opts)
+	    erl-compile-expr)))
+
+(defun inferior-erlang-remove-any-trailing-dot (str)
+  (if (string= (substring str -1) ".")
+      (substring str 0 (1- (length str)))
+    str))
+
 (defun inferior-erlang-format-comma-opts (opts)
   (if (null opts)
       ""
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 905ad895c9..fb9744d759 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -55,14 +55,14 @@
 %% compiled module. This is necessary so that the code can be loaded
 %% on remote nodes that are started after the compilation.
 %%
-%% PARELLALISM
+%% PARALLELISM
 %% To take advantage of SMP when doing the cover analysis both the data 
 %% collection and analysis has been parallelized. One process is spawned for
 %% each node when collecting data, and on the remote node when collecting data
 %% one process is spawned per module. 
 %% 
 %% When analyzing data it is possible to issue multiple analyse(_to_file)/X 
-%% calls at once. They are however all calls (for backwardscompatability 
+%% calls at once. They are however all calls (for backwards compatibility
 %% reasons) so the user of cover will have to spawn several processes to to the
 %% calls ( or use async_analyse_to_file ). 
 %%
diff --git a/lib/tools/test/eprof_SUITE_data/ed.script b/lib/tools/test/eprof_SUITE_data/ed.script
index 94531a9e98..fe1625bc50 100644
--- a/lib/tools/test/eprof_SUITE_data/ed.script
+++ b/lib/tools/test/eprof_SUITE_data/ed.script
@@ -1,5 +1,7 @@
 H
 r eed.erl
+1,$s/Created :/Skapad  :/p
+/^cmd_line/,/^file/-1p
 g/^[a-z][a-zA-Z_]*\(/i\
 %%% -------------------------------------------------------------\
 %%% A stupid function header.\
diff --git a/lib/tools/test/eprof_SUITE_data/eed.erl b/lib/tools/test/eprof_SUITE_data/eed.erl
index 0175abdd0e..520c5f3dd1 100644
--- a/lib/tools/test/eprof_SUITE_data/eed.erl
+++ b/lib/tools/test/eprof_SUITE_data/eed.erl
@@ -10,6 +10,8 @@
 
 -export([edit/0, edit/1, file/1, cmd_line/1]).
 
+-compile({no_auto_import,[error/1]}).
+
 -record(state, {dot = 0,			% Line number of dot.
 		upto_dot = [],			% Lines up to dot (reversed).
 		after_dot = [],			% Lines after dot.
@@ -60,7 +62,7 @@ loop(St0) ->
 	    ok;
 	{error, Reason} ->
 	    loop(print_error(Reason, St1));
-	St2 when record(St2, state) ->
+	St2 when is_record(St2, state) ->
 	    loop(St2)
     end.
 
@@ -68,7 +70,7 @@ command(Cmd, St) ->
     case parse_command(Cmd, St) of
 	quit ->
 	    quit;
-	St1 when function(St1#state.print) ->
+	St1 when is_function(St1#state.print) ->
 	    if
 		St1#state.dot /= 0 ->
 		    print_current(St1);
@@ -76,7 +78,7 @@ command(Cmd, St) ->
 		    ok
 	    end,
 	    St1#state{print=false};
-	St1 when record(St1, state) ->
+	St1 when is_record(St1, state) ->
 	    St1
     end.
 
@@ -103,13 +105,13 @@ get_input([C|Rest], St, Result) ->
 get_line1(Io, Prompt, Result) ->
     get_line2(Io, io:get_line(Io, Prompt), Result).
 
-get_line2(Io, eof, []) ->
+get_line2(_Io, eof, []) ->
     eof;
-get_line2(Io, eof, Result) ->
+get_line2(_Io, eof, Result) ->
     lists:reverse(Result);
 get_line2(Io, [$\\, $\n], Result) ->
     get_line1(Io, '', [$\n|Result]);
-get_line2(Io, [$\n], Result) ->
+get_line2(_Io, [$\n], Result) ->
     lists:reverse(Result, [$\n]);
 get_line2(Io, [C|Rest], Result) ->
     get_line2(Io, Rest, [C|Result]).
@@ -193,7 +195,7 @@ get_one1([$+|Rest], Sum, St) ->
     get_one2({ok, 1, Rest}, 1, Sum, St);
 get_one1([$-|Rest], Sum, St) ->
     get_one2({ok, 1, Rest}, -1, Sum, St);
-get_one1(Cmd, false, St) ->
+get_one1(_Cmd, false, _St) ->
     false;
 get_one1(Cmd, Sum, St) ->
     {ok, Sum, Cmd, St}.
@@ -222,13 +224,13 @@ get_address([$', Mark|Rest], St) when $a =< Mark, Mark =< $z ->
 	false ->
 	    {ok, 0, Rest, St}
     end;
-get_address([$'|Rest], State) ->
+get_address([$'|_Rest], _State) ->
     error(bad_mark);
 get_address([$/|Rest], State) ->
     scan_forward($/, Rest, State);
-get_address([$?|Rest], State) ->
+get_address([$?|_Rest], _State) ->
     error(not_implemented);
-get_address(Cmd, St) ->
+get_address(_Cmd, _St) ->
     false.
 
 scan_forward(End, Patt0, State) ->
@@ -238,8 +240,8 @@ scan_forward(End, Patt0, State) ->
     scan_forward1(Dot+1, After, NewState, Rest).
 
 scan_forward1(Linenum, [Line|Rest], State, RestCmd) ->
-    case regexp:first_match(Line#line.contents, State#state.pattern) of
-	{match, _, _} ->
+    case re:run(Line#line.contents, State#state.pattern, [{capture, none}]) of
+	match ->
 	    {ok, Linenum, RestCmd, State};
 	nomatch ->
 	    scan_forward1(Linenum+1, Rest, State, RestCmd)
@@ -254,13 +256,14 @@ scan_forward1(_, [], State, RestCmd) ->
 	    Other
     end.
 
-scan_forward2(0, [], State, RestCmd) ->
+scan_forward2(0, [], _State, _RestCmd) ->
     false;
 scan_forward2(Linenum, [Line|Rest], State, RestCmd) ->
     case scan_forward2(Linenum-1, Rest, State, RestCmd) of
 	false ->
-	    case regexp:first_match(Line#line.contents, State#state.pattern) of
-		{match, _, _} ->
+	    case re:run(Line#line.contents, State#state.pattern,
+			[{capture, none}]) of
+		match ->
 		    {ok, Linenum, RestCmd, State};
 		nomatch ->
 		    false
@@ -296,7 +299,7 @@ parse_cmd_char($t, Cont) -> Cont(fun transpose_command/3, 2, dot);
 parse_cmd_char($u, Cont) -> Cont(fun undo_command/3, 0, none);
 parse_cmd_char($v, Cont) -> Cont(fun vglobal_command/3, 2, all);
 parse_cmd_char($w, Cont) -> Cont(fun write_command/3, 2, all);
-parse_cmd_char(_, Cont)  -> error(bad_command).
+parse_cmd_char(_, _Cont)  -> error(bad_command).
 
 execute_command(Fun, NumLines, Def, State, Nums, Rest) ->
     Lines = check_lines(NumLines, Def, Nums, State),
@@ -380,7 +383,7 @@ change_command(Rest, Lines, St0) ->
 
 %% (.,.)d - delete lines
 
-delete_command(Rest, [0, Last], St) ->
+delete_command(_Rest, [0, _Last], _St) ->
     error(bad_linenum);
 delete_command(Rest, [First, Last], St0) ->
     St1 = check_trailing_p(Rest, save_for_undo(St0)),
@@ -396,7 +399,7 @@ delete(Left, St0) ->
 
 %% e file - replace buffer with new file
 
-enter_command(Name, [], St) when St#state.modified == true ->
+enter_command(_Name, [], St) when St#state.modified == true ->
     error(buffer_modified);
 enter_command(Name, [], St0) ->
     enter_always_command(Name, [], St0).
@@ -439,7 +442,7 @@ mark(Sense, [First, Last], St0) ->
     St1 = move_to(Last, St0),
     mark1(Sense, First-1, St1).
 
-mark1(Sense, First, St) when St#state.dot == First ->
+mark1(_Sense, First, St) when St#state.dot == First ->
     St;
 mark1(Sense, First, St) ->
     [Line|Prev] = St#state.upto_dot,
@@ -507,16 +510,16 @@ help_always_command([], [], St) ->
 
 %% (.)i - insert text
 
-insert_command(Rest, [0], State) ->
+insert_command(_Rest, [0], _State) ->
     error(bad_linenum);
 insert_command(Rest, [Line], State) ->
     append_command(Rest, [Line-1], State).
 
 %% (.)kx - mark line
 
-mark_command(_, [0], St) ->
+mark_command(_, [0], _St) ->
     error(bad_linenum);
-mark_command([Mark|Rest], [Line], St) when $a =< Mark, Mark =< $z ->
+mark_command([Mark|_Rest], [_Line], _St) when $a =< Mark, Mark =< $z ->
     error(not_implemented);
 mark_command(_, _, _) ->
     error(bad_mark).
@@ -528,12 +531,12 @@ list_command(Rest, Lines, St) ->
 
 %% (.,.)m - move lines
 
-move_command(Cmd, [First, Last], St) ->
+move_command(_Cmd, [_First, _Last], _St) ->
     error(not_implemented).
 
 %% (.,.)t - copy lines
 
-transpose_command(Cmd, [First, Last], St) ->
+transpose_command(_Cmd, [_First, _Last], _St) ->
     error(not_implemented).
 
 %% (.,.)n - print lines with line numbers
@@ -604,39 +607,41 @@ read(After, Name, St0) ->
 
 subst_command(_, [0, _], _) ->
     error(bad_linenum);
-subst_command([$ |Cmd0], [First, Last], St0) ->
+subst_command([$ |_Cmd0], [_First, _Last], _St0) ->
     error(bad_delimiter);
-subst_command([$\n|Cmd0], [First, Last], St0) ->
+subst_command([$\n|_Cmd0], [_First, _Last], _St0) ->
     error(bad_delimiter);
 subst_command([Sep|Cmd0], [First, Last], St0) ->
     St1 = save_for_undo(St0),
     {ok, Cmd1, St2} = get_pattern(Sep, Cmd0, St1),
     {ok, Replacement, Cmd2} = get_replacement(Sep, Cmd1),
-    {ok, Sub, Cmd3} = subst_check_gflag(Cmd2),
+    {ok, Opts, Cmd3} = subst_check_gflag(Cmd2),
     St3 = check_trailing_p(Cmd3, St2),
-    subst_command(Last-First+1, Sub, Replacement, move_to(First-1, St3), nomatch);
+    subst_command(Last-First+1, Opts, Replacement,
+		  move_to(First-1, St3), nomatch);
 subst_command([], _, _) ->
     error(bad_delimiter).
     
 subst_command(0, _, _, _, nomatch) ->
     error(nomatch);
-subst_command(0, _, _, _, StLast) when record(StLast, state) ->
+subst_command(0, _, _, _, StLast) when is_record(StLast, state) ->
     StLast;
-subst_command(Left, Sub, Repl, St0, LastMatch) ->
+subst_command(Left, Opts, Repl, St0, LastMatch) ->
     St1 = next_line(St0),
     [Line|_] = St1#state.upto_dot,
-    case regexp:Sub(Line#line.contents, St1#state.pattern, Repl) of
-	{ok, _, 0} ->
-	    subst_command(Left-1, Sub, Repl, St1, LastMatch);
-	{ok, NewContents, _} ->
+    Contents = Line#line.contents,
+    case re:replace(Contents, St1#state.pattern, Repl, Opts) of
+	Contents ->
+	    subst_command(Left-1, Opts, Repl, St1, LastMatch);
+	NewContents ->
 	    %% XXX This doesn't work with marks.
 	    St2 = delete_current_line(St1),
 	    St3 = insert_line(NewContents, St2),
-	    subst_command(Left-1, Sub, Repl, St3, St3)
+	    subst_command(Left-1, Opts, Repl, St3, St3)
     end.
 
-subst_check_gflag([$g|Cmd]) -> {ok, gsub, Cmd};
-subst_check_gflag(Cmd)      -> {ok, sub, Cmd}.
+subst_check_gflag([$g|Cmd]) -> {ok, [global,{return,list}], Cmd};
+subst_check_gflag(Cmd)      -> {ok, [{return,list}], Cmd}.
 
 %% u - undo
 
@@ -649,7 +654,7 @@ undo_command(_, _, _) ->
 
 %% (1,$)w - write buffer to file
 
-write_command(Cmd, [First, Last], St) ->
+write_command(_Cmd, [_First, _Last], _St) ->
     error(not_implemented).
     
 
@@ -721,7 +726,7 @@ get_pattern(End, Cmd, State) ->
 get_pattern(End, [End|Rest], State, []) when State#state.pattern /= undefined ->
     {ok, Rest, State};
 get_pattern(End, [End|Rest], State, Result) ->
-    case regexp:parse(lists:reverse(Result)) of
+    case re:compile(lists:reverse(Result)) of
 	{error, _} ->
 	    error(bad_pattern);
 	{ok, Re} ->
@@ -754,7 +759,7 @@ check_trailing_p([$p], St) ->
     St#state{print=fun(Line, _) -> io:put_chars(Line) end};
 check_trailing_p([], State) ->
     State;
-check_trailing_p(Other, State) ->
+check_trailing_p(_Other, _State) ->
     error(garbage_after_command).
 
 error(Reason) ->
@@ -765,9 +770,9 @@ match(State) when State#state.dot == 0 ->
 match(State) ->
     [Line|_] = State#state.upto_dot,
     Re = State#state.pattern,
-    case regexp:first_match(Line#line.contents, Re) of
-	{match, _, _} -> true;
-	nomatch       -> false
+    case re:run(Line#line.contents, Re, [{capture, none}]) of
+	match   -> true;
+	nomatch -> false
     end.
 
 skip_blanks([$ |Rest]) ->
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index 6999c695e6..2d63a33554 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.6.6.4
+TOOLS_VSN = 2.6.6.5
diff --git a/lib/tv/doc/src/Makefile b/lib/tv/doc/src/Makefile
index f30e0307a9..5a41b28d48 100644
--- a/lib/tv/doc/src/Makefile
+++ b/lib/tv/doc/src/Makefile
@@ -26,14 +26,6 @@ VSN=$(TV_VSN)
 APPLICATION=tv
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -89,32 +81,10 @@ EXTRA_FILES = \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = $(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = tv-$(VSN).pdf
-TOP_PS_FILE  = tv-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-endif
-
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
@@ -127,8 +97,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 $(TOP_PDF_FILE): $(XML_FILES)
@@ -144,31 +112,6 @@ clean clean_docs:
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) gifs
-
-clean clean_docs clean_tex:
-	rm -f $(TEX_FILES_USERS_GUIDE) $(TEX_FILES_REF_MAN) $(TEX_FILES_BOOK)
-	rm -f $(HTML_FILES) $(MAN3_FILES)
-	rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
-	rm -f errs core *~ $(LATEX_CLEAN) 
-endif
-
 man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
@@ -181,8 +124,6 @@ debug opt:
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -193,29 +134,5 @@ release_docs_spec: docs
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-endif
-endif
-
-endif
-
 release_spec:
 
diff --git a/lib/tv/doc/src/make.dep b/lib/tv/doc/src/make.dep
deleted file mode 100644
index 8437e320c6..0000000000
--- a/lib/tv/doc/src/make.dep
+++ /dev/null
@@ -1,32 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex part.tex ref_man.tex table_visualizer_chapter.tex \
-		tv.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: info_window.ps set_poll_int.ps tv_create_table.ps \
-		tv_record_editor_mnesia.ps tv_row_marked.ps \
-		tv_row_marked_popup.ps tv_search_result.ps \
-		tv_search_window.ps tv_start.ps tv_start_mnesia.ps \
-		tv_start_other_node.ps tv_start_pid_sorted.ps \
-		tv_start_system.ps tv_start_system_unreadable.ps \
-		tv_table_browser.ps tv_table_browser_updated.ps
-
diff --git a/lib/tv/doc/src/notes.xml b/lib/tv/doc/src/notes.xml
index b3f2f5587f..77a6a43d51 100644
--- a/lib/tv/doc/src/notes.xml
+++ b/lib/tv/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tv/src/tv_db_search.erl b/lib/tv/src/tv_db_search.erl
index edd3c188e2..7634bc63b6 100644
--- a/lib/tv/src/tv_db_search.erl
+++ b/lib/tv/src/tv_db_search.erl
@@ -244,10 +244,10 @@ get_entry_text() ->
 
 
 string_to_regexp(Str) ->
-    case regexp:parse(Str) of
+    case re:compile(Str) of
 	{ok, RegExp} ->
 	    {ok, RegExp};
-	_Error ->
+	{error, _Error} ->
 	    case get(error_msg_mode) of
 		normal ->
 		    {error, {not_a_regexp, "Please enter a regular expression!"}};
@@ -410,33 +410,11 @@ search_for_regexp(Pattern, Elem, ListAsStr) ->
 		lists:flatten(tv_io_lib:write(Elem))
 	end,
 
-    case regexp:first_match(ListToSearch, Pattern) of
-	{match, _, _} ->
+    case re:run(ListToSearch, Pattern, [{capture,none}]) of
+	match ->
 	    found;
-	_Other ->
+	nomatch ->
 	    not_found
-	    %% The code below shall be used instead if it is desired to 
-	    %% compare each *element* in the tuples to the regular expression,
-	    %% i.e., treat each element as a new line/string.
-	    %% The difference is most easily explained through an example:
-	    %% If we treat each tuple as a new line/string, the regular expression
-	    %% "^{win" will match the string "{win, 1, 2, 3}", but not the string 
-	    %% "{1, {win,2}}".
-	    %% If we treat each element as a new line/string, the RE "^{win" will match
-	    %% both strings above.
-    
-	    %% SearchList = tuple_to_list(Elem),
-	    %% case lists:dropwhile(
-	    %%	   fun(H) ->
-	    %%		   nomatch == regexp:first_match(lists:flatten(io_lib:write(H)), 
-	    %%						 Pattern)
-	    %%	   end,
-	    %%	   SearchList) of
-	    %%	[] ->
-	    %%	    not_found;
-	    %%	_AnyList ->
-	    %%	    found
-	    %% end
     end.
 
 
diff --git a/lib/tv/src/tv_main.erl b/lib/tv/src/tv_main.erl
index 2f743c2397..283ba4c967 100644
--- a/lib/tv/src/tv_main.erl
+++ b/lib/tv/src/tv_main.erl
@@ -312,7 +312,7 @@ analyze_error(Cause, Node, Table) ->
             handle_error(mnesia_not_started, Node, Table);
         {badrpc, {'EXIT', {aborted, {node_not_running,_ErrNode}}}} ->
             handle_error(mnesia_not_started, Node, Table);
-	{'EXIT', {undef, {mnesia,_Fcn,_Args}}} ->
+	{'EXIT', {undef, {mnesia,_Fcn,_Args,_}}} ->
 	    handle_error(mnesia_not_started, Node, Table);
 
         {'EXIT', Reason} ->
diff --git a/lib/tv/src/tv_mnesia_rpc.erl b/lib/tv/src/tv_mnesia_rpc.erl
index a2385714ec..4a75994145 100644
--- a/lib/tv/src/tv_mnesia_rpc.erl
+++ b/lib/tv/src/tv_mnesia_rpc.erl
@@ -87,6 +87,8 @@ chk(Result) ->
 	    throw(mnesia_not_started);
 	{badrpc, _Reason} ->
 	    throw(mnesia_not_started);
+	{'EXIT', {undef, {mnesia,_Fcn,_Args,_}}} ->
+	    throw(mnesia_not_started);
 	{'EXIT', {undef, {mnesia,_Fcn,_Args}}} ->
 	    throw(mnesia_not_started);
 	
diff --git a/lib/typer/src/typer.erl b/lib/typer/src/typer.erl
index e40c4f39cd..f2a70f49b7 100644
--- a/lib/typer/src/typer.erl
+++ b/lib/typer/src/typer.erl
@@ -466,14 +466,20 @@ write_typed_file(File, Info) ->
   case file:make_dir(TyperAnnDir) of
     {error, Reason} ->
       case Reason of
-	eexist -> %% TypEr dir exists; remove old typer files
-	  ok = file:delete(NewFileName),
+	eexist -> %% TypEr dir exists; remove old typer files if they exist
+	  case file:delete(NewFileName) of
+	    ok -> ok;
+	    {error, enoent} -> ok;
+	    {error, _} ->
+	      Msg = io_lib:format("Error in deleting file ~s\n", [NewFileName]),
+	      fatal_error(Msg)
+	  end,
 	  write_typed_file(File, Info, NewFileName);
 	enospc ->
 	  Msg = io_lib:format("Not enough space in ~p\n", [Dir]),
 	  fatal_error(Msg);
 	eacces ->
-	  Msg = io:format("No write permission in ~p\n", [Dir]),
+	  Msg = io_lib:format("No write permission in ~p\n", [Dir]),
 	  fatal_error(Msg);
 	_ ->
 	  Msg = io_lib:format("Unhandled error ~s when writing ~p\n",
@@ -539,7 +545,7 @@ get_type_string(F, A, Info, Mode) ->
       case {Mode, Type} of
 	{file, {contract, _}} -> "";
 	_ ->
-	  Prefix = lists:concat(["-spec ", F]),
+	  Prefix = lists:concat(["-spec ", erl_types:atom_to_string(F)]),
 	  lists:concat([Prefix, TypeStr, "."])
       end;
     true ->
diff --git a/lib/typer/vsn.mk b/lib/typer/vsn.mk
index fe8faabdf8..9e73aed286 100644
--- a/lib/typer/vsn.mk
+++ b/lib/typer/vsn.mk
@@ -1 +1 @@
-TYPER_VSN = 0.9.1
+TYPER_VSN = 0.9.2
diff --git a/lib/webtool/doc/src/make.dep b/lib/webtool/doc/src/make.dep
deleted file mode 100644
index 87526b3f73..0000000000
--- a/lib/webtool/doc/src/make.dep
+++ /dev/null
@@ -1,20 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex part.tex ref_man.tex start_webtool.tex \
-		webtool.tex webtool_chapter.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
diff --git a/lib/webtool/doc/src/notes.xml b/lib/webtool/doc/src/notes.xml
index b7e6f0421c..c58a440937 100644
--- a/lib/webtool/doc/src/notes.xml
+++ b/lib/webtool/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,22 @@
   <p>This document describes the changes made to the Webtool
     application.</p>
 
+<section><title>WebTool 0.8.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Do not install *.bat files on non-win32 machines (Thanks
+	    to Hans Ulrich Niedermann)</p>
+          <p>
+	    Own Id: OTP-9515</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>WebTool 0.8.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/webtool/priv/Makefile b/lib/webtool/priv/Makefile
index 56ab772c45..6e1c6606fe 100644
--- a/lib/webtool/priv/Makefile
+++ b/lib/webtool/priv/Makefile
@@ -39,8 +39,12 @@ HTDOCS_FILES =  root/doc/index.html \
 	        root/doc/tool_management.html \
 	        root/doc/start_info.html 
 
-SCRIPTS = bin/start_webtool \
-	  bin/start_webtool.bat
+ifeq ($(findstring win32,$(TARGET)),win32)
+WIN32_SCRIPTS= bin/start_webtool.bat
+else
+WIN32_SCRIPTS=
+endif
+SCRIPTS = bin/start_webtool $(WIN32_SCRIPTS)
 
 # ----------------------------------------------------
 # FLAGS
diff --git a/lib/webtool/vsn.mk b/lib/webtool/vsn.mk
index d687b4ff81..2643be866e 100644
--- a/lib/webtool/vsn.mk
+++ b/lib/webtool/vsn.mk
@@ -1 +1 @@
-WEBTOOL_VSN=0.8.8
+WEBTOOL_VSN=0.8.9
diff --git a/lib/wx/api_gen/gen_util.erl b/lib/wx/api_gen/gen_util.erl
index b53f817ce0..df5b4c3405 100644
--- a/lib/wx/api_gen/gen_util.erl
+++ b/lib/wx/api_gen/gen_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -43,23 +43,27 @@ strip_name(String,[]) -> String.
 
 get_hook(_Type, undefined) -> ignore;
 get_hook(Type, List) -> proplists:get_value(Type, List, ignore).
-  
+
+get_taylor_made(Str, Name) ->
+    re:run(Str, "<<"++Name++"(.*)"++Name++">>",
+	   [dotall, {capture, all_but_first, list}]).
+
 open_write(File) ->
     %% io:format("Generating ~s~n",[File]),
     {ok, Fd} = file:open(File++".temp", [write]),
     put(current_file, {Fd,File}).
-    
+
 
 close() ->
     case get(current_file) of
-	undefined -> 
+	undefined ->
 	    ok;
 	{closed, File} ->
 	    io:format("Closing twice ~s~n",[File]);
 	{Fd,File} ->
 	    file:close(Fd),
 	    case os:cmd("diff " ++ File ++ " " ++ File ++ ".temp" ++ "| head -30") of
-		[] -> 
+		[] ->
 		    ok = file:delete(File ++ ".temp"),
 		    %% So that make understands that we have made this
 		    %% case os:getenv("CLEARCASE_ROOT") of
@@ -71,11 +75,11 @@ close() ->
 		    case check_diff(Diff) of
 			copyright -> %% We ignore copyright changes only
 			    ok = file:delete(File ++ ".temp");
-			_ ->		    
+			_ ->
 			    io:format("Diff in ~s~n~s ~n", [File, Diff]),
 			    case file:rename(File ++ ".temp", File) of
 				ok -> ok;
-				_ -> 
+				_ ->
 				    io:format("*****  Failed to save file ~p ~n",[File])
 			    end
 		    end
@@ -85,9 +89,9 @@ close() ->
 
 
 check_diff(Diff) ->
-    try 
+    try
 	[_,D1,_,D2|Tail] = re:split(Diff, "\n"),
-	case Tail of 
+	case Tail of
 	    [] -> ok;
 	    [<<>>] -> ok;
 	    _ -> throw(diff)
@@ -117,29 +121,29 @@ args(Fun, Limit, List, Max) ->
     args(Fun, Limit, List, Max, 0).
 
 args(_Fun, _Limit, [], _Max, _) -> "";  %% No args
-args(Fun, _Limit, [Last], _Max, _Pos) -> 
-    case Fun(Last) of 
+args(Fun, _Limit, [Last], _Max, _Pos) ->
+    case Fun(Last) of
 	skip -> ""; %% FIXME bug if last skips
 	Str  -> Str
     end;
 args(Fun, Limit, [H|R], Max, Pos) ->
-    case Fun(H) of 
+    case Fun(H) of
 	skip -> args(Fun,Limit,R, Max, Pos);
-	Str  -> 
-	    {NL, NewPos} = 
+	Str  ->
+	    {NL, NewPos} =
 		case length(Str) + Pos of
 		    Curr when Curr > Max ->
 			{"\n  ", 0};
-		    Curr -> 
+		    Curr ->
 			{"", Curr}
 		end,
-	    case args(Fun,Limit,R, Max, NewPos) of 
+	    case args(Fun,Limit,R, Max, NewPos) of
 		"" -> Str;
 		End -> Str ++ Limit ++ NL ++ End
 	    end
     end.
 
-    
+
 
 
 tokens(S) ->
@@ -167,11 +171,11 @@ replace_and_remove([E|R], Acc) when is_list(E) -> %% Keep everything that is a w
     replace_and_remove(R, [E|Acc]);
 replace_and_remove([$\n | R], Acc) ->   %% It is semi line oriented so keep eol
     replace_and_remove(R, [eol|Acc]);
-replace_and_remove([$( | R], Acc) ->    
+replace_and_remove([$( | R], Acc) ->
     replace_and_remove(R, ["("|Acc]);
 replace_and_remove([$) | R], Acc) ->
     replace_and_remove(R, [")"|Acc]);
-replace_and_remove([${ | R], Acc) ->    
+replace_and_remove([${ | R], Acc) ->
     replace_and_remove(R, ["{"|Acc]);
 replace_and_remove([$} | R], Acc) ->
     replace_and_remove(R, ["}"|Acc]);
@@ -187,7 +191,7 @@ replace_and_remove([$, | R], Acc) ->
     replace_and_remove(R, [cont|Acc]);
 replace_and_remove([$; | R], Acc) ->
     replace_and_remove(R, [eoe|Acc]);
-replace_and_remove([$@ | R], Acc) ->    
+replace_and_remove([$@ | R], Acc) ->
     replace_and_remove(R, [directive|Acc]);
 
 replace_and_remove([_E|R], Acc) ->       %% Ignore everthing else
@@ -213,7 +217,7 @@ erl_copyright() ->
     w("%%~n",[]),
     w("%% %CopyrightBegin%~n",[]),
     w("%%~n",[]),
-    w("%% Copyright Ericsson AB ~p-2010. All Rights Reserved.~n",
+    w("%% Copyright Ericsson AB ~p-2011. All Rights Reserved.~n",
       [StartYear]),
     w("%%~n",[]),
     w("%% The contents of this file are subject to the Erlang Public License,~n",[]),
@@ -229,11 +233,11 @@ erl_copyright() ->
     w("%%~n",[]),
     w("%% %CopyrightEnd%~n",[]).
 
-c_copyright() -> 
+c_copyright() ->
     w("/*~n",[]),
     w(" * %CopyrightBegin%~n",[]),
     w(" *~n",[]),
-    w(" * Copyright Ericsson AB 2008-2010. All Rights Reserved.~n",[]),
+    w(" * Copyright Ericsson AB 2008-2011. All Rights Reserved.~n",[]),
     w(" *~n",[]),
     w(" * The contents of this file are subject to the Erlang Public License,~n",[]),
     w(" * Version 1.1, (the \"License\"); you may not use this file except in~n",[]),
diff --git a/lib/wx/api_gen/gl_gen.erl b/lib/wx/api_gen/gl_gen.erl
index 374e0bd12b..8998d341e7 100644
--- a/lib/wx/api_gen/gl_gen.erl
+++ b/lib/wx/api_gen/gl_gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -44,7 +44,7 @@ devcode() -> spawn(fun() -> safe(fun gen_code/0,false) end).
 safe(What, QuitOnErr) ->
     try 
 	What(),
-	io:format("Completed succesfully~n~n", []),
+	io:format("Completed successfully~n~n", []),
 	QuitOnErr andalso gen_util:halt(0)
     catch Err:Reason ->
 	    io:format("Error ~p: ~p:~p~n  ~p~n", 
diff --git a/lib/wx/api_gen/wx_extra/wxListCtrl.c_src b/lib/wx/api_gen/wx_extra/wxListCtrl.c_src
index cd3074e481..54d6fafd01 100644
--- a/lib/wx/api_gen/wx_extra/wxListCtrl.c_src
+++ b/lib/wx/api_gen/wx_extra/wxListCtrl.c_src
@@ -1,3 +1,161 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. 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.
+%%
+%% %CopyrightEnd%
+%%
+
+
+<<wxListCtrl_class
+class EwxListCtrl : public wxListCtrl {
+ public: ~EwxListCtrl();
+ EwxListCtrl(wxWindow * parent,wxWindowID winid,const wxPoint& pos,const wxSize& size,long style,const wxValidator& validator) : wxListCtrl(parent,winid,pos,size,style,validator) {};
+ EwxListCtrl() : wxListCtrl() {};
+
+ int onGetItemText;
+ int onGetItemAttr;
+ int onGetItemColumnImage;
+ ErlDrvPort port;
+
+ private:
+ virtual wxString OnGetItemText(long item, long col) const;
+ virtual wxListItemAttr* OnGetItemAttr(long item) const;
+ virtual int OnGetItemImage(long item) const;
+ virtual int OnGetItemColumnImage(long item, long column) const;
+};
+wxListCtrl_class>>
+
+<<wxListCtrl_new_0
+case ~s: { // wxListCtrl::wxListCtrl
+ wxListCtrl * Result = new EwxListCtrl();
+ newPtr((void *) Result, 0, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxListCtrl");
+ break;
+}
+wxListCtrl_new_0>>
+
+<<wxListCtrl_new_2
+case ~s: { // wxListCtrl::wxListCtrl
+ wxWindowID winid=wxID_ANY;
+ wxPoint pos= wxDefaultPosition;
+ wxSize size= wxDefaultSize;
+ long style=wxLC_ICON;
+ const wxValidator * validator= &wxDefaultValidator;
+ wxWindow *parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ int onGetItemText = 0, onGetItemAttr = 0, onGetItemColumnImage = 0;
+
+ bp += 4; /* Align */
+ while( * (int*) bp) { switch (* (int*) bp) {
+  case 1: {bp += 4;
+ winid = (wxWindowID)*(int *) bp; bp += 4;
+  } break;
+  case 2: {bp += 4;
+ int * posX = (int *) bp; bp += 4;
+ int * posY = (int *) bp; bp += 4;
+ pos = wxPoint(*posX,*posY);
+ bp += 4; /* Align */
+  } break;
+  case 3: {bp += 4;
+ int * sizeW = (int *) bp; bp += 4;
+ int * sizeH = (int *) bp; bp += 4;
+ size = wxSize(*sizeW,*sizeH);
+ bp += 4; /* Align */
+  } break;
+  case 4: {bp += 4;
+ style = (long)*(int *) bp; bp += 4;
+  } break;
+  case 5: {bp += 4;
+validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
+  } break;
+  case 6: {bp += 4;
+    onGetItemText = *(int *) bp; bp += 4;
+  } break;
+  case 7: {bp += 4;
+    onGetItemAttr = *(int *) bp; bp += 4;
+  } break;
+  case 8: {bp += 4;
+    onGetItemColumnImage = *(int *) bp; bp += 4;
+  } break;
+ }};
+ EwxListCtrl * Result = new EwxListCtrl(parent,winid,pos,size,style,*validator);
+ Result->onGetItemText = onGetItemText;
+ Result->onGetItemAttr = onGetItemAttr;
+ Result->onGetItemColumnImage = onGetItemColumnImage;
+ Result->port = Ecmd.port;
+ newPtr((void *) Result, 0, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxListCtrl");
+ break;
+}
+wxListCtrl_new_2>>
+
+<<Create
+case ~s: { // wxListCtrl::Create
+ wxWindowID winid=wxID_ANY;
+ wxPoint pos= wxDefaultPosition;
+ wxSize size= wxDefaultSize;
+ long style=wxLC_ICON;
+ const wxValidator * validator= &wxDefaultValidator;
+ EwxListCtrl *This = (EwxListCtrl *) getPtr(bp,memenv); bp += 4;
+ wxWindow *parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ int onGetItemText = 0, onGetItemAttr = 0, onGetItemColumnImage = 0;
+
+ bp += 4; /* Align */
+ while( * (int*) bp) { switch (* (int*) bp) {
+  case 1: {bp += 4;
+ winid = (wxWindowID)*(int *) bp; bp += 4;
+  } break;
+  case 2: {bp += 4;
+ int * posX = (int *) bp; bp += 4;
+ int * posY = (int *) bp; bp += 4;
+ pos = wxPoint(*posX,*posY);
+ bp += 4; /* Align */
+  } break;
+  case 3: {bp += 4;
+ int * sizeW = (int *) bp; bp += 4;
+ int * sizeH = (int *) bp; bp += 4;
+ size = wxSize(*sizeW,*sizeH);
+ bp += 4; /* Align */
+  } break;
+  case 4: {bp += 4;
+ style = (long)*(int *) bp; bp += 4;
+  } break;
+  case 5: {bp += 4;
+validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
+  } break;
+  case 6: {bp += 4;
+    onGetItemText = *(int *) bp; bp += 4;
+  } break;
+  case 7: {bp += 4;
+    onGetItemAttr = *(int *) bp; bp += 4;
+  } break;
+  case 8: {bp += 4;
+    onGetItemColumnImage = *(int *) bp; bp += 4;
+  } break;
+ }};
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->Create(parent,winid,pos,size,style,*validator);
+ This->onGetItemText = onGetItemText;
+ This->onGetItemAttr = onGetItemAttr;
+ This->onGetItemColumnImage = onGetItemColumnImage;
+ This->port = Ecmd.port;
+
+ rt.addBool(Result);
+ break;
+}
+Create>>
+
 <<SortItems
 case ~s: { // wxListCtrl::SortItems taylormade
   wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
@@ -22,3 +180,6 @@ case ~s: { // wxListCtrl::SortItems taylormade
   break;
 }
 SortItems>>
+
+
+
diff --git a/lib/wx/api_gen/wx_extra/wxListCtrl.erl b/lib/wx/api_gen/wx_extra/wxListCtrl.erl
index e6470182cb..99255bc53f 100644
--- a/lib/wx/api_gen/wx_extra/wxListCtrl.erl
+++ b/lib/wx/api_gen/wx_extra/wxListCtrl.erl
@@ -1,32 +1,33 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2011. 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.
-%% 
+%%
 %% %CopyrightEnd%
 %%
+
 <<EXPORT:SortItems sortItems/2 SortItems:EXPORT>>
 
 <<SortItems
 %% @spec (This::wxListCtrl(), SortCallBack::function()) -> boolean()
 %% @doc Sort the items in the list control<br />
-%%   <pre>SortCalBack(Item1,Item2) -> integer()</pre>
+%%   <pre>SortCallBack(Item1,Item2) -> integer()</pre>
 %%  <br /> SortCallBack receives the client data associated with two items
 %%         to compare, and should return 0 if the items are equal, a negative
 %%         value if the first item is less than the second one and a positive
 %%         value if the first item is greater than the second one.
-%%  <br /> NOTE: The callback may not call other processes.
+%%  <br /> NOTE: The callback may not call other (wx) processes.
 sortItems(#wx_ref{type=ThisT,ref=ThisRef}, SortCallBack)
   when is_function(SortCallBack, 2) ->
 	?CLASS(ThisT,wxListCtrl),
@@ -37,3 +38,100 @@ sortItems(#wx_ref{type=ThisT,ref=ThisRef}, SortCallBack)
 	SortId = wxe_util:get_cbId(Sort),
 	wxe_util:call(~s, <<ThisRef:32/?UI,SortId:32/?UI>>).
 SortItems>>
+
+<<EXPORT:wxListCtrl new/0, new/1, new/2 wxListCtrl:EXPORT>>
+
+<<wxListCtrl_new_0
+%% @spec () -> wxListCtrl()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlwxlistctrl">external documentation</a>.
+new() ->
+    wxe_util:construct(~s, <<>>).
+wxListCtrl_new_0>>
+
+<<wxListCtrl_new_2
+%% @spec (Parent::wxWindow:wxWindow()) -> wxListCtrl()
+%% @equiv new(Parent, [])
+new(Parent)
+ when is_record(Parent, wx_ref) ->
+  new(Parent, []).
+
+%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxListCtrl()
+%% Option = {winid, integer()} |
+%%          {pos, {X::integer(),Y::integer()}} |
+%%          {size, {W::integer(),H::integer()}} |
+%%          {style, integer()} |
+%%          {validator, wx:wx()} |
+%%          {onGetItemText, OnGetItemText} |
+%%          {onGetItemAttr, OnGetItemAttr} |
+%%          {onGetItemColumnImage, OnGetItemColumnImage}
+%%
+%% OnGetItemText = (This, Item, Column) -> wxString()
+%% OnGetItemAttr = (This, Item) -> wxListItemAttr()
+%% OnGetItemColumnImage = (This, Item, Column) -> integer()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlwxlistctrl">external documentation</a>.
+
+new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
+  when is_list(Options)->
+    ?CLASS(ParentT,wxWindow),
+    MOpts = fun({winid, Winid}, Acc) -> [<<1:32/?UI,Winid:32/?UI>>|Acc];
+	       ({pos, {PosX,PosY}}, Acc) -> [<<2:32/?UI,PosX:32/?UI,PosY:32/?UI,0:32>>|Acc];
+	       ({size, {SizeW,SizeH}}, Acc) -> [<<3:32/?UI,SizeW:32/?UI,SizeH:32/?UI,0:32>>|Acc];
+	       ({style, Style}, Acc) -> [<<4:32/?UI,Style:32/?UI>>|Acc];
+	       ({validator, #wx_ref{type=ValidatorT,ref=ValidatorRef}}, Acc) ->
+		    ?CLASS(ValidatorT,wx),[<<5:32/?UI,ValidatorRef:32/?UI>>|Acc];
+	       ({onGetItemText, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item,Col]) -> unicode:characters_to_binary([F(This,Item,Col),0]) end,
+		    [<<6:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       ({onGetItemAttr, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item]) ->
+				  #wx_ref{type=wxListItemAttr,ref=ThisRef} = F(This,Item),
+				  <<ThisRef:32/?UI>>
+			  end,
+		    [<<7:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       ({onGetItemColumnImage, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item, Col]) -> <<(F(This,Item,Col)):32/?I>> end,
+		    [<<8:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
+    BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
+    wxe_util:construct(~s, <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
+
+wxListCtrl_new_2>>
+
+<<EXPORT:Create create/2, create/3 Create:EXPORT>>
+
+<<Create
+%% @spec (This::wxListCtrl(), Parent::wxWindow:wxWindow()) -> bool()
+%% @equiv create(This,Parent, [])
+create(This,Parent)
+ when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
+  create(This,Parent, []).
+
+%% @spec (This::wxListCtrl(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
+%% Option = {winid, integer()} |
+%%          {pos, {X::integer(),Y::integer()}} |
+%%          {size, {W::integer(),H::integer()}} |
+%%          {style, integer()} |
+%%          {validator, wx:wx()} |
+%%          {onGetItemText, OnGetItemText} |
+%%          {onGetItemAttr, OnGetItemAttr} |
+%%          {onGetItemColumnImage, OnGetItemColumnImage}
+%%
+%% OnGetItemText = (This, Item, Column) -> wxString()
+%% OnGetItemAttr = (This, Item) -> wxListItemAttr()
+%% OnGetItemColumnImage = (This, Item, Column) -> integer()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlcreate">external documentation</a>.
+create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
+ when is_list(Options) ->
+  ?CLASS(ThisT,wxListCtrl),
+  ?CLASS(ParentT,wxWindow),
+  MOpts = fun({winid, Winid}, Acc) -> [<<1:32/?UI,Winid:32/?UI>>|Acc];
+          ({pos, {PosX,PosY}}, Acc) -> [<<2:32/?UI,PosX:32/?UI,PosY:32/?UI,0:32>>|Acc];
+          ({size, {SizeW,SizeH}}, Acc) -> [<<3:32/?UI,SizeW:32/?UI,SizeH:32/?UI,0:32>>|Acc];
+          ({style, Style}, Acc) -> [<<4:32/?UI,Style:32/?UI>>|Acc];
+          ({validator, #wx_ref{type=ValidatorT,ref=ValidatorRef}}, Acc) ->   ?CLASS(ValidatorT,wx),[<<5:32/?UI,ValidatorRef:32/?UI>>|Acc];
+          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
+  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
+  wxe_util:call(~s,
+  <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
+
+Create>>
diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl
index 2f20c42a5d..209de48496 100644
--- a/lib/wx/api_gen/wx_gen.erl
+++ b/lib/wx/api_gen/wx_gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -30,6 +30,12 @@
 
 -compile(export_all).
 
+-define(DBGCF(Class, Func, Format, Args),
+	case {get(current_class), get(current_func)} of
+	    {Class, Func} -> io:format("~p:~p: " ++ Format, [?MODULE,?LINE] ++ Args);
+	    _ -> ok
+	end).
+
 code() ->  safe(fun gen_code/0,true).
 xml()  ->  safe(fun gen_xml/0,true). 
 
@@ -38,7 +44,7 @@ devcode() -> erase(),safe(fun gen_code/0,false).
 safe(What, QuitOnErr) ->
     try 
 	What(),
-	io:format("Completed succesfully~n~n", []),
+	io:format("Completed successfully~n~n", []),
 	QuitOnErr andalso gen_util:halt(0)
     catch Err:Reason ->
 	    io:format("Error in ~p ~p~n", [get(current_class),get(current_func)]),
@@ -957,17 +963,17 @@ erl_skip_opt(All=[Ms=[{_,{Len,_,_},_}|_]|R],Acc1=[{_,{N,_,_},_}|_], Acc2) ->
     end;
 erl_skip_opt([],Acc1,Acc2) -> [strip_ti(Acc1)|Acc2].
 
-erl_skip_opt2([F={_,{N,In,_},M=#method{where=Where}}|Ms],Acc1,Acc2,Check) -> 
+erl_skip_opt2([F={_,{N,In,_},M=#method{where=Where}}|Ms],Acc1,Acc2,Check) ->
     case N > 0 andalso lists:last(In) =:= opt_list of
-	true when Where =/= merged_c, Where =/= taylormade -> 
-	    case Check of 
-		[] -> 
+	true when Where =/= merged_c, Where =/= taylormade ->
+	    case Check of
+		[] ->
 		    erl_skip_opt2(Ms,[F|Acc1],[M#method{where=erl_no_opt}|Acc2],[]);
-		_  -> 
+		_  ->
 		    Skipped = reverse(tl(reverse(In))),
 		    T = fun({_,{_,Args,_},_}) -> true =:= types_differ(Skipped,Args) end,
 		    case lists:all(T, Check) of
-			true -> 
+			true ->
 			    erl_skip_opt2(Ms,[F|Acc1],
 					  [M#method{where=erl_no_opt}|Acc2],
 					  Check);
@@ -976,7 +982,7 @@ erl_skip_opt2([F={_,{N,In,_},M=#method{where=Where}}|Ms],Acc1,Acc2,Check) ->
 		    end
 	    end;
  	_ ->
-	    erl_skip_opt2(Ms,[F|Acc1],Acc2,[])
+	    erl_skip_opt2(Ms,[F|Acc1],Acc2,Check)
     end;
 erl_skip_opt2([],Acc1,Acc2,_) -> {Acc1,Acc2}.
 
@@ -1025,7 +1031,6 @@ types_differ([{class,C1}|R1], [{class,C2}|R2]) ->
 	true -> 
 	    true;
 	false -> 
-%%	_ ->
 	    {class,C1,C2};
 	{class,C1,C2} -> 
 	    {class,C1,C2};
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index 4b33068d8f..4632fdbffe 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -19,7 +19,7 @@
 %%%-------------------------------------------------------------------
 %%% File    : wx_gen_cpp.erl
 %%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created : 19 Feb 2007 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
@@ -35,7 +35,7 @@
 		   args/3, strip_name/2]).
 -import(wx_gen, [next_id/1]).
 
-gen(Defs) ->   
+gen(Defs) ->
     open_write("../c_src/gen/wxe_derived_dest.h"),
     c_copyright(),
     w("~n/***** This file is generated do not edit ****/~n~n", []),
@@ -49,48 +49,26 @@ gen(Defs) ->
 
     open_write("../c_src/gen/wxe_macros.h"),
     c_copyright(),
-    gen_macros(), 
+    gen_macros(),
     close(),
 
     open_write("../c_src/gen/wxe_init.cpp"),
     c_copyright(),
     build_enums(),
     close(),
-    
+
     build_events(),
     Res.
-	    
+
 gen_derived_dest(Defs) ->
     [gen_derived_dest_2(Class) || Class <- Defs],
-    
-    UglySkipList = ["wxCaret", "wxCalendarDateAttr", 
-		    "wxFileDataObject", "wxTextDataObject", "wxBitmapDataObject"
-		   ],
-
-    ?WTC("gen_derived_dest"),
-    w("void WxeApp::delete_object(void *ptr, wxeRefData *refd) {~n", []),
-    w(" switch(refd->type) {~n", []),
-    Case = fun(#class{name=Class, id=Id, abstract=IsAbs, parent=P}) when P /= "static" ->
-		   UglyWorkaround = lists:member(Class, UglySkipList),
-		   case hd(reverse(wx_gen_erl:parents(Class))) of
-		       root when IsAbs == false, UglyWorkaround == false ->
-			   w("  case ~p: delete (~s *) ptr; break;~n", [Id, Class]);
-		       root when IsAbs == false, UglyWorkaround == true ->
-			   w("  case ~p: /* delete (~s *) ptr;"
-			     "These objects must be deleted by owner object */ "
-			     "break;~n", [Id, Class]);
-		       _ -> ok
-		   end;
-	      (_) -> ok
-	   end,
-    [Case(Class) || Class <- Defs],
-    w("  default: delete (wxObject *) ptr;~n", []),
-    w("}}~n~n", []).
+    ok.
 
 gen_derived_dest_2(C=#class{name=Class}) ->
-    case is_derived(C) of
-	true -> 
-	    ?WTC("gen_derived_dest_2"),
+    ?WTC("gen_derived_dest_2"),
+    Derived = is_derived(C),
+    TaylorMade = taylormade_class(C),
+    if Derived andalso (TaylorMade =:= false) ->
 	    w("class E~s : public ~s {~n",[Class,Class]),
 	    case Class of
 		"wxGLCanvas" ->  %% Special for cleaning up gl context
@@ -101,15 +79,32 @@ gen_derived_dest_2(C=#class{name=Class}) ->
 	    end,
 	    gen_constructors(C),
 	    w("};~n~n", []);
-	false ->
+       TaylorMade /= false ->
+	    w("~s~n", [TaylorMade]);
+       true ->
 	    ignore
     end.
 
+taylormade_class(#class{name=CName, methods=Ms}) ->
+    TaylorMade = lists:any(fun([#method{where=taylormade}|_]) -> true;
+			      (_) -> false
+			   end, Ms),
+    case TaylorMade  of
+	false -> false;
+	true ->
+	    {ok, Bin} = file:read_file(filename:join([wx_extra, CName ++".c_src"])),
+	    Src = binary_to_list(Bin),
+	    case gen_util:get_taylor_made(Src, CName ++ "_class") of
+		nomatch ->   false;
+		{match, [Str0]} -> Str0
+	    end
+    end.
+
 gen_constructors(#class{name=Class, methods=Ms0}) ->
     Ms = lists:append(Ms0),
     Cs = lists:filter(fun(#method{method_type=MT}) -> MT =:= constructor end, Ms),
     [gen_constructor(Class, Const) || Const <- Cs].
-    
+
 gen_constructor(_Class, #method{where=merged_c}) -> ok;
 gen_constructor(_Class, #method{where=erl_no_opt}) -> ok;
 gen_constructor(Class, _M=#method{params=Ps}) ->
@@ -119,7 +114,7 @@ gen_constructor(Class, _M=#method{params=Ps}) ->
     HaveMergedType = fun(#param{type={merged,_,_,_,_,_,_}}) -> true; (_) -> false end,
     ?WTC("gen_constructor"),
     case lists:any(HaveMergedType, Ps) of
-	false -> 
+	false ->
 	    w(" E~s(~s) : ~s(~s) {};~n",
 	      [Class,args(Gen1,",",Ps),Class,args(CallA,",",Ps)]);
 	true ->
@@ -141,9 +136,9 @@ gen_type(#type{name=Type, ref=undefined, single=array, mod=Mod},_) ->
     mods(Mod) ++ to_string(Type) ++ " * ";
 gen_type(#type{name=Type, ref=undefined, mod=Mod},_) ->
     mods(Mod) ++ to_string(Type) ++ " ";
-gen_type({merged, _, T1, _,_, _T2,_}, 1) -> 
+gen_type({merged, _, T1, _,_, _T2,_}, 1) ->
     gen_type(T1,error);
-gen_type({merged, _, _T1,_, _, T2,_}, 2) -> 
+gen_type({merged, _, _T1,_, _, T2,_}, 2) ->
     gen_type(T2,error).
 
 gen_funcs(Defs) ->
@@ -168,7 +163,7 @@ gen_funcs(Defs) ->
 %%     w("  case WXE_REMOVE_PORT:~n", []),
 %%     w("   { destroyMemEnv(Ecmd.port); } break;~n", []),
     w("  case DESTROY_OBJECT: {~n"),
-    w("     wxObject *This = (wxObject *) getPtr(bp,memenv); "),   
+    w("     wxObject *This = (wxObject *) getPtr(bp,memenv); "),
     w("     if(This) {"),
     w("       ((WxeApp *) wxTheApp)->clearPtr((void *) This);~n"),
     w("       delete This; }~n  } break;~n"),
@@ -203,16 +198,39 @@ gen_funcs(Defs) ->
     w("    error.addTupleCount(2);~n"),
     w("    error.addTupleCount(3);~n"),
     w("    error.send();~n"),
-    w("}} /* The End */~n"),
+    w("}} /* The End */~n~n~n"),
+
+    UglySkipList = ["wxCaret", "wxCalendarDateAttr",
+		    "wxFileDataObject", "wxTextDataObject", "wxBitmapDataObject"
+		   ],
+
+    w("void WxeApp::delete_object(void *ptr, wxeRefData *refd) {~n", []),
+    w(" switch(refd->type) {~n", []),
+    Case = fun(#class{name=Class, id=Id, abstract=IsAbs, parent=P}) when P /= "static" ->
+		   UglyWorkaround = lists:member(Class, UglySkipList),
+		   case hd(reverse(wx_gen_erl:parents(Class))) of
+		       root when IsAbs == false, UglyWorkaround == false ->
+			   w("  case ~p: delete (~s *) ptr; break;~n", [Id, Class]);
+		       root when IsAbs == false, UglyWorkaround == true ->
+			   w("  case ~p: /* delete (~s *) ptr;"
+			     "These objects must be deleted by owner object */ "
+			     "break;~n", [Id, Class]);
+		       _ -> ok
+		   end;
+	      (_) -> ok
+	   end,
+    [Case(Class) || Class <- Defs],
+    w("  default: delete (wxObject *) ptr;~n", []),
+    w("}}~n~n", []),
     Res.
-		 
+
 gen_class(C=#class{name=Name,methods=Ms,options=Opts}) ->
     put(current_class, Name),
-    NewMs = 
+    NewMs =
 	case lists:member(taylormade, Opts) of
 	    true ->
 		{ok, Bin} = file:read_file(filename:join([wx_extra,Name++".c_src"])),
-        ?WTC("gen_class"),
+		?WTC("gen_class"),
 		w("~s~n", [binary_to_list(Bin)]),
 		Ms;
 	    false ->
@@ -220,13 +238,13 @@ gen_class(C=#class{name=Name,methods=Ms,options=Opts}) ->
 		    {value, {ifdef, What}} ->
 			w("#if ~p~n",[What]),
 			Methods = lists:flatten(Ms),
-			MsR = [gen_method(Name,M) || 
+			MsR = [gen_method(Name,M) ||
 				  M <- lists:keysort(#method.id, Methods)],
 			w("#endif // ~p~n",[What]),
 			MsR;
 		    false ->
 			Methods = lists:flatten(Ms),
-			[gen_method(Name,M) || 
+			[gen_method(Name,M) ||
 			    M <- lists:keysort(#method.id, Methods)]
 		end
 	end,
@@ -234,15 +252,19 @@ gen_class(C=#class{name=Name,methods=Ms,options=Opts}) ->
     C#class{methods=NewMs}.
 
 gen_method(_CName, M=#method{where=erl_no_opt}) ->     M;
-gen_method(CName, M=#method{where=taylormade, name=Name, id=Id}) ->     
+gen_method(CName, M=#method{where=taylormade, name=Name, id=Id}) ->
     {ok, Bin} = file:read_file(filename:join([wx_extra, CName ++".c_src"])),
-    Str0 = binary_to_list(Bin),
+    Src = binary_to_list(Bin),
     %%    io:format("C++ Class ~p ~p~n", [CName, Name]),
-    
-    {match, [Str1]} = re:run(Str0, "<<"++Name++"(.*)"++Name++">>",
-			   [dotall, {capture, all_but_first, list}]),
+    Str = case gen_util:get_taylor_made(Src, Name) of
+	      nomatch ->
+		  {match, [Str0]} = gen_util:get_taylor_made(Src, wx_gen_erl:get_unique_name(Id)),
+		  Str0;
+	      {match, [Str0]} ->
+		  Str0
+	  end,
     ?WTC("gen_method"),
-    w(Str1, [wx_gen_erl:get_unique_name(Id)]),
+    w(Str, [wx_gen_erl:get_unique_name(Id)]),
     M;
 gen_method(CName, M=#method{name=N,params=[Ps],method_type=destructor,id=MethodId}) ->
     case hd(reverse(wx_gen_erl:parents(CName))) of
@@ -253,7 +275,7 @@ gen_method(CName, M=#method{name=N,params=[Ps],method_type=destructor,id=MethodI
 	    w(" if(This) {", []),
 	    w("   ((WxeApp *) wxTheApp)->clearPtr((void *) This);~n", []),
 	    w("   delete This;}~n", []),
-	    free_args(), 
+	    free_args(),
 	    w(" break;~n}~n", []);
 	object ->  %% Use default
 	    ignore
@@ -266,7 +288,7 @@ gen_method(CName,  M=#method{name=N,params=Ps0,type=T,method_type=MT,id=MethodId
     w("case ~s: { // ~s::~s~n", [wx_gen_erl:get_unique_name(MethodId),CName,N]),
     Ps1 = declare_variables(void, Ps0),
     {Ps2,Align} = decode_arguments(Ps1),
-    Opts = [Opt || Opt = #param{def=Def,in=In,where=Where} <- Ps2, 
+    Opts = [Opt || Opt = #param{def=Def,in=In,where=Where} <- Ps2,
 		   Def =/= none, In =/= false, Where =/= c],
     decode_options(Opts, Align),
     case gen_util:get_hook(c, M#method.pre_hook) of
@@ -292,7 +314,7 @@ declare_variables(T, Ps) ->
 
 declare_var(P = #param{where=erl}) -> P;
 declare_var(P = #param{where=this}) -> P;
-declare_var(P = #param{name=Name,def=Def,type=Type,in=true}) when Def =/= none -> 
+declare_var(P = #param{name=Name,def=Def,type=Type,in=true}) when Def =/= none ->
     declare_type(Name, true, Def, Type),
     P;
 declare_var(P = #param{in=In}) when In =/= false -> P;
@@ -304,7 +326,7 @@ declare_type(N,false,_,#type{name="wxArrayInt"}) ->
     w(" wxArrayInt ~s;~n", [N]);
 declare_type(N,false,_,#type{name="wxArrayString"}) ->
     w(" wxArrayString ~s;~n", [N]);
-declare_type(N,false,_,#type{base=Base,single=true,name=Type,by_val=false,mod=Mod}) 
+declare_type(N,false,_,#type{base=Base,single=true,name=Type,by_val=false,mod=Mod})
   when Base =:= int; Base =:= long; Base =:= float; Base =:= double ->
     w(" ~s~s ~s;~n", [mods(Mod),Type,N]);
 declare_type(N,false,_,#type{base={enum,_},single=true,name=Type,by_val=false,mod=Mod}) ->
@@ -315,7 +337,7 @@ declare_type(N,false,_,#type{name="wxDateTime"}) ->
     w(" wxDateTime ~s;~n", [N]);
 declare_type(N,false,_,#type{name=Type, base=int64, ref=reference}) ->
     w(" ~s ~s;~n", [Type,N]);
-declare_type(N,true,Def,#type{base=Base,single=true,name=Type,by_val=true}) 
+declare_type(N,true,Def,#type{base=Base,single=true,name=Type,by_val=true})
   when Base =:= int; Base =:= long; Base =:= float; Base =:= double; Base =:= bool ->
     w(" ~s ~s=~s;~n", [Type,N,Def]);
 declare_type(N,true,Def,#type{base={comp,_,_},single=true,name=Type,mod=Mod,ref={pointer,1}}) ->
@@ -328,7 +350,7 @@ declare_type(N,true,Def,#type{base={class,_},single=true,name=Type,ref={pointer,
     w(" ~s~s * ~s=~s;~n", [mods(Mod),Type,N,Def]);
 declare_type(N,true,Def,#type{base={class,_},single=true,name=Type,ref=reference,mod=Mod}) ->
     w(" ~s~s * ~s= &~s;~n", [mods(Mod),Type,N,Def]);
-declare_type(N,true,Def,#type{base=Base,single=true,name=Type,by_val=false,ref={pointer,1}}) 
+declare_type(N,true,Def,#type{base=Base,single=true,name=Type,by_val=false,ref={pointer,1}})
   when Base =:= int; Base =:= long; Base =:= float; Base =:= double; Base =:= bool ->
     w(" ~s *~s=~s;~n", [Type,N,Def]);
 declare_type(N,true,Def,#type{single=true,name="wxArtClient"}) ->
@@ -345,7 +367,7 @@ declare_type(N,true,Def,#type{name=Type, ref={pointer,2}}) ->
     %% xxxx
     w(" ~s ** ~s = ~s;~n", [Type,N,Def]);
 declare_type(N,true,Def,#type{name=Type, single=array, ref={pointer,1}}) ->
-    w(" int * ~sLen = 0;~n", [N]),    
+    w(" int * ~sLen = 0;~n", [N]),
     w(" ~s * ~s = ~s;~n", [Type,N,Def]);
 declare_type(N,true,"",#type{name="wxArrayString", single=array, ref=reference}) ->
     w(" wxArrayString ~s;~n", [N]);
@@ -363,12 +385,12 @@ decode_options(Opts, Align) ->
 
 decode_opt(#param{name=Name,type=Type}, N) ->
     w("  case ~p: {bp += 4;~n", [N]),
-    Align = decode_arg(Name,Type,opt,1), 
+    Align = decode_arg(Name,Type,opt,1),
     align(Align, 64),
     w("  } break;~n", []),
     N+1.
 
-decode_arguments(Ps0) -> 
+decode_arguments(Ps0) ->
     lists:mapfoldl(fun decode_arg/2,0,Ps0).
 
 store_free(N) ->
@@ -380,7 +402,7 @@ store_free(N) ->
 free_args() ->
     case get(free_args) of
         undefined -> ignore;
-        List -> 
+        List ->
 	    erase(free_args),
             [w(" driver_free(~s);~n", [Arg]) || Arg <- List]
     end.
@@ -388,7 +410,7 @@ free_args() ->
 decode_arg(P = #param{where=erl},A) -> {P,A};
 decode_arg(P = #param{where=c},A) ->  {P,A};
 decode_arg(P = #param{in=false},A) -> {P,A};
-decode_arg(P = #param{def=Def},A) when Def =/= none -> {P,A}; 
+decode_arg(P = #param{def=Def},A) when Def =/= none -> {P,A};
 decode_arg(P = #param{name=Name,type=Type},A0) ->
     A = decode_arg(Name, Type, arg, A0),
     {P, A}.
@@ -426,22 +448,22 @@ decode_arg(N,#type{base=float,single=true,name=Type},arg,A0) ->
     align(A0,32);
 decode_arg(N,#type{base=double,single=true,name=Type},Arg,A0) ->
     A = align(A0,64),
-    case Arg of 
+    case Arg of
 	arg -> w(" ~s * ~s = (~s *) bp; bp += 8;~n", [Type,N,Type]);
 	opt -> w(" ~s = * (~s *) bp; bp += 8;~n",    [N,Type])
     end,
     A;
 decode_arg(N,#type{base=bool,single=true,name=Type},Arg,A0) ->
-    case Arg of 
+    case Arg of
 	arg -> w(" bool * ~s = (~s *) bp; bp += 4;~n", [N,Type]);
 	opt -> w(" ~s = *(~s *) bp; bp += 4;~n", [N,Type])
     end,
     align(A0,32);
 decode_arg(N,#type{base={enum,Type},single=true},Arg,A0) ->
-    wa(" ~s ", [enum_type(Type)], "~s = *(~s *) bp; bp += 4;;~n",[N, enum_type(Type)], Arg), 
+    wa(" ~s ", [enum_type(Type)], "~s = *(~s *) bp; bp += 4;;~n",[N, enum_type(Type)], Arg),
     align(A0,32);
 decode_arg(N,#type{base={comp,"wxDateTime",List},single=true,name=Type,ref=Ref},Arg,A0) ->
-    Decl = fun({int,Spec}) -> 
+    Decl = fun({int,Spec}) ->
 		   w(" int * ~s~s = (int *) bp; bp += 4;~n", [N,Spec])
 	   end,
     align(A0,32),
@@ -452,15 +474,15 @@ decode_arg(N,#type{base={comp,"wxDateTime",List},single=true,name=Type,ref=Ref},
 	   end,
     case Arg of
 	arg -> w(" ~s ~s = ~s(~s);~n", [Type,N,Type,args(Name, ",", List)]);
-	opt when Ref =:= {pointer,1} -> 
-	    w(" ~sTmp = ~s(~s); ~s = & ~sTmp;~n", 
+	opt when Ref =:= {pointer,1} ->
+	    w(" ~sTmp = ~s(~s); ~s = & ~sTmp;~n",
 	      [N,Type,args(Name, ",", List), N,N]);
 	opt ->
 	    w(" ~s = ~s(~s);~n", [N,Type,args(Name, ",", List)])
     end,
     (A0+length(List)) rem 2;
 decode_arg(N,#type{base={comp,_,List},single=true,name=Type,ref=Ref},Arg,A0) ->
-    Decl = fun({int,Spec}) -> 
+    Decl = fun({int,Spec}) ->
 		   w(" int * ~s~s = (int *) bp; bp += 4;~n", [N,Spec]);
 	      ({double, Spec}) ->
 		   w(" wxDouble * ~s~s = (wxDouble *) bp; bp += 8;~n", [N,Spec])
@@ -473,8 +495,8 @@ decode_arg(N,#type{base={comp,_,List},single=true,name=Type,ref=Ref},Arg,A0) ->
     Name = fun({_,Spec}) -> "*"++N++Spec end,
     case Arg of
 	arg -> w(" ~s ~s = ~s(~s);~n", [Type,N,Type,args(Name, ",", List)]);
-	opt when Ref =:= {pointer,1} -> 
-	    w(" ~sTmp = ~s(~s); ~s = & ~sTmp;~n", 
+	opt when Ref =:= {pointer,1} ->
+	    w(" ~sTmp = ~s(~s); ~s = & ~sTmp;~n",
 	      [N,Type,args(Name, ",", List), N,N]);
 	opt ->
 	    w(" ~s = ~s(~s);~n", [N,Type,args(Name, ",", List)])
@@ -483,7 +505,7 @@ decode_arg(N,#type{base={comp,_,List},single=true,name=Type,ref=Ref},Arg,A0) ->
 	{int, _} ->    (A0+length(List)) rem 2;
 	{double, _} -> 0
     end;
-  
+
 decode_arg(N,#type{name=Class="wxTreeItemId",single=true},Arg,A0) ->
     A = align(A0,64),
     wa(" ~s ",[Class],"~s = wxTreeItemId((void *) *(wxUint64 *) bp); bp += 8;~n",[N],Arg),
@@ -492,7 +514,7 @@ decode_arg(N,#type{name=Class="wxTreeItemIdValue",single=true},Arg,A0) ->
     A = align(A0,64),
     wa(" ~s ",[Class],"~s = (~s) * (wxUint64 *) bp; bp += 8;~n",[N,Class],Arg),
     A;
-decode_arg(N,#type{name="wxChar", single=S},Arg,A0) 
+decode_arg(N,#type{name="wxChar", single=S},Arg,A0)
   when S =/= true ->
     w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),
     wa(" wxString", []," ~s = wxString(bp, wxConvUTF8);~n", [N],Arg),
@@ -501,7 +523,7 @@ decode_arg(N,#type{name="wxChar", single=S},Arg,A0)
 decode_arg(N,#type{base=string, name="wxFileName"},Arg,A0)  ->
     w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),
     wa(" wxString", []," ~sStr = wxString(bp, wxConvUTF8);~n", [N],Arg),
-    w(" bp += *~sLen+((8-((~p+ *~sLen) & 7)) & 7);~n", [N,4*((A0+1) rem 2),N]),    
+    w(" bp += *~sLen+((8-((~p+ *~sLen) & 7)) & 7);~n", [N,4*((A0+1) rem 2),N]),
     w(" wxFileName ~s = wxFileName(~sStr);~n",[N,N]),
     0;
 decode_arg(N,#type{base=string},Arg,A0)  ->
@@ -541,7 +563,7 @@ decode_arg(N,#type{name="wxArrayDouble"},arg,A0) ->
 decode_arg(_N,#type{base=eventType},_Arg,A0) ->
 %%     w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),
 %%     case Arg of
-%% 	arg -> 
+%% 	arg ->
 %% 	    w(" int ~s = wxeEventTypeFromAtom(bp);bp += *~sLen;~n",[N,N]),
 %% 	    w(" char *class_name = bp;~n", []),
 %% 	    w(" wxeCallbackData * Evt_cb = new wxeCallbackData(Ecmd.caller,This,class_name);~n",
@@ -551,7 +573,7 @@ decode_arg(_N,#type{base=eventType},_Arg,A0) ->
 decode_arg(N,#type{name=Type,base=binary,mod=Mod0},Arg,A0) ->
     Mod = mods([M || M <- Mod0]),
     case Arg of
-	arg -> 
+	arg ->
 	    w(" ~s~s * ~s = (~s~s*) Ecmd.bin[~p]->base;~n",
 	      [Mod,Type,N,Mod,Type, next_id(bin_count)]);
 	opt ->
@@ -564,10 +586,10 @@ decode_arg(N,#type{base={term,"wxTreeItemData"},mod=Mod0},Arg,A0) ->
     Type = "wxETreeItemData",
     BinCnt = next_id(bin_count),
     case Arg of
-	arg -> 
+	arg ->
 	    w(" ~s~s * ~s =  new ~s(Ecmd.bin[~p]->size, Ecmd.bin[~p]->base);~n",
 	      [Mod,Type,N,Type,BinCnt,BinCnt]);
-	opt -> 
+	opt ->
 	    w(" ~s = new ~s(Ecmd.bin[~p]->size, Ecmd.bin[~p]->base);~n",
 	      [N,Type,BinCnt,BinCnt])
     end,
@@ -576,10 +598,10 @@ decode_arg(N,#type{name=Type,base={term,_},mod=Mod0},Arg,A0) ->
     Mod = mods([M || M <- Mod0]),
     BinCnt = next_id(bin_count),
     case Arg of
-	arg -> 
+	arg ->
 	    w(" ~s~s * ~s =  new ~s(Ecmd.bin[~p]);~n",
 	      [Mod,Type,N,Type,BinCnt]);
-	opt -> 
+	opt ->
 	    w(" ~s = new ~s(Ecmd.bin[~p]);~n",
 	      [N,Type,BinCnt])
     end,
@@ -588,17 +610,17 @@ decode_arg(N,#type{single=array,base=int},Arg,A0)  ->
     case Arg of
 	arg ->
 	    w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),
-	    w(" int * ~s = (int *) bp; bp += *~sLen*4+((~p+ *~sLen)%2 )*4;~n", 
+	    w(" int * ~s = (int *) bp; bp += *~sLen*4+((~p+ *~sLen)%2 )*4;~n",
 	      [N,N,(A0+1) rem 2,N]);
-	opt ->	
+	opt ->
 	    w(" ~sLen = (int *) bp; bp += 4;~n", [N]),
-	    w(" ~s = (int *) bp; bp += *~sLen*4+((~p+ *~sLen)%2 )*4;~n", 
+	    w(" ~s = (int *) bp; bp += *~sLen*4+((~p+ *~sLen)%2 )*4;~n",
 	      [N,N,(A0+1) rem 2,N])
     end,
     0;
 decode_arg(N,#type{by_val=true,single=array,base={comp,Class="wxPoint",_}},arg,A0) ->
-    w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),    
-    w(" ~s *~s;~n",[Class,N]), 
+    w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),
+    w(" ~s *~s;~n",[Class,N]),
     w(" ~s = (~s *) driver_alloc(sizeof(~s) * *~sLen);~n",[N,Class,Class,N]),
     store_free(N),
     w(" for(int i=0; i < *~sLen; i++) {~n", [N]),
@@ -629,13 +651,13 @@ decode_arg(Name,T, Arg,_A) ->
 align(0, 32) -> 1;
 align(1, 32) -> 0;
 align(0, 64) -> 0;
-align(1, 64) -> 
+align(1, 64) ->
     w(" bp += 4; /* Align */~n"),
     0;
 align(N,Sz) ->
     align(N rem 2, Sz).
 
-call_wx(_N,{constructor,_},#type{base={class,RClass}},Ps) -> 
+call_wx(_N,{constructor,_},#type{base={class,RClass}},Ps) ->
     #class{id=Id} = ClassDef = get({class,RClass}),
     Class = case is_derived(ClassDef) of
 		true ->  "E" ++ RClass;
@@ -648,8 +670,8 @@ call_wx(_N,{constructor,_},#type{base={class,RClass}},Ps) ->
 		    case is_dialog(RClass) of
 			true -> 2;   %% Dialogs must be closed first event before windows
 			false -> 0
-		    end;			
-		false -> 
+		    end;
+		false ->
 		    case hd(reverse(wx_gen_erl:parents(RClass))) of
 			root -> Id;
 			_ -> 1
@@ -682,10 +704,10 @@ call_wx(N,{static,Class},Type,Ps) ->
 return_res(void) -> {"", ""};
 return_res(Type = #type{mod=Mod}) ->
     case lists:member(const, Mod) of
- 	true -> 
-	    {Beg, End} = return_res1(Type), 
+	true ->
+	    {Beg, End} = return_res1(Type),
  	    {"const " ++ Beg, End};
-	_ -> 
+	_ ->
 	    return_res1(Type)
     end.
 
@@ -695,8 +717,8 @@ return_res1(#type{name=Type,ref={pointer,_}}) ->
     {Type ++ " * Result = (" ++ Type ++ "*)", ""};
 return_res1(#type{name=Type,single=true,ref=reference}) ->
     {Type ++ " * Result = &", ""};
-return_res1(#type{name=Type,single=true,by_val=true}) 
-  when is_atom(Type) -> 
+return_res1(#type{name=Type,single=true,by_val=true})
+  when is_atom(Type) ->
     {atom_to_list(Type) ++ " Result = ", ""};
 return_res1(#type{name=Type="wxArrayInt"}) ->
     {Type ++ " Result = ", ""};
@@ -705,19 +727,19 @@ return_res1(#type{name=Type,base={class,_},single=list,ref=reference}) ->
 return_res1(#type{name=Type,base={comp,_,_},single=array,by_val=true}) ->
     {Type ++ " Result = ", ""};
 return_res1(#type{name=Type,single=true,by_val=true, base={class, _}}) ->
-    %% Memory leak !!!!!!   XXXX BUGBUG FIXME or doument!!    
-    case Type of 
+    %% Memory leak !!!!!!   XXXX BUGBUG FIXME or doument!!
+    case Type of
 	"wxImage" ->  ok;
 	"wxFont"  ->  ok;
 	"wxBitmap" -> ok;
 	"wxIcon" ->   ok;
 	"wxGraphics" ++ _ -> ok;
 	_ ->
-	    io:format("~s::~s Building return value of temp ~s~n", 
+	    io:format("~s::~s Building return value of temp ~s~n",
 		      [get(current_class),get(current_func),Type])
     end,
     %% #class{id=Id} = get({class,Type}),
-    {Type ++ " * Result = new " ++ Type ++ "(", "); newPtr((void *) Result," 
+    {Type ++ " * Result = new " ++ Type ++ "(", "); newPtr((void *) Result,"
      ++ "3, memenv);"};
 return_res1(#type{base={enum,_Type},single=true,by_val=true}) ->
     {"int Result = " , ""};
@@ -730,7 +752,7 @@ return_res1(#type{name=Type,single=true,by_val=true}) ->
 
 filter(Ps) ->
     lists:filter(fun filter_arg/1, Ps).
-filter_arg(#param{where=erl}) -> false;	   
+filter_arg(#param{where=erl}) -> false;
 filter_arg(#param{where=this}) -> false;
 filter_arg(#param{}) -> true.
 %%filter_arg(#param{def=Def, in=In}) -> Def =:= none orelse In =:= false.
@@ -739,20 +761,20 @@ filter_arg(#param{}) -> true.
 call_arg(#param{where=c, alt={length,Alt}}) when is_list(Alt) ->
     "*" ++ Alt ++ "Len";
 call_arg(#param{where=c, alt={size,Id}}) when is_integer(Id) ->
-    %% It's a binary 
+    %% It's a binary
     "Ecmd.bin["++ integer_to_list(Id) ++ "]->size";
-call_arg(#param{name=N,def=Def,type=#type{name=Type,by_val=true,single=true,base=Base}}) 
-  when Base =:= int; Base =:= long; Base =:= float; Base =:= double; Base =:= bool -> 
+call_arg(#param{name=N,def=Def,type=#type{name=Type,by_val=true,single=true,base=Base}})
+  when Base =:= int; Base =:= long; Base =:= float; Base =:= double; Base =:= bool ->
     case Def of
 	none -> "(" ++ to_string(Type) ++ ") *" ++ N;
 	_ ->  N
     end;
 
-call_arg(#param{name=N,type=#type{base={enum,Type}, by_val=true,single=true}}) -> 
+call_arg(#param{name=N,type=#type{base={enum,Type}, by_val=true,single=true}}) ->
     "(" ++ enum_type(Type) ++") " ++ N;
 call_arg(#param{name=N,type=#type{base={class,_},by_val=true,single=true}}) -> "*" ++ N;
 call_arg(#param{name=N,type=#type{base={class,_},ref=reference,single=true}}) -> "*" ++ N;
-call_arg(#param{name=N,type=#type{base=eventType}}) -> 
+call_arg(#param{name=N,type=#type{base=eventType}}) ->
     N ++ ", (wxObjectEventFunction)(wxEventFunction) &WxeApp::handle_evt, Evt_cb, this";
 call_arg(#param{name=N,type=#type{by_val=true, single=_False}}) -> N;
 call_arg(#param{name=N,def=Def,type=#type{by_val=false, ref={pointer,2}}})
@@ -760,20 +782,20 @@ call_arg(#param{name=N,def=Def,type=#type{by_val=false, ref={pointer,2}}})
 call_arg(#param{name=N,type=#type{by_val=false, ref={pointer,2}}}) -> "&" ++ N;
 call_arg(#param{name=N,in=false,type=#type{ref=reference, single=true}}) -> N;
 call_arg(#param{name=N,in=false,type=#type{by_val=false, single=true}}) -> "&" ++ N;
-call_arg(#param{name=N,def=Def,type=#type{base={comp,_,_},ref={pointer,1},single=true}}) 
+call_arg(#param{name=N,def=Def,type=#type{base={comp,_,_},ref={pointer,1},single=true}})
   when Def =:= none ->
     "&" ++N;
 call_arg(#param{name=N,type=#type{by_val=false}}) -> N;
 call_arg(#param{name=N,type={merged,_,#type{base={class,_},single=true,
 					    by_val=ByVal,
-					    ref=Ref},_,_,_,_}}) 
-  when ByVal =:= true; Ref =:= reference -> 
+					    ref=Ref},_,_,_,_}})
+  when ByVal =:= true; Ref =:= reference ->
     "*" ++ N;
-call_arg(#param{def=Def, type=void}) when Def =/= none -> Def;  
+call_arg(#param{def=Def, type=void}) when Def =/= none -> Def;
 call_arg(#param{name=N,type=#type{base={ref,_},by_val=true,single=true}}) -> N;
 call_arg(#param{name=N,type={merged,_,_,_,_,_,_}}) -> N.
 
-%% call_arg(#param{name=N,type=#type{base=Tuple,ref=reference}}) 
+%% call_arg(#param{name=N,type=#type{base=Tuple,ref=reference}})
 %%   when is_tuple(Tuple) -> "&" ++ N;
 
 to_string(Type) when is_atom(Type) -> atom_to_list(Type);
@@ -781,19 +803,19 @@ to_string(Type) when is_list(Type) -> Type.
 
 virtual_dest(#class{abstract=true, parent="root"}) -> false;
 virtual_dest(#class{abstract=true, parent="object"}) -> true;
-virtual_dest(#class{abstract=true, parent=Parent}) ->  
+virtual_dest(#class{abstract=true, parent=Parent}) ->
     virtual_dest(get({class,Parent}));
 virtual_dest(#class{methods=Ms, parent=Parent}) ->
     case lists:keysearch(destructor,#method.method_type, lists:append(Ms)) of
 	{value, #method{method_type=destructor, virtual=Virtual}} ->
 	    case Virtual of
-		undefined -> 
+		undefined ->
 		    case get({class,Parent}) of
-			undefined -> 
+			undefined ->
 			    case Parent of
-				"object" -> 
+				"object" ->
 				    true;
-				"root"   -> 
+				"root"   ->
 				    false;
 				_ ->
 				    io:format("Error: ~p~n",[Parent]),
@@ -802,10 +824,10 @@ virtual_dest(#class{methods=Ms, parent=Parent}) ->
 			PClass ->
 			    virtual_dest(PClass)
 		    end;
-		_ -> 
+		_ ->
 		    Virtual
 	    end;
-	false -> 
+	false ->
 	    false
     end.
 
@@ -819,24 +841,24 @@ is_derived(#class{abstract=true}) -> false;
 is_derived(C = #class{}) -> virtual_dest(C).
 
 is_window(Class) ->
-    lists:member("wxWindow", wx_gen_erl:parents(Class)).    
+    lists:member("wxWindow", wx_gen_erl:parents(Class)).
 
 is_dialog(Class) ->
     lists:member("wxDialog", wx_gen_erl:parents(Class)).
-   
+
 build_return_vals(Type,Ps) ->
     HaveType = case Type of  void -> 0; _ -> 1 end,
     NoOut = lists:sum([1 || #param{in=In} <- Ps, In =/= true]) + HaveType,
     OutTupSz = if NoOut > 1 -> NoOut; true -> 0 end,
-    
+
     build_ret_types(Type,Ps),
-    if 
+    if
 	OutTupSz > 1 -> w(" rt.addTupleCount(~p);~n",[OutTupSz]);
 	true -> ignore
-    end,	    
+    end,
     Ps.
 
-build_ret_types(void,Ps) -> 
+build_ret_types(void,Ps) ->
     Calc = fun(#param{name=N,in=False,type=T}, Free) when False =/= true ->
 		   case build_ret(N, False, T) of
 		       ok -> Free;
@@ -845,7 +867,7 @@ build_ret_types(void,Ps) ->
 	      (_, Free) -> Free
 	   end,
     lists:foldl(Calc, [], Ps);
-build_ret_types(Type,Ps) -> 
+build_ret_types(Type,Ps) ->
     Free = case build_ret("Result", out, Type) of
 	       ok -> [];
 	       FreeStr -> [FreeStr]
@@ -854,8 +876,8 @@ build_ret_types(Type,Ps) ->
 		   case build_ret(N, False, T) of
 		       ok -> FreeAcc;
 		       FreeMe -> [FreeMe|FreeAcc]
-		   end;	      
-	      (_, FreeAcc) -> FreeAcc 
+		   end;
+	      (_, FreeAcc) -> FreeAcc
 	   end,
     lists:foldl(Calc, Free, Ps).
 
@@ -898,17 +920,17 @@ build_ret(Name,_,#type{name="wxArrayInt"}) ->
 build_ret(Name,_,#type{base={comp,_,_},single=array}) ->
     w(" for(unsigned int i=0; i < ~s.GetCount(); i++) {~n", [Name]),
     w("  rt.add(~s[i]);~n }~n",[Name]),
-    w(" rt.endList(~s.GetCount());~n",[Name]);    
+    w(" rt.endList(~s.GetCount());~n",[Name]);
 build_ret(Name,_,#type{name=List,single=list,base={class,Class}}) ->
     w(" int i=0;~n"),
     w(" for(~s::const_iterator it = ~s.begin(); it != ~s.end(); ++it) {~n",
       [List, Name, Name]),
     w("   ~s * ~sTmp = *it;~n", [Class,Name]),
     w("   rt.addRef(getRef((void *)~sTmp,memenv), \"~s\"); i++;}~n",[Name,Class]),
-    w(" rt.endList(~s.GetCount());~n",[Name]);    
-    
+    w(" rt.endList(~s.GetCount());~n",[Name]);
+
 build_ret(Name,_,#type{name="wxArrayTreeItemIds"}) ->
-    w(" for(unsigned int i=0; i < ~s.GetCount(); i++) {~n", [Name]),   
+    w(" for(unsigned int i=0; i < ~s.GetCount(); i++) {~n", [Name]),
     w("    rt.add((wxUIntPtr *)~s[i].m_pItem);}~n",[Name]),
     w(" rt.endList(~s.GetCount());~n",[Name]);
 
@@ -923,10 +945,10 @@ build_ret(Name,_,#type{name="wxArrayString", single=array}) ->
     w(" rt.add(~s);~n", [Name]);
 build_ret(Name,In,T) ->
     ?error({nyi, Name,In, T}).
-		 
+
 mods([const|R]) -> "const " ++ mods(R);
 mods([unsigned|R]) -> "unsigned " ++ mods(R);
-mods([]) -> "".   
+mods([]) -> "".
 
 build_enums() ->
     Tree = get(consts),
@@ -935,13 +957,13 @@ build_enums() ->
     w("#include \"../wxe_impl.h\"~n"),
     w("#include \"wxe_macros.h\"~n"),
     w("#include \"../wxe_return.h\"~n"),
-    w("void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {~n"), 
+    w("void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {~n"),
     NotConsts = [NC || NC = #const{is_const=false} <- gb_trees:values(Tree)],
     Size = length(NotConsts),
     GVars = get(gvars),
     GSize = length(GVars),
     w("  wxeReturn rt = wxeReturn(WXE_DRV_PORT, caller);~n"),
-    w(" rt.addAtom((char*)\"wx_consts\");~n"),    
+    w(" rt.addAtom((char*)\"wx_consts\");~n"),
     [build_enum(NConst) || NConst <- lists:keysort(#const.val, NotConsts)],
     _Cnt = foldl(fun(Gvar, I) -> build_gvar(Gvar,I) end, 0, lists:sort(GVars)),
     w(" rt.endList(~p);~n", [Size+GSize]),
@@ -968,9 +990,9 @@ build_gvar({Name, Class, _Id}, Cnt) ->
     Cnt+1.
 
 gen_macros() ->
-    w("#include <wx/caret.h>~n"),   %% Arrg wxw forgot?? some files 
-    w("#include <wx/tooltip.h>~n"), 
-    w("#include <wx/gbsizer.h>~n"), 
+    w("#include <wx/caret.h>~n"),   %% Arrg wxw forgot?? some files
+    w("#include <wx/tooltip.h>~n"),
+    w("#include <wx/gbsizer.h>~n"),
     w("#include <wx/splash.h>~n"),
     w("#include <wx/grid.h>~n"),
     w("#include <wx/image.h>~n"),
@@ -995,15 +1017,15 @@ gen_macros() ->
     w("#include <wx/stc/stc.h>~n"),
     w("#include <wx/minifram.h>~n"),
     w("#include <wx/sashwin.h>~n"),
-    w("#include <wx/laywin.h>~n"), 
-    w("#include <wx/graphics.h>~n"), 
-    w("#include <wx/aui/aui.h>~n"), 
-    w("#include <wx/datectrl.h>~n"), 
-    w("#include <wx/filepicker.h>~n"), 
-    w("#include <wx/fontpicker.h>~n"), 
-    w("#include <wx/clrpicker.h>~n"), 
-    w("#include <wx/statline.h>~n"), 
-    w("#include <wx/clipbrd.h>~n"), 
+    w("#include <wx/laywin.h>~n"),
+    w("#include <wx/graphics.h>~n"),
+    w("#include <wx/aui/aui.h>~n"),
+    w("#include <wx/datectrl.h>~n"),
+    w("#include <wx/filepicker.h>~n"),
+    w("#include <wx/fontpicker.h>~n"),
+    w("#include <wx/clrpicker.h>~n"),
+    w("#include <wx/statline.h>~n"),
+    w("#include <wx/clipbrd.h>~n"),
     w("#include <wx/splitter.h>~n"),
     w("#include <wx/choicebk.h>~n"),
     w("#include <wx/toolbook.h>~n"),
@@ -1012,14 +1034,14 @@ gen_macros() ->
     w("#include <wx/html/htmlwin.h>~n"),
     w("#include <wx/html/htmlcell.h>~n"),
     w("#include <wx/filename.h>~n"),
-    
+
     w("~n~n", []),
     w("#ifndef wxICON_DEFAULT_BITMAP_TYPE~n",[]),
     w("  #define wxICON_DEFAULT_BITMAP_TYPE wxBITMAP_TYPE_ICO_RESOURCE~n",[]),
     w("#endif~n", []),
     w("~n~n", []),
 
-    [w("#define ~s_~s ~p~n", [Class,Name,Id]) || 
+    [w("#define ~s_~s ~p~n", [Class,Name,Id]) ||
 	{Class,Name,_,Id} <- wx_gen_erl:get_unique_names()],
     w("~n~n").
 
@@ -1032,29 +1054,29 @@ build_events() ->
     w("#include \"wxe_macros.h\"~n"),
     w("#include \"../wxe_events.h\"~n~n"),
     w("#include \"../wxe_return.h\"~n~n"),
-    
+
     w("wxeEtype::wxeEtype(const char *name, int Id) {eName = name;cID = Id;}~n~n"),
     w("WX_DECLARE_HASH_MAP(int, wxeEtype*, wxIntegerHash, wxIntegerEqual, wxeETmap );~n~n"),
-    
+
     w("wxeETmap etmap;~n~n"),
-    
+
     w(
 "int wxeEventTypeFromAtom(char *etype_atom) {
   wxeETmap::iterator it;
   for(it = etmap.begin(); it != etmap.end(); ++it) {
        wxeEtype * value = it->second;
-       if(strcmp(value->eName, etype_atom) == 0) { 
-	 if(it->first > wxEVT_USER_FIRST) {	   
+       if(strcmp(value->eName, etype_atom) == 0) {
+	 if(it->first > wxEVT_USER_FIRST) {
 	       return it->first - wxEVT_USER_FIRST;
 	    } else {
 	       return it->first;
 	    }
        }
-  }   
-  return -1; 
+  }
+  return -1;
 }
 
-"), 
+"),
 
     Evs0 = [C || {_,C=#class{event=Evs}} <- get(), Evs =/= false],
     Evs = lists:keysort(#class.id, Evs0),
@@ -1067,7 +1089,7 @@ initEventTable(Evs) ->
     w("  struct { ",[]),
     w("int ev_type;  int class_id; const char * ev_name;} event_types[] =~n  {~n",[]),
 
-    lists:foreach(fun(Ev) -> init_event_classes(Ev) end, 
+    lists:foreach(fun(Ev) -> init_event_classes(Ev) end,
 		  [#class{id=0,event=[wxEVT_NULL]}|Evs]),
     w("   {-1, 0, ""}~n  };~n",[]),
     w("  for(int i=0; event_types[i].ev_type != -1; i++) {~n",[]),
@@ -1085,7 +1107,7 @@ initEventTable(Evs) ->
       "     }~n"
       "  }~n", []),
     w("}~n~n").
-    
+
 init_event_classes(#class{event=ETs, id=Id}) ->
     F = fun({Eev, Cev, OtherClass}) ->
 		w("   {~w + wxEVT_USER_FIRST, ~w, ~p},~n",
@@ -1105,7 +1127,7 @@ find_id(OtherClass) ->
     Class = get({class,atom_to_list(OtherClass)}),
     %%{value, Class} = lists:keysearch(atom_to_list(OtherClass), #class.name, All),
     Class#class.id.
-    
+
 encode_events(Evs) ->
     ?WTC("encode_events"),
     w("void wxeEvtListener::forward(wxEvent& event)~n"
@@ -1132,7 +1154,7 @@ encode_events(Evs) ->
       " wxeMemEnv *memenv = app->getMemEnv(port);~n"
       " if(!memenv) return 0;~n~n"
       " wxeReturn rt = wxeReturn(port, cb->listener);~n"),
-    
+
     w("~n rt.addAtom((char*)\"wx\");~n"
       " rt.addInt((int) event->GetId());~n"
       " rt.addRef(getRef((void *)(cb->obj), memenv), cb->class_name);~n"
@@ -1155,15 +1177,15 @@ encode_events(Evs) ->
     w("   app->clearPtr((void *) event);~n"),
     w(" } else {~n"),
     w("   send_res =  rt.send();~n"),
-    w("   if(cb->skip) event->Skip();~n"),  
+    w("   if(cb->skip) event->Skip();~n"),
     w(" };~n"),
     w(" return send_res;~n"),
     w(" }~n").
 
 encode_event(C = #class{name=Class, id=Id, options=Opts}) ->
     ?WTC("encode_event"),
-    case proplists:get_value("mixed_event", Opts) of 
-	undefined -> 
+    case proplists:get_value("mixed_event", Opts) of
+	undefined ->
 	    w("case ~p: {// ~s~n", [Id,Class]),
 	    encode_event2(C),
 	    ok;
@@ -1189,10 +1211,10 @@ encode_event2(Class = #class{name=Name}) ->
 
 build_event_attrs(ClassRec = #class{name=Class}) ->
     Attrs0 = wx_gen_erl:filter_attrs(ClassRec),
-    Rename = 
-	fun(Att = #param{name=Name,prot=public,acc=undefined}, {All,Use}) -> 
+    Rename =
+	fun(Att = #param{name=Name,prot=public,acc=undefined}, {All,Use}) ->
 		{[Att#param{name= "ev->" ++ Name}|All],Use};
-	   (Att = #param{acc=Acc}, {All,_}) -> 
+	   (Att = #param{acc=Acc}, {All,_}) ->
 		{[Att#param{name= "ev->" ++ Acc}|All], true}
 	end,
     case foldr(Rename,{[],false},Attrs0) of
@@ -1202,9 +1224,9 @@ build_event_attrs(ClassRec = #class{name=Class}) ->
 %% 	    Attrs;
 	{Attrs,_} ->
 	    w(" ~s * ev = (~s *) event;~n",[Class,Class]),
-	    FixClass = 
+	    FixClass =
 		fun(P=#param{name=N,acc=Acc,type=#type{single=Single,by_val=ByVal,
-						       base={class,C}}}) 
+						       base={class,C}}})
 		   when Acc =/= undefined ->
 			Var = var_name(N),
 			if Single, ByVal ->
@@ -1215,17 +1237,17 @@ build_event_attrs(ClassRec = #class{name=Class}) ->
 			end,
 			P#param{name=Var};
 		   (P) -> P
-		end, 
+		end,
 	    lists:map(FixClass, Attrs)
     end.
 
-var_name("ev->" ++ Name0) -> 
+var_name("ev->" ++ Name0) ->
     case reverse(Name0) of
 	")(" ++ Name -> reverse(Name);
 	_ -> Name0
     end;
 var_name(Name) -> Name.
-     
+
 enum_name({Class,Type}) ->
     uppercase_all(Class ++ "_" ++ Type);
 enum_name(Type) ->
diff --git a/lib/wx/api_gen/wx_gen_erl.erl b/lib/wx/api_gen/wx_gen_erl.erl
index e1201ab0d4..e882ae87ca 100644
--- a/lib/wx/api_gen/wx_gen_erl.erl
+++ b/lib/wx/api_gen/wx_gen_erl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -19,7 +19,7 @@
 %%%-------------------------------------------------------------------
 %%% File    : wx_gen_erl.erl
 %%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created : 25 Jan 2007 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
@@ -32,7 +32,7 @@
 
 -import(lists, [foldl/3,foldr/3,reverse/1, keysearch/3, map/2, filter/2]).
 -import(gen_util, [lowercase/1, lowercase_all/1, uppercase/1, uppercase_all/1,
-		   open_write/1, close/0, erl_copyright/0, w/2, 
+		   open_write/1, close/0, erl_copyright/0, w/2,
 		   args/3, args/4, strip_name/2]).
 
 gen(Defs) ->
@@ -42,9 +42,9 @@ gen(Defs) ->
     gen_enums_ints(),
     [gen_class(Class) || Class <- Defs],
     gen_funcnames().
-        
+
 gen_class(Class) ->
-    try 
+    try
 	gen_class1(Class)
     catch throw:skipped ->
 	    Class
@@ -52,10 +52,10 @@ gen_class(Class) ->
 
 gen_class1(C=#class{name=Name,parent="static",methods=Ms,options=_Opts}) ->
     open_write("../src/gen/wx_misc.erl"),
-    put(current_class, Name), 
+    put(current_class, Name),
     erl_copyright(),
     w("", []),
-    w("%% This file is generated DO NOT EDIT~n~n", []),    
+    w("%% This file is generated DO NOT EDIT~n~n", []),
     w("%% @doc See external documentation: "
       "<a href=\"http://www.wxwidgets.org/manuals/stable/wx_miscellany.html\">Misc</a>.\n\n",[]),
 
@@ -67,8 +67,8 @@ gen_class1(C=#class{name=Name,parent="static",methods=Ms,options=_Opts}) ->
     Exp = fun(M) -> gen_export(C,M) end,
     ExportList = lists:usort(lists:append(lists:map(Exp,reverse(Ms)))),
     w("-export([~s]).~n~n", [args(fun(EF) -> EF end, ",", ExportList, 60)]),
-    
-    
+
+
     Gen = fun(M) -> gen_method(Name,M) end,
     NewMs = lists:map(Gen,reverse(Ms)),
     close(),
@@ -79,13 +79,13 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
     case Opts of
 	["ignore"] -> throw(skipped);
 	_ -> ok
-    end,    
+    end,
     open_write("../src/gen/"++Name++".erl"),
-    put(current_class, Name), 
+    put(current_class, Name),
     erl_copyright(),
     w("", []),
-    w("%% This file is generated DO NOT EDIT~n~n", []),    
-    
+    w("%% This file is generated DO NOT EDIT~n~n", []),
+
     case lists:member(taylormade, Opts) of
 	true ->
 	    {ok, Bin} = file:read_file(filename:join([wx_extra, Name++".erl"])),
@@ -95,33 +95,33 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
 	    w("%% @doc See external documentation: "
 	      "<a href=\"http://www.wxwidgets.org/manuals/stable/wx_~s.html\">~s</a>.\n",
 	      [lowercase_all(Name), Name]),
-	    
+
 	    case C#class.doc of
 		undefined -> ignore;
 		Str -> w("%%~n%% ~s~n~n%%~n", [Str])
 	    end,
-	    
+
 	    case C#class.event of
 		false -> ignore;
 		Evs ->
 		    EvTypes = [event_type_name(Ev) || Ev <- Evs],
 		    EvStr = args(fun(Ev) -> "<em>"++Ev++"</em>" end, ", ", EvTypes),
-		    
+
 		    w("%% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>~n",[]),
 		    w("%% <dd>~s</dd></dl>~n", [EvStr]),
-		    w("%% See also the message variant {@link wxEvtHandler:~s(). #~s{}} event record type.~n", 
+		    w("%% See also the message variant {@link wxEvtHandler:~s(). #~s{}} event record type.~n",
 		      [event_rec_name(Name),event_rec_name(Name)]),
 		    w("%%~n",[]),
 		    ok
 	    end,
-	    
+
 	    Parents = parents(Parent),
 	    case [P || P <- Parents, P =/= root, P =/= object] of
 		[] -> ignore;
-		Ps -> 
+		Ps ->
 		    w("%% <p>This class is derived (and can use functions) from:~n", []),
 		    [w("%% <br />{@link ~s}~n", [P]) || P <- Ps],
-		    w("%% </p>~n",[])		    
+		    w("%% </p>~n",[])
 	    end,
 	    w("%% @type ~s().  An object reference, The representation is internal~n",[Name]),
 	    w("%% and can be changed without notice. It can't be used for comparsion~n", []),
@@ -137,17 +137,17 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
 	    Done0 = ["Destroy", "New", "Create", "destroy", "new", "create"],
 	    Done  = gb_sets:from_list(Done0 ++ [M|| #method{name=M} <- lists:append(Ms)]),
 	    {_, InExported} = gen_inherited(Parents, Done, []),
-	    w("-export([~s]).~n~n", [args(fun(EF) -> EF end, ",", 
-					  lists:usort(["parent_class/1"|InExported]), 
+	    w("-export([~s]).~n~n", [args(fun(EF) -> EF end, ",",
+					  lists:usort(["parent_class/1"|InExported]),
 					  60)]),
-    
+
 	    w("%% @hidden~n", []),
 	    parents_check(Parents),
-	    
+
 	    Gen = fun(M) -> gen_method(Name,M) end,
 	    NewMs = lists:map(Gen,reverse(Ms)),
-	    gen_dest(C, Ms),	    
-	    
+	    gen_dest(C, Ms),
+
 	    gen_inherited(Parents, Done, true)
     end,
 
@@ -203,26 +203,26 @@ gen_export(#class{name=Class,abstract=Abs},Ms0) ->
 	[] -> [];
 	[M=#method{where=taylormade}|_] ->
 	    [taylormade_export(Class, M)];
-	Ms -> 
+	Ms ->
 	    GetF = fun(#method{method_type=constructor,where=W,params=Ps}) ->
 			   {Args,Opts} = split_optional(Ps),
-			   OptLen = case Opts of 
-					[] -> 0; 
+			   OptLen = case Opts of
+					[] -> 0;
 					_ when W =:= erl_no_opt -> 0;
-					_ -> 1 
+					_ -> 1
 				    end,
 			   "new/" ++ integer_to_list(length(Args)+OptLen);
 		      (#method{method_type=destructor}) ->
-			   case Abs of 
-			       true -> []; 
+			   case Abs of
+			       true -> [];
 			       _ -> "destroy/1"
 			   end;
 		      (#method{name=N,alias=A,where=W, params=Ps}) ->
 			   {Args,Opts} = split_optional(Ps),
-			   OptLen = case Opts of 
-					[] -> 0; 
+			   OptLen = case Opts of
+					[] -> 0;
 					_ when W =:= erl_no_opt -> 0;
-					_ -> 1 
+					_ -> 1
 				    end,
 			   erl_func_name(N,A) ++ "/" ++ integer_to_list(length(Args) + OptLen)
 		   end,
@@ -235,10 +235,10 @@ gen_method(Class,Ms0) ->
     Res = filter(RemoveC, Ms0),
     case Res of
 	[] -> Ms0;
-	[M=#method{where=taylormade}|_] ->
-	    taylormade_func(Class, M),
+	[#method{where=taylormade}|_] ->
+	    taylormade_func(Class, Res),
 	    Ms0;
-	Ms -> 
+	Ms ->
  	    gen_doc(Class,Ms),
 	    gen_method1(Ms),
 	    Ms0
@@ -279,22 +279,22 @@ gen_method2(M=#method{name=N,alias=A,params=Ps,type=T,method_type=MT,id=MethodId
 	ignore -> skip;
 	_ -> w("  _Result =", [])
     end,
-    
+
     case have_return_vals(T, Ps) of
 	_ when MT =:= constructor ->
 	    w("  wxe_util:construct(~s,~n  <<~s~s>>)", [MId, MArgs,MOpts]);
 	true ->
 	    w("  wxe_util:call(~s,~n  <<~s~s>>)", [MId, MArgs,MOpts]);
-	false -> 
+	false ->
 	    w("  wxe_util:cast(~s,~n  <<~s~s>>)", [MId, MArgs,MOpts])
     end,
     case gen_util:get_hook(erl, M#method.post_hook) of
 	ignore -> skip;
-	Post -> 
+	Post ->
 	    w(",~n  ~s~n", [Post]),
 	    w("  _Result", [])
     end,
-   
+
     erase(current_func),
     M.
 
@@ -306,9 +306,9 @@ gen_dest(#class{name=CName,abstract=Abs}, Ms) ->
 	    case lists:keysearch(destructor,#method.method_type, lists:append(Ms)) of
 		{value, #method{method_type=destructor, id=Id}} ->
 		    case hd(reverse(parents(CName))) of
-			object -> 
+			object ->
 			    gen_dest2(CName, object);
-			root -> 
+			root ->
 			    gen_dest2(CName, Id)
 		    end;
 		false ->
@@ -320,7 +320,7 @@ gen_dest2(Class, Id) ->
     w("%% @spec (This::~s()) -> ok~n", [Class]),
     w("%% @doc Destroys this object, do not use object again~n", []),
     w("destroy(Obj=#wx_ref{type=Type}) ->~n", []),
-    w("  ?CLASS(Type,~s),~n",[Class]), 
+    w("  ?CLASS(Type,~s),~n",[Class]),
     case Id of
 	object ->
 	    w("  wxe_util:destroy(?DESTROY_OBJECT,Obj),~n  ok.~n", []);
@@ -341,14 +341,14 @@ gen_inherited([Parent|Ps], Done0, Exported0) ->
     gen_inherited(Ps, gb_sets:union(Done,Done0), Exported).
 
 gen_inherited_ms([[#method{name=Name,alias=A,params=Ps0,where=W,method_type=MT}|_]|R],
-		 Class,Skip,Done, Exported) 
-  when W =/= merged_c ->    
+		 Class,Skip,Done, Exported)
+  when W =/= merged_c ->
     case gb_sets:is_member(Name,Skip) of
 	false when MT =:= member, Exported =:= true ->
 	    Ps = [patch_param(P,all) || P <- Ps0],
 	    Opts = if W =:= erl_no_opt -> [];
-		      true -> 
-			   [Opt || Opt = #param{def=Def,in=In, where=Where} <- Ps, 
+		      true ->
+			   [Opt || Opt = #param{def=Def,in=In, where=Where} <- Ps,
 				   Def =/= none, In =/= false, Where =/= c]
 		   end,
 	    w("%% @hidden~n", []),
@@ -359,10 +359,10 @@ gen_inherited_ms([[#method{name=Name,alias=A,params=Ps0,where=W,method_type=MT}|
 	    gen_inherited_ms(R,Class, Skip, gb_sets:add(Name,Done), Exported);
 	false when MT =:= member, is_list(Exported) ->
 	    {Args,Opts} = split_optional(Ps0),
-	    OptLen = case Opts of 
-			 [] -> 0; 
+	    OptLen = case Opts of
+			 [] -> 0;
 			 _ when W =:= erl_no_opt -> 0;
-			 _ -> 1 
+			 _ -> 1
 		     end,
 	    Export = erl_func_name(Name,A) ++ "/" ++ integer_to_list(length(Args) + OptLen),
 	    gen_inherited_ms(R,Class,Skip, gb_sets:add(Name,Done), [Export|Exported]);
@@ -374,17 +374,21 @@ gen_inherited_ms([[_|Check]|R],Class,Skip, Done0,Exp) ->
 gen_inherited_ms([[]|R],Class,Skip,Done0,Exp) ->
     gen_inherited_ms(R,Class,Skip,Done0,Exp);
 gen_inherited_ms([], _, _Skip, Done,Exp) -> {Done,Exp}.
-    
+
 
 %%%%%%%%%%%%%%%
 
-taylormade_func(Class, #method{name=Name, id=Id}) ->
+taylormade_func(Class, [#method{name=Name, id=Id}|_]) ->
     {ok, Bin} = file:read_file(filename:join([wx_extra, Class ++".erl"])),
-    Str0 = binary_to_list(Bin),
-    {match, [Str1]} = re:run(Str0, "<<"++Name++"(.*)"++Name++">>",
-			     [dotall, {capture, all_but_first, list}]),
-    
-    w(Str1, ["?" ++ get_unique_name(Id)]),
+    Src = binary_to_list(Bin),
+    Str = case gen_util:get_taylor_made(Src, Name) of
+	      nomatch ->
+		  {match, [Str0]} = gen_util:get_taylor_made(Src, get_unique_name(Id)),
+		  Str0;
+	      {match, [Str0]} ->
+		  Str0
+	  end,
+    w(Str, ["?" ++ get_unique_name(Id)]),
     ok.
 
 taylormade_export(Class, #method{name=Name}) ->
@@ -398,12 +402,12 @@ taylormade_export(Class, #method{name=Name}) ->
 
 arg_type_tests([P|Ps], Mid0) ->
     case arg_type_test(P,"\n",Mid0) of
-	Mid0 -> 
+	Mid0 ->
 	    arg_type_tests(Ps, Mid0);
 	Mid ->  %% Already checked the other args
 	    Mid
     end;
-arg_type_tests([],Mid) -> Mid.        
+arg_type_tests([],Mid) -> Mid.
 
 arg_type_test(#param{where=c}, _, Acc) ->
     Acc;
@@ -412,7 +416,7 @@ arg_type_test(#param{name=Name0,in=In,type=#type{base={class,T},single=true},def
     Name = erl_arg_name(Name0),
     w("  ?CLASS(~sT,~s),~s", [Name,T,EOS]),
     Acc;
-arg_type_test(#param{name=Name0,in=In,type=#type{base={class,T}}, def=none},EOS,Acc) 
+arg_type_test(#param{name=Name0,in=In,type=#type{base={class,T}}, def=none},EOS,Acc)
   when In =/= false ->
     Name = erl_arg_name(Name0),
     w("  [?CLASS(~sT,~s) || #wx_ref{type=~sT} <- ~s],~s", [Name,T,Name,Name,EOS]),
@@ -420,35 +424,35 @@ arg_type_test(#param{name=Name0,in=In,type=#type{base={class,T}}, def=none},EOS,
 arg_type_test(#param{name=Name0,def=none,in=In,
 		     type={merged,
 			   M1, #type{base={class,T1},single=true},Ps1,
-			   M2, #type{base={class,T2},single=true},Ps2}}, EOS, _Acc) 
+			   M2, #type{base={class,T2},single=true},Ps2}}, EOS, _Acc)
   when In =/= false ->
     Name = erl_arg_name(Name0),
     Opname = Name++"OP",
     w("  ~s = case ?CLASS_T(~sT,~s) of~n     true ->\n       ", [Opname,Name,T1]),
-    lists:foreach(fun(Param) -> arg_type_test(Param,"\n       ", ignore) end, 
+    lists:foreach(fun(Param) -> arg_type_test(Param,"\n       ", ignore) end,
 		  element(1,split_optional(Ps1))),
     w("?~s;~n",[get_unique_name(M1)]),
     w("     _ -> ?CLASS(~sT,~s),\n       ",[Name,T2]),
     {Ps21,_} = split_optional(patchArgName(Ps2,Ps1)),
-    lists:foreach(fun(Param) -> arg_type_test(Param,"\n       ", ignore) end, 
+    lists:foreach(fun(Param) -> arg_type_test(Param,"\n       ", ignore) end,
 		  Ps21),
     w("?~s\n     end,~s",[get_unique_name(M2),EOS]),
     Opname;
-arg_type_test(#param{name=Name0, type=#type{base=eventType}}, EOS, Acc) -> 
+arg_type_test(#param{name=Name0, type=#type{base=eventType}}, EOS, Acc) ->
     Name = erl_arg_name(Name0),
     w("  ~sBin = list_to_binary([atom_to_list(~s)|[0]]),~s", [Name,Name,EOS]),
     w("  ThisTypeBin = list_to_binary([atom_to_list(ThisT)|[0]]),~s", [EOS]),
     Acc;
-arg_type_test(#param{name=Name0,def=none,type=#type{base={term,_}}}, EOS, Acc) -> 
+arg_type_test(#param{name=Name0,def=none,type=#type{base={term,_}}}, EOS, Acc) ->
     Name = erl_arg_name(Name0),
     w("  wxe_util:send_bin(term_to_binary(~s)),~s", [Name,EOS]),
     Acc;
-arg_type_test(#param{name=Name0,type=#type{base=binary}},EOS,Acc) -> 
+arg_type_test(#param{name=Name0,type=#type{base=binary}},EOS,Acc) ->
     Name = erl_arg_name(Name0),
     w("  wxe_util:send_bin(~s),~s", [Name,EOS]),
     Acc;
-arg_type_test(#param{name=Name0,type=#type{name=Type,base=Base,single=Single}},EOS,Acc) -> 
-    if 
+arg_type_test(#param{name=Name0,type=#type{name=Type,base=Base,single=Single}},EOS,Acc) ->
+    if
 	Type =:= "wxArtClient", Single =:= true ->
 	    Name = erl_arg_name(Name0),
 	    w("  ~s_UC = unicode:characters_to_binary([~s, $_, $C,0]),~s",
@@ -458,11 +462,11 @@ arg_type_test(#param{name=Name0,type=#type{name=Type,base=Base,single=Single}},E
 	    w("  ~s_UC = unicode:characters_to_binary([~s,0]),~s", [Name,Name,EOS]);
 	Type =:= "wxArrayString" ->
 	    Name = erl_arg_name(Name0),
-	    w("  ~s_UCA = [unicode:characters_to_binary([~sTemp,0]) || ~s", 
+	    w("  ~s_UCA = [unicode:characters_to_binary([~sTemp,0]) || ~s",
 	      [Name,Name, EOS]),
 	    w("              ~sTemp <- ~s],~s", [Name,Name,EOS]);
 	true -> %% Not a string
-	    ignore 
+	    ignore
     end,
     Acc;
 arg_type_test(_,_,Acc) -> Acc.
@@ -476,10 +480,10 @@ have_return_vals(void, Ps) ->
 have_return_vals(#type{}, _) -> true.
 
 gen_function_clause(Name0,MT,Ps,Optional,Variant) ->
-    PArg = fun(Arg) -> 
+    PArg = fun(Arg) ->
 		   case lists:member(name_only, Variant) of
 		       true -> func_arg_name(Arg);
-		       false -> 
+		       false ->
 			   case lists:member(name_type, Variant) of
 			       true ->
 				   Name = func_arg_name(Arg),
@@ -495,17 +499,17 @@ gen_function_clause(Name0,MT,Ps,Optional,Variant) ->
     Args = args(PArg, ",", Ps),
     Name = case MT of constructor -> "new"; _ -> Name0 end,
     w("~s(~s",[Name,Args]),
-    Opts = case Optional of 
+    Opts = case Optional of
 	       [] -> "";
 	       empty_list when Args =:= [] -> "[]";
 	       empty_list -> ", []";
 	       _ when Args =:= [] -> "Options";
-	       _ -> ", Options" 
+	       _ -> ", Options"
 	   end,
     w("~s)", [Opts]),
     case lists:member(no_guards, Variant) of
 	true ->  ok;
-	false -> 
+	false ->
 	    Guards = args(fun guard_test/1, ",", Ps),
 	    if
 		Guards =:= [], Opts =:= "" -> w(" ->~n", []);
@@ -517,10 +521,10 @@ gen_function_clause(Name0,MT,Ps,Optional,Variant) ->
 
 split_optional(Ps) ->
     split_optional(Ps, [], []).
-split_optional([P=#param{def=Def,in=In, where=Where}|Ps], Standard, Opts) 
+split_optional([P=#param{def=Def,in=In, where=Where}|Ps], Standard, Opts)
   when Def =/= none, In =/= false, Where =/= c ->
     split_optional(Ps, Standard, [P|Opts]);
-split_optional([P=#param{def=Def,in=In, where=Where}|Ps], Standard, Opts) 
+split_optional([P=#param{def=Def,in=In, where=Where}|Ps], Standard, Opts)
   when Def =:= none, In =/= false, Where =/= c ->
     split_optional(Ps, [P|Standard], Opts);
 split_optional([_|Ps], Standard, Opts) ->
@@ -532,24 +536,24 @@ patch_param(P=#param{type=#type{base=Tuple}}, all) when is_tuple(Tuple) ->
     P#param{type={class,ignore}};
 patch_param(P=#param{type={merged,_,_,_,_,_,_}}, _) ->
     P#param{type={class,ignore}};
-patch_param(P=#param{type=#type{base={class,_}}},_) -> 
+patch_param(P=#param{type=#type{base={class,_}}},_) ->
     P#param{type={class,ignore}};
-patch_param(P=#param{type=#type{base={ref,_}}},_) -> 
+patch_param(P=#param{type=#type{base={ref,_}}},_) ->
     P#param{type={class,ignore}};
 patch_param(P,_) -> P.
 
 func_arg_name(#param{def=Def}) when Def =/= none -> skip;
 func_arg_name(#param{in=false}) -> skip;
 func_arg_name(#param{where=c}) -> skip;
-func_arg_name(#param{name=Name}) -> 
+func_arg_name(#param{name=Name}) ->
     erl_arg_name(Name).
 
 func_arg(#param{def=Def}) when Def =/= none -> skip;
 func_arg(#param{in=false}) -> skip;
 func_arg(#param{where=c}) -> skip;
-func_arg(#param{name=Name,type=#type{base=string}}) -> 
+func_arg(#param{name=Name,type=#type{base=string}}) ->
     erl_arg_name(Name);
-func_arg(#param{name=Name,type=#type{name="wxArrayString"}}) -> 
+func_arg(#param{name=Name,type=#type{name="wxArrayString"}}) ->
     erl_arg_name(Name);
 func_arg(#param{name=Name0,type=#type{base={class,_CN}, single=true}}) ->
     Name = erl_arg_name(Name0),
@@ -570,7 +574,7 @@ func_arg(#param{name=Name,type=#type{base={comp,"wxDateTime",_Tup}, single=true}
 func_arg(#param{name=Name,type=#type{name="wxArtClient", single=true}}) ->
     erl_arg_name(Name);
 func_arg(#param{name=Name,type=#type{base={comp,_,Tup}, single=true}}) ->
-    N = erl_arg_name(Name),    
+    N = erl_arg_name(Name),
     Doc = fun({_,V}) -> erl_arg_name(N)++V end,
     "{" ++ args(Doc, ",", Tup) ++ "}";
 func_arg(#param{name=Name}) ->
@@ -587,7 +591,7 @@ guard_test(#param{name=N, type=#type{name="wxArtClient"}}) ->
     "is_list(" ++ erl_arg_name(N) ++")";
 guard_test(#param{name=N, type=#type{name="wxArrayString"}}) ->
     "is_list(" ++ erl_arg_name(N) ++")";
-guard_test(#param{name=Name,type=#type{single=Single}}) 
+guard_test(#param{name=Name,type=#type{single=Single}})
   when Single =/= true->
     "is_list(" ++ erl_arg_name(Name) ++  ")";
 guard_test(#param{name=N,type=#type{base=int}}) ->
@@ -637,42 +641,42 @@ gen_doc(_Class,[#method{name=N,alias=A,params=Ps,type=T,where=erl_no_opt,method_
     gen_function_clause(erl_func_name(N,A),MT,Ps,empty_list,[no_guards,name_only]);
 gen_doc(Class,[#method{name=N,params=Ps,type=T}])->
     {_, Optional} = split_optional(Ps),
-    NonDef = [Arg || Arg = #param{def=Def,in=In, where=Where} <- Ps, 
+    NonDef = [Arg || Arg = #param{def=Def,in=In, where=Where} <- Ps,
 		     Def =:= none, In =/= false, Where =/= c],
     OptsType = case Optional of
 		   [] -> "";
 		   _ when NonDef =:= [] -> "[Option]";
-		   _ -> ", [Option]"	       
+		   _ -> ", [Option]"
 	       end,
     w("%% @spec (~s~s) -> ~s~n",
       [doc_arg_types(Ps),OptsType,doc_return_types(T,Ps)]),
     doc_optional(Optional, normal),
-    DocEnum = doc_enum(T,Ps, normal),   
+    DocEnum = doc_enum(T,Ps, normal),
     case Class of
 	"utils" ->
 	    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#~s\">"
-	      "external documentation</a>.~n", 
+	      "external documentation</a>.~n",
 	      [lowercase_all(N)]);
 	_ ->
 	    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/stable/wx_~s.html#~s~s\">"
-	      "external documentation</a>.~n", 
+	      "external documentation</a>.~n",
 	      [lowercase_all(Class),lowercase_all(Class),lowercase_all(N)])
     end,
     doc_enum_desc(DocEnum);
 gen_doc(Class, Cs = [#method{name=N, alias=A,method_type=MT}|_]) ->
-    GetRet  = fun(#method{params=Ps,type=T}) -> 
+    GetRet  = fun(#method{params=Ps,type=T}) ->
 		      doc_return_types(T,Ps)
 	      end,
-    GetArgs = fun(#method{params=Ps, where=Where}) -> 
+    GetArgs = fun(#method{params=Ps, where=Where}) ->
 		      Opt = case Where of
 				erl_no_opt -> [];
-				_ -> 
+				_ ->
 				    case split_optional(Ps) of
 					{_, []} -> [];
 					_ ->  ["[Option]"]
 				    end
 			    end,
-		      [doc_arg_type(P) || 
+		      [doc_arg_type(P) ||
 			  P=#param{in=In,def=none,where=W} <- Ps,
 			  In =/= false, W =/= c] ++ Opt
 	      end,
@@ -682,16 +686,16 @@ gen_doc(Class, Cs = [#method{name=N, alias=A,method_type=MT}|_]) ->
     case Class of
 	"utils" ->
 	    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#~s\">"
-	      "external documentation</a>.~n", 
+	      "external documentation</a>.~n",
 	      [lowercase_all(N)]);
 	_ ->
 	    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/stable/wx_~s.html#~s~s\">"
-	      "external documentation</a>.~n", 
+	      "external documentation</a>.~n",
 	      [lowercase_all(Class),lowercase_all(Class),lowercase_all(N)])
     end,
     Name = case MT of constructor -> "new"; _ -> erl_func_name(N,A) end,
     w("%% <br /> Alternatives:~n",[]),
-    [gen_doc2(Name, Clause) || Clause <- Cs], 
+    [gen_doc2(Name, Clause) || Clause <- Cs],
     ok.
 
 gen_doc2(Name,#method{params=Ps,where=erl_no_opt,method_type=MT}) ->
@@ -704,11 +708,11 @@ gen_doc2(Name,#method{params=Ps,type=T}) ->
     OptsType = case Optional of
 		   [] -> "";
 		   _ when NonDef =:= [] -> "[Option]";
-		   _ -> ", [Option]"	       
+		   _ -> ", [Option]"
 	       end,
     w("%% <p><c>~n",[]),
     w("%% ~s(~s~s) -> ~s </c>~n",
-      [Name,doc_arg_types(Ps),OptsType,doc_return_types(T,Ps)]),    
+      [Name,doc_arg_types(Ps),OptsType,doc_return_types(T,Ps)]),
     doc_optional(Optional, xhtml),
     DocEnum = doc_enum(T,Ps, xhtml),
     doc_enum_desc(DocEnum),
@@ -717,7 +721,7 @@ gen_doc2(Name,#method{params=Ps,type=T}) ->
 doc_arg(ArgList) ->
     case all_eq(ArgList) of
 	true ->  hd(ArgList);
-	false -> 
+	false ->
 	    Get = fun(Str) ->
 			  [_Name|Types] = string:tokens(Str, ":"),
 			  case Types of
@@ -734,12 +738,12 @@ doc_arg(ArgList) ->
 doc_ret(ArgList) ->
     case all_eq(ArgList) of
 	true ->  hd(ArgList);
-	false -> 
+	false ->
 	    args(fun(A) -> A end, "|", ArgList)
     end.
 
 unique([], U) -> reverse(U);
-unique([H|R], U) -> 
+unique([H|R], U) ->
     case lists:member(H,U) of
 	false -> unique(R,[H|U]);
 	true  -> unique(R,U)
@@ -756,7 +760,7 @@ zip(List) ->
 
 zip([[F|L1]|List], Rest, AccL, Acc) ->
     zip(List, [L1|Rest], [F|AccL], Acc);
-zip(Empty, Rest, AccL, Acc) -> 
+zip(Empty, Rest, AccL, Acc) ->
     true = empty(Empty),
     case empty(Rest) andalso empty(AccL) of
 	true -> reverse(Acc);
@@ -779,7 +783,7 @@ doc_arg_type(_) -> skip.
 
 doc_arg_type2(T=#type{single=Single}) when Single =:= array; Single =:= list ->
     "[" ++ doc_arg_type3(T) ++ "]";
-doc_arg_type2(T) -> 
+doc_arg_type2(T) ->
     doc_arg_type3(T).
 
 doc_arg_type3(#type{base=string}) -> "string()";
@@ -799,8 +803,8 @@ doc_arg_type3(#type{base={binary,_}}) -> "binary()";
 doc_arg_type3(#type{base=eventType}) ->  "atom()";
 doc_arg_type3(#type{base={ref,N}}) ->     N++"()";
 doc_arg_type3(#type{base={term,_N}}) ->  "term()";
-doc_arg_type3(T=#type{base={class,N}}) -> 
-    check_class(T),   
+doc_arg_type3(T=#type{base={class,N}}) ->
+    check_class(T),
     case get(current_class) of
 	N -> N ++ "()";
 	_ ->  N++":" ++ N++"()"
@@ -809,7 +813,7 @@ doc_arg_type3({merged,_,T1=#type{base={class,N1}},_,_,T2=#type{base={class,N2}},
     check_class(T1),
     check_class(T2),
     Curr = get(current_class),
-    if 
+    if
 	N1 =:= Curr, N2 =:= Curr ->  N1++"() | "++ N2++"()";
 	N1 =:= Curr -> N1++"() | "++ N2++":" ++ N2++"()";
 	N2 =:= Curr -> N1++":" ++ N1++"() | "++ N2++"()";
@@ -824,7 +828,7 @@ doc_arg_type3(#type{base={comp,_,{record,Name}}}) ->
     "wx:" ++ atom_to_list(Name) ++ "()";
 doc_arg_type3(#type{base={comp,_,Tup}}) ->
     Doc = fun({int,V}) -> V ++ "::integer()";
-	     ({double,V}) -> V ++ "::float()" 
+	     ({double,V}) -> V ++ "::float()"
 	  end,
     "{" ++ args(Doc, ",", Tup) ++ "}";
 doc_arg_type3(T) -> ?error({unknown_type,T}).
@@ -834,7 +838,7 @@ doc_return_types(T, Ps) ->
 doc_return_types2(void, []) ->    "ok";
 doc_return_types2(void, [#param{type=T}]) ->     doc_arg_type2(T);
 doc_return_types2(T, []) ->                      doc_arg_type2(T);
-doc_return_types2(void, Ps) -> 
+doc_return_types2(void, Ps) ->
     "{" ++ args(fun doc_arg_type/1,",",Ps) ++ "}";
 doc_return_types2(T, Ps) ->
     "{" ++ doc_arg_type2(T) ++ "," ++ args(fun doc_arg_type/1,",",Ps) ++ "}".
@@ -887,7 +891,7 @@ check_name(Name) -> Name.
 
 marshal_opts([], _,_) -> "";     %% No opts skip this!
 marshal_opts(Opts, Align, Args) ->
-    w("  MOpts = fun", []), 
+    w("  MOpts = fun", []),
     marshal_opts1(Opts,1),
     w(";~n          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,~n", []),
     w("  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),~n", []),
@@ -896,7 +900,7 @@ marshal_opts(Opts, Align, Args) ->
 	[] -> Str;   % All Args are optional
 	_ ->    ", " ++ Str
     end.
-    
+
 marshal_opts1([P],N) ->
     marshal_opt(P,N);
 marshal_opts1([P|R],N) ->
@@ -909,15 +913,15 @@ marshal_opt(P0=#param{name=Name,type=Type},N) ->
     {Arg,Align} = marshal_arg(Type,erl_arg_name(Name),1),
     AStr = if Align =:= 0 -> "";
 	      Align =:= 1 -> ",0:32"
-	   end,	
-    w("({~s, ~s}, Acc) -> ", [erl_option_name(Name), func_arg(P)]), 
+	   end,
+    w("({~s, ~s}, Acc) -> ", [erl_option_name(Name), func_arg(P)]),
     arg_type_test(P,"",[]),
     case Arg of
-	skip -> 
+	skip ->
 	    w("[<<~p:32/?UI~s>>|Acc]", [N, AStr]);
-	_ -> 
+	_ ->
 	    w("[<<~p:32/?UI,~s~s>>|Acc]", [N, Arg,AStr])
-    end.   
+    end.
 marshal_args(Ps) ->
     marshal_args(Ps, [], 0).
 
@@ -957,23 +961,23 @@ marshal_arg(#type{single=true,base={enum,_Enum}}, Name, Align) ->
 
 marshal_arg(#type{single=true,base=bool}, Name, Align) ->
     align(32, Align, "(wxe_util:from_bool(" ++ Name ++ ")):32/?UI");
-marshal_arg(#type{name="wxChar", single=Single}, Name, Align0)  
+marshal_arg(#type{name="wxChar", single=Single}, Name, Align0)
   when Single =/= true ->
-    {Str,Align} = 
+    {Str,Align} =
 	align(32,Align0, "(byte_size("++Name++"_UC)):32/?UI,(" ++ Name ++ "_UC)/binary"),
     MsgSize = "(" ++ integer_to_list(Align*4)++"+byte_size("++Name++"_UC))",
     {Str++", 0:(((8- (" ++ MsgSize ++" band 16#7)) band 16#7))/unit:8",0};
 marshal_arg(#type{base=string}, Name, Align0) ->
-    {Str,Align} = 
+    {Str,Align} =
 	align(32,Align0, "(byte_size("++Name++"_UC)):32/?UI,(" ++ Name ++ "_UC)/binary"),
     MsgSize = "(" ++ integer_to_list(Align*4)++"+byte_size("++Name++"_UC))",
     {Str++", 0:(((8- (" ++ MsgSize ++" band 16#7)) band 16#7))/unit:8",0};
 marshal_arg(#type{name="wxArrayString"}, Name, Align0) ->
-    InnerBin  = "<<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>", 
+    InnerBin  = "<<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>",
     Outer =  "(<< " ++ InnerBin ++ "|| UC_Str <- "++ Name ++"_UCA>>)/binary",
     Str0  =  "(length("++Name++"_UCA)):32/?UI, " ++ Outer,
     {Str,Align} = align(32,Align0,Str0),
-    MsgSize = "("++integer_to_list(Align*4) ++ 
+    MsgSize = "("++integer_to_list(Align*4) ++
 	" + lists:sum([byte_size(S)+4||S<-" ++ Name ++"_UCA]))",
     AStr = ", 0:(((8- (" ++ MsgSize ++" band 16#7)) band 16#7))/unit:8",
     {Str ++ AStr, 0};
@@ -997,15 +1001,15 @@ marshal_arg(#type{base={term,_}}, _Name, Align0) ->
     {skip,Align0};
 marshal_arg(#type{base=binary}, _Name, Align0) ->
     {skip,Align0};
-marshal_arg(#type{base=Base, single=Single}, Name, Align0) 
+marshal_arg(#type{base=Base, single=Single}, Name, Align0)
   when Single =/= true ->
-    case Base of 
-	int -> 
+    case Base of
+	int ->
 	    Str0 = "(length("++Name++")):32/?UI,\n"
 		"        (<< <<C:32/?I>> || C <- "++Name++">>)/binary",
 	    {Str,Align} = align(32,Align0, Str0),
 	    {Str ++ ", 0:((("++integer_to_list(Align)++"+length("++Name++ ")) rem 2)*32)", 0};
-	{ObjRef,_} when ObjRef =:= class; ObjRef =:= ref -> 
+	{ObjRef,_} when ObjRef =:= class; ObjRef =:= ref ->
 	    Str0 = "(length("++Name++")):32/?UI,",
 	    Str1 = "\n     (<< <<(C#wx_ref.ref):32/?UI>> || C <- "++Name++">>)/binary",
 	    {Str2,Align} = align(32, Align0, Str1),
@@ -1033,7 +1037,7 @@ align(64, 0, Str) -> {Str, 0};
 align(64, 1, Str) -> {"0:32," ++ Str,0};
 align(Sz, W, Str) -> align(Sz, W rem 2, Str).
 
-enum_name(Name) -> 
+enum_name(Name) ->
     case string:tokens(Name, ":") of
 	[Name] -> Name;
 	[C,N] ->  C ++ "_" ++ N
@@ -1053,10 +1057,10 @@ gen_enums_ints() ->
       "        }).~n", []),
     w("~n%% Hardcoded Defines~n", []),
     Enums = [E || {{enum,_},E = #enum{as_atom=false}} <- get()],
-    w("-define(wxDefaultSize, {-1,-1}).~n", []), 
-    w("-define(wxDefaultPosition, {-1,-1}).~n", []), 
+    w("-define(wxDefaultSize, {-1,-1}).~n", []),
+    w("-define(wxDefaultPosition, {-1,-1}).~n", []),
     w("~n%% Global Variables~n", []),
-    [w("-define(~s,  wxe_util:get_const(~s)).~n", [Gvar, Gvar]) || 
+    [w("-define(~s,  wxe_util:get_const(~s)).~n", [Gvar, Gvar]) ||
 	{Gvar,_,_Id} <- get(gvars)],
     w("~n%% Enum and defines~n", []),
     foldl(fun(Enum= #enum{vals=Vals}, Done) when Vals =/= [] ->
@@ -1076,7 +1080,7 @@ build_enum_ints(#enum{from=From, vals=Vals},Done) ->
 	{_File, Class, Name} ->
 	    w("% From class ~s::~s~n",[Class, Name])
     end,
-    
+
     Format = fun(#const{name="wxEVT_" ++ _}) ->
 		     ignore; %% Ignore event macros they are not valid in our event model
 		(#const{name=Name,val=Value,is_const=true}) when is_integer(Value) ->
@@ -1100,12 +1104,12 @@ build_enum_ints(#enum{from=From, vals=Vals},Done) ->
     Consts = get(consts),
     Write = fun({Name,_What}, Skip) ->
 		    case gb_sets:is_member(Name,Skip) of
-			true -> 
+			true ->
 			    Skip;
 			false ->
 			    case gb_trees:lookup(Name, Consts) of
 				{value, Const} ->
-				    Format(Const), 
+				    Format(Const),
 				    gb_sets:add(Name,Skip);
 				none -> Skip
 			    end
@@ -1119,8 +1123,8 @@ gen_event_recs() ->
     w("", []),
     w("%% This file is generated DO NOT EDIT~n~n", []),
     w("%%  All event messages are encapsulated in a wx record~n"
-      "%%  they contain the widget id and a specialized event record.~n" 
-      "%%  Each event record may be sent for one or more event types.~n" 
+      "%%  they contain the widget id and a specialized event record.~n"
+      "%%  Each event record may be sent for one or more event types.~n"
       "%%  The mapping to wxWidgets is one record per class.~n~n",[]),
     w("%% @type wx() = #wx{id=integer(), obj=wx:wxObject(), userData=term(), event=Rec}. Rec is a event record.~n",[]),
     w("-record(wx, {id,     %% Integer Identity of object.~n"
@@ -1130,7 +1134,7 @@ gen_event_recs() ->
     w("%% Here comes the definitions of all event records.~n"
       "%% they contain the event type and possible some extra information.~n~n",[]),
     Types = [build_event_rec(C) || {_,C=#class{event=Evs}} <- get(), Evs =/= false],
-    w("%% @type wxEventType() = ~s.~n", 
+    w("%% @type wxEventType() = ~s.~n",
       [args(fun(Ev) -> Ev end, " | ", lists:sort(lists:append(Types)))]),
     %% close(), closed in gen_enums_ints
     ok.
@@ -1145,22 +1149,22 @@ find_inherited_attr(Param = {PName,_}, Name) ->
     end.
 
 filter_attrs(#class{name=Name, parent=Parent,attributes=Attrs}) ->
-    Attr1 = lists:foldl(fun(#param{acc=skip},Acc) -> Acc; 
+    Attr1 = lists:foldl(fun(#param{acc=skip},Acc) -> Acc;
 			   (P=#param{prot=public},Acc) -> [P|Acc];
-			   (#param{acc=undefined},Acc) -> Acc; 
+			   (#param{acc=undefined},Acc) -> Acc;
 			   ({inherited, PName},Acc) ->
 				case find_inherited_attr(PName, Parent) of
-				    undefined -> 
+				    undefined ->
 					io:format("~p:~p: Missing Event Attr ~p in ~p~n",
 						  [?MODULE,?LINE, PName, Name]),
 					Acc;
-				    P -> 
+				    P ->
 					[P|Acc]
 				end;
 			   (P, Acc) -> [P|Acc]
 			end, [], Attrs),
     lists:reverse(Attr1).
-   
+
 build_event_rec(Class=#class{name=Name, event=Evs}) ->
     EvTypes = [event_type_name(Ev) || Ev <- Evs],
     Str  = args(fun(Ev) -> "<em>"++Ev++"</em>" end, ", ", EvTypes),
@@ -1168,26 +1172,26 @@ build_event_rec(Class=#class{name=Name, event=Evs}) ->
     Rec = event_rec_name(Name),
     GetName = fun(#param{name=N}) ->event_attr_name(N) end,
     GetType = fun(#param{name=N,type=T}) ->
-		      event_attr_name(N) ++ "=" ++ doc_arg_type2(T) 
+		      event_attr_name(N) ++ "=" ++ doc_arg_type2(T)
 	      end,
     case Attr =:= [] of
-	true -> 
+	true ->
 	    w("%% @type ~s() = #~s{type=wxEventType()}.~n", [Rec,Rec]),
 	    w("%% <dl><dt>EventType:</dt> <dd>~s</dd></dl>~n",[Str]),
-%% 	    case is_command_event(Name) of 
+%% 	    case is_command_event(Name) of
 %% 		true  -> w("%% This event skips other event handlers.~n",[]);
 %% 		false -> w("%% This event will be handled by other handlers~n",[])
 %% 	    end,
 	    w("%% Callback event: {@link ~s}~n", [Name]),
 	    w("-record(~s, {type}).~n~n", [Rec]);
 	false ->
-	    w("%% @type ~s() = #~s{type=wxEventType(),~s}.~n", 
+	    w("%% @type ~s() = #~s{type=wxEventType(),~s}.~n",
 	      [Rec,Rec,args(GetType,",",Attr)]),
 	    w("%% <dl><dt>EventType:</dt> <dd>~s</dd></dl>~n",[Str]),
-%% 	    case is_command_event(Name) of 
+%% 	    case is_command_event(Name) of
 %% 		true -> w("%% This event skips other event handlers.~n",[]);
 %% 		false -> w("%% This event will be handled by other handlers~n",[])
-%% 	    end,	    
+%% 	    end,
 	    w("%% Callback event: {@link ~s}~n", [Name]),
 	    w("-record(~s,{type, ~s}).~n~n", [Rec,args(GetName,",",Attr)])
     end,
@@ -1198,7 +1202,7 @@ is_command_event(Name) ->
 	true -> true;
 	false -> false
     end.
-	    
+
 event_rec_name(Name0 = "wx" ++ _) ->
     "tnevE" ++ Name1 = reverse(Name0),
     reverse(Name1).
@@ -1215,7 +1219,7 @@ event_attr_name(Attr) ->
     lowercase(Attr).
 
 
-gen_funcnames() -> 
+gen_funcnames() ->
     open_write("../src/gen/wxe_debug.hrl"),
     erl_copyright(),
     w("%% This file is generated DO NOT EDIT~n~n", []),
@@ -1257,7 +1261,7 @@ unique_names(Ms0, Class) ->
     Ms  = split_list(fun(#method{name=N}, M) -> {N =:= M, N} end, undefined, Ms2),
     unique_names2(Ms,Class).
 %% by Names
-unique_names2([[#method{id=Id, name=Method,alias=Alias, max_arity=A}]|Ms], Class) -> 
+unique_names2([[#method{id=Id, name=Method,alias=Alias, max_arity=A}]|Ms], Class) ->
     [{Class,uname(alias(Method,Alias),Class),A,Id} | unique_names2(Ms,Class)];
 unique_names2([Ms0|RMs], Class) ->
     Split = fun(#method{max_arity=A}, P) -> {A =:= P, A} end,
@@ -1278,11 +1282,11 @@ unique_names4([], _, _Class) -> [].
 
 alias(Method, undefined) -> Method;
 alias(_, Alias) -> Alias.
-     
+
 uname(Class,Class) ->   "new";
 uname([$~ | _], _  ) -> "destruct";
 uname(Name, _) -> Name.
-       
+
 split_list(F, Keep, List) ->
     split_list(F, Keep, List, []).
 
@@ -1297,5 +1301,5 @@ split_list(F, Keep, [M|Ms], Acc) ->
     end;
 split_list(_, _, [], []) -> [];
 split_list(_, _, [], Acc) -> [lists:reverse(Acc)].
-   
+
 
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index aec8a4944a..8ee4451057 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -756,7 +756,9 @@
   'SetFirstItem']}.
 
 {class, wxListCtrl, wxControl, [],
- ['wxListCtrl','~wxListCtrl','Arrange','AssignImageList','ClearAll','Create',
+ [{'wxListCtrl', [{where, taylormade}]},
+  '~wxListCtrl','Arrange','AssignImageList','ClearAll',
+  {'Create',[{where, taylormade}]},
   'DeleteAllItems','DeleteColumn','DeleteItem',
   {'EditLabel',[{"textControlClass",nowhere}]},
   'EnsureVisible',
@@ -788,6 +790,13 @@
   'SetFont','SetId','SetImage','SetMask','SetState',
   'SetStateMask','SetText','SetTextColour','SetWidth']}.
 
+{class, wxListItemAttr, root, [],
+ ['wxListItemAttr','~wxListItemAttr',
+  'GetBackgroundColour', 'GetFont',
+  'GetTextColour', 'HasBackgroundColour', 'HasFont',
+  'HasTextColour', 'SetBackgroundColour', 'SetFont', 'SetTextColour'
+ ]}.
+
 {class, wxImageList, object, [{skip, [{'Create',1}]}], %% No create/0 on windows
  ['wxImageList','~wxImageList','Add','Create','Draw','GetBitmap','GetIcon','GetImageCount',
   'GetSize','Remove','RemoveAll','Replace']}.
diff --git a/lib/wx/c_src/egl_impl.cpp b/lib/wx/c_src/egl_impl.cpp
index e2dbbb73c4..6d873abc44 100644
--- a/lib/wx/c_src/egl_impl.cpp
+++ b/lib/wx/c_src/egl_impl.cpp
@@ -1,20 +1,20 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2010. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2011. 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.
- * 
- * %CopyrightEnd% 
+ *
+ * %CopyrightEnd%
  */
 
 #include <stdio.h>
@@ -35,8 +35,8 @@ void init_tess();
 void exit_tess();
 int load_gl_functions();
 
-/* **************************************************************************** 
- * OPENGL INITIALIZATION 
+/* ****************************************************************************
+ * OPENGL INITIALIZATION
  *****************************************************************************/
 
 int egl_initiated = 0;
@@ -51,7 +51,7 @@ void * dlsym(HMODULE Lib, const char *func) {
   void * funcp;
   if((funcp = (void *) GetProcAddress(Lib, func)))
     return funcp;
-  else 
+  else
     return (void *) wglGetProcAddress(func);
 }
 
@@ -73,14 +73,14 @@ typedef char DL_CHAR;
 #  define OPENGL_LIB "libGL.so"
 #  define OPENGLU_LIB "libGLU.so"
 # endif
-#endif 
+#endif
 extern "C" {
-DRIVER_INIT(EGL_DRIVER) {  
+DRIVER_INIT(EGL_DRIVER) {
   return NULL;
 }
 }
 
-int egl_init_opengl(void *erlCallbacks) 
+int egl_init_opengl(void *erlCallbacks)
 {
 #ifdef _WIN32
   driver_init((TWinDynDriverCallbacks *) erlCallbacks);
@@ -95,7 +95,7 @@ int egl_init_opengl(void *erlCallbacks)
 }
 
 int load_gl_functions() {
-  DL_CHAR * DLName = OPENGL_LIB;
+  DL_CHAR * DLName = (DL_CHAR *) OPENGL_LIB;
   DL_LIB_P LIBhandle = dlopen(DLName, RTLD_LAZY);
   //fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName);
   void * func = NULL;
@@ -127,13 +127,13 @@ int load_gl_functions() {
     fprintf(stderr, "Could NOT load OpenGL library: %s\r\n", DLName);
   };
 
-  DLName = OPENGLU_LIB;
+  DLName = (DL_CHAR *) OPENGLU_LIB;
   LIBhandle = dlopen(DLName, RTLD_LAZY);
   // fprintf(stderr, "Loading GLU: %s\r\n", (const char*)DLName);
   func = NULL;
 
   if(LIBhandle) {
-    for(i=0; glu_fns[i].name != NULL; i++) {      
+    for(i=0; glu_fns[i].name != NULL; i++) {
       if((func = dlsym(LIBhandle, glu_fns[i].name))) {
 	* (void **) (glu_fns[i].func) = func;
       } else {
@@ -201,7 +201,7 @@ egl_ogla_error(GLenum errorCode)
 void CALLBACK
 egl_ogla_combine(GLdouble coords[3],
 		 void* vertex_data[4],
-		 GLfloat w[4], 
+		 GLfloat w[4],
 		 void **dataOut)
 {
   GLdouble* vertex = tess_alloc_vertex;
@@ -226,7 +226,7 @@ egl_ogla_combine(GLdouble coords[3],
   *dataOut = vertex;
 }
 
-void init_tess() 
+void init_tess()
 {
   tess = gluNewTess();
 
@@ -237,7 +237,7 @@ void init_tess()
 
 }
 
-void exit_tess() 
+void exit_tess()
 {
   gluDeleteTess(tess);
 }
@@ -251,22 +251,22 @@ int erl_tess_impl(char* buff, ErlDrvPort port, ErlDrvTermData caller)
   int num_vertices;
   GLdouble *n;
   int n_pos, AP, res;
-  
+
   num_vertices = * (int *) buff; buff += 8; /* Align */
   n = (double *) buff; buff += 8*3;
 
-  bin = driver_alloc_binary(num_vertices*6*sizeof(GLdouble));  
+  bin = driver_alloc_binary(num_vertices*6*sizeof(GLdouble));
   new_vertices = tess_coords = (double *) bin->orig_bytes;
   memcpy(tess_coords,buff,num_vertices*3*sizeof(GLdouble));
   tess_alloc_vertex = tess_coords + num_vertices*3;
 
 #if 0
   fprintf(stderr, "n=%d\r\n", num_vertices);
-#endif 
+#endif
   vertices = (int *) driver_alloc(sizeof(int) * 16*num_vertices);
-  
+
   tess_vertices = vertices;
-  
+
   gluTessNormal(tess, n[0], n[1], n[2]);
   gluTessBeginPolygon(tess, 0);
   gluTessBeginContour(tess);
@@ -275,9 +275,9 @@ int erl_tess_impl(char* buff, ErlDrvPort port, ErlDrvTermData caller)
   }
   gluTessEndContour(tess);
   gluTessEndPolygon(tess);
-    
-  n_pos = (tess_vertices - vertices); 
-  
+
+  n_pos = (tess_vertices - vertices);
+
   AP = 0; ErlDrvTermData *rt;
   rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData) * (13+n_pos*2));
   rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -287,12 +287,12 @@ int erl_tess_impl(char* buff, ErlDrvPort port, ErlDrvTermData caller)
   };
   rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = n_pos+1;
 
-  rt[AP++] = ERL_DRV_BINARY; rt[AP++] = (ErlDrvTermData) bin; 
+  rt[AP++] = ERL_DRV_BINARY; rt[AP++] = (ErlDrvTermData) bin;
   rt[AP++] = (tess_alloc_vertex-new_vertices)*sizeof(GLdouble); rt[AP++] = 0;
-  
+
   rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2; // Return tuple {list, Bin}
   rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2; // Result tuple
-  
+
   res = driver_send_term(port,caller,rt,AP);
   /* fprintf(stderr, "List %d: %d %d %d \r\n",  */
   /* 	  res, */
diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h
index ad46a98c90..4e4aea098d 100644
--- a/lib/wx/c_src/gen/wxe_derived_dest.h
+++ b/lib/wx/c_src/gen/wxe_derived_dest.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. 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
@@ -362,10 +362,22 @@ class EwxListBox : public wxListBox {
  EwxListBox() : wxListBox() {};
 };
 
+
 class EwxListCtrl : public wxListCtrl {
- public: ~EwxListCtrl() {((WxeApp *)wxTheApp)->clearPtr(this);};
+ public: ~EwxListCtrl();
  EwxListCtrl(wxWindow * parent,wxWindowID winid,const wxPoint& pos,const wxSize& size,long style,const wxValidator& validator) : wxListCtrl(parent,winid,pos,size,style,validator) {};
  EwxListCtrl() : wxListCtrl() {};
+
+ int onGetItemText;
+ int onGetItemAttr;
+ int onGetItemColumnImage;
+ ErlDrvPort port;
+
+ private:
+ virtual wxString OnGetItemText(long item, long col) const;
+ virtual wxListItemAttr* OnGetItemAttr(long item) const;
+ virtual int OnGetItemImage(long item) const;
+ virtual int OnGetItemColumnImage(long item, long column) const;
 };
 
 class EwxListItem : public wxListItem {
@@ -715,28 +727,3 @@ class EwxHtmlWindow : public wxHtmlWindow {
  EwxHtmlWindow() : wxHtmlWindow() {};
 };
 
-void WxeApp::delete_object(void *ptr, wxeRefData *refd) {
- switch(refd->type) {
-  case 24: delete (wxGridCellBoolRenderer *) ptr; break;
-  case 25: delete (wxGridCellBoolEditor *) ptr; break;
-  case 26: delete (wxGridCellFloatRenderer *) ptr; break;
-  case 27: delete (wxGridCellFloatEditor *) ptr; break;
-  case 28: delete (wxGridCellStringRenderer *) ptr; break;
-  case 29: delete (wxGridCellTextEditor *) ptr; break;
-  case 30: delete (wxGridCellChoiceEditor *) ptr; break;
-  case 31: delete (wxGridCellNumberRenderer *) ptr; break;
-  case 32: delete (wxGridCellNumberEditor *) ptr; break;
-  case 61: delete (wxIconBundle *) ptr; break;
-  case 69: delete (wxAcceleratorEntry *) ptr; break;
-  case 70: /* delete (wxCaret *) ptr;These objects must be deleted by owner object */ break;
-  case 72: delete (wxSizerFlags *) ptr; break;
-  case 88: /* delete (wxCalendarDateAttr *) ptr;These objects must be deleted by owner object */ break;
-  case 102: delete (wxTextAttr *) ptr; break;
-  case 154: delete (wxAuiPaneInfo *) ptr; break;
-  case 211: /* delete (wxFileDataObject *) ptr;These objects must be deleted by owner object */ break;
-  case 212: /* delete (wxTextDataObject *) ptr;These objects must be deleted by owner object */ break;
-  case 213: /* delete (wxBitmapDataObject *) ptr;These objects must be deleted by owner object */ break;
-  case 223: delete (wxLogNull *) ptr; break;
-  default: delete (wxObject *) ptr;
-}}
-
diff --git a/lib/wx/c_src/gen/wxe_events.cpp b/lib/wx/c_src/gen/wxe_events.cpp
index 692eef858c..b9769318af 100644
--- a/lib/wx/c_src/gen/wxe_events.cpp
+++ b/lib/wx/c_src/gen/wxe_events.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. 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
@@ -37,15 +37,15 @@ int wxeEventTypeFromAtom(char *etype_atom) {
   wxeETmap::iterator it;
   for(it = etmap.begin(); it != etmap.end(); ++it) {
        wxeEtype * value = it->second;
-       if(strcmp(value->eName, etype_atom) == 0) { 
-	 if(it->first > wxEVT_USER_FIRST) {	   
+       if(strcmp(value->eName, etype_atom) == 0) {
+	 if(it->first > wxEVT_USER_FIRST) {
 	       return it->first - wxEVT_USER_FIRST;
 	    } else {
 	       return it->first;
 	    }
        }
-  }   
-  return -1; 
+  }
+  return -1;
 }
 
 void initEventTable()
@@ -53,254 +53,254 @@ void initEventTable()
   struct { int ev_type;  int class_id; const char * ev_name;} event_types[] =
   {
    {wxEVT_NULL, 0, "null"},
-   {wxEVT_COMMAND_BUTTON_CLICKED, 163, "command_button_clicked"},
-   {wxEVT_COMMAND_CHECKBOX_CLICKED, 163, "command_checkbox_clicked"},
-   {wxEVT_COMMAND_CHOICE_SELECTED, 163, "command_choice_selected"},
-   {wxEVT_COMMAND_LISTBOX_SELECTED, 163, "command_listbox_selected"},
-   {wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 163, "command_listbox_doubleclicked"},
-   {wxEVT_COMMAND_TEXT_UPDATED, 163, "command_text_updated"},
-   {wxEVT_COMMAND_TEXT_ENTER, 163, "command_text_enter"},
-   {wxEVT_COMMAND_MENU_SELECTED, 163, "command_menu_selected"},
-   {wxEVT_COMMAND_SLIDER_UPDATED, 163, "command_slider_updated"},
-   {wxEVT_COMMAND_RADIOBOX_SELECTED, 163, "command_radiobox_selected"},
-   {wxEVT_COMMAND_RADIOBUTTON_SELECTED, 163, "command_radiobutton_selected"},
-   {wxEVT_COMMAND_SCROLLBAR_UPDATED, 163, "command_scrollbar_updated"},
-   {wxEVT_COMMAND_VLBOX_SELECTED, 163, "command_vlbox_selected"},
-   {wxEVT_COMMAND_COMBOBOX_SELECTED, 163, "command_combobox_selected"},
-   {wxEVT_COMMAND_TOOL_RCLICKED, 163, "command_tool_rclicked"},
-   {wxEVT_COMMAND_TOOL_ENTER, 163, "command_tool_enter"},
-   {wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 163, "command_checklistbox_toggled"},
-   {wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 163, "command_togglebutton_clicked"},
-   {wxEVT_COMMAND_LEFT_CLICK, 163, "command_left_click"},
-   {wxEVT_COMMAND_LEFT_DCLICK, 163, "command_left_dclick"},
-   {wxEVT_COMMAND_RIGHT_CLICK, 163, "command_right_click"},
-   {wxEVT_COMMAND_SET_FOCUS, 163, "command_set_focus"},
-   {wxEVT_COMMAND_KILL_FOCUS, 163, "command_kill_focus"},
-   {wxEVT_COMMAND_ENTER, 163, "command_enter"},
-   {wxEVT_SCROLL_TOP, 164, "scroll_top"},
-   {wxEVT_SCROLL_BOTTOM, 164, "scroll_bottom"},
-   {wxEVT_SCROLL_LINEUP, 164, "scroll_lineup"},
-   {wxEVT_SCROLL_LINEDOWN, 164, "scroll_linedown"},
-   {wxEVT_SCROLL_PAGEUP, 164, "scroll_pageup"},
-   {wxEVT_SCROLL_PAGEDOWN, 164, "scroll_pagedown"},
-   {wxEVT_SCROLL_THUMBTRACK, 164, "scroll_thumbtrack"},
-   {wxEVT_SCROLL_THUMBRELEASE, 164, "scroll_thumbrelease"},
-   {wxEVT_SCROLL_CHANGED, 164, "scroll_changed"},
-   {wxEVT_SCROLLWIN_TOP, 165, "scrollwin_top"},
-   {wxEVT_SCROLLWIN_BOTTOM, 165, "scrollwin_bottom"},
-   {wxEVT_SCROLLWIN_LINEUP, 165, "scrollwin_lineup"},
-   {wxEVT_SCROLLWIN_LINEDOWN, 165, "scrollwin_linedown"},
-   {wxEVT_SCROLLWIN_PAGEUP, 165, "scrollwin_pageup"},
-   {wxEVT_SCROLLWIN_PAGEDOWN, 165, "scrollwin_pagedown"},
-   {wxEVT_SCROLLWIN_THUMBTRACK, 165, "scrollwin_thumbtrack"},
-   {wxEVT_SCROLLWIN_THUMBRELEASE, 165, "scrollwin_thumbrelease"},
-   {wxEVT_LEFT_DOWN, 166, "left_down"},
-   {wxEVT_LEFT_UP, 166, "left_up"},
-   {wxEVT_MIDDLE_DOWN, 166, "middle_down"},
-   {wxEVT_MIDDLE_UP, 166, "middle_up"},
-   {wxEVT_RIGHT_DOWN, 166, "right_down"},
-   {wxEVT_RIGHT_UP, 166, "right_up"},
-   {wxEVT_MOTION, 166, "motion"},
-   {wxEVT_ENTER_WINDOW, 166, "enter_window"},
-   {wxEVT_LEAVE_WINDOW, 166, "leave_window"},
-   {wxEVT_LEFT_DCLICK, 166, "left_dclick"},
-   {wxEVT_MIDDLE_DCLICK, 166, "middle_dclick"},
-   {wxEVT_RIGHT_DCLICK, 166, "right_dclick"},
-   {wxEVT_MOUSEWHEEL, 166, "mousewheel"},
-   {wxEVT_NC_LEFT_DOWN, 166, "nc_left_down"},
-   {wxEVT_NC_LEFT_UP, 166, "nc_left_up"},
-   {wxEVT_NC_MIDDLE_DOWN, 166, "nc_middle_down"},
-   {wxEVT_NC_MIDDLE_UP, 166, "nc_middle_up"},
-   {wxEVT_NC_RIGHT_DOWN, 166, "nc_right_down"},
-   {wxEVT_NC_RIGHT_UP, 166, "nc_right_up"},
-   {wxEVT_NC_MOTION, 166, "nc_motion"},
-   {wxEVT_NC_ENTER_WINDOW, 166, "nc_enter_window"},
-   {wxEVT_NC_LEAVE_WINDOW, 166, "nc_leave_window"},
-   {wxEVT_NC_LEFT_DCLICK, 166, "nc_left_dclick"},
-   {wxEVT_NC_MIDDLE_DCLICK, 166, "nc_middle_dclick"},
-   {wxEVT_NC_RIGHT_DCLICK, 166, "nc_right_dclick"},
-   {wxEVT_SET_CURSOR, 167, "set_cursor"},
-   {wxEVT_CHAR, 168, "char"},
-   {wxEVT_CHAR_HOOK, 168, "char_hook"},
-   {wxEVT_KEY_DOWN, 168, "key_down"},
-   {wxEVT_KEY_UP, 168, "key_up"},
-   {wxEVT_SIZE, 169, "size"},
-   {wxEVT_MOVE, 170, "move"},
-   {wxEVT_PAINT, 171, "paint"},
-   {wxEVT_PAINT_ICON, 171, "paint_icon"},
-   {wxEVT_NC_PAINT, 172, "nc_paint"},
-   {wxEVT_ERASE_BACKGROUND, 173, "erase_background"},
-   {wxEVT_SET_FOCUS, 174, "set_focus"},
-   {wxEVT_KILL_FOCUS, 174, "kill_focus"},
-   {wxEVT_CHILD_FOCUS, 175, "child_focus"},
-   {wxEVT_MENU_OPEN, 176, "menu_open"},
-   {wxEVT_MENU_CLOSE, 176, "menu_close"},
-   {wxEVT_MENU_HIGHLIGHT, 176, "menu_highlight"},
-   {wxEVT_CLOSE_WINDOW, 177, "close_window"},
-   {wxEVT_END_SESSION, 177, "end_session"},
-   {wxEVT_QUERY_END_SESSION, 177, "query_end_session"},
-   {wxEVT_SHOW, 178, "show"},
-   {wxEVT_ICONIZE, 179, "iconize"},
-   {wxEVT_MAXIMIZE, 180, "maximize"},
-   {wxEVT_JOY_BUTTON_DOWN, 181, "joy_button_down"},
-   {wxEVT_JOY_BUTTON_UP, 181, "joy_button_up"},
-   {wxEVT_JOY_MOVE, 181, "joy_move"},
-   {wxEVT_JOY_ZMOVE, 181, "joy_zmove"},
-   {wxEVT_UPDATE_UI, 182, "update_ui"},
-   {wxEVT_SYS_COLOUR_CHANGED, 183, "sys_colour_changed"},
-   {wxEVT_MOUSE_CAPTURE_CHANGED, 184, "mouse_capture_changed"},
-   {wxEVT_DISPLAY_CHANGED, 185, "display_changed"},
-   {wxEVT_PALETTE_CHANGED, 186, "palette_changed"},
-   {wxEVT_QUERY_NEW_PALETTE, 187, "query_new_palette"},
-   {wxEVT_NAVIGATION_KEY, 188, "navigation_key"},
-   {wxEVT_CREATE, 189, "create"},
-   {wxEVT_DESTROY, 190, "destroy"},
-   {wxEVT_HELP, 191, "help"},
-   {wxEVT_DETAILED_HELP, 191, "detailed_help"},
-   {wxEVT_CONTEXT_MENU, 192, "context_menu"},
-   {wxEVT_IDLE, 193, "idle"},
-   {wxEVT_GRID_CELL_LEFT_CLICK, 194, "grid_cell_left_click"},
-   {wxEVT_GRID_CELL_RIGHT_CLICK, 194, "grid_cell_right_click"},
-   {wxEVT_GRID_CELL_LEFT_DCLICK, 194, "grid_cell_left_dclick"},
-   {wxEVT_GRID_CELL_RIGHT_DCLICK, 194, "grid_cell_right_dclick"},
-   {wxEVT_GRID_LABEL_LEFT_CLICK, 194, "grid_label_left_click"},
-   {wxEVT_GRID_LABEL_RIGHT_CLICK, 194, "grid_label_right_click"},
-   {wxEVT_GRID_LABEL_LEFT_DCLICK, 194, "grid_label_left_dclick"},
-   {wxEVT_GRID_LABEL_RIGHT_DCLICK, 194, "grid_label_right_dclick"},
-   {wxEVT_GRID_ROW_SIZE, 194, "grid_row_size"},
-   {wxEVT_GRID_COL_SIZE, 194, "grid_col_size"},
-   {wxEVT_GRID_RANGE_SELECT, 194, "grid_range_select"},
-   {wxEVT_GRID_CELL_CHANGE, 194, "grid_cell_change"},
-   {wxEVT_GRID_SELECT_CELL, 194, "grid_select_cell"},
-   {wxEVT_GRID_EDITOR_SHOWN, 194, "grid_editor_shown"},
-   {wxEVT_GRID_EDITOR_HIDDEN, 194, "grid_editor_hidden"},
-   {wxEVT_GRID_EDITOR_CREATED, 194, "grid_editor_created"},
-   {wxEVT_GRID_CELL_BEGIN_DRAG, 194, "grid_cell_begin_drag"},
-   {wxEVT_SASH_DRAGGED, 196, "sash_dragged"},
-   {wxEVT_COMMAND_LIST_BEGIN_DRAG, 197, "command_list_begin_drag"},
-   {wxEVT_COMMAND_LIST_BEGIN_RDRAG, 197, "command_list_begin_rdrag"},
-   {wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, 197, "command_list_begin_label_edit"},
-   {wxEVT_COMMAND_LIST_END_LABEL_EDIT, 197, "command_list_end_label_edit"},
-   {wxEVT_COMMAND_LIST_DELETE_ITEM, 197, "command_list_delete_item"},
-   {wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 197, "command_list_delete_all_items"},
-   {wxEVT_COMMAND_LIST_KEY_DOWN, 197, "command_list_key_down"},
-   {wxEVT_COMMAND_LIST_INSERT_ITEM, 197, "command_list_insert_item"},
-   {wxEVT_COMMAND_LIST_COL_CLICK, 197, "command_list_col_click"},
-   {wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, 197, "command_list_col_right_click"},
-   {wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, 197, "command_list_col_begin_drag"},
-   {wxEVT_COMMAND_LIST_COL_DRAGGING, 197, "command_list_col_dragging"},
-   {wxEVT_COMMAND_LIST_COL_END_DRAG, 197, "command_list_col_end_drag"},
-   {wxEVT_COMMAND_LIST_ITEM_SELECTED, 197, "command_list_item_selected"},
-   {wxEVT_COMMAND_LIST_ITEM_DESELECTED, 197, "command_list_item_deselected"},
-   {wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, 197, "command_list_item_right_click"},
-   {wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, 197, "command_list_item_middle_click"},
-   {wxEVT_COMMAND_LIST_ITEM_ACTIVATED, 197, "command_list_item_activated"},
-   {wxEVT_COMMAND_LIST_ITEM_FOCUSED, 197, "command_list_item_focused"},
-   {wxEVT_COMMAND_LIST_CACHE_HINT, 197, "command_list_cache_hint"},
-   {wxEVT_DATE_CHANGED, 198, "date_changed"},
-   {wxEVT_CALENDAR_SEL_CHANGED, 199, "calendar_sel_changed"},
-   {wxEVT_CALENDAR_DAY_CHANGED, 199, "calendar_day_changed"},
-   {wxEVT_CALENDAR_MONTH_CHANGED, 199, "calendar_month_changed"},
-   {wxEVT_CALENDAR_YEAR_CHANGED, 199, "calendar_year_changed"},
-   {wxEVT_CALENDAR_DOUBLECLICKED, 199, "calendar_doubleclicked"},
-   {wxEVT_CALENDAR_WEEKDAY_CLICKED, 199, "calendar_weekday_clicked"},
-   {wxEVT_COMMAND_FILEPICKER_CHANGED, 200, "command_filepicker_changed"},
-   {wxEVT_COMMAND_DIRPICKER_CHANGED, 200, "command_dirpicker_changed"},
-   {wxEVT_COMMAND_COLOURPICKER_CHANGED, 201, "command_colourpicker_changed"},
-   {wxEVT_COMMAND_FONTPICKER_CHANGED, 202, "command_fontpicker_changed"},
-   {wxEVT_STC_CHANGE, 203, "stc_change"},
-   {wxEVT_STC_STYLENEEDED, 203, "stc_styleneeded"},
-   {wxEVT_STC_CHARADDED, 203, "stc_charadded"},
-   {wxEVT_STC_SAVEPOINTREACHED, 203, "stc_savepointreached"},
-   {wxEVT_STC_SAVEPOINTLEFT, 203, "stc_savepointleft"},
-   {wxEVT_STC_ROMODIFYATTEMPT, 203, "stc_romodifyattempt"},
-   {wxEVT_STC_KEY, 203, "stc_key"},
-   {wxEVT_STC_DOUBLECLICK, 203, "stc_doubleclick"},
-   {wxEVT_STC_UPDATEUI, 203, "stc_updateui"},
-   {wxEVT_STC_MODIFIED, 203, "stc_modified"},
-   {wxEVT_STC_MACRORECORD, 203, "stc_macrorecord"},
-   {wxEVT_STC_MARGINCLICK, 203, "stc_marginclick"},
-   {wxEVT_STC_NEEDSHOWN, 203, "stc_needshown"},
-   {wxEVT_STC_PAINTED, 203, "stc_painted"},
-   {wxEVT_STC_USERLISTSELECTION, 203, "stc_userlistselection"},
-   {wxEVT_STC_URIDROPPED, 203, "stc_uridropped"},
-   {wxEVT_STC_DWELLSTART, 203, "stc_dwellstart"},
-   {wxEVT_STC_DWELLEND, 203, "stc_dwellend"},
-   {wxEVT_STC_START_DRAG, 203, "stc_start_drag"},
-   {wxEVT_STC_DRAG_OVER, 203, "stc_drag_over"},
-   {wxEVT_STC_DO_DROP, 203, "stc_do_drop"},
-   {wxEVT_STC_ZOOM, 203, "stc_zoom"},
-   {wxEVT_STC_HOTSPOT_CLICK, 203, "stc_hotspot_click"},
-   {wxEVT_STC_HOTSPOT_DCLICK, 203, "stc_hotspot_dclick"},
-   {wxEVT_STC_CALLTIP_CLICK, 203, "stc_calltip_click"},
-   {wxEVT_STC_AUTOCOMP_SELECTION, 203, "stc_autocomp_selection"},
-   {wxEVT_COMMAND_TREE_BEGIN_DRAG, 208, "command_tree_begin_drag"},
-   {wxEVT_COMMAND_TREE_BEGIN_RDRAG, 208, "command_tree_begin_rdrag"},
-   {wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, 208, "command_tree_begin_label_edit"},
-   {wxEVT_COMMAND_TREE_END_LABEL_EDIT, 208, "command_tree_end_label_edit"},
-   {wxEVT_COMMAND_TREE_DELETE_ITEM, 208, "command_tree_delete_item"},
-   {wxEVT_COMMAND_TREE_GET_INFO, 208, "command_tree_get_info"},
-   {wxEVT_COMMAND_TREE_SET_INFO, 208, "command_tree_set_info"},
-   {wxEVT_COMMAND_TREE_ITEM_EXPANDED, 208, "command_tree_item_expanded"},
-   {wxEVT_COMMAND_TREE_ITEM_EXPANDING, 208, "command_tree_item_expanding"},
-   {wxEVT_COMMAND_TREE_ITEM_COLLAPSED, 208, "command_tree_item_collapsed"},
-   {wxEVT_COMMAND_TREE_ITEM_COLLAPSING, 208, "command_tree_item_collapsing"},
-   {wxEVT_COMMAND_TREE_SEL_CHANGED, 208, "command_tree_sel_changed"},
-   {wxEVT_COMMAND_TREE_SEL_CHANGING, 208, "command_tree_sel_changing"},
-   {wxEVT_COMMAND_TREE_KEY_DOWN, 208, "command_tree_key_down"},
-   {wxEVT_COMMAND_TREE_ITEM_ACTIVATED, 208, "command_tree_item_activated"},
-   {wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, 208, "command_tree_item_right_click"},
-   {wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 208, "command_tree_item_middle_click"},
-   {wxEVT_COMMAND_TREE_END_DRAG, 208, "command_tree_end_drag"},
-   {wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 208, "command_tree_state_image_click"},
-   {wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 208, "command_tree_item_gettooltip"},
-   {wxEVT_COMMAND_TREE_ITEM_MENU, 208, "command_tree_item_menu"},
-   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 209, "command_notebook_page_changed"},
-   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 209, "command_notebook_page_changing"},
-   {wxEVT_COMMAND_SPINCTRL_UPDATED, 215, "command_spinctrl_updated"},
-   {wxEVT_SCROLL_LINEUP + wxEVT_USER_FIRST, 164, "spin_up"},
-   {wxEVT_SCROLL_LINEDOWN + wxEVT_USER_FIRST, 164, "spin_down"},
-   {wxEVT_SCROLL_THUMBTRACK + wxEVT_USER_FIRST, 164, "spin"},
-   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 217, "command_splitter_sash_pos_changed"},
-   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 217, "command_splitter_sash_pos_changing"},
-   {wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 217, "command_splitter_doubleclicked"},
-   {wxEVT_COMMAND_SPLITTER_UNSPLIT, 217, "command_splitter_unsplit"},
-   {wxEVT_COMMAND_HTML_LINK_CLICKED, 219, "command_html_link_clicked"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 221, "command_auinotebook_page_close"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 221, "command_auinotebook_page_changed"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 221, "command_auinotebook_page_changing"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 221, "command_auinotebook_button"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 221, "command_auinotebook_begin_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 221, "command_auinotebook_end_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 221, "command_auinotebook_drag_motion"},
-   {wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 221, "command_auinotebook_allow_dnd"},
+   {wxEVT_COMMAND_BUTTON_CLICKED, 164, "command_button_clicked"},
+   {wxEVT_COMMAND_CHECKBOX_CLICKED, 164, "command_checkbox_clicked"},
+   {wxEVT_COMMAND_CHOICE_SELECTED, 164, "command_choice_selected"},
+   {wxEVT_COMMAND_LISTBOX_SELECTED, 164, "command_listbox_selected"},
+   {wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 164, "command_listbox_doubleclicked"},
+   {wxEVT_COMMAND_TEXT_UPDATED, 164, "command_text_updated"},
+   {wxEVT_COMMAND_TEXT_ENTER, 164, "command_text_enter"},
+   {wxEVT_COMMAND_MENU_SELECTED, 164, "command_menu_selected"},
+   {wxEVT_COMMAND_SLIDER_UPDATED, 164, "command_slider_updated"},
+   {wxEVT_COMMAND_RADIOBOX_SELECTED, 164, "command_radiobox_selected"},
+   {wxEVT_COMMAND_RADIOBUTTON_SELECTED, 164, "command_radiobutton_selected"},
+   {wxEVT_COMMAND_SCROLLBAR_UPDATED, 164, "command_scrollbar_updated"},
+   {wxEVT_COMMAND_VLBOX_SELECTED, 164, "command_vlbox_selected"},
+   {wxEVT_COMMAND_COMBOBOX_SELECTED, 164, "command_combobox_selected"},
+   {wxEVT_COMMAND_TOOL_RCLICKED, 164, "command_tool_rclicked"},
+   {wxEVT_COMMAND_TOOL_ENTER, 164, "command_tool_enter"},
+   {wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 164, "command_checklistbox_toggled"},
+   {wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 164, "command_togglebutton_clicked"},
+   {wxEVT_COMMAND_LEFT_CLICK, 164, "command_left_click"},
+   {wxEVT_COMMAND_LEFT_DCLICK, 164, "command_left_dclick"},
+   {wxEVT_COMMAND_RIGHT_CLICK, 164, "command_right_click"},
+   {wxEVT_COMMAND_SET_FOCUS, 164, "command_set_focus"},
+   {wxEVT_COMMAND_KILL_FOCUS, 164, "command_kill_focus"},
+   {wxEVT_COMMAND_ENTER, 164, "command_enter"},
+   {wxEVT_SCROLL_TOP, 165, "scroll_top"},
+   {wxEVT_SCROLL_BOTTOM, 165, "scroll_bottom"},
+   {wxEVT_SCROLL_LINEUP, 165, "scroll_lineup"},
+   {wxEVT_SCROLL_LINEDOWN, 165, "scroll_linedown"},
+   {wxEVT_SCROLL_PAGEUP, 165, "scroll_pageup"},
+   {wxEVT_SCROLL_PAGEDOWN, 165, "scroll_pagedown"},
+   {wxEVT_SCROLL_THUMBTRACK, 165, "scroll_thumbtrack"},
+   {wxEVT_SCROLL_THUMBRELEASE, 165, "scroll_thumbrelease"},
+   {wxEVT_SCROLL_CHANGED, 165, "scroll_changed"},
+   {wxEVT_SCROLLWIN_TOP, 166, "scrollwin_top"},
+   {wxEVT_SCROLLWIN_BOTTOM, 166, "scrollwin_bottom"},
+   {wxEVT_SCROLLWIN_LINEUP, 166, "scrollwin_lineup"},
+   {wxEVT_SCROLLWIN_LINEDOWN, 166, "scrollwin_linedown"},
+   {wxEVT_SCROLLWIN_PAGEUP, 166, "scrollwin_pageup"},
+   {wxEVT_SCROLLWIN_PAGEDOWN, 166, "scrollwin_pagedown"},
+   {wxEVT_SCROLLWIN_THUMBTRACK, 166, "scrollwin_thumbtrack"},
+   {wxEVT_SCROLLWIN_THUMBRELEASE, 166, "scrollwin_thumbrelease"},
+   {wxEVT_LEFT_DOWN, 167, "left_down"},
+   {wxEVT_LEFT_UP, 167, "left_up"},
+   {wxEVT_MIDDLE_DOWN, 167, "middle_down"},
+   {wxEVT_MIDDLE_UP, 167, "middle_up"},
+   {wxEVT_RIGHT_DOWN, 167, "right_down"},
+   {wxEVT_RIGHT_UP, 167, "right_up"},
+   {wxEVT_MOTION, 167, "motion"},
+   {wxEVT_ENTER_WINDOW, 167, "enter_window"},
+   {wxEVT_LEAVE_WINDOW, 167, "leave_window"},
+   {wxEVT_LEFT_DCLICK, 167, "left_dclick"},
+   {wxEVT_MIDDLE_DCLICK, 167, "middle_dclick"},
+   {wxEVT_RIGHT_DCLICK, 167, "right_dclick"},
+   {wxEVT_MOUSEWHEEL, 167, "mousewheel"},
+   {wxEVT_NC_LEFT_DOWN, 167, "nc_left_down"},
+   {wxEVT_NC_LEFT_UP, 167, "nc_left_up"},
+   {wxEVT_NC_MIDDLE_DOWN, 167, "nc_middle_down"},
+   {wxEVT_NC_MIDDLE_UP, 167, "nc_middle_up"},
+   {wxEVT_NC_RIGHT_DOWN, 167, "nc_right_down"},
+   {wxEVT_NC_RIGHT_UP, 167, "nc_right_up"},
+   {wxEVT_NC_MOTION, 167, "nc_motion"},
+   {wxEVT_NC_ENTER_WINDOW, 167, "nc_enter_window"},
+   {wxEVT_NC_LEAVE_WINDOW, 167, "nc_leave_window"},
+   {wxEVT_NC_LEFT_DCLICK, 167, "nc_left_dclick"},
+   {wxEVT_NC_MIDDLE_DCLICK, 167, "nc_middle_dclick"},
+   {wxEVT_NC_RIGHT_DCLICK, 167, "nc_right_dclick"},
+   {wxEVT_SET_CURSOR, 168, "set_cursor"},
+   {wxEVT_CHAR, 169, "char"},
+   {wxEVT_CHAR_HOOK, 169, "char_hook"},
+   {wxEVT_KEY_DOWN, 169, "key_down"},
+   {wxEVT_KEY_UP, 169, "key_up"},
+   {wxEVT_SIZE, 170, "size"},
+   {wxEVT_MOVE, 171, "move"},
+   {wxEVT_PAINT, 172, "paint"},
+   {wxEVT_PAINT_ICON, 172, "paint_icon"},
+   {wxEVT_NC_PAINT, 173, "nc_paint"},
+   {wxEVT_ERASE_BACKGROUND, 174, "erase_background"},
+   {wxEVT_SET_FOCUS, 175, "set_focus"},
+   {wxEVT_KILL_FOCUS, 175, "kill_focus"},
+   {wxEVT_CHILD_FOCUS, 176, "child_focus"},
+   {wxEVT_MENU_OPEN, 177, "menu_open"},
+   {wxEVT_MENU_CLOSE, 177, "menu_close"},
+   {wxEVT_MENU_HIGHLIGHT, 177, "menu_highlight"},
+   {wxEVT_CLOSE_WINDOW, 178, "close_window"},
+   {wxEVT_END_SESSION, 178, "end_session"},
+   {wxEVT_QUERY_END_SESSION, 178, "query_end_session"},
+   {wxEVT_SHOW, 179, "show"},
+   {wxEVT_ICONIZE, 180, "iconize"},
+   {wxEVT_MAXIMIZE, 181, "maximize"},
+   {wxEVT_JOY_BUTTON_DOWN, 182, "joy_button_down"},
+   {wxEVT_JOY_BUTTON_UP, 182, "joy_button_up"},
+   {wxEVT_JOY_MOVE, 182, "joy_move"},
+   {wxEVT_JOY_ZMOVE, 182, "joy_zmove"},
+   {wxEVT_UPDATE_UI, 183, "update_ui"},
+   {wxEVT_SYS_COLOUR_CHANGED, 184, "sys_colour_changed"},
+   {wxEVT_MOUSE_CAPTURE_CHANGED, 185, "mouse_capture_changed"},
+   {wxEVT_DISPLAY_CHANGED, 186, "display_changed"},
+   {wxEVT_PALETTE_CHANGED, 187, "palette_changed"},
+   {wxEVT_QUERY_NEW_PALETTE, 188, "query_new_palette"},
+   {wxEVT_NAVIGATION_KEY, 189, "navigation_key"},
+   {wxEVT_CREATE, 190, "create"},
+   {wxEVT_DESTROY, 191, "destroy"},
+   {wxEVT_HELP, 192, "help"},
+   {wxEVT_DETAILED_HELP, 192, "detailed_help"},
+   {wxEVT_CONTEXT_MENU, 193, "context_menu"},
+   {wxEVT_IDLE, 194, "idle"},
+   {wxEVT_GRID_CELL_LEFT_CLICK, 195, "grid_cell_left_click"},
+   {wxEVT_GRID_CELL_RIGHT_CLICK, 195, "grid_cell_right_click"},
+   {wxEVT_GRID_CELL_LEFT_DCLICK, 195, "grid_cell_left_dclick"},
+   {wxEVT_GRID_CELL_RIGHT_DCLICK, 195, "grid_cell_right_dclick"},
+   {wxEVT_GRID_LABEL_LEFT_CLICK, 195, "grid_label_left_click"},
+   {wxEVT_GRID_LABEL_RIGHT_CLICK, 195, "grid_label_right_click"},
+   {wxEVT_GRID_LABEL_LEFT_DCLICK, 195, "grid_label_left_dclick"},
+   {wxEVT_GRID_LABEL_RIGHT_DCLICK, 195, "grid_label_right_dclick"},
+   {wxEVT_GRID_ROW_SIZE, 195, "grid_row_size"},
+   {wxEVT_GRID_COL_SIZE, 195, "grid_col_size"},
+   {wxEVT_GRID_RANGE_SELECT, 195, "grid_range_select"},
+   {wxEVT_GRID_CELL_CHANGE, 195, "grid_cell_change"},
+   {wxEVT_GRID_SELECT_CELL, 195, "grid_select_cell"},
+   {wxEVT_GRID_EDITOR_SHOWN, 195, "grid_editor_shown"},
+   {wxEVT_GRID_EDITOR_HIDDEN, 195, "grid_editor_hidden"},
+   {wxEVT_GRID_EDITOR_CREATED, 195, "grid_editor_created"},
+   {wxEVT_GRID_CELL_BEGIN_DRAG, 195, "grid_cell_begin_drag"},
+   {wxEVT_SASH_DRAGGED, 197, "sash_dragged"},
+   {wxEVT_COMMAND_LIST_BEGIN_DRAG, 198, "command_list_begin_drag"},
+   {wxEVT_COMMAND_LIST_BEGIN_RDRAG, 198, "command_list_begin_rdrag"},
+   {wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, 198, "command_list_begin_label_edit"},
+   {wxEVT_COMMAND_LIST_END_LABEL_EDIT, 198, "command_list_end_label_edit"},
+   {wxEVT_COMMAND_LIST_DELETE_ITEM, 198, "command_list_delete_item"},
+   {wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 198, "command_list_delete_all_items"},
+   {wxEVT_COMMAND_LIST_KEY_DOWN, 198, "command_list_key_down"},
+   {wxEVT_COMMAND_LIST_INSERT_ITEM, 198, "command_list_insert_item"},
+   {wxEVT_COMMAND_LIST_COL_CLICK, 198, "command_list_col_click"},
+   {wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, 198, "command_list_col_right_click"},
+   {wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, 198, "command_list_col_begin_drag"},
+   {wxEVT_COMMAND_LIST_COL_DRAGGING, 198, "command_list_col_dragging"},
+   {wxEVT_COMMAND_LIST_COL_END_DRAG, 198, "command_list_col_end_drag"},
+   {wxEVT_COMMAND_LIST_ITEM_SELECTED, 198, "command_list_item_selected"},
+   {wxEVT_COMMAND_LIST_ITEM_DESELECTED, 198, "command_list_item_deselected"},
+   {wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, 198, "command_list_item_right_click"},
+   {wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, 198, "command_list_item_middle_click"},
+   {wxEVT_COMMAND_LIST_ITEM_ACTIVATED, 198, "command_list_item_activated"},
+   {wxEVT_COMMAND_LIST_ITEM_FOCUSED, 198, "command_list_item_focused"},
+   {wxEVT_COMMAND_LIST_CACHE_HINT, 198, "command_list_cache_hint"},
+   {wxEVT_DATE_CHANGED, 199, "date_changed"},
+   {wxEVT_CALENDAR_SEL_CHANGED, 200, "calendar_sel_changed"},
+   {wxEVT_CALENDAR_DAY_CHANGED, 200, "calendar_day_changed"},
+   {wxEVT_CALENDAR_MONTH_CHANGED, 200, "calendar_month_changed"},
+   {wxEVT_CALENDAR_YEAR_CHANGED, 200, "calendar_year_changed"},
+   {wxEVT_CALENDAR_DOUBLECLICKED, 200, "calendar_doubleclicked"},
+   {wxEVT_CALENDAR_WEEKDAY_CLICKED, 200, "calendar_weekday_clicked"},
+   {wxEVT_COMMAND_FILEPICKER_CHANGED, 201, "command_filepicker_changed"},
+   {wxEVT_COMMAND_DIRPICKER_CHANGED, 201, "command_dirpicker_changed"},
+   {wxEVT_COMMAND_COLOURPICKER_CHANGED, 202, "command_colourpicker_changed"},
+   {wxEVT_COMMAND_FONTPICKER_CHANGED, 203, "command_fontpicker_changed"},
+   {wxEVT_STC_CHANGE, 204, "stc_change"},
+   {wxEVT_STC_STYLENEEDED, 204, "stc_styleneeded"},
+   {wxEVT_STC_CHARADDED, 204, "stc_charadded"},
+   {wxEVT_STC_SAVEPOINTREACHED, 204, "stc_savepointreached"},
+   {wxEVT_STC_SAVEPOINTLEFT, 204, "stc_savepointleft"},
+   {wxEVT_STC_ROMODIFYATTEMPT, 204, "stc_romodifyattempt"},
+   {wxEVT_STC_KEY, 204, "stc_key"},
+   {wxEVT_STC_DOUBLECLICK, 204, "stc_doubleclick"},
+   {wxEVT_STC_UPDATEUI, 204, "stc_updateui"},
+   {wxEVT_STC_MODIFIED, 204, "stc_modified"},
+   {wxEVT_STC_MACRORECORD, 204, "stc_macrorecord"},
+   {wxEVT_STC_MARGINCLICK, 204, "stc_marginclick"},
+   {wxEVT_STC_NEEDSHOWN, 204, "stc_needshown"},
+   {wxEVT_STC_PAINTED, 204, "stc_painted"},
+   {wxEVT_STC_USERLISTSELECTION, 204, "stc_userlistselection"},
+   {wxEVT_STC_URIDROPPED, 204, "stc_uridropped"},
+   {wxEVT_STC_DWELLSTART, 204, "stc_dwellstart"},
+   {wxEVT_STC_DWELLEND, 204, "stc_dwellend"},
+   {wxEVT_STC_START_DRAG, 204, "stc_start_drag"},
+   {wxEVT_STC_DRAG_OVER, 204, "stc_drag_over"},
+   {wxEVT_STC_DO_DROP, 204, "stc_do_drop"},
+   {wxEVT_STC_ZOOM, 204, "stc_zoom"},
+   {wxEVT_STC_HOTSPOT_CLICK, 204, "stc_hotspot_click"},
+   {wxEVT_STC_HOTSPOT_DCLICK, 204, "stc_hotspot_dclick"},
+   {wxEVT_STC_CALLTIP_CLICK, 204, "stc_calltip_click"},
+   {wxEVT_STC_AUTOCOMP_SELECTION, 204, "stc_autocomp_selection"},
+   {wxEVT_COMMAND_TREE_BEGIN_DRAG, 209, "command_tree_begin_drag"},
+   {wxEVT_COMMAND_TREE_BEGIN_RDRAG, 209, "command_tree_begin_rdrag"},
+   {wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, 209, "command_tree_begin_label_edit"},
+   {wxEVT_COMMAND_TREE_END_LABEL_EDIT, 209, "command_tree_end_label_edit"},
+   {wxEVT_COMMAND_TREE_DELETE_ITEM, 209, "command_tree_delete_item"},
+   {wxEVT_COMMAND_TREE_GET_INFO, 209, "command_tree_get_info"},
+   {wxEVT_COMMAND_TREE_SET_INFO, 209, "command_tree_set_info"},
+   {wxEVT_COMMAND_TREE_ITEM_EXPANDED, 209, "command_tree_item_expanded"},
+   {wxEVT_COMMAND_TREE_ITEM_EXPANDING, 209, "command_tree_item_expanding"},
+   {wxEVT_COMMAND_TREE_ITEM_COLLAPSED, 209, "command_tree_item_collapsed"},
+   {wxEVT_COMMAND_TREE_ITEM_COLLAPSING, 209, "command_tree_item_collapsing"},
+   {wxEVT_COMMAND_TREE_SEL_CHANGED, 209, "command_tree_sel_changed"},
+   {wxEVT_COMMAND_TREE_SEL_CHANGING, 209, "command_tree_sel_changing"},
+   {wxEVT_COMMAND_TREE_KEY_DOWN, 209, "command_tree_key_down"},
+   {wxEVT_COMMAND_TREE_ITEM_ACTIVATED, 209, "command_tree_item_activated"},
+   {wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, 209, "command_tree_item_right_click"},
+   {wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 209, "command_tree_item_middle_click"},
+   {wxEVT_COMMAND_TREE_END_DRAG, 209, "command_tree_end_drag"},
+   {wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 209, "command_tree_state_image_click"},
+   {wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 209, "command_tree_item_gettooltip"},
+   {wxEVT_COMMAND_TREE_ITEM_MENU, 209, "command_tree_item_menu"},
+   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 210, "command_notebook_page_changed"},
+   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 210, "command_notebook_page_changing"},
+   {wxEVT_COMMAND_SPINCTRL_UPDATED, 216, "command_spinctrl_updated"},
+   {wxEVT_SCROLL_LINEUP + wxEVT_USER_FIRST, 165, "spin_up"},
+   {wxEVT_SCROLL_LINEDOWN + wxEVT_USER_FIRST, 165, "spin_down"},
+   {wxEVT_SCROLL_THUMBTRACK + wxEVT_USER_FIRST, 165, "spin"},
+   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 218, "command_splitter_sash_pos_changed"},
+   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 218, "command_splitter_sash_pos_changing"},
+   {wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 218, "command_splitter_doubleclicked"},
+   {wxEVT_COMMAND_SPLITTER_UNSPLIT, 218, "command_splitter_unsplit"},
+   {wxEVT_COMMAND_HTML_LINK_CLICKED, 220, "command_html_link_clicked"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 222, "command_auinotebook_page_close"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 222, "command_auinotebook_page_changed"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 222, "command_auinotebook_page_changing"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 222, "command_auinotebook_button"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 222, "command_auinotebook_begin_drag"},
+   {wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 222, "command_auinotebook_end_drag"},
+   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 222, "command_auinotebook_drag_motion"},
+   {wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 222, "command_auinotebook_allow_dnd"},
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 221, "command_auinotebook_tab_middle_down"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 222, "command_auinotebook_tab_middle_down"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 221, "command_auinotebook_tab_middle_up"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 222, "command_auinotebook_tab_middle_up"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 221, "command_auinotebook_tab_right_down"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 222, "command_auinotebook_tab_right_down"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 221, "command_auinotebook_tab_right_up"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 222, "command_auinotebook_tab_right_up"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 221, "command_auinotebook_page_closed"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 222, "command_auinotebook_page_closed"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 221, "command_auinotebook_drag_done"},
+   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 222, "command_auinotebook_drag_done"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 221, "command_auinotebook_bg_dclick"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 222, "command_auinotebook_bg_dclick"},
 #endif
-   {wxEVT_AUI_PANE_BUTTON, 222, "aui_pane_button"},
-   {wxEVT_AUI_PANE_CLOSE, 222, "aui_pane_close"},
-   {wxEVT_AUI_PANE_MAXIMIZE, 222, "aui_pane_maximize"},
-   {wxEVT_AUI_PANE_RESTORE, 222, "aui_pane_restore"},
-   {wxEVT_AUI_RENDER, 222, "aui_render"},
-   {wxEVT_AUI_FIND_MANAGER, 222, "aui_find_manager"},
+   {wxEVT_AUI_PANE_BUTTON, 223, "aui_pane_button"},
+   {wxEVT_AUI_PANE_CLOSE, 223, "aui_pane_close"},
+   {wxEVT_AUI_PANE_MAXIMIZE, 223, "aui_pane_maximize"},
+   {wxEVT_AUI_PANE_RESTORE, 223, "aui_pane_restore"},
+   {wxEVT_AUI_RENDER, 223, "aui_render"},
+   {wxEVT_AUI_FIND_MANAGER, 223, "aui_find_manager"},
    {-1, 0, }
   };
   for(int i=0; event_types[i].ev_type != -1; i++) {
@@ -353,7 +353,7 @@ bool sendevent(wxEvent *event, ErlDrvPort port)
  rt.addRef(getRef((void *)(cb->obj), memenv), cb->class_name);
  rt.addExt2Term(cb->user_data);
  switch(Etype->cID) {
-case 163: {// wxCommandEvent
+case 164: {// wxCommandEvent
  wxCommandEvent * ev = (wxCommandEvent *) event;
     evClass = (char*)"wxCommandEvent";
     rt.addAtom((char*)"wxCommand");
@@ -364,7 +364,7 @@ case 163: {// wxCommandEvent
     rt.addTupleCount(5);
   break;
 }
-case 164: {// wxScrollEvent or wxSpinEvent
+case 165: {// wxScrollEvent or wxSpinEvent
   if(event->IsKindOf(CLASSINFO(wxScrollEvent))) {
  wxScrollEvent * ev = (wxScrollEvent *) event;
     evClass = (char*)"wxScrollEvent";
@@ -384,14 +384,14 @@ case 164: {// wxScrollEvent or wxSpinEvent
   }
   break;
 }
-case 165: {// wxScrollWinEvent
+case 166: {// wxScrollWinEvent
     evClass = (char*)"wxScrollWinEvent";
     rt.addAtom((char*)"wxScrollWin");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 166: {// wxMouseEvent
+case 167: {// wxMouseEvent
  wxMouseEvent * ev = (wxMouseEvent *) event;
     evClass = (char*)"wxMouseEvent";
     rt.addAtom((char*)"wxMouse");
@@ -411,14 +411,14 @@ case 166: {// wxMouseEvent
     rt.addTupleCount(14);
   break;
 }
-case 167: {// wxSetCursorEvent
+case 168: {// wxSetCursorEvent
     evClass = (char*)"wxSetCursorEvent";
     rt.addAtom((char*)"wxSetCursor");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 168: {// wxKeyEvent
+case 169: {// wxKeyEvent
  wxKeyEvent * ev = (wxKeyEvent *) event;
     evClass = (char*)"wxKeyEvent";
     rt.addAtom((char*)"wxKey");
@@ -437,7 +437,7 @@ case 168: {// wxKeyEvent
     rt.addTupleCount(13);
   break;
 }
-case 169: {// wxSizeEvent
+case 170: {// wxSizeEvent
  wxSizeEvent * ev = (wxSizeEvent *) event;
     evClass = (char*)"wxSizeEvent";
     rt.addAtom((char*)"wxSize");
@@ -447,28 +447,28 @@ case 169: {// wxSizeEvent
     rt.addTupleCount(4);
   break;
 }
-case 170: {// wxMoveEvent
+case 171: {// wxMoveEvent
     evClass = (char*)"wxMoveEvent";
     rt.addAtom((char*)"wxMove");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 171: {// wxPaintEvent
+case 172: {// wxPaintEvent
     evClass = (char*)"wxPaintEvent";
     rt.addAtom((char*)"wxPaint");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 172: {// wxNcPaintEvent
+case 173: {// wxNcPaintEvent
     evClass = (char*)"wxNcPaintEvent";
     rt.addAtom((char*)"wxNcPaint");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 173: {// wxEraseEvent
+case 174: {// wxEraseEvent
  wxEraseEvent * ev = (wxEraseEvent *) event;
  wxDC * GetDC = ev->GetDC();
     evClass = (char*)"wxEraseEvent";
@@ -478,105 +478,105 @@ case 173: {// wxEraseEvent
     rt.addTupleCount(3);
   break;
 }
-case 174: {// wxFocusEvent
+case 175: {// wxFocusEvent
     evClass = (char*)"wxFocusEvent";
     rt.addAtom((char*)"wxFocus");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 175: {// wxChildFocusEvent
+case 176: {// wxChildFocusEvent
     evClass = (char*)"wxChildFocusEvent";
     rt.addAtom((char*)"wxChildFocus");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 176: {// wxMenuEvent
+case 177: {// wxMenuEvent
     evClass = (char*)"wxMenuEvent";
     rt.addAtom((char*)"wxMenu");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 177: {// wxCloseEvent
+case 178: {// wxCloseEvent
     evClass = (char*)"wxCloseEvent";
     rt.addAtom((char*)"wxClose");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 178: {// wxShowEvent
+case 179: {// wxShowEvent
     evClass = (char*)"wxShowEvent";
     rt.addAtom((char*)"wxShow");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 179: {// wxIconizeEvent
+case 180: {// wxIconizeEvent
     evClass = (char*)"wxIconizeEvent";
     rt.addAtom((char*)"wxIconize");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 180: {// wxMaximizeEvent
+case 181: {// wxMaximizeEvent
     evClass = (char*)"wxMaximizeEvent";
     rt.addAtom((char*)"wxMaximize");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 181: {// wxJoystickEvent
+case 182: {// wxJoystickEvent
     evClass = (char*)"wxJoystickEvent";
     rt.addAtom((char*)"wxJoystick");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 182: {// wxUpdateUIEvent
+case 183: {// wxUpdateUIEvent
     evClass = (char*)"wxUpdateUIEvent";
     rt.addAtom((char*)"wxUpdateUI");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 183: {// wxSysColourChangedEvent
+case 184: {// wxSysColourChangedEvent
     evClass = (char*)"wxSysColourChangedEvent";
     rt.addAtom((char*)"wxSysColourChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 184: {// wxMouseCaptureChangedEvent
+case 185: {// wxMouseCaptureChangedEvent
     evClass = (char*)"wxMouseCaptureChangedEvent";
     rt.addAtom((char*)"wxMouseCaptureChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 185: {// wxDisplayChangedEvent
+case 186: {// wxDisplayChangedEvent
     evClass = (char*)"wxDisplayChangedEvent";
     rt.addAtom((char*)"wxDisplayChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 186: {// wxPaletteChangedEvent
+case 187: {// wxPaletteChangedEvent
     evClass = (char*)"wxPaletteChangedEvent";
     rt.addAtom((char*)"wxPaletteChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 187: {// wxQueryNewPaletteEvent
+case 188: {// wxQueryNewPaletteEvent
     evClass = (char*)"wxQueryNewPaletteEvent";
     rt.addAtom((char*)"wxQueryNewPalette");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 188: {// wxNavigationKeyEvent
+case 189: {// wxNavigationKeyEvent
  wxNavigationKeyEvent * ev = (wxNavigationKeyEvent *) event;
     evClass = (char*)"wxNavigationKeyEvent";
     rt.addAtom((char*)"wxNavigationKey");
@@ -586,42 +586,42 @@ case 188: {// wxNavigationKeyEvent
     rt.addTupleCount(4);
   break;
 }
-case 189: {// wxWindowCreateEvent
+case 190: {// wxWindowCreateEvent
     evClass = (char*)"wxWindowCreateEvent";
     rt.addAtom((char*)"wxWindowCreate");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 190: {// wxWindowDestroyEvent
+case 191: {// wxWindowDestroyEvent
     evClass = (char*)"wxWindowDestroyEvent";
     rt.addAtom((char*)"wxWindowDestroy");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 191: {// wxHelpEvent
+case 192: {// wxHelpEvent
     evClass = (char*)"wxHelpEvent";
     rt.addAtom((char*)"wxHelp");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 192: {// wxContextMenuEvent
+case 193: {// wxContextMenuEvent
     evClass = (char*)"wxContextMenuEvent";
     rt.addAtom((char*)"wxContextMenu");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 193: {// wxIdleEvent
+case 194: {// wxIdleEvent
     evClass = (char*)"wxIdleEvent";
     rt.addAtom((char*)"wxIdle");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 194: {// wxGridEvent
+case 195: {// wxGridEvent
  wxGridEvent * ev = (wxGridEvent *) event;
     evClass = (char*)"wxGridEvent";
     rt.addAtom((char*)"wxGrid");
@@ -638,7 +638,7 @@ case 194: {// wxGridEvent
     rt.addTupleCount(11);
   break;
 }
-case 196: {// wxSashEvent
+case 197: {// wxSashEvent
  wxSashEvent * ev = (wxSashEvent *) event;
     evClass = (char*)"wxSashEvent";
     rt.addAtom((char*)"wxSash");
@@ -649,7 +649,7 @@ case 196: {// wxSashEvent
     rt.addTupleCount(5);
   break;
 }
-case 197: {// wxListEvent
+case 198: {// wxListEvent
  wxListEvent * ev = (wxListEvent *) event;
     evClass = (char*)"wxListEvent";
     rt.addAtom((char*)"wxList");
@@ -662,7 +662,7 @@ case 197: {// wxListEvent
     rt.addTupleCount(7);
   break;
 }
-case 198: {// wxDateEvent
+case 199: {// wxDateEvent
  wxDateEvent * ev = (wxDateEvent *) event;
     evClass = (char*)"wxDateEvent";
     rt.addAtom((char*)"wxDate");
@@ -671,14 +671,14 @@ case 198: {// wxDateEvent
     rt.addTupleCount(3);
   break;
 }
-case 199: {// wxCalendarEvent
+case 200: {// wxCalendarEvent
     evClass = (char*)"wxCalendarEvent";
     rt.addAtom((char*)"wxCalendar");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 200: {// wxFileDirPickerEvent
+case 201: {// wxFileDirPickerEvent
  wxFileDirPickerEvent * ev = (wxFileDirPickerEvent *) event;
     evClass = (char*)"wxFileDirPickerEvent";
     rt.addAtom((char*)"wxFileDirPicker");
@@ -687,7 +687,7 @@ case 200: {// wxFileDirPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 201: {// wxColourPickerEvent
+case 202: {// wxColourPickerEvent
  wxColourPickerEvent * ev = (wxColourPickerEvent *) event;
     evClass = (char*)"wxColourPickerEvent";
     rt.addAtom((char*)"wxColourPicker");
@@ -696,7 +696,7 @@ case 201: {// wxColourPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 202: {// wxFontPickerEvent
+case 203: {// wxFontPickerEvent
  wxFontPickerEvent * ev = (wxFontPickerEvent *) event;
  wxFont * GetFont = new wxFont(ev->GetFont());
  app->newPtr((void *) GetFont,3, memenv);
@@ -707,7 +707,7 @@ case 202: {// wxFontPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 203: {// wxStyledTextEvent
+case 204: {// wxStyledTextEvent
  wxStyledTextEvent * ev = (wxStyledTextEvent *) event;
     evClass = (char*)"wxStyledTextEvent";
     rt.addAtom((char*)"wxStyledText");
@@ -735,7 +735,7 @@ case 203: {// wxStyledTextEvent
     rt.addTupleCount(22);
   break;
 }
-case 208: {// wxTreeEvent
+case 209: {// wxTreeEvent
  wxTreeEvent * ev = (wxTreeEvent *) event;
     evClass = (char*)"wxTreeEvent";
     rt.addAtom((char*)"wxTree");
@@ -746,14 +746,14 @@ case 208: {// wxTreeEvent
     rt.addTupleCount(5);
   break;
 }
-case 209: {// wxNotebookEvent
+case 210: {// wxNotebookEvent
     evClass = (char*)"wxNotebookEvent";
     rt.addAtom((char*)"wxNotebook");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 215: {// wxSpinEvent
+case 216: {// wxSpinEvent
  wxSpinEvent * ev = (wxSpinEvent *) event;
     evClass = (char*)"wxSpinEvent";
     rt.addAtom((char*)"wxSpin");
@@ -762,14 +762,14 @@ case 215: {// wxSpinEvent
     rt.addTupleCount(3);
   break;
 }
-case 217: {// wxSplitterEvent
+case 218: {// wxSplitterEvent
     evClass = (char*)"wxSplitterEvent";
     rt.addAtom((char*)"wxSplitter");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 219: {// wxHtmlLinkEvent
+case 220: {// wxHtmlLinkEvent
  wxHtmlLinkEvent * ev = (wxHtmlLinkEvent *) event;
     evClass = (char*)"wxHtmlLinkEvent";
     rt.addAtom((char*)"wxHtmlLink");
@@ -778,7 +778,7 @@ case 219: {// wxHtmlLinkEvent
     rt.addTupleCount(3);
   break;
 }
-case 221: {// wxAuiNotebookEvent
+case 222: {// wxAuiNotebookEvent
  wxAuiNotebookEvent * ev = (wxAuiNotebookEvent *) event;
  wxAuiNotebook * GetDragSource = ev->GetDragSource();
     evClass = (char*)"wxAuiNotebookEvent";
@@ -790,7 +790,7 @@ case 221: {// wxAuiNotebookEvent
     rt.addTupleCount(5);
   break;
 }
-case 222: {// wxAuiManagerEvent
+case 223: {// wxAuiManagerEvent
  wxAuiManagerEvent * ev = (wxAuiManagerEvent *) event;
  wxAuiManager * GetManager = ev->GetManager();
  wxAuiPaneInfo * GetPane = ev->GetPane();
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp
index 479d7679a4..afef2990b4 100644
--- a/lib/wx/c_src/gen/wxe_funcs.cpp
+++ b/lib/wx/c_src/gen/wxe_funcs.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. 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
@@ -4486,7 +4486,7 @@ case wxGridCellBoolEditor_IsTrueValue: { // wxGridCellBoolEditor::IsTrueValue
  break;
 }
 case wxGridCellBoolEditor_UseStringValues: { // wxGridCellBoolEditor::UseStringValues
- wxString valueTrue= _T("1");
+ wxString valueTrue= wxT("1");
  wxString valueFalse= wxEmptyString;
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
@@ -15143,12 +15143,14 @@ case wxListBox_SetFirstItem_1_1: { // wxListBox::SetFirstItem
  This->SetFirstItem(s);
  break;
 }
+
 case wxListCtrl_new_0: { // wxListCtrl::wxListCtrl
  wxListCtrl * Result = new EwxListCtrl();
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxListCtrl");
  break;
 }
+
 case wxListCtrl_new_2: { // wxListCtrl::wxListCtrl
  wxWindowID winid=wxID_ANY;
  wxPoint pos= wxDefaultPosition;
@@ -15156,6 +15158,8 @@ case wxListCtrl_new_2: { // wxListCtrl::wxListCtrl
  long style=wxLC_ICON;
  const wxValidator * validator= &wxDefaultValidator;
  wxWindow *parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ int onGetItemText = 0, onGetItemAttr = 0, onGetItemColumnImage = 0;
+
  bp += 4; /* Align */
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
@@ -15179,8 +15183,21 @@ case wxListCtrl_new_2: { // wxListCtrl::wxListCtrl
   case 5: {bp += 4;
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
+  case 6: {bp += 4;
+    onGetItemText = *(int *) bp; bp += 4;
+  } break;
+  case 7: {bp += 4;
+    onGetItemAttr = *(int *) bp; bp += 4;
+  } break;
+  case 8: {bp += 4;
+    onGetItemColumnImage = *(int *) bp; bp += 4;
+  } break;
  }};
- wxListCtrl * Result = new EwxListCtrl(parent,winid,pos,size,style,*validator);
+ EwxListCtrl * Result = new EwxListCtrl(parent,winid,pos,size,style,*validator);
+ Result->onGetItemText = onGetItemText;
+ Result->onGetItemAttr = onGetItemAttr;
+ Result->onGetItemColumnImage = onGetItemColumnImage;
+ Result->port = Ecmd.port;
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxListCtrl");
  break;
@@ -15213,14 +15230,18 @@ case wxListCtrl_ClearAll: { // wxListCtrl::ClearAll
  This->ClearAll();
  break;
 }
+
 case wxListCtrl_Create: { // wxListCtrl::Create
  wxWindowID winid=wxID_ANY;
  wxPoint pos= wxDefaultPosition;
  wxSize size= wxDefaultSize;
  long style=wxLC_ICON;
  const wxValidator * validator= &wxDefaultValidator;
- wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
+ EwxListCtrl *This = (EwxListCtrl *) getPtr(bp,memenv); bp += 4;
  wxWindow *parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ int onGetItemText = 0, onGetItemAttr = 0, onGetItemColumnImage = 0;
+
+ bp += 4; /* Align */
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
  winid = (wxWindowID)*(int *) bp; bp += 4;
@@ -15243,9 +15264,23 @@ case wxListCtrl_Create: { // wxListCtrl::Create
   case 5: {bp += 4;
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
+  case 6: {bp += 4;
+    onGetItemText = *(int *) bp; bp += 4;
+  } break;
+  case 7: {bp += 4;
+    onGetItemAttr = *(int *) bp; bp += 4;
+  } break;
+  case 8: {bp += 4;
+    onGetItemColumnImage = *(int *) bp; bp += 4;
+  } break;
  }};
  if(!This) throw wxe_badarg(0);
  bool Result = This->Create(parent,winid,pos,size,style,*validator);
+ This->onGetItemText = onGetItemText;
+ This->onGetItemAttr = onGetItemAttr;
+ This->onGetItemColumnImage = onGetItemColumnImage;
+ This->port = Ecmd.port;
+
  rt.addBool(Result);
  break;
 }
@@ -16095,6 +16130,106 @@ case wxListItem_SetWidth: { // wxListItem::SetWidth
  This->SetWidth((int) *width);
  break;
 }
+case wxListItemAttr_new_0: { // wxListItemAttr::wxListItemAttr
+ wxListItemAttr * Result = new wxListItemAttr();
+ newPtr((void *) Result, 101, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxListItemAttr");
+ break;
+}
+case wxListItemAttr_new_3: { // wxListItemAttr::wxListItemAttr
+ int * colTextR = (int *) bp; bp += 4;
+ int * colTextG = (int *) bp; bp += 4;
+ int * colTextB = (int *) bp; bp += 4;
+ int * colTextA = (int *) bp; bp += 4;
+ wxColour colText = wxColour(*colTextR,*colTextG,*colTextB,*colTextA);
+ int * colBackR = (int *) bp; bp += 4;
+ int * colBackG = (int *) bp; bp += 4;
+ int * colBackB = (int *) bp; bp += 4;
+ int * colBackA = (int *) bp; bp += 4;
+ wxColour colBack = wxColour(*colBackR,*colBackG,*colBackB,*colBackA);
+ wxFont *font = (wxFont *) getPtr(bp,memenv); bp += 4;
+ wxListItemAttr * Result = new wxListItemAttr(colText,colBack,*font);
+ newPtr((void *) Result, 101, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxListItemAttr");
+ break;
+}
+case wxListItemAttr_GetBackgroundColour: { // wxListItemAttr::GetBackgroundColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ const wxColour * Result = &This->GetBackgroundColour();
+ rt.add((*Result));
+ break;
+}
+case wxListItemAttr_GetFont: { // wxListItemAttr::GetFont
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ const wxFont * Result = &This->GetFont();
+ rt.addRef(getRef((void *)Result,memenv), "wxFont");
+ break;
+}
+case wxListItemAttr_GetTextColour: { // wxListItemAttr::GetTextColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ const wxColour * Result = &This->GetTextColour();
+ rt.add((*Result));
+ break;
+}
+case wxListItemAttr_HasBackgroundColour: { // wxListItemAttr::HasBackgroundColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->HasBackgroundColour();
+ rt.addBool(Result);
+ break;
+}
+case wxListItemAttr_HasFont: { // wxListItemAttr::HasFont
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->HasFont();
+ rt.addBool(Result);
+ break;
+}
+case wxListItemAttr_HasTextColour: { // wxListItemAttr::HasTextColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->HasTextColour();
+ rt.addBool(Result);
+ break;
+}
+case wxListItemAttr_SetBackgroundColour: { // wxListItemAttr::SetBackgroundColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ int * colBackR = (int *) bp; bp += 4;
+ int * colBackG = (int *) bp; bp += 4;
+ int * colBackB = (int *) bp; bp += 4;
+ int * colBackA = (int *) bp; bp += 4;
+ wxColour colBack = wxColour(*colBackR,*colBackG,*colBackB,*colBackA);
+ if(!This) throw wxe_badarg(0);
+ This->SetBackgroundColour(colBack);
+ break;
+}
+case wxListItemAttr_SetFont: { // wxListItemAttr::SetFont
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ wxFont *font = (wxFont *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ This->SetFont(*font);
+ break;
+}
+case wxListItemAttr_SetTextColour: { // wxListItemAttr::SetTextColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ int * colTextR = (int *) bp; bp += 4;
+ int * colTextG = (int *) bp; bp += 4;
+ int * colTextB = (int *) bp; bp += 4;
+ int * colTextA = (int *) bp; bp += 4;
+ wxColour colText = wxColour(*colTextR,*colTextG,*colTextB,*colTextA);
+ if(!This) throw wxe_badarg(0);
+ This->SetTextColour(colText);
+ break;
+}
+case wxListItemAttr_destroy: { // wxListItemAttr::destroy
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(This) {   ((WxeApp *) wxTheApp)->clearPtr((void *) This);
+   delete This;}
+ break;
+}
 case wxImageList_new_0: { // wxImageList::wxImageList
  wxImageList * Result = new EwxImageList();
  newPtr((void *) Result, 1, memenv);
@@ -16263,7 +16398,7 @@ case wxImageList_Replace_3: { // wxImageList::Replace
 }
 case wxTextAttr_new_0: { // wxTextAttr::wxTextAttr
  wxTextAttr * Result = new wxTextAttr();
- newPtr((void *) Result, 102, memenv);
+ newPtr((void *) Result, 103, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextAttr");
  break;
 }
@@ -16293,7 +16428,7 @@ alignment = *(wxTextAttrAlignment *) bp; bp += 4;;
   } break;
  }};
  wxTextAttr * Result = new wxTextAttr(colText,colBack,*font,(wxTextAttrAlignment) alignment);
- newPtr((void *) Result, 102, memenv);
+ newPtr((void *) Result, 103, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextAttr");
  break;
 }
@@ -22711,7 +22846,7 @@ case wxPreviewFrame_new: { // wxPreviewFrame::wxPreviewFrame
  wxString title= wxT("Print Preview");
  wxPoint pos= wxDefaultPosition;
  wxSize size= wxDefaultSize;
- long style=wxDEFAULT_FRAME_STYLE;
+ long style=wxDEFAULT_FRAME_STYLE|wxFRAME_FLOAT_ON_PARENT;
  wxPrintPreview *preview = (wxPrintPreview *) getPtr(bp,memenv); bp += 4;
  wxWindow *parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
  while( * (int*) bp) { switch (* (int*) bp) {
@@ -23742,14 +23877,14 @@ case wxAuiManager_Update: { // wxAuiManager::Update
 #if wxUSE_AUI
 case wxAuiPaneInfo_new_0: { // wxAuiPaneInfo::wxAuiPaneInfo
  wxAuiPaneInfo * Result = new wxAuiPaneInfo();
- newPtr((void *) Result, 154, memenv);
+ newPtr((void *) Result, 155, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
 case wxAuiPaneInfo_new_1: { // wxAuiPaneInfo::wxAuiPaneInfo
  wxAuiPaneInfo *c = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  wxAuiPaneInfo * Result = new wxAuiPaneInfo(*c);
- newPtr((void *) Result, 154, memenv);
+ newPtr((void *) Result, 155, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -30292,7 +30427,7 @@ case wxNotebookEvent_SetSelection: { // wxNotebookEvent::SetSelection
 }
 case wxFileDataObject_new: { // wxFileDataObject::wxFileDataObject
  wxFileDataObject * Result = new wxFileDataObject();
- newPtr((void *) Result, 211, memenv);
+ newPtr((void *) Result, 212, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFileDataObject");
  break;
 }
@@ -30328,7 +30463,7 @@ case wxTextDataObject_new: { // wxTextDataObject::wxTextDataObject
   } break;
  }};
  wxTextDataObject * Result = new wxTextDataObject(text);
- newPtr((void *) Result, 212, memenv);
+ newPtr((void *) Result, 213, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextDataObject");
  break;
 }
@@ -30364,7 +30499,7 @@ case wxTextDataObject_destroy: { // wxTextDataObject::destroy
 case wxBitmapDataObject_new_1_1: { // wxBitmapDataObject::wxBitmapDataObject
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  wxBitmapDataObject * Result = new wxBitmapDataObject(*bitmap);
- newPtr((void *) Result, 213, memenv);
+ newPtr((void *) Result, 214, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmapDataObject");
  break;
 }
@@ -30376,7 +30511,7 @@ bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  wxBitmapDataObject * Result = new wxBitmapDataObject(*bitmap);
- newPtr((void *) Result, 213, memenv);
+ newPtr((void *) Result, 214, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmapDataObject");
  break;
 }
@@ -31159,7 +31294,7 @@ case wxAuiManagerEvent_CanVeto: { // wxAuiManagerEvent::CanVeto
 }
 case wxLogNull_new: { // wxLogNull::wxLogNull
  wxLogNull * Result = new wxLogNull();
- newPtr((void *) Result, 223, memenv);
+ newPtr((void *) Result, 224, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxLogNull");
  break;
 }
@@ -31188,3 +31323,31 @@ case wxLogNull_destroy: { // wxLogNull::destroy
     error.addTupleCount(3);
     error.send();
 }} /* The End */
+
+
+void WxeApp::delete_object(void *ptr, wxeRefData *refd) {
+ switch(refd->type) {
+  case 24: delete (wxGridCellBoolRenderer *) ptr; break;
+  case 25: delete (wxGridCellBoolEditor *) ptr; break;
+  case 26: delete (wxGridCellFloatRenderer *) ptr; break;
+  case 27: delete (wxGridCellFloatEditor *) ptr; break;
+  case 28: delete (wxGridCellStringRenderer *) ptr; break;
+  case 29: delete (wxGridCellTextEditor *) ptr; break;
+  case 30: delete (wxGridCellChoiceEditor *) ptr; break;
+  case 31: delete (wxGridCellNumberRenderer *) ptr; break;
+  case 32: delete (wxGridCellNumberEditor *) ptr; break;
+  case 61: delete (wxIconBundle *) ptr; break;
+  case 69: delete (wxAcceleratorEntry *) ptr; break;
+  case 70: /* delete (wxCaret *) ptr;These objects must be deleted by owner object */ break;
+  case 72: delete (wxSizerFlags *) ptr; break;
+  case 88: /* delete (wxCalendarDateAttr *) ptr;These objects must be deleted by owner object */ break;
+  case 101: delete (wxListItemAttr *) ptr; break;
+  case 103: delete (wxTextAttr *) ptr; break;
+  case 155: delete (wxAuiPaneInfo *) ptr; break;
+  case 212: /* delete (wxFileDataObject *) ptr;These objects must be deleted by owner object */ break;
+  case 213: /* delete (wxTextDataObject *) ptr;These objects must be deleted by owner object */ break;
+  case 214: /* delete (wxBitmapDataObject *) ptr;These objects must be deleted by owner object */ break;
+  case 224: delete (wxLogNull *) ptr; break;
+  default: delete (wxObject *) ptr;
+}}
+
diff --git a/lib/wx/c_src/gen/wxe_init.cpp b/lib/wx/c_src/gen/wxe_init.cpp
index bab3261be4..a75298392b 100644
--- a/lib/wx/c_src/gen/wxe_init.cpp
+++ b/lib/wx/c_src/gen/wxe_init.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. 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
diff --git a/lib/wx/c_src/gen/wxe_macros.h b/lib/wx/c_src/gen/wxe_macros.h
index 4fb76f960b..be0481564f 100644
--- a/lib/wx/c_src/gen/wxe_macros.h
+++ b/lib/wx/c_src/gen/wxe_macros.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. 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
@@ -1648,1683 +1648,1695 @@
 #define wxListItem_SetText 1754
 #define wxListItem_SetTextColour 1755
 #define wxListItem_SetWidth 1756
-#define wxImageList_new_0 1757
-#define wxImageList_new_3 1758
-#define wxImageList_Add_1 1759
-#define wxImageList_Add_2_0 1760
-#define wxImageList_Add_2_1 1761
-#define wxImageList_Create 1762
-#define wxImageList_Draw 1764
-#define wxImageList_GetBitmap 1765
-#define wxImageList_GetIcon 1766
-#define wxImageList_GetImageCount 1767
-#define wxImageList_GetSize 1768
-#define wxImageList_Remove 1769
-#define wxImageList_RemoveAll 1770
-#define wxImageList_Replace_2 1771
-#define wxImageList_Replace_3 1772
-#define wxImageList_destroy 1773
-#define wxTextAttr_new_0 1774
-#define wxTextAttr_new_2 1775
-#define wxTextAttr_GetAlignment 1776
-#define wxTextAttr_GetBackgroundColour 1777
-#define wxTextAttr_GetFont 1778
-#define wxTextAttr_GetLeftIndent 1779
-#define wxTextAttr_GetLeftSubIndent 1780
-#define wxTextAttr_GetRightIndent 1781
-#define wxTextAttr_GetTabs 1782
-#define wxTextAttr_GetTextColour 1783
-#define wxTextAttr_HasBackgroundColour 1784
-#define wxTextAttr_HasFont 1785
-#define wxTextAttr_HasTextColour 1786
-#define wxTextAttr_GetFlags 1787
-#define wxTextAttr_IsDefault 1788
-#define wxTextAttr_SetAlignment 1789
-#define wxTextAttr_SetBackgroundColour 1790
-#define wxTextAttr_SetFlags 1791
-#define wxTextAttr_SetFont 1792
-#define wxTextAttr_SetLeftIndent 1793
-#define wxTextAttr_SetRightIndent 1794
-#define wxTextAttr_SetTabs 1795
-#define wxTextAttr_SetTextColour 1796
-#define wxTextAttr_destroy 1797
-#define wxTextCtrl_new_3 1799
-#define wxTextCtrl_new_0 1800
-#define wxTextCtrl_destruct 1802
-#define wxTextCtrl_AppendText 1803
-#define wxTextCtrl_CanCopy 1804
-#define wxTextCtrl_CanCut 1805
-#define wxTextCtrl_CanPaste 1806
-#define wxTextCtrl_CanRedo 1807
-#define wxTextCtrl_CanUndo 1808
-#define wxTextCtrl_Clear 1809
-#define wxTextCtrl_Copy 1810
-#define wxTextCtrl_Create 1811
-#define wxTextCtrl_Cut 1812
-#define wxTextCtrl_DiscardEdits 1813
-#define wxTextCtrl_EmulateKeyPress 1814
-#define wxTextCtrl_GetDefaultStyle 1815
-#define wxTextCtrl_GetInsertionPoint 1816
-#define wxTextCtrl_GetLastPosition 1817
-#define wxTextCtrl_GetLineLength 1818
-#define wxTextCtrl_GetLineText 1819
-#define wxTextCtrl_GetNumberOfLines 1820
-#define wxTextCtrl_GetRange 1821
-#define wxTextCtrl_GetSelection 1822
-#define wxTextCtrl_GetStringSelection 1823
-#define wxTextCtrl_GetStyle 1824
-#define wxTextCtrl_GetValue 1825
-#define wxTextCtrl_IsEditable 1826
-#define wxTextCtrl_IsModified 1827
-#define wxTextCtrl_IsMultiLine 1828
-#define wxTextCtrl_IsSingleLine 1829
-#define wxTextCtrl_LoadFile 1830
-#define wxTextCtrl_MarkDirty 1831
-#define wxTextCtrl_Paste 1832
-#define wxTextCtrl_PositionToXY 1833
-#define wxTextCtrl_Redo 1834
-#define wxTextCtrl_Remove 1835
-#define wxTextCtrl_Replace 1836
-#define wxTextCtrl_SaveFile 1837
-#define wxTextCtrl_SetDefaultStyle 1838
-#define wxTextCtrl_SetEditable 1839
-#define wxTextCtrl_SetInsertionPoint 1840
-#define wxTextCtrl_SetInsertionPointEnd 1841
-#define wxTextCtrl_SetMaxLength 1843
-#define wxTextCtrl_SetSelection 1844
-#define wxTextCtrl_SetStyle 1845
-#define wxTextCtrl_SetValue 1846
-#define wxTextCtrl_ShowPosition 1847
-#define wxTextCtrl_Undo 1848
-#define wxTextCtrl_WriteText 1849
-#define wxTextCtrl_XYToPosition 1850
-#define wxNotebook_new_0 1853
-#define wxNotebook_new_3 1854
-#define wxNotebook_destruct 1855
-#define wxNotebook_AddPage 1856
-#define wxNotebook_AdvanceSelection 1857
-#define wxNotebook_AssignImageList 1858
-#define wxNotebook_Create 1859
-#define wxNotebook_DeleteAllPages 1860
-#define wxNotebook_DeletePage 1861
-#define wxNotebook_RemovePage 1862
-#define wxNotebook_GetCurrentPage 1863
-#define wxNotebook_GetImageList 1864
-#define wxNotebook_GetPage 1866
-#define wxNotebook_GetPageCount 1867
-#define wxNotebook_GetPageImage 1868
-#define wxNotebook_GetPageText 1869
-#define wxNotebook_GetRowCount 1870
-#define wxNotebook_GetSelection 1871
-#define wxNotebook_GetThemeBackgroundColour 1872
-#define wxNotebook_HitTest 1874
-#define wxNotebook_InsertPage 1876
-#define wxNotebook_SetImageList 1877
-#define wxNotebook_SetPadding 1878
-#define wxNotebook_SetPageSize 1879
-#define wxNotebook_SetPageImage 1880
-#define wxNotebook_SetPageText 1881
-#define wxNotebook_SetSelection 1882
-#define wxNotebook_ChangeSelection 1883
-#define wxChoicebook_new_0 1884
-#define wxChoicebook_new_3 1885
-#define wxChoicebook_AddPage 1886
-#define wxChoicebook_AdvanceSelection 1887
-#define wxChoicebook_AssignImageList 1888
-#define wxChoicebook_Create 1889
-#define wxChoicebook_DeleteAllPages 1890
-#define wxChoicebook_DeletePage 1891
-#define wxChoicebook_RemovePage 1892
-#define wxChoicebook_GetCurrentPage 1893
-#define wxChoicebook_GetImageList 1894
-#define wxChoicebook_GetPage 1896
-#define wxChoicebook_GetPageCount 1897
-#define wxChoicebook_GetPageImage 1898
-#define wxChoicebook_GetPageText 1899
-#define wxChoicebook_GetSelection 1900
-#define wxChoicebook_HitTest 1901
-#define wxChoicebook_InsertPage 1902
-#define wxChoicebook_SetImageList 1903
-#define wxChoicebook_SetPageSize 1904
-#define wxChoicebook_SetPageImage 1905
-#define wxChoicebook_SetPageText 1906
-#define wxChoicebook_SetSelection 1907
-#define wxChoicebook_ChangeSelection 1908
-#define wxChoicebook_destroy 1909
-#define wxToolbook_new_0 1910
-#define wxToolbook_new_3 1911
-#define wxToolbook_AddPage 1912
-#define wxToolbook_AdvanceSelection 1913
-#define wxToolbook_AssignImageList 1914
-#define wxToolbook_Create 1915
-#define wxToolbook_DeleteAllPages 1916
-#define wxToolbook_DeletePage 1917
-#define wxToolbook_RemovePage 1918
-#define wxToolbook_GetCurrentPage 1919
-#define wxToolbook_GetImageList 1920
-#define wxToolbook_GetPage 1922
-#define wxToolbook_GetPageCount 1923
-#define wxToolbook_GetPageImage 1924
-#define wxToolbook_GetPageText 1925
-#define wxToolbook_GetSelection 1926
-#define wxToolbook_HitTest 1928
-#define wxToolbook_InsertPage 1929
-#define wxToolbook_SetImageList 1930
-#define wxToolbook_SetPageSize 1931
-#define wxToolbook_SetPageImage 1932
-#define wxToolbook_SetPageText 1933
-#define wxToolbook_SetSelection 1934
-#define wxToolbook_ChangeSelection 1935
-#define wxToolbook_destroy 1936
-#define wxListbook_new_0 1937
-#define wxListbook_new_3 1938
-#define wxListbook_AddPage 1939
-#define wxListbook_AdvanceSelection 1940
-#define wxListbook_AssignImageList 1941
-#define wxListbook_Create 1942
-#define wxListbook_DeleteAllPages 1943
-#define wxListbook_DeletePage 1944
-#define wxListbook_RemovePage 1945
-#define wxListbook_GetCurrentPage 1946
-#define wxListbook_GetImageList 1947
-#define wxListbook_GetPage 1949
-#define wxListbook_GetPageCount 1950
-#define wxListbook_GetPageImage 1951
-#define wxListbook_GetPageText 1952
-#define wxListbook_GetSelection 1953
-#define wxListbook_HitTest 1955
-#define wxListbook_InsertPage 1956
-#define wxListbook_SetImageList 1957
-#define wxListbook_SetPageSize 1958
-#define wxListbook_SetPageImage 1959
-#define wxListbook_SetPageText 1960
-#define wxListbook_SetSelection 1961
-#define wxListbook_ChangeSelection 1962
-#define wxListbook_destroy 1963
-#define wxTreebook_new_0 1964
-#define wxTreebook_new_3 1965
-#define wxTreebook_AddPage 1966
-#define wxTreebook_AdvanceSelection 1967
-#define wxTreebook_AssignImageList 1968
-#define wxTreebook_Create 1969
-#define wxTreebook_DeleteAllPages 1970
-#define wxTreebook_DeletePage 1971
-#define wxTreebook_RemovePage 1972
-#define wxTreebook_GetCurrentPage 1973
-#define wxTreebook_GetImageList 1974
-#define wxTreebook_GetPage 1976
-#define wxTreebook_GetPageCount 1977
-#define wxTreebook_GetPageImage 1978
-#define wxTreebook_GetPageText 1979
-#define wxTreebook_GetSelection 1980
-#define wxTreebook_ExpandNode 1981
-#define wxTreebook_IsNodeExpanded 1982
-#define wxTreebook_HitTest 1984
-#define wxTreebook_InsertPage 1985
-#define wxTreebook_InsertSubPage 1986
-#define wxTreebook_SetImageList 1987
-#define wxTreebook_SetPageSize 1988
-#define wxTreebook_SetPageImage 1989
-#define wxTreebook_SetPageText 1990
-#define wxTreebook_SetSelection 1991
-#define wxTreebook_ChangeSelection 1992
-#define wxTreebook_destroy 1993
-#define wxTreeCtrl_new_2 1996
-#define wxTreeCtrl_new_0 1997
-#define wxTreeCtrl_destruct 1999
-#define wxTreeCtrl_AddRoot 2000
-#define wxTreeCtrl_AppendItem 2001
-#define wxTreeCtrl_AssignImageList 2002
-#define wxTreeCtrl_AssignStateImageList 2003
-#define wxTreeCtrl_Collapse 2004
-#define wxTreeCtrl_CollapseAndReset 2005
-#define wxTreeCtrl_Create 2006
-#define wxTreeCtrl_Delete 2007
-#define wxTreeCtrl_DeleteAllItems 2008
-#define wxTreeCtrl_DeleteChildren 2009
-#define wxTreeCtrl_EditLabel 2010
-#define wxTreeCtrl_EnsureVisible 2011
-#define wxTreeCtrl_Expand 2012
-#define wxTreeCtrl_GetBoundingRect 2013
-#define wxTreeCtrl_GetChildrenCount 2015
-#define wxTreeCtrl_GetCount 2016
-#define wxTreeCtrl_GetEditControl 2017
-#define wxTreeCtrl_GetFirstChild 2018
-#define wxTreeCtrl_GetNextChild 2019
-#define wxTreeCtrl_GetFirstVisibleItem 2020
-#define wxTreeCtrl_GetImageList 2021
-#define wxTreeCtrl_GetIndent 2022
-#define wxTreeCtrl_GetItemBackgroundColour 2023
-#define wxTreeCtrl_GetItemData 2024
-#define wxTreeCtrl_GetItemFont 2025
-#define wxTreeCtrl_GetItemImage_1 2026
-#define wxTreeCtrl_GetItemImage_2 2027
-#define wxTreeCtrl_GetItemText 2028
-#define wxTreeCtrl_GetItemTextColour 2029
-#define wxTreeCtrl_GetLastChild 2030
-#define wxTreeCtrl_GetNextSibling 2031
-#define wxTreeCtrl_GetNextVisible 2032
-#define wxTreeCtrl_GetItemParent 2033
-#define wxTreeCtrl_GetPrevSibling 2034
-#define wxTreeCtrl_GetPrevVisible 2035
-#define wxTreeCtrl_GetRootItem 2036
-#define wxTreeCtrl_GetSelection 2037
-#define wxTreeCtrl_GetSelections 2038
-#define wxTreeCtrl_GetStateImageList 2039
-#define wxTreeCtrl_HitTest 2040
-#define wxTreeCtrl_InsertItem 2042
-#define wxTreeCtrl_IsBold 2043
-#define wxTreeCtrl_IsExpanded 2044
-#define wxTreeCtrl_IsSelected 2045
-#define wxTreeCtrl_IsVisible 2046
-#define wxTreeCtrl_ItemHasChildren 2047
-#define wxTreeCtrl_PrependItem 2048
-#define wxTreeCtrl_ScrollTo 2049
-#define wxTreeCtrl_SelectItem_1 2050
-#define wxTreeCtrl_SelectItem_2 2051
-#define wxTreeCtrl_SetIndent 2052
-#define wxTreeCtrl_SetImageList 2053
-#define wxTreeCtrl_SetItemBackgroundColour 2054
-#define wxTreeCtrl_SetItemBold 2055
-#define wxTreeCtrl_SetItemData 2056
-#define wxTreeCtrl_SetItemDropHighlight 2057
-#define wxTreeCtrl_SetItemFont 2058
-#define wxTreeCtrl_SetItemHasChildren 2059
-#define wxTreeCtrl_SetItemImage_2 2060
-#define wxTreeCtrl_SetItemImage_3 2061
-#define wxTreeCtrl_SetItemText 2062
-#define wxTreeCtrl_SetItemTextColour 2063
-#define wxTreeCtrl_SetStateImageList 2064
-#define wxTreeCtrl_SetWindowStyle 2065
-#define wxTreeCtrl_SortChildren 2066
-#define wxTreeCtrl_Toggle 2067
-#define wxTreeCtrl_ToggleItemSelection 2068
-#define wxTreeCtrl_Unselect 2069
-#define wxTreeCtrl_UnselectAll 2070
-#define wxTreeCtrl_UnselectItem 2071
-#define wxScrollBar_new_0 2072
-#define wxScrollBar_new_3 2073
-#define wxScrollBar_destruct 2074
-#define wxScrollBar_Create 2075
-#define wxScrollBar_GetRange 2076
-#define wxScrollBar_GetPageSize 2077
-#define wxScrollBar_GetThumbPosition 2078
-#define wxScrollBar_GetThumbSize 2079
-#define wxScrollBar_SetThumbPosition 2080
-#define wxScrollBar_SetScrollbar 2081
-#define wxSpinButton_new_2 2083
-#define wxSpinButton_new_0 2084
-#define wxSpinButton_Create 2085
-#define wxSpinButton_GetMax 2086
-#define wxSpinButton_GetMin 2087
-#define wxSpinButton_GetValue 2088
-#define wxSpinButton_SetRange 2089
-#define wxSpinButton_SetValue 2090
-#define wxSpinButton_destroy 2091
-#define wxSpinCtrl_new_0 2092
-#define wxSpinCtrl_new_2 2093
-#define wxSpinCtrl_Create 2095
-#define wxSpinCtrl_SetValue_1_1 2098
-#define wxSpinCtrl_SetValue_1_0 2099
-#define wxSpinCtrl_GetValue 2101
-#define wxSpinCtrl_SetRange 2103
-#define wxSpinCtrl_SetSelection 2104
-#define wxSpinCtrl_GetMin 2106
-#define wxSpinCtrl_GetMax 2108
-#define wxSpinCtrl_destroy 2109
-#define wxStaticText_new_0 2110
-#define wxStaticText_new_4 2111
-#define wxStaticText_Create 2112
-#define wxStaticText_GetLabel 2113
-#define wxStaticText_SetLabel 2114
-#define wxStaticText_Wrap 2115
-#define wxStaticText_destroy 2116
-#define wxStaticBitmap_new_0 2117
-#define wxStaticBitmap_new_4 2118
-#define wxStaticBitmap_Create 2119
-#define wxStaticBitmap_GetBitmap 2120
-#define wxStaticBitmap_SetBitmap 2121
-#define wxStaticBitmap_destroy 2122
-#define wxRadioBox_new 2123
-#define wxRadioBox_destruct 2125
-#define wxRadioBox_Create 2126
-#define wxRadioBox_Enable_2 2127
-#define wxRadioBox_Enable_1 2128
-#define wxRadioBox_GetSelection 2129
-#define wxRadioBox_GetString 2130
-#define wxRadioBox_SetSelection 2131
-#define wxRadioBox_Show_2 2132
-#define wxRadioBox_Show_1 2133
-#define wxRadioBox_GetColumnCount 2134
-#define wxRadioBox_GetItemHelpText 2135
-#define wxRadioBox_GetItemToolTip 2136
-#define wxRadioBox_GetItemFromPoint 2138
-#define wxRadioBox_GetRowCount 2139
-#define wxRadioBox_IsItemEnabled 2140
-#define wxRadioBox_IsItemShown 2141
-#define wxRadioBox_SetItemHelpText 2142
-#define wxRadioBox_SetItemToolTip 2143
-#define wxRadioButton_new_0 2144
-#define wxRadioButton_new_4 2145
-#define wxRadioButton_Create 2146
-#define wxRadioButton_GetValue 2147
-#define wxRadioButton_SetValue 2148
-#define wxRadioButton_destroy 2149
-#define wxSlider_new_6 2151
-#define wxSlider_new_0 2152
-#define wxSlider_Create 2153
-#define wxSlider_GetLineSize 2154
-#define wxSlider_GetMax 2155
-#define wxSlider_GetMin 2156
-#define wxSlider_GetPageSize 2157
-#define wxSlider_GetThumbLength 2158
-#define wxSlider_GetValue 2159
-#define wxSlider_SetLineSize 2160
-#define wxSlider_SetPageSize 2161
-#define wxSlider_SetRange 2162
-#define wxSlider_SetThumbLength 2163
-#define wxSlider_SetValue 2164
-#define wxSlider_destroy 2165
-#define wxDialog_new_4 2167
-#define wxDialog_new_0 2168
-#define wxDialog_destruct 2170
-#define wxDialog_Create 2171
-#define wxDialog_CreateButtonSizer 2172
-#define wxDialog_CreateStdDialogButtonSizer 2173
-#define wxDialog_EndModal 2174
-#define wxDialog_GetAffirmativeId 2175
-#define wxDialog_GetReturnCode 2176
-#define wxDialog_IsModal 2177
-#define wxDialog_SetAffirmativeId 2178
-#define wxDialog_SetReturnCode 2179
-#define wxDialog_Show 2180
-#define wxDialog_ShowModal 2181
-#define wxColourDialog_new_0 2182
-#define wxColourDialog_new_2 2183
-#define wxColourDialog_destruct 2184
-#define wxColourDialog_Create 2185
-#define wxColourDialog_GetColourData 2186
-#define wxColourData_new_0 2187
-#define wxColourData_new_1 2188
-#define wxColourData_destruct 2189
-#define wxColourData_GetChooseFull 2190
-#define wxColourData_GetColour 2191
-#define wxColourData_GetCustomColour 2193
-#define wxColourData_SetChooseFull 2194
-#define wxColourData_SetColour 2195
-#define wxColourData_SetCustomColour 2196
-#define wxPalette_new_0 2197
-#define wxPalette_new_4 2198
-#define wxPalette_destruct 2200
-#define wxPalette_Create 2201
-#define wxPalette_GetColoursCount 2202
-#define wxPalette_GetPixel 2203
-#define wxPalette_GetRGB 2204
-#define wxPalette_IsOk 2205
-#define wxDirDialog_new 2209
-#define wxDirDialog_destruct 2210
-#define wxDirDialog_GetPath 2211
-#define wxDirDialog_GetMessage 2212
-#define wxDirDialog_SetMessage 2213
-#define wxDirDialog_SetPath 2214
-#define wxFileDialog_new 2218
-#define wxFileDialog_destruct 2219
-#define wxFileDialog_GetDirectory 2220
-#define wxFileDialog_GetFilename 2221
-#define wxFileDialog_GetFilenames 2222
-#define wxFileDialog_GetFilterIndex 2223
-#define wxFileDialog_GetMessage 2224
-#define wxFileDialog_GetPath 2225
-#define wxFileDialog_GetPaths 2226
-#define wxFileDialog_GetWildcard 2227
-#define wxFileDialog_SetDirectory 2228
-#define wxFileDialog_SetFilename 2229
-#define wxFileDialog_SetFilterIndex 2230
-#define wxFileDialog_SetMessage 2231
-#define wxFileDialog_SetPath 2232
-#define wxFileDialog_SetWildcard 2233
-#define wxPickerBase_SetInternalMargin 2234
-#define wxPickerBase_GetInternalMargin 2235
-#define wxPickerBase_SetTextCtrlProportion 2236
-#define wxPickerBase_SetPickerCtrlProportion 2237
-#define wxPickerBase_GetTextCtrlProportion 2238
-#define wxPickerBase_GetPickerCtrlProportion 2239
-#define wxPickerBase_HasTextCtrl 2240
-#define wxPickerBase_GetTextCtrl 2241
-#define wxPickerBase_IsTextCtrlGrowable 2242
-#define wxPickerBase_SetPickerCtrlGrowable 2243
-#define wxPickerBase_SetTextCtrlGrowable 2244
-#define wxPickerBase_IsPickerCtrlGrowable 2245
-#define wxFilePickerCtrl_new_0 2246
-#define wxFilePickerCtrl_new_3 2247
-#define wxFilePickerCtrl_Create 2248
-#define wxFilePickerCtrl_GetPath 2249
-#define wxFilePickerCtrl_SetPath 2250
-#define wxFilePickerCtrl_destroy 2251
-#define wxDirPickerCtrl_new_0 2252
-#define wxDirPickerCtrl_new_3 2253
-#define wxDirPickerCtrl_Create 2254
-#define wxDirPickerCtrl_GetPath 2255
-#define wxDirPickerCtrl_SetPath 2256
-#define wxDirPickerCtrl_destroy 2257
-#define wxColourPickerCtrl_new_0 2258
-#define wxColourPickerCtrl_new_3 2259
-#define wxColourPickerCtrl_Create 2260
-#define wxColourPickerCtrl_GetColour 2261
-#define wxColourPickerCtrl_SetColour_1_1 2262
-#define wxColourPickerCtrl_SetColour_1_0 2263
-#define wxColourPickerCtrl_destroy 2264
-#define wxDatePickerCtrl_new_0 2265
-#define wxDatePickerCtrl_new_3 2266
-#define wxDatePickerCtrl_GetRange 2267
-#define wxDatePickerCtrl_GetValue 2268
-#define wxDatePickerCtrl_SetRange 2269
-#define wxDatePickerCtrl_SetValue 2270
-#define wxDatePickerCtrl_destroy 2271
-#define wxFontPickerCtrl_new_0 2272
-#define wxFontPickerCtrl_new_3 2273
-#define wxFontPickerCtrl_Create 2274
-#define wxFontPickerCtrl_GetSelectedFont 2275
-#define wxFontPickerCtrl_SetSelectedFont 2276
-#define wxFontPickerCtrl_GetMaxPointSize 2277
-#define wxFontPickerCtrl_SetMaxPointSize 2278
-#define wxFontPickerCtrl_destroy 2279
-#define wxFindReplaceDialog_new_0 2282
-#define wxFindReplaceDialog_new_4 2283
-#define wxFindReplaceDialog_destruct 2284
-#define wxFindReplaceDialog_Create 2285
-#define wxFindReplaceDialog_GetData 2286
-#define wxFindReplaceData_new_0 2287
-#define wxFindReplaceData_new_1 2288
-#define wxFindReplaceData_GetFindString 2289
-#define wxFindReplaceData_GetReplaceString 2290
-#define wxFindReplaceData_GetFlags 2291
-#define wxFindReplaceData_SetFlags 2292
-#define wxFindReplaceData_SetFindString 2293
-#define wxFindReplaceData_SetReplaceString 2294
-#define wxFindReplaceData_destroy 2295
-#define wxMultiChoiceDialog_new_0 2296
-#define wxMultiChoiceDialog_new_5 2298
-#define wxMultiChoiceDialog_GetSelections 2299
-#define wxMultiChoiceDialog_SetSelections 2300
-#define wxMultiChoiceDialog_destroy 2301
-#define wxSingleChoiceDialog_new_0 2302
-#define wxSingleChoiceDialog_new_5 2304
-#define wxSingleChoiceDialog_GetSelection 2305
-#define wxSingleChoiceDialog_GetStringSelection 2306
-#define wxSingleChoiceDialog_SetSelection 2307
-#define wxSingleChoiceDialog_destroy 2308
-#define wxTextEntryDialog_new 2309
-#define wxTextEntryDialog_GetValue 2310
-#define wxTextEntryDialog_SetValue 2311
-#define wxTextEntryDialog_destroy 2312
-#define wxPasswordEntryDialog_new 2313
-#define wxPasswordEntryDialog_destroy 2314
-#define wxFontData_new_0 2315
-#define wxFontData_new_1 2316
-#define wxFontData_destruct 2317
-#define wxFontData_EnableEffects 2318
-#define wxFontData_GetAllowSymbols 2319
-#define wxFontData_GetColour 2320
-#define wxFontData_GetChosenFont 2321
-#define wxFontData_GetEnableEffects 2322
-#define wxFontData_GetInitialFont 2323
-#define wxFontData_GetShowHelp 2324
-#define wxFontData_SetAllowSymbols 2325
-#define wxFontData_SetChosenFont 2326
-#define wxFontData_SetColour 2327
-#define wxFontData_SetInitialFont 2328
-#define wxFontData_SetRange 2329
-#define wxFontData_SetShowHelp 2330
-#define wxFontDialog_new_0 2334
-#define wxFontDialog_new_2 2336
-#define wxFontDialog_Create 2338
-#define wxFontDialog_GetFontData 2339
-#define wxFontDialog_destroy 2341
-#define wxProgressDialog_new 2342
-#define wxProgressDialog_destruct 2343
-#define wxProgressDialog_Resume 2344
-#define wxProgressDialog_Update_2 2345
-#define wxProgressDialog_Update_0 2346
-#define wxMessageDialog_new 2347
-#define wxMessageDialog_destruct 2348
-#define wxPageSetupDialog_new 2349
-#define wxPageSetupDialog_destruct 2350
-#define wxPageSetupDialog_GetPageSetupData 2351
-#define wxPageSetupDialog_ShowModal 2352
-#define wxPageSetupDialogData_new_0 2353
-#define wxPageSetupDialogData_new_1_0 2354
-#define wxPageSetupDialogData_new_1_1 2355
-#define wxPageSetupDialogData_destruct 2356
-#define wxPageSetupDialogData_EnableHelp 2357
-#define wxPageSetupDialogData_EnableMargins 2358
-#define wxPageSetupDialogData_EnableOrientation 2359
-#define wxPageSetupDialogData_EnablePaper 2360
-#define wxPageSetupDialogData_EnablePrinter 2361
-#define wxPageSetupDialogData_GetDefaultMinMargins 2362
-#define wxPageSetupDialogData_GetEnableMargins 2363
-#define wxPageSetupDialogData_GetEnableOrientation 2364
-#define wxPageSetupDialogData_GetEnablePaper 2365
-#define wxPageSetupDialogData_GetEnablePrinter 2366
-#define wxPageSetupDialogData_GetEnableHelp 2367
-#define wxPageSetupDialogData_GetDefaultInfo 2368
-#define wxPageSetupDialogData_GetMarginTopLeft 2369
-#define wxPageSetupDialogData_GetMarginBottomRight 2370
-#define wxPageSetupDialogData_GetMinMarginTopLeft 2371
-#define wxPageSetupDialogData_GetMinMarginBottomRight 2372
-#define wxPageSetupDialogData_GetPaperId 2373
-#define wxPageSetupDialogData_GetPaperSize 2374
-#define wxPageSetupDialogData_GetPrintData 2376
-#define wxPageSetupDialogData_IsOk 2377
-#define wxPageSetupDialogData_SetDefaultInfo 2378
-#define wxPageSetupDialogData_SetDefaultMinMargins 2379
-#define wxPageSetupDialogData_SetMarginTopLeft 2380
-#define wxPageSetupDialogData_SetMarginBottomRight 2381
-#define wxPageSetupDialogData_SetMinMarginTopLeft 2382
-#define wxPageSetupDialogData_SetMinMarginBottomRight 2383
-#define wxPageSetupDialogData_SetPaperId 2384
-#define wxPageSetupDialogData_SetPaperSize_1_1 2385
-#define wxPageSetupDialogData_SetPaperSize_1_0 2386
-#define wxPageSetupDialogData_SetPrintData 2387
-#define wxPrintDialog_new_2_0 2388
-#define wxPrintDialog_new_2_1 2389
-#define wxPrintDialog_destruct 2390
-#define wxPrintDialog_GetPrintDialogData 2391
-#define wxPrintDialog_GetPrintDC 2392
-#define wxPrintDialogData_new_0 2393
-#define wxPrintDialogData_new_1_1 2394
-#define wxPrintDialogData_new_1_0 2395
-#define wxPrintDialogData_destruct 2396
-#define wxPrintDialogData_EnableHelp 2397
-#define wxPrintDialogData_EnablePageNumbers 2398
-#define wxPrintDialogData_EnablePrintToFile 2399
-#define wxPrintDialogData_EnableSelection 2400
-#define wxPrintDialogData_GetAllPages 2401
-#define wxPrintDialogData_GetCollate 2402
-#define wxPrintDialogData_GetFromPage 2403
-#define wxPrintDialogData_GetMaxPage 2404
-#define wxPrintDialogData_GetMinPage 2405
-#define wxPrintDialogData_GetNoCopies 2406
-#define wxPrintDialogData_GetPrintData 2407
-#define wxPrintDialogData_GetPrintToFile 2408
-#define wxPrintDialogData_GetSelection 2409
-#define wxPrintDialogData_GetToPage 2410
-#define wxPrintDialogData_IsOk 2411
-#define wxPrintDialogData_SetCollate 2412
-#define wxPrintDialogData_SetFromPage 2413
-#define wxPrintDialogData_SetMaxPage 2414
-#define wxPrintDialogData_SetMinPage 2415
-#define wxPrintDialogData_SetNoCopies 2416
-#define wxPrintDialogData_SetPrintData 2417
-#define wxPrintDialogData_SetPrintToFile 2418
-#define wxPrintDialogData_SetSelection 2419
-#define wxPrintDialogData_SetToPage 2420
-#define wxPrintData_new_0 2421
-#define wxPrintData_new_1 2422
-#define wxPrintData_destruct 2423
-#define wxPrintData_GetCollate 2424
-#define wxPrintData_GetBin 2425
-#define wxPrintData_GetColour 2426
-#define wxPrintData_GetDuplex 2427
-#define wxPrintData_GetNoCopies 2428
-#define wxPrintData_GetOrientation 2429
-#define wxPrintData_GetPaperId 2430
-#define wxPrintData_GetPrinterName 2431
-#define wxPrintData_GetQuality 2432
-#define wxPrintData_IsOk 2433
-#define wxPrintData_SetBin 2434
-#define wxPrintData_SetCollate 2435
-#define wxPrintData_SetColour 2436
-#define wxPrintData_SetDuplex 2437
-#define wxPrintData_SetNoCopies 2438
-#define wxPrintData_SetOrientation 2439
-#define wxPrintData_SetPaperId 2440
-#define wxPrintData_SetPrinterName 2441
-#define wxPrintData_SetQuality 2442
-#define wxPrintPreview_new_2 2445
-#define wxPrintPreview_new_3 2446
-#define wxPrintPreview_destruct 2448
-#define wxPrintPreview_GetCanvas 2449
-#define wxPrintPreview_GetCurrentPage 2450
-#define wxPrintPreview_GetFrame 2451
-#define wxPrintPreview_GetMaxPage 2452
-#define wxPrintPreview_GetMinPage 2453
-#define wxPrintPreview_GetPrintout 2454
-#define wxPrintPreview_GetPrintoutForPrinting 2455
-#define wxPrintPreview_IsOk 2456
-#define wxPrintPreview_PaintPage 2457
-#define wxPrintPreview_Print 2458
-#define wxPrintPreview_RenderPage 2459
-#define wxPrintPreview_SetCanvas 2460
-#define wxPrintPreview_SetCurrentPage 2461
-#define wxPrintPreview_SetFrame 2462
-#define wxPrintPreview_SetPrintout 2463
-#define wxPrintPreview_SetZoom 2464
-#define wxPreviewFrame_new 2465
-#define wxPreviewFrame_destruct 2466
-#define wxPreviewFrame_CreateControlBar 2467
-#define wxPreviewFrame_CreateCanvas 2468
-#define wxPreviewFrame_Initialize 2469
-#define wxPreviewFrame_OnCloseWindow 2470
-#define wxPreviewControlBar_new 2471
-#define wxPreviewControlBar_destruct 2472
-#define wxPreviewControlBar_CreateButtons 2473
-#define wxPreviewControlBar_GetPrintPreview 2474
-#define wxPreviewControlBar_GetZoomControl 2475
-#define wxPreviewControlBar_SetZoomControl 2476
-#define wxPrinter_new 2478
-#define wxPrinter_CreateAbortWindow 2479
-#define wxPrinter_GetAbort 2480
-#define wxPrinter_GetLastError 2481
-#define wxPrinter_GetPrintDialogData 2482
-#define wxPrinter_Print 2483
-#define wxPrinter_PrintDialog 2484
-#define wxPrinter_ReportError 2485
-#define wxPrinter_Setup 2486
-#define wxPrinter_destroy 2487
-#define wxXmlResource_new_1 2488
-#define wxXmlResource_new_2 2489
-#define wxXmlResource_destruct 2490
-#define wxXmlResource_AttachUnknownControl 2491
-#define wxXmlResource_ClearHandlers 2492
-#define wxXmlResource_CompareVersion 2493
-#define wxXmlResource_Get 2494
-#define wxXmlResource_GetFlags 2495
-#define wxXmlResource_GetVersion 2496
-#define wxXmlResource_GetXRCID 2497
-#define wxXmlResource_InitAllHandlers 2498
-#define wxXmlResource_Load 2499
-#define wxXmlResource_LoadBitmap 2500
-#define wxXmlResource_LoadDialog_2 2501
-#define wxXmlResource_LoadDialog_3 2502
-#define wxXmlResource_LoadFrame_2 2503
-#define wxXmlResource_LoadFrame_3 2504
-#define wxXmlResource_LoadIcon 2505
-#define wxXmlResource_LoadMenu 2506
-#define wxXmlResource_LoadMenuBar_2 2507
-#define wxXmlResource_LoadMenuBar_1 2508
-#define wxXmlResource_LoadPanel_2 2509
-#define wxXmlResource_LoadPanel_3 2510
-#define wxXmlResource_LoadToolBar 2511
-#define wxXmlResource_Set 2512
-#define wxXmlResource_SetFlags 2513
-#define wxXmlResource_Unload 2514
-#define wxXmlResource_xrcctrl 2515
-#define wxHtmlEasyPrinting_new 2516
-#define wxHtmlEasyPrinting_destruct 2517
-#define wxHtmlEasyPrinting_GetPrintData 2518
-#define wxHtmlEasyPrinting_GetPageSetupData 2519
-#define wxHtmlEasyPrinting_PreviewFile 2520
-#define wxHtmlEasyPrinting_PreviewText 2521
-#define wxHtmlEasyPrinting_PrintFile 2522
-#define wxHtmlEasyPrinting_PrintText 2523
-#define wxHtmlEasyPrinting_PageSetup 2524
-#define wxHtmlEasyPrinting_SetFonts 2525
-#define wxHtmlEasyPrinting_SetHeader 2526
-#define wxHtmlEasyPrinting_SetFooter 2527
-#define wxGLCanvas_new_2 2529
-#define wxGLCanvas_new_3_1 2530
-#define wxGLCanvas_new_3_0 2531
-#define wxGLCanvas_GetContext 2532
-#define wxGLCanvas_SetCurrent 2534
-#define wxGLCanvas_SwapBuffers 2535
-#define wxGLCanvas_destroy 2536
-#define wxAuiManager_new 2537
-#define wxAuiManager_destruct 2538
-#define wxAuiManager_AddPane_2_1 2539
-#define wxAuiManager_AddPane_3 2540
-#define wxAuiManager_AddPane_2_0 2541
-#define wxAuiManager_DetachPane 2542
-#define wxAuiManager_GetAllPanes 2543
-#define wxAuiManager_GetArtProvider 2544
-#define wxAuiManager_GetDockSizeConstraint 2545
-#define wxAuiManager_GetFlags 2546
-#define wxAuiManager_GetManagedWindow 2547
-#define wxAuiManager_GetManager 2548
-#define wxAuiManager_GetPane_1_1 2549
-#define wxAuiManager_GetPane_1_0 2550
-#define wxAuiManager_HideHint 2551
-#define wxAuiManager_InsertPane 2552
-#define wxAuiManager_LoadPaneInfo 2553
-#define wxAuiManager_LoadPerspective 2554
-#define wxAuiManager_SavePaneInfo 2555
-#define wxAuiManager_SavePerspective 2556
-#define wxAuiManager_SetArtProvider 2557
-#define wxAuiManager_SetDockSizeConstraint 2558
-#define wxAuiManager_SetFlags 2559
-#define wxAuiManager_SetManagedWindow 2560
-#define wxAuiManager_ShowHint 2561
-#define wxAuiManager_UnInit 2562
-#define wxAuiManager_Update 2563
-#define wxAuiPaneInfo_new_0 2564
-#define wxAuiPaneInfo_new_1 2565
-#define wxAuiPaneInfo_destruct 2566
-#define wxAuiPaneInfo_BestSize_1 2567
-#define wxAuiPaneInfo_BestSize_2 2568
-#define wxAuiPaneInfo_Bottom 2569
-#define wxAuiPaneInfo_BottomDockable 2570
-#define wxAuiPaneInfo_Caption 2571
-#define wxAuiPaneInfo_CaptionVisible 2572
-#define wxAuiPaneInfo_Centre 2573
-#define wxAuiPaneInfo_CentrePane 2574
-#define wxAuiPaneInfo_CloseButton 2575
-#define wxAuiPaneInfo_DefaultPane 2576
-#define wxAuiPaneInfo_DestroyOnClose 2577
-#define wxAuiPaneInfo_Direction 2578
-#define wxAuiPaneInfo_Dock 2579
-#define wxAuiPaneInfo_Dockable 2580
-#define wxAuiPaneInfo_Fixed 2581
-#define wxAuiPaneInfo_Float 2582
-#define wxAuiPaneInfo_Floatable 2583
-#define wxAuiPaneInfo_FloatingPosition_1 2584
-#define wxAuiPaneInfo_FloatingPosition_2 2585
-#define wxAuiPaneInfo_FloatingSize_1 2586
-#define wxAuiPaneInfo_FloatingSize_2 2587
-#define wxAuiPaneInfo_Gripper 2588
-#define wxAuiPaneInfo_GripperTop 2589
-#define wxAuiPaneInfo_HasBorder 2590
-#define wxAuiPaneInfo_HasCaption 2591
-#define wxAuiPaneInfo_HasCloseButton 2592
-#define wxAuiPaneInfo_HasFlag 2593
-#define wxAuiPaneInfo_HasGripper 2594
-#define wxAuiPaneInfo_HasGripperTop 2595
-#define wxAuiPaneInfo_HasMaximizeButton 2596
-#define wxAuiPaneInfo_HasMinimizeButton 2597
-#define wxAuiPaneInfo_HasPinButton 2598
-#define wxAuiPaneInfo_Hide 2599
-#define wxAuiPaneInfo_IsBottomDockable 2600
-#define wxAuiPaneInfo_IsDocked 2601
-#define wxAuiPaneInfo_IsFixed 2602
-#define wxAuiPaneInfo_IsFloatable 2603
-#define wxAuiPaneInfo_IsFloating 2604
-#define wxAuiPaneInfo_IsLeftDockable 2605
-#define wxAuiPaneInfo_IsMovable 2606
-#define wxAuiPaneInfo_IsOk 2607
-#define wxAuiPaneInfo_IsResizable 2608
-#define wxAuiPaneInfo_IsRightDockable 2609
-#define wxAuiPaneInfo_IsShown 2610
-#define wxAuiPaneInfo_IsToolbar 2611
-#define wxAuiPaneInfo_IsTopDockable 2612
-#define wxAuiPaneInfo_Layer 2613
-#define wxAuiPaneInfo_Left 2614
-#define wxAuiPaneInfo_LeftDockable 2615
-#define wxAuiPaneInfo_MaxSize_1 2616
-#define wxAuiPaneInfo_MaxSize_2 2617
-#define wxAuiPaneInfo_MaximizeButton 2618
-#define wxAuiPaneInfo_MinSize_1 2619
-#define wxAuiPaneInfo_MinSize_2 2620
-#define wxAuiPaneInfo_MinimizeButton 2621
-#define wxAuiPaneInfo_Movable 2622
-#define wxAuiPaneInfo_Name 2623
-#define wxAuiPaneInfo_PaneBorder 2624
-#define wxAuiPaneInfo_PinButton 2625
-#define wxAuiPaneInfo_Position 2626
-#define wxAuiPaneInfo_Resizable 2627
-#define wxAuiPaneInfo_Right 2628
-#define wxAuiPaneInfo_RightDockable 2629
-#define wxAuiPaneInfo_Row 2630
-#define wxAuiPaneInfo_SafeSet 2631
-#define wxAuiPaneInfo_SetFlag 2632
-#define wxAuiPaneInfo_Show 2633
-#define wxAuiPaneInfo_ToolbarPane 2634
-#define wxAuiPaneInfo_Top 2635
-#define wxAuiPaneInfo_TopDockable 2636
-#define wxAuiPaneInfo_Window 2637
-#define wxAuiNotebook_new_0 2638
-#define wxAuiNotebook_new_2 2639
-#define wxAuiNotebook_AddPage 2640
-#define wxAuiNotebook_Create 2641
-#define wxAuiNotebook_DeletePage 2642
-#define wxAuiNotebook_GetArtProvider 2643
-#define wxAuiNotebook_GetPage 2644
-#define wxAuiNotebook_GetPageBitmap 2645
-#define wxAuiNotebook_GetPageCount 2646
-#define wxAuiNotebook_GetPageIndex 2647
-#define wxAuiNotebook_GetPageText 2648
-#define wxAuiNotebook_GetSelection 2649
-#define wxAuiNotebook_InsertPage 2650
-#define wxAuiNotebook_RemovePage 2651
-#define wxAuiNotebook_SetArtProvider 2652
-#define wxAuiNotebook_SetFont 2653
-#define wxAuiNotebook_SetPageBitmap 2654
-#define wxAuiNotebook_SetPageText 2655
-#define wxAuiNotebook_SetSelection 2656
-#define wxAuiNotebook_SetTabCtrlHeight 2657
-#define wxAuiNotebook_SetUniformBitmapSize 2658
-#define wxAuiNotebook_destroy 2659
-#define wxMDIParentFrame_new_0 2660
-#define wxMDIParentFrame_new_4 2661
-#define wxMDIParentFrame_destruct 2662
-#define wxMDIParentFrame_ActivateNext 2663
-#define wxMDIParentFrame_ActivatePrevious 2664
-#define wxMDIParentFrame_ArrangeIcons 2665
-#define wxMDIParentFrame_Cascade 2666
-#define wxMDIParentFrame_Create 2667
-#define wxMDIParentFrame_GetActiveChild 2668
-#define wxMDIParentFrame_GetClientWindow 2669
-#define wxMDIParentFrame_Tile 2670
-#define wxMDIChildFrame_new_0 2671
-#define wxMDIChildFrame_new_4 2672
-#define wxMDIChildFrame_destruct 2673
-#define wxMDIChildFrame_Activate 2674
-#define wxMDIChildFrame_Create 2675
-#define wxMDIChildFrame_Maximize 2676
-#define wxMDIChildFrame_Restore 2677
-#define wxMDIClientWindow_new_0 2678
-#define wxMDIClientWindow_new_2 2679
-#define wxMDIClientWindow_destruct 2680
-#define wxMDIClientWindow_CreateClient 2681
-#define wxLayoutAlgorithm_new 2682
-#define wxLayoutAlgorithm_LayoutFrame 2683
-#define wxLayoutAlgorithm_LayoutMDIFrame 2684
-#define wxLayoutAlgorithm_LayoutWindow 2685
-#define wxLayoutAlgorithm_destroy 2686
-#define wxEvent_GetId 2687
-#define wxEvent_GetSkipped 2688
-#define wxEvent_GetTimestamp 2689
-#define wxEvent_IsCommandEvent 2690
-#define wxEvent_ResumePropagation 2691
-#define wxEvent_ShouldPropagate 2692
-#define wxEvent_Skip 2693
-#define wxEvent_StopPropagation 2694
-#define wxCommandEvent_getClientData 2695
-#define wxCommandEvent_GetExtraLong 2696
-#define wxCommandEvent_GetInt 2697
-#define wxCommandEvent_GetSelection 2698
-#define wxCommandEvent_GetString 2699
-#define wxCommandEvent_IsChecked 2700
-#define wxCommandEvent_IsSelection 2701
-#define wxCommandEvent_SetInt 2702
-#define wxCommandEvent_SetString 2703
-#define wxScrollEvent_GetOrientation 2704
-#define wxScrollEvent_GetPosition 2705
-#define wxScrollWinEvent_GetOrientation 2706
-#define wxScrollWinEvent_GetPosition 2707
-#define wxMouseEvent_AltDown 2708
-#define wxMouseEvent_Button 2709
-#define wxMouseEvent_ButtonDClick 2710
-#define wxMouseEvent_ButtonDown 2711
-#define wxMouseEvent_ButtonUp 2712
-#define wxMouseEvent_CmdDown 2713
-#define wxMouseEvent_ControlDown 2714
-#define wxMouseEvent_Dragging 2715
-#define wxMouseEvent_Entering 2716
-#define wxMouseEvent_GetButton 2717
-#define wxMouseEvent_GetPosition 2720
-#define wxMouseEvent_GetLogicalPosition 2721
-#define wxMouseEvent_GetLinesPerAction 2722
-#define wxMouseEvent_GetWheelRotation 2723
-#define wxMouseEvent_GetWheelDelta 2724
-#define wxMouseEvent_GetX 2725
-#define wxMouseEvent_GetY 2726
-#define wxMouseEvent_IsButton 2727
-#define wxMouseEvent_IsPageScroll 2728
-#define wxMouseEvent_Leaving 2729
-#define wxMouseEvent_LeftDClick 2730
-#define wxMouseEvent_LeftDown 2731
-#define wxMouseEvent_LeftIsDown 2732
-#define wxMouseEvent_LeftUp 2733
-#define wxMouseEvent_MetaDown 2734
-#define wxMouseEvent_MiddleDClick 2735
-#define wxMouseEvent_MiddleDown 2736
-#define wxMouseEvent_MiddleIsDown 2737
-#define wxMouseEvent_MiddleUp 2738
-#define wxMouseEvent_Moving 2739
-#define wxMouseEvent_RightDClick 2740
-#define wxMouseEvent_RightDown 2741
-#define wxMouseEvent_RightIsDown 2742
-#define wxMouseEvent_RightUp 2743
-#define wxMouseEvent_ShiftDown 2744
-#define wxSetCursorEvent_GetCursor 2745
-#define wxSetCursorEvent_GetX 2746
-#define wxSetCursorEvent_GetY 2747
-#define wxSetCursorEvent_HasCursor 2748
-#define wxSetCursorEvent_SetCursor 2749
-#define wxKeyEvent_AltDown 2750
-#define wxKeyEvent_CmdDown 2751
-#define wxKeyEvent_ControlDown 2752
-#define wxKeyEvent_GetKeyCode 2753
-#define wxKeyEvent_GetModifiers 2754
-#define wxKeyEvent_GetPosition 2757
-#define wxKeyEvent_GetRawKeyCode 2758
-#define wxKeyEvent_GetRawKeyFlags 2759
-#define wxKeyEvent_GetUnicodeKey 2760
-#define wxKeyEvent_GetX 2761
-#define wxKeyEvent_GetY 2762
-#define wxKeyEvent_HasModifiers 2763
-#define wxKeyEvent_MetaDown 2764
-#define wxKeyEvent_ShiftDown 2765
-#define wxSizeEvent_GetSize 2766
-#define wxMoveEvent_GetPosition 2767
-#define wxEraseEvent_GetDC 2768
-#define wxFocusEvent_GetWindow 2769
-#define wxChildFocusEvent_GetWindow 2770
-#define wxMenuEvent_GetMenu 2771
-#define wxMenuEvent_GetMenuId 2772
-#define wxMenuEvent_IsPopup 2773
-#define wxCloseEvent_CanVeto 2774
-#define wxCloseEvent_GetLoggingOff 2775
-#define wxCloseEvent_SetCanVeto 2776
-#define wxCloseEvent_SetLoggingOff 2777
-#define wxCloseEvent_Veto 2778
-#define wxShowEvent_SetShow 2779
-#define wxShowEvent_GetShow 2780
-#define wxIconizeEvent_Iconized 2781
-#define wxJoystickEvent_ButtonDown 2782
-#define wxJoystickEvent_ButtonIsDown 2783
-#define wxJoystickEvent_ButtonUp 2784
-#define wxJoystickEvent_GetButtonChange 2785
-#define wxJoystickEvent_GetButtonState 2786
-#define wxJoystickEvent_GetJoystick 2787
-#define wxJoystickEvent_GetPosition 2788
-#define wxJoystickEvent_GetZPosition 2789
-#define wxJoystickEvent_IsButton 2790
-#define wxJoystickEvent_IsMove 2791
-#define wxJoystickEvent_IsZMove 2792
-#define wxUpdateUIEvent_CanUpdate 2793
-#define wxUpdateUIEvent_Check 2794
-#define wxUpdateUIEvent_Enable 2795
-#define wxUpdateUIEvent_Show 2796
-#define wxUpdateUIEvent_GetChecked 2797
-#define wxUpdateUIEvent_GetEnabled 2798
-#define wxUpdateUIEvent_GetShown 2799
-#define wxUpdateUIEvent_GetSetChecked 2800
-#define wxUpdateUIEvent_GetSetEnabled 2801
-#define wxUpdateUIEvent_GetSetShown 2802
-#define wxUpdateUIEvent_GetSetText 2803
-#define wxUpdateUIEvent_GetText 2804
-#define wxUpdateUIEvent_GetMode 2805
-#define wxUpdateUIEvent_GetUpdateInterval 2806
-#define wxUpdateUIEvent_ResetUpdateTime 2807
-#define wxUpdateUIEvent_SetMode 2808
-#define wxUpdateUIEvent_SetText 2809
-#define wxUpdateUIEvent_SetUpdateInterval 2810
-#define wxMouseCaptureChangedEvent_GetCapturedWindow 2811
-#define wxPaletteChangedEvent_SetChangedWindow 2812
-#define wxPaletteChangedEvent_GetChangedWindow 2813
-#define wxQueryNewPaletteEvent_SetPaletteRealized 2814
-#define wxQueryNewPaletteEvent_GetPaletteRealized 2815
-#define wxNavigationKeyEvent_GetDirection 2816
-#define wxNavigationKeyEvent_SetDirection 2817
-#define wxNavigationKeyEvent_IsWindowChange 2818
-#define wxNavigationKeyEvent_SetWindowChange 2819
-#define wxNavigationKeyEvent_IsFromTab 2820
-#define wxNavigationKeyEvent_SetFromTab 2821
-#define wxNavigationKeyEvent_GetCurrentFocus 2822
-#define wxNavigationKeyEvent_SetCurrentFocus 2823
-#define wxHelpEvent_GetOrigin 2824
-#define wxHelpEvent_GetPosition 2825
-#define wxHelpEvent_SetOrigin 2826
-#define wxHelpEvent_SetPosition 2827
-#define wxContextMenuEvent_GetPosition 2828
-#define wxContextMenuEvent_SetPosition 2829
-#define wxIdleEvent_CanSend 2830
-#define wxIdleEvent_GetMode 2831
-#define wxIdleEvent_RequestMore 2832
-#define wxIdleEvent_MoreRequested 2833
-#define wxIdleEvent_SetMode 2834
-#define wxGridEvent_AltDown 2835
-#define wxGridEvent_ControlDown 2836
-#define wxGridEvent_GetCol 2837
-#define wxGridEvent_GetPosition 2838
-#define wxGridEvent_GetRow 2839
-#define wxGridEvent_MetaDown 2840
-#define wxGridEvent_Selecting 2841
-#define wxGridEvent_ShiftDown 2842
-#define wxNotifyEvent_Allow 2843
-#define wxNotifyEvent_IsAllowed 2844
-#define wxNotifyEvent_Veto 2845
-#define wxSashEvent_GetEdge 2846
-#define wxSashEvent_GetDragRect 2847
-#define wxSashEvent_GetDragStatus 2848
-#define wxListEvent_GetCacheFrom 2849
-#define wxListEvent_GetCacheTo 2850
-#define wxListEvent_GetKeyCode 2851
-#define wxListEvent_GetIndex 2852
-#define wxListEvent_GetColumn 2853
-#define wxListEvent_GetPoint 2854
-#define wxListEvent_GetLabel 2855
-#define wxListEvent_GetText 2856
-#define wxListEvent_GetImage 2857
-#define wxListEvent_GetData 2858
-#define wxListEvent_GetMask 2859
-#define wxListEvent_GetItem 2860
-#define wxListEvent_IsEditCancelled 2861
-#define wxDateEvent_GetDate 2862
-#define wxCalendarEvent_GetWeekDay 2863
-#define wxFileDirPickerEvent_GetPath 2864
-#define wxColourPickerEvent_GetColour 2865
-#define wxFontPickerEvent_GetFont 2866
-#define wxStyledTextEvent_GetPosition 2867
-#define wxStyledTextEvent_GetKey 2868
-#define wxStyledTextEvent_GetModifiers 2869
-#define wxStyledTextEvent_GetModificationType 2870
-#define wxStyledTextEvent_GetText 2871
-#define wxStyledTextEvent_GetLength 2872
-#define wxStyledTextEvent_GetLinesAdded 2873
-#define wxStyledTextEvent_GetLine 2874
-#define wxStyledTextEvent_GetFoldLevelNow 2875
-#define wxStyledTextEvent_GetFoldLevelPrev 2876
-#define wxStyledTextEvent_GetMargin 2877
-#define wxStyledTextEvent_GetMessage 2878
-#define wxStyledTextEvent_GetWParam 2879
-#define wxStyledTextEvent_GetLParam 2880
-#define wxStyledTextEvent_GetListType 2881
-#define wxStyledTextEvent_GetX 2882
-#define wxStyledTextEvent_GetY 2883
-#define wxStyledTextEvent_GetDragText 2884
-#define wxStyledTextEvent_GetDragAllowMove 2885
-#define wxStyledTextEvent_GetDragResult 2886
-#define wxStyledTextEvent_GetShift 2887
-#define wxStyledTextEvent_GetControl 2888
-#define wxStyledTextEvent_GetAlt 2889
-#define utils_wxGetKeyState 2890
-#define utils_wxGetMousePosition 2891
-#define utils_wxGetMouseState 2892
-#define utils_wxSetDetectableAutoRepeat 2893
-#define utils_wxBell 2894
-#define utils_wxFindMenuItemId 2895
-#define utils_wxGenericFindWindowAtPoint 2896
-#define utils_wxFindWindowAtPoint 2897
-#define utils_wxBeginBusyCursor 2898
-#define utils_wxEndBusyCursor 2899
-#define utils_wxIsBusy 2900
-#define utils_wxShutdown 2901
-#define utils_wxShell 2902
-#define utils_wxLaunchDefaultBrowser 2903
-#define utils_wxGetEmailAddress 2904
-#define utils_wxGetUserId 2905
-#define utils_wxGetHomeDir 2906
-#define utils_wxNewId 2907
-#define utils_wxRegisterId 2908
-#define utils_wxGetCurrentId 2909
-#define utils_wxGetOsDescription 2910
-#define utils_wxIsPlatformLittleEndian 2911
-#define utils_wxIsPlatform64Bit 2912
-#define wxPrintout_new 2913
-#define wxPrintout_destruct 2914
-#define wxPrintout_GetDC 2915
-#define wxPrintout_GetPageSizeMM 2916
-#define wxPrintout_GetPageSizePixels 2917
-#define wxPrintout_GetPaperRectPixels 2918
-#define wxPrintout_GetPPIPrinter 2919
-#define wxPrintout_GetPPIScreen 2920
-#define wxPrintout_GetTitle 2921
-#define wxPrintout_IsPreview 2922
-#define wxPrintout_FitThisSizeToPaper 2923
-#define wxPrintout_FitThisSizeToPage 2924
-#define wxPrintout_FitThisSizeToPageMargins 2925
-#define wxPrintout_MapScreenSizeToPaper 2926
-#define wxPrintout_MapScreenSizeToPage 2927
-#define wxPrintout_MapScreenSizeToPageMargins 2928
-#define wxPrintout_MapScreenSizeToDevice 2929
-#define wxPrintout_GetLogicalPaperRect 2930
-#define wxPrintout_GetLogicalPageRect 2931
-#define wxPrintout_GetLogicalPageMarginsRect 2932
-#define wxPrintout_SetLogicalOrigin 2933
-#define wxPrintout_OffsetLogicalOrigin 2934
-#define wxStyledTextCtrl_new_2 2935
-#define wxStyledTextCtrl_new_0 2936
-#define wxStyledTextCtrl_destruct 2937
-#define wxStyledTextCtrl_Create 2938
-#define wxStyledTextCtrl_AddText 2939
-#define wxStyledTextCtrl_AddStyledText 2940
-#define wxStyledTextCtrl_InsertText 2941
-#define wxStyledTextCtrl_ClearAll 2942
-#define wxStyledTextCtrl_ClearDocumentStyle 2943
-#define wxStyledTextCtrl_GetLength 2944
-#define wxStyledTextCtrl_GetCharAt 2945
-#define wxStyledTextCtrl_GetCurrentPos 2946
-#define wxStyledTextCtrl_GetAnchor 2947
-#define wxStyledTextCtrl_GetStyleAt 2948
-#define wxStyledTextCtrl_Redo 2949
-#define wxStyledTextCtrl_SetUndoCollection 2950
-#define wxStyledTextCtrl_SelectAll 2951
-#define wxStyledTextCtrl_SetSavePoint 2952
-#define wxStyledTextCtrl_GetStyledText 2953
-#define wxStyledTextCtrl_CanRedo 2954
-#define wxStyledTextCtrl_MarkerLineFromHandle 2955
-#define wxStyledTextCtrl_MarkerDeleteHandle 2956
-#define wxStyledTextCtrl_GetUndoCollection 2957
-#define wxStyledTextCtrl_GetViewWhiteSpace 2958
-#define wxStyledTextCtrl_SetViewWhiteSpace 2959
-#define wxStyledTextCtrl_PositionFromPoint 2960
-#define wxStyledTextCtrl_PositionFromPointClose 2961
-#define wxStyledTextCtrl_GotoLine 2962
-#define wxStyledTextCtrl_GotoPos 2963
-#define wxStyledTextCtrl_SetAnchor 2964
-#define wxStyledTextCtrl_GetCurLine 2965
-#define wxStyledTextCtrl_GetEndStyled 2966
-#define wxStyledTextCtrl_ConvertEOLs 2967
-#define wxStyledTextCtrl_GetEOLMode 2968
-#define wxStyledTextCtrl_SetEOLMode 2969
-#define wxStyledTextCtrl_StartStyling 2970
-#define wxStyledTextCtrl_SetStyling 2971
-#define wxStyledTextCtrl_GetBufferedDraw 2972
-#define wxStyledTextCtrl_SetBufferedDraw 2973
-#define wxStyledTextCtrl_SetTabWidth 2974
-#define wxStyledTextCtrl_GetTabWidth 2975
-#define wxStyledTextCtrl_SetCodePage 2976
-#define wxStyledTextCtrl_MarkerDefine 2977
-#define wxStyledTextCtrl_MarkerSetForeground 2978
-#define wxStyledTextCtrl_MarkerSetBackground 2979
-#define wxStyledTextCtrl_MarkerAdd 2980
-#define wxStyledTextCtrl_MarkerDelete 2981
-#define wxStyledTextCtrl_MarkerDeleteAll 2982
-#define wxStyledTextCtrl_MarkerGet 2983
-#define wxStyledTextCtrl_MarkerNext 2984
-#define wxStyledTextCtrl_MarkerPrevious 2985
-#define wxStyledTextCtrl_MarkerDefineBitmap 2986
-#define wxStyledTextCtrl_MarkerAddSet 2987
-#define wxStyledTextCtrl_MarkerSetAlpha 2988
-#define wxStyledTextCtrl_SetMarginType 2989
-#define wxStyledTextCtrl_GetMarginType 2990
-#define wxStyledTextCtrl_SetMarginWidth 2991
-#define wxStyledTextCtrl_GetMarginWidth 2992
-#define wxStyledTextCtrl_SetMarginMask 2993
-#define wxStyledTextCtrl_GetMarginMask 2994
-#define wxStyledTextCtrl_SetMarginSensitive 2995
-#define wxStyledTextCtrl_GetMarginSensitive 2996
-#define wxStyledTextCtrl_StyleClearAll 2997
-#define wxStyledTextCtrl_StyleSetForeground 2998
-#define wxStyledTextCtrl_StyleSetBackground 2999
-#define wxStyledTextCtrl_StyleSetBold 3000
-#define wxStyledTextCtrl_StyleSetItalic 3001
-#define wxStyledTextCtrl_StyleSetSize 3002
-#define wxStyledTextCtrl_StyleSetFaceName 3003
-#define wxStyledTextCtrl_StyleSetEOLFilled 3004
-#define wxStyledTextCtrl_StyleResetDefault 3005
-#define wxStyledTextCtrl_StyleSetUnderline 3006
-#define wxStyledTextCtrl_StyleSetCase 3007
-#define wxStyledTextCtrl_StyleSetHotSpot 3008
-#define wxStyledTextCtrl_SetSelForeground 3009
-#define wxStyledTextCtrl_SetSelBackground 3010
-#define wxStyledTextCtrl_GetSelAlpha 3011
-#define wxStyledTextCtrl_SetSelAlpha 3012
-#define wxStyledTextCtrl_SetCaretForeground 3013
-#define wxStyledTextCtrl_CmdKeyAssign 3014
-#define wxStyledTextCtrl_CmdKeyClear 3015
-#define wxStyledTextCtrl_CmdKeyClearAll 3016
-#define wxStyledTextCtrl_SetStyleBytes 3017
-#define wxStyledTextCtrl_StyleSetVisible 3018
-#define wxStyledTextCtrl_GetCaretPeriod 3019
-#define wxStyledTextCtrl_SetCaretPeriod 3020
-#define wxStyledTextCtrl_SetWordChars 3021
-#define wxStyledTextCtrl_BeginUndoAction 3022
-#define wxStyledTextCtrl_EndUndoAction 3023
-#define wxStyledTextCtrl_IndicatorSetStyle 3024
-#define wxStyledTextCtrl_IndicatorGetStyle 3025
-#define wxStyledTextCtrl_IndicatorSetForeground 3026
-#define wxStyledTextCtrl_IndicatorGetForeground 3027
-#define wxStyledTextCtrl_SetWhitespaceForeground 3028
-#define wxStyledTextCtrl_SetWhitespaceBackground 3029
-#define wxStyledTextCtrl_GetStyleBits 3030
-#define wxStyledTextCtrl_SetLineState 3031
-#define wxStyledTextCtrl_GetLineState 3032
-#define wxStyledTextCtrl_GetMaxLineState 3033
-#define wxStyledTextCtrl_GetCaretLineVisible 3034
-#define wxStyledTextCtrl_SetCaretLineVisible 3035
-#define wxStyledTextCtrl_GetCaretLineBackground 3036
-#define wxStyledTextCtrl_SetCaretLineBackground 3037
-#define wxStyledTextCtrl_AutoCompShow 3038
-#define wxStyledTextCtrl_AutoCompCancel 3039
-#define wxStyledTextCtrl_AutoCompActive 3040
-#define wxStyledTextCtrl_AutoCompPosStart 3041
-#define wxStyledTextCtrl_AutoCompComplete 3042
-#define wxStyledTextCtrl_AutoCompStops 3043
-#define wxStyledTextCtrl_AutoCompSetSeparator 3044
-#define wxStyledTextCtrl_AutoCompGetSeparator 3045
-#define wxStyledTextCtrl_AutoCompSelect 3046
-#define wxStyledTextCtrl_AutoCompSetCancelAtStart 3047
-#define wxStyledTextCtrl_AutoCompGetCancelAtStart 3048
-#define wxStyledTextCtrl_AutoCompSetFillUps 3049
-#define wxStyledTextCtrl_AutoCompSetChooseSingle 3050
-#define wxStyledTextCtrl_AutoCompGetChooseSingle 3051
-#define wxStyledTextCtrl_AutoCompSetIgnoreCase 3052
-#define wxStyledTextCtrl_AutoCompGetIgnoreCase 3053
-#define wxStyledTextCtrl_UserListShow 3054
-#define wxStyledTextCtrl_AutoCompSetAutoHide 3055
-#define wxStyledTextCtrl_AutoCompGetAutoHide 3056
-#define wxStyledTextCtrl_AutoCompSetDropRestOfWord 3057
-#define wxStyledTextCtrl_AutoCompGetDropRestOfWord 3058
-#define wxStyledTextCtrl_RegisterImage 3059
-#define wxStyledTextCtrl_ClearRegisteredImages 3060
-#define wxStyledTextCtrl_AutoCompGetTypeSeparator 3061
-#define wxStyledTextCtrl_AutoCompSetTypeSeparator 3062
-#define wxStyledTextCtrl_AutoCompSetMaxWidth 3063
-#define wxStyledTextCtrl_AutoCompGetMaxWidth 3064
-#define wxStyledTextCtrl_AutoCompSetMaxHeight 3065
-#define wxStyledTextCtrl_AutoCompGetMaxHeight 3066
-#define wxStyledTextCtrl_SetIndent 3067
-#define wxStyledTextCtrl_GetIndent 3068
-#define wxStyledTextCtrl_SetUseTabs 3069
-#define wxStyledTextCtrl_GetUseTabs 3070
-#define wxStyledTextCtrl_SetLineIndentation 3071
-#define wxStyledTextCtrl_GetLineIndentation 3072
-#define wxStyledTextCtrl_GetLineIndentPosition 3073
-#define wxStyledTextCtrl_GetColumn 3074
-#define wxStyledTextCtrl_SetUseHorizontalScrollBar 3075
-#define wxStyledTextCtrl_GetUseHorizontalScrollBar 3076
-#define wxStyledTextCtrl_SetIndentationGuides 3077
-#define wxStyledTextCtrl_GetIndentationGuides 3078
-#define wxStyledTextCtrl_SetHighlightGuide 3079
-#define wxStyledTextCtrl_GetHighlightGuide 3080
-#define wxStyledTextCtrl_GetLineEndPosition 3081
-#define wxStyledTextCtrl_GetCodePage 3082
-#define wxStyledTextCtrl_GetCaretForeground 3083
-#define wxStyledTextCtrl_GetReadOnly 3084
-#define wxStyledTextCtrl_SetCurrentPos 3085
-#define wxStyledTextCtrl_SetSelectionStart 3086
-#define wxStyledTextCtrl_GetSelectionStart 3087
-#define wxStyledTextCtrl_SetSelectionEnd 3088
-#define wxStyledTextCtrl_GetSelectionEnd 3089
-#define wxStyledTextCtrl_SetPrintMagnification 3090
-#define wxStyledTextCtrl_GetPrintMagnification 3091
-#define wxStyledTextCtrl_SetPrintColourMode 3092
-#define wxStyledTextCtrl_GetPrintColourMode 3093
-#define wxStyledTextCtrl_FindText 3094
-#define wxStyledTextCtrl_FormatRange 3095
-#define wxStyledTextCtrl_GetFirstVisibleLine 3096
-#define wxStyledTextCtrl_GetLine 3097
-#define wxStyledTextCtrl_GetLineCount 3098
-#define wxStyledTextCtrl_SetMarginLeft 3099
-#define wxStyledTextCtrl_GetMarginLeft 3100
-#define wxStyledTextCtrl_SetMarginRight 3101
-#define wxStyledTextCtrl_GetMarginRight 3102
-#define wxStyledTextCtrl_GetModify 3103
-#define wxStyledTextCtrl_SetSelection 3104
-#define wxStyledTextCtrl_GetSelectedText 3105
-#define wxStyledTextCtrl_GetTextRange 3106
-#define wxStyledTextCtrl_HideSelection 3107
-#define wxStyledTextCtrl_LineFromPosition 3108
-#define wxStyledTextCtrl_PositionFromLine 3109
-#define wxStyledTextCtrl_LineScroll 3110
-#define wxStyledTextCtrl_EnsureCaretVisible 3111
-#define wxStyledTextCtrl_ReplaceSelection 3112
-#define wxStyledTextCtrl_SetReadOnly 3113
-#define wxStyledTextCtrl_CanPaste 3114
-#define wxStyledTextCtrl_CanUndo 3115
-#define wxStyledTextCtrl_EmptyUndoBuffer 3116
-#define wxStyledTextCtrl_Undo 3117
-#define wxStyledTextCtrl_Cut 3118
-#define wxStyledTextCtrl_Copy 3119
-#define wxStyledTextCtrl_Paste 3120
-#define wxStyledTextCtrl_Clear 3121
-#define wxStyledTextCtrl_SetText 3122
-#define wxStyledTextCtrl_GetText 3123
-#define wxStyledTextCtrl_GetTextLength 3124
-#define wxStyledTextCtrl_GetOvertype 3125
-#define wxStyledTextCtrl_SetCaretWidth 3126
-#define wxStyledTextCtrl_GetCaretWidth 3127
-#define wxStyledTextCtrl_SetTargetStart 3128
-#define wxStyledTextCtrl_GetTargetStart 3129
-#define wxStyledTextCtrl_SetTargetEnd 3130
-#define wxStyledTextCtrl_GetTargetEnd 3131
-#define wxStyledTextCtrl_ReplaceTarget 3132
-#define wxStyledTextCtrl_SearchInTarget 3133
-#define wxStyledTextCtrl_SetSearchFlags 3134
-#define wxStyledTextCtrl_GetSearchFlags 3135
-#define wxStyledTextCtrl_CallTipShow 3136
-#define wxStyledTextCtrl_CallTipCancel 3137
-#define wxStyledTextCtrl_CallTipActive 3138
-#define wxStyledTextCtrl_CallTipPosAtStart 3139
-#define wxStyledTextCtrl_CallTipSetHighlight 3140
-#define wxStyledTextCtrl_CallTipSetBackground 3141
-#define wxStyledTextCtrl_CallTipSetForeground 3142
-#define wxStyledTextCtrl_CallTipSetForegroundHighlight 3143
-#define wxStyledTextCtrl_CallTipUseStyle 3144
-#define wxStyledTextCtrl_VisibleFromDocLine 3145
-#define wxStyledTextCtrl_DocLineFromVisible 3146
-#define wxStyledTextCtrl_WrapCount 3147
-#define wxStyledTextCtrl_SetFoldLevel 3148
-#define wxStyledTextCtrl_GetFoldLevel 3149
-#define wxStyledTextCtrl_GetLastChild 3150
-#define wxStyledTextCtrl_GetFoldParent 3151
-#define wxStyledTextCtrl_ShowLines 3152
-#define wxStyledTextCtrl_HideLines 3153
-#define wxStyledTextCtrl_GetLineVisible 3154
-#define wxStyledTextCtrl_SetFoldExpanded 3155
-#define wxStyledTextCtrl_GetFoldExpanded 3156
-#define wxStyledTextCtrl_ToggleFold 3157
-#define wxStyledTextCtrl_EnsureVisible 3158
-#define wxStyledTextCtrl_SetFoldFlags 3159
-#define wxStyledTextCtrl_EnsureVisibleEnforcePolicy 3160
-#define wxStyledTextCtrl_SetTabIndents 3161
-#define wxStyledTextCtrl_GetTabIndents 3162
-#define wxStyledTextCtrl_SetBackSpaceUnIndents 3163
-#define wxStyledTextCtrl_GetBackSpaceUnIndents 3164
-#define wxStyledTextCtrl_SetMouseDwellTime 3165
-#define wxStyledTextCtrl_GetMouseDwellTime 3166
-#define wxStyledTextCtrl_WordStartPosition 3167
-#define wxStyledTextCtrl_WordEndPosition 3168
-#define wxStyledTextCtrl_SetWrapMode 3169
-#define wxStyledTextCtrl_GetWrapMode 3170
-#define wxStyledTextCtrl_SetWrapVisualFlags 3171
-#define wxStyledTextCtrl_GetWrapVisualFlags 3172
-#define wxStyledTextCtrl_SetWrapVisualFlagsLocation 3173
-#define wxStyledTextCtrl_GetWrapVisualFlagsLocation 3174
-#define wxStyledTextCtrl_SetWrapStartIndent 3175
-#define wxStyledTextCtrl_GetWrapStartIndent 3176
-#define wxStyledTextCtrl_SetLayoutCache 3177
-#define wxStyledTextCtrl_GetLayoutCache 3178
-#define wxStyledTextCtrl_SetScrollWidth 3179
-#define wxStyledTextCtrl_GetScrollWidth 3180
-#define wxStyledTextCtrl_TextWidth 3181
-#define wxStyledTextCtrl_GetEndAtLastLine 3182
-#define wxStyledTextCtrl_TextHeight 3183
-#define wxStyledTextCtrl_SetUseVerticalScrollBar 3184
-#define wxStyledTextCtrl_GetUseVerticalScrollBar 3185
-#define wxStyledTextCtrl_AppendText 3186
-#define wxStyledTextCtrl_GetTwoPhaseDraw 3187
-#define wxStyledTextCtrl_SetTwoPhaseDraw 3188
-#define wxStyledTextCtrl_TargetFromSelection 3189
-#define wxStyledTextCtrl_LinesJoin 3190
-#define wxStyledTextCtrl_LinesSplit 3191
-#define wxStyledTextCtrl_SetFoldMarginColour 3192
-#define wxStyledTextCtrl_SetFoldMarginHiColour 3193
-#define wxStyledTextCtrl_LineDown 3194
-#define wxStyledTextCtrl_LineDownExtend 3195
-#define wxStyledTextCtrl_LineUp 3196
-#define wxStyledTextCtrl_LineUpExtend 3197
-#define wxStyledTextCtrl_CharLeft 3198
-#define wxStyledTextCtrl_CharLeftExtend 3199
-#define wxStyledTextCtrl_CharRight 3200
-#define wxStyledTextCtrl_CharRightExtend 3201
-#define wxStyledTextCtrl_WordLeft 3202
-#define wxStyledTextCtrl_WordLeftExtend 3203
-#define wxStyledTextCtrl_WordRight 3204
-#define wxStyledTextCtrl_WordRightExtend 3205
-#define wxStyledTextCtrl_Home 3206
-#define wxStyledTextCtrl_HomeExtend 3207
-#define wxStyledTextCtrl_LineEnd 3208
-#define wxStyledTextCtrl_LineEndExtend 3209
-#define wxStyledTextCtrl_DocumentStart 3210
-#define wxStyledTextCtrl_DocumentStartExtend 3211
-#define wxStyledTextCtrl_DocumentEnd 3212
-#define wxStyledTextCtrl_DocumentEndExtend 3213
-#define wxStyledTextCtrl_PageUp 3214
-#define wxStyledTextCtrl_PageUpExtend 3215
-#define wxStyledTextCtrl_PageDown 3216
-#define wxStyledTextCtrl_PageDownExtend 3217
-#define wxStyledTextCtrl_EditToggleOvertype 3218
-#define wxStyledTextCtrl_Cancel 3219
-#define wxStyledTextCtrl_DeleteBack 3220
-#define wxStyledTextCtrl_Tab 3221
-#define wxStyledTextCtrl_BackTab 3222
-#define wxStyledTextCtrl_NewLine 3223
-#define wxStyledTextCtrl_FormFeed 3224
-#define wxStyledTextCtrl_VCHome 3225
-#define wxStyledTextCtrl_VCHomeExtend 3226
-#define wxStyledTextCtrl_ZoomIn 3227
-#define wxStyledTextCtrl_ZoomOut 3228
-#define wxStyledTextCtrl_DelWordLeft 3229
-#define wxStyledTextCtrl_DelWordRight 3230
-#define wxStyledTextCtrl_LineCut 3231
-#define wxStyledTextCtrl_LineDelete 3232
-#define wxStyledTextCtrl_LineTranspose 3233
-#define wxStyledTextCtrl_LineDuplicate 3234
-#define wxStyledTextCtrl_LowerCase 3235
-#define wxStyledTextCtrl_UpperCase 3236
-#define wxStyledTextCtrl_LineScrollDown 3237
-#define wxStyledTextCtrl_LineScrollUp 3238
-#define wxStyledTextCtrl_DeleteBackNotLine 3239
-#define wxStyledTextCtrl_HomeDisplay 3240
-#define wxStyledTextCtrl_HomeDisplayExtend 3241
-#define wxStyledTextCtrl_LineEndDisplay 3242
-#define wxStyledTextCtrl_LineEndDisplayExtend 3243
-#define wxStyledTextCtrl_HomeWrapExtend 3244
-#define wxStyledTextCtrl_LineEndWrap 3245
-#define wxStyledTextCtrl_LineEndWrapExtend 3246
-#define wxStyledTextCtrl_VCHomeWrap 3247
-#define wxStyledTextCtrl_VCHomeWrapExtend 3248
-#define wxStyledTextCtrl_LineCopy 3249
-#define wxStyledTextCtrl_MoveCaretInsideView 3250
-#define wxStyledTextCtrl_LineLength 3251
-#define wxStyledTextCtrl_BraceHighlight 3252
-#define wxStyledTextCtrl_BraceBadLight 3253
-#define wxStyledTextCtrl_BraceMatch 3254
-#define wxStyledTextCtrl_GetViewEOL 3255
-#define wxStyledTextCtrl_SetViewEOL 3256
-#define wxStyledTextCtrl_SetModEventMask 3257
-#define wxStyledTextCtrl_GetEdgeColumn 3258
-#define wxStyledTextCtrl_SetEdgeColumn 3259
-#define wxStyledTextCtrl_GetEdgeMode 3260
-#define wxStyledTextCtrl_GetEdgeColour 3261
-#define wxStyledTextCtrl_SetEdgeColour 3262
-#define wxStyledTextCtrl_SearchAnchor 3263
-#define wxStyledTextCtrl_SearchNext 3264
-#define wxStyledTextCtrl_SearchPrev 3265
-#define wxStyledTextCtrl_LinesOnScreen 3266
-#define wxStyledTextCtrl_UsePopUp 3267
-#define wxStyledTextCtrl_SelectionIsRectangle 3268
-#define wxStyledTextCtrl_SetZoom 3269
-#define wxStyledTextCtrl_GetZoom 3270
-#define wxStyledTextCtrl_GetModEventMask 3271
-#define wxStyledTextCtrl_SetSTCFocus 3272
-#define wxStyledTextCtrl_GetSTCFocus 3273
-#define wxStyledTextCtrl_SetStatus 3274
-#define wxStyledTextCtrl_GetStatus 3275
-#define wxStyledTextCtrl_SetMouseDownCaptures 3276
-#define wxStyledTextCtrl_GetMouseDownCaptures 3277
-#define wxStyledTextCtrl_SetSTCCursor 3278
-#define wxStyledTextCtrl_GetSTCCursor 3279
-#define wxStyledTextCtrl_SetControlCharSymbol 3280
-#define wxStyledTextCtrl_GetControlCharSymbol 3281
-#define wxStyledTextCtrl_WordPartLeft 3282
-#define wxStyledTextCtrl_WordPartLeftExtend 3283
-#define wxStyledTextCtrl_WordPartRight 3284
-#define wxStyledTextCtrl_WordPartRightExtend 3285
-#define wxStyledTextCtrl_SetVisiblePolicy 3286
-#define wxStyledTextCtrl_DelLineLeft 3287
-#define wxStyledTextCtrl_DelLineRight 3288
-#define wxStyledTextCtrl_GetXOffset 3289
-#define wxStyledTextCtrl_ChooseCaretX 3290
-#define wxStyledTextCtrl_SetXCaretPolicy 3291
-#define wxStyledTextCtrl_SetYCaretPolicy 3292
-#define wxStyledTextCtrl_GetPrintWrapMode 3293
-#define wxStyledTextCtrl_SetHotspotActiveForeground 3294
-#define wxStyledTextCtrl_SetHotspotActiveBackground 3295
-#define wxStyledTextCtrl_SetHotspotActiveUnderline 3296
-#define wxStyledTextCtrl_SetHotspotSingleLine 3297
-#define wxStyledTextCtrl_ParaDownExtend 3298
-#define wxStyledTextCtrl_ParaUp 3299
-#define wxStyledTextCtrl_ParaUpExtend 3300
-#define wxStyledTextCtrl_PositionBefore 3301
-#define wxStyledTextCtrl_PositionAfter 3302
-#define wxStyledTextCtrl_CopyRange 3303
-#define wxStyledTextCtrl_CopyText 3304
-#define wxStyledTextCtrl_SetSelectionMode 3305
-#define wxStyledTextCtrl_GetSelectionMode 3306
-#define wxStyledTextCtrl_LineDownRectExtend 3307
-#define wxStyledTextCtrl_LineUpRectExtend 3308
-#define wxStyledTextCtrl_CharLeftRectExtend 3309
-#define wxStyledTextCtrl_CharRightRectExtend 3310
-#define wxStyledTextCtrl_HomeRectExtend 3311
-#define wxStyledTextCtrl_VCHomeRectExtend 3312
-#define wxStyledTextCtrl_LineEndRectExtend 3313
-#define wxStyledTextCtrl_PageUpRectExtend 3314
-#define wxStyledTextCtrl_PageDownRectExtend 3315
-#define wxStyledTextCtrl_StutteredPageUp 3316
-#define wxStyledTextCtrl_StutteredPageUpExtend 3317
-#define wxStyledTextCtrl_StutteredPageDown 3318
-#define wxStyledTextCtrl_StutteredPageDownExtend 3319
-#define wxStyledTextCtrl_WordLeftEnd 3320
-#define wxStyledTextCtrl_WordLeftEndExtend 3321
-#define wxStyledTextCtrl_WordRightEnd 3322
-#define wxStyledTextCtrl_WordRightEndExtend 3323
-#define wxStyledTextCtrl_SetWhitespaceChars 3324
-#define wxStyledTextCtrl_SetCharsDefault 3325
-#define wxStyledTextCtrl_AutoCompGetCurrent 3326
-#define wxStyledTextCtrl_Allocate 3327
-#define wxStyledTextCtrl_FindColumn 3328
-#define wxStyledTextCtrl_GetCaretSticky 3329
-#define wxStyledTextCtrl_SetCaretSticky 3330
-#define wxStyledTextCtrl_ToggleCaretSticky 3331
-#define wxStyledTextCtrl_SetPasteConvertEndings 3332
-#define wxStyledTextCtrl_GetPasteConvertEndings 3333
-#define wxStyledTextCtrl_SelectionDuplicate 3334
-#define wxStyledTextCtrl_SetCaretLineBackAlpha 3335
-#define wxStyledTextCtrl_GetCaretLineBackAlpha 3336
-#define wxStyledTextCtrl_StartRecord 3337
-#define wxStyledTextCtrl_StopRecord 3338
-#define wxStyledTextCtrl_SetLexer 3339
-#define wxStyledTextCtrl_GetLexer 3340
-#define wxStyledTextCtrl_Colourise 3341
-#define wxStyledTextCtrl_SetProperty 3342
-#define wxStyledTextCtrl_SetKeyWords 3343
-#define wxStyledTextCtrl_SetLexerLanguage 3344
-#define wxStyledTextCtrl_GetProperty 3345
-#define wxStyledTextCtrl_GetStyleBitsNeeded 3346
-#define wxStyledTextCtrl_GetCurrentLine 3347
-#define wxStyledTextCtrl_StyleSetSpec 3348
-#define wxStyledTextCtrl_StyleSetFont 3349
-#define wxStyledTextCtrl_StyleSetFontAttr 3350
-#define wxStyledTextCtrl_StyleSetCharacterSet 3351
-#define wxStyledTextCtrl_StyleSetFontEncoding 3352
-#define wxStyledTextCtrl_CmdKeyExecute 3353
-#define wxStyledTextCtrl_SetMargins 3354
-#define wxStyledTextCtrl_GetSelection 3355
-#define wxStyledTextCtrl_PointFromPosition 3356
-#define wxStyledTextCtrl_ScrollToLine 3357
-#define wxStyledTextCtrl_ScrollToColumn 3358
-#define wxStyledTextCtrl_SendMsg 3359
-#define wxStyledTextCtrl_SetVScrollBar 3360
-#define wxStyledTextCtrl_SetHScrollBar 3361
-#define wxStyledTextCtrl_GetLastKeydownProcessed 3362
-#define wxStyledTextCtrl_SetLastKeydownProcessed 3363
-#define wxStyledTextCtrl_SaveFile 3364
-#define wxStyledTextCtrl_LoadFile 3365
-#define wxStyledTextCtrl_DoDragOver 3366
-#define wxStyledTextCtrl_DoDropText 3367
-#define wxStyledTextCtrl_GetUseAntiAliasing 3368
-#define wxStyledTextCtrl_AddTextRaw 3369
-#define wxStyledTextCtrl_InsertTextRaw 3370
-#define wxStyledTextCtrl_GetCurLineRaw 3371
-#define wxStyledTextCtrl_GetLineRaw 3372
-#define wxStyledTextCtrl_GetSelectedTextRaw 3373
-#define wxStyledTextCtrl_GetTextRangeRaw 3374
-#define wxStyledTextCtrl_SetTextRaw 3375
-#define wxStyledTextCtrl_GetTextRaw 3376
-#define wxStyledTextCtrl_AppendTextRaw 3377
-#define wxArtProvider_GetBitmap 3378
-#define wxArtProvider_GetIcon 3379
-#define wxTreeEvent_GetKeyCode 3380
-#define wxTreeEvent_GetItem 3381
-#define wxTreeEvent_GetKeyEvent 3382
-#define wxTreeEvent_GetLabel 3383
-#define wxTreeEvent_GetOldItem 3384
-#define wxTreeEvent_GetPoint 3385
-#define wxTreeEvent_IsEditCancelled 3386
-#define wxTreeEvent_SetToolTip 3387
-#define wxNotebookEvent_GetOldSelection 3388
-#define wxNotebookEvent_GetSelection 3389
-#define wxNotebookEvent_SetOldSelection 3390
-#define wxNotebookEvent_SetSelection 3391
-#define wxFileDataObject_new 3392
-#define wxFileDataObject_AddFile 3393
-#define wxFileDataObject_GetFilenames 3394
-#define wxFileDataObject_destroy 3395
-#define wxTextDataObject_new 3396
-#define wxTextDataObject_GetTextLength 3397
-#define wxTextDataObject_GetText 3398
-#define wxTextDataObject_SetText 3399
-#define wxTextDataObject_destroy 3400
-#define wxBitmapDataObject_new_1_1 3401
-#define wxBitmapDataObject_new_1_0 3402
-#define wxBitmapDataObject_GetBitmap 3403
-#define wxBitmapDataObject_SetBitmap 3404
-#define wxBitmapDataObject_destroy 3405
-#define wxClipboard_new 3407
-#define wxClipboard_destruct 3408
-#define wxClipboard_AddData 3409
-#define wxClipboard_Clear 3410
-#define wxClipboard_Close 3411
-#define wxClipboard_Flush 3412
-#define wxClipboard_GetData 3413
-#define wxClipboard_IsOpened 3414
-#define wxClipboard_Open 3415
-#define wxClipboard_SetData 3416
-#define wxClipboard_UsePrimarySelection 3418
-#define wxClipboard_IsSupported 3419
-#define wxClipboard_Get 3420
-#define wxSpinEvent_GetPosition 3421
-#define wxSpinEvent_SetPosition 3422
-#define wxSplitterWindow_new_0 3423
-#define wxSplitterWindow_new_2 3424
-#define wxSplitterWindow_destruct 3425
-#define wxSplitterWindow_Create 3426
-#define wxSplitterWindow_GetMinimumPaneSize 3427
-#define wxSplitterWindow_GetSashGravity 3428
-#define wxSplitterWindow_GetSashPosition 3429
-#define wxSplitterWindow_GetSplitMode 3430
-#define wxSplitterWindow_GetWindow1 3431
-#define wxSplitterWindow_GetWindow2 3432
-#define wxSplitterWindow_Initialize 3433
-#define wxSplitterWindow_IsSplit 3434
-#define wxSplitterWindow_ReplaceWindow 3435
-#define wxSplitterWindow_SetSashGravity 3436
-#define wxSplitterWindow_SetSashPosition 3437
-#define wxSplitterWindow_SetSashSize 3438
-#define wxSplitterWindow_SetMinimumPaneSize 3439
-#define wxSplitterWindow_SetSplitMode 3440
-#define wxSplitterWindow_SplitHorizontally 3441
-#define wxSplitterWindow_SplitVertically 3442
-#define wxSplitterWindow_Unsplit 3443
-#define wxSplitterWindow_UpdateSize 3444
-#define wxSplitterEvent_GetSashPosition 3445
-#define wxSplitterEvent_GetX 3446
-#define wxSplitterEvent_GetY 3447
-#define wxSplitterEvent_GetWindowBeingRemoved 3448
-#define wxSplitterEvent_SetSashPosition 3449
-#define wxHtmlWindow_new_0 3450
-#define wxHtmlWindow_new_2 3451
-#define wxHtmlWindow_AppendToPage 3452
-#define wxHtmlWindow_GetOpenedAnchor 3453
-#define wxHtmlWindow_GetOpenedPage 3454
-#define wxHtmlWindow_GetOpenedPageTitle 3455
-#define wxHtmlWindow_GetRelatedFrame 3456
-#define wxHtmlWindow_HistoryBack 3457
-#define wxHtmlWindow_HistoryCanBack 3458
-#define wxHtmlWindow_HistoryCanForward 3459
-#define wxHtmlWindow_HistoryClear 3460
-#define wxHtmlWindow_HistoryForward 3461
-#define wxHtmlWindow_LoadFile 3462
-#define wxHtmlWindow_LoadPage 3463
-#define wxHtmlWindow_SelectAll 3464
-#define wxHtmlWindow_SelectionToText 3465
-#define wxHtmlWindow_SelectLine 3466
-#define wxHtmlWindow_SelectWord 3467
-#define wxHtmlWindow_SetBorders 3468
-#define wxHtmlWindow_SetFonts 3469
-#define wxHtmlWindow_SetPage 3470
-#define wxHtmlWindow_SetRelatedFrame 3471
-#define wxHtmlWindow_SetRelatedStatusBar 3472
-#define wxHtmlWindow_ToText 3473
-#define wxHtmlWindow_destroy 3474
-#define wxHtmlLinkEvent_GetLinkInfo 3475
-#define wxSystemSettings_GetColour 3476
-#define wxSystemSettings_GetFont 3477
-#define wxSystemSettings_GetMetric 3478
-#define wxSystemSettings_GetScreenType 3479
-#define wxAuiNotebookEvent_SetSelection 3480
-#define wxAuiNotebookEvent_GetSelection 3481
-#define wxAuiNotebookEvent_SetOldSelection 3482
-#define wxAuiNotebookEvent_GetOldSelection 3483
-#define wxAuiNotebookEvent_SetDragSource 3484
-#define wxAuiNotebookEvent_GetDragSource 3485
-#define wxAuiManagerEvent_SetManager 3486
-#define wxAuiManagerEvent_GetManager 3487
-#define wxAuiManagerEvent_SetPane 3488
-#define wxAuiManagerEvent_GetPane 3489
-#define wxAuiManagerEvent_SetButton 3490
-#define wxAuiManagerEvent_GetButton 3491
-#define wxAuiManagerEvent_SetDC 3492
-#define wxAuiManagerEvent_GetDC 3493
-#define wxAuiManagerEvent_Veto 3494
-#define wxAuiManagerEvent_GetVeto 3495
-#define wxAuiManagerEvent_SetCanVeto 3496
-#define wxAuiManagerEvent_CanVeto 3497
-#define wxLogNull_new 3498
-#define wxLogNull_destroy 3499
+#define wxListItemAttr_new_0 1757
+#define wxListItemAttr_new_3 1758
+#define wxListItemAttr_GetBackgroundColour 1759
+#define wxListItemAttr_GetFont 1760
+#define wxListItemAttr_GetTextColour 1761
+#define wxListItemAttr_HasBackgroundColour 1762
+#define wxListItemAttr_HasFont 1763
+#define wxListItemAttr_HasTextColour 1764
+#define wxListItemAttr_SetBackgroundColour 1765
+#define wxListItemAttr_SetFont 1766
+#define wxListItemAttr_SetTextColour 1767
+#define wxListItemAttr_destroy 1768
+#define wxImageList_new_0 1769
+#define wxImageList_new_3 1770
+#define wxImageList_Add_1 1771
+#define wxImageList_Add_2_0 1772
+#define wxImageList_Add_2_1 1773
+#define wxImageList_Create 1774
+#define wxImageList_Draw 1776
+#define wxImageList_GetBitmap 1777
+#define wxImageList_GetIcon 1778
+#define wxImageList_GetImageCount 1779
+#define wxImageList_GetSize 1780
+#define wxImageList_Remove 1781
+#define wxImageList_RemoveAll 1782
+#define wxImageList_Replace_2 1783
+#define wxImageList_Replace_3 1784
+#define wxImageList_destroy 1785
+#define wxTextAttr_new_0 1786
+#define wxTextAttr_new_2 1787
+#define wxTextAttr_GetAlignment 1788
+#define wxTextAttr_GetBackgroundColour 1789
+#define wxTextAttr_GetFont 1790
+#define wxTextAttr_GetLeftIndent 1791
+#define wxTextAttr_GetLeftSubIndent 1792
+#define wxTextAttr_GetRightIndent 1793
+#define wxTextAttr_GetTabs 1794
+#define wxTextAttr_GetTextColour 1795
+#define wxTextAttr_HasBackgroundColour 1796
+#define wxTextAttr_HasFont 1797
+#define wxTextAttr_HasTextColour 1798
+#define wxTextAttr_GetFlags 1799
+#define wxTextAttr_IsDefault 1800
+#define wxTextAttr_SetAlignment 1801
+#define wxTextAttr_SetBackgroundColour 1802
+#define wxTextAttr_SetFlags 1803
+#define wxTextAttr_SetFont 1804
+#define wxTextAttr_SetLeftIndent 1805
+#define wxTextAttr_SetRightIndent 1806
+#define wxTextAttr_SetTabs 1807
+#define wxTextAttr_SetTextColour 1808
+#define wxTextAttr_destroy 1809
+#define wxTextCtrl_new_3 1811
+#define wxTextCtrl_new_0 1812
+#define wxTextCtrl_destruct 1814
+#define wxTextCtrl_AppendText 1815
+#define wxTextCtrl_CanCopy 1816
+#define wxTextCtrl_CanCut 1817
+#define wxTextCtrl_CanPaste 1818
+#define wxTextCtrl_CanRedo 1819
+#define wxTextCtrl_CanUndo 1820
+#define wxTextCtrl_Clear 1821
+#define wxTextCtrl_Copy 1822
+#define wxTextCtrl_Create 1823
+#define wxTextCtrl_Cut 1824
+#define wxTextCtrl_DiscardEdits 1825
+#define wxTextCtrl_EmulateKeyPress 1826
+#define wxTextCtrl_GetDefaultStyle 1827
+#define wxTextCtrl_GetInsertionPoint 1828
+#define wxTextCtrl_GetLastPosition 1829
+#define wxTextCtrl_GetLineLength 1830
+#define wxTextCtrl_GetLineText 1831
+#define wxTextCtrl_GetNumberOfLines 1832
+#define wxTextCtrl_GetRange 1833
+#define wxTextCtrl_GetSelection 1834
+#define wxTextCtrl_GetStringSelection 1835
+#define wxTextCtrl_GetStyle 1836
+#define wxTextCtrl_GetValue 1837
+#define wxTextCtrl_IsEditable 1838
+#define wxTextCtrl_IsModified 1839
+#define wxTextCtrl_IsMultiLine 1840
+#define wxTextCtrl_IsSingleLine 1841
+#define wxTextCtrl_LoadFile 1842
+#define wxTextCtrl_MarkDirty 1843
+#define wxTextCtrl_Paste 1844
+#define wxTextCtrl_PositionToXY 1845
+#define wxTextCtrl_Redo 1846
+#define wxTextCtrl_Remove 1847
+#define wxTextCtrl_Replace 1848
+#define wxTextCtrl_SaveFile 1849
+#define wxTextCtrl_SetDefaultStyle 1850
+#define wxTextCtrl_SetEditable 1851
+#define wxTextCtrl_SetInsertionPoint 1852
+#define wxTextCtrl_SetInsertionPointEnd 1853
+#define wxTextCtrl_SetMaxLength 1855
+#define wxTextCtrl_SetSelection 1856
+#define wxTextCtrl_SetStyle 1857
+#define wxTextCtrl_SetValue 1858
+#define wxTextCtrl_ShowPosition 1859
+#define wxTextCtrl_Undo 1860
+#define wxTextCtrl_WriteText 1861
+#define wxTextCtrl_XYToPosition 1862
+#define wxNotebook_new_0 1865
+#define wxNotebook_new_3 1866
+#define wxNotebook_destruct 1867
+#define wxNotebook_AddPage 1868
+#define wxNotebook_AdvanceSelection 1869
+#define wxNotebook_AssignImageList 1870
+#define wxNotebook_Create 1871
+#define wxNotebook_DeleteAllPages 1872
+#define wxNotebook_DeletePage 1873
+#define wxNotebook_RemovePage 1874
+#define wxNotebook_GetCurrentPage 1875
+#define wxNotebook_GetImageList 1876
+#define wxNotebook_GetPage 1878
+#define wxNotebook_GetPageCount 1879
+#define wxNotebook_GetPageImage 1880
+#define wxNotebook_GetPageText 1881
+#define wxNotebook_GetRowCount 1882
+#define wxNotebook_GetSelection 1883
+#define wxNotebook_GetThemeBackgroundColour 1884
+#define wxNotebook_HitTest 1886
+#define wxNotebook_InsertPage 1888
+#define wxNotebook_SetImageList 1889
+#define wxNotebook_SetPadding 1890
+#define wxNotebook_SetPageSize 1891
+#define wxNotebook_SetPageImage 1892
+#define wxNotebook_SetPageText 1893
+#define wxNotebook_SetSelection 1894
+#define wxNotebook_ChangeSelection 1895
+#define wxChoicebook_new_0 1896
+#define wxChoicebook_new_3 1897
+#define wxChoicebook_AddPage 1898
+#define wxChoicebook_AdvanceSelection 1899
+#define wxChoicebook_AssignImageList 1900
+#define wxChoicebook_Create 1901
+#define wxChoicebook_DeleteAllPages 1902
+#define wxChoicebook_DeletePage 1903
+#define wxChoicebook_RemovePage 1904
+#define wxChoicebook_GetCurrentPage 1905
+#define wxChoicebook_GetImageList 1906
+#define wxChoicebook_GetPage 1908
+#define wxChoicebook_GetPageCount 1909
+#define wxChoicebook_GetPageImage 1910
+#define wxChoicebook_GetPageText 1911
+#define wxChoicebook_GetSelection 1912
+#define wxChoicebook_HitTest 1913
+#define wxChoicebook_InsertPage 1914
+#define wxChoicebook_SetImageList 1915
+#define wxChoicebook_SetPageSize 1916
+#define wxChoicebook_SetPageImage 1917
+#define wxChoicebook_SetPageText 1918
+#define wxChoicebook_SetSelection 1919
+#define wxChoicebook_ChangeSelection 1920
+#define wxChoicebook_destroy 1921
+#define wxToolbook_new_0 1922
+#define wxToolbook_new_3 1923
+#define wxToolbook_AddPage 1924
+#define wxToolbook_AdvanceSelection 1925
+#define wxToolbook_AssignImageList 1926
+#define wxToolbook_Create 1927
+#define wxToolbook_DeleteAllPages 1928
+#define wxToolbook_DeletePage 1929
+#define wxToolbook_RemovePage 1930
+#define wxToolbook_GetCurrentPage 1931
+#define wxToolbook_GetImageList 1932
+#define wxToolbook_GetPage 1934
+#define wxToolbook_GetPageCount 1935
+#define wxToolbook_GetPageImage 1936
+#define wxToolbook_GetPageText 1937
+#define wxToolbook_GetSelection 1938
+#define wxToolbook_HitTest 1940
+#define wxToolbook_InsertPage 1941
+#define wxToolbook_SetImageList 1942
+#define wxToolbook_SetPageSize 1943
+#define wxToolbook_SetPageImage 1944
+#define wxToolbook_SetPageText 1945
+#define wxToolbook_SetSelection 1946
+#define wxToolbook_ChangeSelection 1947
+#define wxToolbook_destroy 1948
+#define wxListbook_new_0 1949
+#define wxListbook_new_3 1950
+#define wxListbook_AddPage 1951
+#define wxListbook_AdvanceSelection 1952
+#define wxListbook_AssignImageList 1953
+#define wxListbook_Create 1954
+#define wxListbook_DeleteAllPages 1955
+#define wxListbook_DeletePage 1956
+#define wxListbook_RemovePage 1957
+#define wxListbook_GetCurrentPage 1958
+#define wxListbook_GetImageList 1959
+#define wxListbook_GetPage 1961
+#define wxListbook_GetPageCount 1962
+#define wxListbook_GetPageImage 1963
+#define wxListbook_GetPageText 1964
+#define wxListbook_GetSelection 1965
+#define wxListbook_HitTest 1967
+#define wxListbook_InsertPage 1968
+#define wxListbook_SetImageList 1969
+#define wxListbook_SetPageSize 1970
+#define wxListbook_SetPageImage 1971
+#define wxListbook_SetPageText 1972
+#define wxListbook_SetSelection 1973
+#define wxListbook_ChangeSelection 1974
+#define wxListbook_destroy 1975
+#define wxTreebook_new_0 1976
+#define wxTreebook_new_3 1977
+#define wxTreebook_AddPage 1978
+#define wxTreebook_AdvanceSelection 1979
+#define wxTreebook_AssignImageList 1980
+#define wxTreebook_Create 1981
+#define wxTreebook_DeleteAllPages 1982
+#define wxTreebook_DeletePage 1983
+#define wxTreebook_RemovePage 1984
+#define wxTreebook_GetCurrentPage 1985
+#define wxTreebook_GetImageList 1986
+#define wxTreebook_GetPage 1988
+#define wxTreebook_GetPageCount 1989
+#define wxTreebook_GetPageImage 1990
+#define wxTreebook_GetPageText 1991
+#define wxTreebook_GetSelection 1992
+#define wxTreebook_ExpandNode 1993
+#define wxTreebook_IsNodeExpanded 1994
+#define wxTreebook_HitTest 1996
+#define wxTreebook_InsertPage 1997
+#define wxTreebook_InsertSubPage 1998
+#define wxTreebook_SetImageList 1999
+#define wxTreebook_SetPageSize 2000
+#define wxTreebook_SetPageImage 2001
+#define wxTreebook_SetPageText 2002
+#define wxTreebook_SetSelection 2003
+#define wxTreebook_ChangeSelection 2004
+#define wxTreebook_destroy 2005
+#define wxTreeCtrl_new_2 2008
+#define wxTreeCtrl_new_0 2009
+#define wxTreeCtrl_destruct 2011
+#define wxTreeCtrl_AddRoot 2012
+#define wxTreeCtrl_AppendItem 2013
+#define wxTreeCtrl_AssignImageList 2014
+#define wxTreeCtrl_AssignStateImageList 2015
+#define wxTreeCtrl_Collapse 2016
+#define wxTreeCtrl_CollapseAndReset 2017
+#define wxTreeCtrl_Create 2018
+#define wxTreeCtrl_Delete 2019
+#define wxTreeCtrl_DeleteAllItems 2020
+#define wxTreeCtrl_DeleteChildren 2021
+#define wxTreeCtrl_EditLabel 2022
+#define wxTreeCtrl_EnsureVisible 2023
+#define wxTreeCtrl_Expand 2024
+#define wxTreeCtrl_GetBoundingRect 2025
+#define wxTreeCtrl_GetChildrenCount 2027
+#define wxTreeCtrl_GetCount 2028
+#define wxTreeCtrl_GetEditControl 2029
+#define wxTreeCtrl_GetFirstChild 2030
+#define wxTreeCtrl_GetNextChild 2031
+#define wxTreeCtrl_GetFirstVisibleItem 2032
+#define wxTreeCtrl_GetImageList 2033
+#define wxTreeCtrl_GetIndent 2034
+#define wxTreeCtrl_GetItemBackgroundColour 2035
+#define wxTreeCtrl_GetItemData 2036
+#define wxTreeCtrl_GetItemFont 2037
+#define wxTreeCtrl_GetItemImage_1 2038
+#define wxTreeCtrl_GetItemImage_2 2039
+#define wxTreeCtrl_GetItemText 2040
+#define wxTreeCtrl_GetItemTextColour 2041
+#define wxTreeCtrl_GetLastChild 2042
+#define wxTreeCtrl_GetNextSibling 2043
+#define wxTreeCtrl_GetNextVisible 2044
+#define wxTreeCtrl_GetItemParent 2045
+#define wxTreeCtrl_GetPrevSibling 2046
+#define wxTreeCtrl_GetPrevVisible 2047
+#define wxTreeCtrl_GetRootItem 2048
+#define wxTreeCtrl_GetSelection 2049
+#define wxTreeCtrl_GetSelections 2050
+#define wxTreeCtrl_GetStateImageList 2051
+#define wxTreeCtrl_HitTest 2052
+#define wxTreeCtrl_InsertItem 2054
+#define wxTreeCtrl_IsBold 2055
+#define wxTreeCtrl_IsExpanded 2056
+#define wxTreeCtrl_IsSelected 2057
+#define wxTreeCtrl_IsVisible 2058
+#define wxTreeCtrl_ItemHasChildren 2059
+#define wxTreeCtrl_PrependItem 2060
+#define wxTreeCtrl_ScrollTo 2061
+#define wxTreeCtrl_SelectItem_1 2062
+#define wxTreeCtrl_SelectItem_2 2063
+#define wxTreeCtrl_SetIndent 2064
+#define wxTreeCtrl_SetImageList 2065
+#define wxTreeCtrl_SetItemBackgroundColour 2066
+#define wxTreeCtrl_SetItemBold 2067
+#define wxTreeCtrl_SetItemData 2068
+#define wxTreeCtrl_SetItemDropHighlight 2069
+#define wxTreeCtrl_SetItemFont 2070
+#define wxTreeCtrl_SetItemHasChildren 2071
+#define wxTreeCtrl_SetItemImage_2 2072
+#define wxTreeCtrl_SetItemImage_3 2073
+#define wxTreeCtrl_SetItemText 2074
+#define wxTreeCtrl_SetItemTextColour 2075
+#define wxTreeCtrl_SetStateImageList 2076
+#define wxTreeCtrl_SetWindowStyle 2077
+#define wxTreeCtrl_SortChildren 2078
+#define wxTreeCtrl_Toggle 2079
+#define wxTreeCtrl_ToggleItemSelection 2080
+#define wxTreeCtrl_Unselect 2081
+#define wxTreeCtrl_UnselectAll 2082
+#define wxTreeCtrl_UnselectItem 2083
+#define wxScrollBar_new_0 2084
+#define wxScrollBar_new_3 2085
+#define wxScrollBar_destruct 2086
+#define wxScrollBar_Create 2087
+#define wxScrollBar_GetRange 2088
+#define wxScrollBar_GetPageSize 2089
+#define wxScrollBar_GetThumbPosition 2090
+#define wxScrollBar_GetThumbSize 2091
+#define wxScrollBar_SetThumbPosition 2092
+#define wxScrollBar_SetScrollbar 2093
+#define wxSpinButton_new_2 2095
+#define wxSpinButton_new_0 2096
+#define wxSpinButton_Create 2097
+#define wxSpinButton_GetMax 2098
+#define wxSpinButton_GetMin 2099
+#define wxSpinButton_GetValue 2100
+#define wxSpinButton_SetRange 2101
+#define wxSpinButton_SetValue 2102
+#define wxSpinButton_destroy 2103
+#define wxSpinCtrl_new_0 2104
+#define wxSpinCtrl_new_2 2105
+#define wxSpinCtrl_Create 2107
+#define wxSpinCtrl_SetValue_1_1 2110
+#define wxSpinCtrl_SetValue_1_0 2111
+#define wxSpinCtrl_GetValue 2113
+#define wxSpinCtrl_SetRange 2115
+#define wxSpinCtrl_SetSelection 2116
+#define wxSpinCtrl_GetMin 2118
+#define wxSpinCtrl_GetMax 2120
+#define wxSpinCtrl_destroy 2121
+#define wxStaticText_new_0 2122
+#define wxStaticText_new_4 2123
+#define wxStaticText_Create 2124
+#define wxStaticText_GetLabel 2125
+#define wxStaticText_SetLabel 2126
+#define wxStaticText_Wrap 2127
+#define wxStaticText_destroy 2128
+#define wxStaticBitmap_new_0 2129
+#define wxStaticBitmap_new_4 2130
+#define wxStaticBitmap_Create 2131
+#define wxStaticBitmap_GetBitmap 2132
+#define wxStaticBitmap_SetBitmap 2133
+#define wxStaticBitmap_destroy 2134
+#define wxRadioBox_new 2135
+#define wxRadioBox_destruct 2137
+#define wxRadioBox_Create 2138
+#define wxRadioBox_Enable_2 2139
+#define wxRadioBox_Enable_1 2140
+#define wxRadioBox_GetSelection 2141
+#define wxRadioBox_GetString 2142
+#define wxRadioBox_SetSelection 2143
+#define wxRadioBox_Show_2 2144
+#define wxRadioBox_Show_1 2145
+#define wxRadioBox_GetColumnCount 2146
+#define wxRadioBox_GetItemHelpText 2147
+#define wxRadioBox_GetItemToolTip 2148
+#define wxRadioBox_GetItemFromPoint 2150
+#define wxRadioBox_GetRowCount 2151
+#define wxRadioBox_IsItemEnabled 2152
+#define wxRadioBox_IsItemShown 2153
+#define wxRadioBox_SetItemHelpText 2154
+#define wxRadioBox_SetItemToolTip 2155
+#define wxRadioButton_new_0 2156
+#define wxRadioButton_new_4 2157
+#define wxRadioButton_Create 2158
+#define wxRadioButton_GetValue 2159
+#define wxRadioButton_SetValue 2160
+#define wxRadioButton_destroy 2161
+#define wxSlider_new_6 2163
+#define wxSlider_new_0 2164
+#define wxSlider_Create 2165
+#define wxSlider_GetLineSize 2166
+#define wxSlider_GetMax 2167
+#define wxSlider_GetMin 2168
+#define wxSlider_GetPageSize 2169
+#define wxSlider_GetThumbLength 2170
+#define wxSlider_GetValue 2171
+#define wxSlider_SetLineSize 2172
+#define wxSlider_SetPageSize 2173
+#define wxSlider_SetRange 2174
+#define wxSlider_SetThumbLength 2175
+#define wxSlider_SetValue 2176
+#define wxSlider_destroy 2177
+#define wxDialog_new_4 2179
+#define wxDialog_new_0 2180
+#define wxDialog_destruct 2182
+#define wxDialog_Create 2183
+#define wxDialog_CreateButtonSizer 2184
+#define wxDialog_CreateStdDialogButtonSizer 2185
+#define wxDialog_EndModal 2186
+#define wxDialog_GetAffirmativeId 2187
+#define wxDialog_GetReturnCode 2188
+#define wxDialog_IsModal 2189
+#define wxDialog_SetAffirmativeId 2190
+#define wxDialog_SetReturnCode 2191
+#define wxDialog_Show 2192
+#define wxDialog_ShowModal 2193
+#define wxColourDialog_new_0 2194
+#define wxColourDialog_new_2 2195
+#define wxColourDialog_destruct 2196
+#define wxColourDialog_Create 2197
+#define wxColourDialog_GetColourData 2198
+#define wxColourData_new_0 2199
+#define wxColourData_new_1 2200
+#define wxColourData_destruct 2201
+#define wxColourData_GetChooseFull 2202
+#define wxColourData_GetColour 2203
+#define wxColourData_GetCustomColour 2205
+#define wxColourData_SetChooseFull 2206
+#define wxColourData_SetColour 2207
+#define wxColourData_SetCustomColour 2208
+#define wxPalette_new_0 2209
+#define wxPalette_new_4 2210
+#define wxPalette_destruct 2212
+#define wxPalette_Create 2213
+#define wxPalette_GetColoursCount 2214
+#define wxPalette_GetPixel 2215
+#define wxPalette_GetRGB 2216
+#define wxPalette_IsOk 2217
+#define wxDirDialog_new 2221
+#define wxDirDialog_destruct 2222
+#define wxDirDialog_GetPath 2223
+#define wxDirDialog_GetMessage 2224
+#define wxDirDialog_SetMessage 2225
+#define wxDirDialog_SetPath 2226
+#define wxFileDialog_new 2230
+#define wxFileDialog_destruct 2231
+#define wxFileDialog_GetDirectory 2232
+#define wxFileDialog_GetFilename 2233
+#define wxFileDialog_GetFilenames 2234
+#define wxFileDialog_GetFilterIndex 2235
+#define wxFileDialog_GetMessage 2236
+#define wxFileDialog_GetPath 2237
+#define wxFileDialog_GetPaths 2238
+#define wxFileDialog_GetWildcard 2239
+#define wxFileDialog_SetDirectory 2240
+#define wxFileDialog_SetFilename 2241
+#define wxFileDialog_SetFilterIndex 2242
+#define wxFileDialog_SetMessage 2243
+#define wxFileDialog_SetPath 2244
+#define wxFileDialog_SetWildcard 2245
+#define wxPickerBase_SetInternalMargin 2246
+#define wxPickerBase_GetInternalMargin 2247
+#define wxPickerBase_SetTextCtrlProportion 2248
+#define wxPickerBase_SetPickerCtrlProportion 2249
+#define wxPickerBase_GetTextCtrlProportion 2250
+#define wxPickerBase_GetPickerCtrlProportion 2251
+#define wxPickerBase_HasTextCtrl 2252
+#define wxPickerBase_GetTextCtrl 2253
+#define wxPickerBase_IsTextCtrlGrowable 2254
+#define wxPickerBase_SetPickerCtrlGrowable 2255
+#define wxPickerBase_SetTextCtrlGrowable 2256
+#define wxPickerBase_IsPickerCtrlGrowable 2257
+#define wxFilePickerCtrl_new_0 2258
+#define wxFilePickerCtrl_new_3 2259
+#define wxFilePickerCtrl_Create 2260
+#define wxFilePickerCtrl_GetPath 2261
+#define wxFilePickerCtrl_SetPath 2262
+#define wxFilePickerCtrl_destroy 2263
+#define wxDirPickerCtrl_new_0 2264
+#define wxDirPickerCtrl_new_3 2265
+#define wxDirPickerCtrl_Create 2266
+#define wxDirPickerCtrl_GetPath 2267
+#define wxDirPickerCtrl_SetPath 2268
+#define wxDirPickerCtrl_destroy 2269
+#define wxColourPickerCtrl_new_0 2270
+#define wxColourPickerCtrl_new_3 2271
+#define wxColourPickerCtrl_Create 2272
+#define wxColourPickerCtrl_GetColour 2273
+#define wxColourPickerCtrl_SetColour_1_1 2274
+#define wxColourPickerCtrl_SetColour_1_0 2275
+#define wxColourPickerCtrl_destroy 2276
+#define wxDatePickerCtrl_new_0 2277
+#define wxDatePickerCtrl_new_3 2278
+#define wxDatePickerCtrl_GetRange 2279
+#define wxDatePickerCtrl_GetValue 2280
+#define wxDatePickerCtrl_SetRange 2281
+#define wxDatePickerCtrl_SetValue 2282
+#define wxDatePickerCtrl_destroy 2283
+#define wxFontPickerCtrl_new_0 2284
+#define wxFontPickerCtrl_new_3 2285
+#define wxFontPickerCtrl_Create 2286
+#define wxFontPickerCtrl_GetSelectedFont 2287
+#define wxFontPickerCtrl_SetSelectedFont 2288
+#define wxFontPickerCtrl_GetMaxPointSize 2289
+#define wxFontPickerCtrl_SetMaxPointSize 2290
+#define wxFontPickerCtrl_destroy 2291
+#define wxFindReplaceDialog_new_0 2294
+#define wxFindReplaceDialog_new_4 2295
+#define wxFindReplaceDialog_destruct 2296
+#define wxFindReplaceDialog_Create 2297
+#define wxFindReplaceDialog_GetData 2298
+#define wxFindReplaceData_new_0 2299
+#define wxFindReplaceData_new_1 2300
+#define wxFindReplaceData_GetFindString 2301
+#define wxFindReplaceData_GetReplaceString 2302
+#define wxFindReplaceData_GetFlags 2303
+#define wxFindReplaceData_SetFlags 2304
+#define wxFindReplaceData_SetFindString 2305
+#define wxFindReplaceData_SetReplaceString 2306
+#define wxFindReplaceData_destroy 2307
+#define wxMultiChoiceDialog_new_0 2308
+#define wxMultiChoiceDialog_new_5 2310
+#define wxMultiChoiceDialog_GetSelections 2311
+#define wxMultiChoiceDialog_SetSelections 2312
+#define wxMultiChoiceDialog_destroy 2313
+#define wxSingleChoiceDialog_new_0 2314
+#define wxSingleChoiceDialog_new_5 2316
+#define wxSingleChoiceDialog_GetSelection 2317
+#define wxSingleChoiceDialog_GetStringSelection 2318
+#define wxSingleChoiceDialog_SetSelection 2319
+#define wxSingleChoiceDialog_destroy 2320
+#define wxTextEntryDialog_new 2321
+#define wxTextEntryDialog_GetValue 2322
+#define wxTextEntryDialog_SetValue 2323
+#define wxTextEntryDialog_destroy 2324
+#define wxPasswordEntryDialog_new 2325
+#define wxPasswordEntryDialog_destroy 2326
+#define wxFontData_new_0 2327
+#define wxFontData_new_1 2328
+#define wxFontData_destruct 2329
+#define wxFontData_EnableEffects 2330
+#define wxFontData_GetAllowSymbols 2331
+#define wxFontData_GetColour 2332
+#define wxFontData_GetChosenFont 2333
+#define wxFontData_GetEnableEffects 2334
+#define wxFontData_GetInitialFont 2335
+#define wxFontData_GetShowHelp 2336
+#define wxFontData_SetAllowSymbols 2337
+#define wxFontData_SetChosenFont 2338
+#define wxFontData_SetColour 2339
+#define wxFontData_SetInitialFont 2340
+#define wxFontData_SetRange 2341
+#define wxFontData_SetShowHelp 2342
+#define wxFontDialog_new_0 2346
+#define wxFontDialog_new_2 2348
+#define wxFontDialog_Create 2350
+#define wxFontDialog_GetFontData 2351
+#define wxFontDialog_destroy 2353
+#define wxProgressDialog_new 2354
+#define wxProgressDialog_destruct 2355
+#define wxProgressDialog_Resume 2356
+#define wxProgressDialog_Update_2 2357
+#define wxProgressDialog_Update_0 2358
+#define wxMessageDialog_new 2359
+#define wxMessageDialog_destruct 2360
+#define wxPageSetupDialog_new 2361
+#define wxPageSetupDialog_destruct 2362
+#define wxPageSetupDialog_GetPageSetupData 2363
+#define wxPageSetupDialog_ShowModal 2364
+#define wxPageSetupDialogData_new_0 2365
+#define wxPageSetupDialogData_new_1_0 2366
+#define wxPageSetupDialogData_new_1_1 2367
+#define wxPageSetupDialogData_destruct 2368
+#define wxPageSetupDialogData_EnableHelp 2369
+#define wxPageSetupDialogData_EnableMargins 2370
+#define wxPageSetupDialogData_EnableOrientation 2371
+#define wxPageSetupDialogData_EnablePaper 2372
+#define wxPageSetupDialogData_EnablePrinter 2373
+#define wxPageSetupDialogData_GetDefaultMinMargins 2374
+#define wxPageSetupDialogData_GetEnableMargins 2375
+#define wxPageSetupDialogData_GetEnableOrientation 2376
+#define wxPageSetupDialogData_GetEnablePaper 2377
+#define wxPageSetupDialogData_GetEnablePrinter 2378
+#define wxPageSetupDialogData_GetEnableHelp 2379
+#define wxPageSetupDialogData_GetDefaultInfo 2380
+#define wxPageSetupDialogData_GetMarginTopLeft 2381
+#define wxPageSetupDialogData_GetMarginBottomRight 2382
+#define wxPageSetupDialogData_GetMinMarginTopLeft 2383
+#define wxPageSetupDialogData_GetMinMarginBottomRight 2384
+#define wxPageSetupDialogData_GetPaperId 2385
+#define wxPageSetupDialogData_GetPaperSize 2386
+#define wxPageSetupDialogData_GetPrintData 2388
+#define wxPageSetupDialogData_IsOk 2389
+#define wxPageSetupDialogData_SetDefaultInfo 2390
+#define wxPageSetupDialogData_SetDefaultMinMargins 2391
+#define wxPageSetupDialogData_SetMarginTopLeft 2392
+#define wxPageSetupDialogData_SetMarginBottomRight 2393
+#define wxPageSetupDialogData_SetMinMarginTopLeft 2394
+#define wxPageSetupDialogData_SetMinMarginBottomRight 2395
+#define wxPageSetupDialogData_SetPaperId 2396
+#define wxPageSetupDialogData_SetPaperSize_1_1 2397
+#define wxPageSetupDialogData_SetPaperSize_1_0 2398
+#define wxPageSetupDialogData_SetPrintData 2399
+#define wxPrintDialog_new_2_0 2400
+#define wxPrintDialog_new_2_1 2401
+#define wxPrintDialog_destruct 2402
+#define wxPrintDialog_GetPrintDialogData 2403
+#define wxPrintDialog_GetPrintDC 2404
+#define wxPrintDialogData_new_0 2405
+#define wxPrintDialogData_new_1_1 2406
+#define wxPrintDialogData_new_1_0 2407
+#define wxPrintDialogData_destruct 2408
+#define wxPrintDialogData_EnableHelp 2409
+#define wxPrintDialogData_EnablePageNumbers 2410
+#define wxPrintDialogData_EnablePrintToFile 2411
+#define wxPrintDialogData_EnableSelection 2412
+#define wxPrintDialogData_GetAllPages 2413
+#define wxPrintDialogData_GetCollate 2414
+#define wxPrintDialogData_GetFromPage 2415
+#define wxPrintDialogData_GetMaxPage 2416
+#define wxPrintDialogData_GetMinPage 2417
+#define wxPrintDialogData_GetNoCopies 2418
+#define wxPrintDialogData_GetPrintData 2419
+#define wxPrintDialogData_GetPrintToFile 2420
+#define wxPrintDialogData_GetSelection 2421
+#define wxPrintDialogData_GetToPage 2422
+#define wxPrintDialogData_IsOk 2423
+#define wxPrintDialogData_SetCollate 2424
+#define wxPrintDialogData_SetFromPage 2425
+#define wxPrintDialogData_SetMaxPage 2426
+#define wxPrintDialogData_SetMinPage 2427
+#define wxPrintDialogData_SetNoCopies 2428
+#define wxPrintDialogData_SetPrintData 2429
+#define wxPrintDialogData_SetPrintToFile 2430
+#define wxPrintDialogData_SetSelection 2431
+#define wxPrintDialogData_SetToPage 2432
+#define wxPrintData_new_0 2433
+#define wxPrintData_new_1 2434
+#define wxPrintData_destruct 2435
+#define wxPrintData_GetCollate 2436
+#define wxPrintData_GetBin 2437
+#define wxPrintData_GetColour 2438
+#define wxPrintData_GetDuplex 2439
+#define wxPrintData_GetNoCopies 2440
+#define wxPrintData_GetOrientation 2441
+#define wxPrintData_GetPaperId 2442
+#define wxPrintData_GetPrinterName 2443
+#define wxPrintData_GetQuality 2444
+#define wxPrintData_IsOk 2445
+#define wxPrintData_SetBin 2446
+#define wxPrintData_SetCollate 2447
+#define wxPrintData_SetColour 2448
+#define wxPrintData_SetDuplex 2449
+#define wxPrintData_SetNoCopies 2450
+#define wxPrintData_SetOrientation 2451
+#define wxPrintData_SetPaperId 2452
+#define wxPrintData_SetPrinterName 2453
+#define wxPrintData_SetQuality 2454
+#define wxPrintPreview_new_2 2457
+#define wxPrintPreview_new_3 2458
+#define wxPrintPreview_destruct 2460
+#define wxPrintPreview_GetCanvas 2461
+#define wxPrintPreview_GetCurrentPage 2462
+#define wxPrintPreview_GetFrame 2463
+#define wxPrintPreview_GetMaxPage 2464
+#define wxPrintPreview_GetMinPage 2465
+#define wxPrintPreview_GetPrintout 2466
+#define wxPrintPreview_GetPrintoutForPrinting 2467
+#define wxPrintPreview_IsOk 2468
+#define wxPrintPreview_PaintPage 2469
+#define wxPrintPreview_Print 2470
+#define wxPrintPreview_RenderPage 2471
+#define wxPrintPreview_SetCanvas 2472
+#define wxPrintPreview_SetCurrentPage 2473
+#define wxPrintPreview_SetFrame 2474
+#define wxPrintPreview_SetPrintout 2475
+#define wxPrintPreview_SetZoom 2476
+#define wxPreviewFrame_new 2477
+#define wxPreviewFrame_destruct 2478
+#define wxPreviewFrame_CreateControlBar 2479
+#define wxPreviewFrame_CreateCanvas 2480
+#define wxPreviewFrame_Initialize 2481
+#define wxPreviewFrame_OnCloseWindow 2482
+#define wxPreviewControlBar_new 2483
+#define wxPreviewControlBar_destruct 2484
+#define wxPreviewControlBar_CreateButtons 2485
+#define wxPreviewControlBar_GetPrintPreview 2486
+#define wxPreviewControlBar_GetZoomControl 2487
+#define wxPreviewControlBar_SetZoomControl 2488
+#define wxPrinter_new 2490
+#define wxPrinter_CreateAbortWindow 2491
+#define wxPrinter_GetAbort 2492
+#define wxPrinter_GetLastError 2493
+#define wxPrinter_GetPrintDialogData 2494
+#define wxPrinter_Print 2495
+#define wxPrinter_PrintDialog 2496
+#define wxPrinter_ReportError 2497
+#define wxPrinter_Setup 2498
+#define wxPrinter_destroy 2499
+#define wxXmlResource_new_1 2500
+#define wxXmlResource_new_2 2501
+#define wxXmlResource_destruct 2502
+#define wxXmlResource_AttachUnknownControl 2503
+#define wxXmlResource_ClearHandlers 2504
+#define wxXmlResource_CompareVersion 2505
+#define wxXmlResource_Get 2506
+#define wxXmlResource_GetFlags 2507
+#define wxXmlResource_GetVersion 2508
+#define wxXmlResource_GetXRCID 2509
+#define wxXmlResource_InitAllHandlers 2510
+#define wxXmlResource_Load 2511
+#define wxXmlResource_LoadBitmap 2512
+#define wxXmlResource_LoadDialog_2 2513
+#define wxXmlResource_LoadDialog_3 2514
+#define wxXmlResource_LoadFrame_2 2515
+#define wxXmlResource_LoadFrame_3 2516
+#define wxXmlResource_LoadIcon 2517
+#define wxXmlResource_LoadMenu 2518
+#define wxXmlResource_LoadMenuBar_2 2519
+#define wxXmlResource_LoadMenuBar_1 2520
+#define wxXmlResource_LoadPanel_2 2521
+#define wxXmlResource_LoadPanel_3 2522
+#define wxXmlResource_LoadToolBar 2523
+#define wxXmlResource_Set 2524
+#define wxXmlResource_SetFlags 2525
+#define wxXmlResource_Unload 2526
+#define wxXmlResource_xrcctrl 2527
+#define wxHtmlEasyPrinting_new 2528
+#define wxHtmlEasyPrinting_destruct 2529
+#define wxHtmlEasyPrinting_GetPrintData 2530
+#define wxHtmlEasyPrinting_GetPageSetupData 2531
+#define wxHtmlEasyPrinting_PreviewFile 2532
+#define wxHtmlEasyPrinting_PreviewText 2533
+#define wxHtmlEasyPrinting_PrintFile 2534
+#define wxHtmlEasyPrinting_PrintText 2535
+#define wxHtmlEasyPrinting_PageSetup 2536
+#define wxHtmlEasyPrinting_SetFonts 2537
+#define wxHtmlEasyPrinting_SetHeader 2538
+#define wxHtmlEasyPrinting_SetFooter 2539
+#define wxGLCanvas_new_2 2541
+#define wxGLCanvas_new_3_1 2542
+#define wxGLCanvas_new_3_0 2543
+#define wxGLCanvas_GetContext 2544
+#define wxGLCanvas_SetCurrent 2546
+#define wxGLCanvas_SwapBuffers 2547
+#define wxGLCanvas_destroy 2548
+#define wxAuiManager_new 2549
+#define wxAuiManager_destruct 2550
+#define wxAuiManager_AddPane_2_1 2551
+#define wxAuiManager_AddPane_3 2552
+#define wxAuiManager_AddPane_2_0 2553
+#define wxAuiManager_DetachPane 2554
+#define wxAuiManager_GetAllPanes 2555
+#define wxAuiManager_GetArtProvider 2556
+#define wxAuiManager_GetDockSizeConstraint 2557
+#define wxAuiManager_GetFlags 2558
+#define wxAuiManager_GetManagedWindow 2559
+#define wxAuiManager_GetManager 2560
+#define wxAuiManager_GetPane_1_1 2561
+#define wxAuiManager_GetPane_1_0 2562
+#define wxAuiManager_HideHint 2563
+#define wxAuiManager_InsertPane 2564
+#define wxAuiManager_LoadPaneInfo 2565
+#define wxAuiManager_LoadPerspective 2566
+#define wxAuiManager_SavePaneInfo 2567
+#define wxAuiManager_SavePerspective 2568
+#define wxAuiManager_SetArtProvider 2569
+#define wxAuiManager_SetDockSizeConstraint 2570
+#define wxAuiManager_SetFlags 2571
+#define wxAuiManager_SetManagedWindow 2572
+#define wxAuiManager_ShowHint 2573
+#define wxAuiManager_UnInit 2574
+#define wxAuiManager_Update 2575
+#define wxAuiPaneInfo_new_0 2576
+#define wxAuiPaneInfo_new_1 2577
+#define wxAuiPaneInfo_destruct 2578
+#define wxAuiPaneInfo_BestSize_1 2579
+#define wxAuiPaneInfo_BestSize_2 2580
+#define wxAuiPaneInfo_Bottom 2581
+#define wxAuiPaneInfo_BottomDockable 2582
+#define wxAuiPaneInfo_Caption 2583
+#define wxAuiPaneInfo_CaptionVisible 2584
+#define wxAuiPaneInfo_Centre 2585
+#define wxAuiPaneInfo_CentrePane 2586
+#define wxAuiPaneInfo_CloseButton 2587
+#define wxAuiPaneInfo_DefaultPane 2588
+#define wxAuiPaneInfo_DestroyOnClose 2589
+#define wxAuiPaneInfo_Direction 2590
+#define wxAuiPaneInfo_Dock 2591
+#define wxAuiPaneInfo_Dockable 2592
+#define wxAuiPaneInfo_Fixed 2593
+#define wxAuiPaneInfo_Float 2594
+#define wxAuiPaneInfo_Floatable 2595
+#define wxAuiPaneInfo_FloatingPosition_1 2596
+#define wxAuiPaneInfo_FloatingPosition_2 2597
+#define wxAuiPaneInfo_FloatingSize_1 2598
+#define wxAuiPaneInfo_FloatingSize_2 2599
+#define wxAuiPaneInfo_Gripper 2600
+#define wxAuiPaneInfo_GripperTop 2601
+#define wxAuiPaneInfo_HasBorder 2602
+#define wxAuiPaneInfo_HasCaption 2603
+#define wxAuiPaneInfo_HasCloseButton 2604
+#define wxAuiPaneInfo_HasFlag 2605
+#define wxAuiPaneInfo_HasGripper 2606
+#define wxAuiPaneInfo_HasGripperTop 2607
+#define wxAuiPaneInfo_HasMaximizeButton 2608
+#define wxAuiPaneInfo_HasMinimizeButton 2609
+#define wxAuiPaneInfo_HasPinButton 2610
+#define wxAuiPaneInfo_Hide 2611
+#define wxAuiPaneInfo_IsBottomDockable 2612
+#define wxAuiPaneInfo_IsDocked 2613
+#define wxAuiPaneInfo_IsFixed 2614
+#define wxAuiPaneInfo_IsFloatable 2615
+#define wxAuiPaneInfo_IsFloating 2616
+#define wxAuiPaneInfo_IsLeftDockable 2617
+#define wxAuiPaneInfo_IsMovable 2618
+#define wxAuiPaneInfo_IsOk 2619
+#define wxAuiPaneInfo_IsResizable 2620
+#define wxAuiPaneInfo_IsRightDockable 2621
+#define wxAuiPaneInfo_IsShown 2622
+#define wxAuiPaneInfo_IsToolbar 2623
+#define wxAuiPaneInfo_IsTopDockable 2624
+#define wxAuiPaneInfo_Layer 2625
+#define wxAuiPaneInfo_Left 2626
+#define wxAuiPaneInfo_LeftDockable 2627
+#define wxAuiPaneInfo_MaxSize_1 2628
+#define wxAuiPaneInfo_MaxSize_2 2629
+#define wxAuiPaneInfo_MaximizeButton 2630
+#define wxAuiPaneInfo_MinSize_1 2631
+#define wxAuiPaneInfo_MinSize_2 2632
+#define wxAuiPaneInfo_MinimizeButton 2633
+#define wxAuiPaneInfo_Movable 2634
+#define wxAuiPaneInfo_Name 2635
+#define wxAuiPaneInfo_PaneBorder 2636
+#define wxAuiPaneInfo_PinButton 2637
+#define wxAuiPaneInfo_Position 2638
+#define wxAuiPaneInfo_Resizable 2639
+#define wxAuiPaneInfo_Right 2640
+#define wxAuiPaneInfo_RightDockable 2641
+#define wxAuiPaneInfo_Row 2642
+#define wxAuiPaneInfo_SafeSet 2643
+#define wxAuiPaneInfo_SetFlag 2644
+#define wxAuiPaneInfo_Show 2645
+#define wxAuiPaneInfo_ToolbarPane 2646
+#define wxAuiPaneInfo_Top 2647
+#define wxAuiPaneInfo_TopDockable 2648
+#define wxAuiPaneInfo_Window 2649
+#define wxAuiNotebook_new_0 2650
+#define wxAuiNotebook_new_2 2651
+#define wxAuiNotebook_AddPage 2652
+#define wxAuiNotebook_Create 2653
+#define wxAuiNotebook_DeletePage 2654
+#define wxAuiNotebook_GetArtProvider 2655
+#define wxAuiNotebook_GetPage 2656
+#define wxAuiNotebook_GetPageBitmap 2657
+#define wxAuiNotebook_GetPageCount 2658
+#define wxAuiNotebook_GetPageIndex 2659
+#define wxAuiNotebook_GetPageText 2660
+#define wxAuiNotebook_GetSelection 2661
+#define wxAuiNotebook_InsertPage 2662
+#define wxAuiNotebook_RemovePage 2663
+#define wxAuiNotebook_SetArtProvider 2664
+#define wxAuiNotebook_SetFont 2665
+#define wxAuiNotebook_SetPageBitmap 2666
+#define wxAuiNotebook_SetPageText 2667
+#define wxAuiNotebook_SetSelection 2668
+#define wxAuiNotebook_SetTabCtrlHeight 2669
+#define wxAuiNotebook_SetUniformBitmapSize 2670
+#define wxAuiNotebook_destroy 2671
+#define wxMDIParentFrame_new_0 2672
+#define wxMDIParentFrame_new_4 2673
+#define wxMDIParentFrame_destruct 2674
+#define wxMDIParentFrame_ActivateNext 2675
+#define wxMDIParentFrame_ActivatePrevious 2676
+#define wxMDIParentFrame_ArrangeIcons 2677
+#define wxMDIParentFrame_Cascade 2678
+#define wxMDIParentFrame_Create 2679
+#define wxMDIParentFrame_GetActiveChild 2680
+#define wxMDIParentFrame_GetClientWindow 2681
+#define wxMDIParentFrame_Tile 2682
+#define wxMDIChildFrame_new_0 2683
+#define wxMDIChildFrame_new_4 2684
+#define wxMDIChildFrame_destruct 2685
+#define wxMDIChildFrame_Activate 2686
+#define wxMDIChildFrame_Create 2687
+#define wxMDIChildFrame_Maximize 2688
+#define wxMDIChildFrame_Restore 2689
+#define wxMDIClientWindow_new_0 2690
+#define wxMDIClientWindow_new_2 2691
+#define wxMDIClientWindow_destruct 2692
+#define wxMDIClientWindow_CreateClient 2693
+#define wxLayoutAlgorithm_new 2694
+#define wxLayoutAlgorithm_LayoutFrame 2695
+#define wxLayoutAlgorithm_LayoutMDIFrame 2696
+#define wxLayoutAlgorithm_LayoutWindow 2697
+#define wxLayoutAlgorithm_destroy 2698
+#define wxEvent_GetId 2699
+#define wxEvent_GetSkipped 2700
+#define wxEvent_GetTimestamp 2701
+#define wxEvent_IsCommandEvent 2702
+#define wxEvent_ResumePropagation 2703
+#define wxEvent_ShouldPropagate 2704
+#define wxEvent_Skip 2705
+#define wxEvent_StopPropagation 2706
+#define wxCommandEvent_getClientData 2707
+#define wxCommandEvent_GetExtraLong 2708
+#define wxCommandEvent_GetInt 2709
+#define wxCommandEvent_GetSelection 2710
+#define wxCommandEvent_GetString 2711
+#define wxCommandEvent_IsChecked 2712
+#define wxCommandEvent_IsSelection 2713
+#define wxCommandEvent_SetInt 2714
+#define wxCommandEvent_SetString 2715
+#define wxScrollEvent_GetOrientation 2716
+#define wxScrollEvent_GetPosition 2717
+#define wxScrollWinEvent_GetOrientation 2718
+#define wxScrollWinEvent_GetPosition 2719
+#define wxMouseEvent_AltDown 2720
+#define wxMouseEvent_Button 2721
+#define wxMouseEvent_ButtonDClick 2722
+#define wxMouseEvent_ButtonDown 2723
+#define wxMouseEvent_ButtonUp 2724
+#define wxMouseEvent_CmdDown 2725
+#define wxMouseEvent_ControlDown 2726
+#define wxMouseEvent_Dragging 2727
+#define wxMouseEvent_Entering 2728
+#define wxMouseEvent_GetButton 2729
+#define wxMouseEvent_GetPosition 2732
+#define wxMouseEvent_GetLogicalPosition 2733
+#define wxMouseEvent_GetLinesPerAction 2734
+#define wxMouseEvent_GetWheelRotation 2735
+#define wxMouseEvent_GetWheelDelta 2736
+#define wxMouseEvent_GetX 2737
+#define wxMouseEvent_GetY 2738
+#define wxMouseEvent_IsButton 2739
+#define wxMouseEvent_IsPageScroll 2740
+#define wxMouseEvent_Leaving 2741
+#define wxMouseEvent_LeftDClick 2742
+#define wxMouseEvent_LeftDown 2743
+#define wxMouseEvent_LeftIsDown 2744
+#define wxMouseEvent_LeftUp 2745
+#define wxMouseEvent_MetaDown 2746
+#define wxMouseEvent_MiddleDClick 2747
+#define wxMouseEvent_MiddleDown 2748
+#define wxMouseEvent_MiddleIsDown 2749
+#define wxMouseEvent_MiddleUp 2750
+#define wxMouseEvent_Moving 2751
+#define wxMouseEvent_RightDClick 2752
+#define wxMouseEvent_RightDown 2753
+#define wxMouseEvent_RightIsDown 2754
+#define wxMouseEvent_RightUp 2755
+#define wxMouseEvent_ShiftDown 2756
+#define wxSetCursorEvent_GetCursor 2757
+#define wxSetCursorEvent_GetX 2758
+#define wxSetCursorEvent_GetY 2759
+#define wxSetCursorEvent_HasCursor 2760
+#define wxSetCursorEvent_SetCursor 2761
+#define wxKeyEvent_AltDown 2762
+#define wxKeyEvent_CmdDown 2763
+#define wxKeyEvent_ControlDown 2764
+#define wxKeyEvent_GetKeyCode 2765
+#define wxKeyEvent_GetModifiers 2766
+#define wxKeyEvent_GetPosition 2769
+#define wxKeyEvent_GetRawKeyCode 2770
+#define wxKeyEvent_GetRawKeyFlags 2771
+#define wxKeyEvent_GetUnicodeKey 2772
+#define wxKeyEvent_GetX 2773
+#define wxKeyEvent_GetY 2774
+#define wxKeyEvent_HasModifiers 2775
+#define wxKeyEvent_MetaDown 2776
+#define wxKeyEvent_ShiftDown 2777
+#define wxSizeEvent_GetSize 2778
+#define wxMoveEvent_GetPosition 2779
+#define wxEraseEvent_GetDC 2780
+#define wxFocusEvent_GetWindow 2781
+#define wxChildFocusEvent_GetWindow 2782
+#define wxMenuEvent_GetMenu 2783
+#define wxMenuEvent_GetMenuId 2784
+#define wxMenuEvent_IsPopup 2785
+#define wxCloseEvent_CanVeto 2786
+#define wxCloseEvent_GetLoggingOff 2787
+#define wxCloseEvent_SetCanVeto 2788
+#define wxCloseEvent_SetLoggingOff 2789
+#define wxCloseEvent_Veto 2790
+#define wxShowEvent_SetShow 2791
+#define wxShowEvent_GetShow 2792
+#define wxIconizeEvent_Iconized 2793
+#define wxJoystickEvent_ButtonDown 2794
+#define wxJoystickEvent_ButtonIsDown 2795
+#define wxJoystickEvent_ButtonUp 2796
+#define wxJoystickEvent_GetButtonChange 2797
+#define wxJoystickEvent_GetButtonState 2798
+#define wxJoystickEvent_GetJoystick 2799
+#define wxJoystickEvent_GetPosition 2800
+#define wxJoystickEvent_GetZPosition 2801
+#define wxJoystickEvent_IsButton 2802
+#define wxJoystickEvent_IsMove 2803
+#define wxJoystickEvent_IsZMove 2804
+#define wxUpdateUIEvent_CanUpdate 2805
+#define wxUpdateUIEvent_Check 2806
+#define wxUpdateUIEvent_Enable 2807
+#define wxUpdateUIEvent_Show 2808
+#define wxUpdateUIEvent_GetChecked 2809
+#define wxUpdateUIEvent_GetEnabled 2810
+#define wxUpdateUIEvent_GetShown 2811
+#define wxUpdateUIEvent_GetSetChecked 2812
+#define wxUpdateUIEvent_GetSetEnabled 2813
+#define wxUpdateUIEvent_GetSetShown 2814
+#define wxUpdateUIEvent_GetSetText 2815
+#define wxUpdateUIEvent_GetText 2816
+#define wxUpdateUIEvent_GetMode 2817
+#define wxUpdateUIEvent_GetUpdateInterval 2818
+#define wxUpdateUIEvent_ResetUpdateTime 2819
+#define wxUpdateUIEvent_SetMode 2820
+#define wxUpdateUIEvent_SetText 2821
+#define wxUpdateUIEvent_SetUpdateInterval 2822
+#define wxMouseCaptureChangedEvent_GetCapturedWindow 2823
+#define wxPaletteChangedEvent_SetChangedWindow 2824
+#define wxPaletteChangedEvent_GetChangedWindow 2825
+#define wxQueryNewPaletteEvent_SetPaletteRealized 2826
+#define wxQueryNewPaletteEvent_GetPaletteRealized 2827
+#define wxNavigationKeyEvent_GetDirection 2828
+#define wxNavigationKeyEvent_SetDirection 2829
+#define wxNavigationKeyEvent_IsWindowChange 2830
+#define wxNavigationKeyEvent_SetWindowChange 2831
+#define wxNavigationKeyEvent_IsFromTab 2832
+#define wxNavigationKeyEvent_SetFromTab 2833
+#define wxNavigationKeyEvent_GetCurrentFocus 2834
+#define wxNavigationKeyEvent_SetCurrentFocus 2835
+#define wxHelpEvent_GetOrigin 2836
+#define wxHelpEvent_GetPosition 2837
+#define wxHelpEvent_SetOrigin 2838
+#define wxHelpEvent_SetPosition 2839
+#define wxContextMenuEvent_GetPosition 2840
+#define wxContextMenuEvent_SetPosition 2841
+#define wxIdleEvent_CanSend 2842
+#define wxIdleEvent_GetMode 2843
+#define wxIdleEvent_RequestMore 2844
+#define wxIdleEvent_MoreRequested 2845
+#define wxIdleEvent_SetMode 2846
+#define wxGridEvent_AltDown 2847
+#define wxGridEvent_ControlDown 2848
+#define wxGridEvent_GetCol 2849
+#define wxGridEvent_GetPosition 2850
+#define wxGridEvent_GetRow 2851
+#define wxGridEvent_MetaDown 2852
+#define wxGridEvent_Selecting 2853
+#define wxGridEvent_ShiftDown 2854
+#define wxNotifyEvent_Allow 2855
+#define wxNotifyEvent_IsAllowed 2856
+#define wxNotifyEvent_Veto 2857
+#define wxSashEvent_GetEdge 2858
+#define wxSashEvent_GetDragRect 2859
+#define wxSashEvent_GetDragStatus 2860
+#define wxListEvent_GetCacheFrom 2861
+#define wxListEvent_GetCacheTo 2862
+#define wxListEvent_GetKeyCode 2863
+#define wxListEvent_GetIndex 2864
+#define wxListEvent_GetColumn 2865
+#define wxListEvent_GetPoint 2866
+#define wxListEvent_GetLabel 2867
+#define wxListEvent_GetText 2868
+#define wxListEvent_GetImage 2869
+#define wxListEvent_GetData 2870
+#define wxListEvent_GetMask 2871
+#define wxListEvent_GetItem 2872
+#define wxListEvent_IsEditCancelled 2873
+#define wxDateEvent_GetDate 2874
+#define wxCalendarEvent_GetWeekDay 2875
+#define wxFileDirPickerEvent_GetPath 2876
+#define wxColourPickerEvent_GetColour 2877
+#define wxFontPickerEvent_GetFont 2878
+#define wxStyledTextEvent_GetPosition 2879
+#define wxStyledTextEvent_GetKey 2880
+#define wxStyledTextEvent_GetModifiers 2881
+#define wxStyledTextEvent_GetModificationType 2882
+#define wxStyledTextEvent_GetText 2883
+#define wxStyledTextEvent_GetLength 2884
+#define wxStyledTextEvent_GetLinesAdded 2885
+#define wxStyledTextEvent_GetLine 2886
+#define wxStyledTextEvent_GetFoldLevelNow 2887
+#define wxStyledTextEvent_GetFoldLevelPrev 2888
+#define wxStyledTextEvent_GetMargin 2889
+#define wxStyledTextEvent_GetMessage 2890
+#define wxStyledTextEvent_GetWParam 2891
+#define wxStyledTextEvent_GetLParam 2892
+#define wxStyledTextEvent_GetListType 2893
+#define wxStyledTextEvent_GetX 2894
+#define wxStyledTextEvent_GetY 2895
+#define wxStyledTextEvent_GetDragText 2896
+#define wxStyledTextEvent_GetDragAllowMove 2897
+#define wxStyledTextEvent_GetDragResult 2898
+#define wxStyledTextEvent_GetShift 2899
+#define wxStyledTextEvent_GetControl 2900
+#define wxStyledTextEvent_GetAlt 2901
+#define utils_wxGetKeyState 2902
+#define utils_wxGetMousePosition 2903
+#define utils_wxGetMouseState 2904
+#define utils_wxSetDetectableAutoRepeat 2905
+#define utils_wxBell 2906
+#define utils_wxFindMenuItemId 2907
+#define utils_wxGenericFindWindowAtPoint 2908
+#define utils_wxFindWindowAtPoint 2909
+#define utils_wxBeginBusyCursor 2910
+#define utils_wxEndBusyCursor 2911
+#define utils_wxIsBusy 2912
+#define utils_wxShutdown 2913
+#define utils_wxShell 2914
+#define utils_wxLaunchDefaultBrowser 2915
+#define utils_wxGetEmailAddress 2916
+#define utils_wxGetUserId 2917
+#define utils_wxGetHomeDir 2918
+#define utils_wxNewId 2919
+#define utils_wxRegisterId 2920
+#define utils_wxGetCurrentId 2921
+#define utils_wxGetOsDescription 2922
+#define utils_wxIsPlatformLittleEndian 2923
+#define utils_wxIsPlatform64Bit 2924
+#define wxPrintout_new 2925
+#define wxPrintout_destruct 2926
+#define wxPrintout_GetDC 2927
+#define wxPrintout_GetPageSizeMM 2928
+#define wxPrintout_GetPageSizePixels 2929
+#define wxPrintout_GetPaperRectPixels 2930
+#define wxPrintout_GetPPIPrinter 2931
+#define wxPrintout_GetPPIScreen 2932
+#define wxPrintout_GetTitle 2933
+#define wxPrintout_IsPreview 2934
+#define wxPrintout_FitThisSizeToPaper 2935
+#define wxPrintout_FitThisSizeToPage 2936
+#define wxPrintout_FitThisSizeToPageMargins 2937
+#define wxPrintout_MapScreenSizeToPaper 2938
+#define wxPrintout_MapScreenSizeToPage 2939
+#define wxPrintout_MapScreenSizeToPageMargins 2940
+#define wxPrintout_MapScreenSizeToDevice 2941
+#define wxPrintout_GetLogicalPaperRect 2942
+#define wxPrintout_GetLogicalPageRect 2943
+#define wxPrintout_GetLogicalPageMarginsRect 2944
+#define wxPrintout_SetLogicalOrigin 2945
+#define wxPrintout_OffsetLogicalOrigin 2946
+#define wxStyledTextCtrl_new_2 2947
+#define wxStyledTextCtrl_new_0 2948
+#define wxStyledTextCtrl_destruct 2949
+#define wxStyledTextCtrl_Create 2950
+#define wxStyledTextCtrl_AddText 2951
+#define wxStyledTextCtrl_AddStyledText 2952
+#define wxStyledTextCtrl_InsertText 2953
+#define wxStyledTextCtrl_ClearAll 2954
+#define wxStyledTextCtrl_ClearDocumentStyle 2955
+#define wxStyledTextCtrl_GetLength 2956
+#define wxStyledTextCtrl_GetCharAt 2957
+#define wxStyledTextCtrl_GetCurrentPos 2958
+#define wxStyledTextCtrl_GetAnchor 2959
+#define wxStyledTextCtrl_GetStyleAt 2960
+#define wxStyledTextCtrl_Redo 2961
+#define wxStyledTextCtrl_SetUndoCollection 2962
+#define wxStyledTextCtrl_SelectAll 2963
+#define wxStyledTextCtrl_SetSavePoint 2964
+#define wxStyledTextCtrl_GetStyledText 2965
+#define wxStyledTextCtrl_CanRedo 2966
+#define wxStyledTextCtrl_MarkerLineFromHandle 2967
+#define wxStyledTextCtrl_MarkerDeleteHandle 2968
+#define wxStyledTextCtrl_GetUndoCollection 2969
+#define wxStyledTextCtrl_GetViewWhiteSpace 2970
+#define wxStyledTextCtrl_SetViewWhiteSpace 2971
+#define wxStyledTextCtrl_PositionFromPoint 2972
+#define wxStyledTextCtrl_PositionFromPointClose 2973
+#define wxStyledTextCtrl_GotoLine 2974
+#define wxStyledTextCtrl_GotoPos 2975
+#define wxStyledTextCtrl_SetAnchor 2976
+#define wxStyledTextCtrl_GetCurLine 2977
+#define wxStyledTextCtrl_GetEndStyled 2978
+#define wxStyledTextCtrl_ConvertEOLs 2979
+#define wxStyledTextCtrl_GetEOLMode 2980
+#define wxStyledTextCtrl_SetEOLMode 2981
+#define wxStyledTextCtrl_StartStyling 2982
+#define wxStyledTextCtrl_SetStyling 2983
+#define wxStyledTextCtrl_GetBufferedDraw 2984
+#define wxStyledTextCtrl_SetBufferedDraw 2985
+#define wxStyledTextCtrl_SetTabWidth 2986
+#define wxStyledTextCtrl_GetTabWidth 2987
+#define wxStyledTextCtrl_SetCodePage 2988
+#define wxStyledTextCtrl_MarkerDefine 2989
+#define wxStyledTextCtrl_MarkerSetForeground 2990
+#define wxStyledTextCtrl_MarkerSetBackground 2991
+#define wxStyledTextCtrl_MarkerAdd 2992
+#define wxStyledTextCtrl_MarkerDelete 2993
+#define wxStyledTextCtrl_MarkerDeleteAll 2994
+#define wxStyledTextCtrl_MarkerGet 2995
+#define wxStyledTextCtrl_MarkerNext 2996
+#define wxStyledTextCtrl_MarkerPrevious 2997
+#define wxStyledTextCtrl_MarkerDefineBitmap 2998
+#define wxStyledTextCtrl_MarkerAddSet 2999
+#define wxStyledTextCtrl_MarkerSetAlpha 3000
+#define wxStyledTextCtrl_SetMarginType 3001
+#define wxStyledTextCtrl_GetMarginType 3002
+#define wxStyledTextCtrl_SetMarginWidth 3003
+#define wxStyledTextCtrl_GetMarginWidth 3004
+#define wxStyledTextCtrl_SetMarginMask 3005
+#define wxStyledTextCtrl_GetMarginMask 3006
+#define wxStyledTextCtrl_SetMarginSensitive 3007
+#define wxStyledTextCtrl_GetMarginSensitive 3008
+#define wxStyledTextCtrl_StyleClearAll 3009
+#define wxStyledTextCtrl_StyleSetForeground 3010
+#define wxStyledTextCtrl_StyleSetBackground 3011
+#define wxStyledTextCtrl_StyleSetBold 3012
+#define wxStyledTextCtrl_StyleSetItalic 3013
+#define wxStyledTextCtrl_StyleSetSize 3014
+#define wxStyledTextCtrl_StyleSetFaceName 3015
+#define wxStyledTextCtrl_StyleSetEOLFilled 3016
+#define wxStyledTextCtrl_StyleResetDefault 3017
+#define wxStyledTextCtrl_StyleSetUnderline 3018
+#define wxStyledTextCtrl_StyleSetCase 3019
+#define wxStyledTextCtrl_StyleSetHotSpot 3020
+#define wxStyledTextCtrl_SetSelForeground 3021
+#define wxStyledTextCtrl_SetSelBackground 3022
+#define wxStyledTextCtrl_GetSelAlpha 3023
+#define wxStyledTextCtrl_SetSelAlpha 3024
+#define wxStyledTextCtrl_SetCaretForeground 3025
+#define wxStyledTextCtrl_CmdKeyAssign 3026
+#define wxStyledTextCtrl_CmdKeyClear 3027
+#define wxStyledTextCtrl_CmdKeyClearAll 3028
+#define wxStyledTextCtrl_SetStyleBytes 3029
+#define wxStyledTextCtrl_StyleSetVisible 3030
+#define wxStyledTextCtrl_GetCaretPeriod 3031
+#define wxStyledTextCtrl_SetCaretPeriod 3032
+#define wxStyledTextCtrl_SetWordChars 3033
+#define wxStyledTextCtrl_BeginUndoAction 3034
+#define wxStyledTextCtrl_EndUndoAction 3035
+#define wxStyledTextCtrl_IndicatorSetStyle 3036
+#define wxStyledTextCtrl_IndicatorGetStyle 3037
+#define wxStyledTextCtrl_IndicatorSetForeground 3038
+#define wxStyledTextCtrl_IndicatorGetForeground 3039
+#define wxStyledTextCtrl_SetWhitespaceForeground 3040
+#define wxStyledTextCtrl_SetWhitespaceBackground 3041
+#define wxStyledTextCtrl_GetStyleBits 3042
+#define wxStyledTextCtrl_SetLineState 3043
+#define wxStyledTextCtrl_GetLineState 3044
+#define wxStyledTextCtrl_GetMaxLineState 3045
+#define wxStyledTextCtrl_GetCaretLineVisible 3046
+#define wxStyledTextCtrl_SetCaretLineVisible 3047
+#define wxStyledTextCtrl_GetCaretLineBackground 3048
+#define wxStyledTextCtrl_SetCaretLineBackground 3049
+#define wxStyledTextCtrl_AutoCompShow 3050
+#define wxStyledTextCtrl_AutoCompCancel 3051
+#define wxStyledTextCtrl_AutoCompActive 3052
+#define wxStyledTextCtrl_AutoCompPosStart 3053
+#define wxStyledTextCtrl_AutoCompComplete 3054
+#define wxStyledTextCtrl_AutoCompStops 3055
+#define wxStyledTextCtrl_AutoCompSetSeparator 3056
+#define wxStyledTextCtrl_AutoCompGetSeparator 3057
+#define wxStyledTextCtrl_AutoCompSelect 3058
+#define wxStyledTextCtrl_AutoCompSetCancelAtStart 3059
+#define wxStyledTextCtrl_AutoCompGetCancelAtStart 3060
+#define wxStyledTextCtrl_AutoCompSetFillUps 3061
+#define wxStyledTextCtrl_AutoCompSetChooseSingle 3062
+#define wxStyledTextCtrl_AutoCompGetChooseSingle 3063
+#define wxStyledTextCtrl_AutoCompSetIgnoreCase 3064
+#define wxStyledTextCtrl_AutoCompGetIgnoreCase 3065
+#define wxStyledTextCtrl_UserListShow 3066
+#define wxStyledTextCtrl_AutoCompSetAutoHide 3067
+#define wxStyledTextCtrl_AutoCompGetAutoHide 3068
+#define wxStyledTextCtrl_AutoCompSetDropRestOfWord 3069
+#define wxStyledTextCtrl_AutoCompGetDropRestOfWord 3070
+#define wxStyledTextCtrl_RegisterImage 3071
+#define wxStyledTextCtrl_ClearRegisteredImages 3072
+#define wxStyledTextCtrl_AutoCompGetTypeSeparator 3073
+#define wxStyledTextCtrl_AutoCompSetTypeSeparator 3074
+#define wxStyledTextCtrl_AutoCompSetMaxWidth 3075
+#define wxStyledTextCtrl_AutoCompGetMaxWidth 3076
+#define wxStyledTextCtrl_AutoCompSetMaxHeight 3077
+#define wxStyledTextCtrl_AutoCompGetMaxHeight 3078
+#define wxStyledTextCtrl_SetIndent 3079
+#define wxStyledTextCtrl_GetIndent 3080
+#define wxStyledTextCtrl_SetUseTabs 3081
+#define wxStyledTextCtrl_GetUseTabs 3082
+#define wxStyledTextCtrl_SetLineIndentation 3083
+#define wxStyledTextCtrl_GetLineIndentation 3084
+#define wxStyledTextCtrl_GetLineIndentPosition 3085
+#define wxStyledTextCtrl_GetColumn 3086
+#define wxStyledTextCtrl_SetUseHorizontalScrollBar 3087
+#define wxStyledTextCtrl_GetUseHorizontalScrollBar 3088
+#define wxStyledTextCtrl_SetIndentationGuides 3089
+#define wxStyledTextCtrl_GetIndentationGuides 3090
+#define wxStyledTextCtrl_SetHighlightGuide 3091
+#define wxStyledTextCtrl_GetHighlightGuide 3092
+#define wxStyledTextCtrl_GetLineEndPosition 3093
+#define wxStyledTextCtrl_GetCodePage 3094
+#define wxStyledTextCtrl_GetCaretForeground 3095
+#define wxStyledTextCtrl_GetReadOnly 3096
+#define wxStyledTextCtrl_SetCurrentPos 3097
+#define wxStyledTextCtrl_SetSelectionStart 3098
+#define wxStyledTextCtrl_GetSelectionStart 3099
+#define wxStyledTextCtrl_SetSelectionEnd 3100
+#define wxStyledTextCtrl_GetSelectionEnd 3101
+#define wxStyledTextCtrl_SetPrintMagnification 3102
+#define wxStyledTextCtrl_GetPrintMagnification 3103
+#define wxStyledTextCtrl_SetPrintColourMode 3104
+#define wxStyledTextCtrl_GetPrintColourMode 3105
+#define wxStyledTextCtrl_FindText 3106
+#define wxStyledTextCtrl_FormatRange 3107
+#define wxStyledTextCtrl_GetFirstVisibleLine 3108
+#define wxStyledTextCtrl_GetLine 3109
+#define wxStyledTextCtrl_GetLineCount 3110
+#define wxStyledTextCtrl_SetMarginLeft 3111
+#define wxStyledTextCtrl_GetMarginLeft 3112
+#define wxStyledTextCtrl_SetMarginRight 3113
+#define wxStyledTextCtrl_GetMarginRight 3114
+#define wxStyledTextCtrl_GetModify 3115
+#define wxStyledTextCtrl_SetSelection 3116
+#define wxStyledTextCtrl_GetSelectedText 3117
+#define wxStyledTextCtrl_GetTextRange 3118
+#define wxStyledTextCtrl_HideSelection 3119
+#define wxStyledTextCtrl_LineFromPosition 3120
+#define wxStyledTextCtrl_PositionFromLine 3121
+#define wxStyledTextCtrl_LineScroll 3122
+#define wxStyledTextCtrl_EnsureCaretVisible 3123
+#define wxStyledTextCtrl_ReplaceSelection 3124
+#define wxStyledTextCtrl_SetReadOnly 3125
+#define wxStyledTextCtrl_CanPaste 3126
+#define wxStyledTextCtrl_CanUndo 3127
+#define wxStyledTextCtrl_EmptyUndoBuffer 3128
+#define wxStyledTextCtrl_Undo 3129
+#define wxStyledTextCtrl_Cut 3130
+#define wxStyledTextCtrl_Copy 3131
+#define wxStyledTextCtrl_Paste 3132
+#define wxStyledTextCtrl_Clear 3133
+#define wxStyledTextCtrl_SetText 3134
+#define wxStyledTextCtrl_GetText 3135
+#define wxStyledTextCtrl_GetTextLength 3136
+#define wxStyledTextCtrl_GetOvertype 3137
+#define wxStyledTextCtrl_SetCaretWidth 3138
+#define wxStyledTextCtrl_GetCaretWidth 3139
+#define wxStyledTextCtrl_SetTargetStart 3140
+#define wxStyledTextCtrl_GetTargetStart 3141
+#define wxStyledTextCtrl_SetTargetEnd 3142
+#define wxStyledTextCtrl_GetTargetEnd 3143
+#define wxStyledTextCtrl_ReplaceTarget 3144
+#define wxStyledTextCtrl_SearchInTarget 3145
+#define wxStyledTextCtrl_SetSearchFlags 3146
+#define wxStyledTextCtrl_GetSearchFlags 3147
+#define wxStyledTextCtrl_CallTipShow 3148
+#define wxStyledTextCtrl_CallTipCancel 3149
+#define wxStyledTextCtrl_CallTipActive 3150
+#define wxStyledTextCtrl_CallTipPosAtStart 3151
+#define wxStyledTextCtrl_CallTipSetHighlight 3152
+#define wxStyledTextCtrl_CallTipSetBackground 3153
+#define wxStyledTextCtrl_CallTipSetForeground 3154
+#define wxStyledTextCtrl_CallTipSetForegroundHighlight 3155
+#define wxStyledTextCtrl_CallTipUseStyle 3156
+#define wxStyledTextCtrl_VisibleFromDocLine 3157
+#define wxStyledTextCtrl_DocLineFromVisible 3158
+#define wxStyledTextCtrl_WrapCount 3159
+#define wxStyledTextCtrl_SetFoldLevel 3160
+#define wxStyledTextCtrl_GetFoldLevel 3161
+#define wxStyledTextCtrl_GetLastChild 3162
+#define wxStyledTextCtrl_GetFoldParent 3163
+#define wxStyledTextCtrl_ShowLines 3164
+#define wxStyledTextCtrl_HideLines 3165
+#define wxStyledTextCtrl_GetLineVisible 3166
+#define wxStyledTextCtrl_SetFoldExpanded 3167
+#define wxStyledTextCtrl_GetFoldExpanded 3168
+#define wxStyledTextCtrl_ToggleFold 3169
+#define wxStyledTextCtrl_EnsureVisible 3170
+#define wxStyledTextCtrl_SetFoldFlags 3171
+#define wxStyledTextCtrl_EnsureVisibleEnforcePolicy 3172
+#define wxStyledTextCtrl_SetTabIndents 3173
+#define wxStyledTextCtrl_GetTabIndents 3174
+#define wxStyledTextCtrl_SetBackSpaceUnIndents 3175
+#define wxStyledTextCtrl_GetBackSpaceUnIndents 3176
+#define wxStyledTextCtrl_SetMouseDwellTime 3177
+#define wxStyledTextCtrl_GetMouseDwellTime 3178
+#define wxStyledTextCtrl_WordStartPosition 3179
+#define wxStyledTextCtrl_WordEndPosition 3180
+#define wxStyledTextCtrl_SetWrapMode 3181
+#define wxStyledTextCtrl_GetWrapMode 3182
+#define wxStyledTextCtrl_SetWrapVisualFlags 3183
+#define wxStyledTextCtrl_GetWrapVisualFlags 3184
+#define wxStyledTextCtrl_SetWrapVisualFlagsLocation 3185
+#define wxStyledTextCtrl_GetWrapVisualFlagsLocation 3186
+#define wxStyledTextCtrl_SetWrapStartIndent 3187
+#define wxStyledTextCtrl_GetWrapStartIndent 3188
+#define wxStyledTextCtrl_SetLayoutCache 3189
+#define wxStyledTextCtrl_GetLayoutCache 3190
+#define wxStyledTextCtrl_SetScrollWidth 3191
+#define wxStyledTextCtrl_GetScrollWidth 3192
+#define wxStyledTextCtrl_TextWidth 3193
+#define wxStyledTextCtrl_GetEndAtLastLine 3194
+#define wxStyledTextCtrl_TextHeight 3195
+#define wxStyledTextCtrl_SetUseVerticalScrollBar 3196
+#define wxStyledTextCtrl_GetUseVerticalScrollBar 3197
+#define wxStyledTextCtrl_AppendText 3198
+#define wxStyledTextCtrl_GetTwoPhaseDraw 3199
+#define wxStyledTextCtrl_SetTwoPhaseDraw 3200
+#define wxStyledTextCtrl_TargetFromSelection 3201
+#define wxStyledTextCtrl_LinesJoin 3202
+#define wxStyledTextCtrl_LinesSplit 3203
+#define wxStyledTextCtrl_SetFoldMarginColour 3204
+#define wxStyledTextCtrl_SetFoldMarginHiColour 3205
+#define wxStyledTextCtrl_LineDown 3206
+#define wxStyledTextCtrl_LineDownExtend 3207
+#define wxStyledTextCtrl_LineUp 3208
+#define wxStyledTextCtrl_LineUpExtend 3209
+#define wxStyledTextCtrl_CharLeft 3210
+#define wxStyledTextCtrl_CharLeftExtend 3211
+#define wxStyledTextCtrl_CharRight 3212
+#define wxStyledTextCtrl_CharRightExtend 3213
+#define wxStyledTextCtrl_WordLeft 3214
+#define wxStyledTextCtrl_WordLeftExtend 3215
+#define wxStyledTextCtrl_WordRight 3216
+#define wxStyledTextCtrl_WordRightExtend 3217
+#define wxStyledTextCtrl_Home 3218
+#define wxStyledTextCtrl_HomeExtend 3219
+#define wxStyledTextCtrl_LineEnd 3220
+#define wxStyledTextCtrl_LineEndExtend 3221
+#define wxStyledTextCtrl_DocumentStart 3222
+#define wxStyledTextCtrl_DocumentStartExtend 3223
+#define wxStyledTextCtrl_DocumentEnd 3224
+#define wxStyledTextCtrl_DocumentEndExtend 3225
+#define wxStyledTextCtrl_PageUp 3226
+#define wxStyledTextCtrl_PageUpExtend 3227
+#define wxStyledTextCtrl_PageDown 3228
+#define wxStyledTextCtrl_PageDownExtend 3229
+#define wxStyledTextCtrl_EditToggleOvertype 3230
+#define wxStyledTextCtrl_Cancel 3231
+#define wxStyledTextCtrl_DeleteBack 3232
+#define wxStyledTextCtrl_Tab 3233
+#define wxStyledTextCtrl_BackTab 3234
+#define wxStyledTextCtrl_NewLine 3235
+#define wxStyledTextCtrl_FormFeed 3236
+#define wxStyledTextCtrl_VCHome 3237
+#define wxStyledTextCtrl_VCHomeExtend 3238
+#define wxStyledTextCtrl_ZoomIn 3239
+#define wxStyledTextCtrl_ZoomOut 3240
+#define wxStyledTextCtrl_DelWordLeft 3241
+#define wxStyledTextCtrl_DelWordRight 3242
+#define wxStyledTextCtrl_LineCut 3243
+#define wxStyledTextCtrl_LineDelete 3244
+#define wxStyledTextCtrl_LineTranspose 3245
+#define wxStyledTextCtrl_LineDuplicate 3246
+#define wxStyledTextCtrl_LowerCase 3247
+#define wxStyledTextCtrl_UpperCase 3248
+#define wxStyledTextCtrl_LineScrollDown 3249
+#define wxStyledTextCtrl_LineScrollUp 3250
+#define wxStyledTextCtrl_DeleteBackNotLine 3251
+#define wxStyledTextCtrl_HomeDisplay 3252
+#define wxStyledTextCtrl_HomeDisplayExtend 3253
+#define wxStyledTextCtrl_LineEndDisplay 3254
+#define wxStyledTextCtrl_LineEndDisplayExtend 3255
+#define wxStyledTextCtrl_HomeWrapExtend 3256
+#define wxStyledTextCtrl_LineEndWrap 3257
+#define wxStyledTextCtrl_LineEndWrapExtend 3258
+#define wxStyledTextCtrl_VCHomeWrap 3259
+#define wxStyledTextCtrl_VCHomeWrapExtend 3260
+#define wxStyledTextCtrl_LineCopy 3261
+#define wxStyledTextCtrl_MoveCaretInsideView 3262
+#define wxStyledTextCtrl_LineLength 3263
+#define wxStyledTextCtrl_BraceHighlight 3264
+#define wxStyledTextCtrl_BraceBadLight 3265
+#define wxStyledTextCtrl_BraceMatch 3266
+#define wxStyledTextCtrl_GetViewEOL 3267
+#define wxStyledTextCtrl_SetViewEOL 3268
+#define wxStyledTextCtrl_SetModEventMask 3269
+#define wxStyledTextCtrl_GetEdgeColumn 3270
+#define wxStyledTextCtrl_SetEdgeColumn 3271
+#define wxStyledTextCtrl_GetEdgeMode 3272
+#define wxStyledTextCtrl_GetEdgeColour 3273
+#define wxStyledTextCtrl_SetEdgeColour 3274
+#define wxStyledTextCtrl_SearchAnchor 3275
+#define wxStyledTextCtrl_SearchNext 3276
+#define wxStyledTextCtrl_SearchPrev 3277
+#define wxStyledTextCtrl_LinesOnScreen 3278
+#define wxStyledTextCtrl_UsePopUp 3279
+#define wxStyledTextCtrl_SelectionIsRectangle 3280
+#define wxStyledTextCtrl_SetZoom 3281
+#define wxStyledTextCtrl_GetZoom 3282
+#define wxStyledTextCtrl_GetModEventMask 3283
+#define wxStyledTextCtrl_SetSTCFocus 3284
+#define wxStyledTextCtrl_GetSTCFocus 3285
+#define wxStyledTextCtrl_SetStatus 3286
+#define wxStyledTextCtrl_GetStatus 3287
+#define wxStyledTextCtrl_SetMouseDownCaptures 3288
+#define wxStyledTextCtrl_GetMouseDownCaptures 3289
+#define wxStyledTextCtrl_SetSTCCursor 3290
+#define wxStyledTextCtrl_GetSTCCursor 3291
+#define wxStyledTextCtrl_SetControlCharSymbol 3292
+#define wxStyledTextCtrl_GetControlCharSymbol 3293
+#define wxStyledTextCtrl_WordPartLeft 3294
+#define wxStyledTextCtrl_WordPartLeftExtend 3295
+#define wxStyledTextCtrl_WordPartRight 3296
+#define wxStyledTextCtrl_WordPartRightExtend 3297
+#define wxStyledTextCtrl_SetVisiblePolicy 3298
+#define wxStyledTextCtrl_DelLineLeft 3299
+#define wxStyledTextCtrl_DelLineRight 3300
+#define wxStyledTextCtrl_GetXOffset 3301
+#define wxStyledTextCtrl_ChooseCaretX 3302
+#define wxStyledTextCtrl_SetXCaretPolicy 3303
+#define wxStyledTextCtrl_SetYCaretPolicy 3304
+#define wxStyledTextCtrl_GetPrintWrapMode 3305
+#define wxStyledTextCtrl_SetHotspotActiveForeground 3306
+#define wxStyledTextCtrl_SetHotspotActiveBackground 3307
+#define wxStyledTextCtrl_SetHotspotActiveUnderline 3308
+#define wxStyledTextCtrl_SetHotspotSingleLine 3309
+#define wxStyledTextCtrl_ParaDownExtend 3310
+#define wxStyledTextCtrl_ParaUp 3311
+#define wxStyledTextCtrl_ParaUpExtend 3312
+#define wxStyledTextCtrl_PositionBefore 3313
+#define wxStyledTextCtrl_PositionAfter 3314
+#define wxStyledTextCtrl_CopyRange 3315
+#define wxStyledTextCtrl_CopyText 3316
+#define wxStyledTextCtrl_SetSelectionMode 3317
+#define wxStyledTextCtrl_GetSelectionMode 3318
+#define wxStyledTextCtrl_LineDownRectExtend 3319
+#define wxStyledTextCtrl_LineUpRectExtend 3320
+#define wxStyledTextCtrl_CharLeftRectExtend 3321
+#define wxStyledTextCtrl_CharRightRectExtend 3322
+#define wxStyledTextCtrl_HomeRectExtend 3323
+#define wxStyledTextCtrl_VCHomeRectExtend 3324
+#define wxStyledTextCtrl_LineEndRectExtend 3325
+#define wxStyledTextCtrl_PageUpRectExtend 3326
+#define wxStyledTextCtrl_PageDownRectExtend 3327
+#define wxStyledTextCtrl_StutteredPageUp 3328
+#define wxStyledTextCtrl_StutteredPageUpExtend 3329
+#define wxStyledTextCtrl_StutteredPageDown 3330
+#define wxStyledTextCtrl_StutteredPageDownExtend 3331
+#define wxStyledTextCtrl_WordLeftEnd 3332
+#define wxStyledTextCtrl_WordLeftEndExtend 3333
+#define wxStyledTextCtrl_WordRightEnd 3334
+#define wxStyledTextCtrl_WordRightEndExtend 3335
+#define wxStyledTextCtrl_SetWhitespaceChars 3336
+#define wxStyledTextCtrl_SetCharsDefault 3337
+#define wxStyledTextCtrl_AutoCompGetCurrent 3338
+#define wxStyledTextCtrl_Allocate 3339
+#define wxStyledTextCtrl_FindColumn 3340
+#define wxStyledTextCtrl_GetCaretSticky 3341
+#define wxStyledTextCtrl_SetCaretSticky 3342
+#define wxStyledTextCtrl_ToggleCaretSticky 3343
+#define wxStyledTextCtrl_SetPasteConvertEndings 3344
+#define wxStyledTextCtrl_GetPasteConvertEndings 3345
+#define wxStyledTextCtrl_SelectionDuplicate 3346
+#define wxStyledTextCtrl_SetCaretLineBackAlpha 3347
+#define wxStyledTextCtrl_GetCaretLineBackAlpha 3348
+#define wxStyledTextCtrl_StartRecord 3349
+#define wxStyledTextCtrl_StopRecord 3350
+#define wxStyledTextCtrl_SetLexer 3351
+#define wxStyledTextCtrl_GetLexer 3352
+#define wxStyledTextCtrl_Colourise 3353
+#define wxStyledTextCtrl_SetProperty 3354
+#define wxStyledTextCtrl_SetKeyWords 3355
+#define wxStyledTextCtrl_SetLexerLanguage 3356
+#define wxStyledTextCtrl_GetProperty 3357
+#define wxStyledTextCtrl_GetStyleBitsNeeded 3358
+#define wxStyledTextCtrl_GetCurrentLine 3359
+#define wxStyledTextCtrl_StyleSetSpec 3360
+#define wxStyledTextCtrl_StyleSetFont 3361
+#define wxStyledTextCtrl_StyleSetFontAttr 3362
+#define wxStyledTextCtrl_StyleSetCharacterSet 3363
+#define wxStyledTextCtrl_StyleSetFontEncoding 3364
+#define wxStyledTextCtrl_CmdKeyExecute 3365
+#define wxStyledTextCtrl_SetMargins 3366
+#define wxStyledTextCtrl_GetSelection 3367
+#define wxStyledTextCtrl_PointFromPosition 3368
+#define wxStyledTextCtrl_ScrollToLine 3369
+#define wxStyledTextCtrl_ScrollToColumn 3370
+#define wxStyledTextCtrl_SendMsg 3371
+#define wxStyledTextCtrl_SetVScrollBar 3372
+#define wxStyledTextCtrl_SetHScrollBar 3373
+#define wxStyledTextCtrl_GetLastKeydownProcessed 3374
+#define wxStyledTextCtrl_SetLastKeydownProcessed 3375
+#define wxStyledTextCtrl_SaveFile 3376
+#define wxStyledTextCtrl_LoadFile 3377
+#define wxStyledTextCtrl_DoDragOver 3378
+#define wxStyledTextCtrl_DoDropText 3379
+#define wxStyledTextCtrl_GetUseAntiAliasing 3380
+#define wxStyledTextCtrl_AddTextRaw 3381
+#define wxStyledTextCtrl_InsertTextRaw 3382
+#define wxStyledTextCtrl_GetCurLineRaw 3383
+#define wxStyledTextCtrl_GetLineRaw 3384
+#define wxStyledTextCtrl_GetSelectedTextRaw 3385
+#define wxStyledTextCtrl_GetTextRangeRaw 3386
+#define wxStyledTextCtrl_SetTextRaw 3387
+#define wxStyledTextCtrl_GetTextRaw 3388
+#define wxStyledTextCtrl_AppendTextRaw 3389
+#define wxArtProvider_GetBitmap 3390
+#define wxArtProvider_GetIcon 3391
+#define wxTreeEvent_GetKeyCode 3392
+#define wxTreeEvent_GetItem 3393
+#define wxTreeEvent_GetKeyEvent 3394
+#define wxTreeEvent_GetLabel 3395
+#define wxTreeEvent_GetOldItem 3396
+#define wxTreeEvent_GetPoint 3397
+#define wxTreeEvent_IsEditCancelled 3398
+#define wxTreeEvent_SetToolTip 3399
+#define wxNotebookEvent_GetOldSelection 3400
+#define wxNotebookEvent_GetSelection 3401
+#define wxNotebookEvent_SetOldSelection 3402
+#define wxNotebookEvent_SetSelection 3403
+#define wxFileDataObject_new 3404
+#define wxFileDataObject_AddFile 3405
+#define wxFileDataObject_GetFilenames 3406
+#define wxFileDataObject_destroy 3407
+#define wxTextDataObject_new 3408
+#define wxTextDataObject_GetTextLength 3409
+#define wxTextDataObject_GetText 3410
+#define wxTextDataObject_SetText 3411
+#define wxTextDataObject_destroy 3412
+#define wxBitmapDataObject_new_1_1 3413
+#define wxBitmapDataObject_new_1_0 3414
+#define wxBitmapDataObject_GetBitmap 3415
+#define wxBitmapDataObject_SetBitmap 3416
+#define wxBitmapDataObject_destroy 3417
+#define wxClipboard_new 3419
+#define wxClipboard_destruct 3420
+#define wxClipboard_AddData 3421
+#define wxClipboard_Clear 3422
+#define wxClipboard_Close 3423
+#define wxClipboard_Flush 3424
+#define wxClipboard_GetData 3425
+#define wxClipboard_IsOpened 3426
+#define wxClipboard_Open 3427
+#define wxClipboard_SetData 3428
+#define wxClipboard_UsePrimarySelection 3430
+#define wxClipboard_IsSupported 3431
+#define wxClipboard_Get 3432
+#define wxSpinEvent_GetPosition 3433
+#define wxSpinEvent_SetPosition 3434
+#define wxSplitterWindow_new_0 3435
+#define wxSplitterWindow_new_2 3436
+#define wxSplitterWindow_destruct 3437
+#define wxSplitterWindow_Create 3438
+#define wxSplitterWindow_GetMinimumPaneSize 3439
+#define wxSplitterWindow_GetSashGravity 3440
+#define wxSplitterWindow_GetSashPosition 3441
+#define wxSplitterWindow_GetSplitMode 3442
+#define wxSplitterWindow_GetWindow1 3443
+#define wxSplitterWindow_GetWindow2 3444
+#define wxSplitterWindow_Initialize 3445
+#define wxSplitterWindow_IsSplit 3446
+#define wxSplitterWindow_ReplaceWindow 3447
+#define wxSplitterWindow_SetSashGravity 3448
+#define wxSplitterWindow_SetSashPosition 3449
+#define wxSplitterWindow_SetSashSize 3450
+#define wxSplitterWindow_SetMinimumPaneSize 3451
+#define wxSplitterWindow_SetSplitMode 3452
+#define wxSplitterWindow_SplitHorizontally 3453
+#define wxSplitterWindow_SplitVertically 3454
+#define wxSplitterWindow_Unsplit 3455
+#define wxSplitterWindow_UpdateSize 3456
+#define wxSplitterEvent_GetSashPosition 3457
+#define wxSplitterEvent_GetX 3458
+#define wxSplitterEvent_GetY 3459
+#define wxSplitterEvent_GetWindowBeingRemoved 3460
+#define wxSplitterEvent_SetSashPosition 3461
+#define wxHtmlWindow_new_0 3462
+#define wxHtmlWindow_new_2 3463
+#define wxHtmlWindow_AppendToPage 3464
+#define wxHtmlWindow_GetOpenedAnchor 3465
+#define wxHtmlWindow_GetOpenedPage 3466
+#define wxHtmlWindow_GetOpenedPageTitle 3467
+#define wxHtmlWindow_GetRelatedFrame 3468
+#define wxHtmlWindow_HistoryBack 3469
+#define wxHtmlWindow_HistoryCanBack 3470
+#define wxHtmlWindow_HistoryCanForward 3471
+#define wxHtmlWindow_HistoryClear 3472
+#define wxHtmlWindow_HistoryForward 3473
+#define wxHtmlWindow_LoadFile 3474
+#define wxHtmlWindow_LoadPage 3475
+#define wxHtmlWindow_SelectAll 3476
+#define wxHtmlWindow_SelectionToText 3477
+#define wxHtmlWindow_SelectLine 3478
+#define wxHtmlWindow_SelectWord 3479
+#define wxHtmlWindow_SetBorders 3480
+#define wxHtmlWindow_SetFonts 3481
+#define wxHtmlWindow_SetPage 3482
+#define wxHtmlWindow_SetRelatedFrame 3483
+#define wxHtmlWindow_SetRelatedStatusBar 3484
+#define wxHtmlWindow_ToText 3485
+#define wxHtmlWindow_destroy 3486
+#define wxHtmlLinkEvent_GetLinkInfo 3487
+#define wxSystemSettings_GetColour 3488
+#define wxSystemSettings_GetFont 3489
+#define wxSystemSettings_GetMetric 3490
+#define wxSystemSettings_GetScreenType 3491
+#define wxAuiNotebookEvent_SetSelection 3492
+#define wxAuiNotebookEvent_GetSelection 3493
+#define wxAuiNotebookEvent_SetOldSelection 3494
+#define wxAuiNotebookEvent_GetOldSelection 3495
+#define wxAuiNotebookEvent_SetDragSource 3496
+#define wxAuiNotebookEvent_GetDragSource 3497
+#define wxAuiManagerEvent_SetManager 3498
+#define wxAuiManagerEvent_GetManager 3499
+#define wxAuiManagerEvent_SetPane 3500
+#define wxAuiManagerEvent_GetPane 3501
+#define wxAuiManagerEvent_SetButton 3502
+#define wxAuiManagerEvent_GetButton 3503
+#define wxAuiManagerEvent_SetDC 3504
+#define wxAuiManagerEvent_GetDC 3505
+#define wxAuiManagerEvent_Veto 3506
+#define wxAuiManagerEvent_GetVeto 3507
+#define wxAuiManagerEvent_SetCanVeto 3508
+#define wxAuiManagerEvent_CanVeto 3509
+#define wxLogNull_new 3510
+#define wxLogNull_destroy 3511
 
 
diff --git a/lib/wx/c_src/wxePrintout.cpp b/lib/wx/c_src/wxePrintout.cpp
index ea1c76edcc..90959df379 100644
--- a/lib/wx/c_src/wxePrintout.cpp
+++ b/lib/wx/c_src/wxePrintout.cpp
@@ -1,41 +1,62 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2008-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2008-2011. 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.
- * 
- * %CopyrightEnd% 
+ *
+ * %CopyrightEnd%
  */
 
 #include <wx/wx.h>
 #include "wxe_impl.h"
 #include "wxe_return.h"
+#include "gen/wxe_macros.h"
+#include "gen/wxe_derived_dest.h"
 
 /* *****************************************************************/
 /* Special Class impls */
 
+#define INVOKE_CALLBACK_INIT(port, callback, class_str)		        \
+  {									\
+    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);	\
+    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);	\
+    rt.addInt(callback);						\
+    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), class_str);
+
+#define INVOKE_CALLBACK_END(port, args)					\
+  rt.endList(1 + (args));						\
+  rt.addAtom("_wx_invoke_cb_");						\
+  rt.addTupleCount(3);							\
+  rt.send();								\
+  handle_event_callback(port, memenv->owner); 			        \
+ }
+
+#define INVOKE_CALLBACK(port, callback, class_str)	\
+  INVOKE_CALLBACK_INIT(port, callback, class_str);	\
+  INVOKE_CALLBACK_END(port, 0)
 
+/* *****************************************************************/
 /* Printing special */
 
 wxEPrintout::~wxEPrintout() {
-  clear_cb(onPrintPage);
-  clear_cb(onPreparePrinting);
-  clear_cb(onBeginPrinting); 
-  clear_cb(onEndPrinting);
-  clear_cb(onBeginDocument);
-  clear_cb(onEndDocument);
-  clear_cb(hasPage); 
-  clear_cb(getPageInfo);
+  clear_cb(port, onPrintPage);
+  clear_cb(port, onPreparePrinting);
+  clear_cb(port, onBeginPrinting);
+  clear_cb(port, onEndPrinting);
+  clear_cb(port, onBeginDocument);
+  clear_cb(port, onEndDocument);
+  clear_cb(port, hasPage);
+  clear_cb(port, getPageInfo);
 
   ((WxeApp *)wxTheApp)->clearPtr(this);
 }
@@ -43,73 +64,44 @@ wxEPrintout::~wxEPrintout() {
 bool wxEPrintout::OnBeginDocument(int startPage, int endPage)
 {
   if(onBeginDocument) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    char * bp = ((WxeApp *) wxTheApp)->cb_buff;
-    
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
-    rt.addInt(onBeginDocument);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
+    INVOKE_CALLBACK_INIT(port, onBeginDocument, "wxPrintout");
     rt.addInt(startPage);
     rt.addInt(endPage);
-    rt.endList(3);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
-    return *(int*) bp; 
-  } else {
-    return wxPrintout::OnBeginDocument(startPage,endPage);
-  } 
+    INVOKE_CALLBACK_END(port, 2);
+    if(((WxeApp *) wxTheApp)->cb_buff) {
+      int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+      return res;
+    }
+  }
+  return wxPrintout::OnBeginDocument(startPage,endPage);
 }
 
-void wxEPrintout::OnEndDocument() 
+void wxEPrintout::OnEndDocument()
 {
   if(onEndDocument) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
-    rt.addInt(onEndDocument);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
-    rt.endList(1);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
+    INVOKE_CALLBACK(port, onEndDocument, "wxPrintout");
   } else {
     wxPrintout::OnEndDocument();
-  } 
+  }
 }
 
-void wxEPrintout::OnBeginPrinting() 
+void wxEPrintout::OnBeginPrinting()
 {
 
   if(onBeginPrinting) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);    
-    rt.addInt(onBeginPrinting);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
-    rt.endList(1);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
+    INVOKE_CALLBACK(port, onBeginPrinting, "wxPrintout");
   } else {
     wxPrintout::OnBeginPrinting();
-  } 
+  }
 }
 
-void wxEPrintout::OnEndPrinting() 
+void wxEPrintout::OnEndPrinting()
 {
 
   if(onEndPrinting) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);    
-    rt.addInt(onEndPrinting);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
-    rt.endList(1);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
+    INVOKE_CALLBACK(port, onEndPrinting, "wxPrintout");
   } else {
     wxPrintout::OnEndPrinting();
   }
@@ -119,92 +111,133 @@ void wxEPrintout::OnPreparePrinting()
 {
 
   if(onPreparePrinting) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);    
-    rt.addInt(onPreparePrinting);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
-    rt.endList(1);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
+    INVOKE_CALLBACK(port, onPreparePrinting, "wxPrintout");
   } else {
     wxPrintout::OnPreparePrinting();
-  } 
+  }
 }
 
-bool wxEPrintout::HasPage(int page) 
+bool wxEPrintout::HasPage(int page)
 {
 
   if(hasPage) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);    
-    rt.addInt(hasPage);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
+    INVOKE_CALLBACK_INIT(port, hasPage, "wxPrintout");
     rt.addInt(page);
-    rt.endList(2);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    char * bp = ((WxeApp *) wxTheApp)->cb_buff;
-    handle_callback_batch(port);    
-    return *(int*) bp;
-  } else {
-    return wxPrintout::HasPage(page);
-  } 
+    INVOKE_CALLBACK_END(port, 1);
+    if(((WxeApp *) wxTheApp)->cb_buff) {
+      int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+      return res;
+    }
+  }
+  return wxPrintout::HasPage(page);
 }
 
 bool wxEPrintout::OnPrintPage(int page)
 {
-  wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-  wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);    
-  rt.addInt(onPrintPage);
-  rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
+  INVOKE_CALLBACK_INIT(port, onPrintPage, "wxPrintout");
   rt.addInt(page);
-  rt.endList(2);
-  rt.addAtom("_wx_invoke_cb_");
-  rt.addTupleCount(3);
-  rt.send();
-  handle_callback_batch(port);
-  //fprintf(stderr,"%d ", __LINE__);handle_callback_batch(port);  fprintf(stderr,"%d\r\n", __LINE__);
-  char * bp = ((WxeApp *) wxTheApp)->cb_buff;
-  return *(int*) bp;
+  INVOKE_CALLBACK_END(port, 1);
+  if(((WxeApp *) wxTheApp)->cb_buff) {
+    int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
+    driver_free(((WxeApp *) wxTheApp)->cb_buff);
+    ((WxeApp *) wxTheApp)->cb_buff = NULL;
+    return res;
+  }
+  return FALSE;
 }
- 
+
 void wxEPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo)
 {
   if(getPageInfo) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);        
-    rt.addInt(getPageInfo);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
-    rt.endList(1);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
-    //fprintf(stderr,"%d ", __LINE__);handle_callback_batch(port);  fprintf(stderr,"%d\r\n", __LINE__);    
+    INVOKE_CALLBACK(port, getPageInfo, "wxPrintout");
+    if(((WxeApp *) wxTheApp)->cb_buff) {
+      char * bp = ((WxeApp *) wxTheApp)->cb_buff;
+      *minPage  = *(int *) bp; bp += 4;
+      *maxPage  = *(int *) bp; bp += 4;
+      *pageFrom = *(int *) bp; bp += 4;
+      *pageTo   = *(int *) bp; bp += 4;
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+    }
+  }
+  wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
+}
+
+/* *****************************************************************/
+// ListCtrl with callbacks for VIRTUAL_TABLES
+
+wxString EwxListCtrl::OnGetItemText(long item, long col) const {
+  if(onGetItemText) {
+    INVOKE_CALLBACK_INIT(port, onGetItemText, "wxListCtrl");
+    rt.addInt(item);
+    rt.addInt(col);
+    INVOKE_CALLBACK_END(port, 2);
+    if(((WxeApp *) wxTheApp)->cb_buff) {
+      char * bp = ((WxeApp *) wxTheApp)->cb_buff;
+      wxString str = wxString(bp, wxConvUTF8);
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+      return str;
+    }
+  }
+  return wxT("OnGetItemText not correctly defined");
+}
 
+wxListItemAttr* EwxListCtrl::OnGetItemAttr(long item) const {
+  if(onGetItemAttr) {
+    INVOKE_CALLBACK_INIT(port, onGetItemAttr, "wxListCtrl");
+    rt.addInt(item);
+    INVOKE_CALLBACK_END(port, 1);
     char * bp = ((WxeApp *) wxTheApp)->cb_buff;
-    *minPage  = *(int *) bp; bp += 4;
-    *maxPage  = *(int *) bp; bp += 4;
-    *pageFrom = *(int *) bp; bp += 4;
-    *pageTo   = *(int *) bp; bp += 4;
-  } else {
-    wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
+    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
+    if(bp) {
+      wxListItemAttr * result = (wxListItemAttr *)((WxeApp *) wxTheApp)->getPtr(bp, memenv);
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+      return result;
+    }
   }
+  return NULL;
+}
+
+int EwxListCtrl::OnGetItemImage(long item) const {
+  return OnGetItemColumnImage(item, 0);
 }
 
-void wxEPrintout::clear_cb(int callback)
+int EwxListCtrl::OnGetItemColumnImage(long item, long col) const {
+  if(onGetItemColumnImage) {
+    INVOKE_CALLBACK_INIT(port, onGetItemColumnImage, "wxListCtrl");
+    rt.addInt(item);
+    rt.addInt(col);
+    INVOKE_CALLBACK_END(port, 2);
+    if(((WxeApp *) wxTheApp)->cb_buff) {
+      int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+      return res;
+    }
+  }
+  return -1;
+}
+
+EwxListCtrl::~EwxListCtrl() {
+  clear_cb(port, onGetItemText);
+  clear_cb(port, onGetItemAttr);
+  clear_cb(port, onGetItemColumnImage);
+  ((WxeApp *)wxTheApp)->clearPtr(this);
+}
+// tools
+
+void clear_cb(ErlDrvPort port, int callback)
 {
   if(callback > 0) {
     wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
     wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
-    // NOTE: Remove this later when changing from funs to gen_server
     rt.addAtom("wx_delete_cb");
     rt.addInt(callback);
     rt.addTupleCount(2);
     rt.send();
   }
 }
-
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 365fb691a1..e430fbc7a2 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -14,7 +14,7 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  *
- * %CopyrightEnd% 
+ * %CopyrightEnd%
  */
 
 #include <stdio.h>
@@ -49,7 +49,7 @@ DEFINE_EVENT_TYPE(wxeEVT_META_COMMAND)
 
 #define WXE_NORMAL      0
 #define WXE_CALLBACK    1
-#define WXE_STORED      2 
+#define WXE_STORED      2
 
 ErlDrvTid wxe_thread;
 
@@ -67,7 +67,7 @@ wxList * wxe_batch_cb_saved = NULL;
 ErlDrvTermData  wxe_batch_caller = 0;
 ErlDrvTermData  init_caller = 0;
 
-// extern opengl 
+// extern opengl
 void gl_dispatch(int op, char *bp, ErlDrvTermData caller, WXEBinRef *bins[]);
 
 
@@ -99,7 +99,7 @@ void *wxe_main_loop(void * );
  *  START AND STOP of driver thread
  * ************************************************************/
 
-int load_native_gui() 
+int load_native_gui()
 {
   return 1;
 }
@@ -112,7 +112,7 @@ int start_native_gui(wxe_data *sd)
 
   wxe_batch_locker_m = erl_drv_mutex_create((char *)"wxe_batch_locker_m");
   wxe_batch_locker_c = erl_drv_cond_create((char *)"wxe_batch_locker_c");
-  init_caller = driver_connected(sd->port); 
+  init_caller = driver_connected(sd->port);
 
 #ifdef __DARWIN__
   res = erl_drv_steal_main_thread((char *)"wxwidgets",
@@ -152,9 +152,9 @@ void stop_native_gui(wxe_data *sd)
   erl_drv_cond_destroy(wxe_batch_locker_c);
 }
 
-void unload_native_gui() 
+void unload_native_gui()
 {
-  
+
 }
 
 /* ************************************************************
@@ -162,13 +162,13 @@ void unload_native_gui()
  *    Called by emulator thread
  * ************************************************************/
 
-void push_command(int op,char * buf,int len, wxe_data *sd) 
-{  
+void push_command(int op,char * buf,int len, wxe_data *sd)
+{
   // fprintf(stderr, "Op %d %d\r\n", op, (int) driver_caller(sd->port)),fflush(stderr);
   wxeCommand *Cmd = new wxeCommand(op, buf, len, sd);
   erl_drv_mutex_lock(wxe_batch_locker_m);
   wxe_batch->Append(Cmd);
-  
+
   if(wxe_batch_caller > 0) {
     // wx-thread is waiting on batch end in cond_wait
     erl_drv_cond_signal(wxe_batch_locker_c);
@@ -179,11 +179,11 @@ void push_command(int op,char * buf,int len, wxe_data *sd)
     }
     erl_drv_cond_signal(wxe_batch_locker_c);
     wxWakeUpIdle();
-  }  
+  }
   erl_drv_mutex_unlock(wxe_batch_locker_m);
 }
 
-void meta_command(int what, wxe_data *sd) {  
+void meta_command(int what, wxe_data *sd) {
   if(what == PING_PORT) {
     erl_drv_mutex_lock(wxe_batch_locker_m);
     if(wxe_batch_caller > 0) {
@@ -203,17 +203,17 @@ void meta_command(int what, wxe_data *sd) {
 }
 
 /* ************************************************************
- *  wxWidgets Thread 
+ *  wxWidgets Thread
  * ************************************************************/
 
 void *wxe_main_loop(void *vpdl)
 {
-  int result; 
+  int result;
   int  argc = 1;
   char * temp = (char *) "Erlang";
   char * argv[] = {temp,NULL};
   ErlDrvPDL pdl = (ErlDrvPDL) vpdl;
-  
+
   driver_pdl_inc_refc(pdl);
 
   // ErlDrvSysInfo einfo;
@@ -223,7 +223,7 @@ void *wxe_main_loop(void *vpdl)
 #ifndef _WIN32
   erts_thread_disable_fpe();
 #endif
-  
+
   result = wxEntry(argc, argv);
   // fprintf(stderr, "WXWidgets quits main loop %d \r\n", result);
   if(result >= 0 && wxe_status == WXE_INITIATED) {
@@ -240,17 +240,17 @@ void *wxe_main_loop(void *vpdl)
     erl_drv_cond_signal(wxe_status_c);
     erl_drv_mutex_unlock(wxe_status_m);
     driver_pdl_dec_refc(pdl);
-    return NULL;    
+    return NULL;
   }
 }
 
 wxFrame * dummy_window;
 
 void create_dummy_window() {
-  dummy_window = new wxFrame(NULL,-1, wxT("wx driver"), 
-			     wxDefaultPosition, wxSize(5,5), 
+  dummy_window = new wxFrame(NULL,-1, wxT("wx driver"),
+			     wxDefaultPosition, wxSize(5,5),
 			     wxFRAME_NO_TASKBAR);
-  dummy_window->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, 
+  dummy_window->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW,
 			(wxObjectEventFunction) (wxEventFunction) &WxeApp::dummy_close);
 }
 
@@ -262,7 +262,7 @@ void WxeApp::dummy_close(wxEvent& Ev) {
   create_dummy_window();
 }
 
-// Init wx-widgets thread 
+// Init wx-widgets thread
 bool WxeApp::OnInit()
 {
   wxe_ps_init();
@@ -270,16 +270,17 @@ bool WxeApp::OnInit()
   global_me = new wxeMemEnv();
   wxe_batch = new wxList;
   wxe_batch_cb_saved = new wxList;
+  cb_buff = NULL;
 
   wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED);
 
-  this->Connect(wxID_ANY, wxEVT_IDLE, 
+  this->Connect(wxID_ANY, wxEVT_IDLE,
 		(wxObjectEventFunction) (wxEventFunction) &WxeApp::idle);
-  this->Connect(CREATE_PORT, wxeEVT_META_COMMAND, 
+  this->Connect(CREATE_PORT, wxeEVT_META_COMMAND,
 		(wxObjectEventFunction) (wxEventFunction) &WxeApp::newMemEnv);
-  this->Connect(DELETE_PORT, wxeEVT_META_COMMAND, 
+  this->Connect(DELETE_PORT, wxeEVT_META_COMMAND,
 		(wxObjectEventFunction) (wxEventFunction) &WxeApp::destroyMemEnv);
-  this->Connect(WXE_SHUTDOWN, wxeEVT_META_COMMAND, 
+  this->Connect(WXE_SHUTDOWN, wxeEVT_META_COMMAND,
 		(wxObjectEventFunction) (wxEventFunction) &WxeApp::shutdown);
 
 //   fprintf(stderr, "Size void* %d: long %d long long %d int64 %d \r\n",
@@ -287,9 +288,9 @@ bool WxeApp::OnInit()
   initEventTable();
   wxInitAllImageHandlers();
 
-  /* Create a dummy window so wxWidgets don't automagicly quits the main loop 
+  /* Create a dummy window so wxWidgets don't automagicly quits the main loop
      after the last window */
-  create_dummy_window();  
+  create_dummy_window();
 
   init_nonconsts(global_me, init_caller);
   erl_drv_mutex_lock(wxe_status_m);
@@ -308,19 +309,19 @@ void send_msg(const char * type, wxString * msg) {
   wxeReturn rt = wxeReturn(WXE_DRV_PORT, init_caller);
   rt.addAtom((char *) "wxe_driver");
   rt.addAtom((char *) type);
-  rt.add(msg);  
+  rt.add(msg);
   rt.addTupleCount(3);
   rt.send();
 }
 
 /* ************************************************************
- *  Erlang Command execution  *    
+ *  Erlang Command execution  *
  * ************************************************************/
 
-/* Callback from printer and event callbacks */ 
+/* Callback from printer and event callbacks */
 void pre_callback()
 {
-  // no-op 
+  // no-op
 }
 
 void handle_event_callback(ErlDrvPort port, ErlDrvTermData process)
@@ -330,29 +331,19 @@ void handle_event_callback(ErlDrvPort port, ErlDrvTermData process)
   driver_monitor_process(port, process, &monitor);
   // Should we be able to handle commands when recursing? probably
   erl_drv_mutex_lock(wxe_batch_locker_m);
-  //fprintf(stderr, "\r\nCB Start ");fflush(stderr);
+  // fprintf(stderr, "\r\nCB EV Start ");fflush(stderr);
   app->dispatch_cb(wxe_batch, wxe_batch_cb_saved, process);
-  //fprintf(stderr, ".. done \r\n");fflush(stderr);
+  // fprintf(stderr, ".. done \r\n");fflush(stderr);
   wxe_batch_caller = 0;
   erl_drv_mutex_unlock(wxe_batch_locker_m);
   driver_demonitor_process(port, &monitor);
 }
 
-void handle_callback_batch(ErlDrvPort port)
-{
-  WxeApp * app = (WxeApp *) wxTheApp;
-  // Should we be able to handle commands when recursing? probably
-  erl_drv_mutex_lock(wxe_batch_locker_m);
-  app->dispatch(wxe_batch, 0, WXE_CALLBACK);
-  wxe_batch_caller = 0;
-  erl_drv_mutex_unlock(wxe_batch_locker_m);
-}
-
 // Called by wx thread
 void WxeApp::idle(wxIdleEvent& event) {
   dispatch_cmds();
 }
- 
+
 void WxeApp::dispatch_cmds() {
   erl_drv_mutex_lock(wxe_batch_locker_m);
   int level = dispatch(wxe_batch_cb_saved, 0, WXE_STORED);
@@ -361,14 +352,14 @@ void WxeApp::dispatch_cmds() {
   erl_drv_mutex_unlock(wxe_batch_locker_m);
 }
 
-// Should have  erl_drv_mutex_lock(wxe_batch_locker_m); 
-// when entering this function and it should be released 
+// Should have  erl_drv_mutex_lock(wxe_batch_locker_m);
+// when entering this function and it should be released
 // afterwards
-int WxeApp::dispatch(wxList * batch, int blevel, int list_type) 
+int WxeApp::dispatch(wxList * batch, int blevel, int list_type)
 {
   int ping = 0;
   // erl_drv_mutex_lock(wxe_batch_locker_m);  must be locked already
-  while(true) 
+  while(true)
     {
       if (batch->size() > 0) {
 	for( wxList::compatibility_iterator node = batch->GetFirst();
@@ -385,19 +376,22 @@ int WxeApp::dispatch(wxList * batch, int blevel, int list_type)
 	      {blevel++; }
 	      break;
 	    case WXE_DEBUG_PING:
-	      // When in debugger we don't want to hang waiting for a BATCH_END 
+	      // When in debugger we don't want to hang waiting for a BATCH_END
 	      // that never comes, because a breakpoint have hit.
 	      ping++;
-	      if(ping > 2) 
+	      if(ping > 2)
 		blevel = 0;
 	      break;
 	    case WXE_CB_RETURN:
 	      // erl_drv_mutex_unlock(wxe_batch_locker_m); should be called after
 	      // whatever cleaning is necessary
-	      memcpy(cb_buff, event->buffer, event->len);
+	      if(event->len > 0) {
+		cb_buff = (char *) driver_alloc(event->len);
+		memcpy(cb_buff, event->buffer, event->len);
+	      }
 	      return blevel;
 	    default:
-	      erl_drv_mutex_unlock(wxe_batch_locker_m);	      
+	      erl_drv_mutex_unlock(wxe_batch_locker_m);
 	      if(event->op < OPENGL_START) {
 		// fprintf(stderr, "  c %d (%d) \r\n", event->op, blevel);
 		wxe_dispatch(*event);
@@ -436,10 +430,10 @@ void WxeApp::dispatch_cb(wxList * batch, wxList * temp, ErlDrvTermData process)
 	  wxeCommand *event = (wxeCommand *)node->GetData();
 	  wxeMemEnv *memenv = getMemEnv(event->port);
 	  batch->Erase(node);
-	  if(event->caller == process ||  // Callbacks from CB process only 
+	  if(event->caller == process ||  // Callbacks from CB process only
 	     event->op == WXE_CB_START || // Recursive event callback allow
 	     // Allow connect_cb during CB i.e. msg from wxe_server.
-	     (memenv && event->caller == memenv->owner)) 
+	     (memenv && event->caller == memenv->owner))
 	    {
 	      switch(event->op) {
 	      case WXE_BATCH_END:
@@ -447,7 +441,10 @@ void WxeApp::dispatch_cb(wxList * batch, wxList * temp, ErlDrvTermData process)
 	      case WXE_DEBUG_PING:
 		break;
 	      case WXE_CB_RETURN:
-		memcpy(cb_buff, event->buffer, event->len);
+		if(event->len > 0) {
+		  cb_buff = (char *) driver_alloc(event->len);
+		  memcpy(cb_buff, event->buffer, event->len);
+		}
 		callback_returned = 1;
 		return;
 	      case WXE_CB_START:
@@ -464,12 +461,12 @@ void WxeApp::dispatch_cb(wxList * batch, wxList * temp, ErlDrvTermData process)
 		}
 		erl_drv_mutex_lock(wxe_batch_locker_m);
 		break;
-		if(callback_returned) 
+		if(callback_returned)
 		  return;
 	      }
 	      delete event;
 	    } else {
-	    // fprintf(stderr, "  sav %d \r\n", event->op);
+	    // fprintf(stderr, "  save %d \r\n", event->op);
 	    temp->Append(event);
 	  }
 	}
@@ -494,13 +491,13 @@ void WxeApp::newMemEnv(wxeMetaCommand& Ecmd) {
   driver_pdl_inc_refc(Ecmd.pdl);
 
   for(int i = 0; i < global_me->next; i++) {
-    memenv->ref2ptr[i] = global_me->ref2ptr[i];    
+    memenv->ref2ptr[i] = global_me->ref2ptr[i];
   }
   memenv->next = global_me->next;
   refmap[(ErlDrvTermData) Ecmd.port] = memenv;
   memenv->owner = Ecmd.caller;
 
-  ErlDrvTermData rt[] = {ERL_DRV_ATOM, driver_mk_atom((char *)"wx_port_initiated")};  
+  ErlDrvTermData rt[] = {ERL_DRV_ATOM, driver_mk_atom((char *)"wx_port_initiated")};
   driver_send_term(WXE_DRV_PORT,Ecmd.caller,rt,2);
 }
 
@@ -519,13 +516,13 @@ void WxeApp::destroyMemEnv(wxeMetaCommand& Ecmd) {
   // pre-pass delete all dialogs first since they might crash erlang otherwise
   for(int i=1; i < memenv->next; i++) {
     wxObject * ptr = (wxObject *) memenv->ref2ptr[i];
-    if(ptr) { 
+    if(ptr) {
       ptrMap::iterator it = ptr2ref.find(ptr);
       if(it != ptr2ref.end()) {
 	wxeRefData *refd = it->second;
 	if(refd->alloc_in_erl) {
 	  if(refd->type == 2) {
-	    wxDialog *win = (wxDialog *) ptr; 
+	    wxDialog *win = (wxDialog *) ptr;
 	    if(win->IsModal()) {
 	      win->EndModal(-1);
 	    }
@@ -535,25 +532,25 @@ void WxeApp::destroyMemEnv(wxeMetaCommand& Ecmd) {
 	      if(parentRef == ptr2ref.end()) {
 		// The parent is already dead delete the parent ref
 		win->SetParent(NULL);
-	      } 
+	      }
 	    }
 	    delete win;
-	  } 
+	  }
 	}
       }
     }
   }
-  // First pass, delete all top parents/windows of all linked objects 
+  // First pass, delete all top parents/windows of all linked objects
   //   fprintf(stderr, "close port %x\r\n", Ecmd.port);fflush(stderr);
 
   for(int i=1; i < memenv->next; i++) {
     void * ptr = memenv->ref2ptr[i];
-    if(ptr) { 
+    if(ptr) {
       ptrMap::iterator it = ptr2ref.find(ptr);
       if(it != ptr2ref.end()) {
 	wxeRefData *refd = it->second;
 	if(refd->alloc_in_erl && refd->type == 0) {
-	  parent = (wxWindow *) ptr; 
+	  parent = (wxWindow *) ptr;
 	  // fprintf(stderr, "window %x %d\r\n", (int) parent, refd->ref);
 	  while(parent->GetParent()) {
 	    parent = parent->GetParent();
@@ -573,7 +570,7 @@ void WxeApp::destroyMemEnv(wxeMetaCommand& Ecmd) {
   // everything linked from windows should now be deleted
   for(int i=1; i < memenv->next; i++) {
     void * ptr = memenv->ref2ptr[i];
-    if(ptr) { 
+    if(ptr) {
       ptrMap::iterator it = ptr2ref.find(ptr);
       if(it != ptr2ref.end()) {
 	wxeRefData *refd = it->second;
@@ -585,33 +582,33 @@ void WxeApp::destroyMemEnv(wxeMetaCommand& Ecmd) {
 	  wxString msg;
 	  if((refd->type == 0)) { // Maybe also class 1
 	    wxClassInfo *cinfo = ((wxObject *)ptr)->GetClassInfo();
-	    msg.Printf(wxT("Memory leak: {wx_ref, %d, %s}"), 
+	    msg.Printf(wxT("Memory leak: {wx_ref, %d, %s}"),
 		       refd->ref, cinfo->GetClassName());
 	    send_msg("error", &msg);
 	  } else {
 	    delete_object(ptr, refd);
 	  }
-	  if(type == 0 || type > 3) { 
-	    // Delete refs for leaks and non overridden allocs 
+	  if(type == 0 || type > 2) {
+	    // Delete refs for leaks and non overridden allocs
 	    delete refd;
 	    ptr2ref.erase(it);
 	  } // overridden allocs deletes meta-data in clearPtr
 	} else { // Not alloced in erl just delete references
 	  if(refd->ref >= global_me->next) { // if it is not part of global ptrs
-	    delete refd; 
+	    delete refd;
 	    ptr2ref.erase(it);
 	  }
 	}
       }
     }
-  }  
-  // Assert ?
-//   for(ptrMap::iterator it = ptr2ref.begin(); it != ptr2ref.end(); it++) {
-//     wxeRefData *refd = it->second;
-//     if(refd->ref >= global_me->next)
-//       fprintf(stderr, "L %d  %d\r\n", refd->ref, refd->alloc_in_erl);
-//   }
-//   fflush(stderr);
+  }
+// // Assert ?
+// for(ptrMap::iterator it = ptr2ref.begin(); it != ptr2ref.end(); it++) {
+//   wxeRefData *refd = it->second;
+//   if(refd->ref >= global_me->next)
+//     fprintf(stderr, "L %d %d %d\r\n", refd->ref, refd->type, refd->alloc_in_erl);
+// }
+//  fflush(stderr);
   delete memenv;
   driver_pdl_dec_refc(Ecmd.pdl);
   refmap.erase((ErlDrvTermData) Ecmd.port);
@@ -624,7 +621,7 @@ wxeMemEnv * WxeApp::getMemEnv(ErlDrvPort port) {
 int WxeApp::newPtr(void * ptr, int type, wxeMemEnv *memenv) {
   int ref;
   intList free = memenv->free;
-  
+
   if(free.IsEmpty()) {
     ref = memenv->next++;
   } else {
@@ -632,8 +629,8 @@ int WxeApp::newPtr(void * ptr, int type, wxeMemEnv *memenv) {
   };
   if(ref >= memenv->max) {
     memenv->max *= 2;
-    memenv->ref2ptr = 
-      (void **) driver_realloc(memenv->ref2ptr,memenv->max * sizeof(void*));    
+    memenv->ref2ptr =
+      (void **) driver_realloc(memenv->ref2ptr,memenv->max * sizeof(void*));
   }
   memenv->ref2ptr[ref] = ptr;
 
@@ -653,12 +650,12 @@ int WxeApp::getRef(void * ptr, wxeMemEnv *memenv) {
   ptrMap::iterator it = ptr2ref.find(ptr);
   if(it != ptr2ref.end()) {
     wxeRefData *refd = it->second;
-    if(refd->memenv == memenv) {
+    if(refd->memenv == memenv || refd->memenv == global_me) {
       // Found it return
       return refd->ref;
     } // else
     // Old reference to deleted object, release old and recreate in current memenv.
-    clearPtr(ptr);
+    ptr2ref.erase(it);
   }
   int ref;
   intList free = memenv->free;
@@ -687,7 +684,7 @@ void WxeApp::clearPtr(void * ptr) {
   if(it != ptr2ref.end()) {
     wxeRefData *refd = it->second;
     intList free = refd->memenv->free;
-    int ref = refd->ref;    
+    int ref = refd->ref;
     refd->memenv->ref2ptr[ref] = NULL;
     free.Append(ref);
 
@@ -696,7 +693,7 @@ void WxeApp::clearPtr(void * ptr) {
       msg.Printf(wxT("Deleting {wx_ref, %d, unknown} at %p "), ref, ptr);
       send_msg("debug", &msg);
     }
-    
+
     if(((int) refd->pid) != -1) {
       // Send terminate pid to owner
       wxeReturn rt = wxeReturn(WXE_DRV_PORT,refd->memenv->owner, false);
@@ -709,30 +706,30 @@ void WxeApp::clearPtr(void * ptr) {
     if(refd->type == 1 && ((wxObject*)ptr)->IsKindOf(CLASSINFO(wxSizer))) {
       wxSizerItemList list = ((wxSizer*)ptr)->GetChildren();
       for(wxSizerItemList::compatibility_iterator node = list.GetFirst();
-	  node; node = node->GetNext()) { 
+	  node; node = node->GetNext()) {
 	wxSizerItem *item = node->GetData();
 	wxObject *content=NULL;
-	if((content = item->GetWindow())) 
+	if((content = item->GetWindow()))
 	  if(ptr2ref.end() == ptr2ref.find(content)) {
 	    wxString msg;
 	    wxClassInfo *cinfo = ((wxObject *)ptr)->GetClassInfo();
 	    msg.Printf(wxT("Double usage detected of window at %p in sizer {wx_ref, %d, %s}"),
 		       content, ref, cinfo->GetClassName());
 	    send_msg("error", &msg);
-	    ((wxSizer*)ptr)->Detach((wxWindow*)content);	    
+	    ((wxSizer*)ptr)->Detach((wxWindow*)content);
 	  }
-	if((content = item->GetSizer())) 
+	if((content = item->GetSizer()))
 	  if(ptr2ref.end() == ptr2ref.find(content)) {
 	    wxString msg;
 	    wxClassInfo *cinfo = ((wxObject *)ptr)->GetClassInfo();
 	    msg.Printf(wxT("Double usage detected of sizer at %p in sizer {wx_ref, %d, %s}"),
 		       content, ref, cinfo->GetClassName());
 	    send_msg("error", &msg);
-	    ((wxSizer*)ptr)->Detach((wxSizer*)content);	
+	    ((wxSizer*)ptr)->Detach((wxSizer*)content);
 	  }
       }
     }
-    
+
     delete refd;
     ptr2ref.erase(it);
   }
@@ -753,7 +750,7 @@ void * WxeApp::getPtr(char * bp, wxeMemEnv *memenv) {
 
 void WxeApp::registerPid(char * bp, ErlDrvTermData pid, wxeMemEnv * memenv) {
   int index = *(int *) bp;
-  if(!memenv) 
+  if(!memenv)
     throw wxe_badarg(index);
   void * temp = memenv->ref2ptr[index];
   if((index < memenv->next) && ((index == 0) || (temp > NULL))) {
@@ -773,14 +770,14 @@ void WxeApp::registerPid(char * bp, ErlDrvTermData pid, wxeMemEnv * memenv) {
  *  Misc utility classes
  * ************************************************************/
 
-/* **************************************************************************** 
- * Memory handling  
+/* ****************************************************************************
+ * Memory handling
  * ****************************************************************************/
 
 wxeMemEnv::wxeMemEnv() {
-  ref2ptr = (void **) driver_alloc(128*sizeof(void *));  
+  ref2ptr = (void **) driver_alloc(128*sizeof(void *));
   ref2ptr[0] = NULL;
-  next = 1; 
+  next = 1;
   max = 128;
 }
 
@@ -788,12 +785,12 @@ wxeMemEnv::~wxeMemEnv() {
   driver_free(ref2ptr);
 }
 
-/* **************************************************************************** 
+/* ****************************************************************************
  * Erlang Commands (don't need to be derived of wxEvent anymore should
  * be re-written to own class struct)
  * ****************************************************************************/
 
-wxeCommand::wxeCommand(int fc,char * cbuf,int buflen, wxe_data *sd) 
+wxeCommand::wxeCommand(int fc,char * cbuf,int buflen, wxe_data *sd)
   : wxObject()
 {
   WXEBinRef *temp, *start, *prev;
@@ -809,12 +806,12 @@ wxeCommand::wxeCommand(int fc,char * cbuf,int buflen, wxe_data *sd)
   if(cbuf) {
     buffer = (char *) driver_alloc(len);
     memcpy((void *) buffer, (void *) cbuf, len);;
-    
+
     temp = sd->bin;
-    
+
     prev  = NULL;
     start = temp;
-    
+
     while(temp) {
       if(caller == temp->from) {
 	bin[n++] = temp;
@@ -839,7 +836,7 @@ wxeCommand::~wxeCommand() {
   int n = 0;
   if(buffer) {
     while(bin[n]) {
-      if(bin[n]->bin) 
+      if(bin[n]->bin)
 	driver_free_binary(bin[n]->bin);
       driver_free(bin[n++]);
     }
@@ -847,26 +844,26 @@ wxeCommand::~wxeCommand() {
   }
 }
 
-/* **************************************************************************** 
- * TreeItemData 
+/* ****************************************************************************
+ * TreeItemData
  * ****************************************************************************/
 
-wxETreeItemData::wxETreeItemData(int sz, char * data) { 
+wxETreeItemData::wxETreeItemData(int sz, char * data) {
   size = sz;
   bin = (char *) driver_alloc(sz);
   memcpy(bin, data, sz);
 }
 
-wxETreeItemData::~wxETreeItemData() 
+wxETreeItemData::~wxETreeItemData()
 {
   driver_free(bin);
 }
 
-/* **************************************************************************** 
+/* ****************************************************************************
  * CallbackData *
  * ****************************************************************************/
 
-wxeCallbackData::wxeCallbackData(ErlDrvTermData caller,void * req, char *req_type, 
+wxeCallbackData::wxeCallbackData(ErlDrvTermData caller,void * req, char *req_type,
 				 int funcb, int skip_ev, wxeErlTerm * userData)
   : wxObject()
 {
@@ -893,8 +890,6 @@ int wxCALLBACK wxEListCtrlCompare(long item1, long item2, long callbackInfoPtr)
 {
   callbackInfo * cb = (callbackInfo *)callbackInfoPtr;
   wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(cb->port);
-  char * bp = ((WxeApp *) wxTheApp)->cb_buff;
-  
   wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
   rt.addInt(cb->callbackID);
   rt.addInt(item1);
@@ -903,6 +898,13 @@ int wxCALLBACK wxEListCtrlCompare(long item1, long item2, long callbackInfoPtr)
   rt.addAtom("_wx_invoke_cb_");
   rt.addTupleCount(3);
   rt.send();
-  handle_callback_batch(cb->port);
-  return *(int*) bp;
+  handle_event_callback(cb->port, memenv->owner);
+
+  if(((WxeApp *) wxTheApp)->cb_buff) {
+    int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
+    driver_free(((WxeApp *) wxTheApp)->cb_buff);
+    ((WxeApp *) wxTheApp)->cb_buff = NULL;
+    return res;
+  }
+  return 0;
 }
diff --git a/lib/wx/c_src/wxe_impl.h b/lib/wx/c_src/wxe_impl.h
index 39c02f8c1a..ee31068d5d 100644
--- a/lib/wx/c_src/wxe_impl.h
+++ b/lib/wx/c_src/wxe_impl.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. 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
@@ -178,7 +178,8 @@ public:
   wxeMemEnv * global_me;
   
   // Temp container for callbacks
-  char cb_buff[256];
+  char *cb_buff;
+  int  cb_len;
 };
 
 class wxETreeItemData : public wxTreeItemData 
@@ -194,7 +195,6 @@ class wxETreeItemData : public wxTreeItemData
 
 bool sendevent(wxEvent * event, ErlDrvPort port);
 void pre_callback();
-void handle_callback_batch(ErlDrvPort port);  // For wxePrintout
 void handle_event_callback(ErlDrvPort port, ErlDrvTermData process);
 
 void activateGL(ErlDrvTermData caller);
@@ -232,8 +232,6 @@ class wxEPrintout : public wxPrintout
    bool OnPrintPage(int page);
    void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
 
-   void clear_cb(int callback);
-
    int onPrintPage;
    int onPreparePrinting;
    int onBeginPrinting; 
@@ -246,6 +244,9 @@ class wxEPrintout : public wxPrintout
    ErlDrvPort port;
 };
 
+void clear_cb(ErlDrvPort port, int callback);
+
+
 // Implementation of wxListCtrlCompare
 struct callbackInfo {
    ErlDrvPort port;
diff --git a/lib/wx/doc/src/make.dep b/lib/wx/doc/src/make.dep
deleted file mode 100644
index 91001be438..0000000000
--- a/lib/wx/doc/src/make.dep
+++ /dev/null
@@ -1,13 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex chapter.tex part.tex
-
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 26d1f892b2..7bd8d18592 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -31,6 +31,39 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 0.99</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    wx: fix obsolete guard warning (list/1) (Thanks to Tuncer
+	    Ayaz)</p>
+          <p>
+	    Own Id: OTP-9513</p>
+        </item>
+        <item>
+	    <p> XML files have been corrected. </p>
+          <p>
+	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Support virtual tables in wxListCtrl.</p>
+          <p>
+	    Own Id: OTP-9415</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 0.98.10</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/examples/demo/ex_listCtrl.erl b/lib/wx/examples/demo/ex_listCtrl.erl
index c574c7247a..3faec4e229 100644
--- a/lib/wx/examples/demo/ex_listCtrl.erl
+++ b/lib/wx/examples/demo/ex_listCtrl.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2009-2011. 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.
-%% 
+%%
 %% %CopyrightEnd%
 
 -module(ex_listCtrl).
@@ -25,7 +25,7 @@
 -export([start/1, init/1, terminate/2,  code_change/3,
 	 handle_info/2, handle_call/3, handle_event/2]).
 
--record(state, 
+-record(state,
 	{
 	  parent,
 	  config,
@@ -40,11 +40,11 @@ init(Config) ->
         wx:batch(fun() -> do_init(Config) end).
 
 do_init(Config) ->
-    Parent = proplists:get_value(parent, Config),  
+    Parent = proplists:get_value(parent, Config),
     Panel = wxPanel:new(Parent, []),
 
     %% Setup sizers
-    MainSizer = wxStaticBoxSizer:new(?wxVERTICAL, Panel, 
+    MainSizer = wxStaticBoxSizer:new(?wxVERTICAL, Panel,
 				     [{label, "wxListCtrl"}]),
 
     Notebook = wxNotebook:new(Panel, 1, [{style, ?wxBK_DEFAULT}]),
@@ -81,14 +81,46 @@ do_init(Config) ->
     wxListCtrl:setItemBackgroundColour(ListCtrl3,3,?wxGREEN),
     wxListCtrl:setItemBackgroundColour(ListCtrl3,0,?wxCYAN),
 
+    IA = wxListItemAttr:new(),
+    wxListItemAttr:setTextColour(IA, {190, 25, 25}),
+    LC4Opts = [{style, ?wxLC_REPORT bor ?wxLC_VIRTUAL},
+	       {onGetItemText, fun(_This, Item, 0) ->
+				       "Row " ++ integer_to_list(Item);
+				  (_, Item, 1) when Item rem 5 == 0 ->
+				       "Column 2";
+				  (_, _, _) -> ""
+			       end},
+	       {onGetItemAttr, fun(_This, Item) when Item rem 3 == 0 ->
+				       IA;
+				  (_This, _Item)  ->
+				       wx:typeCast(wx:null(), wxListItemAttr)
+			       end},
+	       {onGetItemColumnImage, fun(_This, Item, 1) ->
+					      Item rem 4;
+					 (_, _, _) ->
+					      -1
+				      end}
+	      ],
+    ListCtrl4 = wxListCtrl:new(Notebook, LC4Opts),
+    wxListCtrl:setImageList(ListCtrl4, IL, ?wxIMAGE_LIST_SMALL),
+
+    wxListCtrl:insertColumn(ListCtrl4, 0, "Column 1"),
+    wxListCtrl:insertColumn(ListCtrl4, 1, "Column 2"),
+    wxListCtrl:setColumnWidth(ListCtrl4, 0, 200),
+    wxListCtrl:setColumnWidth(ListCtrl4, 1, 200),
+    wxListCtrl:setItemCount(ListCtrl4, 1000000),
+
+
     wxListCtrl:connect(ListCtrl1, command_list_item_selected, []),
     wxListCtrl:connect(ListCtrl2, command_list_item_selected, []),
     wxListCtrl:connect(ListCtrl3, command_list_item_selected, []),
+    wxListCtrl:connect(ListCtrl4, command_list_item_selected, []),
 
     %% Add to sizers
     wxNotebook:addPage(Notebook, ListCtrl1, "List", []),
     wxNotebook:addPage(Notebook, ListCtrl2, "Report", []),
     wxNotebook:addPage(Notebook, ListCtrl3, "Colored multiselect", []),
+    wxNotebook:addPage(Notebook, ListCtrl4, "Virtual Report", []),
 
     wxSizer:add(MainSizer, Notebook, [{proportion, 1},
 				      {flag, ?wxEXPAND}]),
@@ -145,4 +177,4 @@ create_list_ctrl(Win, Options) ->
 
     ListCtrl.
 
-    
+
diff --git a/lib/wx/include/gl.hrl b/lib/wx/include/gl.hrl
index 52f2635af9..54eb551285 100644
--- a/lib/wx/include/gl.hrl
+++ b/lib/wx/include/gl.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -21,32 +21,22 @@
 %% This file is generated DO NOT EDIT
 
 -define(GL_VERSION_1_1, 1).
--define(GL_CURRENT_BIT, 16#1).
--define(GL_POINT_BIT, 16#2).
--define(GL_LINE_BIT, 16#4).
--define(GL_POLYGON_BIT, 16#8).
--define(GL_POLYGON_STIPPLE_BIT, 16#10).
--define(GL_PIXEL_MODE_BIT, 16#20).
--define(GL_LIGHTING_BIT, 16#40).
--define(GL_FOG_BIT, 16#80).
--define(GL_DEPTH_BUFFER_BIT, 16#100).
--define(GL_ACCUM_BUFFER_BIT, 16#200).
--define(GL_STENCIL_BUFFER_BIT, 16#400).
--define(GL_VIEWPORT_BIT, 16#800).
--define(GL_TRANSFORM_BIT, 16#1000).
--define(GL_ENABLE_BIT, 16#2000).
--define(GL_COLOR_BUFFER_BIT, 16#4000).
--define(GL_HINT_BIT, 16#8000).
--define(GL_EVAL_BIT, 16#10000).
--define(GL_LIST_BIT, 16#20000).
--define(GL_TEXTURE_BIT, 16#40000).
--define(GL_SCISSOR_BIT, 16#80000).
--define(GL_ALL_ATTRIB_BITS, 16#FFFFFFFF).
--define(GL_CLIENT_PIXEL_STORE_BIT, 16#1).
--define(GL_CLIENT_VERTEX_ARRAY_BIT, 16#2).
--define(GL_CLIENT_ALL_ATTRIB_BITS, 16#FFFFFFFF).
--define(GL_FALSE, 0).
--define(GL_TRUE, 1).
+-define(GL_VERSION_1_2, 1).
+-define(GL_VERSION_1_3, 1).
+-define(GL_ARB_imaging, 1).
+-define(GL_FALSE, 16#0).
+-define(GL_TRUE, 16#1).
+-define(GL_BYTE, 16#1400).
+-define(GL_UNSIGNED_BYTE, 16#1401).
+-define(GL_SHORT, 16#1402).
+-define(GL_UNSIGNED_SHORT, 16#1403).
+-define(GL_INT, 16#1404).
+-define(GL_UNSIGNED_INT, 16#1405).
+-define(GL_FLOAT, 16#1406).
+-define(GL_2_BYTES, 16#1407).
+-define(GL_3_BYTES, 16#1408).
+-define(GL_4_BYTES, 16#1409).
+-define(GL_DOUBLE, 16#140A).
 -define(GL_POINTS, 16#0).
 -define(GL_LINES, 16#1).
 -define(GL_LINE_LOOP, 16#2).
@@ -57,11 +47,85 @@
 -define(GL_QUADS, 16#7).
 -define(GL_QUAD_STRIP, 16#8).
 -define(GL_POLYGON, 16#9).
--define(GL_ACCUM, 16#100).
--define(GL_LOAD, 16#101).
--define(GL_RETURN, 16#102).
--define(GL_MULT, 16#103).
--define(GL_ADD, 16#104).
+-define(GL_VERTEX_ARRAY, 16#8074).
+-define(GL_NORMAL_ARRAY, 16#8075).
+-define(GL_COLOR_ARRAY, 16#8076).
+-define(GL_INDEX_ARRAY, 16#8077).
+-define(GL_TEXTURE_COORD_ARRAY, 16#8078).
+-define(GL_EDGE_FLAG_ARRAY, 16#8079).
+-define(GL_VERTEX_ARRAY_SIZE, 16#807A).
+-define(GL_VERTEX_ARRAY_TYPE, 16#807B).
+-define(GL_VERTEX_ARRAY_STRIDE, 16#807C).
+-define(GL_NORMAL_ARRAY_TYPE, 16#807E).
+-define(GL_NORMAL_ARRAY_STRIDE, 16#807F).
+-define(GL_COLOR_ARRAY_SIZE, 16#8081).
+-define(GL_COLOR_ARRAY_TYPE, 16#8082).
+-define(GL_COLOR_ARRAY_STRIDE, 16#8083).
+-define(GL_INDEX_ARRAY_TYPE, 16#8085).
+-define(GL_INDEX_ARRAY_STRIDE, 16#8086).
+-define(GL_TEXTURE_COORD_ARRAY_SIZE, 16#8088).
+-define(GL_TEXTURE_COORD_ARRAY_TYPE, 16#8089).
+-define(GL_TEXTURE_COORD_ARRAY_STRIDE, 16#808A).
+-define(GL_EDGE_FLAG_ARRAY_STRIDE, 16#808C).
+-define(GL_VERTEX_ARRAY_POINTER, 16#808E).
+-define(GL_NORMAL_ARRAY_POINTER, 16#808F).
+-define(GL_COLOR_ARRAY_POINTER, 16#8090).
+-define(GL_INDEX_ARRAY_POINTER, 16#8091).
+-define(GL_TEXTURE_COORD_ARRAY_POINTER, 16#8092).
+-define(GL_EDGE_FLAG_ARRAY_POINTER, 16#8093).
+-define(GL_V2F, 16#2A20).
+-define(GL_V3F, 16#2A21).
+-define(GL_C4UB_V2F, 16#2A22).
+-define(GL_C4UB_V3F, 16#2A23).
+-define(GL_C3F_V3F, 16#2A24).
+-define(GL_N3F_V3F, 16#2A25).
+-define(GL_C4F_N3F_V3F, 16#2A26).
+-define(GL_T2F_V3F, 16#2A27).
+-define(GL_T4F_V4F, 16#2A28).
+-define(GL_T2F_C4UB_V3F, 16#2A29).
+-define(GL_T2F_C3F_V3F, 16#2A2A).
+-define(GL_T2F_N3F_V3F, 16#2A2B).
+-define(GL_T2F_C4F_N3F_V3F, 16#2A2C).
+-define(GL_T4F_C4F_N3F_V4F, 16#2A2D).
+-define(GL_MATRIX_MODE, 16#BA0).
+-define(GL_MODELVIEW, 16#1700).
+-define(GL_PROJECTION, 16#1701).
+-define(GL_TEXTURE, 16#1702).
+-define(GL_POINT_SMOOTH, 16#B10).
+-define(GL_POINT_SIZE, 16#B11).
+-define(GL_POINT_SIZE_GRANULARITY, 16#B13).
+-define(GL_POINT_SIZE_RANGE, 16#B12).
+-define(GL_LINE_SMOOTH, 16#B20).
+-define(GL_LINE_STIPPLE, 16#B24).
+-define(GL_LINE_STIPPLE_PATTERN, 16#B25).
+-define(GL_LINE_STIPPLE_REPEAT, 16#B26).
+-define(GL_LINE_WIDTH, 16#B21).
+-define(GL_LINE_WIDTH_GRANULARITY, 16#B23).
+-define(GL_LINE_WIDTH_RANGE, 16#B22).
+-define(GL_POINT, 16#1B00).
+-define(GL_LINE, 16#1B01).
+-define(GL_FILL, 16#1B02).
+-define(GL_CW, 16#900).
+-define(GL_CCW, 16#901).
+-define(GL_FRONT, 16#404).
+-define(GL_BACK, 16#405).
+-define(GL_POLYGON_MODE, 16#B40).
+-define(GL_POLYGON_SMOOTH, 16#B41).
+-define(GL_POLYGON_STIPPLE, 16#B42).
+-define(GL_EDGE_FLAG, 16#B43).
+-define(GL_CULL_FACE, 16#B44).
+-define(GL_CULL_FACE_MODE, 16#B45).
+-define(GL_FRONT_FACE, 16#B46).
+-define(GL_POLYGON_OFFSET_FACTOR, 16#8038).
+-define(GL_POLYGON_OFFSET_UNITS, 16#2A00).
+-define(GL_POLYGON_OFFSET_POINT, 16#2A01).
+-define(GL_POLYGON_OFFSET_LINE, 16#2A02).
+-define(GL_POLYGON_OFFSET_FILL, 16#8037).
+-define(GL_COMPILE, 16#1300).
+-define(GL_COMPILE_AND_EXECUTE, 16#1301).
+-define(GL_LIST_BASE, 16#B32).
+-define(GL_LIST_INDEX, 16#B33).
+-define(GL_LIST_MODE, 16#B30).
 -define(GL_NEVER, 16#200).
 -define(GL_LESS, 16#201).
 -define(GL_EQUAL, 16#202).
@@ -70,8 +134,71 @@
 -define(GL_NOTEQUAL, 16#205).
 -define(GL_GEQUAL, 16#206).
 -define(GL_ALWAYS, 16#207).
--define(GL_ZERO, 0).
--define(GL_ONE, 1).
+-define(GL_DEPTH_TEST, 16#B71).
+-define(GL_DEPTH_BITS, 16#D56).
+-define(GL_DEPTH_CLEAR_VALUE, 16#B73).
+-define(GL_DEPTH_FUNC, 16#B74).
+-define(GL_DEPTH_RANGE, 16#B70).
+-define(GL_DEPTH_WRITEMASK, 16#B72).
+-define(GL_DEPTH_COMPONENT, 16#1902).
+-define(GL_LIGHTING, 16#B50).
+-define(GL_LIGHT0, 16#4000).
+-define(GL_LIGHT1, 16#4001).
+-define(GL_LIGHT2, 16#4002).
+-define(GL_LIGHT3, 16#4003).
+-define(GL_LIGHT4, 16#4004).
+-define(GL_LIGHT5, 16#4005).
+-define(GL_LIGHT6, 16#4006).
+-define(GL_LIGHT7, 16#4007).
+-define(GL_SPOT_EXPONENT, 16#1205).
+-define(GL_SPOT_CUTOFF, 16#1206).
+-define(GL_CONSTANT_ATTENUATION, 16#1207).
+-define(GL_LINEAR_ATTENUATION, 16#1208).
+-define(GL_QUADRATIC_ATTENUATION, 16#1209).
+-define(GL_AMBIENT, 16#1200).
+-define(GL_DIFFUSE, 16#1201).
+-define(GL_SPECULAR, 16#1202).
+-define(GL_SHININESS, 16#1601).
+-define(GL_EMISSION, 16#1600).
+-define(GL_POSITION, 16#1203).
+-define(GL_SPOT_DIRECTION, 16#1204).
+-define(GL_AMBIENT_AND_DIFFUSE, 16#1602).
+-define(GL_COLOR_INDEXES, 16#1603).
+-define(GL_LIGHT_MODEL_TWO_SIDE, 16#B52).
+-define(GL_LIGHT_MODEL_LOCAL_VIEWER, 16#B51).
+-define(GL_LIGHT_MODEL_AMBIENT, 16#B53).
+-define(GL_FRONT_AND_BACK, 16#408).
+-define(GL_SHADE_MODEL, 16#B54).
+-define(GL_FLAT, 16#1D00).
+-define(GL_SMOOTH, 16#1D01).
+-define(GL_COLOR_MATERIAL, 16#B57).
+-define(GL_COLOR_MATERIAL_FACE, 16#B55).
+-define(GL_COLOR_MATERIAL_PARAMETER, 16#B56).
+-define(GL_NORMALIZE, 16#BA1).
+-define(GL_CLIP_PLANE0, 16#3000).
+-define(GL_CLIP_PLANE1, 16#3001).
+-define(GL_CLIP_PLANE2, 16#3002).
+-define(GL_CLIP_PLANE3, 16#3003).
+-define(GL_CLIP_PLANE4, 16#3004).
+-define(GL_CLIP_PLANE5, 16#3005).
+-define(GL_ACCUM_RED_BITS, 16#D58).
+-define(GL_ACCUM_GREEN_BITS, 16#D59).
+-define(GL_ACCUM_BLUE_BITS, 16#D5A).
+-define(GL_ACCUM_ALPHA_BITS, 16#D5B).
+-define(GL_ACCUM_CLEAR_VALUE, 16#B80).
+-define(GL_ACCUM, 16#100).
+-define(GL_ADD, 16#104).
+-define(GL_LOAD, 16#101).
+-define(GL_MULT, 16#103).
+-define(GL_RETURN, 16#102).
+-define(GL_ALPHA_TEST, 16#BC0).
+-define(GL_ALPHA_TEST_REF, 16#BC2).
+-define(GL_ALPHA_TEST_FUNC, 16#BC1).
+-define(GL_BLEND, 16#BE2).
+-define(GL_BLEND_SRC, 16#BE1).
+-define(GL_BLEND_DST, 16#BE0).
+-define(GL_ZERO, 16#0).
+-define(GL_ONE, 16#1).
 -define(GL_SRC_COLOR, 16#300).
 -define(GL_ONE_MINUS_SRC_COLOR, 16#301).
 -define(GL_SRC_ALPHA, 16#302).
@@ -81,121 +208,58 @@
 -define(GL_DST_COLOR, 16#306).
 -define(GL_ONE_MINUS_DST_COLOR, 16#307).
 -define(GL_SRC_ALPHA_SATURATE, 16#308).
--define(GL_NONE, 0).
--define(GL_FRONT_LEFT, 16#400).
--define(GL_FRONT_RIGHT, 16#401).
--define(GL_BACK_LEFT, 16#402).
--define(GL_BACK_RIGHT, 16#403).
--define(GL_FRONT, 16#404).
--define(GL_BACK, 16#405).
--define(GL_LEFT, 16#406).
--define(GL_RIGHT, 16#407).
--define(GL_FRONT_AND_BACK, 16#408).
--define(GL_AUX0, 16#409).
--define(GL_AUX1, 16#40A).
--define(GL_AUX2, 16#40B).
--define(GL_AUX3, 16#40C).
--define(GL_NO_ERROR, 0).
--define(GL_INVALID_ENUM, 16#500).
--define(GL_INVALID_VALUE, 16#501).
--define(GL_INVALID_OPERATION, 16#502).
--define(GL_STACK_OVERFLOW, 16#503).
--define(GL_STACK_UNDERFLOW, 16#504).
--define(GL_OUT_OF_MEMORY, 16#505).
--define(GL_TABLE_TOO_LARGE, 16#8031).
+-define(GL_FEEDBACK, 16#1C01).
+-define(GL_RENDER, 16#1C00).
+-define(GL_SELECT, 16#1C02).
 -define(GL_2D, 16#600).
 -define(GL_3D, 16#601).
 -define(GL_3D_COLOR, 16#602).
 -define(GL_3D_COLOR_TEXTURE, 16#603).
 -define(GL_4D_COLOR_TEXTURE, 16#604).
--define(GL_PASS_THROUGH_TOKEN, 16#700).
 -define(GL_POINT_TOKEN, 16#701).
 -define(GL_LINE_TOKEN, 16#702).
+-define(GL_LINE_RESET_TOKEN, 16#707).
 -define(GL_POLYGON_TOKEN, 16#703).
 -define(GL_BITMAP_TOKEN, 16#704).
 -define(GL_DRAW_PIXEL_TOKEN, 16#705).
 -define(GL_COPY_PIXEL_TOKEN, 16#706).
--define(GL_LINE_RESET_TOKEN, 16#707).
--define(GL_EXP, 16#800).
--define(GL_EXP2, 16#801).
--define(GL_CW, 16#900).
--define(GL_CCW, 16#901).
--define(GL_COEFF, 16#A00).
--define(GL_ORDER, 16#A01).
--define(GL_DOMAIN, 16#A02).
--define(GL_PIXEL_MAP_I_TO_I, 16#C70).
--define(GL_PIXEL_MAP_S_TO_S, 16#C71).
--define(GL_PIXEL_MAP_I_TO_R, 16#C72).
--define(GL_PIXEL_MAP_I_TO_G, 16#C73).
--define(GL_PIXEL_MAP_I_TO_B, 16#C74).
--define(GL_PIXEL_MAP_I_TO_A, 16#C75).
--define(GL_PIXEL_MAP_R_TO_R, 16#C76).
--define(GL_PIXEL_MAP_G_TO_G, 16#C77).
--define(GL_PIXEL_MAP_B_TO_B, 16#C78).
--define(GL_PIXEL_MAP_A_TO_A, 16#C79).
--define(GL_VERTEX_ARRAY_POINTER, 16#808E).
--define(GL_NORMAL_ARRAY_POINTER, 16#808F).
--define(GL_COLOR_ARRAY_POINTER, 16#8090).
--define(GL_INDEX_ARRAY_POINTER, 16#8091).
--define(GL_TEXTURE_COORD_ARRAY_POINTER, 16#8092).
--define(GL_EDGE_FLAG_ARRAY_POINTER, 16#8093).
--define(GL_CURRENT_COLOR, 16#B00).
--define(GL_CURRENT_INDEX, 16#B01).
--define(GL_CURRENT_NORMAL, 16#B02).
--define(GL_CURRENT_TEXTURE_COORDS, 16#B03).
--define(GL_CURRENT_RASTER_COLOR, 16#B04).
--define(GL_CURRENT_RASTER_INDEX, 16#B05).
--define(GL_CURRENT_RASTER_TEXTURE_COORDS, 16#B06).
--define(GL_CURRENT_RASTER_POSITION, 16#B07).
--define(GL_CURRENT_RASTER_POSITION_VALID, 16#B08).
--define(GL_CURRENT_RASTER_DISTANCE, 16#B09).
--define(GL_POINT_SMOOTH, 16#B10).
--define(GL_POINT_SIZE, 16#B11).
--define(GL_SMOOTH_POINT_SIZE_RANGE, 16#B12).
--define(GL_SMOOTH_POINT_SIZE_GRANULARITY, 16#B13).
--define(GL_POINT_SIZE_RANGE, ?GL_SMOOTH_POINT_SIZE_RANGE).
--define(GL_POINT_SIZE_GRANULARITY, ?GL_SMOOTH_POINT_SIZE_GRANULARITY).
--define(GL_LINE_SMOOTH, 16#B20).
--define(GL_LINE_WIDTH, 16#B21).
--define(GL_SMOOTH_LINE_WIDTH_RANGE, 16#B22).
--define(GL_SMOOTH_LINE_WIDTH_GRANULARITY, 16#B23).
--define(GL_LINE_WIDTH_RANGE, ?GL_SMOOTH_LINE_WIDTH_RANGE).
--define(GL_LINE_WIDTH_GRANULARITY, ?GL_SMOOTH_LINE_WIDTH_GRANULARITY).
--define(GL_LINE_STIPPLE, 16#B24).
--define(GL_LINE_STIPPLE_PATTERN, 16#B25).
--define(GL_LINE_STIPPLE_REPEAT, 16#B26).
--define(GL_LIST_MODE, 16#B30).
--define(GL_MAX_LIST_NESTING, 16#B31).
--define(GL_LIST_BASE, 16#B32).
--define(GL_LIST_INDEX, 16#B33).
--define(GL_POLYGON_MODE, 16#B40).
--define(GL_POLYGON_SMOOTH, 16#B41).
--define(GL_POLYGON_STIPPLE, 16#B42).
--define(GL_EDGE_FLAG, 16#B43).
--define(GL_CULL_FACE, 16#B44).
--define(GL_CULL_FACE_MODE, 16#B45).
--define(GL_FRONT_FACE, 16#B46).
--define(GL_LIGHTING, 16#B50).
--define(GL_LIGHT_MODEL_LOCAL_VIEWER, 16#B51).
--define(GL_LIGHT_MODEL_TWO_SIDE, 16#B52).
--define(GL_LIGHT_MODEL_AMBIENT, 16#B53).
--define(GL_SHADE_MODEL, 16#B54).
--define(GL_COLOR_MATERIAL_FACE, 16#B55).
--define(GL_COLOR_MATERIAL_PARAMETER, 16#B56).
--define(GL_COLOR_MATERIAL, 16#B57).
+-define(GL_PASS_THROUGH_TOKEN, 16#700).
+-define(GL_FEEDBACK_BUFFER_POINTER, 16#DF0).
+-define(GL_FEEDBACK_BUFFER_SIZE, 16#DF1).
+-define(GL_FEEDBACK_BUFFER_TYPE, 16#DF2).
+-define(GL_SELECTION_BUFFER_POINTER, 16#DF3).
+-define(GL_SELECTION_BUFFER_SIZE, 16#DF4).
 -define(GL_FOG, 16#B60).
--define(GL_FOG_INDEX, 16#B61).
+-define(GL_FOG_MODE, 16#B65).
 -define(GL_FOG_DENSITY, 16#B62).
+-define(GL_FOG_COLOR, 16#B66).
+-define(GL_FOG_INDEX, 16#B61).
 -define(GL_FOG_START, 16#B63).
 -define(GL_FOG_END, 16#B64).
--define(GL_FOG_MODE, 16#B65).
--define(GL_FOG_COLOR, 16#B66).
--define(GL_DEPTH_RANGE, 16#B70).
--define(GL_DEPTH_TEST, 16#B71).
--define(GL_DEPTH_WRITEMASK, 16#B72).
--define(GL_DEPTH_CLEAR_VALUE, 16#B73).
--define(GL_DEPTH_FUNC, 16#B74).
--define(GL_ACCUM_CLEAR_VALUE, 16#B80).
+-define(GL_LINEAR, 16#2601).
+-define(GL_EXP, 16#800).
+-define(GL_EXP2, 16#801).
+-define(GL_LOGIC_OP, 16#BF1).
+-define(GL_INDEX_LOGIC_OP, 16#BF1).
+-define(GL_COLOR_LOGIC_OP, 16#BF2).
+-define(GL_LOGIC_OP_MODE, 16#BF0).
+-define(GL_CLEAR, 16#1500).
+-define(GL_SET, 16#150F).
+-define(GL_COPY, 16#1503).
+-define(GL_COPY_INVERTED, 16#150C).
+-define(GL_NOOP, 16#1505).
+-define(GL_INVERT, 16#150A).
+-define(GL_AND, 16#1501).
+-define(GL_NAND, 16#150E).
+-define(GL_OR, 16#1507).
+-define(GL_NOR, 16#1508).
+-define(GL_XOR, 16#1506).
+-define(GL_EQUIV, 16#1509).
+-define(GL_AND_REVERSE, 16#1502).
+-define(GL_AND_INVERTED, 16#1504).
+-define(GL_OR_REVERSE, 16#150B).
+-define(GL_OR_INVERTED, 16#150D).
+-define(GL_STENCIL_BITS, 16#D57).
 -define(GL_STENCIL_TEST, 16#B90).
 -define(GL_STENCIL_CLEAR_VALUE, 16#B91).
 -define(GL_STENCIL_FUNC, 16#B92).
@@ -205,89 +269,48 @@
 -define(GL_STENCIL_PASS_DEPTH_PASS, 16#B96).
 -define(GL_STENCIL_REF, 16#B97).
 -define(GL_STENCIL_WRITEMASK, 16#B98).
--define(GL_MATRIX_MODE, 16#BA0).
--define(GL_NORMALIZE, 16#BA1).
--define(GL_VIEWPORT, 16#BA2).
--define(GL_MODELVIEW_STACK_DEPTH, 16#BA3).
--define(GL_PROJECTION_STACK_DEPTH, 16#BA4).
--define(GL_TEXTURE_STACK_DEPTH, 16#BA5).
--define(GL_MODELVIEW_MATRIX, 16#BA6).
--define(GL_PROJECTION_MATRIX, 16#BA7).
--define(GL_TEXTURE_MATRIX, 16#BA8).
--define(GL_ATTRIB_STACK_DEPTH, 16#BB0).
--define(GL_CLIENT_ATTRIB_STACK_DEPTH, 16#BB1).
--define(GL_ALPHA_TEST, 16#BC0).
--define(GL_ALPHA_TEST_FUNC, 16#BC1).
--define(GL_ALPHA_TEST_REF, 16#BC2).
--define(GL_DITHER, 16#BD0).
--define(GL_BLEND_DST, 16#BE0).
--define(GL_BLEND_SRC, 16#BE1).
--define(GL_BLEND, 16#BE2).
--define(GL_LOGIC_OP_MODE, 16#BF0).
--define(GL_INDEX_LOGIC_OP, 16#BF1).
--define(GL_LOGIC_OP, ?GL_INDEX_LOGIC_OP).
--define(GL_COLOR_LOGIC_OP, 16#BF2).
+-define(GL_STENCIL_INDEX, 16#1901).
+-define(GL_KEEP, 16#1E00).
+-define(GL_REPLACE, 16#1E01).
+-define(GL_INCR, 16#1E02).
+-define(GL_DECR, 16#1E03).
+-define(GL_NONE, 16#0).
+-define(GL_LEFT, 16#406).
+-define(GL_RIGHT, 16#407).
+-define(GL_FRONT_LEFT, 16#400).
+-define(GL_FRONT_RIGHT, 16#401).
+-define(GL_BACK_LEFT, 16#402).
+-define(GL_BACK_RIGHT, 16#403).
+-define(GL_AUX0, 16#409).
+-define(GL_AUX1, 16#40A).
+-define(GL_AUX2, 16#40B).
+-define(GL_AUX3, 16#40C).
+-define(GL_COLOR_INDEX, 16#1900).
+-define(GL_RED, 16#1903).
+-define(GL_GREEN, 16#1904).
+-define(GL_BLUE, 16#1905).
+-define(GL_ALPHA, 16#1906).
+-define(GL_LUMINANCE, 16#1909).
+-define(GL_LUMINANCE_ALPHA, 16#190A).
+-define(GL_ALPHA_BITS, 16#D55).
+-define(GL_RED_BITS, 16#D52).
+-define(GL_GREEN_BITS, 16#D53).
+-define(GL_BLUE_BITS, 16#D54).
+-define(GL_INDEX_BITS, 16#D51).
+-define(GL_SUBPIXEL_BITS, 16#D50).
 -define(GL_AUX_BUFFERS, 16#C00).
--define(GL_DRAW_BUFFER, 16#C01).
 -define(GL_READ_BUFFER, 16#C02).
--define(GL_SCISSOR_BOX, 16#C10).
--define(GL_SCISSOR_TEST, 16#C11).
--define(GL_INDEX_CLEAR_VALUE, 16#C20).
--define(GL_INDEX_WRITEMASK, 16#C21).
--define(GL_COLOR_CLEAR_VALUE, 16#C22).
--define(GL_COLOR_WRITEMASK, 16#C23).
--define(GL_INDEX_MODE, 16#C30).
--define(GL_RGBA_MODE, 16#C31).
+-define(GL_DRAW_BUFFER, 16#C01).
 -define(GL_DOUBLEBUFFER, 16#C32).
 -define(GL_STEREO, 16#C33).
--define(GL_RENDER_MODE, 16#C40).
--define(GL_PERSPECTIVE_CORRECTION_HINT, 16#C50).
--define(GL_POINT_SMOOTH_HINT, 16#C51).
--define(GL_LINE_SMOOTH_HINT, 16#C52).
--define(GL_POLYGON_SMOOTH_HINT, 16#C53).
--define(GL_FOG_HINT, 16#C54).
--define(GL_TEXTURE_GEN_S, 16#C60).
--define(GL_TEXTURE_GEN_T, 16#C61).
--define(GL_TEXTURE_GEN_R, 16#C62).
--define(GL_TEXTURE_GEN_Q, 16#C63).
--define(GL_PIXEL_MAP_I_TO_I_SIZE, 16#CB0).
--define(GL_PIXEL_MAP_S_TO_S_SIZE, 16#CB1).
--define(GL_PIXEL_MAP_I_TO_R_SIZE, 16#CB2).
--define(GL_PIXEL_MAP_I_TO_G_SIZE, 16#CB3).
--define(GL_PIXEL_MAP_I_TO_B_SIZE, 16#CB4).
--define(GL_PIXEL_MAP_I_TO_A_SIZE, 16#CB5).
--define(GL_PIXEL_MAP_R_TO_R_SIZE, 16#CB6).
--define(GL_PIXEL_MAP_G_TO_G_SIZE, 16#CB7).
--define(GL_PIXEL_MAP_B_TO_B_SIZE, 16#CB8).
--define(GL_PIXEL_MAP_A_TO_A_SIZE, 16#CB9).
--define(GL_UNPACK_SWAP_BYTES, 16#CF0).
--define(GL_UNPACK_LSB_FIRST, 16#CF1).
--define(GL_UNPACK_ROW_LENGTH, 16#CF2).
--define(GL_UNPACK_SKIP_ROWS, 16#CF3).
--define(GL_UNPACK_SKIP_PIXELS, 16#CF4).
--define(GL_UNPACK_ALIGNMENT, 16#CF5).
--define(GL_PACK_SWAP_BYTES, 16#D00).
--define(GL_PACK_LSB_FIRST, 16#D01).
--define(GL_PACK_ROW_LENGTH, 16#D02).
--define(GL_PACK_SKIP_ROWS, 16#D03).
--define(GL_PACK_SKIP_PIXELS, 16#D04).
--define(GL_PACK_ALIGNMENT, 16#D05).
--define(GL_MAP_COLOR, 16#D10).
--define(GL_MAP_STENCIL, 16#D11).
--define(GL_INDEX_SHIFT, 16#D12).
--define(GL_INDEX_OFFSET, 16#D13).
--define(GL_RED_SCALE, 16#D14).
--define(GL_RED_BIAS, 16#D15).
--define(GL_ZOOM_X, 16#D16).
--define(GL_ZOOM_Y, 16#D17).
--define(GL_GREEN_SCALE, 16#D18).
--define(GL_GREEN_BIAS, 16#D19).
--define(GL_BLUE_SCALE, 16#D1A).
--define(GL_BLUE_BIAS, 16#D1B).
--define(GL_ALPHA_SCALE, 16#D1C).
--define(GL_ALPHA_BIAS, 16#D1D).
--define(GL_DEPTH_SCALE, 16#D1E).
--define(GL_DEPTH_BIAS, 16#D1F).
+-define(GL_BITMAP, 16#1A00).
+-define(GL_COLOR, 16#1800).
+-define(GL_DEPTH, 16#1801).
+-define(GL_STENCIL, 16#1802).
+-define(GL_DITHER, 16#BD0).
+-define(GL_RGB, 16#1907).
+-define(GL_RGBA, 16#1908).
+-define(GL_MAX_LIST_NESTING, 16#B31).
 -define(GL_MAX_EVAL_ORDER, 16#D30).
 -define(GL_MAX_LIGHTS, 16#D31).
 -define(GL_MAX_CLIP_PLANES, 16#D32).
@@ -300,19 +323,33 @@
 -define(GL_MAX_TEXTURE_STACK_DEPTH, 16#D39).
 -define(GL_MAX_VIEWPORT_DIMS, 16#D3A).
 -define(GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, 16#D3B).
--define(GL_SUBPIXEL_BITS, 16#D50).
--define(GL_INDEX_BITS, 16#D51).
--define(GL_RED_BITS, 16#D52).
--define(GL_GREEN_BITS, 16#D53).
--define(GL_BLUE_BITS, 16#D54).
--define(GL_ALPHA_BITS, 16#D55).
--define(GL_DEPTH_BITS, 16#D56).
--define(GL_STENCIL_BITS, 16#D57).
--define(GL_ACCUM_RED_BITS, 16#D58).
--define(GL_ACCUM_GREEN_BITS, 16#D59).
--define(GL_ACCUM_BLUE_BITS, 16#D5A).
--define(GL_ACCUM_ALPHA_BITS, 16#D5B).
+-define(GL_ATTRIB_STACK_DEPTH, 16#BB0).
+-define(GL_CLIENT_ATTRIB_STACK_DEPTH, 16#BB1).
+-define(GL_COLOR_CLEAR_VALUE, 16#C22).
+-define(GL_COLOR_WRITEMASK, 16#C23).
+-define(GL_CURRENT_INDEX, 16#B01).
+-define(GL_CURRENT_COLOR, 16#B00).
+-define(GL_CURRENT_NORMAL, 16#B02).
+-define(GL_CURRENT_RASTER_COLOR, 16#B04).
+-define(GL_CURRENT_RASTER_DISTANCE, 16#B09).
+-define(GL_CURRENT_RASTER_INDEX, 16#B05).
+-define(GL_CURRENT_RASTER_POSITION, 16#B07).
+-define(GL_CURRENT_RASTER_TEXTURE_COORDS, 16#B06).
+-define(GL_CURRENT_RASTER_POSITION_VALID, 16#B08).
+-define(GL_CURRENT_TEXTURE_COORDS, 16#B03).
+-define(GL_INDEX_CLEAR_VALUE, 16#C20).
+-define(GL_INDEX_MODE, 16#C30).
+-define(GL_INDEX_WRITEMASK, 16#C21).
+-define(GL_MODELVIEW_MATRIX, 16#BA6).
+-define(GL_MODELVIEW_STACK_DEPTH, 16#BA3).
 -define(GL_NAME_STACK_DEPTH, 16#D70).
+-define(GL_PROJECTION_MATRIX, 16#BA7).
+-define(GL_PROJECTION_STACK_DEPTH, 16#BA4).
+-define(GL_RENDER_MODE, 16#C40).
+-define(GL_RGBA_MODE, 16#C31).
+-define(GL_TEXTURE_MATRIX, 16#BA8).
+-define(GL_TEXTURE_STACK_DEPTH, 16#BA5).
+-define(GL_VIEWPORT, 16#BA2).
 -define(GL_AUTO_NORMAL, 16#D80).
 -define(GL_MAP1_COLOR_4, 16#D90).
 -define(GL_MAP1_INDEX, 16#D91).
@@ -336,166 +373,149 @@
 -define(GL_MAP1_GRID_SEGMENTS, 16#DD1).
 -define(GL_MAP2_GRID_DOMAIN, 16#DD2).
 -define(GL_MAP2_GRID_SEGMENTS, 16#DD3).
+-define(GL_COEFF, 16#A00).
+-define(GL_ORDER, 16#A01).
+-define(GL_DOMAIN, 16#A02).
+-define(GL_PERSPECTIVE_CORRECTION_HINT, 16#C50).
+-define(GL_POINT_SMOOTH_HINT, 16#C51).
+-define(GL_LINE_SMOOTH_HINT, 16#C52).
+-define(GL_POLYGON_SMOOTH_HINT, 16#C53).
+-define(GL_FOG_HINT, 16#C54).
+-define(GL_DONT_CARE, 16#1100).
+-define(GL_FASTEST, 16#1101).
+-define(GL_NICEST, 16#1102).
+-define(GL_SCISSOR_BOX, 16#C10).
+-define(GL_SCISSOR_TEST, 16#C11).
+-define(GL_MAP_COLOR, 16#D10).
+-define(GL_MAP_STENCIL, 16#D11).
+-define(GL_INDEX_SHIFT, 16#D12).
+-define(GL_INDEX_OFFSET, 16#D13).
+-define(GL_RED_SCALE, 16#D14).
+-define(GL_RED_BIAS, 16#D15).
+-define(GL_GREEN_SCALE, 16#D18).
+-define(GL_GREEN_BIAS, 16#D19).
+-define(GL_BLUE_SCALE, 16#D1A).
+-define(GL_BLUE_BIAS, 16#D1B).
+-define(GL_ALPHA_SCALE, 16#D1C).
+-define(GL_ALPHA_BIAS, 16#D1D).
+-define(GL_DEPTH_SCALE, 16#D1E).
+-define(GL_DEPTH_BIAS, 16#D1F).
+-define(GL_PIXEL_MAP_S_TO_S_SIZE, 16#CB1).
+-define(GL_PIXEL_MAP_I_TO_I_SIZE, 16#CB0).
+-define(GL_PIXEL_MAP_I_TO_R_SIZE, 16#CB2).
+-define(GL_PIXEL_MAP_I_TO_G_SIZE, 16#CB3).
+-define(GL_PIXEL_MAP_I_TO_B_SIZE, 16#CB4).
+-define(GL_PIXEL_MAP_I_TO_A_SIZE, 16#CB5).
+-define(GL_PIXEL_MAP_R_TO_R_SIZE, 16#CB6).
+-define(GL_PIXEL_MAP_G_TO_G_SIZE, 16#CB7).
+-define(GL_PIXEL_MAP_B_TO_B_SIZE, 16#CB8).
+-define(GL_PIXEL_MAP_A_TO_A_SIZE, 16#CB9).
+-define(GL_PIXEL_MAP_S_TO_S, 16#C71).
+-define(GL_PIXEL_MAP_I_TO_I, 16#C70).
+-define(GL_PIXEL_MAP_I_TO_R, 16#C72).
+-define(GL_PIXEL_MAP_I_TO_G, 16#C73).
+-define(GL_PIXEL_MAP_I_TO_B, 16#C74).
+-define(GL_PIXEL_MAP_I_TO_A, 16#C75).
+-define(GL_PIXEL_MAP_R_TO_R, 16#C76).
+-define(GL_PIXEL_MAP_G_TO_G, 16#C77).
+-define(GL_PIXEL_MAP_B_TO_B, 16#C78).
+-define(GL_PIXEL_MAP_A_TO_A, 16#C79).
+-define(GL_PACK_ALIGNMENT, 16#D05).
+-define(GL_PACK_LSB_FIRST, 16#D01).
+-define(GL_PACK_ROW_LENGTH, 16#D02).
+-define(GL_PACK_SKIP_PIXELS, 16#D04).
+-define(GL_PACK_SKIP_ROWS, 16#D03).
+-define(GL_PACK_SWAP_BYTES, 16#D00).
+-define(GL_UNPACK_ALIGNMENT, 16#CF5).
+-define(GL_UNPACK_LSB_FIRST, 16#CF1).
+-define(GL_UNPACK_ROW_LENGTH, 16#CF2).
+-define(GL_UNPACK_SKIP_PIXELS, 16#CF4).
+-define(GL_UNPACK_SKIP_ROWS, 16#CF3).
+-define(GL_UNPACK_SWAP_BYTES, 16#CF0).
+-define(GL_ZOOM_X, 16#D16).
+-define(GL_ZOOM_Y, 16#D17).
+-define(GL_TEXTURE_ENV, 16#2300).
+-define(GL_TEXTURE_ENV_MODE, 16#2200).
 -define(GL_TEXTURE_1D, 16#DE0).
 -define(GL_TEXTURE_2D, 16#DE1).
--define(GL_FEEDBACK_BUFFER_POINTER, 16#DF0).
--define(GL_FEEDBACK_BUFFER_SIZE, 16#DF1).
--define(GL_FEEDBACK_BUFFER_TYPE, 16#DF2).
--define(GL_SELECTION_BUFFER_POINTER, 16#DF3).
--define(GL_SELECTION_BUFFER_SIZE, 16#DF4).
--define(GL_POLYGON_OFFSET_UNITS, 16#2A00).
--define(GL_POLYGON_OFFSET_POINT, 16#2A01).
--define(GL_POLYGON_OFFSET_LINE, 16#2A02).
--define(GL_POLYGON_OFFSET_FILL, 16#8037).
--define(GL_POLYGON_OFFSET_FACTOR, 16#8038).
--define(GL_TEXTURE_BINDING_1D, 16#8068).
--define(GL_TEXTURE_BINDING_2D, 16#8069).
--define(GL_TEXTURE_BINDING_3D, 16#806A).
--define(GL_VERTEX_ARRAY, 16#8074).
--define(GL_NORMAL_ARRAY, 16#8075).
--define(GL_COLOR_ARRAY, 16#8076).
--define(GL_INDEX_ARRAY, 16#8077).
--define(GL_TEXTURE_COORD_ARRAY, 16#8078).
--define(GL_EDGE_FLAG_ARRAY, 16#8079).
--define(GL_VERTEX_ARRAY_SIZE, 16#807A).
--define(GL_VERTEX_ARRAY_TYPE, 16#807B).
--define(GL_VERTEX_ARRAY_STRIDE, 16#807C).
--define(GL_NORMAL_ARRAY_TYPE, 16#807E).
--define(GL_NORMAL_ARRAY_STRIDE, 16#807F).
--define(GL_COLOR_ARRAY_SIZE, 16#8081).
--define(GL_COLOR_ARRAY_TYPE, 16#8082).
--define(GL_COLOR_ARRAY_STRIDE, 16#8083).
--define(GL_INDEX_ARRAY_TYPE, 16#8085).
--define(GL_INDEX_ARRAY_STRIDE, 16#8086).
--define(GL_TEXTURE_COORD_ARRAY_SIZE, 16#8088).
--define(GL_TEXTURE_COORD_ARRAY_TYPE, 16#8089).
--define(GL_TEXTURE_COORD_ARRAY_STRIDE, 16#808A).
--define(GL_EDGE_FLAG_ARRAY_STRIDE, 16#808C).
+-define(GL_TEXTURE_WRAP_S, 16#2802).
+-define(GL_TEXTURE_WRAP_T, 16#2803).
+-define(GL_TEXTURE_MAG_FILTER, 16#2800).
+-define(GL_TEXTURE_MIN_FILTER, 16#2801).
+-define(GL_TEXTURE_ENV_COLOR, 16#2201).
+-define(GL_TEXTURE_GEN_S, 16#C60).
+-define(GL_TEXTURE_GEN_T, 16#C61).
+-define(GL_TEXTURE_GEN_MODE, 16#2500).
+-define(GL_TEXTURE_BORDER_COLOR, 16#1004).
 -define(GL_TEXTURE_WIDTH, 16#1000).
 -define(GL_TEXTURE_HEIGHT, 16#1001).
--define(GL_TEXTURE_INTERNAL_FORMAT, 16#1003).
--define(GL_TEXTURE_COMPONENTS, ?GL_TEXTURE_INTERNAL_FORMAT).
--define(GL_TEXTURE_BORDER_COLOR, 16#1004).
 -define(GL_TEXTURE_BORDER, 16#1005).
+-define(GL_TEXTURE_COMPONENTS, 16#1003).
 -define(GL_TEXTURE_RED_SIZE, 16#805C).
 -define(GL_TEXTURE_GREEN_SIZE, 16#805D).
 -define(GL_TEXTURE_BLUE_SIZE, 16#805E).
 -define(GL_TEXTURE_ALPHA_SIZE, 16#805F).
 -define(GL_TEXTURE_LUMINANCE_SIZE, 16#8060).
 -define(GL_TEXTURE_INTENSITY_SIZE, 16#8061).
--define(GL_TEXTURE_PRIORITY, 16#8066).
--define(GL_TEXTURE_RESIDENT, 16#8067).
--define(GL_DONT_CARE, 16#1100).
--define(GL_FASTEST, 16#1101).
--define(GL_NICEST, 16#1102).
--define(GL_AMBIENT, 16#1200).
--define(GL_DIFFUSE, 16#1201).
--define(GL_SPECULAR, 16#1202).
--define(GL_POSITION, 16#1203).
--define(GL_SPOT_DIRECTION, 16#1204).
--define(GL_SPOT_EXPONENT, 16#1205).
--define(GL_SPOT_CUTOFF, 16#1206).
--define(GL_CONSTANT_ATTENUATION, 16#1207).
--define(GL_LINEAR_ATTENUATION, 16#1208).
--define(GL_QUADRATIC_ATTENUATION, 16#1209).
--define(GL_COMPILE, 16#1300).
--define(GL_COMPILE_AND_EXECUTE, 16#1301).
--define(GL_BYTE, 16#1400).
--define(GL_UNSIGNED_BYTE, 16#1401).
--define(GL_SHORT, 16#1402).
--define(GL_UNSIGNED_SHORT, 16#1403).
--define(GL_INT, 16#1404).
--define(GL_UNSIGNED_INT, 16#1405).
--define(GL_FLOAT, 16#1406).
--define(GL_2_BYTES, 16#1407).
--define(GL_3_BYTES, 16#1408).
--define(GL_4_BYTES, 16#1409).
--define(GL_DOUBLE, 16#140A).
--define(GL_DOUBLE_EXT, 16#140A).
--define(GL_CLEAR, 16#1500).
--define(GL_AND, 16#1501).
--define(GL_AND_REVERSE, 16#1502).
--define(GL_COPY, 16#1503).
--define(GL_AND_INVERTED, 16#1504).
--define(GL_NOOP, 16#1505).
--define(GL_XOR, 16#1506).
--define(GL_OR, 16#1507).
--define(GL_NOR, 16#1508).
--define(GL_EQUIV, 16#1509).
--define(GL_INVERT, 16#150A).
--define(GL_OR_REVERSE, 16#150B).
--define(GL_COPY_INVERTED, 16#150C).
--define(GL_OR_INVERTED, 16#150D).
--define(GL_NAND, 16#150E).
--define(GL_SET, 16#150F).
--define(GL_EMISSION, 16#1600).
--define(GL_SHININESS, 16#1601).
--define(GL_AMBIENT_AND_DIFFUSE, 16#1602).
--define(GL_COLOR_INDEXES, 16#1603).
--define(GL_MODELVIEW, 16#1700).
--define(GL_PROJECTION, 16#1701).
--define(GL_TEXTURE, 16#1702).
--define(GL_COLOR, 16#1800).
--define(GL_DEPTH, 16#1801).
--define(GL_STENCIL, 16#1802).
--define(GL_COLOR_INDEX, 16#1900).
--define(GL_STENCIL_INDEX, 16#1901).
--define(GL_DEPTH_COMPONENT, 16#1902).
--define(GL_RED, 16#1903).
--define(GL_GREEN, 16#1904).
--define(GL_BLUE, 16#1905).
--define(GL_ALPHA, 16#1906).
--define(GL_RGB, 16#1907).
--define(GL_RGBA, 16#1908).
--define(GL_LUMINANCE, 16#1909).
--define(GL_LUMINANCE_ALPHA, 16#190A).
--define(GL_BITMAP, 16#1A00).
--define(GL_POINT, 16#1B00).
--define(GL_LINE, 16#1B01).
--define(GL_FILL, 16#1B02).
--define(GL_RENDER, 16#1C00).
--define(GL_FEEDBACK, 16#1C01).
--define(GL_SELECT, 16#1C02).
--define(GL_FLAT, 16#1D00).
--define(GL_SMOOTH, 16#1D01).
--define(GL_KEEP, 16#1E00).
--define(GL_REPLACE, 16#1E01).
--define(GL_INCR, 16#1E02).
--define(GL_DECR, 16#1E03).
--define(GL_VENDOR, 16#1F00).
--define(GL_RENDERER, 16#1F01).
--define(GL_VERSION, 16#1F02).
--define(GL_EXTENSIONS, 16#1F03).
--define(GL_S, 16#2000).
--define(GL_T, 16#2001).
--define(GL_R, 16#2002).
--define(GL_Q, 16#2003).
--define(GL_MODULATE, 16#2100).
--define(GL_DECAL, 16#2101).
--define(GL_TEXTURE_ENV_MODE, 16#2200).
--define(GL_TEXTURE_ENV_COLOR, 16#2201).
--define(GL_TEXTURE_ENV, 16#2300).
--define(GL_EYE_LINEAR, 16#2400).
+-define(GL_NEAREST_MIPMAP_NEAREST, 16#2700).
+-define(GL_NEAREST_MIPMAP_LINEAR, 16#2702).
+-define(GL_LINEAR_MIPMAP_NEAREST, 16#2701).
+-define(GL_LINEAR_MIPMAP_LINEAR, 16#2703).
 -define(GL_OBJECT_LINEAR, 16#2401).
--define(GL_SPHERE_MAP, 16#2402).
--define(GL_TEXTURE_GEN_MODE, 16#2500).
 -define(GL_OBJECT_PLANE, 16#2501).
+-define(GL_EYE_LINEAR, 16#2400).
 -define(GL_EYE_PLANE, 16#2502).
+-define(GL_SPHERE_MAP, 16#2402).
+-define(GL_DECAL, 16#2101).
+-define(GL_MODULATE, 16#2100).
 -define(GL_NEAREST, 16#2600).
--define(GL_LINEAR, 16#2601).
--define(GL_NEAREST_MIPMAP_NEAREST, 16#2700).
--define(GL_LINEAR_MIPMAP_NEAREST, 16#2701).
--define(GL_NEAREST_MIPMAP_LINEAR, 16#2702).
--define(GL_LINEAR_MIPMAP_LINEAR, 16#2703).
--define(GL_TEXTURE_MAG_FILTER, 16#2800).
--define(GL_TEXTURE_MIN_FILTER, 16#2801).
--define(GL_TEXTURE_WRAP_S, 16#2802).
--define(GL_TEXTURE_WRAP_T, 16#2803).
+-define(GL_REPEAT, 16#2901).
+-define(GL_CLAMP, 16#2900).
+-define(GL_S, 16#2000).
+-define(GL_T, 16#2001).
+-define(GL_R, 16#2002).
+-define(GL_Q, 16#2003).
+-define(GL_TEXTURE_GEN_R, 16#C62).
+-define(GL_TEXTURE_GEN_Q, 16#C63).
+-define(GL_VENDOR, 16#1F00).
+-define(GL_RENDERER, 16#1F01).
+-define(GL_VERSION, 16#1F02).
+-define(GL_EXTENSIONS, 16#1F03).
+-define(GL_NO_ERROR, 16#0).
+-define(GL_INVALID_ENUM, 16#500).
+-define(GL_INVALID_VALUE, 16#501).
+-define(GL_INVALID_OPERATION, 16#502).
+-define(GL_STACK_OVERFLOW, 16#503).
+-define(GL_STACK_UNDERFLOW, 16#504).
+-define(GL_OUT_OF_MEMORY, 16#505).
+-define(GL_CURRENT_BIT, 16#1).
+-define(GL_POINT_BIT, 16#2).
+-define(GL_LINE_BIT, 16#4).
+-define(GL_POLYGON_BIT, 16#8).
+-define(GL_POLYGON_STIPPLE_BIT, 16#10).
+-define(GL_PIXEL_MODE_BIT, 16#20).
+-define(GL_LIGHTING_BIT, 16#40).
+-define(GL_FOG_BIT, 16#80).
+-define(GL_DEPTH_BUFFER_BIT, 16#100).
+-define(GL_ACCUM_BUFFER_BIT, 16#200).
+-define(GL_STENCIL_BUFFER_BIT, 16#400).
+-define(GL_VIEWPORT_BIT, 16#800).
+-define(GL_TRANSFORM_BIT, 16#1000).
+-define(GL_ENABLE_BIT, 16#2000).
+-define(GL_COLOR_BUFFER_BIT, 16#4000).
+-define(GL_HINT_BIT, 16#8000).
+-define(GL_EVAL_BIT, 16#10000).
+-define(GL_LIST_BIT, 16#20000).
+-define(GL_TEXTURE_BIT, 16#40000).
+-define(GL_SCISSOR_BIT, 16#80000).
+-define(GL_ALL_ATTRIB_BITS, 16#FFFFF).
 -define(GL_PROXY_TEXTURE_1D, 16#8063).
 -define(GL_PROXY_TEXTURE_2D, 16#8064).
--define(GL_CLAMP, 16#2900).
--define(GL_REPEAT, 16#2901).
--define(GL_R3_G3_B2, 16#2A10).
+-define(GL_TEXTURE_PRIORITY, 16#8066).
+-define(GL_TEXTURE_RESIDENT, 16#8067).
+-define(GL_TEXTURE_BINDING_1D, 16#8068).
+-define(GL_TEXTURE_BINDING_2D, 16#8069).
+-define(GL_TEXTURE_INTERNAL_FORMAT, 16#1003).
 -define(GL_ALPHA4, 16#803B).
 -define(GL_ALPHA8, 16#803C).
 -define(GL_ALPHA12, 16#803D).
@@ -515,6 +535,7 @@
 -define(GL_INTENSITY8, 16#804B).
 -define(GL_INTENSITY12, 16#804C).
 -define(GL_INTENSITY16, 16#804D).
+-define(GL_R3_G3_B2, 16#2A10).
 -define(GL_RGB4, 16#804F).
 -define(GL_RGB5, 16#8050).
 -define(GL_RGB8, 16#8051).
@@ -528,51 +549,14 @@
 -define(GL_RGB10_A2, 16#8059).
 -define(GL_RGBA12, 16#805A).
 -define(GL_RGBA16, 16#805B).
--define(GL_V2F, 16#2A20).
--define(GL_V3F, 16#2A21).
--define(GL_C4UB_V2F, 16#2A22).
--define(GL_C4UB_V3F, 16#2A23).
--define(GL_C3F_V3F, 16#2A24).
--define(GL_N3F_V3F, 16#2A25).
--define(GL_C4F_N3F_V3F, 16#2A26).
--define(GL_T2F_V3F, 16#2A27).
--define(GL_T4F_V4F, 16#2A28).
--define(GL_T2F_C4UB_V3F, 16#2A29).
--define(GL_T2F_C3F_V3F, 16#2A2A).
--define(GL_T2F_N3F_V3F, 16#2A2B).
--define(GL_T2F_C4F_N3F_V3F, 16#2A2C).
--define(GL_T4F_C4F_N3F_V4F, 16#2A2D).
--define(GL_CLIP_PLANE0, 16#3000).
--define(GL_CLIP_PLANE1, 16#3001).
--define(GL_CLIP_PLANE2, 16#3002).
--define(GL_CLIP_PLANE3, 16#3003).
--define(GL_CLIP_PLANE4, 16#3004).
--define(GL_CLIP_PLANE5, 16#3005).
--define(GL_LIGHT0, 16#4000).
--define(GL_LIGHT1, 16#4001).
--define(GL_LIGHT2, 16#4002).
--define(GL_LIGHT3, 16#4003).
--define(GL_LIGHT4, 16#4004).
--define(GL_LIGHT5, 16#4005).
--define(GL_LIGHT6, 16#4006).
--define(GL_LIGHT7, 16#4007).
--define(GL_ABGR_EXT, 16#8000).
--define(GL_FUNC_SUBTRACT_EXT, 16#800A).
--define(GL_FUNC_REVERSE_SUBTRACT_EXT, 16#800B).
--define(GL_UNSIGNED_BYTE_3_3_2_EXT, 16#8032).
--define(GL_UNSIGNED_SHORT_4_4_4_4_EXT, 16#8033).
--define(GL_UNSIGNED_SHORT_5_5_5_1_EXT, 16#8034).
--define(GL_UNSIGNED_INT_8_8_8_8_EXT, 16#8035).
--define(GL_UNSIGNED_INT_10_10_10_2_EXT, 16#8036).
--define(GL_PACK_SKIP_IMAGES, 16#806B).
--define(GL_PACK_IMAGE_HEIGHT, 16#806C).
--define(GL_UNPACK_SKIP_IMAGES, 16#806D).
--define(GL_UNPACK_IMAGE_HEIGHT, 16#806E).
--define(GL_TEXTURE_3D, 16#806F).
--define(GL_PROXY_TEXTURE_3D, 16#8070).
--define(GL_TEXTURE_DEPTH, 16#8071).
--define(GL_TEXTURE_WRAP_R, 16#8072).
--define(GL_MAX_3D_TEXTURE_SIZE, 16#8073).
+-define(GL_CLIENT_PIXEL_STORE_BIT, 16#1).
+-define(GL_CLIENT_VERTEX_ARRAY_BIT, 16#2).
+-define(GL_ALL_CLIENT_ATTRIB_BITS, 16#FFFFFFFF).
+-define(GL_CLIENT_ALL_ATTRIB_BITS, 16#FFFFFFFF).
+-define(GL_RESCALE_NORMAL, 16#803A).
+-define(GL_CLAMP_TO_EDGE, 16#812F).
+-define(GL_MAX_ELEMENTS_VERTICES, 16#80E8).
+-define(GL_MAX_ELEMENTS_INDICES, 16#80E9).
 -define(GL_BGR, 16#80E0).
 -define(GL_BGRA, 16#80E1).
 -define(GL_UNSIGNED_BYTE_3_3_2, 16#8032).
@@ -587,22 +571,104 @@
 -define(GL_UNSIGNED_INT_8_8_8_8_REV, 16#8367).
 -define(GL_UNSIGNED_INT_10_10_10_2, 16#8036).
 -define(GL_UNSIGNED_INT_2_10_10_10_REV, 16#8368).
--define(GL_RESCALE_NORMAL, 16#803A).
 -define(GL_LIGHT_MODEL_COLOR_CONTROL, 16#81F8).
 -define(GL_SINGLE_COLOR, 16#81F9).
 -define(GL_SEPARATE_SPECULAR_COLOR, 16#81FA).
--define(GL_CLAMP_TO_EDGE, 16#812F).
 -define(GL_TEXTURE_MIN_LOD, 16#813A).
 -define(GL_TEXTURE_MAX_LOD, 16#813B).
 -define(GL_TEXTURE_BASE_LEVEL, 16#813C).
 -define(GL_TEXTURE_MAX_LEVEL, 16#813D).
--define(GL_MAX_ELEMENTS_VERTICES, 16#80E8).
--define(GL_MAX_ELEMENTS_INDICES, 16#80E9).
+-define(GL_SMOOTH_POINT_SIZE_RANGE, 16#B12).
+-define(GL_SMOOTH_POINT_SIZE_GRANULARITY, 16#B13).
+-define(GL_SMOOTH_LINE_WIDTH_RANGE, 16#B22).
+-define(GL_SMOOTH_LINE_WIDTH_GRANULARITY, 16#B23).
 -define(GL_ALIASED_POINT_SIZE_RANGE, 16#846D).
 -define(GL_ALIASED_LINE_WIDTH_RANGE, 16#846E).
--define(GL_ACTIVE_TEXTURE, 16#84E0).
--define(GL_CLIENT_ACTIVE_TEXTURE, 16#84E1).
--define(GL_MAX_TEXTURE_UNITS, 16#84E2).
+-define(GL_PACK_SKIP_IMAGES, 16#806B).
+-define(GL_PACK_IMAGE_HEIGHT, 16#806C).
+-define(GL_UNPACK_SKIP_IMAGES, 16#806D).
+-define(GL_UNPACK_IMAGE_HEIGHT, 16#806E).
+-define(GL_TEXTURE_3D, 16#806F).
+-define(GL_PROXY_TEXTURE_3D, 16#8070).
+-define(GL_TEXTURE_DEPTH, 16#8071).
+-define(GL_TEXTURE_WRAP_R, 16#8072).
+-define(GL_MAX_3D_TEXTURE_SIZE, 16#8073).
+-define(GL_TEXTURE_BINDING_3D, 16#806A).
+-define(GL_CONSTANT_COLOR, 16#8001).
+-define(GL_ONE_MINUS_CONSTANT_COLOR, 16#8002).
+-define(GL_CONSTANT_ALPHA, 16#8003).
+-define(GL_ONE_MINUS_CONSTANT_ALPHA, 16#8004).
+-define(GL_COLOR_TABLE, 16#80D0).
+-define(GL_POST_CONVOLUTION_COLOR_TABLE, 16#80D1).
+-define(GL_POST_COLOR_MATRIX_COLOR_TABLE, 16#80D2).
+-define(GL_PROXY_COLOR_TABLE, 16#80D3).
+-define(GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, 16#80D4).
+-define(GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE, 16#80D5).
+-define(GL_COLOR_TABLE_SCALE, 16#80D6).
+-define(GL_COLOR_TABLE_BIAS, 16#80D7).
+-define(GL_COLOR_TABLE_FORMAT, 16#80D8).
+-define(GL_COLOR_TABLE_WIDTH, 16#80D9).
+-define(GL_COLOR_TABLE_RED_SIZE, 16#80DA).
+-define(GL_COLOR_TABLE_GREEN_SIZE, 16#80DB).
+-define(GL_COLOR_TABLE_BLUE_SIZE, 16#80DC).
+-define(GL_COLOR_TABLE_ALPHA_SIZE, 16#80DD).
+-define(GL_COLOR_TABLE_LUMINANCE_SIZE, 16#80DE).
+-define(GL_COLOR_TABLE_INTENSITY_SIZE, 16#80DF).
+-define(GL_CONVOLUTION_1D, 16#8010).
+-define(GL_CONVOLUTION_2D, 16#8011).
+-define(GL_SEPARABLE_2D, 16#8012).
+-define(GL_CONVOLUTION_BORDER_MODE, 16#8013).
+-define(GL_CONVOLUTION_FILTER_SCALE, 16#8014).
+-define(GL_CONVOLUTION_FILTER_BIAS, 16#8015).
+-define(GL_REDUCE, 16#8016).
+-define(GL_CONVOLUTION_FORMAT, 16#8017).
+-define(GL_CONVOLUTION_WIDTH, 16#8018).
+-define(GL_CONVOLUTION_HEIGHT, 16#8019).
+-define(GL_MAX_CONVOLUTION_WIDTH, 16#801A).
+-define(GL_MAX_CONVOLUTION_HEIGHT, 16#801B).
+-define(GL_POST_CONVOLUTION_RED_SCALE, 16#801C).
+-define(GL_POST_CONVOLUTION_GREEN_SCALE, 16#801D).
+-define(GL_POST_CONVOLUTION_BLUE_SCALE, 16#801E).
+-define(GL_POST_CONVOLUTION_ALPHA_SCALE, 16#801F).
+-define(GL_POST_CONVOLUTION_RED_BIAS, 16#8020).
+-define(GL_POST_CONVOLUTION_GREEN_BIAS, 16#8021).
+-define(GL_POST_CONVOLUTION_BLUE_BIAS, 16#8022).
+-define(GL_POST_CONVOLUTION_ALPHA_BIAS, 16#8023).
+-define(GL_CONSTANT_BORDER, 16#8151).
+-define(GL_REPLICATE_BORDER, 16#8153).
+-define(GL_CONVOLUTION_BORDER_COLOR, 16#8154).
+-define(GL_COLOR_MATRIX, 16#80B1).
+-define(GL_COLOR_MATRIX_STACK_DEPTH, 16#80B2).
+-define(GL_MAX_COLOR_MATRIX_STACK_DEPTH, 16#80B3).
+-define(GL_POST_COLOR_MATRIX_RED_SCALE, 16#80B4).
+-define(GL_POST_COLOR_MATRIX_GREEN_SCALE, 16#80B5).
+-define(GL_POST_COLOR_MATRIX_BLUE_SCALE, 16#80B6).
+-define(GL_POST_COLOR_MATRIX_ALPHA_SCALE, 16#80B7).
+-define(GL_POST_COLOR_MATRIX_RED_BIAS, 16#80B8).
+-define(GL_POST_COLOR_MATRIX_GREEN_BIAS, 16#80B9).
+-define(GL_POST_COLOR_MATRIX_BLUE_BIAS, 16#80BA).
+-define(GL_POST_COLOR_MATRIX_ALPHA_BIAS, 16#80BB).
+-define(GL_HISTOGRAM, 16#8024).
+-define(GL_PROXY_HISTOGRAM, 16#8025).
+-define(GL_HISTOGRAM_WIDTH, 16#8026).
+-define(GL_HISTOGRAM_FORMAT, 16#8027).
+-define(GL_HISTOGRAM_RED_SIZE, 16#8028).
+-define(GL_HISTOGRAM_GREEN_SIZE, 16#8029).
+-define(GL_HISTOGRAM_BLUE_SIZE, 16#802A).
+-define(GL_HISTOGRAM_ALPHA_SIZE, 16#802B).
+-define(GL_HISTOGRAM_LUMINANCE_SIZE, 16#802C).
+-define(GL_HISTOGRAM_SINK, 16#802D).
+-define(GL_MINMAX, 16#802E).
+-define(GL_MINMAX_FORMAT, 16#802F).
+-define(GL_MINMAX_SINK, 16#8030).
+-define(GL_TABLE_TOO_LARGE, 16#8031).
+-define(GL_BLEND_EQUATION, 16#8009).
+-define(GL_MIN, 16#8007).
+-define(GL_MAX, 16#8008).
+-define(GL_FUNC_ADD, 16#8006).
+-define(GL_FUNC_SUBTRACT, 16#800A).
+-define(GL_FUNC_REVERSE_SUBTRACT, 16#800B).
+-define(GL_BLEND_COLOR, 16#8005).
 -define(GL_TEXTURE0, 16#84C0).
 -define(GL_TEXTURE1, 16#84C1).
 -define(GL_TEXTURE2, 16#84C2).
@@ -635,6 +701,9 @@
 -define(GL_TEXTURE29, 16#84DD).
 -define(GL_TEXTURE30, 16#84DE).
 -define(GL_TEXTURE31, 16#84DF).
+-define(GL_ACTIVE_TEXTURE, 16#84E0).
+-define(GL_CLIENT_ACTIVE_TEXTURE, 16#84E1).
+-define(GL_MAX_TEXTURE_UNITS, 16#84E2).
 -define(GL_NORMAL_MAP, 16#8511).
 -define(GL_REFLECTION_MAP, 16#8512).
 -define(GL_TEXTURE_CUBE_MAP, 16#8513).
@@ -647,32 +716,6 @@
 -define(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 16#851A).
 -define(GL_PROXY_TEXTURE_CUBE_MAP, 16#851B).
 -define(GL_MAX_CUBE_MAP_TEXTURE_SIZE, 16#851C).
--define(GL_COMBINE, 16#8570).
--define(GL_COMBINE_RGB, 16#8571).
--define(GL_COMBINE_ALPHA, 16#8572).
--define(GL_RGB_SCALE, 16#8573).
--define(GL_ADD_SIGNED, 16#8574).
--define(GL_INTERPOLATE, 16#8575).
--define(GL_CONSTANT, 16#8576).
--define(GL_PRIMARY_COLOR, 16#8577).
--define(GL_PREVIOUS, 16#8578).
--define(GL_SOURCE0_RGB, 16#8580).
--define(GL_SOURCE1_RGB, 16#8581).
--define(GL_SOURCE2_RGB, 16#8582).
--define(GL_SOURCE0_ALPHA, 16#8588).
--define(GL_SOURCE1_ALPHA, 16#8589).
--define(GL_SOURCE2_ALPHA, 16#858A).
--define(GL_OPERAND0_RGB, 16#8590).
--define(GL_OPERAND1_RGB, 16#8591).
--define(GL_OPERAND2_RGB, 16#8592).
--define(GL_OPERAND0_ALPHA, 16#8598).
--define(GL_OPERAND1_ALPHA, 16#8599).
--define(GL_OPERAND2_ALPHA, 16#859A).
--define(GL_SUBTRACT, 16#84E7).
--define(GL_TRANSPOSE_MODELVIEW_MATRIX, 16#84E3).
--define(GL_TRANSPOSE_PROJECTION_MATRIX, 16#84E4).
--define(GL_TRANSPOSE_TEXTURE_MATRIX, 16#84E5).
--define(GL_TRANSPOSE_COLOR_MATRIX, 16#84E6).
 -define(GL_COMPRESSED_ALPHA, 16#84E9).
 -define(GL_COMPRESSED_LUMINANCE, 16#84EA).
 -define(GL_COMPRESSED_LUMINANCE_ALPHA, 16#84EB).
@@ -684,9 +727,6 @@
 -define(GL_TEXTURE_COMPRESSED, 16#86A1).
 -define(GL_NUM_COMPRESSED_TEXTURE_FORMATS, 16#86A2).
 -define(GL_COMPRESSED_TEXTURE_FORMATS, 16#86A3).
--define(GL_DOT3_RGB, 16#86AE).
--define(GL_DOT3_RGBA, 16#86AF).
--define(GL_CLAMP_TO_BORDER, 16#812D).
 -define(GL_MULTISAMPLE, 16#809D).
 -define(GL_SAMPLE_ALPHA_TO_COVERAGE, 16#809E).
 -define(GL_SAMPLE_ALPHA_TO_ONE, 16#809F).
@@ -696,57 +736,120 @@
 -define(GL_SAMPLE_COVERAGE_VALUE, 16#80AA).
 -define(GL_SAMPLE_COVERAGE_INVERT, 16#80AB).
 -define(GL_MULTISAMPLE_BIT, 16#20000000).
--define(GL_VERTEX_ARRAY_EXT, 16#8074).
--define(GL_NORMAL_ARRAY_EXT, 16#8075).
--define(GL_COLOR_ARRAY_EXT, 16#8076).
--define(GL_INDEX_ARRAY_EXT, 16#8077).
--define(GL_TEXTURE_COORD_ARRAY_EXT, 16#8078).
--define(GL_EDGE_FLAG_ARRAY_EXT, 16#8079).
--define(GL_VERTEX_ARRAY_SIZE_EXT, 16#807A).
--define(GL_VERTEX_ARRAY_TYPE_EXT, 16#807B).
--define(GL_VERTEX_ARRAY_STRIDE_EXT, 16#807C).
--define(GL_VERTEX_ARRAY_COUNT_EXT, 16#807D).
--define(GL_NORMAL_ARRAY_TYPE_EXT, 16#807E).
--define(GL_NORMAL_ARRAY_STRIDE_EXT, 16#807F).
--define(GL_NORMAL_ARRAY_COUNT_EXT, 16#8080).
--define(GL_COLOR_ARRAY_SIZE_EXT, 16#8081).
--define(GL_COLOR_ARRAY_TYPE_EXT, 16#8082).
--define(GL_COLOR_ARRAY_STRIDE_EXT, 16#8083).
--define(GL_COLOR_ARRAY_COUNT_EXT, 16#8084).
--define(GL_INDEX_ARRAY_TYPE_EXT, 16#8085).
--define(GL_INDEX_ARRAY_STRIDE_EXT, 16#8086).
--define(GL_INDEX_ARRAY_COUNT_EXT, 16#8087).
--define(GL_TEXTURE_COORD_ARRAY_SIZE_EXT, 16#8088).
--define(GL_TEXTURE_COORD_ARRAY_TYPE_EXT, 16#8089).
--define(GL_TEXTURE_COORD_ARRAY_STRIDE_EXT, 16#808A).
--define(GL_TEXTURE_COORD_ARRAY_COUNT_EXT, 16#808B).
--define(GL_EDGE_FLAG_ARRAY_STRIDE_EXT, 16#808C).
--define(GL_EDGE_FLAG_ARRAY_COUNT_EXT, 16#808D).
--define(GL_VERTEX_ARRAY_POINTER_EXT, 16#808E).
--define(GL_NORMAL_ARRAY_POINTER_EXT, 16#808F).
--define(GL_COLOR_ARRAY_POINTER_EXT, 16#8090).
--define(GL_INDEX_ARRAY_POINTER_EXT, 16#8091).
--define(GL_TEXTURE_COORD_ARRAY_POINTER_EXT, 16#8092).
--define(GL_EDGE_FLAG_ARRAY_POINTER_EXT, 16#8093).
--define(GL_TEXTURE_MIN_LOD_SGIS, 16#813A).
--define(GL_TEXTURE_MAX_LOD_SGIS, 16#813B).
--define(GL_TEXTURE_BASE_LEVEL_SGIS, 16#813C).
--define(GL_TEXTURE_MAX_LEVEL_SGIS, 16#813D).
--define(GL_SHARED_TEXTURE_PALETTE_EXT, 16#81FB).
--define(GL_RESCALE_NORMAL_EXT, 16#803A).
--define(GL_TEXTURE_COMPARE_SGIX, 16#819A).
--define(GL_TEXTURE_COMPARE_OPERATOR_SGIX, 16#819B).
--define(GL_TEXTURE_LEQUAL_R_SGIX, 16#819C).
--define(GL_TEXTURE_GEQUAL_R_SGIX, 16#819D).
--define(GL_DEPTH_COMPONENT16_SGIX, 16#81A5).
--define(GL_DEPTH_COMPONENT24_SGIX, 16#81A6).
--define(GL_DEPTH_COMPONENT32_SGIX, 16#81A7).
--define(GL_GENERATE_MIPMAP_SGIS, 16#8191).
--define(GL_GENERATE_MIPMAP_HINT_SGIS, 16#8192).
+-define(GL_TRANSPOSE_MODELVIEW_MATRIX, 16#84E3).
+-define(GL_TRANSPOSE_PROJECTION_MATRIX, 16#84E4).
+-define(GL_TRANSPOSE_TEXTURE_MATRIX, 16#84E5).
+-define(GL_TRANSPOSE_COLOR_MATRIX, 16#84E6).
+-define(GL_COMBINE, 16#8570).
+-define(GL_COMBINE_RGB, 16#8571).
+-define(GL_COMBINE_ALPHA, 16#8572).
+-define(GL_SOURCE0_RGB, 16#8580).
+-define(GL_SOURCE1_RGB, 16#8581).
+-define(GL_SOURCE2_RGB, 16#8582).
+-define(GL_SOURCE0_ALPHA, 16#8588).
+-define(GL_SOURCE1_ALPHA, 16#8589).
+-define(GL_SOURCE2_ALPHA, 16#858A).
+-define(GL_OPERAND0_RGB, 16#8590).
+-define(GL_OPERAND1_RGB, 16#8591).
+-define(GL_OPERAND2_RGB, 16#8592).
+-define(GL_OPERAND0_ALPHA, 16#8598).
+-define(GL_OPERAND1_ALPHA, 16#8599).
+-define(GL_OPERAND2_ALPHA, 16#859A).
+-define(GL_RGB_SCALE, 16#8573).
+-define(GL_ADD_SIGNED, 16#8574).
+-define(GL_INTERPOLATE, 16#8575).
+-define(GL_SUBTRACT, 16#84E7).
+-define(GL_CONSTANT, 16#8576).
+-define(GL_PRIMARY_COLOR, 16#8577).
+-define(GL_PREVIOUS, 16#8578).
+-define(GL_DOT3_RGB, 16#86AE).
+-define(GL_DOT3_RGBA, 16#86AF).
+-define(GL_CLAMP_TO_BORDER, 16#812D).
+-define(GL_ARB_multitexture, 1).
+-define(GL_TEXTURE0_ARB, 16#84C0).
+-define(GL_TEXTURE1_ARB, 16#84C1).
+-define(GL_TEXTURE2_ARB, 16#84C2).
+-define(GL_TEXTURE3_ARB, 16#84C3).
+-define(GL_TEXTURE4_ARB, 16#84C4).
+-define(GL_TEXTURE5_ARB, 16#84C5).
+-define(GL_TEXTURE6_ARB, 16#84C6).
+-define(GL_TEXTURE7_ARB, 16#84C7).
+-define(GL_TEXTURE8_ARB, 16#84C8).
+-define(GL_TEXTURE9_ARB, 16#84C9).
+-define(GL_TEXTURE10_ARB, 16#84CA).
+-define(GL_TEXTURE11_ARB, 16#84CB).
+-define(GL_TEXTURE12_ARB, 16#84CC).
+-define(GL_TEXTURE13_ARB, 16#84CD).
+-define(GL_TEXTURE14_ARB, 16#84CE).
+-define(GL_TEXTURE15_ARB, 16#84CF).
+-define(GL_TEXTURE16_ARB, 16#84D0).
+-define(GL_TEXTURE17_ARB, 16#84D1).
+-define(GL_TEXTURE18_ARB, 16#84D2).
+-define(GL_TEXTURE19_ARB, 16#84D3).
+-define(GL_TEXTURE20_ARB, 16#84D4).
+-define(GL_TEXTURE21_ARB, 16#84D5).
+-define(GL_TEXTURE22_ARB, 16#84D6).
+-define(GL_TEXTURE23_ARB, 16#84D7).
+-define(GL_TEXTURE24_ARB, 16#84D8).
+-define(GL_TEXTURE25_ARB, 16#84D9).
+-define(GL_TEXTURE26_ARB, 16#84DA).
+-define(GL_TEXTURE27_ARB, 16#84DB).
+-define(GL_TEXTURE28_ARB, 16#84DC).
+-define(GL_TEXTURE29_ARB, 16#84DD).
+-define(GL_TEXTURE30_ARB, 16#84DE).
+-define(GL_TEXTURE31_ARB, 16#84DF).
+-define(GL_ACTIVE_TEXTURE_ARB, 16#84E0).
+-define(GL_CLIENT_ACTIVE_TEXTURE_ARB, 16#84E1).
+-define(GL_MAX_TEXTURE_UNITS_ARB, 16#84E2).
+-define(GL_MESA_packed_depth_stencil, 1).
+-define(GL_DEPTH_STENCIL_MESA, 16#8750).
+-define(GL_UNSIGNED_INT_24_8_MESA, 16#8751).
+-define(GL_UNSIGNED_INT_8_24_REV_MESA, 16#8752).
+-define(GL_UNSIGNED_SHORT_15_1_MESA, 16#8753).
+-define(GL_UNSIGNED_SHORT_1_15_REV_MESA, 16#8754).
+-define(GL_MESA_program_debug, 1).
+-define(GL_FRAGMENT_PROGRAM_POSITION_MESA, 16#8BB0).
+-define(GL_FRAGMENT_PROGRAM_CALLBACK_MESA, 16#8BB1).
+-define(GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA, 16#8BB2).
+-define(GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA, 16#8BB3).
+-define(GL_VERTEX_PROGRAM_POSITION_MESA, 16#8BB4).
+-define(GL_VERTEX_PROGRAM_CALLBACK_MESA, 16#8BB5).
+-define(GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA, 16#8BB6).
+-define(GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA, 16#8BB7).
+-define(GL_MESA_texture_array, 1).
+-define(GL_TEXTURE_1D_ARRAY_EXT, 16#8C18).
+-define(GL_PROXY_TEXTURE_1D_ARRAY_EXT, 16#8C19).
+-define(GL_TEXTURE_2D_ARRAY_EXT, 16#8C1A).
+-define(GL_PROXY_TEXTURE_2D_ARRAY_EXT, 16#8C1B).
+-define(GL_TEXTURE_BINDING_1D_ARRAY_EXT, 16#8C1C).
+-define(GL_TEXTURE_BINDING_2D_ARRAY_EXT, 16#8C1D).
+-define(GL_MAX_ARRAY_TEXTURE_LAYERS_EXT, 16#88FF).
+-define(GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT, 16#8CD4).
+-define(GL_ATI_blend_equation_separate, 1).
+-define(GL_ALPHA_BLEND_EQUATION_ATI, 16#883D).
+-define(GL_OES_EGL_image, 1).
+-define(GL_GLEXT_VERSION, 66).
+-define(GL_BLEND_DST_RGB, 16#80C8).
+-define(GL_BLEND_SRC_RGB, 16#80C9).
+-define(GL_BLEND_DST_ALPHA, 16#80CA).
+-define(GL_BLEND_SRC_ALPHA, 16#80CB).
+-define(GL_POINT_FADE_THRESHOLD_SIZE, 16#8128).
+-define(GL_DEPTH_COMPONENT16, 16#81A5).
+-define(GL_DEPTH_COMPONENT24, 16#81A6).
+-define(GL_DEPTH_COMPONENT32, 16#81A7).
+-define(GL_MIRRORED_REPEAT, 16#8370).
+-define(GL_MAX_TEXTURE_LOD_BIAS, 16#84FD).
+-define(GL_TEXTURE_LOD_BIAS, 16#8501).
+-define(GL_INCR_WRAP, 16#8507).
+-define(GL_DECR_WRAP, 16#8508).
+-define(GL_TEXTURE_DEPTH_SIZE, 16#884A).
+-define(GL_TEXTURE_COMPARE_MODE, 16#884C).
+-define(GL_TEXTURE_COMPARE_FUNC, 16#884D).
 -define(GL_POINT_SIZE_MIN, 16#8126).
 -define(GL_POINT_SIZE_MAX, 16#8127).
--define(GL_POINT_FADE_THRESHOLD_SIZE, 16#8128).
 -define(GL_POINT_DISTANCE_ATTENUATION, 16#8129).
+-define(GL_GENERATE_MIPMAP, 16#8191).
+-define(GL_GENERATE_MIPMAP_HINT, 16#8192).
 -define(GL_FOG_COORDINATE_SOURCE, 16#8450).
 -define(GL_FOG_COORDINATE, 16#8451).
 -define(GL_FRAGMENT_DEPTH, 16#8452).
@@ -762,101 +865,9 @@
 -define(GL_SECONDARY_COLOR_ARRAY_STRIDE, 16#845C).
 -define(GL_SECONDARY_COLOR_ARRAY_POINTER, 16#845D).
 -define(GL_SECONDARY_COLOR_ARRAY, 16#845E).
--define(GL_INCR_WRAP, 16#8507).
--define(GL_DECR_WRAP, 16#8508).
--define(GL_MAX_TEXTURE_LOD_BIAS, 16#84FD).
 -define(GL_TEXTURE_FILTER_CONTROL, 16#8500).
--define(GL_TEXTURE_LOD_BIAS, 16#8501).
--define(GL_GENERATE_MIPMAP, 16#8191).
--define(GL_GENERATE_MIPMAP_HINT, 16#8192).
--define(GL_BLEND_DST_RGB, 16#80C8).
--define(GL_BLEND_SRC_RGB, 16#80C9).
--define(GL_BLEND_DST_ALPHA, 16#80CA).
--define(GL_BLEND_SRC_ALPHA, 16#80CB).
--define(GL_MIRRORED_REPEAT, 16#8370).
--define(GL_DEPTH_COMPONENT16, 16#81A5).
--define(GL_DEPTH_COMPONENT24, 16#81A6).
--define(GL_DEPTH_COMPONENT32, 16#81A7).
--define(GL_TEXTURE_DEPTH_SIZE, 16#884A).
 -define(GL_DEPTH_TEXTURE_MODE, 16#884B).
--define(GL_TEXTURE_COMPARE_MODE, 16#884C).
--define(GL_TEXTURE_COMPARE_FUNC, 16#884D).
 -define(GL_COMPARE_R_TO_TEXTURE, 16#884E).
--define(GL_GLEXT_VERSION, 65).
--define(GL_CONSTANT_COLOR, 16#8001).
--define(GL_ONE_MINUS_CONSTANT_COLOR, 16#8002).
--define(GL_CONSTANT_ALPHA, 16#8003).
--define(GL_ONE_MINUS_CONSTANT_ALPHA, 16#8004).
--define(GL_BLEND_COLOR, 16#8005).
--define(GL_FUNC_ADD, 16#8006).
--define(GL_MIN, 16#8007).
--define(GL_MAX, 16#8008).
--define(GL_BLEND_EQUATION, 16#8009).
--define(GL_FUNC_SUBTRACT, 16#800A).
--define(GL_FUNC_REVERSE_SUBTRACT, 16#800B).
--define(GL_CONVOLUTION_1D, 16#8010).
--define(GL_CONVOLUTION_2D, 16#8011).
--define(GL_SEPARABLE_2D, 16#8012).
--define(GL_CONVOLUTION_BORDER_MODE, 16#8013).
--define(GL_CONVOLUTION_FILTER_SCALE, 16#8014).
--define(GL_CONVOLUTION_FILTER_BIAS, 16#8015).
--define(GL_REDUCE, 16#8016).
--define(GL_CONVOLUTION_FORMAT, 16#8017).
--define(GL_CONVOLUTION_WIDTH, 16#8018).
--define(GL_CONVOLUTION_HEIGHT, 16#8019).
--define(GL_MAX_CONVOLUTION_WIDTH, 16#801A).
--define(GL_MAX_CONVOLUTION_HEIGHT, 16#801B).
--define(GL_POST_CONVOLUTION_RED_SCALE, 16#801C).
--define(GL_POST_CONVOLUTION_GREEN_SCALE, 16#801D).
--define(GL_POST_CONVOLUTION_BLUE_SCALE, 16#801E).
--define(GL_POST_CONVOLUTION_ALPHA_SCALE, 16#801F).
--define(GL_POST_CONVOLUTION_RED_BIAS, 16#8020).
--define(GL_POST_CONVOLUTION_GREEN_BIAS, 16#8021).
--define(GL_POST_CONVOLUTION_BLUE_BIAS, 16#8022).
--define(GL_POST_CONVOLUTION_ALPHA_BIAS, 16#8023).
--define(GL_HISTOGRAM, 16#8024).
--define(GL_PROXY_HISTOGRAM, 16#8025).
--define(GL_HISTOGRAM_WIDTH, 16#8026).
--define(GL_HISTOGRAM_FORMAT, 16#8027).
--define(GL_HISTOGRAM_RED_SIZE, 16#8028).
--define(GL_HISTOGRAM_GREEN_SIZE, 16#8029).
--define(GL_HISTOGRAM_BLUE_SIZE, 16#802A).
--define(GL_HISTOGRAM_ALPHA_SIZE, 16#802B).
--define(GL_HISTOGRAM_LUMINANCE_SIZE, 16#802C).
--define(GL_HISTOGRAM_SINK, 16#802D).
--define(GL_MINMAX, 16#802E).
--define(GL_MINMAX_FORMAT, 16#802F).
--define(GL_MINMAX_SINK, 16#8030).
--define(GL_COLOR_MATRIX, 16#80B1).
--define(GL_COLOR_MATRIX_STACK_DEPTH, 16#80B2).
--define(GL_MAX_COLOR_MATRIX_STACK_DEPTH, 16#80B3).
--define(GL_POST_COLOR_MATRIX_RED_SCALE, 16#80B4).
--define(GL_POST_COLOR_MATRIX_GREEN_SCALE, 16#80B5).
--define(GL_POST_COLOR_MATRIX_BLUE_SCALE, 16#80B6).
--define(GL_POST_COLOR_MATRIX_ALPHA_SCALE, 16#80B7).
--define(GL_POST_COLOR_MATRIX_RED_BIAS, 16#80B8).
--define(GL_POST_COLOR_MATRIX_GREEN_BIAS, 16#80B9).
--define(GL_POST_COLOR_MATRIX_BLUE_BIAS, 16#80BA).
--define(GL_POST_COLOR_MATRIX_ALPHA_BIAS, 16#80BB).
--define(GL_COLOR_TABLE, 16#80D0).
--define(GL_POST_CONVOLUTION_COLOR_TABLE, 16#80D1).
--define(GL_POST_COLOR_MATRIX_COLOR_TABLE, 16#80D2).
--define(GL_PROXY_COLOR_TABLE, 16#80D3).
--define(GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, 16#80D4).
--define(GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE, 16#80D5).
--define(GL_COLOR_TABLE_SCALE, 16#80D6).
--define(GL_COLOR_TABLE_BIAS, 16#80D7).
--define(GL_COLOR_TABLE_FORMAT, 16#80D8).
--define(GL_COLOR_TABLE_WIDTH, 16#80D9).
--define(GL_COLOR_TABLE_RED_SIZE, 16#80DA).
--define(GL_COLOR_TABLE_GREEN_SIZE, 16#80DB).
--define(GL_COLOR_TABLE_BLUE_SIZE, 16#80DC).
--define(GL_COLOR_TABLE_ALPHA_SIZE, 16#80DD).
--define(GL_COLOR_TABLE_LUMINANCE_SIZE, 16#80DE).
--define(GL_COLOR_TABLE_INTENSITY_SIZE, 16#80DF).
--define(GL_CONSTANT_BORDER, 16#8151).
--define(GL_REPLICATE_BORDER, 16#8153).
--define(GL_CONVOLUTION_BORDER_COLOR, 16#8154).
 -define(GL_BUFFER_SIZE, 16#8764).
 -define(GL_BUFFER_USAGE, 16#8765).
 -define(GL_QUERY_COUNTER_BITS, 16#8864).
@@ -1184,41 +1195,6 @@
 -define(GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW, 16#900D).
 -define(GL_INT_SAMPLER_CUBE_MAP_ARRAY, 16#900E).
 -define(GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY, 16#900F).
--define(GL_TEXTURE0_ARB, 16#84C0).
--define(GL_TEXTURE1_ARB, 16#84C1).
--define(GL_TEXTURE2_ARB, 16#84C2).
--define(GL_TEXTURE3_ARB, 16#84C3).
--define(GL_TEXTURE4_ARB, 16#84C4).
--define(GL_TEXTURE5_ARB, 16#84C5).
--define(GL_TEXTURE6_ARB, 16#84C6).
--define(GL_TEXTURE7_ARB, 16#84C7).
--define(GL_TEXTURE8_ARB, 16#84C8).
--define(GL_TEXTURE9_ARB, 16#84C9).
--define(GL_TEXTURE10_ARB, 16#84CA).
--define(GL_TEXTURE11_ARB, 16#84CB).
--define(GL_TEXTURE12_ARB, 16#84CC).
--define(GL_TEXTURE13_ARB, 16#84CD).
--define(GL_TEXTURE14_ARB, 16#84CE).
--define(GL_TEXTURE15_ARB, 16#84CF).
--define(GL_TEXTURE16_ARB, 16#84D0).
--define(GL_TEXTURE17_ARB, 16#84D1).
--define(GL_TEXTURE18_ARB, 16#84D2).
--define(GL_TEXTURE19_ARB, 16#84D3).
--define(GL_TEXTURE20_ARB, 16#84D4).
--define(GL_TEXTURE21_ARB, 16#84D5).
--define(GL_TEXTURE22_ARB, 16#84D6).
--define(GL_TEXTURE23_ARB, 16#84D7).
--define(GL_TEXTURE24_ARB, 16#84D8).
--define(GL_TEXTURE25_ARB, 16#84D9).
--define(GL_TEXTURE26_ARB, 16#84DA).
--define(GL_TEXTURE27_ARB, 16#84DB).
--define(GL_TEXTURE28_ARB, 16#84DC).
--define(GL_TEXTURE29_ARB, 16#84DD).
--define(GL_TEXTURE30_ARB, 16#84DE).
--define(GL_TEXTURE31_ARB, 16#84DF).
--define(GL_ACTIVE_TEXTURE_ARB, 16#84E0).
--define(GL_CLIENT_ACTIVE_TEXTURE_ARB, 16#84E1).
--define(GL_MAX_TEXTURE_UNITS_ARB, 16#84E2).
 -define(GL_TRANSPOSE_MODELVIEW_MATRIX_ARB, 16#84E3).
 -define(GL_TRANSPOSE_PROJECTION_MATRIX_ARB, 16#84E4).
 -define(GL_TRANSPOSE_TEXTURE_MATRIX_ARB, 16#84E5).
@@ -1956,6 +1932,7 @@
 -define(GL_UNKNOWN_CONTEXT_RESET_ARB, 16#8255).
 -define(GL_RESET_NOTIFICATION_STRATEGY_ARB, 16#8256).
 -define(GL_NO_RESET_NOTIFICATION_ARB, 16#8261).
+-define(GL_ABGR_EXT, 16#8000).
 -define(GL_CONSTANT_COLOR_EXT, 16#8001).
 -define(GL_ONE_MINUS_CONSTANT_COLOR_EXT, 16#8002).
 -define(GL_CONSTANT_ALPHA_EXT, 16#8003).
@@ -2118,6 +2095,15 @@
 -define(GL_LINEAR_SHARPEN_ALPHA_SGIS, 16#80AE).
 -define(GL_LINEAR_SHARPEN_COLOR_SGIS, 16#80AF).
 -define(GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS, 16#80B0).
+-define(GL_UNSIGNED_BYTE_3_3_2_EXT, 16#8032).
+-define(GL_UNSIGNED_SHORT_4_4_4_4_EXT, 16#8033).
+-define(GL_UNSIGNED_SHORT_5_5_5_1_EXT, 16#8034).
+-define(GL_UNSIGNED_INT_8_8_8_8_EXT, 16#8035).
+-define(GL_UNSIGNED_INT_10_10_10_2_EXT, 16#8036).
+-define(GL_TEXTURE_MIN_LOD_SGIS, 16#813A).
+-define(GL_TEXTURE_MAX_LOD_SGIS, 16#813B).
+-define(GL_TEXTURE_BASE_LEVEL_SGIS, 16#813C).
+-define(GL_TEXTURE_MAX_LEVEL_SGIS, 16#813D).
 -define(GL_MULTISAMPLE_SGIS, 16#809D).
 -define(GL_SAMPLE_ALPHA_TO_MASK_SGIS, 16#809E).
 -define(GL_SAMPLE_ALPHA_TO_ONE_SGIS, 16#809F).
@@ -2134,6 +2120,41 @@
 -define(GL_SAMPLE_MASK_VALUE_SGIS, 16#80AA).
 -define(GL_SAMPLE_MASK_INVERT_SGIS, 16#80AB).
 -define(GL_SAMPLE_PATTERN_SGIS, 16#80AC).
+-define(GL_RESCALE_NORMAL_EXT, 16#803A).
+-define(GL_VERTEX_ARRAY_EXT, 16#8074).
+-define(GL_NORMAL_ARRAY_EXT, 16#8075).
+-define(GL_COLOR_ARRAY_EXT, 16#8076).
+-define(GL_INDEX_ARRAY_EXT, 16#8077).
+-define(GL_TEXTURE_COORD_ARRAY_EXT, 16#8078).
+-define(GL_EDGE_FLAG_ARRAY_EXT, 16#8079).
+-define(GL_VERTEX_ARRAY_SIZE_EXT, 16#807A).
+-define(GL_VERTEX_ARRAY_TYPE_EXT, 16#807B).
+-define(GL_VERTEX_ARRAY_STRIDE_EXT, 16#807C).
+-define(GL_VERTEX_ARRAY_COUNT_EXT, 16#807D).
+-define(GL_NORMAL_ARRAY_TYPE_EXT, 16#807E).
+-define(GL_NORMAL_ARRAY_STRIDE_EXT, 16#807F).
+-define(GL_NORMAL_ARRAY_COUNT_EXT, 16#8080).
+-define(GL_COLOR_ARRAY_SIZE_EXT, 16#8081).
+-define(GL_COLOR_ARRAY_TYPE_EXT, 16#8082).
+-define(GL_COLOR_ARRAY_STRIDE_EXT, 16#8083).
+-define(GL_COLOR_ARRAY_COUNT_EXT, 16#8084).
+-define(GL_INDEX_ARRAY_TYPE_EXT, 16#8085).
+-define(GL_INDEX_ARRAY_STRIDE_EXT, 16#8086).
+-define(GL_INDEX_ARRAY_COUNT_EXT, 16#8087).
+-define(GL_TEXTURE_COORD_ARRAY_SIZE_EXT, 16#8088).
+-define(GL_TEXTURE_COORD_ARRAY_TYPE_EXT, 16#8089).
+-define(GL_TEXTURE_COORD_ARRAY_STRIDE_EXT, 16#808A).
+-define(GL_TEXTURE_COORD_ARRAY_COUNT_EXT, 16#808B).
+-define(GL_EDGE_FLAG_ARRAY_STRIDE_EXT, 16#808C).
+-define(GL_EDGE_FLAG_ARRAY_COUNT_EXT, 16#808D).
+-define(GL_VERTEX_ARRAY_POINTER_EXT, 16#808E).
+-define(GL_NORMAL_ARRAY_POINTER_EXT, 16#808F).
+-define(GL_COLOR_ARRAY_POINTER_EXT, 16#8090).
+-define(GL_INDEX_ARRAY_POINTER_EXT, 16#8091).
+-define(GL_TEXTURE_COORD_ARRAY_POINTER_EXT, 16#8092).
+-define(GL_EDGE_FLAG_ARRAY_POINTER_EXT, 16#8093).
+-define(GL_GENERATE_MIPMAP_SGIS, 16#8191).
+-define(GL_GENERATE_MIPMAP_HINT_SGIS, 16#8192).
 -define(GL_LINEAR_CLIPMAP_LINEAR_SGIX, 16#8170).
 -define(GL_TEXTURE_CLIPMAP_CENTER_SGIX, 16#8171).
 -define(GL_TEXTURE_CLIPMAP_FRAME_SGIX, 16#8172).
@@ -2146,12 +2167,18 @@
 -define(GL_NEAREST_CLIPMAP_NEAREST_SGIX, 16#844D).
 -define(GL_NEAREST_CLIPMAP_LINEAR_SGIX, 16#844E).
 -define(GL_LINEAR_CLIPMAP_NEAREST_SGIX, 16#844F).
+-define(GL_TEXTURE_COMPARE_SGIX, 16#819A).
+-define(GL_TEXTURE_COMPARE_OPERATOR_SGIX, 16#819B).
+-define(GL_TEXTURE_LEQUAL_R_SGIX, 16#819C).
+-define(GL_TEXTURE_GEQUAL_R_SGIX, 16#819D).
 -define(GL_CLAMP_TO_EDGE_SGIS, 16#812F).
 -define(GL_CLAMP_TO_BORDER_SGIS, 16#812D).
 -define(GL_FUNC_ADD_EXT, 16#8006).
 -define(GL_MIN_EXT, 16#8007).
 -define(GL_MAX_EXT, 16#8008).
 -define(GL_BLEND_EQUATION_EXT, 16#8009).
+-define(GL_FUNC_SUBTRACT_EXT, 16#800A).
+-define(GL_FUNC_REVERSE_SUBTRACT_EXT, 16#800B).
 -define(GL_INTERLACE_SGIX, 16#8094).
 -define(GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX, 16#813E).
 -define(GL_PIXEL_TILE_CACHE_INCREMENT_SGIX, 16#813F).
@@ -2216,6 +2243,9 @@
 -define(GL_MAX_DEFORMATION_ORDER_SGIX, 16#8197).
 -define(GL_REFERENCE_PLANE_SGIX, 16#817D).
 -define(GL_REFERENCE_PLANE_EQUATION_SGIX, 16#817E).
+-define(GL_DEPTH_COMPONENT16_SGIX, 16#81A5).
+-define(GL_DEPTH_COMPONENT24_SGIX, 16#81A6).
+-define(GL_DEPTH_COMPONENT32_SGIX, 16#81A7).
 -define(GL_FOG_FUNC_SGIS, 16#812A).
 -define(GL_FOG_FUNC_POINTS_SGIS, 16#812B).
 -define(GL_MAX_FOG_FUNC_POINTS_SGIS, 16#812C).
@@ -2393,6 +2423,7 @@
 -define(GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT, 16#8336).
 -define(GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT, 16#8337).
 -define(GL_PIXEL_TRANSFORM_2D_MATRIX_EXT, 16#8338).
+-define(GL_SHARED_TEXTURE_PALETTE_EXT, 16#81FB).
 -define(GL_LIGHT_MODEL_COLOR_CONTROL_EXT, 16#81F8).
 -define(GL_SINGLE_COLOR_EXT, 16#81F9).
 -define(GL_SEPARATE_SPECULAR_COLOR_EXT, 16#81FA).
@@ -3387,7 +3418,6 @@
 -define(GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT, 16#8DA7).
 -define(GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT, 16#8DA8).
 -define(GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT, 16#8DA9).
--define(GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT, 16#8CD4).
 -define(GL_PROGRAM_POINT_SIZE_EXT, 16#8642).
 -define(GL_GEOMETRY_SHADER_EXT, 16#8DD9).
 -define(GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT, 16#8DDD).
@@ -3425,13 +3455,6 @@
 -define(GL_R11F_G11F_B10F_EXT, 16#8C3A).
 -define(GL_UNSIGNED_INT_10F_11F_11F_REV_EXT, 16#8C3B).
 -define(GL_RGBA_SIGNED_COMPONENTS_EXT, 16#8C3C).
--define(GL_TEXTURE_1D_ARRAY_EXT, 16#8C18).
--define(GL_PROXY_TEXTURE_1D_ARRAY_EXT, 16#8C19).
--define(GL_TEXTURE_2D_ARRAY_EXT, 16#8C1A).
--define(GL_PROXY_TEXTURE_2D_ARRAY_EXT, 16#8C1B).
--define(GL_TEXTURE_BINDING_1D_ARRAY_EXT, 16#8C1C).
--define(GL_TEXTURE_BINDING_2D_ARRAY_EXT, 16#8C1D).
--define(GL_MAX_ARRAY_TEXTURE_LAYERS_EXT, 16#88FF).
 -define(GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT, 16#884E).
 -define(GL_TEXTURE_BUFFER_EXT, 16#8C2A).
 -define(GL_MAX_TEXTURE_BUFFER_SIZE_EXT, 16#8C2B).
@@ -3857,396 +3880,5 @@
 -define(GL_SURFACE_REGISTERED_NV, 16#86FD).
 -define(GL_SURFACE_MAPPED_NV, 16#8700).
 -define(GL_WRITE_DISCARD_NV, 16#88BE).
--define(GL_VERSION_1_2, 1).
--define(GL_VERSION_1_2_DEPRECATED, 1).
--define(GL_VERSION_1_3, 1).
--define(GL_VERSION_1_3_DEPRECATED, 1).
--define(GL_VERSION_1_4, 1).
--define(GL_VERSION_1_4_DEPRECATED, 1).
--define(GL_VERSION_1_5, 1).
--define(GL_VERSION_2_0, 1).
--define(GL_VERSION_2_1, 1).
--define(GL_VERSION_3_0, 1).
--define(GL_VERSION_3_1, 1).
--define(GL_VERSION_3_2, 1).
--define(GL_VERSION_3_3, 1).
--define(GL_VERSION_4_0, 1).
--define(GL_VERSION_4_1, 1).
--define(GL_ARB_multitexture, 1).
--define(GL_ARB_transpose_matrix, 1).
--define(GL_ARB_multisample, 1).
--define(GL_ARB_texture_env_add, 1).
--define(GL_ARB_texture_cube_map, 1).
--define(GL_ARB_texture_compression, 1).
--define(GL_ARB_texture_border_clamp, 1).
--define(GL_ARB_point_parameters, 1).
--define(GL_ARB_vertex_blend, 1).
--define(GL_ARB_matrix_palette, 1).
--define(GL_ARB_texture_env_combine, 1).
--define(GL_ARB_texture_env_crossbar, 1).
--define(GL_ARB_texture_env_dot3, 1).
--define(GL_ARB_texture_mirrored_repeat, 1).
--define(GL_ARB_depth_texture, 1).
--define(GL_ARB_shadow, 1).
--define(GL_ARB_shadow_ambient, 1).
--define(GL_ARB_window_pos, 1).
--define(GL_ARB_vertex_program, 1).
--define(GL_ARB_fragment_program, 1).
--define(GL_ARB_vertex_buffer_object, 1).
--define(GL_ARB_occlusion_query, 1).
--define(GL_ARB_shader_objects, 1).
--define(GL_ARB_vertex_shader, 1).
--define(GL_ARB_fragment_shader, 1).
--define(GL_ARB_shading_language_100, 1).
--define(GL_ARB_texture_non_power_of_two, 1).
--define(GL_ARB_point_sprite, 1).
--define(GL_ARB_fragment_program_shadow, 1).
--define(GL_ARB_draw_buffers, 1).
--define(GL_ARB_texture_rectangle, 1).
--define(GL_ARB_color_buffer_float, 1).
--define(GL_ARB_half_float_pixel, 1).
--define(GL_ARB_texture_float, 1).
--define(GL_ARB_pixel_buffer_object, 1).
--define(GL_ARB_depth_buffer_float, 1).
--define(GL_ARB_draw_instanced, 1).
--define(GL_ARB_framebuffer_object, 1).
--define(GL_ARB_framebuffer_sRGB, 1).
--define(GL_ARB_geometry_shader4, 1).
--define(GL_ARB_half_float_vertex, 1).
--define(GL_ARB_instanced_arrays, 1).
--define(GL_ARB_map_buffer_range, 1).
--define(GL_ARB_texture_buffer_object, 1).
--define(GL_ARB_texture_compression_rgtc, 1).
--define(GL_ARB_texture_rg, 1).
--define(GL_ARB_vertex_array_object, 1).
--define(GL_ARB_uniform_buffer_object, 1).
--define(GL_ARB_compatibility, 1).
--define(GL_ARB_copy_buffer, 1).
--define(GL_ARB_shader_texture_lod, 1).
--define(GL_ARB_depth_clamp, 1).
--define(GL_ARB_draw_elements_base_vertex, 1).
--define(GL_ARB_fragment_coord_conventions, 1).
--define(GL_ARB_provoking_vertex, 1).
--define(GL_ARB_seamless_cube_map, 1).
--define(GL_ARB_sync, 1).
--define(GL_ARB_texture_multisample, 1).
--define(GL_ARB_vertex_array_bgra, 1).
--define(GL_ARB_draw_buffers_blend, 1).
--define(GL_ARB_sample_shading, 1).
--define(GL_ARB_texture_cube_map_array, 1).
--define(GL_ARB_texture_gather, 1).
--define(GL_ARB_texture_query_lod, 1).
--define(GL_ARB_shading_language_include, 1).
--define(GL_ARB_texture_compression_bptc, 1).
--define(GL_ARB_blend_func_extended, 1).
--define(GL_ARB_explicit_attrib_location, 1).
--define(GL_ARB_occlusion_query2, 1).
--define(GL_ARB_sampler_objects, 1).
--define(GL_ARB_texture_rgb10_a2ui, 1).
--define(GL_ARB_texture_swizzle, 1).
--define(GL_ARB_timer_query, 1).
--define(GL_ARB_vertex_type_2_10_10_10_rev, 1).
--define(GL_ARB_draw_indirect, 1).
--define(GL_ARB_gpu_shader5, 1).
--define(GL_ARB_gpu_shader_fp64, 1).
--define(GL_ARB_shader_subroutine, 1).
--define(GL_ARB_tessellation_shader, 1).
--define(GL_ARB_texture_buffer_object_rgb32, 1).
--define(GL_ARB_transform_feedback2, 1).
--define(GL_ARB_transform_feedback3, 1).
--define(GL_ARB_ES2_compatibility, 1).
--define(GL_ARB_get_program_binary, 1).
--define(GL_ARB_separate_shader_objects, 1).
--define(GL_ARB_vertex_attrib_64bit, 1).
--define(GL_ARB_viewport_array, 1).
--define(GL_ARB_cl_event, 1).
--define(GL_ARB_debug_output, 1).
--define(GL_ARB_robustness, 1).
--define(GL_ARB_shader_stencil_export, 1).
--define(GL_EXT_abgr, 1).
--define(GL_EXT_blend_color, 1).
--define(GL_EXT_polygon_offset, 1).
--define(GL_EXT_texture, 1).
--define(GL_EXT_texture3D, 1).
--define(GL_SGIS_texture_filter4, 1).
--define(GL_EXT_subtexture, 1).
--define(GL_EXT_copy_texture, 1).
--define(GL_EXT_histogram, 1).
--define(GL_EXT_convolution, 1).
--define(GL_SGI_color_matrix, 1).
--define(GL_SGI_color_table, 1).
--define(GL_SGIX_pixel_texture, 1).
--define(GL_SGIS_pixel_texture, 1).
--define(GL_SGIS_texture4D, 1).
--define(GL_SGI_texture_color_table, 1).
--define(GL_EXT_cmyka, 1).
--define(GL_EXT_texture_object, 1).
--define(GL_SGIS_detail_texture, 1).
--define(GL_SGIS_sharpen_texture, 1).
--define(GL_EXT_packed_pixels, 1).
--define(GL_SGIS_texture_lod, 1).
--define(GL_SGIS_multisample, 1).
--define(GL_EXT_rescale_normal, 1).
--define(GL_EXT_vertex_array, 1).
--define(GL_EXT_misc_attribute, 1).
--define(GL_SGIS_generate_mipmap, 1).
--define(GL_SGIX_clipmap, 1).
--define(GL_SGIX_shadow, 1).
--define(GL_SGIS_texture_edge_clamp, 1).
--define(GL_SGIS_texture_border_clamp, 1).
--define(GL_EXT_blend_minmax, 1).
--define(GL_EXT_blend_subtract, 1).
--define(GL_EXT_blend_logic_op, 1).
--define(GL_SGIX_interlace, 1).
--define(GL_SGIX_pixel_tiles, 1).
--define(GL_SGIX_texture_select, 1).
--define(GL_SGIX_sprite, 1).
--define(GL_SGIX_texture_multi_buffer, 1).
--define(GL_EXT_point_parameters, 1).
--define(GL_SGIS_point_parameters, 1).
--define(GL_SGIX_instruments, 1).
--define(GL_SGIX_texture_scale_bias, 1).
--define(GL_SGIX_framezoom, 1).
--define(GL_SGIX_tag_sample_buffer, 1).
--define(GL_SGIX_polynomial_ffd, 1).
--define(GL_SGIX_reference_plane, 1).
--define(GL_SGIX_flush_raster, 1).
--define(GL_SGIX_depth_texture, 1).
--define(GL_SGIS_fog_function, 1).
--define(GL_SGIX_fog_offset, 1).
--define(GL_HP_image_transform, 1).
--define(GL_HP_convolution_border_modes, 1).
--define(GL_SGIX_texture_add_env, 1).
--define(GL_EXT_color_subtable, 1).
--define(GL_PGI_vertex_hints, 1).
--define(GL_PGI_misc_hints, 1).
--define(GL_EXT_paletted_texture, 1).
--define(GL_EXT_clip_volume_hint, 1).
--define(GL_SGIX_list_priority, 1).
--define(GL_SGIX_ir_instrument1, 1).
--define(GL_SGIX_calligraphic_fragment, 1).
--define(GL_SGIX_texture_lod_bias, 1).
--define(GL_SGIX_shadow_ambient, 1).
--define(GL_EXT_index_texture, 1).
--define(GL_EXT_index_material, 1).
--define(GL_EXT_index_func, 1).
--define(GL_EXT_index_array_formats, 1).
--define(GL_EXT_compiled_vertex_array, 1).
--define(GL_EXT_cull_vertex, 1).
--define(GL_SGIX_ycrcb, 1).
--define(GL_SGIX_fragment_lighting, 1).
--define(GL_IBM_rasterpos_clip, 1).
--define(GL_HP_texture_lighting, 1).
--define(GL_EXT_draw_range_elements, 1).
--define(GL_WIN_phong_shading, 1).
--define(GL_WIN_specular_fog, 1).
--define(GL_EXT_light_texture, 1).
--define(GL_SGIX_blend_alpha_minmax, 1).
--define(GL_EXT_bgra, 1).
--define(GL_SGIX_async, 1).
--define(GL_SGIX_async_pixel, 1).
--define(GL_SGIX_async_histogram, 1).
--define(GL_INTEL_parallel_arrays, 1).
--define(GL_HP_occlusion_test, 1).
--define(GL_EXT_pixel_transform, 1).
--define(GL_EXT_pixel_transform_color_table, 1).
--define(GL_EXT_shared_texture_palette, 1).
--define(GL_EXT_separate_specular_color, 1).
--define(GL_EXT_secondary_color, 1).
--define(GL_EXT_texture_perturb_normal, 1).
--define(GL_EXT_multi_draw_arrays, 1).
--define(GL_EXT_fog_coord, 1).
--define(GL_REND_screen_coordinates, 1).
--define(GL_EXT_coordinate_frame, 1).
--define(GL_EXT_texture_env_combine, 1).
--define(GL_APPLE_specular_vector, 1).
--define(GL_APPLE_transform_hint, 1).
--define(GL_SGIX_fog_scale, 1).
--define(GL_SUNX_constant_data, 1).
--define(GL_SUN_global_alpha, 1).
--define(GL_SUN_triangle_list, 1).
--define(GL_SUN_vertex, 1).
--define(GL_EXT_blend_func_separate, 1).
--define(GL_INGR_blend_func_separate, 1).
--define(GL_INGR_color_clamp, 1).
--define(GL_INGR_interlace_read, 1).
--define(GL_EXT_stencil_wrap, 1).
--define(GL_EXT_422_pixels, 1).
--define(GL_NV_texgen_reflection, 1).
--define(GL_SUN_convolution_border_modes, 1).
--define(GL_EXT_texture_env_add, 1).
--define(GL_EXT_texture_lod_bias, 1).
--define(GL_EXT_texture_filter_anisotropic, 1).
--define(GL_EXT_vertex_weighting, 1).
--define(GL_NV_light_max_exponent, 1).
--define(GL_NV_vertex_array_range, 1).
--define(GL_NV_register_combiners, 1).
--define(GL_NV_fog_distance, 1).
--define(GL_NV_texgen_emboss, 1).
--define(GL_NV_blend_square, 1).
--define(GL_NV_texture_env_combine4, 1).
--define(GL_MESA_resize_buffers, 1).
--define(GL_MESA_window_pos, 1).
--define(GL_IBM_cull_vertex, 1).
--define(GL_IBM_multimode_draw_arrays, 1).
--define(GL_IBM_vertex_array_lists, 1).
--define(GL_SGIX_subsample, 1).
--define(GL_SGIX_ycrcba, 1).
--define(GL_SGIX_ycrcb_subsample, 1).
--define(GL_SGIX_depth_pass_instrument, 1).
--define(GL_3DFX_texture_compression_FXT1, 1).
--define(GL_3DFX_multisample, 1).
--define(GL_3DFX_tbuffer, 1).
--define(GL_EXT_multisample, 1).
--define(GL_SGIX_vertex_preclip, 1).
--define(GL_SGIX_convolution_accuracy, 1).
--define(GL_SGIX_resample, 1).
--define(GL_SGIS_point_line_texgen, 1).
--define(GL_SGIS_texture_color_mask, 1).
--define(GL_SGIX_igloo_interface, 1).
--define(GL_EXT_texture_env_dot3, 1).
--define(GL_ATI_texture_mirror_once, 1).
--define(GL_NV_fence, 1).
--define(GL_NV_evaluators, 1).
--define(GL_NV_packed_depth_stencil, 1).
--define(GL_NV_register_combiners2, 1).
--define(GL_NV_texture_compression_vtc, 1).
--define(GL_NV_texture_rectangle, 1).
--define(GL_NV_texture_shader, 1).
--define(GL_NV_texture_shader2, 1).
--define(GL_NV_vertex_array_range2, 1).
--define(GL_NV_vertex_program, 1).
--define(GL_SGIX_texture_coordinate_clamp, 1).
--define(GL_SGIX_scalebias_hint, 1).
--define(GL_OML_interlace, 1).
--define(GL_OML_subsample, 1).
--define(GL_OML_resample, 1).
--define(GL_NV_copy_depth_to_color, 1).
--define(GL_ATI_envmap_bumpmap, 1).
--define(GL_ATI_fragment_shader, 1).
--define(GL_ATI_pn_triangles, 1).
--define(GL_ATI_vertex_array_object, 1).
--define(GL_EXT_vertex_shader, 1).
--define(GL_ATI_vertex_streams, 1).
--define(GL_ATI_element_array, 1).
--define(GL_SUN_mesh_array, 1).
--define(GL_SUN_slice_accum, 1).
--define(GL_NV_multisample_filter_hint, 1).
--define(GL_NV_depth_clamp, 1).
--define(GL_NV_occlusion_query, 1).
--define(GL_NV_point_sprite, 1).
--define(GL_NV_texture_shader3, 1).
--define(GL_NV_vertex_program1_1, 1).
--define(GL_EXT_shadow_funcs, 1).
--define(GL_EXT_stencil_two_side, 1).
--define(GL_ATI_text_fragment_shader, 1).
--define(GL_APPLE_client_storage, 1).
--define(GL_APPLE_element_array, 1).
--define(GL_APPLE_fence, 1).
--define(GL_APPLE_vertex_array_object, 1).
--define(GL_APPLE_vertex_array_range, 1).
--define(GL_APPLE_ycbcr_422, 1).
--define(GL_S3_s3tc, 1).
--define(GL_ATI_draw_buffers, 1).
--define(GL_ATI_pixel_format_float, 1).
--define(GL_ATI_texture_env_combine3, 1).
--define(GL_ATI_texture_float, 1).
--define(GL_NV_float_buffer, 1).
--define(GL_NV_fragment_program, 1).
--define(GL_NV_half_float, 1).
--define(GL_NV_pixel_data_range, 1).
--define(GL_NV_primitive_restart, 1).
--define(GL_NV_texture_expand_normal, 1).
--define(GL_NV_vertex_program2, 1).
--define(GL_ATI_map_object_buffer, 1).
--define(GL_ATI_separate_stencil, 1).
--define(GL_ATI_vertex_attrib_array_object, 1).
--define(GL_OES_read_format, 1).
--define(GL_EXT_depth_bounds_test, 1).
--define(GL_EXT_texture_mirror_clamp, 1).
--define(GL_EXT_blend_equation_separate, 1).
--define(GL_MESA_pack_invert, 1).
--define(GL_MESA_ycbcr_texture, 1).
--define(GL_EXT_pixel_buffer_object, 1).
--define(GL_NV_fragment_program_option, 1).
--define(GL_NV_fragment_program2, 1).
--define(GL_NV_vertex_program2_option, 1).
--define(GL_NV_vertex_program3, 1).
--define(GL_EXT_framebuffer_object, 1).
--define(GL_GREMEDY_string_marker, 1).
--define(GL_EXT_packed_depth_stencil, 1).
--define(GL_EXT_stencil_clear_tag, 1).
--define(GL_EXT_texture_sRGB, 1).
--define(GL_EXT_framebuffer_blit, 1).
--define(GL_EXT_framebuffer_multisample, 1).
--define(GL_MESAX_texture_stack, 1).
--define(GL_EXT_timer_query, 1).
--define(GL_EXT_gpu_program_parameters, 1).
--define(GL_APPLE_flush_buffer_range, 1).
--define(GL_NV_gpu_program4, 1).
--define(GL_NV_geometry_program4, 1).
--define(GL_EXT_geometry_shader4, 1).
--define(GL_NV_vertex_program4, 1).
--define(GL_EXT_gpu_shader4, 1).
--define(GL_EXT_draw_instanced, 1).
--define(GL_EXT_packed_float, 1).
--define(GL_EXT_texture_array, 1).
--define(GL_EXT_texture_buffer_object, 1).
--define(GL_EXT_texture_compression_latc, 1).
--define(GL_EXT_texture_compression_rgtc, 1).
--define(GL_EXT_texture_shared_exponent, 1).
--define(GL_NV_depth_buffer_float, 1).
--define(GL_NV_fragment_program4, 1).
--define(GL_NV_framebuffer_multisample_coverage, 1).
--define(GL_EXT_framebuffer_sRGB, 1).
--define(GL_NV_geometry_shader4, 1).
--define(GL_NV_parameter_buffer_object, 1).
--define(GL_EXT_draw_buffers2, 1).
--define(GL_NV_transform_feedback, 1).
--define(GL_EXT_bindable_uniform, 1).
--define(GL_EXT_texture_integer, 1).
--define(GL_GREMEDY_frame_terminator, 1).
--define(GL_NV_conditional_render, 1).
--define(GL_NV_present_video, 1).
--define(GL_EXT_transform_feedback, 1).
--define(GL_EXT_direct_state_access, 1).
--define(GL_EXT_vertex_array_bgra, 1).
--define(GL_EXT_texture_swizzle, 1).
--define(GL_NV_explicit_multisample, 1).
--define(GL_NV_transform_feedback2, 1).
--define(GL_ATI_meminfo, 1).
--define(GL_AMD_performance_monitor, 1).
--define(GL_AMD_texture_texture4, 1).
--define(GL_AMD_vertex_shader_tesselator, 1).
--define(GL_EXT_provoking_vertex, 1).
--define(GL_EXT_texture_snorm, 1).
--define(GL_AMD_draw_buffers_blend, 1).
--define(GL_APPLE_texture_range, 1).
--define(GL_APPLE_float_pixels, 1).
--define(GL_APPLE_vertex_program_evaluators, 1).
--define(GL_APPLE_aux_depth_stencil, 1).
--define(GL_APPLE_object_purgeable, 1).
--define(GL_APPLE_row_bytes, 1).
--define(GL_APPLE_rgb_422, 1).
--define(GL_NV_video_capture, 1).
--define(GL_NV_copy_image, 1).
--define(GL_EXT_separate_shader_objects, 1).
--define(GL_NV_parameter_buffer_object2, 1).
--define(GL_NV_shader_buffer_load, 1).
--define(GL_NV_vertex_buffer_unified_memory, 1).
--define(GL_NV_texture_barrier, 1).
--define(GL_AMD_shader_stencil_export, 1).
--define(GL_AMD_seamless_cubemap_per_texture, 1).
--define(GL_AMD_conservative_depth, 1).
--define(GL_EXT_shader_image_load_store, 1).
--define(GL_EXT_vertex_attrib_64bit, 1).
--define(GL_NV_gpu_program5, 1).
--define(GL_NV_gpu_shader5, 1).
--define(GL_NV_shader_buffer_store, 1).
--define(GL_NV_tessellation_program5, 1).
--define(GL_NV_vertex_attrib_integer_64bit, 1).
--define(GL_NV_multisample_coverage, 1).
--define(GL_AMD_name_gen_delete, 1).
--define(GL_AMD_debug_output, 1).
--define(GL_NV_vdpau_interop, 1).
--define(GL_AMD_transform_feedback3_lines_triangles, 1).
+-define(GL_DEPTH_CLAMP_NEAR_AMD, 16#901E).
+-define(GL_DEPTH_CLAMP_FAR_AMD, 16#901F).
diff --git a/lib/wx/src/gen/wxBoxSizer.erl b/lib/wx/src/gen/wxBoxSizer.erl
index 1d5b1cf2fa..e6287945a9 100644
--- a/lib/wx/src/gen/wxBoxSizer.erl
+++ b/lib/wx/src/gen/wxBoxSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -102,7 +102,7 @@ prepend(This,Width,Height, Options) -> wxSizer:prepend(This,Width,Height, Option
 %% @hidden
 prepend(This,Width,Height) -> wxSizer:prepend(This,Width,Height).
 %% @hidden
-prepend(This,Window) -> wxSizer:prepend(This,Window).
+prepend(This,Item) -> wxSizer:prepend(This,Item).
 %% @hidden
 layout(This) -> wxSizer:layout(This).
 %% @hidden
@@ -118,7 +118,7 @@ insert(This,Index,Width,Height, Options) -> wxSizer:insert(This,Index,Width,Heig
 %% @hidden
 insert(This,Index,Width,Height) -> wxSizer:insert(This,Index,Width,Height).
 %% @hidden
-insert(This,Index,Window) -> wxSizer:insert(This,Index,Window).
+insert(This,Index,Item) -> wxSizer:insert(This,Index,Item).
 %% @hidden
 hide(This,Window, Options) -> wxSizer:hide(This,Window, Options).
 %% @hidden
diff --git a/lib/wx/src/gen/wxFlexGridSizer.erl b/lib/wx/src/gen/wxFlexGridSizer.erl
index 9471cc8a01..910cc78894 100644
--- a/lib/wx/src/gen/wxFlexGridSizer.erl
+++ b/lib/wx/src/gen/wxFlexGridSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -222,7 +222,7 @@ prepend(This,Width,Height, Options) -> wxSizer:prepend(This,Width,Height, Option
 %% @hidden
 prepend(This,Width,Height) -> wxSizer:prepend(This,Width,Height).
 %% @hidden
-prepend(This,Window) -> wxSizer:prepend(This,Window).
+prepend(This,Item) -> wxSizer:prepend(This,Item).
 %% @hidden
 layout(This) -> wxSizer:layout(This).
 %% @hidden
@@ -238,7 +238,7 @@ insert(This,Index,Width,Height, Options) -> wxSizer:insert(This,Index,Width,Heig
 %% @hidden
 insert(This,Index,Width,Height) -> wxSizer:insert(This,Index,Width,Height).
 %% @hidden
-insert(This,Index,Window) -> wxSizer:insert(This,Index,Window).
+insert(This,Index,Item) -> wxSizer:insert(This,Index,Item).
 %% @hidden
 hide(This,Window, Options) -> wxSizer:hide(This,Window, Options).
 %% @hidden
diff --git a/lib/wx/src/gen/wxGridBagSizer.erl b/lib/wx/src/gen/wxGridBagSizer.erl
index d8cc210d3b..cfc182cf89 100644
--- a/lib/wx/src/gen/wxGridBagSizer.erl
+++ b/lib/wx/src/gen/wxGridBagSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -474,7 +474,7 @@ prepend(This,Width,Height, Options) -> wxSizer:prepend(This,Width,Height, Option
 %% @hidden
 prepend(This,Width,Height) -> wxSizer:prepend(This,Width,Height).
 %% @hidden
-prepend(This,Window) -> wxSizer:prepend(This,Window).
+prepend(This,Item) -> wxSizer:prepend(This,Item).
 %% @hidden
 layout(This) -> wxSizer:layout(This).
 %% @hidden
@@ -490,7 +490,7 @@ insert(This,Index,Width,Height, Options) -> wxSizer:insert(This,Index,Width,Heig
 %% @hidden
 insert(This,Index,Width,Height) -> wxSizer:insert(This,Index,Width,Height).
 %% @hidden
-insert(This,Index,Window) -> wxSizer:insert(This,Index,Window).
+insert(This,Index,Item) -> wxSizer:insert(This,Index,Item).
 %% @hidden
 hide(This,Window, Options) -> wxSizer:hide(This,Window, Options).
 %% @hidden
diff --git a/lib/wx/src/gen/wxGridSizer.erl b/lib/wx/src/gen/wxGridSizer.erl
index 7b62774347..fd8580c70d 100644
--- a/lib/wx/src/gen/wxGridSizer.erl
+++ b/lib/wx/src/gen/wxGridSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -174,7 +174,7 @@ prepend(This,Width,Height, Options) -> wxSizer:prepend(This,Width,Height, Option
 %% @hidden
 prepend(This,Width,Height) -> wxSizer:prepend(This,Width,Height).
 %% @hidden
-prepend(This,Window) -> wxSizer:prepend(This,Window).
+prepend(This,Item) -> wxSizer:prepend(This,Item).
 %% @hidden
 layout(This) -> wxSizer:layout(This).
 %% @hidden
@@ -190,7 +190,7 @@ insert(This,Index,Width,Height, Options) -> wxSizer:insert(This,Index,Width,Heig
 %% @hidden
 insert(This,Index,Width,Height) -> wxSizer:insert(This,Index,Width,Height).
 %% @hidden
-insert(This,Index,Window) -> wxSizer:insert(This,Index,Window).
+insert(This,Index,Item) -> wxSizer:insert(This,Index,Item).
 %% @hidden
 hide(This,Window, Options) -> wxSizer:hide(This,Window, Options).
 %% @hidden
diff --git a/lib/wx/src/gen/wxListCtrl.erl b/lib/wx/src/gen/wxListCtrl.erl
index 9c4ba1e5a3..5799206b87 100644
--- a/lib/wx/src/gen/wxListCtrl.erl
+++ b/lib/wx/src/gen/wxListCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -29,17 +29,17 @@
 
 -module(wxListCtrl).
 -include("wxe.hrl").
--export([ sortItems/2 ,arrange/1,arrange/2,assignImageList/3,clearAll/1,create/2,
-  create/3,deleteAllItems/1,deleteColumn/2,deleteItem/2,destroy/1,editLabel/2,
-  ensureVisible/2,findItem/3,findItem/4,getColumn/3,getColumnCount/1,
-  getColumnWidth/2,getCountPerPage/1,getEditControl/1,getImageList/2,
-  getItem/2,getItemBackgroundColour/2,getItemCount/1,getItemData/2,
-  getItemFont/2,getItemPosition/3,getItemRect/3,getItemRect/4,getItemSpacing/1,
-  getItemState/3,getItemText/2,getItemTextColour/2,getNextItem/2,getNextItem/3,
-  getSelectedItemCount/1,getTextColour/1,getTopItem/1,getViewRect/1,
-  hitTest/2,insertColumn/3,insertColumn/4,insertItem/2,insertItem/3,
-  insertItem/4,new/0,new/1,new/2,refreshItem/2,refreshItems/3,scrollList/3,
-  setBackgroundColour/2,setColumn/3,setColumnWidth/3,setImageList/3,
+-export([ create/2, create/3 , new/0, new/1, new/2 , sortItems/2 ,arrange/1,
+  arrange/2,assignImageList/3,clearAll/1,deleteAllItems/1,deleteColumn/2,
+  deleteItem/2,destroy/1,editLabel/2,ensureVisible/2,findItem/3,findItem/4,
+  getColumn/3,getColumnCount/1,getColumnWidth/2,getCountPerPage/1,getEditControl/1,
+  getImageList/2,getItem/2,getItemBackgroundColour/2,getItemCount/1,
+  getItemData/2,getItemFont/2,getItemPosition/3,getItemRect/3,getItemRect/4,
+  getItemSpacing/1,getItemState/3,getItemText/2,getItemTextColour/2,
+  getNextItem/2,getNextItem/3,getSelectedItemCount/1,getTextColour/1,
+  getTopItem/1,getViewRect/1,hitTest/2,insertColumn/3,insertColumn/4,
+  insertItem/2,insertItem/3,insertItem/4,refreshItem/2,refreshItems/3,
+  scrollList/3,setBackgroundColour/2,setColumn/3,setColumnWidth/3,setImageList/3,
   setItem/2,setItem/4,setItem/5,setItemBackgroundColour/3,setItemColumnImage/4,
   setItemCount/2,setItemData/3,setItemFont/3,setItemImage/3,setItemImage/4,
   setItemPosition/3,setItemState/4,setItemText/3,setItemTextColour/3,
@@ -89,11 +89,11 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+
 %% @spec () -> wxListCtrl()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlwxlistctrl">external documentation</a>.
 new() ->
-  wxe_util:construct(?wxListCtrl_new_0,
-  <<>>).
+    wxe_util:construct(?wxListCtrl_new_0, <<>>).
 
 %% @spec (Parent::wxWindow:wxWindow()) -> wxListCtrl()
 %% @equiv new(Parent, [])
@@ -102,20 +102,44 @@ new(Parent)
   new(Parent, []).
 
 %% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxListCtrl()
-%% Option = {winid, integer()} | {pos, {X::integer(),Y::integer()}} | {size, {W::integer(),H::integer()}} | {style, integer()} | {validator, wx:wx()}
+%% Option = {winid, integer()} |
+%%          {pos, {X::integer(),Y::integer()}} |
+%%          {size, {W::integer(),H::integer()}} |
+%%          {style, integer()} |
+%%          {validator, wx:wx()} |
+%%          {onGetItemText, OnGetItemText} |
+%%          {onGetItemAttr, OnGetItemAttr} |
+%%          {onGetItemColumnImage, OnGetItemColumnImage}
+%%
+%% OnGetItemText = (This, Item, Column) -> wxString()
+%% OnGetItemAttr = (This, Item) -> wxListItemAttr()
+%% OnGetItemColumnImage = (This, Item, Column) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlwxlistctrl">external documentation</a>.
+
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
- when is_list(Options) ->
-  ?CLASS(ParentT,wxWindow),
-  MOpts = fun({winid, Winid}, Acc) -> [<<1:32/?UI,Winid:32/?UI>>|Acc];
-          ({pos, {PosX,PosY}}, Acc) -> [<<2:32/?UI,PosX:32/?UI,PosY:32/?UI,0:32>>|Acc];
-          ({size, {SizeW,SizeH}}, Acc) -> [<<3:32/?UI,SizeW:32/?UI,SizeH:32/?UI,0:32>>|Acc];
-          ({style, Style}, Acc) -> [<<4:32/?UI,Style:32/?UI>>|Acc];
-          ({validator, #wx_ref{type=ValidatorT,ref=ValidatorRef}}, Acc) ->   ?CLASS(ValidatorT,wx),[<<5:32/?UI,ValidatorRef:32/?UI>>|Acc];
-          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
-  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
-  wxe_util:construct(?wxListCtrl_new_2,
-  <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
+  when is_list(Options)->
+    ?CLASS(ParentT,wxWindow),
+    MOpts = fun({winid, Winid}, Acc) -> [<<1:32/?UI,Winid:32/?UI>>|Acc];
+	       ({pos, {PosX,PosY}}, Acc) -> [<<2:32/?UI,PosX:32/?UI,PosY:32/?UI,0:32>>|Acc];
+	       ({size, {SizeW,SizeH}}, Acc) -> [<<3:32/?UI,SizeW:32/?UI,SizeH:32/?UI,0:32>>|Acc];
+	       ({style, Style}, Acc) -> [<<4:32/?UI,Style:32/?UI>>|Acc];
+	       ({validator, #wx_ref{type=ValidatorT,ref=ValidatorRef}}, Acc) ->
+		    ?CLASS(ValidatorT,wx),[<<5:32/?UI,ValidatorRef:32/?UI>>|Acc];
+	       ({onGetItemText, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item,Col]) -> unicode:characters_to_binary([F(This,Item,Col),0]) end,
+		    [<<6:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       ({onGetItemAttr, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item]) ->
+				  #wx_ref{type=wxListItemAttr,ref=ThisRef} = F(This,Item),
+				  <<ThisRef:32/?UI>>
+			  end,
+		    [<<7:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       ({onGetItemColumnImage, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item, Col]) -> <<(F(This,Item,Col)):32/?I>> end,
+		    [<<8:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
+    BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
+    wxe_util:construct(?wxListCtrl_new_2, <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
 %% @spec (This::wxListCtrl()) -> bool()
 %% @equiv arrange(This, [])
@@ -151,6 +175,7 @@ clearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxListCtrl_ClearAll,
   <<ThisRef:32/?UI>>).
 
+
 %% @spec (This::wxListCtrl(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
 create(This,Parent)
@@ -158,7 +183,18 @@ create(This,Parent)
   create(This,Parent, []).
 
 %% @spec (This::wxListCtrl(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {winid, integer()} | {pos, {X::integer(),Y::integer()}} | {size, {W::integer(),H::integer()}} | {style, integer()} | {validator, wx:wx()}
+%% Option = {winid, integer()} |
+%%          {pos, {X::integer(),Y::integer()}} |
+%%          {size, {W::integer(),H::integer()}} |
+%%          {style, integer()} |
+%%          {validator, wx:wx()} |
+%%          {onGetItemText, OnGetItemText} |
+%%          {onGetItemAttr, OnGetItemAttr} |
+%%          {onGetItemColumnImage, OnGetItemColumnImage}
+%%
+%% OnGetItemText = (This, Item, Column) -> wxString()
+%% OnGetItemAttr = (This, Item) -> wxListItemAttr()
+%% OnGetItemColumnImage = (This, Item, Column) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlcreate">external documentation</a>.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
@@ -726,12 +762,12 @@ setWindowStyleFlag(#wx_ref{type=ThisT,ref=ThisRef},Style)
 
 %% @spec (This::wxListCtrl(), SortCallBack::function()) -> boolean()
 %% @doc Sort the items in the list control<br />
-%%   <pre>SortCalBack(Item1,Item2) -> integer()</pre>
+%%   <pre>SortCallBack(Item1,Item2) -> integer()</pre>
 %%  <br /> SortCallBack receives the client data associated with two items
 %%         to compare, and should return 0 if the items are equal, a negative
 %%         value if the first item is less than the second one and a positive
 %%         value if the first item is greater than the second one.
-%%  <br /> NOTE: The callback may not call other processes.
+%%  <br /> NOTE: The callback may not call other (wx) processes.
 sortItems(#wx_ref{type=ThisT,ref=ThisRef}, SortCallBack)
   when is_function(SortCallBack, 2) ->
 	?CLASS(ThisT,wxListCtrl),
diff --git a/lib/wx/src/gen/wxListItemAttr.erl b/lib/wx/src/gen/wxListItemAttr.erl
new file mode 100644
index 0000000000..1a43c71854
--- /dev/null
+++ b/lib/wx/src/gen/wxListItemAttr.erl
@@ -0,0 +1,122 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2011. 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.
+%%
+%% %CopyrightEnd%
+%% This file is generated DO NOT EDIT
+
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html">wxListItemAttr</a>.
+%% @type wxListItemAttr().  An object reference, The representation is internal
+%% and can be changed without notice. It can't be used for comparsion
+%% stored on disc or distributed for use on other nodes.
+
+-module(wxListItemAttr).
+-include("wxe.hrl").
+-export([destroy/1,getBackgroundColour/1,getFont/1,getTextColour/1,hasBackgroundColour/1,
+  hasFont/1,hasTextColour/1,new/0,new/3,setBackgroundColour/2,setFont/2,
+  setTextColour/2]).
+
+%% inherited exports
+-export([parent_class/1]).
+
+%% @hidden
+parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
+
+%% @spec () -> wxListItemAttr()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrwxlistitemattr">external documentation</a>.
+new() ->
+  wxe_util:construct(?wxListItemAttr_new_0,
+  <<>>).
+
+%% @spec (ColText::wx:colour(), ColBack::wx:colour(), Font::wxFont:wxFont()) -> wxListItemAttr()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrwxlistitemattr">external documentation</a>.
+new(ColText,ColBack,#wx_ref{type=FontT,ref=FontRef})
+ when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4,tuple_size(ColBack) =:= 3; tuple_size(ColBack) =:= 4 ->
+  ?CLASS(FontT,wxFont),
+  wxe_util:construct(?wxListItemAttr_new_3,
+  <<(wxe_util:colour_bin(ColText)):16/binary,(wxe_util:colour_bin(ColBack)):16/binary,FontRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> wx:colour()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgetbackgroundcolour">external documentation</a>.
+getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_GetBackgroundColour,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> wxFont:wxFont()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgetfont">external documentation</a>.
+getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_GetFont,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> wx:colour()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgettextcolour">external documentation</a>.
+getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_GetTextColour,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> bool()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhasbackgroundcolour">external documentation</a>.
+hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_HasBackgroundColour,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> bool()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhasfont">external documentation</a>.
+hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_HasFont,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> bool()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhastextcolour">external documentation</a>.
+hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_HasTextColour,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr(), ColBack::wx:colour()) -> ok
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsetbackgroundcolour">external documentation</a>.
+setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
+ when tuple_size(ColBack) =:= 3; tuple_size(ColBack) =:= 4 ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:cast(?wxListItemAttr_SetBackgroundColour,
+  <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
+
+%% @spec (This::wxListItemAttr(), Font::wxFont:wxFont()) -> ok
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsetfont">external documentation</a>.
+setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  ?CLASS(FontT,wxFont),
+  wxe_util:cast(?wxListItemAttr_SetFont,
+  <<ThisRef:32/?UI,FontRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr(), ColText::wx:colour()) -> ok
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsettextcolour">external documentation</a>.
+setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
+ when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4 ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:cast(?wxListItemAttr_SetTextColour,
+  <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>).
+
+%% @spec (This::wxListItemAttr()) -> ok
+%% @doc Destroys this object, do not use object again
+destroy(Obj=#wx_ref{type=Type}) ->
+  ?CLASS(Type,wxListItemAttr),
+  wxe_util:destroy(?wxListItemAttr_destroy,Obj),
+  ok.
diff --git a/lib/wx/src/gen/wxRegion.erl b/lib/wx/src/gen/wxRegion.erl
index 0ceba1d203..4e8d98a54f 100644
--- a/lib/wx/src/gen/wxRegion.erl
+++ b/lib/wx/src/gen/wxRegion.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -48,7 +48,7 @@ new() ->
 %% new(Bmp::wxBitmap:wxBitmap()) -> wxRegion() </c>
 %% </p>
 %% <p><c>
-%% new(Rect::{X::integer(),Y::integer(),W::integer(),H::integer()}) -> wxRegion() </c>
+%% new(Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> wxRegion() </c>
 %% </p>
 new(#wx_ref{type=BmpT,ref=BmpRef}) ->
   ?CLASS(BmpT,wxBitmap),
diff --git a/lib/wx/src/gen/wxSizer.erl b/lib/wx/src/gen/wxSizer.erl
index 716b2224b5..e9b83a7333 100644
--- a/lib/wx/src/gen/wxSizer.erl
+++ b/lib/wx/src/gen/wxSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -298,18 +298,8 @@ hide(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Option
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI, BinOpt/binary>>).
 
-%% @spec (This::wxSizer(),Index::integer(),X::term()) -> wxSizerItem:wxSizerItem()
+%% @spec (This::wxSizer(), Index::integer(), Item::wxSizerItem:wxSizerItem()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerinsert">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% insert(This::wxSizer(), Index::integer(), Window::wxWindow:wxWindow() | wxSizer()) -> insert(This,Index,Window, []) </c></p>
-%% <p><c>
-%% insert(This::wxSizer(), Index::integer(), Item::wxSizerItem:wxSizerItem()) -> wxSizerItem:wxSizerItem() </c>
-%% </p>
-
-insert(This,Index,Window)
- when is_record(This, wx_ref),is_integer(Index),is_record(Window, wx_ref) ->
-  insert(This,Index,Window, []);
 insert(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=ItemT,ref=ItemRef})
  when is_integer(Index) ->
   ?CLASS(ThisT,wxSizer),
@@ -437,18 +427,8 @@ layout(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxSizer_Layout,
   <<ThisRef:32/?UI>>).
 
-%% @spec (This::wxSizer(),X::term()) -> wxSizerItem:wxSizerItem()
+%% @spec (This::wxSizer(), Item::wxSizerItem:wxSizerItem()) -> wxSizerItem:wxSizerItem()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerprepend">external documentation</a>.
-%% <br /> Alternatives:
-%% <p><c>
-%% prepend(This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer()) -> prepend(This,Window, []) </c></p>
-%% <p><c>
-%% prepend(This::wxSizer(), Item::wxSizerItem:wxSizerItem()) -> wxSizerItem:wxSizerItem() </c>
-%% </p>
-
-prepend(This,Window)
- when is_record(This, wx_ref),is_record(Window, wx_ref) ->
-  prepend(This,Window, []);
 prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   ?CLASS(ThisT,wxSizer),
   ?CLASS(ItemT,wxSizerItem),
diff --git a/lib/wx/src/gen/wxStaticBoxSizer.erl b/lib/wx/src/gen/wxStaticBoxSizer.erl
index 5f346b7a1e..2cf9f64325 100644
--- a/lib/wx/src/gen/wxStaticBoxSizer.erl
+++ b/lib/wx/src/gen/wxStaticBoxSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -130,7 +130,7 @@ prepend(This,Width,Height, Options) -> wxSizer:prepend(This,Width,Height, Option
 %% @hidden
 prepend(This,Width,Height) -> wxSizer:prepend(This,Width,Height).
 %% @hidden
-prepend(This,Window) -> wxSizer:prepend(This,Window).
+prepend(This,Item) -> wxSizer:prepend(This,Item).
 %% @hidden
 layout(This) -> wxSizer:layout(This).
 %% @hidden
@@ -146,7 +146,7 @@ insert(This,Index,Width,Height, Options) -> wxSizer:insert(This,Index,Width,Heig
 %% @hidden
 insert(This,Index,Width,Height) -> wxSizer:insert(This,Index,Width,Height).
 %% @hidden
-insert(This,Index,Window) -> wxSizer:insert(This,Index,Window).
+insert(This,Index,Item) -> wxSizer:insert(This,Index,Item).
 %% @hidden
 hide(This,Window, Options) -> wxSizer:hide(This,Window, Options).
 %% @hidden
diff --git a/lib/wx/src/gen/wxStdDialogButtonSizer.erl b/lib/wx/src/gen/wxStdDialogButtonSizer.erl
index b0052ca2e1..3d31907275 100644
--- a/lib/wx/src/gen/wxStdDialogButtonSizer.erl
+++ b/lib/wx/src/gen/wxStdDialogButtonSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -139,7 +139,7 @@ prepend(This,Width,Height, Options) -> wxSizer:prepend(This,Width,Height, Option
 %% @hidden
 prepend(This,Width,Height) -> wxSizer:prepend(This,Width,Height).
 %% @hidden
-prepend(This,Window) -> wxSizer:prepend(This,Window).
+prepend(This,Item) -> wxSizer:prepend(This,Item).
 %% @hidden
 layout(This) -> wxSizer:layout(This).
 %% @hidden
@@ -155,7 +155,7 @@ insert(This,Index,Width,Height, Options) -> wxSizer:insert(This,Index,Width,Heig
 %% @hidden
 insert(This,Index,Width,Height) -> wxSizer:insert(This,Index,Width,Height).
 %% @hidden
-insert(This,Index,Window) -> wxSizer:insert(This,Index,Window).
+insert(This,Index,Item) -> wxSizer:insert(This,Index,Item).
 %% @hidden
 hide(This,Window, Options) -> wxSizer:hide(This,Window, Options).
 %% @hidden
diff --git a/lib/wx/src/gen/wxWindow.erl b/lib/wx/src/gen/wxWindow.erl
index 33665a0ad6..031314bfe2 100644
--- a/lib/wx/src/gen/wxWindow.erl
+++ b/lib/wx/src/gen/wxWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -1144,10 +1144,10 @@ setCaret(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CaretT,ref=CaretRef}) ->
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetclientsize">external documentation</a>.
 %% <br /> Alternatives:
 %% <p><c>
-%% setClientSize(This::wxWindow(), Size::{W::integer(),H::integer()}) -> ok </c>
+%% setClientSize(This::wxWindow(), Size::{W::integer(), H::integer()}) -> ok </c>
 %% </p>
 %% <p><c>
-%% setClientSize(This::wxWindow(), Rect::{X::integer(),Y::integer(),W::integer(),H::integer()}) -> ok </c>
+%% setClientSize(This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok </c>
 %% </p>
 setClientSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
diff --git a/lib/wx/src/gen/wxe_debug.hrl b/lib/wx/src/gen/wxe_debug.hrl
index 3edfa73599..960f67a1f6 100644
--- a/lib/wx/src/gen/wxe_debug.hrl
+++ b/lib/wx/src/gen/wxe_debug.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -1603,1684 +1603,1696 @@ wxdebug_table() ->
  {1754, {wxListItem, setText, 1}},
  {1755, {wxListItem, setTextColour, 1}},
  {1756, {wxListItem, setWidth, 1}},
- {1757, {wxImageList, new_0, 0}},
- {1758, {wxImageList, new_3, 3}},
- {1759, {wxImageList, add_1, 1}},
- {1760, {wxImageList, add_2_0, 2}},
- {1761, {wxImageList, add_2_1, 2}},
- {1762, {wxImageList, create, 3}},
- {1764, {wxImageList, draw, 5}},
- {1765, {wxImageList, getBitmap, 1}},
- {1766, {wxImageList, getIcon, 1}},
- {1767, {wxImageList, getImageCount, 0}},
- {1768, {wxImageList, getSize, 3}},
- {1769, {wxImageList, remove, 1}},
- {1770, {wxImageList, removeAll, 0}},
- {1771, {wxImageList, replace_2, 2}},
- {1772, {wxImageList, replace_3, 3}},
- {1773, {wxImageList, 'Destroy', undefined}},
- {1774, {wxTextAttr, new_0, 0}},
- {1775, {wxTextAttr, new_2, 2}},
- {1776, {wxTextAttr, getAlignment, 0}},
- {1777, {wxTextAttr, getBackgroundColour, 0}},
- {1778, {wxTextAttr, getFont, 0}},
- {1779, {wxTextAttr, getLeftIndent, 0}},
- {1780, {wxTextAttr, getLeftSubIndent, 0}},
- {1781, {wxTextAttr, getRightIndent, 0}},
- {1782, {wxTextAttr, getTabs, 0}},
- {1783, {wxTextAttr, getTextColour, 0}},
- {1784, {wxTextAttr, hasBackgroundColour, 0}},
- {1785, {wxTextAttr, hasFont, 0}},
- {1786, {wxTextAttr, hasTextColour, 0}},
- {1787, {wxTextAttr, getFlags, 0}},
- {1788, {wxTextAttr, isDefault, 0}},
- {1789, {wxTextAttr, setAlignment, 1}},
- {1790, {wxTextAttr, setBackgroundColour, 1}},
- {1791, {wxTextAttr, setFlags, 1}},
- {1792, {wxTextAttr, setFont, 2}},
- {1793, {wxTextAttr, setLeftIndent, 2}},
- {1794, {wxTextAttr, setRightIndent, 1}},
- {1795, {wxTextAttr, setTabs, 1}},
- {1796, {wxTextAttr, setTextColour, 1}},
- {1797, {wxTextAttr, 'Destroy', undefined}},
- {1799, {wxTextCtrl, new_3, 3}},
- {1800, {wxTextCtrl, new_0, 0}},
- {1802, {wxTextCtrl, destruct, 0}},
- {1803, {wxTextCtrl, appendText, 1}},
- {1804, {wxTextCtrl, canCopy, 0}},
- {1805, {wxTextCtrl, canCut, 0}},
- {1806, {wxTextCtrl, canPaste, 0}},
- {1807, {wxTextCtrl, canRedo, 0}},
- {1808, {wxTextCtrl, canUndo, 0}},
- {1809, {wxTextCtrl, clear, 0}},
- {1810, {wxTextCtrl, copy, 0}},
- {1811, {wxTextCtrl, create, 3}},
- {1812, {wxTextCtrl, cut, 0}},
- {1813, {wxTextCtrl, discardEdits, 0}},
- {1814, {wxTextCtrl, emulateKeyPress, 1}},
- {1815, {wxTextCtrl, getDefaultStyle, 0}},
- {1816, {wxTextCtrl, getInsertionPoint, 0}},
- {1817, {wxTextCtrl, getLastPosition, 0}},
- {1818, {wxTextCtrl, getLineLength, 1}},
- {1819, {wxTextCtrl, getLineText, 1}},
- {1820, {wxTextCtrl, getNumberOfLines, 0}},
- {1821, {wxTextCtrl, getRange, 2}},
- {1822, {wxTextCtrl, getSelection, 2}},
- {1823, {wxTextCtrl, getStringSelection, 0}},
- {1824, {wxTextCtrl, getStyle, 2}},
- {1825, {wxTextCtrl, getValue, 0}},
- {1826, {wxTextCtrl, isEditable, 0}},
- {1827, {wxTextCtrl, isModified, 0}},
- {1828, {wxTextCtrl, isMultiLine, 0}},
- {1829, {wxTextCtrl, isSingleLine, 0}},
- {1830, {wxTextCtrl, loadFile, 2}},
- {1831, {wxTextCtrl, markDirty, 0}},
- {1832, {wxTextCtrl, paste, 0}},
- {1833, {wxTextCtrl, positionToXY, 3}},
- {1834, {wxTextCtrl, redo, 0}},
- {1835, {wxTextCtrl, remove, 2}},
- {1836, {wxTextCtrl, replace, 3}},
- {1837, {wxTextCtrl, saveFile, 1}},
- {1838, {wxTextCtrl, setDefaultStyle, 1}},
- {1839, {wxTextCtrl, setEditable, 1}},
- {1840, {wxTextCtrl, setInsertionPoint, 1}},
- {1841, {wxTextCtrl, setInsertionPointEnd, 0}},
- {1843, {wxTextCtrl, setMaxLength, 1}},
- {1844, {wxTextCtrl, setSelection, 2}},
- {1845, {wxTextCtrl, setStyle, 3}},
- {1846, {wxTextCtrl, setValue, 1}},
- {1847, {wxTextCtrl, showPosition, 1}},
- {1848, {wxTextCtrl, undo, 0}},
- {1849, {wxTextCtrl, writeText, 1}},
- {1850, {wxTextCtrl, xYToPosition, 2}},
- {1853, {wxNotebook, new_0, 0}},
- {1854, {wxNotebook, new_3, 3}},
- {1855, {wxNotebook, destruct, 0}},
- {1856, {wxNotebook, addPage, 3}},
- {1857, {wxNotebook, advanceSelection, 1}},
- {1858, {wxNotebook, assignImageList, 1}},
- {1859, {wxNotebook, create, 3}},
- {1860, {wxNotebook, deleteAllPages, 0}},
- {1861, {wxNotebook, deletePage, 1}},
- {1862, {wxNotebook, removePage, 1}},
- {1863, {wxNotebook, getCurrentPage, 0}},
- {1864, {wxNotebook, getImageList, 0}},
- {1866, {wxNotebook, getPage, 1}},
- {1867, {wxNotebook, getPageCount, 0}},
- {1868, {wxNotebook, getPageImage, 1}},
- {1869, {wxNotebook, getPageText, 1}},
- {1870, {wxNotebook, getRowCount, 0}},
- {1871, {wxNotebook, getSelection, 0}},
- {1872, {wxNotebook, getThemeBackgroundColour, 0}},
- {1874, {wxNotebook, hitTest, 2}},
- {1876, {wxNotebook, insertPage, 4}},
- {1877, {wxNotebook, setImageList, 1}},
- {1878, {wxNotebook, setPadding, 1}},
- {1879, {wxNotebook, setPageSize, 1}},
- {1880, {wxNotebook, setPageImage, 2}},
- {1881, {wxNotebook, setPageText, 2}},
- {1882, {wxNotebook, setSelection, 1}},
- {1883, {wxNotebook, changeSelection, 1}},
- {1884, {wxChoicebook, new_0, 0}},
- {1885, {wxChoicebook, new_3, 3}},
- {1886, {wxChoicebook, addPage, 3}},
- {1887, {wxChoicebook, advanceSelection, 1}},
- {1888, {wxChoicebook, assignImageList, 1}},
- {1889, {wxChoicebook, create, 3}},
- {1890, {wxChoicebook, deleteAllPages, 0}},
- {1891, {wxChoicebook, deletePage, 1}},
- {1892, {wxChoicebook, removePage, 1}},
- {1893, {wxChoicebook, getCurrentPage, 0}},
- {1894, {wxChoicebook, getImageList, 0}},
- {1896, {wxChoicebook, getPage, 1}},
- {1897, {wxChoicebook, getPageCount, 0}},
- {1898, {wxChoicebook, getPageImage, 1}},
- {1899, {wxChoicebook, getPageText, 1}},
- {1900, {wxChoicebook, getSelection, 0}},
- {1901, {wxChoicebook, hitTest, 2}},
- {1902, {wxChoicebook, insertPage, 4}},
- {1903, {wxChoicebook, setImageList, 1}},
- {1904, {wxChoicebook, setPageSize, 1}},
- {1905, {wxChoicebook, setPageImage, 2}},
- {1906, {wxChoicebook, setPageText, 2}},
- {1907, {wxChoicebook, setSelection, 1}},
- {1908, {wxChoicebook, changeSelection, 1}},
- {1909, {wxChoicebook, 'Destroy', undefined}},
- {1910, {wxToolbook, new_0, 0}},
- {1911, {wxToolbook, new_3, 3}},
- {1912, {wxToolbook, addPage, 3}},
- {1913, {wxToolbook, advanceSelection, 1}},
- {1914, {wxToolbook, assignImageList, 1}},
- {1915, {wxToolbook, create, 3}},
- {1916, {wxToolbook, deleteAllPages, 0}},
- {1917, {wxToolbook, deletePage, 1}},
- {1918, {wxToolbook, removePage, 1}},
- {1919, {wxToolbook, getCurrentPage, 0}},
- {1920, {wxToolbook, getImageList, 0}},
- {1922, {wxToolbook, getPage, 1}},
- {1923, {wxToolbook, getPageCount, 0}},
- {1924, {wxToolbook, getPageImage, 1}},
- {1925, {wxToolbook, getPageText, 1}},
- {1926, {wxToolbook, getSelection, 0}},
- {1928, {wxToolbook, hitTest, 2}},
- {1929, {wxToolbook, insertPage, 4}},
- {1930, {wxToolbook, setImageList, 1}},
- {1931, {wxToolbook, setPageSize, 1}},
- {1932, {wxToolbook, setPageImage, 2}},
- {1933, {wxToolbook, setPageText, 2}},
- {1934, {wxToolbook, setSelection, 1}},
- {1935, {wxToolbook, changeSelection, 1}},
- {1936, {wxToolbook, 'Destroy', undefined}},
- {1937, {wxListbook, new_0, 0}},
- {1938, {wxListbook, new_3, 3}},
- {1939, {wxListbook, addPage, 3}},
- {1940, {wxListbook, advanceSelection, 1}},
- {1941, {wxListbook, assignImageList, 1}},
- {1942, {wxListbook, create, 3}},
- {1943, {wxListbook, deleteAllPages, 0}},
- {1944, {wxListbook, deletePage, 1}},
- {1945, {wxListbook, removePage, 1}},
- {1946, {wxListbook, getCurrentPage, 0}},
- {1947, {wxListbook, getImageList, 0}},
- {1949, {wxListbook, getPage, 1}},
- {1950, {wxListbook, getPageCount, 0}},
- {1951, {wxListbook, getPageImage, 1}},
- {1952, {wxListbook, getPageText, 1}},
- {1953, {wxListbook, getSelection, 0}},
- {1955, {wxListbook, hitTest, 2}},
- {1956, {wxListbook, insertPage, 4}},
- {1957, {wxListbook, setImageList, 1}},
- {1958, {wxListbook, setPageSize, 1}},
- {1959, {wxListbook, setPageImage, 2}},
- {1960, {wxListbook, setPageText, 2}},
- {1961, {wxListbook, setSelection, 1}},
- {1962, {wxListbook, changeSelection, 1}},
- {1963, {wxListbook, 'Destroy', undefined}},
- {1964, {wxTreebook, new_0, 0}},
- {1965, {wxTreebook, new_3, 3}},
- {1966, {wxTreebook, addPage, 3}},
- {1967, {wxTreebook, advanceSelection, 1}},
- {1968, {wxTreebook, assignImageList, 1}},
- {1969, {wxTreebook, create, 3}},
- {1970, {wxTreebook, deleteAllPages, 0}},
- {1971, {wxTreebook, deletePage, 1}},
- {1972, {wxTreebook, removePage, 1}},
- {1973, {wxTreebook, getCurrentPage, 0}},
- {1974, {wxTreebook, getImageList, 0}},
- {1976, {wxTreebook, getPage, 1}},
- {1977, {wxTreebook, getPageCount, 0}},
- {1978, {wxTreebook, getPageImage, 1}},
- {1979, {wxTreebook, getPageText, 1}},
- {1980, {wxTreebook, getSelection, 0}},
- {1981, {wxTreebook, expandNode, 2}},
- {1982, {wxTreebook, isNodeExpanded, 1}},
- {1984, {wxTreebook, hitTest, 2}},
- {1985, {wxTreebook, insertPage, 4}},
- {1986, {wxTreebook, insertSubPage, 4}},
- {1987, {wxTreebook, setImageList, 1}},
- {1988, {wxTreebook, setPageSize, 1}},
- {1989, {wxTreebook, setPageImage, 2}},
- {1990, {wxTreebook, setPageText, 2}},
- {1991, {wxTreebook, setSelection, 1}},
- {1992, {wxTreebook, changeSelection, 1}},
- {1993, {wxTreebook, 'Destroy', undefined}},
- {1996, {wxTreeCtrl, new_2, 2}},
- {1997, {wxTreeCtrl, new_0, 0}},
- {1999, {wxTreeCtrl, destruct, 0}},
- {2000, {wxTreeCtrl, addRoot, 2}},
- {2001, {wxTreeCtrl, appendItem, 3}},
- {2002, {wxTreeCtrl, assignImageList, 1}},
- {2003, {wxTreeCtrl, assignStateImageList, 1}},
- {2004, {wxTreeCtrl, collapse, 1}},
- {2005, {wxTreeCtrl, collapseAndReset, 1}},
- {2006, {wxTreeCtrl, create, 2}},
- {2007, {wxTreeCtrl, delete, 1}},
- {2008, {wxTreeCtrl, deleteAllItems, 0}},
- {2009, {wxTreeCtrl, deleteChildren, 1}},
- {2010, {wxTreeCtrl, editLabel, 1}},
- {2011, {wxTreeCtrl, ensureVisible, 1}},
- {2012, {wxTreeCtrl, expand, 1}},
- {2013, {wxTreeCtrl, getBoundingRect, 3}},
- {2015, {wxTreeCtrl, getChildrenCount, 2}},
- {2016, {wxTreeCtrl, getCount, 0}},
- {2017, {wxTreeCtrl, getEditControl, 0}},
- {2018, {wxTreeCtrl, getFirstChild, 2}},
- {2019, {wxTreeCtrl, getNextChild, 2}},
- {2020, {wxTreeCtrl, getFirstVisibleItem, 0}},
- {2021, {wxTreeCtrl, getImageList, 0}},
- {2022, {wxTreeCtrl, getIndent, 0}},
- {2023, {wxTreeCtrl, getItemBackgroundColour, 1}},
- {2024, {wxTreeCtrl, getItemData, 1}},
- {2025, {wxTreeCtrl, getItemFont, 1}},
- {2026, {wxTreeCtrl, getItemImage_1, 1}},
- {2027, {wxTreeCtrl, getItemImage_2, 2}},
- {2028, {wxTreeCtrl, getItemText, 1}},
- {2029, {wxTreeCtrl, getItemTextColour, 1}},
- {2030, {wxTreeCtrl, getLastChild, 1}},
- {2031, {wxTreeCtrl, getNextSibling, 1}},
- {2032, {wxTreeCtrl, getNextVisible, 1}},
- {2033, {wxTreeCtrl, getItemParent, 1}},
- {2034, {wxTreeCtrl, getPrevSibling, 1}},
- {2035, {wxTreeCtrl, getPrevVisible, 1}},
- {2036, {wxTreeCtrl, getRootItem, 0}},
- {2037, {wxTreeCtrl, getSelection, 0}},
- {2038, {wxTreeCtrl, getSelections, 1}},
- {2039, {wxTreeCtrl, getStateImageList, 0}},
- {2040, {wxTreeCtrl, hitTest, 1}},
- {2042, {wxTreeCtrl, insertItem, 4}},
- {2043, {wxTreeCtrl, isBold, 1}},
- {2044, {wxTreeCtrl, isExpanded, 1}},
- {2045, {wxTreeCtrl, isSelected, 1}},
- {2046, {wxTreeCtrl, isVisible, 1}},
- {2047, {wxTreeCtrl, itemHasChildren, 1}},
- {2048, {wxTreeCtrl, prependItem, 3}},
- {2049, {wxTreeCtrl, scrollTo, 1}},
- {2050, {wxTreeCtrl, selectItem_1, 1}},
- {2051, {wxTreeCtrl, selectItem_2, 2}},
- {2052, {wxTreeCtrl, setIndent, 1}},
- {2053, {wxTreeCtrl, setImageList, 1}},
- {2054, {wxTreeCtrl, setItemBackgroundColour, 2}},
- {2055, {wxTreeCtrl, setItemBold, 2}},
- {2056, {wxTreeCtrl, setItemData, 2}},
- {2057, {wxTreeCtrl, setItemDropHighlight, 2}},
- {2058, {wxTreeCtrl, setItemFont, 2}},
- {2059, {wxTreeCtrl, setItemHasChildren, 2}},
- {2060, {wxTreeCtrl, setItemImage_2, 2}},
- {2061, {wxTreeCtrl, setItemImage_3, 3}},
- {2062, {wxTreeCtrl, setItemText, 2}},
- {2063, {wxTreeCtrl, setItemTextColour, 2}},
- {2064, {wxTreeCtrl, setStateImageList, 1}},
- {2065, {wxTreeCtrl, setWindowStyle, 1}},
- {2066, {wxTreeCtrl, sortChildren, 1}},
- {2067, {wxTreeCtrl, toggle, 1}},
- {2068, {wxTreeCtrl, toggleItemSelection, 1}},
- {2069, {wxTreeCtrl, unselect, 0}},
- {2070, {wxTreeCtrl, unselectAll, 0}},
- {2071, {wxTreeCtrl, unselectItem, 1}},
- {2072, {wxScrollBar, new_0, 0}},
- {2073, {wxScrollBar, new_3, 3}},
- {2074, {wxScrollBar, destruct, 0}},
- {2075, {wxScrollBar, create, 3}},
- {2076, {wxScrollBar, getRange, 0}},
- {2077, {wxScrollBar, getPageSize, 0}},
- {2078, {wxScrollBar, getThumbPosition, 0}},
- {2079, {wxScrollBar, getThumbSize, 0}},
- {2080, {wxScrollBar, setThumbPosition, 1}},
- {2081, {wxScrollBar, setScrollbar, 5}},
- {2083, {wxSpinButton, new_2, 2}},
- {2084, {wxSpinButton, new_0, 0}},
- {2085, {wxSpinButton, create, 2}},
- {2086, {wxSpinButton, getMax, 0}},
- {2087, {wxSpinButton, getMin, 0}},
- {2088, {wxSpinButton, getValue, 0}},
- {2089, {wxSpinButton, setRange, 2}},
- {2090, {wxSpinButton, setValue, 1}},
- {2091, {wxSpinButton, 'Destroy', undefined}},
- {2092, {wxSpinCtrl, new_0, 0}},
- {2093, {wxSpinCtrl, new_2, 2}},
- {2095, {wxSpinCtrl, create, 2}},
- {2098, {wxSpinCtrl, setValue_1_1, 1}},
- {2099, {wxSpinCtrl, setValue_1_0, 1}},
- {2101, {wxSpinCtrl, getValue, 0}},
- {2103, {wxSpinCtrl, setRange, 2}},
- {2104, {wxSpinCtrl, setSelection, 2}},
- {2106, {wxSpinCtrl, getMin, 0}},
- {2108, {wxSpinCtrl, getMax, 0}},
- {2109, {wxSpinCtrl, 'Destroy', undefined}},
- {2110, {wxStaticText, new_0, 0}},
- {2111, {wxStaticText, new_4, 4}},
- {2112, {wxStaticText, create, 4}},
- {2113, {wxStaticText, getLabel, 0}},
- {2114, {wxStaticText, setLabel, 1}},
- {2115, {wxStaticText, wrap, 1}},
- {2116, {wxStaticText, 'Destroy', undefined}},
- {2117, {wxStaticBitmap, new_0, 0}},
- {2118, {wxStaticBitmap, new_4, 4}},
- {2119, {wxStaticBitmap, create, 4}},
- {2120, {wxStaticBitmap, getBitmap, 0}},
- {2121, {wxStaticBitmap, setBitmap, 1}},
- {2122, {wxStaticBitmap, 'Destroy', undefined}},
- {2123, {wxRadioBox, new, 7}},
- {2125, {wxRadioBox, destruct, 0}},
- {2126, {wxRadioBox, create, 7}},
- {2127, {wxRadioBox, enable_2, 2}},
- {2128, {wxRadioBox, enable_1, 1}},
- {2129, {wxRadioBox, getSelection, 0}},
- {2130, {wxRadioBox, getString, 1}},
- {2131, {wxRadioBox, setSelection, 1}},
- {2132, {wxRadioBox, show_2, 2}},
- {2133, {wxRadioBox, show_1, 1}},
- {2134, {wxRadioBox, getColumnCount, 0}},
- {2135, {wxRadioBox, getItemHelpText, 1}},
- {2136, {wxRadioBox, getItemToolTip, 1}},
- {2138, {wxRadioBox, getItemFromPoint, 1}},
- {2139, {wxRadioBox, getRowCount, 0}},
- {2140, {wxRadioBox, isItemEnabled, 1}},
- {2141, {wxRadioBox, isItemShown, 1}},
- {2142, {wxRadioBox, setItemHelpText, 2}},
- {2143, {wxRadioBox, setItemToolTip, 2}},
- {2144, {wxRadioButton, new_0, 0}},
- {2145, {wxRadioButton, new_4, 4}},
- {2146, {wxRadioButton, create, 4}},
- {2147, {wxRadioButton, getValue, 0}},
- {2148, {wxRadioButton, setValue, 1}},
- {2149, {wxRadioButton, 'Destroy', undefined}},
- {2151, {wxSlider, new_6, 6}},
- {2152, {wxSlider, new_0, 0}},
- {2153, {wxSlider, create, 6}},
- {2154, {wxSlider, getLineSize, 0}},
- {2155, {wxSlider, getMax, 0}},
- {2156, {wxSlider, getMin, 0}},
- {2157, {wxSlider, getPageSize, 0}},
- {2158, {wxSlider, getThumbLength, 0}},
- {2159, {wxSlider, getValue, 0}},
- {2160, {wxSlider, setLineSize, 1}},
- {2161, {wxSlider, setPageSize, 1}},
- {2162, {wxSlider, setRange, 2}},
- {2163, {wxSlider, setThumbLength, 1}},
- {2164, {wxSlider, setValue, 1}},
- {2165, {wxSlider, 'Destroy', undefined}},
- {2167, {wxDialog, new_4, 4}},
- {2168, {wxDialog, new_0, 0}},
- {2170, {wxDialog, destruct, 0}},
- {2171, {wxDialog, create, 4}},
- {2172, {wxDialog, createButtonSizer, 1}},
- {2173, {wxDialog, createStdDialogButtonSizer, 1}},
- {2174, {wxDialog, endModal, 1}},
- {2175, {wxDialog, getAffirmativeId, 0}},
- {2176, {wxDialog, getReturnCode, 0}},
- {2177, {wxDialog, isModal, 0}},
- {2178, {wxDialog, setAffirmativeId, 1}},
- {2179, {wxDialog, setReturnCode, 1}},
- {2180, {wxDialog, show, 1}},
- {2181, {wxDialog, showModal, 0}},
- {2182, {wxColourDialog, new_0, 0}},
- {2183, {wxColourDialog, new_2, 2}},
- {2184, {wxColourDialog, destruct, 0}},
- {2185, {wxColourDialog, create, 2}},
- {2186, {wxColourDialog, getColourData, 0}},
- {2187, {wxColourData, new_0, 0}},
- {2188, {wxColourData, new_1, 1}},
- {2189, {wxColourData, destruct, 0}},
- {2190, {wxColourData, getChooseFull, 0}},
- {2191, {wxColourData, getColour, 0}},
- {2193, {wxColourData, getCustomColour, 1}},
- {2194, {wxColourData, setChooseFull, 1}},
- {2195, {wxColourData, setColour, 1}},
- {2196, {wxColourData, setCustomColour, 2}},
- {2197, {wxPalette, new_0, 0}},
- {2198, {wxPalette, new_4, 4}},
- {2200, {wxPalette, destruct, 0}},
- {2201, {wxPalette, create, 4}},
- {2202, {wxPalette, getColoursCount, 0}},
- {2203, {wxPalette, getPixel, 3}},
- {2204, {wxPalette, getRGB, 4}},
- {2205, {wxPalette, isOk, 0}},
- {2209, {wxDirDialog, new, 2}},
- {2210, {wxDirDialog, destruct, 0}},
- {2211, {wxDirDialog, getPath, 0}},
- {2212, {wxDirDialog, getMessage, 0}},
- {2213, {wxDirDialog, setMessage, 1}},
- {2214, {wxDirDialog, setPath, 1}},
- {2218, {wxFileDialog, new, 2}},
- {2219, {wxFileDialog, destruct, 0}},
- {2220, {wxFileDialog, getDirectory, 0}},
- {2221, {wxFileDialog, getFilename, 0}},
- {2222, {wxFileDialog, getFilenames, 1}},
- {2223, {wxFileDialog, getFilterIndex, 0}},
- {2224, {wxFileDialog, getMessage, 0}},
- {2225, {wxFileDialog, getPath, 0}},
- {2226, {wxFileDialog, getPaths, 1}},
- {2227, {wxFileDialog, getWildcard, 0}},
- {2228, {wxFileDialog, setDirectory, 1}},
- {2229, {wxFileDialog, setFilename, 1}},
- {2230, {wxFileDialog, setFilterIndex, 1}},
- {2231, {wxFileDialog, setMessage, 1}},
- {2232, {wxFileDialog, setPath, 1}},
- {2233, {wxFileDialog, setWildcard, 1}},
- {2234, {wxPickerBase, setInternalMargin, 1}},
- {2235, {wxPickerBase, getInternalMargin, 0}},
- {2236, {wxPickerBase, setTextCtrlProportion, 1}},
- {2237, {wxPickerBase, setPickerCtrlProportion, 1}},
- {2238, {wxPickerBase, getTextCtrlProportion, 0}},
- {2239, {wxPickerBase, getPickerCtrlProportion, 0}},
- {2240, {wxPickerBase, hasTextCtrl, 0}},
- {2241, {wxPickerBase, getTextCtrl, 0}},
- {2242, {wxPickerBase, isTextCtrlGrowable, 0}},
- {2243, {wxPickerBase, setPickerCtrlGrowable, 1}},
- {2244, {wxPickerBase, setTextCtrlGrowable, 1}},
- {2245, {wxPickerBase, isPickerCtrlGrowable, 0}},
- {2246, {wxFilePickerCtrl, new_0, 0}},
- {2247, {wxFilePickerCtrl, new_3, 3}},
- {2248, {wxFilePickerCtrl, create, 3}},
- {2249, {wxFilePickerCtrl, getPath, 0}},
- {2250, {wxFilePickerCtrl, setPath, 1}},
- {2251, {wxFilePickerCtrl, 'Destroy', undefined}},
- {2252, {wxDirPickerCtrl, new_0, 0}},
- {2253, {wxDirPickerCtrl, new_3, 3}},
- {2254, {wxDirPickerCtrl, create, 3}},
- {2255, {wxDirPickerCtrl, getPath, 0}},
- {2256, {wxDirPickerCtrl, setPath, 1}},
- {2257, {wxDirPickerCtrl, 'Destroy', undefined}},
- {2258, {wxColourPickerCtrl, new_0, 0}},
- {2259, {wxColourPickerCtrl, new_3, 3}},
- {2260, {wxColourPickerCtrl, create, 3}},
- {2261, {wxColourPickerCtrl, getColour, 0}},
- {2262, {wxColourPickerCtrl, setColour_1_1, 1}},
- {2263, {wxColourPickerCtrl, setColour_1_0, 1}},
- {2264, {wxColourPickerCtrl, 'Destroy', undefined}},
- {2265, {wxDatePickerCtrl, new_0, 0}},
- {2266, {wxDatePickerCtrl, new_3, 3}},
- {2267, {wxDatePickerCtrl, getRange, 2}},
- {2268, {wxDatePickerCtrl, getValue, 0}},
- {2269, {wxDatePickerCtrl, setRange, 2}},
- {2270, {wxDatePickerCtrl, setValue, 1}},
- {2271, {wxDatePickerCtrl, 'Destroy', undefined}},
- {2272, {wxFontPickerCtrl, new_0, 0}},
- {2273, {wxFontPickerCtrl, new_3, 3}},
- {2274, {wxFontPickerCtrl, create, 3}},
- {2275, {wxFontPickerCtrl, getSelectedFont, 0}},
- {2276, {wxFontPickerCtrl, setSelectedFont, 1}},
- {2277, {wxFontPickerCtrl, getMaxPointSize, 0}},
- {2278, {wxFontPickerCtrl, setMaxPointSize, 1}},
- {2279, {wxFontPickerCtrl, 'Destroy', undefined}},
- {2282, {wxFindReplaceDialog, new_0, 0}},
- {2283, {wxFindReplaceDialog, new_4, 4}},
- {2284, {wxFindReplaceDialog, destruct, 0}},
- {2285, {wxFindReplaceDialog, create, 4}},
- {2286, {wxFindReplaceDialog, getData, 0}},
- {2287, {wxFindReplaceData, new_0, 0}},
- {2288, {wxFindReplaceData, new_1, 1}},
- {2289, {wxFindReplaceData, getFindString, 0}},
- {2290, {wxFindReplaceData, getReplaceString, 0}},
- {2291, {wxFindReplaceData, getFlags, 0}},
- {2292, {wxFindReplaceData, setFlags, 1}},
- {2293, {wxFindReplaceData, setFindString, 1}},
- {2294, {wxFindReplaceData, setReplaceString, 1}},
- {2295, {wxFindReplaceData, 'Destroy', undefined}},
- {2296, {wxMultiChoiceDialog, new_0, 0}},
- {2298, {wxMultiChoiceDialog, new_5, 5}},
- {2299, {wxMultiChoiceDialog, getSelections, 0}},
- {2300, {wxMultiChoiceDialog, setSelections, 1}},
- {2301, {wxMultiChoiceDialog, 'Destroy', undefined}},
- {2302, {wxSingleChoiceDialog, new_0, 0}},
- {2304, {wxSingleChoiceDialog, new_5, 5}},
- {2305, {wxSingleChoiceDialog, getSelection, 0}},
- {2306, {wxSingleChoiceDialog, getStringSelection, 0}},
- {2307, {wxSingleChoiceDialog, setSelection, 1}},
- {2308, {wxSingleChoiceDialog, 'Destroy', undefined}},
- {2309, {wxTextEntryDialog, new, 3}},
- {2310, {wxTextEntryDialog, getValue, 0}},
- {2311, {wxTextEntryDialog, setValue, 1}},
- {2312, {wxTextEntryDialog, 'Destroy', undefined}},
- {2313, {wxPasswordEntryDialog, new, 3}},
- {2314, {wxPasswordEntryDialog, 'Destroy', undefined}},
- {2315, {wxFontData, new_0, 0}},
- {2316, {wxFontData, new_1, 1}},
- {2317, {wxFontData, destruct, 0}},
- {2318, {wxFontData, enableEffects, 1}},
- {2319, {wxFontData, getAllowSymbols, 0}},
- {2320, {wxFontData, getColour, 0}},
- {2321, {wxFontData, getChosenFont, 0}},
- {2322, {wxFontData, getEnableEffects, 0}},
- {2323, {wxFontData, getInitialFont, 0}},
- {2324, {wxFontData, getShowHelp, 0}},
- {2325, {wxFontData, setAllowSymbols, 1}},
- {2326, {wxFontData, setChosenFont, 1}},
- {2327, {wxFontData, setColour, 1}},
- {2328, {wxFontData, setInitialFont, 1}},
- {2329, {wxFontData, setRange, 2}},
- {2330, {wxFontData, setShowHelp, 1}},
- {2334, {wxFontDialog, new_0, 0}},
- {2336, {wxFontDialog, new_2, 2}},
- {2338, {wxFontDialog, create, 2}},
- {2339, {wxFontDialog, getFontData, 0}},
- {2341, {wxFontDialog, 'Destroy', undefined}},
- {2342, {wxProgressDialog, new, 3}},
- {2343, {wxProgressDialog, destruct, 0}},
- {2344, {wxProgressDialog, resume, 0}},
- {2345, {wxProgressDialog, update_2, 2}},
- {2346, {wxProgressDialog, update_0, 0}},
- {2347, {wxMessageDialog, new, 3}},
- {2348, {wxMessageDialog, destruct, 0}},
- {2349, {wxPageSetupDialog, new, 2}},
- {2350, {wxPageSetupDialog, destruct, 0}},
- {2351, {wxPageSetupDialog, getPageSetupData, 0}},
- {2352, {wxPageSetupDialog, showModal, 0}},
- {2353, {wxPageSetupDialogData, new_0, 0}},
- {2354, {wxPageSetupDialogData, new_1_0, 1}},
- {2355, {wxPageSetupDialogData, new_1_1, 1}},
- {2356, {wxPageSetupDialogData, destruct, 0}},
- {2357, {wxPageSetupDialogData, enableHelp, 1}},
- {2358, {wxPageSetupDialogData, enableMargins, 1}},
- {2359, {wxPageSetupDialogData, enableOrientation, 1}},
- {2360, {wxPageSetupDialogData, enablePaper, 1}},
- {2361, {wxPageSetupDialogData, enablePrinter, 1}},
- {2362, {wxPageSetupDialogData, getDefaultMinMargins, 0}},
- {2363, {wxPageSetupDialogData, getEnableMargins, 0}},
- {2364, {wxPageSetupDialogData, getEnableOrientation, 0}},
- {2365, {wxPageSetupDialogData, getEnablePaper, 0}},
- {2366, {wxPageSetupDialogData, getEnablePrinter, 0}},
- {2367, {wxPageSetupDialogData, getEnableHelp, 0}},
- {2368, {wxPageSetupDialogData, getDefaultInfo, 0}},
- {2369, {wxPageSetupDialogData, getMarginTopLeft, 0}},
- {2370, {wxPageSetupDialogData, getMarginBottomRight, 0}},
- {2371, {wxPageSetupDialogData, getMinMarginTopLeft, 0}},
- {2372, {wxPageSetupDialogData, getMinMarginBottomRight, 0}},
- {2373, {wxPageSetupDialogData, getPaperId, 0}},
- {2374, {wxPageSetupDialogData, getPaperSize, 0}},
- {2376, {wxPageSetupDialogData, getPrintData, 0}},
- {2377, {wxPageSetupDialogData, isOk, 0}},
- {2378, {wxPageSetupDialogData, setDefaultInfo, 1}},
- {2379, {wxPageSetupDialogData, setDefaultMinMargins, 1}},
- {2380, {wxPageSetupDialogData, setMarginTopLeft, 1}},
- {2381, {wxPageSetupDialogData, setMarginBottomRight, 1}},
- {2382, {wxPageSetupDialogData, setMinMarginTopLeft, 1}},
- {2383, {wxPageSetupDialogData, setMinMarginBottomRight, 1}},
- {2384, {wxPageSetupDialogData, setPaperId, 1}},
- {2385, {wxPageSetupDialogData, setPaperSize_1_1, 1}},
- {2386, {wxPageSetupDialogData, setPaperSize_1_0, 1}},
- {2387, {wxPageSetupDialogData, setPrintData, 1}},
- {2388, {wxPrintDialog, new_2_0, 2}},
- {2389, {wxPrintDialog, new_2_1, 2}},
- {2390, {wxPrintDialog, destruct, 0}},
- {2391, {wxPrintDialog, getPrintDialogData, 0}},
- {2392, {wxPrintDialog, getPrintDC, 0}},
- {2393, {wxPrintDialogData, new_0, 0}},
- {2394, {wxPrintDialogData, new_1_1, 1}},
- {2395, {wxPrintDialogData, new_1_0, 1}},
- {2396, {wxPrintDialogData, destruct, 0}},
- {2397, {wxPrintDialogData, enableHelp, 1}},
- {2398, {wxPrintDialogData, enablePageNumbers, 1}},
- {2399, {wxPrintDialogData, enablePrintToFile, 1}},
- {2400, {wxPrintDialogData, enableSelection, 1}},
- {2401, {wxPrintDialogData, getAllPages, 0}},
- {2402, {wxPrintDialogData, getCollate, 0}},
- {2403, {wxPrintDialogData, getFromPage, 0}},
- {2404, {wxPrintDialogData, getMaxPage, 0}},
- {2405, {wxPrintDialogData, getMinPage, 0}},
- {2406, {wxPrintDialogData, getNoCopies, 0}},
- {2407, {wxPrintDialogData, getPrintData, 0}},
- {2408, {wxPrintDialogData, getPrintToFile, 0}},
- {2409, {wxPrintDialogData, getSelection, 0}},
- {2410, {wxPrintDialogData, getToPage, 0}},
- {2411, {wxPrintDialogData, isOk, 0}},
- {2412, {wxPrintDialogData, setCollate, 1}},
- {2413, {wxPrintDialogData, setFromPage, 1}},
- {2414, {wxPrintDialogData, setMaxPage, 1}},
- {2415, {wxPrintDialogData, setMinPage, 1}},
- {2416, {wxPrintDialogData, setNoCopies, 1}},
- {2417, {wxPrintDialogData, setPrintData, 1}},
- {2418, {wxPrintDialogData, setPrintToFile, 1}},
- {2419, {wxPrintDialogData, setSelection, 1}},
- {2420, {wxPrintDialogData, setToPage, 1}},
- {2421, {wxPrintData, new_0, 0}},
- {2422, {wxPrintData, new_1, 1}},
- {2423, {wxPrintData, destruct, 0}},
- {2424, {wxPrintData, getCollate, 0}},
- {2425, {wxPrintData, getBin, 0}},
- {2426, {wxPrintData, getColour, 0}},
- {2427, {wxPrintData, getDuplex, 0}},
- {2428, {wxPrintData, getNoCopies, 0}},
- {2429, {wxPrintData, getOrientation, 0}},
- {2430, {wxPrintData, getPaperId, 0}},
- {2431, {wxPrintData, getPrinterName, 0}},
- {2432, {wxPrintData, getQuality, 0}},
- {2433, {wxPrintData, isOk, 0}},
- {2434, {wxPrintData, setBin, 1}},
- {2435, {wxPrintData, setCollate, 1}},
- {2436, {wxPrintData, setColour, 1}},
- {2437, {wxPrintData, setDuplex, 1}},
- {2438, {wxPrintData, setNoCopies, 1}},
- {2439, {wxPrintData, setOrientation, 1}},
- {2440, {wxPrintData, setPaperId, 1}},
- {2441, {wxPrintData, setPrinterName, 1}},
- {2442, {wxPrintData, setQuality, 1}},
- {2445, {wxPrintPreview, new_2, 2}},
- {2446, {wxPrintPreview, new_3, 3}},
- {2448, {wxPrintPreview, destruct, 0}},
- {2449, {wxPrintPreview, getCanvas, 0}},
- {2450, {wxPrintPreview, getCurrentPage, 0}},
- {2451, {wxPrintPreview, getFrame, 0}},
- {2452, {wxPrintPreview, getMaxPage, 0}},
- {2453, {wxPrintPreview, getMinPage, 0}},
- {2454, {wxPrintPreview, getPrintout, 0}},
- {2455, {wxPrintPreview, getPrintoutForPrinting, 0}},
- {2456, {wxPrintPreview, isOk, 0}},
- {2457, {wxPrintPreview, paintPage, 2}},
- {2458, {wxPrintPreview, print, 1}},
- {2459, {wxPrintPreview, renderPage, 1}},
- {2460, {wxPrintPreview, setCanvas, 1}},
- {2461, {wxPrintPreview, setCurrentPage, 1}},
- {2462, {wxPrintPreview, setFrame, 1}},
- {2463, {wxPrintPreview, setPrintout, 1}},
- {2464, {wxPrintPreview, setZoom, 1}},
- {2465, {wxPreviewFrame, new, 3}},
- {2466, {wxPreviewFrame, destruct, 0}},
- {2467, {wxPreviewFrame, createControlBar, 0}},
- {2468, {wxPreviewFrame, createCanvas, 0}},
- {2469, {wxPreviewFrame, initialize, 0}},
- {2470, {wxPreviewFrame, onCloseWindow, 1}},
- {2471, {wxPreviewControlBar, new, 4}},
- {2472, {wxPreviewControlBar, destruct, 0}},
- {2473, {wxPreviewControlBar, createButtons, 0}},
- {2474, {wxPreviewControlBar, getPrintPreview, 0}},
- {2475, {wxPreviewControlBar, getZoomControl, 0}},
- {2476, {wxPreviewControlBar, setZoomControl, 1}},
- {2478, {wxPrinter, new, 1}},
- {2479, {wxPrinter, createAbortWindow, 2}},
- {2480, {wxPrinter, getAbort, 0}},
- {2481, {wxPrinter, getLastError, 0}},
- {2482, {wxPrinter, getPrintDialogData, 0}},
- {2483, {wxPrinter, print, 3}},
- {2484, {wxPrinter, printDialog, 1}},
- {2485, {wxPrinter, reportError, 3}},
- {2486, {wxPrinter, setup, 1}},
- {2487, {wxPrinter, 'Destroy', undefined}},
- {2488, {wxXmlResource, new_1, 1}},
- {2489, {wxXmlResource, new_2, 2}},
- {2490, {wxXmlResource, destruct, 0}},
- {2491, {wxXmlResource, attachUnknownControl, 3}},
- {2492, {wxXmlResource, clearHandlers, 0}},
- {2493, {wxXmlResource, compareVersion, 4}},
- {2494, {wxXmlResource, get, 0}},
- {2495, {wxXmlResource, getFlags, 0}},
- {2496, {wxXmlResource, getVersion, 0}},
- {2497, {wxXmlResource, getXRCID, 2}},
- {2498, {wxXmlResource, initAllHandlers, 0}},
- {2499, {wxXmlResource, load, 1}},
- {2500, {wxXmlResource, loadBitmap, 1}},
- {2501, {wxXmlResource, loadDialog_2, 2}},
- {2502, {wxXmlResource, loadDialog_3, 3}},
- {2503, {wxXmlResource, loadFrame_2, 2}},
- {2504, {wxXmlResource, loadFrame_3, 3}},
- {2505, {wxXmlResource, loadIcon, 1}},
- {2506, {wxXmlResource, loadMenu, 1}},
- {2507, {wxXmlResource, loadMenuBar_2, 2}},
- {2508, {wxXmlResource, loadMenuBar_1, 1}},
- {2509, {wxXmlResource, loadPanel_2, 2}},
- {2510, {wxXmlResource, loadPanel_3, 3}},
- {2511, {wxXmlResource, loadToolBar, 2}},
- {2512, {wxXmlResource, set, 1}},
- {2513, {wxXmlResource, setFlags, 1}},
- {2514, {wxXmlResource, unload, 1}},
- {2515, {wxXmlResource, xrcctrl, 3}},
- {2516, {wxHtmlEasyPrinting, new, 1}},
- {2517, {wxHtmlEasyPrinting, destruct, 0}},
- {2518, {wxHtmlEasyPrinting, getPrintData, 0}},
- {2519, {wxHtmlEasyPrinting, getPageSetupData, 0}},
- {2520, {wxHtmlEasyPrinting, previewFile, 1}},
- {2521, {wxHtmlEasyPrinting, previewText, 2}},
- {2522, {wxHtmlEasyPrinting, printFile, 1}},
- {2523, {wxHtmlEasyPrinting, printText, 2}},
- {2524, {wxHtmlEasyPrinting, pageSetup, 0}},
- {2525, {wxHtmlEasyPrinting, setFonts, 3}},
- {2526, {wxHtmlEasyPrinting, setHeader, 2}},
- {2527, {wxHtmlEasyPrinting, setFooter, 2}},
- {2529, {wxGLCanvas, new_2, 2}},
- {2530, {wxGLCanvas, new_3_1, 3}},
- {2531, {wxGLCanvas, new_3_0, 3}},
- {2532, {wxGLCanvas, getContext, 0}},
- {2534, {wxGLCanvas, setCurrent, 0}},
- {2535, {wxGLCanvas, swapBuffers, 0}},
- {2536, {wxGLCanvas, 'Destroy', undefined}},
- {2537, {wxAuiManager, new, 1}},
- {2538, {wxAuiManager, destruct, 0}},
- {2539, {wxAuiManager, addPane_2_1, 2}},
- {2540, {wxAuiManager, addPane_3, 3}},
- {2541, {wxAuiManager, addPane_2_0, 2}},
- {2542, {wxAuiManager, detachPane, 1}},
- {2543, {wxAuiManager, getAllPanes, 0}},
- {2544, {wxAuiManager, getArtProvider, 0}},
- {2545, {wxAuiManager, getDockSizeConstraint, 2}},
- {2546, {wxAuiManager, getFlags, 0}},
- {2547, {wxAuiManager, getManagedWindow, 0}},
- {2548, {wxAuiManager, getManager, 1}},
- {2549, {wxAuiManager, getPane_1_1, 1}},
- {2550, {wxAuiManager, getPane_1_0, 1}},
- {2551, {wxAuiManager, hideHint, 0}},
- {2552, {wxAuiManager, insertPane, 3}},
- {2553, {wxAuiManager, loadPaneInfo, 2}},
- {2554, {wxAuiManager, loadPerspective, 2}},
- {2555, {wxAuiManager, savePaneInfo, 1}},
- {2556, {wxAuiManager, savePerspective, 0}},
- {2557, {wxAuiManager, setArtProvider, 1}},
- {2558, {wxAuiManager, setDockSizeConstraint, 2}},
- {2559, {wxAuiManager, setFlags, 1}},
- {2560, {wxAuiManager, setManagedWindow, 1}},
- {2561, {wxAuiManager, showHint, 1}},
- {2562, {wxAuiManager, unInit, 0}},
- {2563, {wxAuiManager, update, 0}},
- {2564, {wxAuiPaneInfo, new_0, 0}},
- {2565, {wxAuiPaneInfo, new_1, 1}},
- {2566, {wxAuiPaneInfo, destruct, 0}},
- {2567, {wxAuiPaneInfo, bestSize_1, 1}},
- {2568, {wxAuiPaneInfo, bestSize_2, 2}},
- {2569, {wxAuiPaneInfo, bottom, 0}},
- {2570, {wxAuiPaneInfo, bottomDockable, 1}},
- {2571, {wxAuiPaneInfo, caption, 1}},
- {2572, {wxAuiPaneInfo, captionVisible, 1}},
- {2573, {wxAuiPaneInfo, centre, 0}},
- {2574, {wxAuiPaneInfo, centrePane, 0}},
- {2575, {wxAuiPaneInfo, closeButton, 1}},
- {2576, {wxAuiPaneInfo, defaultPane, 0}},
- {2577, {wxAuiPaneInfo, destroyOnClose, 1}},
- {2578, {wxAuiPaneInfo, direction, 1}},
- {2579, {wxAuiPaneInfo, dock, 0}},
- {2580, {wxAuiPaneInfo, dockable, 1}},
- {2581, {wxAuiPaneInfo, fixed, 0}},
- {2582, {wxAuiPaneInfo, float, 0}},
- {2583, {wxAuiPaneInfo, floatable, 1}},
- {2584, {wxAuiPaneInfo, floatingPosition_1, 1}},
- {2585, {wxAuiPaneInfo, floatingPosition_2, 2}},
- {2586, {wxAuiPaneInfo, floatingSize_1, 1}},
- {2587, {wxAuiPaneInfo, floatingSize_2, 2}},
- {2588, {wxAuiPaneInfo, gripper, 1}},
- {2589, {wxAuiPaneInfo, gripperTop, 1}},
- {2590, {wxAuiPaneInfo, hasBorder, 0}},
- {2591, {wxAuiPaneInfo, hasCaption, 0}},
- {2592, {wxAuiPaneInfo, hasCloseButton, 0}},
- {2593, {wxAuiPaneInfo, hasFlag, 1}},
- {2594, {wxAuiPaneInfo, hasGripper, 0}},
- {2595, {wxAuiPaneInfo, hasGripperTop, 0}},
- {2596, {wxAuiPaneInfo, hasMaximizeButton, 0}},
- {2597, {wxAuiPaneInfo, hasMinimizeButton, 0}},
- {2598, {wxAuiPaneInfo, hasPinButton, 0}},
- {2599, {wxAuiPaneInfo, hide, 0}},
- {2600, {wxAuiPaneInfo, isBottomDockable, 0}},
- {2601, {wxAuiPaneInfo, isDocked, 0}},
- {2602, {wxAuiPaneInfo, isFixed, 0}},
- {2603, {wxAuiPaneInfo, isFloatable, 0}},
- {2604, {wxAuiPaneInfo, isFloating, 0}},
- {2605, {wxAuiPaneInfo, isLeftDockable, 0}},
- {2606, {wxAuiPaneInfo, isMovable, 0}},
- {2607, {wxAuiPaneInfo, isOk, 0}},
- {2608, {wxAuiPaneInfo, isResizable, 0}},
- {2609, {wxAuiPaneInfo, isRightDockable, 0}},
- {2610, {wxAuiPaneInfo, isShown, 0}},
- {2611, {wxAuiPaneInfo, isToolbar, 0}},
- {2612, {wxAuiPaneInfo, isTopDockable, 0}},
- {2613, {wxAuiPaneInfo, layer, 1}},
- {2614, {wxAuiPaneInfo, left, 0}},
- {2615, {wxAuiPaneInfo, leftDockable, 1}},
- {2616, {wxAuiPaneInfo, maxSize_1, 1}},
- {2617, {wxAuiPaneInfo, maxSize_2, 2}},
- {2618, {wxAuiPaneInfo, maximizeButton, 1}},
- {2619, {wxAuiPaneInfo, minSize_1, 1}},
- {2620, {wxAuiPaneInfo, minSize_2, 2}},
- {2621, {wxAuiPaneInfo, minimizeButton, 1}},
- {2622, {wxAuiPaneInfo, movable, 1}},
- {2623, {wxAuiPaneInfo, name, 1}},
- {2624, {wxAuiPaneInfo, paneBorder, 1}},
- {2625, {wxAuiPaneInfo, pinButton, 1}},
- {2626, {wxAuiPaneInfo, position, 1}},
- {2627, {wxAuiPaneInfo, resizable, 1}},
- {2628, {wxAuiPaneInfo, right, 0}},
- {2629, {wxAuiPaneInfo, rightDockable, 1}},
- {2630, {wxAuiPaneInfo, row, 1}},
- {2631, {wxAuiPaneInfo, safeSet, 1}},
- {2632, {wxAuiPaneInfo, setFlag, 2}},
- {2633, {wxAuiPaneInfo, show, 1}},
- {2634, {wxAuiPaneInfo, toolbarPane, 0}},
- {2635, {wxAuiPaneInfo, top, 0}},
- {2636, {wxAuiPaneInfo, topDockable, 1}},
- {2637, {wxAuiPaneInfo, window, 1}},
- {2638, {wxAuiNotebook, new_0, 0}},
- {2639, {wxAuiNotebook, new_2, 2}},
- {2640, {wxAuiNotebook, addPage, 3}},
- {2641, {wxAuiNotebook, create, 2}},
- {2642, {wxAuiNotebook, deletePage, 1}},
- {2643, {wxAuiNotebook, getArtProvider, 0}},
- {2644, {wxAuiNotebook, getPage, 1}},
- {2645, {wxAuiNotebook, getPageBitmap, 1}},
- {2646, {wxAuiNotebook, getPageCount, 0}},
- {2647, {wxAuiNotebook, getPageIndex, 1}},
- {2648, {wxAuiNotebook, getPageText, 1}},
- {2649, {wxAuiNotebook, getSelection, 0}},
- {2650, {wxAuiNotebook, insertPage, 4}},
- {2651, {wxAuiNotebook, removePage, 1}},
- {2652, {wxAuiNotebook, setArtProvider, 1}},
- {2653, {wxAuiNotebook, setFont, 1}},
- {2654, {wxAuiNotebook, setPageBitmap, 2}},
- {2655, {wxAuiNotebook, setPageText, 2}},
- {2656, {wxAuiNotebook, setSelection, 1}},
- {2657, {wxAuiNotebook, setTabCtrlHeight, 1}},
- {2658, {wxAuiNotebook, setUniformBitmapSize, 1}},
- {2659, {wxAuiNotebook, 'Destroy', undefined}},
- {2660, {wxMDIParentFrame, new_0, 0}},
- {2661, {wxMDIParentFrame, new_4, 4}},
- {2662, {wxMDIParentFrame, destruct, 0}},
- {2663, {wxMDIParentFrame, activateNext, 0}},
- {2664, {wxMDIParentFrame, activatePrevious, 0}},
- {2665, {wxMDIParentFrame, arrangeIcons, 0}},
- {2666, {wxMDIParentFrame, cascade, 0}},
- {2667, {wxMDIParentFrame, create, 4}},
- {2668, {wxMDIParentFrame, getActiveChild, 0}},
- {2669, {wxMDIParentFrame, getClientWindow, 0}},
- {2670, {wxMDIParentFrame, tile, 1}},
- {2671, {wxMDIChildFrame, new_0, 0}},
- {2672, {wxMDIChildFrame, new_4, 4}},
- {2673, {wxMDIChildFrame, destruct, 0}},
- {2674, {wxMDIChildFrame, activate, 0}},
- {2675, {wxMDIChildFrame, create, 4}},
- {2676, {wxMDIChildFrame, maximize, 1}},
- {2677, {wxMDIChildFrame, restore, 0}},
- {2678, {wxMDIClientWindow, new_0, 0}},
- {2679, {wxMDIClientWindow, new_2, 2}},
- {2680, {wxMDIClientWindow, destruct, 0}},
- {2681, {wxMDIClientWindow, createClient, 2}},
- {2682, {wxLayoutAlgorithm, new, 0}},
- {2683, {wxLayoutAlgorithm, layoutFrame, 2}},
- {2684, {wxLayoutAlgorithm, layoutMDIFrame, 2}},
- {2685, {wxLayoutAlgorithm, layoutWindow, 2}},
- {2686, {wxLayoutAlgorithm, 'Destroy', undefined}},
- {2687, {wxEvent, getId, 0}},
- {2688, {wxEvent, getSkipped, 0}},
- {2689, {wxEvent, getTimestamp, 0}},
- {2690, {wxEvent, isCommandEvent, 0}},
- {2691, {wxEvent, resumePropagation, 1}},
- {2692, {wxEvent, shouldPropagate, 0}},
- {2693, {wxEvent, skip, 1}},
- {2694, {wxEvent, stopPropagation, 0}},
- {2695, {wxCommandEvent, getClientData, 0}},
- {2696, {wxCommandEvent, getExtraLong, 0}},
- {2697, {wxCommandEvent, getInt, 0}},
- {2698, {wxCommandEvent, getSelection, 0}},
- {2699, {wxCommandEvent, getString, 0}},
- {2700, {wxCommandEvent, isChecked, 0}},
- {2701, {wxCommandEvent, isSelection, 0}},
- {2702, {wxCommandEvent, setInt, 1}},
- {2703, {wxCommandEvent, setString, 1}},
- {2704, {wxScrollEvent, getOrientation, 0}},
- {2705, {wxScrollEvent, getPosition, 0}},
- {2706, {wxScrollWinEvent, getOrientation, 0}},
- {2707, {wxScrollWinEvent, getPosition, 0}},
- {2708, {wxMouseEvent, altDown, 0}},
- {2709, {wxMouseEvent, button, 1}},
- {2710, {wxMouseEvent, buttonDClick, 1}},
- {2711, {wxMouseEvent, buttonDown, 1}},
- {2712, {wxMouseEvent, buttonUp, 1}},
- {2713, {wxMouseEvent, cmdDown, 0}},
- {2714, {wxMouseEvent, controlDown, 0}},
- {2715, {wxMouseEvent, dragging, 0}},
- {2716, {wxMouseEvent, entering, 0}},
- {2717, {wxMouseEvent, getButton, 0}},
- {2720, {wxMouseEvent, getPosition, 0}},
- {2721, {wxMouseEvent, getLogicalPosition, 1}},
- {2722, {wxMouseEvent, getLinesPerAction, 0}},
- {2723, {wxMouseEvent, getWheelRotation, 0}},
- {2724, {wxMouseEvent, getWheelDelta, 0}},
- {2725, {wxMouseEvent, getX, 0}},
- {2726, {wxMouseEvent, getY, 0}},
- {2727, {wxMouseEvent, isButton, 0}},
- {2728, {wxMouseEvent, isPageScroll, 0}},
- {2729, {wxMouseEvent, leaving, 0}},
- {2730, {wxMouseEvent, leftDClick, 0}},
- {2731, {wxMouseEvent, leftDown, 0}},
- {2732, {wxMouseEvent, leftIsDown, 0}},
- {2733, {wxMouseEvent, leftUp, 0}},
- {2734, {wxMouseEvent, metaDown, 0}},
- {2735, {wxMouseEvent, middleDClick, 0}},
- {2736, {wxMouseEvent, middleDown, 0}},
- {2737, {wxMouseEvent, middleIsDown, 0}},
- {2738, {wxMouseEvent, middleUp, 0}},
- {2739, {wxMouseEvent, moving, 0}},
- {2740, {wxMouseEvent, rightDClick, 0}},
- {2741, {wxMouseEvent, rightDown, 0}},
- {2742, {wxMouseEvent, rightIsDown, 0}},
- {2743, {wxMouseEvent, rightUp, 0}},
- {2744, {wxMouseEvent, shiftDown, 0}},
- {2745, {wxSetCursorEvent, getCursor, 0}},
- {2746, {wxSetCursorEvent, getX, 0}},
- {2747, {wxSetCursorEvent, getY, 0}},
- {2748, {wxSetCursorEvent, hasCursor, 0}},
- {2749, {wxSetCursorEvent, setCursor, 1}},
- {2750, {wxKeyEvent, altDown, 0}},
- {2751, {wxKeyEvent, cmdDown, 0}},
- {2752, {wxKeyEvent, controlDown, 0}},
- {2753, {wxKeyEvent, getKeyCode, 0}},
- {2754, {wxKeyEvent, getModifiers, 0}},
- {2757, {wxKeyEvent, getPosition, 0}},
- {2758, {wxKeyEvent, getRawKeyCode, 0}},
- {2759, {wxKeyEvent, getRawKeyFlags, 0}},
- {2760, {wxKeyEvent, getUnicodeKey, 0}},
- {2761, {wxKeyEvent, getX, 0}},
- {2762, {wxKeyEvent, getY, 0}},
- {2763, {wxKeyEvent, hasModifiers, 0}},
- {2764, {wxKeyEvent, metaDown, 0}},
- {2765, {wxKeyEvent, shiftDown, 0}},
- {2766, {wxSizeEvent, getSize, 0}},
- {2767, {wxMoveEvent, getPosition, 0}},
- {2768, {wxEraseEvent, getDC, 0}},
- {2769, {wxFocusEvent, getWindow, 0}},
- {2770, {wxChildFocusEvent, getWindow, 0}},
- {2771, {wxMenuEvent, getMenu, 0}},
- {2772, {wxMenuEvent, getMenuId, 0}},
- {2773, {wxMenuEvent, isPopup, 0}},
- {2774, {wxCloseEvent, canVeto, 0}},
- {2775, {wxCloseEvent, getLoggingOff, 0}},
- {2776, {wxCloseEvent, setCanVeto, 1}},
- {2777, {wxCloseEvent, setLoggingOff, 1}},
- {2778, {wxCloseEvent, veto, 1}},
- {2779, {wxShowEvent, setShow, 1}},
- {2780, {wxShowEvent, getShow, 0}},
- {2781, {wxIconizeEvent, iconized, 0}},
- {2782, {wxJoystickEvent, buttonDown, 1}},
- {2783, {wxJoystickEvent, buttonIsDown, 1}},
- {2784, {wxJoystickEvent, buttonUp, 1}},
- {2785, {wxJoystickEvent, getButtonChange, 0}},
- {2786, {wxJoystickEvent, getButtonState, 0}},
- {2787, {wxJoystickEvent, getJoystick, 0}},
- {2788, {wxJoystickEvent, getPosition, 0}},
- {2789, {wxJoystickEvent, getZPosition, 0}},
- {2790, {wxJoystickEvent, isButton, 0}},
- {2791, {wxJoystickEvent, isMove, 0}},
- {2792, {wxJoystickEvent, isZMove, 0}},
- {2793, {wxUpdateUIEvent, canUpdate, 1}},
- {2794, {wxUpdateUIEvent, check, 1}},
- {2795, {wxUpdateUIEvent, enable, 1}},
- {2796, {wxUpdateUIEvent, show, 1}},
- {2797, {wxUpdateUIEvent, getChecked, 0}},
- {2798, {wxUpdateUIEvent, getEnabled, 0}},
- {2799, {wxUpdateUIEvent, getShown, 0}},
- {2800, {wxUpdateUIEvent, getSetChecked, 0}},
- {2801, {wxUpdateUIEvent, getSetEnabled, 0}},
- {2802, {wxUpdateUIEvent, getSetShown, 0}},
- {2803, {wxUpdateUIEvent, getSetText, 0}},
- {2804, {wxUpdateUIEvent, getText, 0}},
- {2805, {wxUpdateUIEvent, getMode, 0}},
- {2806, {wxUpdateUIEvent, getUpdateInterval, 0}},
- {2807, {wxUpdateUIEvent, resetUpdateTime, 0}},
- {2808, {wxUpdateUIEvent, setMode, 1}},
- {2809, {wxUpdateUIEvent, setText, 1}},
- {2810, {wxUpdateUIEvent, setUpdateInterval, 1}},
- {2811, {wxMouseCaptureChangedEvent, getCapturedWindow, 0}},
- {2812, {wxPaletteChangedEvent, setChangedWindow, 1}},
- {2813, {wxPaletteChangedEvent, getChangedWindow, 0}},
- {2814, {wxQueryNewPaletteEvent, setPaletteRealized, 1}},
- {2815, {wxQueryNewPaletteEvent, getPaletteRealized, 0}},
- {2816, {wxNavigationKeyEvent, getDirection, 0}},
- {2817, {wxNavigationKeyEvent, setDirection, 1}},
- {2818, {wxNavigationKeyEvent, isWindowChange, 0}},
- {2819, {wxNavigationKeyEvent, setWindowChange, 1}},
- {2820, {wxNavigationKeyEvent, isFromTab, 0}},
- {2821, {wxNavigationKeyEvent, setFromTab, 1}},
- {2822, {wxNavigationKeyEvent, getCurrentFocus, 0}},
- {2823, {wxNavigationKeyEvent, setCurrentFocus, 1}},
- {2824, {wxHelpEvent, getOrigin, 0}},
- {2825, {wxHelpEvent, getPosition, 0}},
- {2826, {wxHelpEvent, setOrigin, 1}},
- {2827, {wxHelpEvent, setPosition, 1}},
- {2828, {wxContextMenuEvent, getPosition, 0}},
- {2829, {wxContextMenuEvent, setPosition, 1}},
- {2830, {wxIdleEvent, canSend, 1}},
- {2831, {wxIdleEvent, getMode, 0}},
- {2832, {wxIdleEvent, requestMore, 1}},
- {2833, {wxIdleEvent, moreRequested, 0}},
- {2834, {wxIdleEvent, setMode, 1}},
- {2835, {wxGridEvent, altDown, 0}},
- {2836, {wxGridEvent, controlDown, 0}},
- {2837, {wxGridEvent, getCol, 0}},
- {2838, {wxGridEvent, getPosition, 0}},
- {2839, {wxGridEvent, getRow, 0}},
- {2840, {wxGridEvent, metaDown, 0}},
- {2841, {wxGridEvent, selecting, 0}},
- {2842, {wxGridEvent, shiftDown, 0}},
- {2843, {wxNotifyEvent, allow, 0}},
- {2844, {wxNotifyEvent, isAllowed, 0}},
- {2845, {wxNotifyEvent, veto, 0}},
- {2846, {wxSashEvent, getEdge, 0}},
- {2847, {wxSashEvent, getDragRect, 0}},
- {2848, {wxSashEvent, getDragStatus, 0}},
- {2849, {wxListEvent, getCacheFrom, 0}},
- {2850, {wxListEvent, getCacheTo, 0}},
- {2851, {wxListEvent, getKeyCode, 0}},
- {2852, {wxListEvent, getIndex, 0}},
- {2853, {wxListEvent, getColumn, 0}},
- {2854, {wxListEvent, getPoint, 0}},
- {2855, {wxListEvent, getLabel, 0}},
- {2856, {wxListEvent, getText, 0}},
- {2857, {wxListEvent, getImage, 0}},
- {2858, {wxListEvent, getData, 0}},
- {2859, {wxListEvent, getMask, 0}},
- {2860, {wxListEvent, getItem, 0}},
- {2861, {wxListEvent, isEditCancelled, 0}},
- {2862, {wxDateEvent, getDate, 0}},
- {2863, {wxCalendarEvent, getWeekDay, 0}},
- {2864, {wxFileDirPickerEvent, getPath, 0}},
- {2865, {wxColourPickerEvent, getColour, 0}},
- {2866, {wxFontPickerEvent, getFont, 0}},
- {2867, {wxStyledTextEvent, getPosition, 0}},
- {2868, {wxStyledTextEvent, getKey, 0}},
- {2869, {wxStyledTextEvent, getModifiers, 0}},
- {2870, {wxStyledTextEvent, getModificationType, 0}},
- {2871, {wxStyledTextEvent, getText, 0}},
- {2872, {wxStyledTextEvent, getLength, 0}},
- {2873, {wxStyledTextEvent, getLinesAdded, 0}},
- {2874, {wxStyledTextEvent, getLine, 0}},
- {2875, {wxStyledTextEvent, getFoldLevelNow, 0}},
- {2876, {wxStyledTextEvent, getFoldLevelPrev, 0}},
- {2877, {wxStyledTextEvent, getMargin, 0}},
- {2878, {wxStyledTextEvent, getMessage, 0}},
- {2879, {wxStyledTextEvent, getWParam, 0}},
- {2880, {wxStyledTextEvent, getLParam, 0}},
- {2881, {wxStyledTextEvent, getListType, 0}},
- {2882, {wxStyledTextEvent, getX, 0}},
- {2883, {wxStyledTextEvent, getY, 0}},
- {2884, {wxStyledTextEvent, getDragText, 0}},
- {2885, {wxStyledTextEvent, getDragAllowMove, 0}},
- {2886, {wxStyledTextEvent, getDragResult, 0}},
- {2887, {wxStyledTextEvent, getShift, 0}},
- {2888, {wxStyledTextEvent, getControl, 0}},
- {2889, {wxStyledTextEvent, getAlt, 0}},
- {2890, {utils, getKeyState, 1}},
- {2891, {utils, getMousePosition, 2}},
- {2892, {utils, getMouseState, 0}},
- {2893, {utils, setDetectableAutoRepeat, 1}},
- {2894, {utils, bell, 0}},
- {2895, {utils, findMenuItemId, 3}},
- {2896, {utils, genericFindWindowAtPoint, 1}},
- {2897, {utils, findWindowAtPoint, 1}},
- {2898, {utils, beginBusyCursor, 1}},
- {2899, {utils, endBusyCursor, 0}},
- {2900, {utils, isBusy, 0}},
- {2901, {utils, shutdown, 1}},
- {2902, {utils, shell, 1}},
- {2903, {utils, launchDefaultBrowser, 2}},
- {2904, {utils, getEmailAddress, 0}},
- {2905, {utils, getUserId, 0}},
- {2906, {utils, getHomeDir, 0}},
- {2907, {utils, newId, 0}},
- {2908, {utils, registerId, 1}},
- {2909, {utils, getCurrentId, 0}},
- {2910, {utils, getOsDescription, 0}},
- {2911, {utils, isPlatformLittleEndian, 0}},
- {2912, {utils, isPlatform64Bit, 0}},
- {2913, {wxPrintout, new, 1}},
- {2914, {wxPrintout, destruct, 0}},
- {2915, {wxPrintout, getDC, 0}},
- {2916, {wxPrintout, getPageSizeMM, 2}},
- {2917, {wxPrintout, getPageSizePixels, 2}},
- {2918, {wxPrintout, getPaperRectPixels, 0}},
- {2919, {wxPrintout, getPPIPrinter, 2}},
- {2920, {wxPrintout, getPPIScreen, 2}},
- {2921, {wxPrintout, getTitle, 0}},
- {2922, {wxPrintout, isPreview, 0}},
- {2923, {wxPrintout, fitThisSizeToPaper, 1}},
- {2924, {wxPrintout, fitThisSizeToPage, 1}},
- {2925, {wxPrintout, fitThisSizeToPageMargins, 2}},
- {2926, {wxPrintout, mapScreenSizeToPaper, 0}},
- {2927, {wxPrintout, mapScreenSizeToPage, 0}},
- {2928, {wxPrintout, mapScreenSizeToPageMargins, 1}},
- {2929, {wxPrintout, mapScreenSizeToDevice, 0}},
- {2930, {wxPrintout, getLogicalPaperRect, 0}},
- {2931, {wxPrintout, getLogicalPageRect, 0}},
- {2932, {wxPrintout, getLogicalPageMarginsRect, 1}},
- {2933, {wxPrintout, setLogicalOrigin, 2}},
- {2934, {wxPrintout, offsetLogicalOrigin, 2}},
- {2935, {wxStyledTextCtrl, new_2, 2}},
- {2936, {wxStyledTextCtrl, new_0, 0}},
- {2937, {wxStyledTextCtrl, destruct, 0}},
- {2938, {wxStyledTextCtrl, create, 2}},
- {2939, {wxStyledTextCtrl, addText, 1}},
- {2940, {wxStyledTextCtrl, addStyledText, 1}},
- {2941, {wxStyledTextCtrl, insertText, 2}},
- {2942, {wxStyledTextCtrl, clearAll, 0}},
- {2943, {wxStyledTextCtrl, clearDocumentStyle, 0}},
- {2944, {wxStyledTextCtrl, getLength, 0}},
- {2945, {wxStyledTextCtrl, getCharAt, 1}},
- {2946, {wxStyledTextCtrl, getCurrentPos, 0}},
- {2947, {wxStyledTextCtrl, getAnchor, 0}},
- {2948, {wxStyledTextCtrl, getStyleAt, 1}},
- {2949, {wxStyledTextCtrl, redo, 0}},
- {2950, {wxStyledTextCtrl, setUndoCollection, 1}},
- {2951, {wxStyledTextCtrl, selectAll, 0}},
- {2952, {wxStyledTextCtrl, setSavePoint, 0}},
- {2953, {wxStyledTextCtrl, getStyledText, 2}},
- {2954, {wxStyledTextCtrl, canRedo, 0}},
- {2955, {wxStyledTextCtrl, markerLineFromHandle, 1}},
- {2956, {wxStyledTextCtrl, markerDeleteHandle, 1}},
- {2957, {wxStyledTextCtrl, getUndoCollection, 0}},
- {2958, {wxStyledTextCtrl, getViewWhiteSpace, 0}},
- {2959, {wxStyledTextCtrl, setViewWhiteSpace, 1}},
- {2960, {wxStyledTextCtrl, positionFromPoint, 1}},
- {2961, {wxStyledTextCtrl, positionFromPointClose, 2}},
- {2962, {wxStyledTextCtrl, gotoLine, 1}},
- {2963, {wxStyledTextCtrl, gotoPos, 1}},
- {2964, {wxStyledTextCtrl, setAnchor, 1}},
- {2965, {wxStyledTextCtrl, getCurLine, 1}},
- {2966, {wxStyledTextCtrl, getEndStyled, 0}},
- {2967, {wxStyledTextCtrl, convertEOLs, 1}},
- {2968, {wxStyledTextCtrl, getEOLMode, 0}},
- {2969, {wxStyledTextCtrl, setEOLMode, 1}},
- {2970, {wxStyledTextCtrl, startStyling, 2}},
- {2971, {wxStyledTextCtrl, setStyling, 2}},
- {2972, {wxStyledTextCtrl, getBufferedDraw, 0}},
- {2973, {wxStyledTextCtrl, setBufferedDraw, 1}},
- {2974, {wxStyledTextCtrl, setTabWidth, 1}},
- {2975, {wxStyledTextCtrl, getTabWidth, 0}},
- {2976, {wxStyledTextCtrl, setCodePage, 1}},
- {2977, {wxStyledTextCtrl, markerDefine, 3}},
- {2978, {wxStyledTextCtrl, markerSetForeground, 2}},
- {2979, {wxStyledTextCtrl, markerSetBackground, 2}},
- {2980, {wxStyledTextCtrl, markerAdd, 2}},
- {2981, {wxStyledTextCtrl, markerDelete, 2}},
- {2982, {wxStyledTextCtrl, markerDeleteAll, 1}},
- {2983, {wxStyledTextCtrl, markerGet, 1}},
- {2984, {wxStyledTextCtrl, markerNext, 2}},
- {2985, {wxStyledTextCtrl, markerPrevious, 2}},
- {2986, {wxStyledTextCtrl, markerDefineBitmap, 2}},
- {2987, {wxStyledTextCtrl, markerAddSet, 2}},
- {2988, {wxStyledTextCtrl, markerSetAlpha, 2}},
- {2989, {wxStyledTextCtrl, setMarginType, 2}},
- {2990, {wxStyledTextCtrl, getMarginType, 1}},
- {2991, {wxStyledTextCtrl, setMarginWidth, 2}},
- {2992, {wxStyledTextCtrl, getMarginWidth, 1}},
- {2993, {wxStyledTextCtrl, setMarginMask, 2}},
- {2994, {wxStyledTextCtrl, getMarginMask, 1}},
- {2995, {wxStyledTextCtrl, setMarginSensitive, 2}},
- {2996, {wxStyledTextCtrl, getMarginSensitive, 1}},
- {2997, {wxStyledTextCtrl, styleClearAll, 0}},
- {2998, {wxStyledTextCtrl, styleSetForeground, 2}},
- {2999, {wxStyledTextCtrl, styleSetBackground, 2}},
- {3000, {wxStyledTextCtrl, styleSetBold, 2}},
- {3001, {wxStyledTextCtrl, styleSetItalic, 2}},
- {3002, {wxStyledTextCtrl, styleSetSize, 2}},
- {3003, {wxStyledTextCtrl, styleSetFaceName, 2}},
- {3004, {wxStyledTextCtrl, styleSetEOLFilled, 2}},
- {3005, {wxStyledTextCtrl, styleResetDefault, 0}},
- {3006, {wxStyledTextCtrl, styleSetUnderline, 2}},
- {3007, {wxStyledTextCtrl, styleSetCase, 2}},
- {3008, {wxStyledTextCtrl, styleSetHotSpot, 2}},
- {3009, {wxStyledTextCtrl, setSelForeground, 2}},
- {3010, {wxStyledTextCtrl, setSelBackground, 2}},
- {3011, {wxStyledTextCtrl, getSelAlpha, 0}},
- {3012, {wxStyledTextCtrl, setSelAlpha, 1}},
- {3013, {wxStyledTextCtrl, setCaretForeground, 1}},
- {3014, {wxStyledTextCtrl, cmdKeyAssign, 3}},
- {3015, {wxStyledTextCtrl, cmdKeyClear, 2}},
- {3016, {wxStyledTextCtrl, cmdKeyClearAll, 0}},
- {3017, {wxStyledTextCtrl, setStyleBytes, 2}},
- {3018, {wxStyledTextCtrl, styleSetVisible, 2}},
- {3019, {wxStyledTextCtrl, getCaretPeriod, 0}},
- {3020, {wxStyledTextCtrl, setCaretPeriod, 1}},
- {3021, {wxStyledTextCtrl, setWordChars, 1}},
- {3022, {wxStyledTextCtrl, beginUndoAction, 0}},
- {3023, {wxStyledTextCtrl, endUndoAction, 0}},
- {3024, {wxStyledTextCtrl, indicatorSetStyle, 2}},
- {3025, {wxStyledTextCtrl, indicatorGetStyle, 1}},
- {3026, {wxStyledTextCtrl, indicatorSetForeground, 2}},
- {3027, {wxStyledTextCtrl, indicatorGetForeground, 1}},
- {3028, {wxStyledTextCtrl, setWhitespaceForeground, 2}},
- {3029, {wxStyledTextCtrl, setWhitespaceBackground, 2}},
- {3030, {wxStyledTextCtrl, getStyleBits, 0}},
- {3031, {wxStyledTextCtrl, setLineState, 2}},
- {3032, {wxStyledTextCtrl, getLineState, 1}},
- {3033, {wxStyledTextCtrl, getMaxLineState, 0}},
- {3034, {wxStyledTextCtrl, getCaretLineVisible, 0}},
- {3035, {wxStyledTextCtrl, setCaretLineVisible, 1}},
- {3036, {wxStyledTextCtrl, getCaretLineBackground, 0}},
- {3037, {wxStyledTextCtrl, setCaretLineBackground, 1}},
- {3038, {wxStyledTextCtrl, autoCompShow, 2}},
- {3039, {wxStyledTextCtrl, autoCompCancel, 0}},
- {3040, {wxStyledTextCtrl, autoCompActive, 0}},
- {3041, {wxStyledTextCtrl, autoCompPosStart, 0}},
- {3042, {wxStyledTextCtrl, autoCompComplete, 0}},
- {3043, {wxStyledTextCtrl, autoCompStops, 1}},
- {3044, {wxStyledTextCtrl, autoCompSetSeparator, 1}},
- {3045, {wxStyledTextCtrl, autoCompGetSeparator, 0}},
- {3046, {wxStyledTextCtrl, autoCompSelect, 1}},
- {3047, {wxStyledTextCtrl, autoCompSetCancelAtStart, 1}},
- {3048, {wxStyledTextCtrl, autoCompGetCancelAtStart, 0}},
- {3049, {wxStyledTextCtrl, autoCompSetFillUps, 1}},
- {3050, {wxStyledTextCtrl, autoCompSetChooseSingle, 1}},
- {3051, {wxStyledTextCtrl, autoCompGetChooseSingle, 0}},
- {3052, {wxStyledTextCtrl, autoCompSetIgnoreCase, 1}},
- {3053, {wxStyledTextCtrl, autoCompGetIgnoreCase, 0}},
- {3054, {wxStyledTextCtrl, userListShow, 2}},
- {3055, {wxStyledTextCtrl, autoCompSetAutoHide, 1}},
- {3056, {wxStyledTextCtrl, autoCompGetAutoHide, 0}},
- {3057, {wxStyledTextCtrl, autoCompSetDropRestOfWord, 1}},
- {3058, {wxStyledTextCtrl, autoCompGetDropRestOfWord, 0}},
- {3059, {wxStyledTextCtrl, registerImage, 2}},
- {3060, {wxStyledTextCtrl, clearRegisteredImages, 0}},
- {3061, {wxStyledTextCtrl, autoCompGetTypeSeparator, 0}},
- {3062, {wxStyledTextCtrl, autoCompSetTypeSeparator, 1}},
- {3063, {wxStyledTextCtrl, autoCompSetMaxWidth, 1}},
- {3064, {wxStyledTextCtrl, autoCompGetMaxWidth, 0}},
- {3065, {wxStyledTextCtrl, autoCompSetMaxHeight, 1}},
- {3066, {wxStyledTextCtrl, autoCompGetMaxHeight, 0}},
- {3067, {wxStyledTextCtrl, setIndent, 1}},
- {3068, {wxStyledTextCtrl, getIndent, 0}},
- {3069, {wxStyledTextCtrl, setUseTabs, 1}},
- {3070, {wxStyledTextCtrl, getUseTabs, 0}},
- {3071, {wxStyledTextCtrl, setLineIndentation, 2}},
- {3072, {wxStyledTextCtrl, getLineIndentation, 1}},
- {3073, {wxStyledTextCtrl, getLineIndentPosition, 1}},
- {3074, {wxStyledTextCtrl, getColumn, 1}},
- {3075, {wxStyledTextCtrl, setUseHorizontalScrollBar, 1}},
- {3076, {wxStyledTextCtrl, getUseHorizontalScrollBar, 0}},
- {3077, {wxStyledTextCtrl, setIndentationGuides, 1}},
- {3078, {wxStyledTextCtrl, getIndentationGuides, 0}},
- {3079, {wxStyledTextCtrl, setHighlightGuide, 1}},
- {3080, {wxStyledTextCtrl, getHighlightGuide, 0}},
- {3081, {wxStyledTextCtrl, getLineEndPosition, 1}},
- {3082, {wxStyledTextCtrl, getCodePage, 0}},
- {3083, {wxStyledTextCtrl, getCaretForeground, 0}},
- {3084, {wxStyledTextCtrl, getReadOnly, 0}},
- {3085, {wxStyledTextCtrl, setCurrentPos, 1}},
- {3086, {wxStyledTextCtrl, setSelectionStart, 1}},
- {3087, {wxStyledTextCtrl, getSelectionStart, 0}},
- {3088, {wxStyledTextCtrl, setSelectionEnd, 1}},
- {3089, {wxStyledTextCtrl, getSelectionEnd, 0}},
- {3090, {wxStyledTextCtrl, setPrintMagnification, 1}},
- {3091, {wxStyledTextCtrl, getPrintMagnification, 0}},
- {3092, {wxStyledTextCtrl, setPrintColourMode, 1}},
- {3093, {wxStyledTextCtrl, getPrintColourMode, 0}},
- {3094, {wxStyledTextCtrl, findText, 4}},
- {3095, {wxStyledTextCtrl, formatRange, 7}},
- {3096, {wxStyledTextCtrl, getFirstVisibleLine, 0}},
- {3097, {wxStyledTextCtrl, getLine, 1}},
- {3098, {wxStyledTextCtrl, getLineCount, 0}},
- {3099, {wxStyledTextCtrl, setMarginLeft, 1}},
- {3100, {wxStyledTextCtrl, getMarginLeft, 0}},
- {3101, {wxStyledTextCtrl, setMarginRight, 1}},
- {3102, {wxStyledTextCtrl, getMarginRight, 0}},
- {3103, {wxStyledTextCtrl, getModify, 0}},
- {3104, {wxStyledTextCtrl, setSelection, 2}},
- {3105, {wxStyledTextCtrl, getSelectedText, 0}},
- {3106, {wxStyledTextCtrl, getTextRange, 2}},
- {3107, {wxStyledTextCtrl, hideSelection, 1}},
- {3108, {wxStyledTextCtrl, lineFromPosition, 1}},
- {3109, {wxStyledTextCtrl, positionFromLine, 1}},
- {3110, {wxStyledTextCtrl, lineScroll, 2}},
- {3111, {wxStyledTextCtrl, ensureCaretVisible, 0}},
- {3112, {wxStyledTextCtrl, replaceSelection, 1}},
- {3113, {wxStyledTextCtrl, setReadOnly, 1}},
- {3114, {wxStyledTextCtrl, canPaste, 0}},
- {3115, {wxStyledTextCtrl, canUndo, 0}},
- {3116, {wxStyledTextCtrl, emptyUndoBuffer, 0}},
- {3117, {wxStyledTextCtrl, undo, 0}},
- {3118, {wxStyledTextCtrl, cut, 0}},
- {3119, {wxStyledTextCtrl, copy, 0}},
- {3120, {wxStyledTextCtrl, paste, 0}},
- {3121, {wxStyledTextCtrl, clear, 0}},
- {3122, {wxStyledTextCtrl, setText, 1}},
- {3123, {wxStyledTextCtrl, getText, 0}},
- {3124, {wxStyledTextCtrl, getTextLength, 0}},
- {3125, {wxStyledTextCtrl, getOvertype, 0}},
- {3126, {wxStyledTextCtrl, setCaretWidth, 1}},
- {3127, {wxStyledTextCtrl, getCaretWidth, 0}},
- {3128, {wxStyledTextCtrl, setTargetStart, 1}},
- {3129, {wxStyledTextCtrl, getTargetStart, 0}},
- {3130, {wxStyledTextCtrl, setTargetEnd, 1}},
- {3131, {wxStyledTextCtrl, getTargetEnd, 0}},
- {3132, {wxStyledTextCtrl, replaceTarget, 1}},
- {3133, {wxStyledTextCtrl, searchInTarget, 1}},
- {3134, {wxStyledTextCtrl, setSearchFlags, 1}},
- {3135, {wxStyledTextCtrl, getSearchFlags, 0}},
- {3136, {wxStyledTextCtrl, callTipShow, 2}},
- {3137, {wxStyledTextCtrl, callTipCancel, 0}},
- {3138, {wxStyledTextCtrl, callTipActive, 0}},
- {3139, {wxStyledTextCtrl, callTipPosAtStart, 0}},
- {3140, {wxStyledTextCtrl, callTipSetHighlight, 2}},
- {3141, {wxStyledTextCtrl, callTipSetBackground, 1}},
- {3142, {wxStyledTextCtrl, callTipSetForeground, 1}},
- {3143, {wxStyledTextCtrl, callTipSetForegroundHighlight, 1}},
- {3144, {wxStyledTextCtrl, callTipUseStyle, 1}},
- {3145, {wxStyledTextCtrl, visibleFromDocLine, 1}},
- {3146, {wxStyledTextCtrl, docLineFromVisible, 1}},
- {3147, {wxStyledTextCtrl, wrapCount, 1}},
- {3148, {wxStyledTextCtrl, setFoldLevel, 2}},
- {3149, {wxStyledTextCtrl, getFoldLevel, 1}},
- {3150, {wxStyledTextCtrl, getLastChild, 2}},
- {3151, {wxStyledTextCtrl, getFoldParent, 1}},
- {3152, {wxStyledTextCtrl, showLines, 2}},
- {3153, {wxStyledTextCtrl, hideLines, 2}},
- {3154, {wxStyledTextCtrl, getLineVisible, 1}},
- {3155, {wxStyledTextCtrl, setFoldExpanded, 2}},
- {3156, {wxStyledTextCtrl, getFoldExpanded, 1}},
- {3157, {wxStyledTextCtrl, toggleFold, 1}},
- {3158, {wxStyledTextCtrl, ensureVisible, 1}},
- {3159, {wxStyledTextCtrl, setFoldFlags, 1}},
- {3160, {wxStyledTextCtrl, ensureVisibleEnforcePolicy, 1}},
- {3161, {wxStyledTextCtrl, setTabIndents, 1}},
- {3162, {wxStyledTextCtrl, getTabIndents, 0}},
- {3163, {wxStyledTextCtrl, setBackSpaceUnIndents, 1}},
- {3164, {wxStyledTextCtrl, getBackSpaceUnIndents, 0}},
- {3165, {wxStyledTextCtrl, setMouseDwellTime, 1}},
- {3166, {wxStyledTextCtrl, getMouseDwellTime, 0}},
- {3167, {wxStyledTextCtrl, wordStartPosition, 2}},
- {3168, {wxStyledTextCtrl, wordEndPosition, 2}},
- {3169, {wxStyledTextCtrl, setWrapMode, 1}},
- {3170, {wxStyledTextCtrl, getWrapMode, 0}},
- {3171, {wxStyledTextCtrl, setWrapVisualFlags, 1}},
- {3172, {wxStyledTextCtrl, getWrapVisualFlags, 0}},
- {3173, {wxStyledTextCtrl, setWrapVisualFlagsLocation, 1}},
- {3174, {wxStyledTextCtrl, getWrapVisualFlagsLocation, 0}},
- {3175, {wxStyledTextCtrl, setWrapStartIndent, 1}},
- {3176, {wxStyledTextCtrl, getWrapStartIndent, 0}},
- {3177, {wxStyledTextCtrl, setLayoutCache, 1}},
- {3178, {wxStyledTextCtrl, getLayoutCache, 0}},
- {3179, {wxStyledTextCtrl, setScrollWidth, 1}},
- {3180, {wxStyledTextCtrl, getScrollWidth, 0}},
- {3181, {wxStyledTextCtrl, textWidth, 2}},
- {3182, {wxStyledTextCtrl, getEndAtLastLine, 0}},
- {3183, {wxStyledTextCtrl, textHeight, 1}},
- {3184, {wxStyledTextCtrl, setUseVerticalScrollBar, 1}},
- {3185, {wxStyledTextCtrl, getUseVerticalScrollBar, 0}},
- {3186, {wxStyledTextCtrl, appendText, 1}},
- {3187, {wxStyledTextCtrl, getTwoPhaseDraw, 0}},
- {3188, {wxStyledTextCtrl, setTwoPhaseDraw, 1}},
- {3189, {wxStyledTextCtrl, targetFromSelection, 0}},
- {3190, {wxStyledTextCtrl, linesJoin, 0}},
- {3191, {wxStyledTextCtrl, linesSplit, 1}},
- {3192, {wxStyledTextCtrl, setFoldMarginColour, 2}},
- {3193, {wxStyledTextCtrl, setFoldMarginHiColour, 2}},
- {3194, {wxStyledTextCtrl, lineDown, 0}},
- {3195, {wxStyledTextCtrl, lineDownExtend, 0}},
- {3196, {wxStyledTextCtrl, lineUp, 0}},
- {3197, {wxStyledTextCtrl, lineUpExtend, 0}},
- {3198, {wxStyledTextCtrl, charLeft, 0}},
- {3199, {wxStyledTextCtrl, charLeftExtend, 0}},
- {3200, {wxStyledTextCtrl, charRight, 0}},
- {3201, {wxStyledTextCtrl, charRightExtend, 0}},
- {3202, {wxStyledTextCtrl, wordLeft, 0}},
- {3203, {wxStyledTextCtrl, wordLeftExtend, 0}},
- {3204, {wxStyledTextCtrl, wordRight, 0}},
- {3205, {wxStyledTextCtrl, wordRightExtend, 0}},
- {3206, {wxStyledTextCtrl, home, 0}},
- {3207, {wxStyledTextCtrl, homeExtend, 0}},
- {3208, {wxStyledTextCtrl, lineEnd, 0}},
- {3209, {wxStyledTextCtrl, lineEndExtend, 0}},
- {3210, {wxStyledTextCtrl, documentStart, 0}},
- {3211, {wxStyledTextCtrl, documentStartExtend, 0}},
- {3212, {wxStyledTextCtrl, documentEnd, 0}},
- {3213, {wxStyledTextCtrl, documentEndExtend, 0}},
- {3214, {wxStyledTextCtrl, pageUp, 0}},
- {3215, {wxStyledTextCtrl, pageUpExtend, 0}},
- {3216, {wxStyledTextCtrl, pageDown, 0}},
- {3217, {wxStyledTextCtrl, pageDownExtend, 0}},
- {3218, {wxStyledTextCtrl, editToggleOvertype, 0}},
- {3219, {wxStyledTextCtrl, cancel, 0}},
- {3220, {wxStyledTextCtrl, deleteBack, 0}},
- {3221, {wxStyledTextCtrl, tab, 0}},
- {3222, {wxStyledTextCtrl, backTab, 0}},
- {3223, {wxStyledTextCtrl, newLine, 0}},
- {3224, {wxStyledTextCtrl, formFeed, 0}},
- {3225, {wxStyledTextCtrl, vCHome, 0}},
- {3226, {wxStyledTextCtrl, vCHomeExtend, 0}},
- {3227, {wxStyledTextCtrl, zoomIn, 0}},
- {3228, {wxStyledTextCtrl, zoomOut, 0}},
- {3229, {wxStyledTextCtrl, delWordLeft, 0}},
- {3230, {wxStyledTextCtrl, delWordRight, 0}},
- {3231, {wxStyledTextCtrl, lineCut, 0}},
- {3232, {wxStyledTextCtrl, lineDelete, 0}},
- {3233, {wxStyledTextCtrl, lineTranspose, 0}},
- {3234, {wxStyledTextCtrl, lineDuplicate, 0}},
- {3235, {wxStyledTextCtrl, lowerCase, 0}},
- {3236, {wxStyledTextCtrl, upperCase, 0}},
- {3237, {wxStyledTextCtrl, lineScrollDown, 0}},
- {3238, {wxStyledTextCtrl, lineScrollUp, 0}},
- {3239, {wxStyledTextCtrl, deleteBackNotLine, 0}},
- {3240, {wxStyledTextCtrl, homeDisplay, 0}},
- {3241, {wxStyledTextCtrl, homeDisplayExtend, 0}},
- {3242, {wxStyledTextCtrl, lineEndDisplay, 0}},
- {3243, {wxStyledTextCtrl, lineEndDisplayExtend, 0}},
- {3244, {wxStyledTextCtrl, homeWrapExtend, 0}},
- {3245, {wxStyledTextCtrl, lineEndWrap, 0}},
- {3246, {wxStyledTextCtrl, lineEndWrapExtend, 0}},
- {3247, {wxStyledTextCtrl, vCHomeWrap, 0}},
- {3248, {wxStyledTextCtrl, vCHomeWrapExtend, 0}},
- {3249, {wxStyledTextCtrl, lineCopy, 0}},
- {3250, {wxStyledTextCtrl, moveCaretInsideView, 0}},
- {3251, {wxStyledTextCtrl, lineLength, 1}},
- {3252, {wxStyledTextCtrl, braceHighlight, 2}},
- {3253, {wxStyledTextCtrl, braceBadLight, 1}},
- {3254, {wxStyledTextCtrl, braceMatch, 1}},
- {3255, {wxStyledTextCtrl, getViewEOL, 0}},
- {3256, {wxStyledTextCtrl, setViewEOL, 1}},
- {3257, {wxStyledTextCtrl, setModEventMask, 1}},
- {3258, {wxStyledTextCtrl, getEdgeColumn, 0}},
- {3259, {wxStyledTextCtrl, setEdgeColumn, 1}},
- {3260, {wxStyledTextCtrl, getEdgeMode, 0}},
- {3261, {wxStyledTextCtrl, getEdgeColour, 0}},
- {3262, {wxStyledTextCtrl, setEdgeColour, 1}},
- {3263, {wxStyledTextCtrl, searchAnchor, 0}},
- {3264, {wxStyledTextCtrl, searchNext, 2}},
- {3265, {wxStyledTextCtrl, searchPrev, 2}},
- {3266, {wxStyledTextCtrl, linesOnScreen, 0}},
- {3267, {wxStyledTextCtrl, usePopUp, 1}},
- {3268, {wxStyledTextCtrl, selectionIsRectangle, 0}},
- {3269, {wxStyledTextCtrl, setZoom, 1}},
- {3270, {wxStyledTextCtrl, getZoom, 0}},
- {3271, {wxStyledTextCtrl, getModEventMask, 0}},
- {3272, {wxStyledTextCtrl, setSTCFocus, 1}},
- {3273, {wxStyledTextCtrl, getSTCFocus, 0}},
- {3274, {wxStyledTextCtrl, setStatus, 1}},
- {3275, {wxStyledTextCtrl, getStatus, 0}},
- {3276, {wxStyledTextCtrl, setMouseDownCaptures, 1}},
- {3277, {wxStyledTextCtrl, getMouseDownCaptures, 0}},
- {3278, {wxStyledTextCtrl, setSTCCursor, 1}},
- {3279, {wxStyledTextCtrl, getSTCCursor, 0}},
- {3280, {wxStyledTextCtrl, setControlCharSymbol, 1}},
- {3281, {wxStyledTextCtrl, getControlCharSymbol, 0}},
- {3282, {wxStyledTextCtrl, wordPartLeft, 0}},
- {3283, {wxStyledTextCtrl, wordPartLeftExtend, 0}},
- {3284, {wxStyledTextCtrl, wordPartRight, 0}},
- {3285, {wxStyledTextCtrl, wordPartRightExtend, 0}},
- {3286, {wxStyledTextCtrl, setVisiblePolicy, 2}},
- {3287, {wxStyledTextCtrl, delLineLeft, 0}},
- {3288, {wxStyledTextCtrl, delLineRight, 0}},
- {3289, {wxStyledTextCtrl, getXOffset, 0}},
- {3290, {wxStyledTextCtrl, chooseCaretX, 0}},
- {3291, {wxStyledTextCtrl, setXCaretPolicy, 2}},
- {3292, {wxStyledTextCtrl, setYCaretPolicy, 2}},
- {3293, {wxStyledTextCtrl, getPrintWrapMode, 0}},
- {3294, {wxStyledTextCtrl, setHotspotActiveForeground, 2}},
- {3295, {wxStyledTextCtrl, setHotspotActiveBackground, 2}},
- {3296, {wxStyledTextCtrl, setHotspotActiveUnderline, 1}},
- {3297, {wxStyledTextCtrl, setHotspotSingleLine, 1}},
- {3298, {wxStyledTextCtrl, paraDownExtend, 0}},
- {3299, {wxStyledTextCtrl, paraUp, 0}},
- {3300, {wxStyledTextCtrl, paraUpExtend, 0}},
- {3301, {wxStyledTextCtrl, positionBefore, 1}},
- {3302, {wxStyledTextCtrl, positionAfter, 1}},
- {3303, {wxStyledTextCtrl, copyRange, 2}},
- {3304, {wxStyledTextCtrl, copyText, 2}},
- {3305, {wxStyledTextCtrl, setSelectionMode, 1}},
- {3306, {wxStyledTextCtrl, getSelectionMode, 0}},
- {3307, {wxStyledTextCtrl, lineDownRectExtend, 0}},
- {3308, {wxStyledTextCtrl, lineUpRectExtend, 0}},
- {3309, {wxStyledTextCtrl, charLeftRectExtend, 0}},
- {3310, {wxStyledTextCtrl, charRightRectExtend, 0}},
- {3311, {wxStyledTextCtrl, homeRectExtend, 0}},
- {3312, {wxStyledTextCtrl, vCHomeRectExtend, 0}},
- {3313, {wxStyledTextCtrl, lineEndRectExtend, 0}},
- {3314, {wxStyledTextCtrl, pageUpRectExtend, 0}},
- {3315, {wxStyledTextCtrl, pageDownRectExtend, 0}},
- {3316, {wxStyledTextCtrl, stutteredPageUp, 0}},
- {3317, {wxStyledTextCtrl, stutteredPageUpExtend, 0}},
- {3318, {wxStyledTextCtrl, stutteredPageDown, 0}},
- {3319, {wxStyledTextCtrl, stutteredPageDownExtend, 0}},
- {3320, {wxStyledTextCtrl, wordLeftEnd, 0}},
- {3321, {wxStyledTextCtrl, wordLeftEndExtend, 0}},
- {3322, {wxStyledTextCtrl, wordRightEnd, 0}},
- {3323, {wxStyledTextCtrl, wordRightEndExtend, 0}},
- {3324, {wxStyledTextCtrl, setWhitespaceChars, 1}},
- {3325, {wxStyledTextCtrl, setCharsDefault, 0}},
- {3326, {wxStyledTextCtrl, autoCompGetCurrent, 0}},
- {3327, {wxStyledTextCtrl, allocate, 1}},
- {3328, {wxStyledTextCtrl, findColumn, 2}},
- {3329, {wxStyledTextCtrl, getCaretSticky, 0}},
- {3330, {wxStyledTextCtrl, setCaretSticky, 1}},
- {3331, {wxStyledTextCtrl, toggleCaretSticky, 0}},
- {3332, {wxStyledTextCtrl, setPasteConvertEndings, 1}},
- {3333, {wxStyledTextCtrl, getPasteConvertEndings, 0}},
- {3334, {wxStyledTextCtrl, selectionDuplicate, 0}},
- {3335, {wxStyledTextCtrl, setCaretLineBackAlpha, 1}},
- {3336, {wxStyledTextCtrl, getCaretLineBackAlpha, 0}},
- {3337, {wxStyledTextCtrl, startRecord, 0}},
- {3338, {wxStyledTextCtrl, stopRecord, 0}},
- {3339, {wxStyledTextCtrl, setLexer, 1}},
- {3340, {wxStyledTextCtrl, getLexer, 0}},
- {3341, {wxStyledTextCtrl, colourise, 2}},
- {3342, {wxStyledTextCtrl, setProperty, 2}},
- {3343, {wxStyledTextCtrl, setKeyWords, 2}},
- {3344, {wxStyledTextCtrl, setLexerLanguage, 1}},
- {3345, {wxStyledTextCtrl, getProperty, 1}},
- {3346, {wxStyledTextCtrl, getStyleBitsNeeded, 0}},
- {3347, {wxStyledTextCtrl, getCurrentLine, 0}},
- {3348, {wxStyledTextCtrl, styleSetSpec, 2}},
- {3349, {wxStyledTextCtrl, styleSetFont, 2}},
- {3350, {wxStyledTextCtrl, styleSetFontAttr, 7}},
- {3351, {wxStyledTextCtrl, styleSetCharacterSet, 2}},
- {3352, {wxStyledTextCtrl, styleSetFontEncoding, 2}},
- {3353, {wxStyledTextCtrl, cmdKeyExecute, 1}},
- {3354, {wxStyledTextCtrl, setMargins, 2}},
- {3355, {wxStyledTextCtrl, getSelection, 2}},
- {3356, {wxStyledTextCtrl, pointFromPosition, 1}},
- {3357, {wxStyledTextCtrl, scrollToLine, 1}},
- {3358, {wxStyledTextCtrl, scrollToColumn, 1}},
- {3359, {wxStyledTextCtrl, sendMsg, 2}},
- {3360, {wxStyledTextCtrl, setVScrollBar, 1}},
- {3361, {wxStyledTextCtrl, setHScrollBar, 1}},
- {3362, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
- {3363, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
- {3364, {wxStyledTextCtrl, saveFile, 1}},
- {3365, {wxStyledTextCtrl, loadFile, 1}},
- {3366, {wxStyledTextCtrl, doDragOver, 3}},
- {3367, {wxStyledTextCtrl, doDropText, 3}},
- {3368, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
- {3369, {wxStyledTextCtrl, addTextRaw, 1}},
- {3370, {wxStyledTextCtrl, insertTextRaw, 2}},
- {3371, {wxStyledTextCtrl, getCurLineRaw, 1}},
- {3372, {wxStyledTextCtrl, getLineRaw, 1}},
- {3373, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
- {3374, {wxStyledTextCtrl, getTextRangeRaw, 2}},
- {3375, {wxStyledTextCtrl, setTextRaw, 1}},
- {3376, {wxStyledTextCtrl, getTextRaw, 0}},
- {3377, {wxStyledTextCtrl, appendTextRaw, 1}},
- {3378, {wxArtProvider, getBitmap, 2}},
- {3379, {wxArtProvider, getIcon, 2}},
- {3380, {wxTreeEvent, getKeyCode, 0}},
- {3381, {wxTreeEvent, getItem, 0}},
- {3382, {wxTreeEvent, getKeyEvent, 0}},
- {3383, {wxTreeEvent, getLabel, 0}},
- {3384, {wxTreeEvent, getOldItem, 0}},
- {3385, {wxTreeEvent, getPoint, 0}},
- {3386, {wxTreeEvent, isEditCancelled, 0}},
- {3387, {wxTreeEvent, setToolTip, 1}},
- {3388, {wxNotebookEvent, getOldSelection, 0}},
- {3389, {wxNotebookEvent, getSelection, 0}},
- {3390, {wxNotebookEvent, setOldSelection, 1}},
- {3391, {wxNotebookEvent, setSelection, 1}},
- {3392, {wxFileDataObject, new, 0}},
- {3393, {wxFileDataObject, addFile, 1}},
- {3394, {wxFileDataObject, getFilenames, 0}},
- {3395, {wxFileDataObject, 'Destroy', undefined}},
- {3396, {wxTextDataObject, new, 1}},
- {3397, {wxTextDataObject, getTextLength, 0}},
- {3398, {wxTextDataObject, getText, 0}},
- {3399, {wxTextDataObject, setText, 1}},
- {3400, {wxTextDataObject, 'Destroy', undefined}},
- {3401, {wxBitmapDataObject, new_1_1, 1}},
- {3402, {wxBitmapDataObject, new_1_0, 1}},
- {3403, {wxBitmapDataObject, getBitmap, 0}},
- {3404, {wxBitmapDataObject, setBitmap, 1}},
- {3405, {wxBitmapDataObject, 'Destroy', undefined}},
- {3407, {wxClipboard, new, 0}},
- {3408, {wxClipboard, destruct, 0}},
- {3409, {wxClipboard, addData, 1}},
- {3410, {wxClipboard, clear, 0}},
- {3411, {wxClipboard, close, 0}},
- {3412, {wxClipboard, flush, 0}},
- {3413, {wxClipboard, getData, 1}},
- {3414, {wxClipboard, isOpened, 0}},
- {3415, {wxClipboard, open, 0}},
- {3416, {wxClipboard, setData, 1}},
- {3418, {wxClipboard, usePrimarySelection, 1}},
- {3419, {wxClipboard, isSupported, 1}},
- {3420, {wxClipboard, get, 0}},
- {3421, {wxSpinEvent, getPosition, 0}},
- {3422, {wxSpinEvent, setPosition, 1}},
- {3423, {wxSplitterWindow, new_0, 0}},
- {3424, {wxSplitterWindow, new_2, 2}},
- {3425, {wxSplitterWindow, destruct, 0}},
- {3426, {wxSplitterWindow, create, 2}},
- {3427, {wxSplitterWindow, getMinimumPaneSize, 0}},
- {3428, {wxSplitterWindow, getSashGravity, 0}},
- {3429, {wxSplitterWindow, getSashPosition, 0}},
- {3430, {wxSplitterWindow, getSplitMode, 0}},
- {3431, {wxSplitterWindow, getWindow1, 0}},
- {3432, {wxSplitterWindow, getWindow2, 0}},
- {3433, {wxSplitterWindow, initialize, 1}},
- {3434, {wxSplitterWindow, isSplit, 0}},
- {3435, {wxSplitterWindow, replaceWindow, 2}},
- {3436, {wxSplitterWindow, setSashGravity, 1}},
- {3437, {wxSplitterWindow, setSashPosition, 2}},
- {3438, {wxSplitterWindow, setSashSize, 1}},
- {3439, {wxSplitterWindow, setMinimumPaneSize, 1}},
- {3440, {wxSplitterWindow, setSplitMode, 1}},
- {3441, {wxSplitterWindow, splitHorizontally, 3}},
- {3442, {wxSplitterWindow, splitVertically, 3}},
- {3443, {wxSplitterWindow, unsplit, 1}},
- {3444, {wxSplitterWindow, updateSize, 0}},
- {3445, {wxSplitterEvent, getSashPosition, 0}},
- {3446, {wxSplitterEvent, getX, 0}},
- {3447, {wxSplitterEvent, getY, 0}},
- {3448, {wxSplitterEvent, getWindowBeingRemoved, 0}},
- {3449, {wxSplitterEvent, setSashPosition, 1}},
- {3450, {wxHtmlWindow, new_0, 0}},
- {3451, {wxHtmlWindow, new_2, 2}},
- {3452, {wxHtmlWindow, appendToPage, 1}},
- {3453, {wxHtmlWindow, getOpenedAnchor, 0}},
- {3454, {wxHtmlWindow, getOpenedPage, 0}},
- {3455, {wxHtmlWindow, getOpenedPageTitle, 0}},
- {3456, {wxHtmlWindow, getRelatedFrame, 0}},
- {3457, {wxHtmlWindow, historyBack, 0}},
- {3458, {wxHtmlWindow, historyCanBack, 0}},
- {3459, {wxHtmlWindow, historyCanForward, 0}},
- {3460, {wxHtmlWindow, historyClear, 0}},
- {3461, {wxHtmlWindow, historyForward, 0}},
- {3462, {wxHtmlWindow, loadFile, 1}},
- {3463, {wxHtmlWindow, loadPage, 1}},
- {3464, {wxHtmlWindow, selectAll, 0}},
- {3465, {wxHtmlWindow, selectionToText, 0}},
- {3466, {wxHtmlWindow, selectLine, 1}},
- {3467, {wxHtmlWindow, selectWord, 1}},
- {3468, {wxHtmlWindow, setBorders, 1}},
- {3469, {wxHtmlWindow, setFonts, 3}},
- {3470, {wxHtmlWindow, setPage, 1}},
- {3471, {wxHtmlWindow, setRelatedFrame, 2}},
- {3472, {wxHtmlWindow, setRelatedStatusBar, 1}},
- {3473, {wxHtmlWindow, toText, 0}},
- {3474, {wxHtmlWindow, 'Destroy', undefined}},
- {3475, {wxHtmlLinkEvent, getLinkInfo, 0}},
- {3476, {wxSystemSettings, getColour, 1}},
- {3477, {wxSystemSettings, getFont, 1}},
- {3478, {wxSystemSettings, getMetric, 2}},
- {3479, {wxSystemSettings, getScreenType, 0}},
- {3480, {wxAuiNotebookEvent, setSelection, 1}},
- {3481, {wxAuiNotebookEvent, getSelection, 0}},
- {3482, {wxAuiNotebookEvent, setOldSelection, 1}},
- {3483, {wxAuiNotebookEvent, getOldSelection, 0}},
- {3484, {wxAuiNotebookEvent, setDragSource, 1}},
- {3485, {wxAuiNotebookEvent, getDragSource, 0}},
- {3486, {wxAuiManagerEvent, setManager, 1}},
- {3487, {wxAuiManagerEvent, getManager, 0}},
- {3488, {wxAuiManagerEvent, setPane, 1}},
- {3489, {wxAuiManagerEvent, getPane, 0}},
- {3490, {wxAuiManagerEvent, setButton, 1}},
- {3491, {wxAuiManagerEvent, getButton, 0}},
- {3492, {wxAuiManagerEvent, setDC, 1}},
- {3493, {wxAuiManagerEvent, getDC, 0}},
- {3494, {wxAuiManagerEvent, veto, 1}},
- {3495, {wxAuiManagerEvent, getVeto, 0}},
- {3496, {wxAuiManagerEvent, setCanVeto, 1}},
- {3497, {wxAuiManagerEvent, canVeto, 0}},
- {3498, {wxLogNull, new, 0}},
- {3499, {wxLogNull, 'Destroy', undefined}},
+ {1757, {wxListItemAttr, new_0, 0}},
+ {1758, {wxListItemAttr, new_3, 3}},
+ {1759, {wxListItemAttr, getBackgroundColour, 0}},
+ {1760, {wxListItemAttr, getFont, 0}},
+ {1761, {wxListItemAttr, getTextColour, 0}},
+ {1762, {wxListItemAttr, hasBackgroundColour, 0}},
+ {1763, {wxListItemAttr, hasFont, 0}},
+ {1764, {wxListItemAttr, hasTextColour, 0}},
+ {1765, {wxListItemAttr, setBackgroundColour, 1}},
+ {1766, {wxListItemAttr, setFont, 1}},
+ {1767, {wxListItemAttr, setTextColour, 1}},
+ {1768, {wxListItemAttr, 'Destroy', undefined}},
+ {1769, {wxImageList, new_0, 0}},
+ {1770, {wxImageList, new_3, 3}},
+ {1771, {wxImageList, add_1, 1}},
+ {1772, {wxImageList, add_2_0, 2}},
+ {1773, {wxImageList, add_2_1, 2}},
+ {1774, {wxImageList, create, 3}},
+ {1776, {wxImageList, draw, 5}},
+ {1777, {wxImageList, getBitmap, 1}},
+ {1778, {wxImageList, getIcon, 1}},
+ {1779, {wxImageList, getImageCount, 0}},
+ {1780, {wxImageList, getSize, 3}},
+ {1781, {wxImageList, remove, 1}},
+ {1782, {wxImageList, removeAll, 0}},
+ {1783, {wxImageList, replace_2, 2}},
+ {1784, {wxImageList, replace_3, 3}},
+ {1785, {wxImageList, 'Destroy', undefined}},
+ {1786, {wxTextAttr, new_0, 0}},
+ {1787, {wxTextAttr, new_2, 2}},
+ {1788, {wxTextAttr, getAlignment, 0}},
+ {1789, {wxTextAttr, getBackgroundColour, 0}},
+ {1790, {wxTextAttr, getFont, 0}},
+ {1791, {wxTextAttr, getLeftIndent, 0}},
+ {1792, {wxTextAttr, getLeftSubIndent, 0}},
+ {1793, {wxTextAttr, getRightIndent, 0}},
+ {1794, {wxTextAttr, getTabs, 0}},
+ {1795, {wxTextAttr, getTextColour, 0}},
+ {1796, {wxTextAttr, hasBackgroundColour, 0}},
+ {1797, {wxTextAttr, hasFont, 0}},
+ {1798, {wxTextAttr, hasTextColour, 0}},
+ {1799, {wxTextAttr, getFlags, 0}},
+ {1800, {wxTextAttr, isDefault, 0}},
+ {1801, {wxTextAttr, setAlignment, 1}},
+ {1802, {wxTextAttr, setBackgroundColour, 1}},
+ {1803, {wxTextAttr, setFlags, 1}},
+ {1804, {wxTextAttr, setFont, 2}},
+ {1805, {wxTextAttr, setLeftIndent, 2}},
+ {1806, {wxTextAttr, setRightIndent, 1}},
+ {1807, {wxTextAttr, setTabs, 1}},
+ {1808, {wxTextAttr, setTextColour, 1}},
+ {1809, {wxTextAttr, 'Destroy', undefined}},
+ {1811, {wxTextCtrl, new_3, 3}},
+ {1812, {wxTextCtrl, new_0, 0}},
+ {1814, {wxTextCtrl, destruct, 0}},
+ {1815, {wxTextCtrl, appendText, 1}},
+ {1816, {wxTextCtrl, canCopy, 0}},
+ {1817, {wxTextCtrl, canCut, 0}},
+ {1818, {wxTextCtrl, canPaste, 0}},
+ {1819, {wxTextCtrl, canRedo, 0}},
+ {1820, {wxTextCtrl, canUndo, 0}},
+ {1821, {wxTextCtrl, clear, 0}},
+ {1822, {wxTextCtrl, copy, 0}},
+ {1823, {wxTextCtrl, create, 3}},
+ {1824, {wxTextCtrl, cut, 0}},
+ {1825, {wxTextCtrl, discardEdits, 0}},
+ {1826, {wxTextCtrl, emulateKeyPress, 1}},
+ {1827, {wxTextCtrl, getDefaultStyle, 0}},
+ {1828, {wxTextCtrl, getInsertionPoint, 0}},
+ {1829, {wxTextCtrl, getLastPosition, 0}},
+ {1830, {wxTextCtrl, getLineLength, 1}},
+ {1831, {wxTextCtrl, getLineText, 1}},
+ {1832, {wxTextCtrl, getNumberOfLines, 0}},
+ {1833, {wxTextCtrl, getRange, 2}},
+ {1834, {wxTextCtrl, getSelection, 2}},
+ {1835, {wxTextCtrl, getStringSelection, 0}},
+ {1836, {wxTextCtrl, getStyle, 2}},
+ {1837, {wxTextCtrl, getValue, 0}},
+ {1838, {wxTextCtrl, isEditable, 0}},
+ {1839, {wxTextCtrl, isModified, 0}},
+ {1840, {wxTextCtrl, isMultiLine, 0}},
+ {1841, {wxTextCtrl, isSingleLine, 0}},
+ {1842, {wxTextCtrl, loadFile, 2}},
+ {1843, {wxTextCtrl, markDirty, 0}},
+ {1844, {wxTextCtrl, paste, 0}},
+ {1845, {wxTextCtrl, positionToXY, 3}},
+ {1846, {wxTextCtrl, redo, 0}},
+ {1847, {wxTextCtrl, remove, 2}},
+ {1848, {wxTextCtrl, replace, 3}},
+ {1849, {wxTextCtrl, saveFile, 1}},
+ {1850, {wxTextCtrl, setDefaultStyle, 1}},
+ {1851, {wxTextCtrl, setEditable, 1}},
+ {1852, {wxTextCtrl, setInsertionPoint, 1}},
+ {1853, {wxTextCtrl, setInsertionPointEnd, 0}},
+ {1855, {wxTextCtrl, setMaxLength, 1}},
+ {1856, {wxTextCtrl, setSelection, 2}},
+ {1857, {wxTextCtrl, setStyle, 3}},
+ {1858, {wxTextCtrl, setValue, 1}},
+ {1859, {wxTextCtrl, showPosition, 1}},
+ {1860, {wxTextCtrl, undo, 0}},
+ {1861, {wxTextCtrl, writeText, 1}},
+ {1862, {wxTextCtrl, xYToPosition, 2}},
+ {1865, {wxNotebook, new_0, 0}},
+ {1866, {wxNotebook, new_3, 3}},
+ {1867, {wxNotebook, destruct, 0}},
+ {1868, {wxNotebook, addPage, 3}},
+ {1869, {wxNotebook, advanceSelection, 1}},
+ {1870, {wxNotebook, assignImageList, 1}},
+ {1871, {wxNotebook, create, 3}},
+ {1872, {wxNotebook, deleteAllPages, 0}},
+ {1873, {wxNotebook, deletePage, 1}},
+ {1874, {wxNotebook, removePage, 1}},
+ {1875, {wxNotebook, getCurrentPage, 0}},
+ {1876, {wxNotebook, getImageList, 0}},
+ {1878, {wxNotebook, getPage, 1}},
+ {1879, {wxNotebook, getPageCount, 0}},
+ {1880, {wxNotebook, getPageImage, 1}},
+ {1881, {wxNotebook, getPageText, 1}},
+ {1882, {wxNotebook, getRowCount, 0}},
+ {1883, {wxNotebook, getSelection, 0}},
+ {1884, {wxNotebook, getThemeBackgroundColour, 0}},
+ {1886, {wxNotebook, hitTest, 2}},
+ {1888, {wxNotebook, insertPage, 4}},
+ {1889, {wxNotebook, setImageList, 1}},
+ {1890, {wxNotebook, setPadding, 1}},
+ {1891, {wxNotebook, setPageSize, 1}},
+ {1892, {wxNotebook, setPageImage, 2}},
+ {1893, {wxNotebook, setPageText, 2}},
+ {1894, {wxNotebook, setSelection, 1}},
+ {1895, {wxNotebook, changeSelection, 1}},
+ {1896, {wxChoicebook, new_0, 0}},
+ {1897, {wxChoicebook, new_3, 3}},
+ {1898, {wxChoicebook, addPage, 3}},
+ {1899, {wxChoicebook, advanceSelection, 1}},
+ {1900, {wxChoicebook, assignImageList, 1}},
+ {1901, {wxChoicebook, create, 3}},
+ {1902, {wxChoicebook, deleteAllPages, 0}},
+ {1903, {wxChoicebook, deletePage, 1}},
+ {1904, {wxChoicebook, removePage, 1}},
+ {1905, {wxChoicebook, getCurrentPage, 0}},
+ {1906, {wxChoicebook, getImageList, 0}},
+ {1908, {wxChoicebook, getPage, 1}},
+ {1909, {wxChoicebook, getPageCount, 0}},
+ {1910, {wxChoicebook, getPageImage, 1}},
+ {1911, {wxChoicebook, getPageText, 1}},
+ {1912, {wxChoicebook, getSelection, 0}},
+ {1913, {wxChoicebook, hitTest, 2}},
+ {1914, {wxChoicebook, insertPage, 4}},
+ {1915, {wxChoicebook, setImageList, 1}},
+ {1916, {wxChoicebook, setPageSize, 1}},
+ {1917, {wxChoicebook, setPageImage, 2}},
+ {1918, {wxChoicebook, setPageText, 2}},
+ {1919, {wxChoicebook, setSelection, 1}},
+ {1920, {wxChoicebook, changeSelection, 1}},
+ {1921, {wxChoicebook, 'Destroy', undefined}},
+ {1922, {wxToolbook, new_0, 0}},
+ {1923, {wxToolbook, new_3, 3}},
+ {1924, {wxToolbook, addPage, 3}},
+ {1925, {wxToolbook, advanceSelection, 1}},
+ {1926, {wxToolbook, assignImageList, 1}},
+ {1927, {wxToolbook, create, 3}},
+ {1928, {wxToolbook, deleteAllPages, 0}},
+ {1929, {wxToolbook, deletePage, 1}},
+ {1930, {wxToolbook, removePage, 1}},
+ {1931, {wxToolbook, getCurrentPage, 0}},
+ {1932, {wxToolbook, getImageList, 0}},
+ {1934, {wxToolbook, getPage, 1}},
+ {1935, {wxToolbook, getPageCount, 0}},
+ {1936, {wxToolbook, getPageImage, 1}},
+ {1937, {wxToolbook, getPageText, 1}},
+ {1938, {wxToolbook, getSelection, 0}},
+ {1940, {wxToolbook, hitTest, 2}},
+ {1941, {wxToolbook, insertPage, 4}},
+ {1942, {wxToolbook, setImageList, 1}},
+ {1943, {wxToolbook, setPageSize, 1}},
+ {1944, {wxToolbook, setPageImage, 2}},
+ {1945, {wxToolbook, setPageText, 2}},
+ {1946, {wxToolbook, setSelection, 1}},
+ {1947, {wxToolbook, changeSelection, 1}},
+ {1948, {wxToolbook, 'Destroy', undefined}},
+ {1949, {wxListbook, new_0, 0}},
+ {1950, {wxListbook, new_3, 3}},
+ {1951, {wxListbook, addPage, 3}},
+ {1952, {wxListbook, advanceSelection, 1}},
+ {1953, {wxListbook, assignImageList, 1}},
+ {1954, {wxListbook, create, 3}},
+ {1955, {wxListbook, deleteAllPages, 0}},
+ {1956, {wxListbook, deletePage, 1}},
+ {1957, {wxListbook, removePage, 1}},
+ {1958, {wxListbook, getCurrentPage, 0}},
+ {1959, {wxListbook, getImageList, 0}},
+ {1961, {wxListbook, getPage, 1}},
+ {1962, {wxListbook, getPageCount, 0}},
+ {1963, {wxListbook, getPageImage, 1}},
+ {1964, {wxListbook, getPageText, 1}},
+ {1965, {wxListbook, getSelection, 0}},
+ {1967, {wxListbook, hitTest, 2}},
+ {1968, {wxListbook, insertPage, 4}},
+ {1969, {wxListbook, setImageList, 1}},
+ {1970, {wxListbook, setPageSize, 1}},
+ {1971, {wxListbook, setPageImage, 2}},
+ {1972, {wxListbook, setPageText, 2}},
+ {1973, {wxListbook, setSelection, 1}},
+ {1974, {wxListbook, changeSelection, 1}},
+ {1975, {wxListbook, 'Destroy', undefined}},
+ {1976, {wxTreebook, new_0, 0}},
+ {1977, {wxTreebook, new_3, 3}},
+ {1978, {wxTreebook, addPage, 3}},
+ {1979, {wxTreebook, advanceSelection, 1}},
+ {1980, {wxTreebook, assignImageList, 1}},
+ {1981, {wxTreebook, create, 3}},
+ {1982, {wxTreebook, deleteAllPages, 0}},
+ {1983, {wxTreebook, deletePage, 1}},
+ {1984, {wxTreebook, removePage, 1}},
+ {1985, {wxTreebook, getCurrentPage, 0}},
+ {1986, {wxTreebook, getImageList, 0}},
+ {1988, {wxTreebook, getPage, 1}},
+ {1989, {wxTreebook, getPageCount, 0}},
+ {1990, {wxTreebook, getPageImage, 1}},
+ {1991, {wxTreebook, getPageText, 1}},
+ {1992, {wxTreebook, getSelection, 0}},
+ {1993, {wxTreebook, expandNode, 2}},
+ {1994, {wxTreebook, isNodeExpanded, 1}},
+ {1996, {wxTreebook, hitTest, 2}},
+ {1997, {wxTreebook, insertPage, 4}},
+ {1998, {wxTreebook, insertSubPage, 4}},
+ {1999, {wxTreebook, setImageList, 1}},
+ {2000, {wxTreebook, setPageSize, 1}},
+ {2001, {wxTreebook, setPageImage, 2}},
+ {2002, {wxTreebook, setPageText, 2}},
+ {2003, {wxTreebook, setSelection, 1}},
+ {2004, {wxTreebook, changeSelection, 1}},
+ {2005, {wxTreebook, 'Destroy', undefined}},
+ {2008, {wxTreeCtrl, new_2, 2}},
+ {2009, {wxTreeCtrl, new_0, 0}},
+ {2011, {wxTreeCtrl, destruct, 0}},
+ {2012, {wxTreeCtrl, addRoot, 2}},
+ {2013, {wxTreeCtrl, appendItem, 3}},
+ {2014, {wxTreeCtrl, assignImageList, 1}},
+ {2015, {wxTreeCtrl, assignStateImageList, 1}},
+ {2016, {wxTreeCtrl, collapse, 1}},
+ {2017, {wxTreeCtrl, collapseAndReset, 1}},
+ {2018, {wxTreeCtrl, create, 2}},
+ {2019, {wxTreeCtrl, delete, 1}},
+ {2020, {wxTreeCtrl, deleteAllItems, 0}},
+ {2021, {wxTreeCtrl, deleteChildren, 1}},
+ {2022, {wxTreeCtrl, editLabel, 1}},
+ {2023, {wxTreeCtrl, ensureVisible, 1}},
+ {2024, {wxTreeCtrl, expand, 1}},
+ {2025, {wxTreeCtrl, getBoundingRect, 3}},
+ {2027, {wxTreeCtrl, getChildrenCount, 2}},
+ {2028, {wxTreeCtrl, getCount, 0}},
+ {2029, {wxTreeCtrl, getEditControl, 0}},
+ {2030, {wxTreeCtrl, getFirstChild, 2}},
+ {2031, {wxTreeCtrl, getNextChild, 2}},
+ {2032, {wxTreeCtrl, getFirstVisibleItem, 0}},
+ {2033, {wxTreeCtrl, getImageList, 0}},
+ {2034, {wxTreeCtrl, getIndent, 0}},
+ {2035, {wxTreeCtrl, getItemBackgroundColour, 1}},
+ {2036, {wxTreeCtrl, getItemData, 1}},
+ {2037, {wxTreeCtrl, getItemFont, 1}},
+ {2038, {wxTreeCtrl, getItemImage_1, 1}},
+ {2039, {wxTreeCtrl, getItemImage_2, 2}},
+ {2040, {wxTreeCtrl, getItemText, 1}},
+ {2041, {wxTreeCtrl, getItemTextColour, 1}},
+ {2042, {wxTreeCtrl, getLastChild, 1}},
+ {2043, {wxTreeCtrl, getNextSibling, 1}},
+ {2044, {wxTreeCtrl, getNextVisible, 1}},
+ {2045, {wxTreeCtrl, getItemParent, 1}},
+ {2046, {wxTreeCtrl, getPrevSibling, 1}},
+ {2047, {wxTreeCtrl, getPrevVisible, 1}},
+ {2048, {wxTreeCtrl, getRootItem, 0}},
+ {2049, {wxTreeCtrl, getSelection, 0}},
+ {2050, {wxTreeCtrl, getSelections, 1}},
+ {2051, {wxTreeCtrl, getStateImageList, 0}},
+ {2052, {wxTreeCtrl, hitTest, 1}},
+ {2054, {wxTreeCtrl, insertItem, 4}},
+ {2055, {wxTreeCtrl, isBold, 1}},
+ {2056, {wxTreeCtrl, isExpanded, 1}},
+ {2057, {wxTreeCtrl, isSelected, 1}},
+ {2058, {wxTreeCtrl, isVisible, 1}},
+ {2059, {wxTreeCtrl, itemHasChildren, 1}},
+ {2060, {wxTreeCtrl, prependItem, 3}},
+ {2061, {wxTreeCtrl, scrollTo, 1}},
+ {2062, {wxTreeCtrl, selectItem_1, 1}},
+ {2063, {wxTreeCtrl, selectItem_2, 2}},
+ {2064, {wxTreeCtrl, setIndent, 1}},
+ {2065, {wxTreeCtrl, setImageList, 1}},
+ {2066, {wxTreeCtrl, setItemBackgroundColour, 2}},
+ {2067, {wxTreeCtrl, setItemBold, 2}},
+ {2068, {wxTreeCtrl, setItemData, 2}},
+ {2069, {wxTreeCtrl, setItemDropHighlight, 2}},
+ {2070, {wxTreeCtrl, setItemFont, 2}},
+ {2071, {wxTreeCtrl, setItemHasChildren, 2}},
+ {2072, {wxTreeCtrl, setItemImage_2, 2}},
+ {2073, {wxTreeCtrl, setItemImage_3, 3}},
+ {2074, {wxTreeCtrl, setItemText, 2}},
+ {2075, {wxTreeCtrl, setItemTextColour, 2}},
+ {2076, {wxTreeCtrl, setStateImageList, 1}},
+ {2077, {wxTreeCtrl, setWindowStyle, 1}},
+ {2078, {wxTreeCtrl, sortChildren, 1}},
+ {2079, {wxTreeCtrl, toggle, 1}},
+ {2080, {wxTreeCtrl, toggleItemSelection, 1}},
+ {2081, {wxTreeCtrl, unselect, 0}},
+ {2082, {wxTreeCtrl, unselectAll, 0}},
+ {2083, {wxTreeCtrl, unselectItem, 1}},
+ {2084, {wxScrollBar, new_0, 0}},
+ {2085, {wxScrollBar, new_3, 3}},
+ {2086, {wxScrollBar, destruct, 0}},
+ {2087, {wxScrollBar, create, 3}},
+ {2088, {wxScrollBar, getRange, 0}},
+ {2089, {wxScrollBar, getPageSize, 0}},
+ {2090, {wxScrollBar, getThumbPosition, 0}},
+ {2091, {wxScrollBar, getThumbSize, 0}},
+ {2092, {wxScrollBar, setThumbPosition, 1}},
+ {2093, {wxScrollBar, setScrollbar, 5}},
+ {2095, {wxSpinButton, new_2, 2}},
+ {2096, {wxSpinButton, new_0, 0}},
+ {2097, {wxSpinButton, create, 2}},
+ {2098, {wxSpinButton, getMax, 0}},
+ {2099, {wxSpinButton, getMin, 0}},
+ {2100, {wxSpinButton, getValue, 0}},
+ {2101, {wxSpinButton, setRange, 2}},
+ {2102, {wxSpinButton, setValue, 1}},
+ {2103, {wxSpinButton, 'Destroy', undefined}},
+ {2104, {wxSpinCtrl, new_0, 0}},
+ {2105, {wxSpinCtrl, new_2, 2}},
+ {2107, {wxSpinCtrl, create, 2}},
+ {2110, {wxSpinCtrl, setValue_1_1, 1}},
+ {2111, {wxSpinCtrl, setValue_1_0, 1}},
+ {2113, {wxSpinCtrl, getValue, 0}},
+ {2115, {wxSpinCtrl, setRange, 2}},
+ {2116, {wxSpinCtrl, setSelection, 2}},
+ {2118, {wxSpinCtrl, getMin, 0}},
+ {2120, {wxSpinCtrl, getMax, 0}},
+ {2121, {wxSpinCtrl, 'Destroy', undefined}},
+ {2122, {wxStaticText, new_0, 0}},
+ {2123, {wxStaticText, new_4, 4}},
+ {2124, {wxStaticText, create, 4}},
+ {2125, {wxStaticText, getLabel, 0}},
+ {2126, {wxStaticText, setLabel, 1}},
+ {2127, {wxStaticText, wrap, 1}},
+ {2128, {wxStaticText, 'Destroy', undefined}},
+ {2129, {wxStaticBitmap, new_0, 0}},
+ {2130, {wxStaticBitmap, new_4, 4}},
+ {2131, {wxStaticBitmap, create, 4}},
+ {2132, {wxStaticBitmap, getBitmap, 0}},
+ {2133, {wxStaticBitmap, setBitmap, 1}},
+ {2134, {wxStaticBitmap, 'Destroy', undefined}},
+ {2135, {wxRadioBox, new, 7}},
+ {2137, {wxRadioBox, destruct, 0}},
+ {2138, {wxRadioBox, create, 7}},
+ {2139, {wxRadioBox, enable_2, 2}},
+ {2140, {wxRadioBox, enable_1, 1}},
+ {2141, {wxRadioBox, getSelection, 0}},
+ {2142, {wxRadioBox, getString, 1}},
+ {2143, {wxRadioBox, setSelection, 1}},
+ {2144, {wxRadioBox, show_2, 2}},
+ {2145, {wxRadioBox, show_1, 1}},
+ {2146, {wxRadioBox, getColumnCount, 0}},
+ {2147, {wxRadioBox, getItemHelpText, 1}},
+ {2148, {wxRadioBox, getItemToolTip, 1}},
+ {2150, {wxRadioBox, getItemFromPoint, 1}},
+ {2151, {wxRadioBox, getRowCount, 0}},
+ {2152, {wxRadioBox, isItemEnabled, 1}},
+ {2153, {wxRadioBox, isItemShown, 1}},
+ {2154, {wxRadioBox, setItemHelpText, 2}},
+ {2155, {wxRadioBox, setItemToolTip, 2}},
+ {2156, {wxRadioButton, new_0, 0}},
+ {2157, {wxRadioButton, new_4, 4}},
+ {2158, {wxRadioButton, create, 4}},
+ {2159, {wxRadioButton, getValue, 0}},
+ {2160, {wxRadioButton, setValue, 1}},
+ {2161, {wxRadioButton, 'Destroy', undefined}},
+ {2163, {wxSlider, new_6, 6}},
+ {2164, {wxSlider, new_0, 0}},
+ {2165, {wxSlider, create, 6}},
+ {2166, {wxSlider, getLineSize, 0}},
+ {2167, {wxSlider, getMax, 0}},
+ {2168, {wxSlider, getMin, 0}},
+ {2169, {wxSlider, getPageSize, 0}},
+ {2170, {wxSlider, getThumbLength, 0}},
+ {2171, {wxSlider, getValue, 0}},
+ {2172, {wxSlider, setLineSize, 1}},
+ {2173, {wxSlider, setPageSize, 1}},
+ {2174, {wxSlider, setRange, 2}},
+ {2175, {wxSlider, setThumbLength, 1}},
+ {2176, {wxSlider, setValue, 1}},
+ {2177, {wxSlider, 'Destroy', undefined}},
+ {2179, {wxDialog, new_4, 4}},
+ {2180, {wxDialog, new_0, 0}},
+ {2182, {wxDialog, destruct, 0}},
+ {2183, {wxDialog, create, 4}},
+ {2184, {wxDialog, createButtonSizer, 1}},
+ {2185, {wxDialog, createStdDialogButtonSizer, 1}},
+ {2186, {wxDialog, endModal, 1}},
+ {2187, {wxDialog, getAffirmativeId, 0}},
+ {2188, {wxDialog, getReturnCode, 0}},
+ {2189, {wxDialog, isModal, 0}},
+ {2190, {wxDialog, setAffirmativeId, 1}},
+ {2191, {wxDialog, setReturnCode, 1}},
+ {2192, {wxDialog, show, 1}},
+ {2193, {wxDialog, showModal, 0}},
+ {2194, {wxColourDialog, new_0, 0}},
+ {2195, {wxColourDialog, new_2, 2}},
+ {2196, {wxColourDialog, destruct, 0}},
+ {2197, {wxColourDialog, create, 2}},
+ {2198, {wxColourDialog, getColourData, 0}},
+ {2199, {wxColourData, new_0, 0}},
+ {2200, {wxColourData, new_1, 1}},
+ {2201, {wxColourData, destruct, 0}},
+ {2202, {wxColourData, getChooseFull, 0}},
+ {2203, {wxColourData, getColour, 0}},
+ {2205, {wxColourData, getCustomColour, 1}},
+ {2206, {wxColourData, setChooseFull, 1}},
+ {2207, {wxColourData, setColour, 1}},
+ {2208, {wxColourData, setCustomColour, 2}},
+ {2209, {wxPalette, new_0, 0}},
+ {2210, {wxPalette, new_4, 4}},
+ {2212, {wxPalette, destruct, 0}},
+ {2213, {wxPalette, create, 4}},
+ {2214, {wxPalette, getColoursCount, 0}},
+ {2215, {wxPalette, getPixel, 3}},
+ {2216, {wxPalette, getRGB, 4}},
+ {2217, {wxPalette, isOk, 0}},
+ {2221, {wxDirDialog, new, 2}},
+ {2222, {wxDirDialog, destruct, 0}},
+ {2223, {wxDirDialog, getPath, 0}},
+ {2224, {wxDirDialog, getMessage, 0}},
+ {2225, {wxDirDialog, setMessage, 1}},
+ {2226, {wxDirDialog, setPath, 1}},
+ {2230, {wxFileDialog, new, 2}},
+ {2231, {wxFileDialog, destruct, 0}},
+ {2232, {wxFileDialog, getDirectory, 0}},
+ {2233, {wxFileDialog, getFilename, 0}},
+ {2234, {wxFileDialog, getFilenames, 1}},
+ {2235, {wxFileDialog, getFilterIndex, 0}},
+ {2236, {wxFileDialog, getMessage, 0}},
+ {2237, {wxFileDialog, getPath, 0}},
+ {2238, {wxFileDialog, getPaths, 1}},
+ {2239, {wxFileDialog, getWildcard, 0}},
+ {2240, {wxFileDialog, setDirectory, 1}},
+ {2241, {wxFileDialog, setFilename, 1}},
+ {2242, {wxFileDialog, setFilterIndex, 1}},
+ {2243, {wxFileDialog, setMessage, 1}},
+ {2244, {wxFileDialog, setPath, 1}},
+ {2245, {wxFileDialog, setWildcard, 1}},
+ {2246, {wxPickerBase, setInternalMargin, 1}},
+ {2247, {wxPickerBase, getInternalMargin, 0}},
+ {2248, {wxPickerBase, setTextCtrlProportion, 1}},
+ {2249, {wxPickerBase, setPickerCtrlProportion, 1}},
+ {2250, {wxPickerBase, getTextCtrlProportion, 0}},
+ {2251, {wxPickerBase, getPickerCtrlProportion, 0}},
+ {2252, {wxPickerBase, hasTextCtrl, 0}},
+ {2253, {wxPickerBase, getTextCtrl, 0}},
+ {2254, {wxPickerBase, isTextCtrlGrowable, 0}},
+ {2255, {wxPickerBase, setPickerCtrlGrowable, 1}},
+ {2256, {wxPickerBase, setTextCtrlGrowable, 1}},
+ {2257, {wxPickerBase, isPickerCtrlGrowable, 0}},
+ {2258, {wxFilePickerCtrl, new_0, 0}},
+ {2259, {wxFilePickerCtrl, new_3, 3}},
+ {2260, {wxFilePickerCtrl, create, 3}},
+ {2261, {wxFilePickerCtrl, getPath, 0}},
+ {2262, {wxFilePickerCtrl, setPath, 1}},
+ {2263, {wxFilePickerCtrl, 'Destroy', undefined}},
+ {2264, {wxDirPickerCtrl, new_0, 0}},
+ {2265, {wxDirPickerCtrl, new_3, 3}},
+ {2266, {wxDirPickerCtrl, create, 3}},
+ {2267, {wxDirPickerCtrl, getPath, 0}},
+ {2268, {wxDirPickerCtrl, setPath, 1}},
+ {2269, {wxDirPickerCtrl, 'Destroy', undefined}},
+ {2270, {wxColourPickerCtrl, new_0, 0}},
+ {2271, {wxColourPickerCtrl, new_3, 3}},
+ {2272, {wxColourPickerCtrl, create, 3}},
+ {2273, {wxColourPickerCtrl, getColour, 0}},
+ {2274, {wxColourPickerCtrl, setColour_1_1, 1}},
+ {2275, {wxColourPickerCtrl, setColour_1_0, 1}},
+ {2276, {wxColourPickerCtrl, 'Destroy', undefined}},
+ {2277, {wxDatePickerCtrl, new_0, 0}},
+ {2278, {wxDatePickerCtrl, new_3, 3}},
+ {2279, {wxDatePickerCtrl, getRange, 2}},
+ {2280, {wxDatePickerCtrl, getValue, 0}},
+ {2281, {wxDatePickerCtrl, setRange, 2}},
+ {2282, {wxDatePickerCtrl, setValue, 1}},
+ {2283, {wxDatePickerCtrl, 'Destroy', undefined}},
+ {2284, {wxFontPickerCtrl, new_0, 0}},
+ {2285, {wxFontPickerCtrl, new_3, 3}},
+ {2286, {wxFontPickerCtrl, create, 3}},
+ {2287, {wxFontPickerCtrl, getSelectedFont, 0}},
+ {2288, {wxFontPickerCtrl, setSelectedFont, 1}},
+ {2289, {wxFontPickerCtrl, getMaxPointSize, 0}},
+ {2290, {wxFontPickerCtrl, setMaxPointSize, 1}},
+ {2291, {wxFontPickerCtrl, 'Destroy', undefined}},
+ {2294, {wxFindReplaceDialog, new_0, 0}},
+ {2295, {wxFindReplaceDialog, new_4, 4}},
+ {2296, {wxFindReplaceDialog, destruct, 0}},
+ {2297, {wxFindReplaceDialog, create, 4}},
+ {2298, {wxFindReplaceDialog, getData, 0}},
+ {2299, {wxFindReplaceData, new_0, 0}},
+ {2300, {wxFindReplaceData, new_1, 1}},
+ {2301, {wxFindReplaceData, getFindString, 0}},
+ {2302, {wxFindReplaceData, getReplaceString, 0}},
+ {2303, {wxFindReplaceData, getFlags, 0}},
+ {2304, {wxFindReplaceData, setFlags, 1}},
+ {2305, {wxFindReplaceData, setFindString, 1}},
+ {2306, {wxFindReplaceData, setReplaceString, 1}},
+ {2307, {wxFindReplaceData, 'Destroy', undefined}},
+ {2308, {wxMultiChoiceDialog, new_0, 0}},
+ {2310, {wxMultiChoiceDialog, new_5, 5}},
+ {2311, {wxMultiChoiceDialog, getSelections, 0}},
+ {2312, {wxMultiChoiceDialog, setSelections, 1}},
+ {2313, {wxMultiChoiceDialog, 'Destroy', undefined}},
+ {2314, {wxSingleChoiceDialog, new_0, 0}},
+ {2316, {wxSingleChoiceDialog, new_5, 5}},
+ {2317, {wxSingleChoiceDialog, getSelection, 0}},
+ {2318, {wxSingleChoiceDialog, getStringSelection, 0}},
+ {2319, {wxSingleChoiceDialog, setSelection, 1}},
+ {2320, {wxSingleChoiceDialog, 'Destroy', undefined}},
+ {2321, {wxTextEntryDialog, new, 3}},
+ {2322, {wxTextEntryDialog, getValue, 0}},
+ {2323, {wxTextEntryDialog, setValue, 1}},
+ {2324, {wxTextEntryDialog, 'Destroy', undefined}},
+ {2325, {wxPasswordEntryDialog, new, 3}},
+ {2326, {wxPasswordEntryDialog, 'Destroy', undefined}},
+ {2327, {wxFontData, new_0, 0}},
+ {2328, {wxFontData, new_1, 1}},
+ {2329, {wxFontData, destruct, 0}},
+ {2330, {wxFontData, enableEffects, 1}},
+ {2331, {wxFontData, getAllowSymbols, 0}},
+ {2332, {wxFontData, getColour, 0}},
+ {2333, {wxFontData, getChosenFont, 0}},
+ {2334, {wxFontData, getEnableEffects, 0}},
+ {2335, {wxFontData, getInitialFont, 0}},
+ {2336, {wxFontData, getShowHelp, 0}},
+ {2337, {wxFontData, setAllowSymbols, 1}},
+ {2338, {wxFontData, setChosenFont, 1}},
+ {2339, {wxFontData, setColour, 1}},
+ {2340, {wxFontData, setInitialFont, 1}},
+ {2341, {wxFontData, setRange, 2}},
+ {2342, {wxFontData, setShowHelp, 1}},
+ {2346, {wxFontDialog, new_0, 0}},
+ {2348, {wxFontDialog, new_2, 2}},
+ {2350, {wxFontDialog, create, 2}},
+ {2351, {wxFontDialog, getFontData, 0}},
+ {2353, {wxFontDialog, 'Destroy', undefined}},
+ {2354, {wxProgressDialog, new, 3}},
+ {2355, {wxProgressDialog, destruct, 0}},
+ {2356, {wxProgressDialog, resume, 0}},
+ {2357, {wxProgressDialog, update_2, 2}},
+ {2358, {wxProgressDialog, update_0, 0}},
+ {2359, {wxMessageDialog, new, 3}},
+ {2360, {wxMessageDialog, destruct, 0}},
+ {2361, {wxPageSetupDialog, new, 2}},
+ {2362, {wxPageSetupDialog, destruct, 0}},
+ {2363, {wxPageSetupDialog, getPageSetupData, 0}},
+ {2364, {wxPageSetupDialog, showModal, 0}},
+ {2365, {wxPageSetupDialogData, new_0, 0}},
+ {2366, {wxPageSetupDialogData, new_1_0, 1}},
+ {2367, {wxPageSetupDialogData, new_1_1, 1}},
+ {2368, {wxPageSetupDialogData, destruct, 0}},
+ {2369, {wxPageSetupDialogData, enableHelp, 1}},
+ {2370, {wxPageSetupDialogData, enableMargins, 1}},
+ {2371, {wxPageSetupDialogData, enableOrientation, 1}},
+ {2372, {wxPageSetupDialogData, enablePaper, 1}},
+ {2373, {wxPageSetupDialogData, enablePrinter, 1}},
+ {2374, {wxPageSetupDialogData, getDefaultMinMargins, 0}},
+ {2375, {wxPageSetupDialogData, getEnableMargins, 0}},
+ {2376, {wxPageSetupDialogData, getEnableOrientation, 0}},
+ {2377, {wxPageSetupDialogData, getEnablePaper, 0}},
+ {2378, {wxPageSetupDialogData, getEnablePrinter, 0}},
+ {2379, {wxPageSetupDialogData, getEnableHelp, 0}},
+ {2380, {wxPageSetupDialogData, getDefaultInfo, 0}},
+ {2381, {wxPageSetupDialogData, getMarginTopLeft, 0}},
+ {2382, {wxPageSetupDialogData, getMarginBottomRight, 0}},
+ {2383, {wxPageSetupDialogData, getMinMarginTopLeft, 0}},
+ {2384, {wxPageSetupDialogData, getMinMarginBottomRight, 0}},
+ {2385, {wxPageSetupDialogData, getPaperId, 0}},
+ {2386, {wxPageSetupDialogData, getPaperSize, 0}},
+ {2388, {wxPageSetupDialogData, getPrintData, 0}},
+ {2389, {wxPageSetupDialogData, isOk, 0}},
+ {2390, {wxPageSetupDialogData, setDefaultInfo, 1}},
+ {2391, {wxPageSetupDialogData, setDefaultMinMargins, 1}},
+ {2392, {wxPageSetupDialogData, setMarginTopLeft, 1}},
+ {2393, {wxPageSetupDialogData, setMarginBottomRight, 1}},
+ {2394, {wxPageSetupDialogData, setMinMarginTopLeft, 1}},
+ {2395, {wxPageSetupDialogData, setMinMarginBottomRight, 1}},
+ {2396, {wxPageSetupDialogData, setPaperId, 1}},
+ {2397, {wxPageSetupDialogData, setPaperSize_1_1, 1}},
+ {2398, {wxPageSetupDialogData, setPaperSize_1_0, 1}},
+ {2399, {wxPageSetupDialogData, setPrintData, 1}},
+ {2400, {wxPrintDialog, new_2_0, 2}},
+ {2401, {wxPrintDialog, new_2_1, 2}},
+ {2402, {wxPrintDialog, destruct, 0}},
+ {2403, {wxPrintDialog, getPrintDialogData, 0}},
+ {2404, {wxPrintDialog, getPrintDC, 0}},
+ {2405, {wxPrintDialogData, new_0, 0}},
+ {2406, {wxPrintDialogData, new_1_1, 1}},
+ {2407, {wxPrintDialogData, new_1_0, 1}},
+ {2408, {wxPrintDialogData, destruct, 0}},
+ {2409, {wxPrintDialogData, enableHelp, 1}},
+ {2410, {wxPrintDialogData, enablePageNumbers, 1}},
+ {2411, {wxPrintDialogData, enablePrintToFile, 1}},
+ {2412, {wxPrintDialogData, enableSelection, 1}},
+ {2413, {wxPrintDialogData, getAllPages, 0}},
+ {2414, {wxPrintDialogData, getCollate, 0}},
+ {2415, {wxPrintDialogData, getFromPage, 0}},
+ {2416, {wxPrintDialogData, getMaxPage, 0}},
+ {2417, {wxPrintDialogData, getMinPage, 0}},
+ {2418, {wxPrintDialogData, getNoCopies, 0}},
+ {2419, {wxPrintDialogData, getPrintData, 0}},
+ {2420, {wxPrintDialogData, getPrintToFile, 0}},
+ {2421, {wxPrintDialogData, getSelection, 0}},
+ {2422, {wxPrintDialogData, getToPage, 0}},
+ {2423, {wxPrintDialogData, isOk, 0}},
+ {2424, {wxPrintDialogData, setCollate, 1}},
+ {2425, {wxPrintDialogData, setFromPage, 1}},
+ {2426, {wxPrintDialogData, setMaxPage, 1}},
+ {2427, {wxPrintDialogData, setMinPage, 1}},
+ {2428, {wxPrintDialogData, setNoCopies, 1}},
+ {2429, {wxPrintDialogData, setPrintData, 1}},
+ {2430, {wxPrintDialogData, setPrintToFile, 1}},
+ {2431, {wxPrintDialogData, setSelection, 1}},
+ {2432, {wxPrintDialogData, setToPage, 1}},
+ {2433, {wxPrintData, new_0, 0}},
+ {2434, {wxPrintData, new_1, 1}},
+ {2435, {wxPrintData, destruct, 0}},
+ {2436, {wxPrintData, getCollate, 0}},
+ {2437, {wxPrintData, getBin, 0}},
+ {2438, {wxPrintData, getColour, 0}},
+ {2439, {wxPrintData, getDuplex, 0}},
+ {2440, {wxPrintData, getNoCopies, 0}},
+ {2441, {wxPrintData, getOrientation, 0}},
+ {2442, {wxPrintData, getPaperId, 0}},
+ {2443, {wxPrintData, getPrinterName, 0}},
+ {2444, {wxPrintData, getQuality, 0}},
+ {2445, {wxPrintData, isOk, 0}},
+ {2446, {wxPrintData, setBin, 1}},
+ {2447, {wxPrintData, setCollate, 1}},
+ {2448, {wxPrintData, setColour, 1}},
+ {2449, {wxPrintData, setDuplex, 1}},
+ {2450, {wxPrintData, setNoCopies, 1}},
+ {2451, {wxPrintData, setOrientation, 1}},
+ {2452, {wxPrintData, setPaperId, 1}},
+ {2453, {wxPrintData, setPrinterName, 1}},
+ {2454, {wxPrintData, setQuality, 1}},
+ {2457, {wxPrintPreview, new_2, 2}},
+ {2458, {wxPrintPreview, new_3, 3}},
+ {2460, {wxPrintPreview, destruct, 0}},
+ {2461, {wxPrintPreview, getCanvas, 0}},
+ {2462, {wxPrintPreview, getCurrentPage, 0}},
+ {2463, {wxPrintPreview, getFrame, 0}},
+ {2464, {wxPrintPreview, getMaxPage, 0}},
+ {2465, {wxPrintPreview, getMinPage, 0}},
+ {2466, {wxPrintPreview, getPrintout, 0}},
+ {2467, {wxPrintPreview, getPrintoutForPrinting, 0}},
+ {2468, {wxPrintPreview, isOk, 0}},
+ {2469, {wxPrintPreview, paintPage, 2}},
+ {2470, {wxPrintPreview, print, 1}},
+ {2471, {wxPrintPreview, renderPage, 1}},
+ {2472, {wxPrintPreview, setCanvas, 1}},
+ {2473, {wxPrintPreview, setCurrentPage, 1}},
+ {2474, {wxPrintPreview, setFrame, 1}},
+ {2475, {wxPrintPreview, setPrintout, 1}},
+ {2476, {wxPrintPreview, setZoom, 1}},
+ {2477, {wxPreviewFrame, new, 3}},
+ {2478, {wxPreviewFrame, destruct, 0}},
+ {2479, {wxPreviewFrame, createControlBar, 0}},
+ {2480, {wxPreviewFrame, createCanvas, 0}},
+ {2481, {wxPreviewFrame, initialize, 0}},
+ {2482, {wxPreviewFrame, onCloseWindow, 1}},
+ {2483, {wxPreviewControlBar, new, 4}},
+ {2484, {wxPreviewControlBar, destruct, 0}},
+ {2485, {wxPreviewControlBar, createButtons, 0}},
+ {2486, {wxPreviewControlBar, getPrintPreview, 0}},
+ {2487, {wxPreviewControlBar, getZoomControl, 0}},
+ {2488, {wxPreviewControlBar, setZoomControl, 1}},
+ {2490, {wxPrinter, new, 1}},
+ {2491, {wxPrinter, createAbortWindow, 2}},
+ {2492, {wxPrinter, getAbort, 0}},
+ {2493, {wxPrinter, getLastError, 0}},
+ {2494, {wxPrinter, getPrintDialogData, 0}},
+ {2495, {wxPrinter, print, 3}},
+ {2496, {wxPrinter, printDialog, 1}},
+ {2497, {wxPrinter, reportError, 3}},
+ {2498, {wxPrinter, setup, 1}},
+ {2499, {wxPrinter, 'Destroy', undefined}},
+ {2500, {wxXmlResource, new_1, 1}},
+ {2501, {wxXmlResource, new_2, 2}},
+ {2502, {wxXmlResource, destruct, 0}},
+ {2503, {wxXmlResource, attachUnknownControl, 3}},
+ {2504, {wxXmlResource, clearHandlers, 0}},
+ {2505, {wxXmlResource, compareVersion, 4}},
+ {2506, {wxXmlResource, get, 0}},
+ {2507, {wxXmlResource, getFlags, 0}},
+ {2508, {wxXmlResource, getVersion, 0}},
+ {2509, {wxXmlResource, getXRCID, 2}},
+ {2510, {wxXmlResource, initAllHandlers, 0}},
+ {2511, {wxXmlResource, load, 1}},
+ {2512, {wxXmlResource, loadBitmap, 1}},
+ {2513, {wxXmlResource, loadDialog_2, 2}},
+ {2514, {wxXmlResource, loadDialog_3, 3}},
+ {2515, {wxXmlResource, loadFrame_2, 2}},
+ {2516, {wxXmlResource, loadFrame_3, 3}},
+ {2517, {wxXmlResource, loadIcon, 1}},
+ {2518, {wxXmlResource, loadMenu, 1}},
+ {2519, {wxXmlResource, loadMenuBar_2, 2}},
+ {2520, {wxXmlResource, loadMenuBar_1, 1}},
+ {2521, {wxXmlResource, loadPanel_2, 2}},
+ {2522, {wxXmlResource, loadPanel_3, 3}},
+ {2523, {wxXmlResource, loadToolBar, 2}},
+ {2524, {wxXmlResource, set, 1}},
+ {2525, {wxXmlResource, setFlags, 1}},
+ {2526, {wxXmlResource, unload, 1}},
+ {2527, {wxXmlResource, xrcctrl, 3}},
+ {2528, {wxHtmlEasyPrinting, new, 1}},
+ {2529, {wxHtmlEasyPrinting, destruct, 0}},
+ {2530, {wxHtmlEasyPrinting, getPrintData, 0}},
+ {2531, {wxHtmlEasyPrinting, getPageSetupData, 0}},
+ {2532, {wxHtmlEasyPrinting, previewFile, 1}},
+ {2533, {wxHtmlEasyPrinting, previewText, 2}},
+ {2534, {wxHtmlEasyPrinting, printFile, 1}},
+ {2535, {wxHtmlEasyPrinting, printText, 2}},
+ {2536, {wxHtmlEasyPrinting, pageSetup, 0}},
+ {2537, {wxHtmlEasyPrinting, setFonts, 3}},
+ {2538, {wxHtmlEasyPrinting, setHeader, 2}},
+ {2539, {wxHtmlEasyPrinting, setFooter, 2}},
+ {2541, {wxGLCanvas, new_2, 2}},
+ {2542, {wxGLCanvas, new_3_1, 3}},
+ {2543, {wxGLCanvas, new_3_0, 3}},
+ {2544, {wxGLCanvas, getContext, 0}},
+ {2546, {wxGLCanvas, setCurrent, 0}},
+ {2547, {wxGLCanvas, swapBuffers, 0}},
+ {2548, {wxGLCanvas, 'Destroy', undefined}},
+ {2549, {wxAuiManager, new, 1}},
+ {2550, {wxAuiManager, destruct, 0}},
+ {2551, {wxAuiManager, addPane_2_1, 2}},
+ {2552, {wxAuiManager, addPane_3, 3}},
+ {2553, {wxAuiManager, addPane_2_0, 2}},
+ {2554, {wxAuiManager, detachPane, 1}},
+ {2555, {wxAuiManager, getAllPanes, 0}},
+ {2556, {wxAuiManager, getArtProvider, 0}},
+ {2557, {wxAuiManager, getDockSizeConstraint, 2}},
+ {2558, {wxAuiManager, getFlags, 0}},
+ {2559, {wxAuiManager, getManagedWindow, 0}},
+ {2560, {wxAuiManager, getManager, 1}},
+ {2561, {wxAuiManager, getPane_1_1, 1}},
+ {2562, {wxAuiManager, getPane_1_0, 1}},
+ {2563, {wxAuiManager, hideHint, 0}},
+ {2564, {wxAuiManager, insertPane, 3}},
+ {2565, {wxAuiManager, loadPaneInfo, 2}},
+ {2566, {wxAuiManager, loadPerspective, 2}},
+ {2567, {wxAuiManager, savePaneInfo, 1}},
+ {2568, {wxAuiManager, savePerspective, 0}},
+ {2569, {wxAuiManager, setArtProvider, 1}},
+ {2570, {wxAuiManager, setDockSizeConstraint, 2}},
+ {2571, {wxAuiManager, setFlags, 1}},
+ {2572, {wxAuiManager, setManagedWindow, 1}},
+ {2573, {wxAuiManager, showHint, 1}},
+ {2574, {wxAuiManager, unInit, 0}},
+ {2575, {wxAuiManager, update, 0}},
+ {2576, {wxAuiPaneInfo, new_0, 0}},
+ {2577, {wxAuiPaneInfo, new_1, 1}},
+ {2578, {wxAuiPaneInfo, destruct, 0}},
+ {2579, {wxAuiPaneInfo, bestSize_1, 1}},
+ {2580, {wxAuiPaneInfo, bestSize_2, 2}},
+ {2581, {wxAuiPaneInfo, bottom, 0}},
+ {2582, {wxAuiPaneInfo, bottomDockable, 1}},
+ {2583, {wxAuiPaneInfo, caption, 1}},
+ {2584, {wxAuiPaneInfo, captionVisible, 1}},
+ {2585, {wxAuiPaneInfo, centre, 0}},
+ {2586, {wxAuiPaneInfo, centrePane, 0}},
+ {2587, {wxAuiPaneInfo, closeButton, 1}},
+ {2588, {wxAuiPaneInfo, defaultPane, 0}},
+ {2589, {wxAuiPaneInfo, destroyOnClose, 1}},
+ {2590, {wxAuiPaneInfo, direction, 1}},
+ {2591, {wxAuiPaneInfo, dock, 0}},
+ {2592, {wxAuiPaneInfo, dockable, 1}},
+ {2593, {wxAuiPaneInfo, fixed, 0}},
+ {2594, {wxAuiPaneInfo, float, 0}},
+ {2595, {wxAuiPaneInfo, floatable, 1}},
+ {2596, {wxAuiPaneInfo, floatingPosition_1, 1}},
+ {2597, {wxAuiPaneInfo, floatingPosition_2, 2}},
+ {2598, {wxAuiPaneInfo, floatingSize_1, 1}},
+ {2599, {wxAuiPaneInfo, floatingSize_2, 2}},
+ {2600, {wxAuiPaneInfo, gripper, 1}},
+ {2601, {wxAuiPaneInfo, gripperTop, 1}},
+ {2602, {wxAuiPaneInfo, hasBorder, 0}},
+ {2603, {wxAuiPaneInfo, hasCaption, 0}},
+ {2604, {wxAuiPaneInfo, hasCloseButton, 0}},
+ {2605, {wxAuiPaneInfo, hasFlag, 1}},
+ {2606, {wxAuiPaneInfo, hasGripper, 0}},
+ {2607, {wxAuiPaneInfo, hasGripperTop, 0}},
+ {2608, {wxAuiPaneInfo, hasMaximizeButton, 0}},
+ {2609, {wxAuiPaneInfo, hasMinimizeButton, 0}},
+ {2610, {wxAuiPaneInfo, hasPinButton, 0}},
+ {2611, {wxAuiPaneInfo, hide, 0}},
+ {2612, {wxAuiPaneInfo, isBottomDockable, 0}},
+ {2613, {wxAuiPaneInfo, isDocked, 0}},
+ {2614, {wxAuiPaneInfo, isFixed, 0}},
+ {2615, {wxAuiPaneInfo, isFloatable, 0}},
+ {2616, {wxAuiPaneInfo, isFloating, 0}},
+ {2617, {wxAuiPaneInfo, isLeftDockable, 0}},
+ {2618, {wxAuiPaneInfo, isMovable, 0}},
+ {2619, {wxAuiPaneInfo, isOk, 0}},
+ {2620, {wxAuiPaneInfo, isResizable, 0}},
+ {2621, {wxAuiPaneInfo, isRightDockable, 0}},
+ {2622, {wxAuiPaneInfo, isShown, 0}},
+ {2623, {wxAuiPaneInfo, isToolbar, 0}},
+ {2624, {wxAuiPaneInfo, isTopDockable, 0}},
+ {2625, {wxAuiPaneInfo, layer, 1}},
+ {2626, {wxAuiPaneInfo, left, 0}},
+ {2627, {wxAuiPaneInfo, leftDockable, 1}},
+ {2628, {wxAuiPaneInfo, maxSize_1, 1}},
+ {2629, {wxAuiPaneInfo, maxSize_2, 2}},
+ {2630, {wxAuiPaneInfo, maximizeButton, 1}},
+ {2631, {wxAuiPaneInfo, minSize_1, 1}},
+ {2632, {wxAuiPaneInfo, minSize_2, 2}},
+ {2633, {wxAuiPaneInfo, minimizeButton, 1}},
+ {2634, {wxAuiPaneInfo, movable, 1}},
+ {2635, {wxAuiPaneInfo, name, 1}},
+ {2636, {wxAuiPaneInfo, paneBorder, 1}},
+ {2637, {wxAuiPaneInfo, pinButton, 1}},
+ {2638, {wxAuiPaneInfo, position, 1}},
+ {2639, {wxAuiPaneInfo, resizable, 1}},
+ {2640, {wxAuiPaneInfo, right, 0}},
+ {2641, {wxAuiPaneInfo, rightDockable, 1}},
+ {2642, {wxAuiPaneInfo, row, 1}},
+ {2643, {wxAuiPaneInfo, safeSet, 1}},
+ {2644, {wxAuiPaneInfo, setFlag, 2}},
+ {2645, {wxAuiPaneInfo, show, 1}},
+ {2646, {wxAuiPaneInfo, toolbarPane, 0}},
+ {2647, {wxAuiPaneInfo, top, 0}},
+ {2648, {wxAuiPaneInfo, topDockable, 1}},
+ {2649, {wxAuiPaneInfo, window, 1}},
+ {2650, {wxAuiNotebook, new_0, 0}},
+ {2651, {wxAuiNotebook, new_2, 2}},
+ {2652, {wxAuiNotebook, addPage, 3}},
+ {2653, {wxAuiNotebook, create, 2}},
+ {2654, {wxAuiNotebook, deletePage, 1}},
+ {2655, {wxAuiNotebook, getArtProvider, 0}},
+ {2656, {wxAuiNotebook, getPage, 1}},
+ {2657, {wxAuiNotebook, getPageBitmap, 1}},
+ {2658, {wxAuiNotebook, getPageCount, 0}},
+ {2659, {wxAuiNotebook, getPageIndex, 1}},
+ {2660, {wxAuiNotebook, getPageText, 1}},
+ {2661, {wxAuiNotebook, getSelection, 0}},
+ {2662, {wxAuiNotebook, insertPage, 4}},
+ {2663, {wxAuiNotebook, removePage, 1}},
+ {2664, {wxAuiNotebook, setArtProvider, 1}},
+ {2665, {wxAuiNotebook, setFont, 1}},
+ {2666, {wxAuiNotebook, setPageBitmap, 2}},
+ {2667, {wxAuiNotebook, setPageText, 2}},
+ {2668, {wxAuiNotebook, setSelection, 1}},
+ {2669, {wxAuiNotebook, setTabCtrlHeight, 1}},
+ {2670, {wxAuiNotebook, setUniformBitmapSize, 1}},
+ {2671, {wxAuiNotebook, 'Destroy', undefined}},
+ {2672, {wxMDIParentFrame, new_0, 0}},
+ {2673, {wxMDIParentFrame, new_4, 4}},
+ {2674, {wxMDIParentFrame, destruct, 0}},
+ {2675, {wxMDIParentFrame, activateNext, 0}},
+ {2676, {wxMDIParentFrame, activatePrevious, 0}},
+ {2677, {wxMDIParentFrame, arrangeIcons, 0}},
+ {2678, {wxMDIParentFrame, cascade, 0}},
+ {2679, {wxMDIParentFrame, create, 4}},
+ {2680, {wxMDIParentFrame, getActiveChild, 0}},
+ {2681, {wxMDIParentFrame, getClientWindow, 0}},
+ {2682, {wxMDIParentFrame, tile, 1}},
+ {2683, {wxMDIChildFrame, new_0, 0}},
+ {2684, {wxMDIChildFrame, new_4, 4}},
+ {2685, {wxMDIChildFrame, destruct, 0}},
+ {2686, {wxMDIChildFrame, activate, 0}},
+ {2687, {wxMDIChildFrame, create, 4}},
+ {2688, {wxMDIChildFrame, maximize, 1}},
+ {2689, {wxMDIChildFrame, restore, 0}},
+ {2690, {wxMDIClientWindow, new_0, 0}},
+ {2691, {wxMDIClientWindow, new_2, 2}},
+ {2692, {wxMDIClientWindow, destruct, 0}},
+ {2693, {wxMDIClientWindow, createClient, 2}},
+ {2694, {wxLayoutAlgorithm, new, 0}},
+ {2695, {wxLayoutAlgorithm, layoutFrame, 2}},
+ {2696, {wxLayoutAlgorithm, layoutMDIFrame, 2}},
+ {2697, {wxLayoutAlgorithm, layoutWindow, 2}},
+ {2698, {wxLayoutAlgorithm, 'Destroy', undefined}},
+ {2699, {wxEvent, getId, 0}},
+ {2700, {wxEvent, getSkipped, 0}},
+ {2701, {wxEvent, getTimestamp, 0}},
+ {2702, {wxEvent, isCommandEvent, 0}},
+ {2703, {wxEvent, resumePropagation, 1}},
+ {2704, {wxEvent, shouldPropagate, 0}},
+ {2705, {wxEvent, skip, 1}},
+ {2706, {wxEvent, stopPropagation, 0}},
+ {2707, {wxCommandEvent, getClientData, 0}},
+ {2708, {wxCommandEvent, getExtraLong, 0}},
+ {2709, {wxCommandEvent, getInt, 0}},
+ {2710, {wxCommandEvent, getSelection, 0}},
+ {2711, {wxCommandEvent, getString, 0}},
+ {2712, {wxCommandEvent, isChecked, 0}},
+ {2713, {wxCommandEvent, isSelection, 0}},
+ {2714, {wxCommandEvent, setInt, 1}},
+ {2715, {wxCommandEvent, setString, 1}},
+ {2716, {wxScrollEvent, getOrientation, 0}},
+ {2717, {wxScrollEvent, getPosition, 0}},
+ {2718, {wxScrollWinEvent, getOrientation, 0}},
+ {2719, {wxScrollWinEvent, getPosition, 0}},
+ {2720, {wxMouseEvent, altDown, 0}},
+ {2721, {wxMouseEvent, button, 1}},
+ {2722, {wxMouseEvent, buttonDClick, 1}},
+ {2723, {wxMouseEvent, buttonDown, 1}},
+ {2724, {wxMouseEvent, buttonUp, 1}},
+ {2725, {wxMouseEvent, cmdDown, 0}},
+ {2726, {wxMouseEvent, controlDown, 0}},
+ {2727, {wxMouseEvent, dragging, 0}},
+ {2728, {wxMouseEvent, entering, 0}},
+ {2729, {wxMouseEvent, getButton, 0}},
+ {2732, {wxMouseEvent, getPosition, 0}},
+ {2733, {wxMouseEvent, getLogicalPosition, 1}},
+ {2734, {wxMouseEvent, getLinesPerAction, 0}},
+ {2735, {wxMouseEvent, getWheelRotation, 0}},
+ {2736, {wxMouseEvent, getWheelDelta, 0}},
+ {2737, {wxMouseEvent, getX, 0}},
+ {2738, {wxMouseEvent, getY, 0}},
+ {2739, {wxMouseEvent, isButton, 0}},
+ {2740, {wxMouseEvent, isPageScroll, 0}},
+ {2741, {wxMouseEvent, leaving, 0}},
+ {2742, {wxMouseEvent, leftDClick, 0}},
+ {2743, {wxMouseEvent, leftDown, 0}},
+ {2744, {wxMouseEvent, leftIsDown, 0}},
+ {2745, {wxMouseEvent, leftUp, 0}},
+ {2746, {wxMouseEvent, metaDown, 0}},
+ {2747, {wxMouseEvent, middleDClick, 0}},
+ {2748, {wxMouseEvent, middleDown, 0}},
+ {2749, {wxMouseEvent, middleIsDown, 0}},
+ {2750, {wxMouseEvent, middleUp, 0}},
+ {2751, {wxMouseEvent, moving, 0}},
+ {2752, {wxMouseEvent, rightDClick, 0}},
+ {2753, {wxMouseEvent, rightDown, 0}},
+ {2754, {wxMouseEvent, rightIsDown, 0}},
+ {2755, {wxMouseEvent, rightUp, 0}},
+ {2756, {wxMouseEvent, shiftDown, 0}},
+ {2757, {wxSetCursorEvent, getCursor, 0}},
+ {2758, {wxSetCursorEvent, getX, 0}},
+ {2759, {wxSetCursorEvent, getY, 0}},
+ {2760, {wxSetCursorEvent, hasCursor, 0}},
+ {2761, {wxSetCursorEvent, setCursor, 1}},
+ {2762, {wxKeyEvent, altDown, 0}},
+ {2763, {wxKeyEvent, cmdDown, 0}},
+ {2764, {wxKeyEvent, controlDown, 0}},
+ {2765, {wxKeyEvent, getKeyCode, 0}},
+ {2766, {wxKeyEvent, getModifiers, 0}},
+ {2769, {wxKeyEvent, getPosition, 0}},
+ {2770, {wxKeyEvent, getRawKeyCode, 0}},
+ {2771, {wxKeyEvent, getRawKeyFlags, 0}},
+ {2772, {wxKeyEvent, getUnicodeKey, 0}},
+ {2773, {wxKeyEvent, getX, 0}},
+ {2774, {wxKeyEvent, getY, 0}},
+ {2775, {wxKeyEvent, hasModifiers, 0}},
+ {2776, {wxKeyEvent, metaDown, 0}},
+ {2777, {wxKeyEvent, shiftDown, 0}},
+ {2778, {wxSizeEvent, getSize, 0}},
+ {2779, {wxMoveEvent, getPosition, 0}},
+ {2780, {wxEraseEvent, getDC, 0}},
+ {2781, {wxFocusEvent, getWindow, 0}},
+ {2782, {wxChildFocusEvent, getWindow, 0}},
+ {2783, {wxMenuEvent, getMenu, 0}},
+ {2784, {wxMenuEvent, getMenuId, 0}},
+ {2785, {wxMenuEvent, isPopup, 0}},
+ {2786, {wxCloseEvent, canVeto, 0}},
+ {2787, {wxCloseEvent, getLoggingOff, 0}},
+ {2788, {wxCloseEvent, setCanVeto, 1}},
+ {2789, {wxCloseEvent, setLoggingOff, 1}},
+ {2790, {wxCloseEvent, veto, 1}},
+ {2791, {wxShowEvent, setShow, 1}},
+ {2792, {wxShowEvent, getShow, 0}},
+ {2793, {wxIconizeEvent, iconized, 0}},
+ {2794, {wxJoystickEvent, buttonDown, 1}},
+ {2795, {wxJoystickEvent, buttonIsDown, 1}},
+ {2796, {wxJoystickEvent, buttonUp, 1}},
+ {2797, {wxJoystickEvent, getButtonChange, 0}},
+ {2798, {wxJoystickEvent, getButtonState, 0}},
+ {2799, {wxJoystickEvent, getJoystick, 0}},
+ {2800, {wxJoystickEvent, getPosition, 0}},
+ {2801, {wxJoystickEvent, getZPosition, 0}},
+ {2802, {wxJoystickEvent, isButton, 0}},
+ {2803, {wxJoystickEvent, isMove, 0}},
+ {2804, {wxJoystickEvent, isZMove, 0}},
+ {2805, {wxUpdateUIEvent, canUpdate, 1}},
+ {2806, {wxUpdateUIEvent, check, 1}},
+ {2807, {wxUpdateUIEvent, enable, 1}},
+ {2808, {wxUpdateUIEvent, show, 1}},
+ {2809, {wxUpdateUIEvent, getChecked, 0}},
+ {2810, {wxUpdateUIEvent, getEnabled, 0}},
+ {2811, {wxUpdateUIEvent, getShown, 0}},
+ {2812, {wxUpdateUIEvent, getSetChecked, 0}},
+ {2813, {wxUpdateUIEvent, getSetEnabled, 0}},
+ {2814, {wxUpdateUIEvent, getSetShown, 0}},
+ {2815, {wxUpdateUIEvent, getSetText, 0}},
+ {2816, {wxUpdateUIEvent, getText, 0}},
+ {2817, {wxUpdateUIEvent, getMode, 0}},
+ {2818, {wxUpdateUIEvent, getUpdateInterval, 0}},
+ {2819, {wxUpdateUIEvent, resetUpdateTime, 0}},
+ {2820, {wxUpdateUIEvent, setMode, 1}},
+ {2821, {wxUpdateUIEvent, setText, 1}},
+ {2822, {wxUpdateUIEvent, setUpdateInterval, 1}},
+ {2823, {wxMouseCaptureChangedEvent, getCapturedWindow, 0}},
+ {2824, {wxPaletteChangedEvent, setChangedWindow, 1}},
+ {2825, {wxPaletteChangedEvent, getChangedWindow, 0}},
+ {2826, {wxQueryNewPaletteEvent, setPaletteRealized, 1}},
+ {2827, {wxQueryNewPaletteEvent, getPaletteRealized, 0}},
+ {2828, {wxNavigationKeyEvent, getDirection, 0}},
+ {2829, {wxNavigationKeyEvent, setDirection, 1}},
+ {2830, {wxNavigationKeyEvent, isWindowChange, 0}},
+ {2831, {wxNavigationKeyEvent, setWindowChange, 1}},
+ {2832, {wxNavigationKeyEvent, isFromTab, 0}},
+ {2833, {wxNavigationKeyEvent, setFromTab, 1}},
+ {2834, {wxNavigationKeyEvent, getCurrentFocus, 0}},
+ {2835, {wxNavigationKeyEvent, setCurrentFocus, 1}},
+ {2836, {wxHelpEvent, getOrigin, 0}},
+ {2837, {wxHelpEvent, getPosition, 0}},
+ {2838, {wxHelpEvent, setOrigin, 1}},
+ {2839, {wxHelpEvent, setPosition, 1}},
+ {2840, {wxContextMenuEvent, getPosition, 0}},
+ {2841, {wxContextMenuEvent, setPosition, 1}},
+ {2842, {wxIdleEvent, canSend, 1}},
+ {2843, {wxIdleEvent, getMode, 0}},
+ {2844, {wxIdleEvent, requestMore, 1}},
+ {2845, {wxIdleEvent, moreRequested, 0}},
+ {2846, {wxIdleEvent, setMode, 1}},
+ {2847, {wxGridEvent, altDown, 0}},
+ {2848, {wxGridEvent, controlDown, 0}},
+ {2849, {wxGridEvent, getCol, 0}},
+ {2850, {wxGridEvent, getPosition, 0}},
+ {2851, {wxGridEvent, getRow, 0}},
+ {2852, {wxGridEvent, metaDown, 0}},
+ {2853, {wxGridEvent, selecting, 0}},
+ {2854, {wxGridEvent, shiftDown, 0}},
+ {2855, {wxNotifyEvent, allow, 0}},
+ {2856, {wxNotifyEvent, isAllowed, 0}},
+ {2857, {wxNotifyEvent, veto, 0}},
+ {2858, {wxSashEvent, getEdge, 0}},
+ {2859, {wxSashEvent, getDragRect, 0}},
+ {2860, {wxSashEvent, getDragStatus, 0}},
+ {2861, {wxListEvent, getCacheFrom, 0}},
+ {2862, {wxListEvent, getCacheTo, 0}},
+ {2863, {wxListEvent, getKeyCode, 0}},
+ {2864, {wxListEvent, getIndex, 0}},
+ {2865, {wxListEvent, getColumn, 0}},
+ {2866, {wxListEvent, getPoint, 0}},
+ {2867, {wxListEvent, getLabel, 0}},
+ {2868, {wxListEvent, getText, 0}},
+ {2869, {wxListEvent, getImage, 0}},
+ {2870, {wxListEvent, getData, 0}},
+ {2871, {wxListEvent, getMask, 0}},
+ {2872, {wxListEvent, getItem, 0}},
+ {2873, {wxListEvent, isEditCancelled, 0}},
+ {2874, {wxDateEvent, getDate, 0}},
+ {2875, {wxCalendarEvent, getWeekDay, 0}},
+ {2876, {wxFileDirPickerEvent, getPath, 0}},
+ {2877, {wxColourPickerEvent, getColour, 0}},
+ {2878, {wxFontPickerEvent, getFont, 0}},
+ {2879, {wxStyledTextEvent, getPosition, 0}},
+ {2880, {wxStyledTextEvent, getKey, 0}},
+ {2881, {wxStyledTextEvent, getModifiers, 0}},
+ {2882, {wxStyledTextEvent, getModificationType, 0}},
+ {2883, {wxStyledTextEvent, getText, 0}},
+ {2884, {wxStyledTextEvent, getLength, 0}},
+ {2885, {wxStyledTextEvent, getLinesAdded, 0}},
+ {2886, {wxStyledTextEvent, getLine, 0}},
+ {2887, {wxStyledTextEvent, getFoldLevelNow, 0}},
+ {2888, {wxStyledTextEvent, getFoldLevelPrev, 0}},
+ {2889, {wxStyledTextEvent, getMargin, 0}},
+ {2890, {wxStyledTextEvent, getMessage, 0}},
+ {2891, {wxStyledTextEvent, getWParam, 0}},
+ {2892, {wxStyledTextEvent, getLParam, 0}},
+ {2893, {wxStyledTextEvent, getListType, 0}},
+ {2894, {wxStyledTextEvent, getX, 0}},
+ {2895, {wxStyledTextEvent, getY, 0}},
+ {2896, {wxStyledTextEvent, getDragText, 0}},
+ {2897, {wxStyledTextEvent, getDragAllowMove, 0}},
+ {2898, {wxStyledTextEvent, getDragResult, 0}},
+ {2899, {wxStyledTextEvent, getShift, 0}},
+ {2900, {wxStyledTextEvent, getControl, 0}},
+ {2901, {wxStyledTextEvent, getAlt, 0}},
+ {2902, {utils, getKeyState, 1}},
+ {2903, {utils, getMousePosition, 2}},
+ {2904, {utils, getMouseState, 0}},
+ {2905, {utils, setDetectableAutoRepeat, 1}},
+ {2906, {utils, bell, 0}},
+ {2907, {utils, findMenuItemId, 3}},
+ {2908, {utils, genericFindWindowAtPoint, 1}},
+ {2909, {utils, findWindowAtPoint, 1}},
+ {2910, {utils, beginBusyCursor, 1}},
+ {2911, {utils, endBusyCursor, 0}},
+ {2912, {utils, isBusy, 0}},
+ {2913, {utils, shutdown, 1}},
+ {2914, {utils, shell, 1}},
+ {2915, {utils, launchDefaultBrowser, 2}},
+ {2916, {utils, getEmailAddress, 0}},
+ {2917, {utils, getUserId, 0}},
+ {2918, {utils, getHomeDir, 0}},
+ {2919, {utils, newId, 0}},
+ {2920, {utils, registerId, 1}},
+ {2921, {utils, getCurrentId, 0}},
+ {2922, {utils, getOsDescription, 0}},
+ {2923, {utils, isPlatformLittleEndian, 0}},
+ {2924, {utils, isPlatform64Bit, 0}},
+ {2925, {wxPrintout, new, 1}},
+ {2926, {wxPrintout, destruct, 0}},
+ {2927, {wxPrintout, getDC, 0}},
+ {2928, {wxPrintout, getPageSizeMM, 2}},
+ {2929, {wxPrintout, getPageSizePixels, 2}},
+ {2930, {wxPrintout, getPaperRectPixels, 0}},
+ {2931, {wxPrintout, getPPIPrinter, 2}},
+ {2932, {wxPrintout, getPPIScreen, 2}},
+ {2933, {wxPrintout, getTitle, 0}},
+ {2934, {wxPrintout, isPreview, 0}},
+ {2935, {wxPrintout, fitThisSizeToPaper, 1}},
+ {2936, {wxPrintout, fitThisSizeToPage, 1}},
+ {2937, {wxPrintout, fitThisSizeToPageMargins, 2}},
+ {2938, {wxPrintout, mapScreenSizeToPaper, 0}},
+ {2939, {wxPrintout, mapScreenSizeToPage, 0}},
+ {2940, {wxPrintout, mapScreenSizeToPageMargins, 1}},
+ {2941, {wxPrintout, mapScreenSizeToDevice, 0}},
+ {2942, {wxPrintout, getLogicalPaperRect, 0}},
+ {2943, {wxPrintout, getLogicalPageRect, 0}},
+ {2944, {wxPrintout, getLogicalPageMarginsRect, 1}},
+ {2945, {wxPrintout, setLogicalOrigin, 2}},
+ {2946, {wxPrintout, offsetLogicalOrigin, 2}},
+ {2947, {wxStyledTextCtrl, new_2, 2}},
+ {2948, {wxStyledTextCtrl, new_0, 0}},
+ {2949, {wxStyledTextCtrl, destruct, 0}},
+ {2950, {wxStyledTextCtrl, create, 2}},
+ {2951, {wxStyledTextCtrl, addText, 1}},
+ {2952, {wxStyledTextCtrl, addStyledText, 1}},
+ {2953, {wxStyledTextCtrl, insertText, 2}},
+ {2954, {wxStyledTextCtrl, clearAll, 0}},
+ {2955, {wxStyledTextCtrl, clearDocumentStyle, 0}},
+ {2956, {wxStyledTextCtrl, getLength, 0}},
+ {2957, {wxStyledTextCtrl, getCharAt, 1}},
+ {2958, {wxStyledTextCtrl, getCurrentPos, 0}},
+ {2959, {wxStyledTextCtrl, getAnchor, 0}},
+ {2960, {wxStyledTextCtrl, getStyleAt, 1}},
+ {2961, {wxStyledTextCtrl, redo, 0}},
+ {2962, {wxStyledTextCtrl, setUndoCollection, 1}},
+ {2963, {wxStyledTextCtrl, selectAll, 0}},
+ {2964, {wxStyledTextCtrl, setSavePoint, 0}},
+ {2965, {wxStyledTextCtrl, getStyledText, 2}},
+ {2966, {wxStyledTextCtrl, canRedo, 0}},
+ {2967, {wxStyledTextCtrl, markerLineFromHandle, 1}},
+ {2968, {wxStyledTextCtrl, markerDeleteHandle, 1}},
+ {2969, {wxStyledTextCtrl, getUndoCollection, 0}},
+ {2970, {wxStyledTextCtrl, getViewWhiteSpace, 0}},
+ {2971, {wxStyledTextCtrl, setViewWhiteSpace, 1}},
+ {2972, {wxStyledTextCtrl, positionFromPoint, 1}},
+ {2973, {wxStyledTextCtrl, positionFromPointClose, 2}},
+ {2974, {wxStyledTextCtrl, gotoLine, 1}},
+ {2975, {wxStyledTextCtrl, gotoPos, 1}},
+ {2976, {wxStyledTextCtrl, setAnchor, 1}},
+ {2977, {wxStyledTextCtrl, getCurLine, 1}},
+ {2978, {wxStyledTextCtrl, getEndStyled, 0}},
+ {2979, {wxStyledTextCtrl, convertEOLs, 1}},
+ {2980, {wxStyledTextCtrl, getEOLMode, 0}},
+ {2981, {wxStyledTextCtrl, setEOLMode, 1}},
+ {2982, {wxStyledTextCtrl, startStyling, 2}},
+ {2983, {wxStyledTextCtrl, setStyling, 2}},
+ {2984, {wxStyledTextCtrl, getBufferedDraw, 0}},
+ {2985, {wxStyledTextCtrl, setBufferedDraw, 1}},
+ {2986, {wxStyledTextCtrl, setTabWidth, 1}},
+ {2987, {wxStyledTextCtrl, getTabWidth, 0}},
+ {2988, {wxStyledTextCtrl, setCodePage, 1}},
+ {2989, {wxStyledTextCtrl, markerDefine, 3}},
+ {2990, {wxStyledTextCtrl, markerSetForeground, 2}},
+ {2991, {wxStyledTextCtrl, markerSetBackground, 2}},
+ {2992, {wxStyledTextCtrl, markerAdd, 2}},
+ {2993, {wxStyledTextCtrl, markerDelete, 2}},
+ {2994, {wxStyledTextCtrl, markerDeleteAll, 1}},
+ {2995, {wxStyledTextCtrl, markerGet, 1}},
+ {2996, {wxStyledTextCtrl, markerNext, 2}},
+ {2997, {wxStyledTextCtrl, markerPrevious, 2}},
+ {2998, {wxStyledTextCtrl, markerDefineBitmap, 2}},
+ {2999, {wxStyledTextCtrl, markerAddSet, 2}},
+ {3000, {wxStyledTextCtrl, markerSetAlpha, 2}},
+ {3001, {wxStyledTextCtrl, setMarginType, 2}},
+ {3002, {wxStyledTextCtrl, getMarginType, 1}},
+ {3003, {wxStyledTextCtrl, setMarginWidth, 2}},
+ {3004, {wxStyledTextCtrl, getMarginWidth, 1}},
+ {3005, {wxStyledTextCtrl, setMarginMask, 2}},
+ {3006, {wxStyledTextCtrl, getMarginMask, 1}},
+ {3007, {wxStyledTextCtrl, setMarginSensitive, 2}},
+ {3008, {wxStyledTextCtrl, getMarginSensitive, 1}},
+ {3009, {wxStyledTextCtrl, styleClearAll, 0}},
+ {3010, {wxStyledTextCtrl, styleSetForeground, 2}},
+ {3011, {wxStyledTextCtrl, styleSetBackground, 2}},
+ {3012, {wxStyledTextCtrl, styleSetBold, 2}},
+ {3013, {wxStyledTextCtrl, styleSetItalic, 2}},
+ {3014, {wxStyledTextCtrl, styleSetSize, 2}},
+ {3015, {wxStyledTextCtrl, styleSetFaceName, 2}},
+ {3016, {wxStyledTextCtrl, styleSetEOLFilled, 2}},
+ {3017, {wxStyledTextCtrl, styleResetDefault, 0}},
+ {3018, {wxStyledTextCtrl, styleSetUnderline, 2}},
+ {3019, {wxStyledTextCtrl, styleSetCase, 2}},
+ {3020, {wxStyledTextCtrl, styleSetHotSpot, 2}},
+ {3021, {wxStyledTextCtrl, setSelForeground, 2}},
+ {3022, {wxStyledTextCtrl, setSelBackground, 2}},
+ {3023, {wxStyledTextCtrl, getSelAlpha, 0}},
+ {3024, {wxStyledTextCtrl, setSelAlpha, 1}},
+ {3025, {wxStyledTextCtrl, setCaretForeground, 1}},
+ {3026, {wxStyledTextCtrl, cmdKeyAssign, 3}},
+ {3027, {wxStyledTextCtrl, cmdKeyClear, 2}},
+ {3028, {wxStyledTextCtrl, cmdKeyClearAll, 0}},
+ {3029, {wxStyledTextCtrl, setStyleBytes, 2}},
+ {3030, {wxStyledTextCtrl, styleSetVisible, 2}},
+ {3031, {wxStyledTextCtrl, getCaretPeriod, 0}},
+ {3032, {wxStyledTextCtrl, setCaretPeriod, 1}},
+ {3033, {wxStyledTextCtrl, setWordChars, 1}},
+ {3034, {wxStyledTextCtrl, beginUndoAction, 0}},
+ {3035, {wxStyledTextCtrl, endUndoAction, 0}},
+ {3036, {wxStyledTextCtrl, indicatorSetStyle, 2}},
+ {3037, {wxStyledTextCtrl, indicatorGetStyle, 1}},
+ {3038, {wxStyledTextCtrl, indicatorSetForeground, 2}},
+ {3039, {wxStyledTextCtrl, indicatorGetForeground, 1}},
+ {3040, {wxStyledTextCtrl, setWhitespaceForeground, 2}},
+ {3041, {wxStyledTextCtrl, setWhitespaceBackground, 2}},
+ {3042, {wxStyledTextCtrl, getStyleBits, 0}},
+ {3043, {wxStyledTextCtrl, setLineState, 2}},
+ {3044, {wxStyledTextCtrl, getLineState, 1}},
+ {3045, {wxStyledTextCtrl, getMaxLineState, 0}},
+ {3046, {wxStyledTextCtrl, getCaretLineVisible, 0}},
+ {3047, {wxStyledTextCtrl, setCaretLineVisible, 1}},
+ {3048, {wxStyledTextCtrl, getCaretLineBackground, 0}},
+ {3049, {wxStyledTextCtrl, setCaretLineBackground, 1}},
+ {3050, {wxStyledTextCtrl, autoCompShow, 2}},
+ {3051, {wxStyledTextCtrl, autoCompCancel, 0}},
+ {3052, {wxStyledTextCtrl, autoCompActive, 0}},
+ {3053, {wxStyledTextCtrl, autoCompPosStart, 0}},
+ {3054, {wxStyledTextCtrl, autoCompComplete, 0}},
+ {3055, {wxStyledTextCtrl, autoCompStops, 1}},
+ {3056, {wxStyledTextCtrl, autoCompSetSeparator, 1}},
+ {3057, {wxStyledTextCtrl, autoCompGetSeparator, 0}},
+ {3058, {wxStyledTextCtrl, autoCompSelect, 1}},
+ {3059, {wxStyledTextCtrl, autoCompSetCancelAtStart, 1}},
+ {3060, {wxStyledTextCtrl, autoCompGetCancelAtStart, 0}},
+ {3061, {wxStyledTextCtrl, autoCompSetFillUps, 1}},
+ {3062, {wxStyledTextCtrl, autoCompSetChooseSingle, 1}},
+ {3063, {wxStyledTextCtrl, autoCompGetChooseSingle, 0}},
+ {3064, {wxStyledTextCtrl, autoCompSetIgnoreCase, 1}},
+ {3065, {wxStyledTextCtrl, autoCompGetIgnoreCase, 0}},
+ {3066, {wxStyledTextCtrl, userListShow, 2}},
+ {3067, {wxStyledTextCtrl, autoCompSetAutoHide, 1}},
+ {3068, {wxStyledTextCtrl, autoCompGetAutoHide, 0}},
+ {3069, {wxStyledTextCtrl, autoCompSetDropRestOfWord, 1}},
+ {3070, {wxStyledTextCtrl, autoCompGetDropRestOfWord, 0}},
+ {3071, {wxStyledTextCtrl, registerImage, 2}},
+ {3072, {wxStyledTextCtrl, clearRegisteredImages, 0}},
+ {3073, {wxStyledTextCtrl, autoCompGetTypeSeparator, 0}},
+ {3074, {wxStyledTextCtrl, autoCompSetTypeSeparator, 1}},
+ {3075, {wxStyledTextCtrl, autoCompSetMaxWidth, 1}},
+ {3076, {wxStyledTextCtrl, autoCompGetMaxWidth, 0}},
+ {3077, {wxStyledTextCtrl, autoCompSetMaxHeight, 1}},
+ {3078, {wxStyledTextCtrl, autoCompGetMaxHeight, 0}},
+ {3079, {wxStyledTextCtrl, setIndent, 1}},
+ {3080, {wxStyledTextCtrl, getIndent, 0}},
+ {3081, {wxStyledTextCtrl, setUseTabs, 1}},
+ {3082, {wxStyledTextCtrl, getUseTabs, 0}},
+ {3083, {wxStyledTextCtrl, setLineIndentation, 2}},
+ {3084, {wxStyledTextCtrl, getLineIndentation, 1}},
+ {3085, {wxStyledTextCtrl, getLineIndentPosition, 1}},
+ {3086, {wxStyledTextCtrl, getColumn, 1}},
+ {3087, {wxStyledTextCtrl, setUseHorizontalScrollBar, 1}},
+ {3088, {wxStyledTextCtrl, getUseHorizontalScrollBar, 0}},
+ {3089, {wxStyledTextCtrl, setIndentationGuides, 1}},
+ {3090, {wxStyledTextCtrl, getIndentationGuides, 0}},
+ {3091, {wxStyledTextCtrl, setHighlightGuide, 1}},
+ {3092, {wxStyledTextCtrl, getHighlightGuide, 0}},
+ {3093, {wxStyledTextCtrl, getLineEndPosition, 1}},
+ {3094, {wxStyledTextCtrl, getCodePage, 0}},
+ {3095, {wxStyledTextCtrl, getCaretForeground, 0}},
+ {3096, {wxStyledTextCtrl, getReadOnly, 0}},
+ {3097, {wxStyledTextCtrl, setCurrentPos, 1}},
+ {3098, {wxStyledTextCtrl, setSelectionStart, 1}},
+ {3099, {wxStyledTextCtrl, getSelectionStart, 0}},
+ {3100, {wxStyledTextCtrl, setSelectionEnd, 1}},
+ {3101, {wxStyledTextCtrl, getSelectionEnd, 0}},
+ {3102, {wxStyledTextCtrl, setPrintMagnification, 1}},
+ {3103, {wxStyledTextCtrl, getPrintMagnification, 0}},
+ {3104, {wxStyledTextCtrl, setPrintColourMode, 1}},
+ {3105, {wxStyledTextCtrl, getPrintColourMode, 0}},
+ {3106, {wxStyledTextCtrl, findText, 4}},
+ {3107, {wxStyledTextCtrl, formatRange, 7}},
+ {3108, {wxStyledTextCtrl, getFirstVisibleLine, 0}},
+ {3109, {wxStyledTextCtrl, getLine, 1}},
+ {3110, {wxStyledTextCtrl, getLineCount, 0}},
+ {3111, {wxStyledTextCtrl, setMarginLeft, 1}},
+ {3112, {wxStyledTextCtrl, getMarginLeft, 0}},
+ {3113, {wxStyledTextCtrl, setMarginRight, 1}},
+ {3114, {wxStyledTextCtrl, getMarginRight, 0}},
+ {3115, {wxStyledTextCtrl, getModify, 0}},
+ {3116, {wxStyledTextCtrl, setSelection, 2}},
+ {3117, {wxStyledTextCtrl, getSelectedText, 0}},
+ {3118, {wxStyledTextCtrl, getTextRange, 2}},
+ {3119, {wxStyledTextCtrl, hideSelection, 1}},
+ {3120, {wxStyledTextCtrl, lineFromPosition, 1}},
+ {3121, {wxStyledTextCtrl, positionFromLine, 1}},
+ {3122, {wxStyledTextCtrl, lineScroll, 2}},
+ {3123, {wxStyledTextCtrl, ensureCaretVisible, 0}},
+ {3124, {wxStyledTextCtrl, replaceSelection, 1}},
+ {3125, {wxStyledTextCtrl, setReadOnly, 1}},
+ {3126, {wxStyledTextCtrl, canPaste, 0}},
+ {3127, {wxStyledTextCtrl, canUndo, 0}},
+ {3128, {wxStyledTextCtrl, emptyUndoBuffer, 0}},
+ {3129, {wxStyledTextCtrl, undo, 0}},
+ {3130, {wxStyledTextCtrl, cut, 0}},
+ {3131, {wxStyledTextCtrl, copy, 0}},
+ {3132, {wxStyledTextCtrl, paste, 0}},
+ {3133, {wxStyledTextCtrl, clear, 0}},
+ {3134, {wxStyledTextCtrl, setText, 1}},
+ {3135, {wxStyledTextCtrl, getText, 0}},
+ {3136, {wxStyledTextCtrl, getTextLength, 0}},
+ {3137, {wxStyledTextCtrl, getOvertype, 0}},
+ {3138, {wxStyledTextCtrl, setCaretWidth, 1}},
+ {3139, {wxStyledTextCtrl, getCaretWidth, 0}},
+ {3140, {wxStyledTextCtrl, setTargetStart, 1}},
+ {3141, {wxStyledTextCtrl, getTargetStart, 0}},
+ {3142, {wxStyledTextCtrl, setTargetEnd, 1}},
+ {3143, {wxStyledTextCtrl, getTargetEnd, 0}},
+ {3144, {wxStyledTextCtrl, replaceTarget, 1}},
+ {3145, {wxStyledTextCtrl, searchInTarget, 1}},
+ {3146, {wxStyledTextCtrl, setSearchFlags, 1}},
+ {3147, {wxStyledTextCtrl, getSearchFlags, 0}},
+ {3148, {wxStyledTextCtrl, callTipShow, 2}},
+ {3149, {wxStyledTextCtrl, callTipCancel, 0}},
+ {3150, {wxStyledTextCtrl, callTipActive, 0}},
+ {3151, {wxStyledTextCtrl, callTipPosAtStart, 0}},
+ {3152, {wxStyledTextCtrl, callTipSetHighlight, 2}},
+ {3153, {wxStyledTextCtrl, callTipSetBackground, 1}},
+ {3154, {wxStyledTextCtrl, callTipSetForeground, 1}},
+ {3155, {wxStyledTextCtrl, callTipSetForegroundHighlight, 1}},
+ {3156, {wxStyledTextCtrl, callTipUseStyle, 1}},
+ {3157, {wxStyledTextCtrl, visibleFromDocLine, 1}},
+ {3158, {wxStyledTextCtrl, docLineFromVisible, 1}},
+ {3159, {wxStyledTextCtrl, wrapCount, 1}},
+ {3160, {wxStyledTextCtrl, setFoldLevel, 2}},
+ {3161, {wxStyledTextCtrl, getFoldLevel, 1}},
+ {3162, {wxStyledTextCtrl, getLastChild, 2}},
+ {3163, {wxStyledTextCtrl, getFoldParent, 1}},
+ {3164, {wxStyledTextCtrl, showLines, 2}},
+ {3165, {wxStyledTextCtrl, hideLines, 2}},
+ {3166, {wxStyledTextCtrl, getLineVisible, 1}},
+ {3167, {wxStyledTextCtrl, setFoldExpanded, 2}},
+ {3168, {wxStyledTextCtrl, getFoldExpanded, 1}},
+ {3169, {wxStyledTextCtrl, toggleFold, 1}},
+ {3170, {wxStyledTextCtrl, ensureVisible, 1}},
+ {3171, {wxStyledTextCtrl, setFoldFlags, 1}},
+ {3172, {wxStyledTextCtrl, ensureVisibleEnforcePolicy, 1}},
+ {3173, {wxStyledTextCtrl, setTabIndents, 1}},
+ {3174, {wxStyledTextCtrl, getTabIndents, 0}},
+ {3175, {wxStyledTextCtrl, setBackSpaceUnIndents, 1}},
+ {3176, {wxStyledTextCtrl, getBackSpaceUnIndents, 0}},
+ {3177, {wxStyledTextCtrl, setMouseDwellTime, 1}},
+ {3178, {wxStyledTextCtrl, getMouseDwellTime, 0}},
+ {3179, {wxStyledTextCtrl, wordStartPosition, 2}},
+ {3180, {wxStyledTextCtrl, wordEndPosition, 2}},
+ {3181, {wxStyledTextCtrl, setWrapMode, 1}},
+ {3182, {wxStyledTextCtrl, getWrapMode, 0}},
+ {3183, {wxStyledTextCtrl, setWrapVisualFlags, 1}},
+ {3184, {wxStyledTextCtrl, getWrapVisualFlags, 0}},
+ {3185, {wxStyledTextCtrl, setWrapVisualFlagsLocation, 1}},
+ {3186, {wxStyledTextCtrl, getWrapVisualFlagsLocation, 0}},
+ {3187, {wxStyledTextCtrl, setWrapStartIndent, 1}},
+ {3188, {wxStyledTextCtrl, getWrapStartIndent, 0}},
+ {3189, {wxStyledTextCtrl, setLayoutCache, 1}},
+ {3190, {wxStyledTextCtrl, getLayoutCache, 0}},
+ {3191, {wxStyledTextCtrl, setScrollWidth, 1}},
+ {3192, {wxStyledTextCtrl, getScrollWidth, 0}},
+ {3193, {wxStyledTextCtrl, textWidth, 2}},
+ {3194, {wxStyledTextCtrl, getEndAtLastLine, 0}},
+ {3195, {wxStyledTextCtrl, textHeight, 1}},
+ {3196, {wxStyledTextCtrl, setUseVerticalScrollBar, 1}},
+ {3197, {wxStyledTextCtrl, getUseVerticalScrollBar, 0}},
+ {3198, {wxStyledTextCtrl, appendText, 1}},
+ {3199, {wxStyledTextCtrl, getTwoPhaseDraw, 0}},
+ {3200, {wxStyledTextCtrl, setTwoPhaseDraw, 1}},
+ {3201, {wxStyledTextCtrl, targetFromSelection, 0}},
+ {3202, {wxStyledTextCtrl, linesJoin, 0}},
+ {3203, {wxStyledTextCtrl, linesSplit, 1}},
+ {3204, {wxStyledTextCtrl, setFoldMarginColour, 2}},
+ {3205, {wxStyledTextCtrl, setFoldMarginHiColour, 2}},
+ {3206, {wxStyledTextCtrl, lineDown, 0}},
+ {3207, {wxStyledTextCtrl, lineDownExtend, 0}},
+ {3208, {wxStyledTextCtrl, lineUp, 0}},
+ {3209, {wxStyledTextCtrl, lineUpExtend, 0}},
+ {3210, {wxStyledTextCtrl, charLeft, 0}},
+ {3211, {wxStyledTextCtrl, charLeftExtend, 0}},
+ {3212, {wxStyledTextCtrl, charRight, 0}},
+ {3213, {wxStyledTextCtrl, charRightExtend, 0}},
+ {3214, {wxStyledTextCtrl, wordLeft, 0}},
+ {3215, {wxStyledTextCtrl, wordLeftExtend, 0}},
+ {3216, {wxStyledTextCtrl, wordRight, 0}},
+ {3217, {wxStyledTextCtrl, wordRightExtend, 0}},
+ {3218, {wxStyledTextCtrl, home, 0}},
+ {3219, {wxStyledTextCtrl, homeExtend, 0}},
+ {3220, {wxStyledTextCtrl, lineEnd, 0}},
+ {3221, {wxStyledTextCtrl, lineEndExtend, 0}},
+ {3222, {wxStyledTextCtrl, documentStart, 0}},
+ {3223, {wxStyledTextCtrl, documentStartExtend, 0}},
+ {3224, {wxStyledTextCtrl, documentEnd, 0}},
+ {3225, {wxStyledTextCtrl, documentEndExtend, 0}},
+ {3226, {wxStyledTextCtrl, pageUp, 0}},
+ {3227, {wxStyledTextCtrl, pageUpExtend, 0}},
+ {3228, {wxStyledTextCtrl, pageDown, 0}},
+ {3229, {wxStyledTextCtrl, pageDownExtend, 0}},
+ {3230, {wxStyledTextCtrl, editToggleOvertype, 0}},
+ {3231, {wxStyledTextCtrl, cancel, 0}},
+ {3232, {wxStyledTextCtrl, deleteBack, 0}},
+ {3233, {wxStyledTextCtrl, tab, 0}},
+ {3234, {wxStyledTextCtrl, backTab, 0}},
+ {3235, {wxStyledTextCtrl, newLine, 0}},
+ {3236, {wxStyledTextCtrl, formFeed, 0}},
+ {3237, {wxStyledTextCtrl, vCHome, 0}},
+ {3238, {wxStyledTextCtrl, vCHomeExtend, 0}},
+ {3239, {wxStyledTextCtrl, zoomIn, 0}},
+ {3240, {wxStyledTextCtrl, zoomOut, 0}},
+ {3241, {wxStyledTextCtrl, delWordLeft, 0}},
+ {3242, {wxStyledTextCtrl, delWordRight, 0}},
+ {3243, {wxStyledTextCtrl, lineCut, 0}},
+ {3244, {wxStyledTextCtrl, lineDelete, 0}},
+ {3245, {wxStyledTextCtrl, lineTranspose, 0}},
+ {3246, {wxStyledTextCtrl, lineDuplicate, 0}},
+ {3247, {wxStyledTextCtrl, lowerCase, 0}},
+ {3248, {wxStyledTextCtrl, upperCase, 0}},
+ {3249, {wxStyledTextCtrl, lineScrollDown, 0}},
+ {3250, {wxStyledTextCtrl, lineScrollUp, 0}},
+ {3251, {wxStyledTextCtrl, deleteBackNotLine, 0}},
+ {3252, {wxStyledTextCtrl, homeDisplay, 0}},
+ {3253, {wxStyledTextCtrl, homeDisplayExtend, 0}},
+ {3254, {wxStyledTextCtrl, lineEndDisplay, 0}},
+ {3255, {wxStyledTextCtrl, lineEndDisplayExtend, 0}},
+ {3256, {wxStyledTextCtrl, homeWrapExtend, 0}},
+ {3257, {wxStyledTextCtrl, lineEndWrap, 0}},
+ {3258, {wxStyledTextCtrl, lineEndWrapExtend, 0}},
+ {3259, {wxStyledTextCtrl, vCHomeWrap, 0}},
+ {3260, {wxStyledTextCtrl, vCHomeWrapExtend, 0}},
+ {3261, {wxStyledTextCtrl, lineCopy, 0}},
+ {3262, {wxStyledTextCtrl, moveCaretInsideView, 0}},
+ {3263, {wxStyledTextCtrl, lineLength, 1}},
+ {3264, {wxStyledTextCtrl, braceHighlight, 2}},
+ {3265, {wxStyledTextCtrl, braceBadLight, 1}},
+ {3266, {wxStyledTextCtrl, braceMatch, 1}},
+ {3267, {wxStyledTextCtrl, getViewEOL, 0}},
+ {3268, {wxStyledTextCtrl, setViewEOL, 1}},
+ {3269, {wxStyledTextCtrl, setModEventMask, 1}},
+ {3270, {wxStyledTextCtrl, getEdgeColumn, 0}},
+ {3271, {wxStyledTextCtrl, setEdgeColumn, 1}},
+ {3272, {wxStyledTextCtrl, getEdgeMode, 0}},
+ {3273, {wxStyledTextCtrl, getEdgeColour, 0}},
+ {3274, {wxStyledTextCtrl, setEdgeColour, 1}},
+ {3275, {wxStyledTextCtrl, searchAnchor, 0}},
+ {3276, {wxStyledTextCtrl, searchNext, 2}},
+ {3277, {wxStyledTextCtrl, searchPrev, 2}},
+ {3278, {wxStyledTextCtrl, linesOnScreen, 0}},
+ {3279, {wxStyledTextCtrl, usePopUp, 1}},
+ {3280, {wxStyledTextCtrl, selectionIsRectangle, 0}},
+ {3281, {wxStyledTextCtrl, setZoom, 1}},
+ {3282, {wxStyledTextCtrl, getZoom, 0}},
+ {3283, {wxStyledTextCtrl, getModEventMask, 0}},
+ {3284, {wxStyledTextCtrl, setSTCFocus, 1}},
+ {3285, {wxStyledTextCtrl, getSTCFocus, 0}},
+ {3286, {wxStyledTextCtrl, setStatus, 1}},
+ {3287, {wxStyledTextCtrl, getStatus, 0}},
+ {3288, {wxStyledTextCtrl, setMouseDownCaptures, 1}},
+ {3289, {wxStyledTextCtrl, getMouseDownCaptures, 0}},
+ {3290, {wxStyledTextCtrl, setSTCCursor, 1}},
+ {3291, {wxStyledTextCtrl, getSTCCursor, 0}},
+ {3292, {wxStyledTextCtrl, setControlCharSymbol, 1}},
+ {3293, {wxStyledTextCtrl, getControlCharSymbol, 0}},
+ {3294, {wxStyledTextCtrl, wordPartLeft, 0}},
+ {3295, {wxStyledTextCtrl, wordPartLeftExtend, 0}},
+ {3296, {wxStyledTextCtrl, wordPartRight, 0}},
+ {3297, {wxStyledTextCtrl, wordPartRightExtend, 0}},
+ {3298, {wxStyledTextCtrl, setVisiblePolicy, 2}},
+ {3299, {wxStyledTextCtrl, delLineLeft, 0}},
+ {3300, {wxStyledTextCtrl, delLineRight, 0}},
+ {3301, {wxStyledTextCtrl, getXOffset, 0}},
+ {3302, {wxStyledTextCtrl, chooseCaretX, 0}},
+ {3303, {wxStyledTextCtrl, setXCaretPolicy, 2}},
+ {3304, {wxStyledTextCtrl, setYCaretPolicy, 2}},
+ {3305, {wxStyledTextCtrl, getPrintWrapMode, 0}},
+ {3306, {wxStyledTextCtrl, setHotspotActiveForeground, 2}},
+ {3307, {wxStyledTextCtrl, setHotspotActiveBackground, 2}},
+ {3308, {wxStyledTextCtrl, setHotspotActiveUnderline, 1}},
+ {3309, {wxStyledTextCtrl, setHotspotSingleLine, 1}},
+ {3310, {wxStyledTextCtrl, paraDownExtend, 0}},
+ {3311, {wxStyledTextCtrl, paraUp, 0}},
+ {3312, {wxStyledTextCtrl, paraUpExtend, 0}},
+ {3313, {wxStyledTextCtrl, positionBefore, 1}},
+ {3314, {wxStyledTextCtrl, positionAfter, 1}},
+ {3315, {wxStyledTextCtrl, copyRange, 2}},
+ {3316, {wxStyledTextCtrl, copyText, 2}},
+ {3317, {wxStyledTextCtrl, setSelectionMode, 1}},
+ {3318, {wxStyledTextCtrl, getSelectionMode, 0}},
+ {3319, {wxStyledTextCtrl, lineDownRectExtend, 0}},
+ {3320, {wxStyledTextCtrl, lineUpRectExtend, 0}},
+ {3321, {wxStyledTextCtrl, charLeftRectExtend, 0}},
+ {3322, {wxStyledTextCtrl, charRightRectExtend, 0}},
+ {3323, {wxStyledTextCtrl, homeRectExtend, 0}},
+ {3324, {wxStyledTextCtrl, vCHomeRectExtend, 0}},
+ {3325, {wxStyledTextCtrl, lineEndRectExtend, 0}},
+ {3326, {wxStyledTextCtrl, pageUpRectExtend, 0}},
+ {3327, {wxStyledTextCtrl, pageDownRectExtend, 0}},
+ {3328, {wxStyledTextCtrl, stutteredPageUp, 0}},
+ {3329, {wxStyledTextCtrl, stutteredPageUpExtend, 0}},
+ {3330, {wxStyledTextCtrl, stutteredPageDown, 0}},
+ {3331, {wxStyledTextCtrl, stutteredPageDownExtend, 0}},
+ {3332, {wxStyledTextCtrl, wordLeftEnd, 0}},
+ {3333, {wxStyledTextCtrl, wordLeftEndExtend, 0}},
+ {3334, {wxStyledTextCtrl, wordRightEnd, 0}},
+ {3335, {wxStyledTextCtrl, wordRightEndExtend, 0}},
+ {3336, {wxStyledTextCtrl, setWhitespaceChars, 1}},
+ {3337, {wxStyledTextCtrl, setCharsDefault, 0}},
+ {3338, {wxStyledTextCtrl, autoCompGetCurrent, 0}},
+ {3339, {wxStyledTextCtrl, allocate, 1}},
+ {3340, {wxStyledTextCtrl, findColumn, 2}},
+ {3341, {wxStyledTextCtrl, getCaretSticky, 0}},
+ {3342, {wxStyledTextCtrl, setCaretSticky, 1}},
+ {3343, {wxStyledTextCtrl, toggleCaretSticky, 0}},
+ {3344, {wxStyledTextCtrl, setPasteConvertEndings, 1}},
+ {3345, {wxStyledTextCtrl, getPasteConvertEndings, 0}},
+ {3346, {wxStyledTextCtrl, selectionDuplicate, 0}},
+ {3347, {wxStyledTextCtrl, setCaretLineBackAlpha, 1}},
+ {3348, {wxStyledTextCtrl, getCaretLineBackAlpha, 0}},
+ {3349, {wxStyledTextCtrl, startRecord, 0}},
+ {3350, {wxStyledTextCtrl, stopRecord, 0}},
+ {3351, {wxStyledTextCtrl, setLexer, 1}},
+ {3352, {wxStyledTextCtrl, getLexer, 0}},
+ {3353, {wxStyledTextCtrl, colourise, 2}},
+ {3354, {wxStyledTextCtrl, setProperty, 2}},
+ {3355, {wxStyledTextCtrl, setKeyWords, 2}},
+ {3356, {wxStyledTextCtrl, setLexerLanguage, 1}},
+ {3357, {wxStyledTextCtrl, getProperty, 1}},
+ {3358, {wxStyledTextCtrl, getStyleBitsNeeded, 0}},
+ {3359, {wxStyledTextCtrl, getCurrentLine, 0}},
+ {3360, {wxStyledTextCtrl, styleSetSpec, 2}},
+ {3361, {wxStyledTextCtrl, styleSetFont, 2}},
+ {3362, {wxStyledTextCtrl, styleSetFontAttr, 7}},
+ {3363, {wxStyledTextCtrl, styleSetCharacterSet, 2}},
+ {3364, {wxStyledTextCtrl, styleSetFontEncoding, 2}},
+ {3365, {wxStyledTextCtrl, cmdKeyExecute, 1}},
+ {3366, {wxStyledTextCtrl, setMargins, 2}},
+ {3367, {wxStyledTextCtrl, getSelection, 2}},
+ {3368, {wxStyledTextCtrl, pointFromPosition, 1}},
+ {3369, {wxStyledTextCtrl, scrollToLine, 1}},
+ {3370, {wxStyledTextCtrl, scrollToColumn, 1}},
+ {3371, {wxStyledTextCtrl, sendMsg, 2}},
+ {3372, {wxStyledTextCtrl, setVScrollBar, 1}},
+ {3373, {wxStyledTextCtrl, setHScrollBar, 1}},
+ {3374, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
+ {3375, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
+ {3376, {wxStyledTextCtrl, saveFile, 1}},
+ {3377, {wxStyledTextCtrl, loadFile, 1}},
+ {3378, {wxStyledTextCtrl, doDragOver, 3}},
+ {3379, {wxStyledTextCtrl, doDropText, 3}},
+ {3380, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
+ {3381, {wxStyledTextCtrl, addTextRaw, 1}},
+ {3382, {wxStyledTextCtrl, insertTextRaw, 2}},
+ {3383, {wxStyledTextCtrl, getCurLineRaw, 1}},
+ {3384, {wxStyledTextCtrl, getLineRaw, 1}},
+ {3385, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
+ {3386, {wxStyledTextCtrl, getTextRangeRaw, 2}},
+ {3387, {wxStyledTextCtrl, setTextRaw, 1}},
+ {3388, {wxStyledTextCtrl, getTextRaw, 0}},
+ {3389, {wxStyledTextCtrl, appendTextRaw, 1}},
+ {3390, {wxArtProvider, getBitmap, 2}},
+ {3391, {wxArtProvider, getIcon, 2}},
+ {3392, {wxTreeEvent, getKeyCode, 0}},
+ {3393, {wxTreeEvent, getItem, 0}},
+ {3394, {wxTreeEvent, getKeyEvent, 0}},
+ {3395, {wxTreeEvent, getLabel, 0}},
+ {3396, {wxTreeEvent, getOldItem, 0}},
+ {3397, {wxTreeEvent, getPoint, 0}},
+ {3398, {wxTreeEvent, isEditCancelled, 0}},
+ {3399, {wxTreeEvent, setToolTip, 1}},
+ {3400, {wxNotebookEvent, getOldSelection, 0}},
+ {3401, {wxNotebookEvent, getSelection, 0}},
+ {3402, {wxNotebookEvent, setOldSelection, 1}},
+ {3403, {wxNotebookEvent, setSelection, 1}},
+ {3404, {wxFileDataObject, new, 0}},
+ {3405, {wxFileDataObject, addFile, 1}},
+ {3406, {wxFileDataObject, getFilenames, 0}},
+ {3407, {wxFileDataObject, 'Destroy', undefined}},
+ {3408, {wxTextDataObject, new, 1}},
+ {3409, {wxTextDataObject, getTextLength, 0}},
+ {3410, {wxTextDataObject, getText, 0}},
+ {3411, {wxTextDataObject, setText, 1}},
+ {3412, {wxTextDataObject, 'Destroy', undefined}},
+ {3413, {wxBitmapDataObject, new_1_1, 1}},
+ {3414, {wxBitmapDataObject, new_1_0, 1}},
+ {3415, {wxBitmapDataObject, getBitmap, 0}},
+ {3416, {wxBitmapDataObject, setBitmap, 1}},
+ {3417, {wxBitmapDataObject, 'Destroy', undefined}},
+ {3419, {wxClipboard, new, 0}},
+ {3420, {wxClipboard, destruct, 0}},
+ {3421, {wxClipboard, addData, 1}},
+ {3422, {wxClipboard, clear, 0}},
+ {3423, {wxClipboard, close, 0}},
+ {3424, {wxClipboard, flush, 0}},
+ {3425, {wxClipboard, getData, 1}},
+ {3426, {wxClipboard, isOpened, 0}},
+ {3427, {wxClipboard, open, 0}},
+ {3428, {wxClipboard, setData, 1}},
+ {3430, {wxClipboard, usePrimarySelection, 1}},
+ {3431, {wxClipboard, isSupported, 1}},
+ {3432, {wxClipboard, get, 0}},
+ {3433, {wxSpinEvent, getPosition, 0}},
+ {3434, {wxSpinEvent, setPosition, 1}},
+ {3435, {wxSplitterWindow, new_0, 0}},
+ {3436, {wxSplitterWindow, new_2, 2}},
+ {3437, {wxSplitterWindow, destruct, 0}},
+ {3438, {wxSplitterWindow, create, 2}},
+ {3439, {wxSplitterWindow, getMinimumPaneSize, 0}},
+ {3440, {wxSplitterWindow, getSashGravity, 0}},
+ {3441, {wxSplitterWindow, getSashPosition, 0}},
+ {3442, {wxSplitterWindow, getSplitMode, 0}},
+ {3443, {wxSplitterWindow, getWindow1, 0}},
+ {3444, {wxSplitterWindow, getWindow2, 0}},
+ {3445, {wxSplitterWindow, initialize, 1}},
+ {3446, {wxSplitterWindow, isSplit, 0}},
+ {3447, {wxSplitterWindow, replaceWindow, 2}},
+ {3448, {wxSplitterWindow, setSashGravity, 1}},
+ {3449, {wxSplitterWindow, setSashPosition, 2}},
+ {3450, {wxSplitterWindow, setSashSize, 1}},
+ {3451, {wxSplitterWindow, setMinimumPaneSize, 1}},
+ {3452, {wxSplitterWindow, setSplitMode, 1}},
+ {3453, {wxSplitterWindow, splitHorizontally, 3}},
+ {3454, {wxSplitterWindow, splitVertically, 3}},
+ {3455, {wxSplitterWindow, unsplit, 1}},
+ {3456, {wxSplitterWindow, updateSize, 0}},
+ {3457, {wxSplitterEvent, getSashPosition, 0}},
+ {3458, {wxSplitterEvent, getX, 0}},
+ {3459, {wxSplitterEvent, getY, 0}},
+ {3460, {wxSplitterEvent, getWindowBeingRemoved, 0}},
+ {3461, {wxSplitterEvent, setSashPosition, 1}},
+ {3462, {wxHtmlWindow, new_0, 0}},
+ {3463, {wxHtmlWindow, new_2, 2}},
+ {3464, {wxHtmlWindow, appendToPage, 1}},
+ {3465, {wxHtmlWindow, getOpenedAnchor, 0}},
+ {3466, {wxHtmlWindow, getOpenedPage, 0}},
+ {3467, {wxHtmlWindow, getOpenedPageTitle, 0}},
+ {3468, {wxHtmlWindow, getRelatedFrame, 0}},
+ {3469, {wxHtmlWindow, historyBack, 0}},
+ {3470, {wxHtmlWindow, historyCanBack, 0}},
+ {3471, {wxHtmlWindow, historyCanForward, 0}},
+ {3472, {wxHtmlWindow, historyClear, 0}},
+ {3473, {wxHtmlWindow, historyForward, 0}},
+ {3474, {wxHtmlWindow, loadFile, 1}},
+ {3475, {wxHtmlWindow, loadPage, 1}},
+ {3476, {wxHtmlWindow, selectAll, 0}},
+ {3477, {wxHtmlWindow, selectionToText, 0}},
+ {3478, {wxHtmlWindow, selectLine, 1}},
+ {3479, {wxHtmlWindow, selectWord, 1}},
+ {3480, {wxHtmlWindow, setBorders, 1}},
+ {3481, {wxHtmlWindow, setFonts, 3}},
+ {3482, {wxHtmlWindow, setPage, 1}},
+ {3483, {wxHtmlWindow, setRelatedFrame, 2}},
+ {3484, {wxHtmlWindow, setRelatedStatusBar, 1}},
+ {3485, {wxHtmlWindow, toText, 0}},
+ {3486, {wxHtmlWindow, 'Destroy', undefined}},
+ {3487, {wxHtmlLinkEvent, getLinkInfo, 0}},
+ {3488, {wxSystemSettings, getColour, 1}},
+ {3489, {wxSystemSettings, getFont, 1}},
+ {3490, {wxSystemSettings, getMetric, 2}},
+ {3491, {wxSystemSettings, getScreenType, 0}},
+ {3492, {wxAuiNotebookEvent, setSelection, 1}},
+ {3493, {wxAuiNotebookEvent, getSelection, 0}},
+ {3494, {wxAuiNotebookEvent, setOldSelection, 1}},
+ {3495, {wxAuiNotebookEvent, getOldSelection, 0}},
+ {3496, {wxAuiNotebookEvent, setDragSource, 1}},
+ {3497, {wxAuiNotebookEvent, getDragSource, 0}},
+ {3498, {wxAuiManagerEvent, setManager, 1}},
+ {3499, {wxAuiManagerEvent, getManager, 0}},
+ {3500, {wxAuiManagerEvent, setPane, 1}},
+ {3501, {wxAuiManagerEvent, getPane, 0}},
+ {3502, {wxAuiManagerEvent, setButton, 1}},
+ {3503, {wxAuiManagerEvent, getButton, 0}},
+ {3504, {wxAuiManagerEvent, setDC, 1}},
+ {3505, {wxAuiManagerEvent, getDC, 0}},
+ {3506, {wxAuiManagerEvent, veto, 1}},
+ {3507, {wxAuiManagerEvent, getVeto, 0}},
+ {3508, {wxAuiManagerEvent, setCanVeto, 1}},
+ {3509, {wxAuiManagerEvent, canVeto, 0}},
+ {3510, {wxLogNull, new, 0}},
+ {3511, {wxLogNull, 'Destroy', undefined}},
  {-1, {mod, func, -1}}
 ].
 
diff --git a/lib/wx/src/gen/wxe_funcs.hrl b/lib/wx/src/gen/wxe_funcs.hrl
index cf672644c6..af74caaa25 100644
--- a/lib/wx/src/gen/wxe_funcs.hrl
+++ b/lib/wx/src/gen/wxe_funcs.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -1600,1681 +1600,1693 @@
 -define(wxListItem_SetText, 1754).
 -define(wxListItem_SetTextColour, 1755).
 -define(wxListItem_SetWidth, 1756).
--define(wxImageList_new_0, 1757).
--define(wxImageList_new_3, 1758).
--define(wxImageList_Add_1, 1759).
--define(wxImageList_Add_2_0, 1760).
--define(wxImageList_Add_2_1, 1761).
--define(wxImageList_Create, 1762).
--define(wxImageList_Draw, 1764).
--define(wxImageList_GetBitmap, 1765).
--define(wxImageList_GetIcon, 1766).
--define(wxImageList_GetImageCount, 1767).
--define(wxImageList_GetSize, 1768).
--define(wxImageList_Remove, 1769).
--define(wxImageList_RemoveAll, 1770).
--define(wxImageList_Replace_2, 1771).
--define(wxImageList_Replace_3, 1772).
--define(wxImageList_destroy, 1773).
--define(wxTextAttr_new_0, 1774).
--define(wxTextAttr_new_2, 1775).
--define(wxTextAttr_GetAlignment, 1776).
--define(wxTextAttr_GetBackgroundColour, 1777).
--define(wxTextAttr_GetFont, 1778).
--define(wxTextAttr_GetLeftIndent, 1779).
--define(wxTextAttr_GetLeftSubIndent, 1780).
--define(wxTextAttr_GetRightIndent, 1781).
--define(wxTextAttr_GetTabs, 1782).
--define(wxTextAttr_GetTextColour, 1783).
--define(wxTextAttr_HasBackgroundColour, 1784).
--define(wxTextAttr_HasFont, 1785).
--define(wxTextAttr_HasTextColour, 1786).
--define(wxTextAttr_GetFlags, 1787).
--define(wxTextAttr_IsDefault, 1788).
--define(wxTextAttr_SetAlignment, 1789).
--define(wxTextAttr_SetBackgroundColour, 1790).
--define(wxTextAttr_SetFlags, 1791).
--define(wxTextAttr_SetFont, 1792).
--define(wxTextAttr_SetLeftIndent, 1793).
--define(wxTextAttr_SetRightIndent, 1794).
--define(wxTextAttr_SetTabs, 1795).
--define(wxTextAttr_SetTextColour, 1796).
--define(wxTextAttr_destroy, 1797).
--define(wxTextCtrl_new_3, 1799).
--define(wxTextCtrl_new_0, 1800).
--define(wxTextCtrl_destruct, 1802).
--define(wxTextCtrl_AppendText, 1803).
--define(wxTextCtrl_CanCopy, 1804).
--define(wxTextCtrl_CanCut, 1805).
--define(wxTextCtrl_CanPaste, 1806).
--define(wxTextCtrl_CanRedo, 1807).
--define(wxTextCtrl_CanUndo, 1808).
--define(wxTextCtrl_Clear, 1809).
--define(wxTextCtrl_Copy, 1810).
--define(wxTextCtrl_Create, 1811).
--define(wxTextCtrl_Cut, 1812).
--define(wxTextCtrl_DiscardEdits, 1813).
--define(wxTextCtrl_EmulateKeyPress, 1814).
--define(wxTextCtrl_GetDefaultStyle, 1815).
--define(wxTextCtrl_GetInsertionPoint, 1816).
--define(wxTextCtrl_GetLastPosition, 1817).
--define(wxTextCtrl_GetLineLength, 1818).
--define(wxTextCtrl_GetLineText, 1819).
--define(wxTextCtrl_GetNumberOfLines, 1820).
--define(wxTextCtrl_GetRange, 1821).
--define(wxTextCtrl_GetSelection, 1822).
--define(wxTextCtrl_GetStringSelection, 1823).
--define(wxTextCtrl_GetStyle, 1824).
--define(wxTextCtrl_GetValue, 1825).
--define(wxTextCtrl_IsEditable, 1826).
--define(wxTextCtrl_IsModified, 1827).
--define(wxTextCtrl_IsMultiLine, 1828).
--define(wxTextCtrl_IsSingleLine, 1829).
--define(wxTextCtrl_LoadFile, 1830).
--define(wxTextCtrl_MarkDirty, 1831).
--define(wxTextCtrl_Paste, 1832).
--define(wxTextCtrl_PositionToXY, 1833).
--define(wxTextCtrl_Redo, 1834).
--define(wxTextCtrl_Remove, 1835).
--define(wxTextCtrl_Replace, 1836).
--define(wxTextCtrl_SaveFile, 1837).
--define(wxTextCtrl_SetDefaultStyle, 1838).
--define(wxTextCtrl_SetEditable, 1839).
--define(wxTextCtrl_SetInsertionPoint, 1840).
--define(wxTextCtrl_SetInsertionPointEnd, 1841).
--define(wxTextCtrl_SetMaxLength, 1843).
--define(wxTextCtrl_SetSelection, 1844).
--define(wxTextCtrl_SetStyle, 1845).
--define(wxTextCtrl_SetValue, 1846).
--define(wxTextCtrl_ShowPosition, 1847).
--define(wxTextCtrl_Undo, 1848).
--define(wxTextCtrl_WriteText, 1849).
--define(wxTextCtrl_XYToPosition, 1850).
--define(wxNotebook_new_0, 1853).
--define(wxNotebook_new_3, 1854).
--define(wxNotebook_destruct, 1855).
--define(wxNotebook_AddPage, 1856).
--define(wxNotebook_AdvanceSelection, 1857).
--define(wxNotebook_AssignImageList, 1858).
--define(wxNotebook_Create, 1859).
--define(wxNotebook_DeleteAllPages, 1860).
--define(wxNotebook_DeletePage, 1861).
--define(wxNotebook_RemovePage, 1862).
--define(wxNotebook_GetCurrentPage, 1863).
--define(wxNotebook_GetImageList, 1864).
--define(wxNotebook_GetPage, 1866).
--define(wxNotebook_GetPageCount, 1867).
--define(wxNotebook_GetPageImage, 1868).
--define(wxNotebook_GetPageText, 1869).
--define(wxNotebook_GetRowCount, 1870).
--define(wxNotebook_GetSelection, 1871).
--define(wxNotebook_GetThemeBackgroundColour, 1872).
--define(wxNotebook_HitTest, 1874).
--define(wxNotebook_InsertPage, 1876).
--define(wxNotebook_SetImageList, 1877).
--define(wxNotebook_SetPadding, 1878).
--define(wxNotebook_SetPageSize, 1879).
--define(wxNotebook_SetPageImage, 1880).
--define(wxNotebook_SetPageText, 1881).
--define(wxNotebook_SetSelection, 1882).
--define(wxNotebook_ChangeSelection, 1883).
--define(wxChoicebook_new_0, 1884).
--define(wxChoicebook_new_3, 1885).
--define(wxChoicebook_AddPage, 1886).
--define(wxChoicebook_AdvanceSelection, 1887).
--define(wxChoicebook_AssignImageList, 1888).
--define(wxChoicebook_Create, 1889).
--define(wxChoicebook_DeleteAllPages, 1890).
--define(wxChoicebook_DeletePage, 1891).
--define(wxChoicebook_RemovePage, 1892).
--define(wxChoicebook_GetCurrentPage, 1893).
--define(wxChoicebook_GetImageList, 1894).
--define(wxChoicebook_GetPage, 1896).
--define(wxChoicebook_GetPageCount, 1897).
--define(wxChoicebook_GetPageImage, 1898).
--define(wxChoicebook_GetPageText, 1899).
--define(wxChoicebook_GetSelection, 1900).
--define(wxChoicebook_HitTest, 1901).
--define(wxChoicebook_InsertPage, 1902).
--define(wxChoicebook_SetImageList, 1903).
--define(wxChoicebook_SetPageSize, 1904).
--define(wxChoicebook_SetPageImage, 1905).
--define(wxChoicebook_SetPageText, 1906).
--define(wxChoicebook_SetSelection, 1907).
--define(wxChoicebook_ChangeSelection, 1908).
--define(wxChoicebook_destroy, 1909).
--define(wxToolbook_new_0, 1910).
--define(wxToolbook_new_3, 1911).
--define(wxToolbook_AddPage, 1912).
--define(wxToolbook_AdvanceSelection, 1913).
--define(wxToolbook_AssignImageList, 1914).
--define(wxToolbook_Create, 1915).
--define(wxToolbook_DeleteAllPages, 1916).
--define(wxToolbook_DeletePage, 1917).
--define(wxToolbook_RemovePage, 1918).
--define(wxToolbook_GetCurrentPage, 1919).
--define(wxToolbook_GetImageList, 1920).
--define(wxToolbook_GetPage, 1922).
--define(wxToolbook_GetPageCount, 1923).
--define(wxToolbook_GetPageImage, 1924).
--define(wxToolbook_GetPageText, 1925).
--define(wxToolbook_GetSelection, 1926).
--define(wxToolbook_HitTest, 1928).
--define(wxToolbook_InsertPage, 1929).
--define(wxToolbook_SetImageList, 1930).
--define(wxToolbook_SetPageSize, 1931).
--define(wxToolbook_SetPageImage, 1932).
--define(wxToolbook_SetPageText, 1933).
--define(wxToolbook_SetSelection, 1934).
--define(wxToolbook_ChangeSelection, 1935).
--define(wxToolbook_destroy, 1936).
--define(wxListbook_new_0, 1937).
--define(wxListbook_new_3, 1938).
--define(wxListbook_AddPage, 1939).
--define(wxListbook_AdvanceSelection, 1940).
--define(wxListbook_AssignImageList, 1941).
--define(wxListbook_Create, 1942).
--define(wxListbook_DeleteAllPages, 1943).
--define(wxListbook_DeletePage, 1944).
--define(wxListbook_RemovePage, 1945).
--define(wxListbook_GetCurrentPage, 1946).
--define(wxListbook_GetImageList, 1947).
--define(wxListbook_GetPage, 1949).
--define(wxListbook_GetPageCount, 1950).
--define(wxListbook_GetPageImage, 1951).
--define(wxListbook_GetPageText, 1952).
--define(wxListbook_GetSelection, 1953).
--define(wxListbook_HitTest, 1955).
--define(wxListbook_InsertPage, 1956).
--define(wxListbook_SetImageList, 1957).
--define(wxListbook_SetPageSize, 1958).
--define(wxListbook_SetPageImage, 1959).
--define(wxListbook_SetPageText, 1960).
--define(wxListbook_SetSelection, 1961).
--define(wxListbook_ChangeSelection, 1962).
--define(wxListbook_destroy, 1963).
--define(wxTreebook_new_0, 1964).
--define(wxTreebook_new_3, 1965).
--define(wxTreebook_AddPage, 1966).
--define(wxTreebook_AdvanceSelection, 1967).
--define(wxTreebook_AssignImageList, 1968).
--define(wxTreebook_Create, 1969).
--define(wxTreebook_DeleteAllPages, 1970).
--define(wxTreebook_DeletePage, 1971).
--define(wxTreebook_RemovePage, 1972).
--define(wxTreebook_GetCurrentPage, 1973).
--define(wxTreebook_GetImageList, 1974).
--define(wxTreebook_GetPage, 1976).
--define(wxTreebook_GetPageCount, 1977).
--define(wxTreebook_GetPageImage, 1978).
--define(wxTreebook_GetPageText, 1979).
--define(wxTreebook_GetSelection, 1980).
--define(wxTreebook_ExpandNode, 1981).
--define(wxTreebook_IsNodeExpanded, 1982).
--define(wxTreebook_HitTest, 1984).
--define(wxTreebook_InsertPage, 1985).
--define(wxTreebook_InsertSubPage, 1986).
--define(wxTreebook_SetImageList, 1987).
--define(wxTreebook_SetPageSize, 1988).
--define(wxTreebook_SetPageImage, 1989).
--define(wxTreebook_SetPageText, 1990).
--define(wxTreebook_SetSelection, 1991).
--define(wxTreebook_ChangeSelection, 1992).
--define(wxTreebook_destroy, 1993).
--define(wxTreeCtrl_new_2, 1996).
--define(wxTreeCtrl_new_0, 1997).
--define(wxTreeCtrl_destruct, 1999).
--define(wxTreeCtrl_AddRoot, 2000).
--define(wxTreeCtrl_AppendItem, 2001).
--define(wxTreeCtrl_AssignImageList, 2002).
--define(wxTreeCtrl_AssignStateImageList, 2003).
--define(wxTreeCtrl_Collapse, 2004).
--define(wxTreeCtrl_CollapseAndReset, 2005).
--define(wxTreeCtrl_Create, 2006).
--define(wxTreeCtrl_Delete, 2007).
--define(wxTreeCtrl_DeleteAllItems, 2008).
--define(wxTreeCtrl_DeleteChildren, 2009).
--define(wxTreeCtrl_EditLabel, 2010).
--define(wxTreeCtrl_EnsureVisible, 2011).
--define(wxTreeCtrl_Expand, 2012).
--define(wxTreeCtrl_GetBoundingRect, 2013).
--define(wxTreeCtrl_GetChildrenCount, 2015).
--define(wxTreeCtrl_GetCount, 2016).
--define(wxTreeCtrl_GetEditControl, 2017).
--define(wxTreeCtrl_GetFirstChild, 2018).
--define(wxTreeCtrl_GetNextChild, 2019).
--define(wxTreeCtrl_GetFirstVisibleItem, 2020).
--define(wxTreeCtrl_GetImageList, 2021).
--define(wxTreeCtrl_GetIndent, 2022).
--define(wxTreeCtrl_GetItemBackgroundColour, 2023).
--define(wxTreeCtrl_GetItemData, 2024).
--define(wxTreeCtrl_GetItemFont, 2025).
--define(wxTreeCtrl_GetItemImage_1, 2026).
--define(wxTreeCtrl_GetItemImage_2, 2027).
--define(wxTreeCtrl_GetItemText, 2028).
--define(wxTreeCtrl_GetItemTextColour, 2029).
--define(wxTreeCtrl_GetLastChild, 2030).
--define(wxTreeCtrl_GetNextSibling, 2031).
--define(wxTreeCtrl_GetNextVisible, 2032).
--define(wxTreeCtrl_GetItemParent, 2033).
--define(wxTreeCtrl_GetPrevSibling, 2034).
--define(wxTreeCtrl_GetPrevVisible, 2035).
--define(wxTreeCtrl_GetRootItem, 2036).
--define(wxTreeCtrl_GetSelection, 2037).
--define(wxTreeCtrl_GetSelections, 2038).
--define(wxTreeCtrl_GetStateImageList, 2039).
--define(wxTreeCtrl_HitTest, 2040).
--define(wxTreeCtrl_InsertItem, 2042).
--define(wxTreeCtrl_IsBold, 2043).
--define(wxTreeCtrl_IsExpanded, 2044).
--define(wxTreeCtrl_IsSelected, 2045).
--define(wxTreeCtrl_IsVisible, 2046).
--define(wxTreeCtrl_ItemHasChildren, 2047).
--define(wxTreeCtrl_PrependItem, 2048).
--define(wxTreeCtrl_ScrollTo, 2049).
--define(wxTreeCtrl_SelectItem_1, 2050).
--define(wxTreeCtrl_SelectItem_2, 2051).
--define(wxTreeCtrl_SetIndent, 2052).
--define(wxTreeCtrl_SetImageList, 2053).
--define(wxTreeCtrl_SetItemBackgroundColour, 2054).
--define(wxTreeCtrl_SetItemBold, 2055).
--define(wxTreeCtrl_SetItemData, 2056).
--define(wxTreeCtrl_SetItemDropHighlight, 2057).
--define(wxTreeCtrl_SetItemFont, 2058).
--define(wxTreeCtrl_SetItemHasChildren, 2059).
--define(wxTreeCtrl_SetItemImage_2, 2060).
--define(wxTreeCtrl_SetItemImage_3, 2061).
--define(wxTreeCtrl_SetItemText, 2062).
--define(wxTreeCtrl_SetItemTextColour, 2063).
--define(wxTreeCtrl_SetStateImageList, 2064).
--define(wxTreeCtrl_SetWindowStyle, 2065).
--define(wxTreeCtrl_SortChildren, 2066).
--define(wxTreeCtrl_Toggle, 2067).
--define(wxTreeCtrl_ToggleItemSelection, 2068).
--define(wxTreeCtrl_Unselect, 2069).
--define(wxTreeCtrl_UnselectAll, 2070).
--define(wxTreeCtrl_UnselectItem, 2071).
--define(wxScrollBar_new_0, 2072).
--define(wxScrollBar_new_3, 2073).
--define(wxScrollBar_destruct, 2074).
--define(wxScrollBar_Create, 2075).
--define(wxScrollBar_GetRange, 2076).
--define(wxScrollBar_GetPageSize, 2077).
--define(wxScrollBar_GetThumbPosition, 2078).
--define(wxScrollBar_GetThumbSize, 2079).
--define(wxScrollBar_SetThumbPosition, 2080).
--define(wxScrollBar_SetScrollbar, 2081).
--define(wxSpinButton_new_2, 2083).
--define(wxSpinButton_new_0, 2084).
--define(wxSpinButton_Create, 2085).
--define(wxSpinButton_GetMax, 2086).
--define(wxSpinButton_GetMin, 2087).
--define(wxSpinButton_GetValue, 2088).
--define(wxSpinButton_SetRange, 2089).
--define(wxSpinButton_SetValue, 2090).
--define(wxSpinButton_destroy, 2091).
--define(wxSpinCtrl_new_0, 2092).
--define(wxSpinCtrl_new_2, 2093).
--define(wxSpinCtrl_Create, 2095).
--define(wxSpinCtrl_SetValue_1_1, 2098).
--define(wxSpinCtrl_SetValue_1_0, 2099).
--define(wxSpinCtrl_GetValue, 2101).
--define(wxSpinCtrl_SetRange, 2103).
--define(wxSpinCtrl_SetSelection, 2104).
--define(wxSpinCtrl_GetMin, 2106).
--define(wxSpinCtrl_GetMax, 2108).
--define(wxSpinCtrl_destroy, 2109).
--define(wxStaticText_new_0, 2110).
--define(wxStaticText_new_4, 2111).
--define(wxStaticText_Create, 2112).
--define(wxStaticText_GetLabel, 2113).
--define(wxStaticText_SetLabel, 2114).
--define(wxStaticText_Wrap, 2115).
--define(wxStaticText_destroy, 2116).
--define(wxStaticBitmap_new_0, 2117).
--define(wxStaticBitmap_new_4, 2118).
--define(wxStaticBitmap_Create, 2119).
--define(wxStaticBitmap_GetBitmap, 2120).
--define(wxStaticBitmap_SetBitmap, 2121).
--define(wxStaticBitmap_destroy, 2122).
--define(wxRadioBox_new, 2123).
--define(wxRadioBox_destruct, 2125).
--define(wxRadioBox_Create, 2126).
--define(wxRadioBox_Enable_2, 2127).
--define(wxRadioBox_Enable_1, 2128).
--define(wxRadioBox_GetSelection, 2129).
--define(wxRadioBox_GetString, 2130).
--define(wxRadioBox_SetSelection, 2131).
--define(wxRadioBox_Show_2, 2132).
--define(wxRadioBox_Show_1, 2133).
--define(wxRadioBox_GetColumnCount, 2134).
--define(wxRadioBox_GetItemHelpText, 2135).
--define(wxRadioBox_GetItemToolTip, 2136).
--define(wxRadioBox_GetItemFromPoint, 2138).
--define(wxRadioBox_GetRowCount, 2139).
--define(wxRadioBox_IsItemEnabled, 2140).
--define(wxRadioBox_IsItemShown, 2141).
--define(wxRadioBox_SetItemHelpText, 2142).
--define(wxRadioBox_SetItemToolTip, 2143).
--define(wxRadioButton_new_0, 2144).
--define(wxRadioButton_new_4, 2145).
--define(wxRadioButton_Create, 2146).
--define(wxRadioButton_GetValue, 2147).
--define(wxRadioButton_SetValue, 2148).
--define(wxRadioButton_destroy, 2149).
--define(wxSlider_new_6, 2151).
--define(wxSlider_new_0, 2152).
--define(wxSlider_Create, 2153).
--define(wxSlider_GetLineSize, 2154).
--define(wxSlider_GetMax, 2155).
--define(wxSlider_GetMin, 2156).
--define(wxSlider_GetPageSize, 2157).
--define(wxSlider_GetThumbLength, 2158).
--define(wxSlider_GetValue, 2159).
--define(wxSlider_SetLineSize, 2160).
--define(wxSlider_SetPageSize, 2161).
--define(wxSlider_SetRange, 2162).
--define(wxSlider_SetThumbLength, 2163).
--define(wxSlider_SetValue, 2164).
--define(wxSlider_destroy, 2165).
--define(wxDialog_new_4, 2167).
--define(wxDialog_new_0, 2168).
--define(wxDialog_destruct, 2170).
--define(wxDialog_Create, 2171).
--define(wxDialog_CreateButtonSizer, 2172).
--define(wxDialog_CreateStdDialogButtonSizer, 2173).
--define(wxDialog_EndModal, 2174).
--define(wxDialog_GetAffirmativeId, 2175).
--define(wxDialog_GetReturnCode, 2176).
--define(wxDialog_IsModal, 2177).
--define(wxDialog_SetAffirmativeId, 2178).
--define(wxDialog_SetReturnCode, 2179).
--define(wxDialog_Show, 2180).
--define(wxDialog_ShowModal, 2181).
--define(wxColourDialog_new_0, 2182).
--define(wxColourDialog_new_2, 2183).
--define(wxColourDialog_destruct, 2184).
--define(wxColourDialog_Create, 2185).
--define(wxColourDialog_GetColourData, 2186).
--define(wxColourData_new_0, 2187).
--define(wxColourData_new_1, 2188).
--define(wxColourData_destruct, 2189).
--define(wxColourData_GetChooseFull, 2190).
--define(wxColourData_GetColour, 2191).
--define(wxColourData_GetCustomColour, 2193).
--define(wxColourData_SetChooseFull, 2194).
--define(wxColourData_SetColour, 2195).
--define(wxColourData_SetCustomColour, 2196).
--define(wxPalette_new_0, 2197).
--define(wxPalette_new_4, 2198).
--define(wxPalette_destruct, 2200).
--define(wxPalette_Create, 2201).
--define(wxPalette_GetColoursCount, 2202).
--define(wxPalette_GetPixel, 2203).
--define(wxPalette_GetRGB, 2204).
--define(wxPalette_IsOk, 2205).
--define(wxDirDialog_new, 2209).
--define(wxDirDialog_destruct, 2210).
--define(wxDirDialog_GetPath, 2211).
--define(wxDirDialog_GetMessage, 2212).
--define(wxDirDialog_SetMessage, 2213).
--define(wxDirDialog_SetPath, 2214).
--define(wxFileDialog_new, 2218).
--define(wxFileDialog_destruct, 2219).
--define(wxFileDialog_GetDirectory, 2220).
--define(wxFileDialog_GetFilename, 2221).
--define(wxFileDialog_GetFilenames, 2222).
--define(wxFileDialog_GetFilterIndex, 2223).
--define(wxFileDialog_GetMessage, 2224).
--define(wxFileDialog_GetPath, 2225).
--define(wxFileDialog_GetPaths, 2226).
--define(wxFileDialog_GetWildcard, 2227).
--define(wxFileDialog_SetDirectory, 2228).
--define(wxFileDialog_SetFilename, 2229).
--define(wxFileDialog_SetFilterIndex, 2230).
--define(wxFileDialog_SetMessage, 2231).
--define(wxFileDialog_SetPath, 2232).
--define(wxFileDialog_SetWildcard, 2233).
--define(wxPickerBase_SetInternalMargin, 2234).
--define(wxPickerBase_GetInternalMargin, 2235).
--define(wxPickerBase_SetTextCtrlProportion, 2236).
--define(wxPickerBase_SetPickerCtrlProportion, 2237).
--define(wxPickerBase_GetTextCtrlProportion, 2238).
--define(wxPickerBase_GetPickerCtrlProportion, 2239).
--define(wxPickerBase_HasTextCtrl, 2240).
--define(wxPickerBase_GetTextCtrl, 2241).
--define(wxPickerBase_IsTextCtrlGrowable, 2242).
--define(wxPickerBase_SetPickerCtrlGrowable, 2243).
--define(wxPickerBase_SetTextCtrlGrowable, 2244).
--define(wxPickerBase_IsPickerCtrlGrowable, 2245).
--define(wxFilePickerCtrl_new_0, 2246).
--define(wxFilePickerCtrl_new_3, 2247).
--define(wxFilePickerCtrl_Create, 2248).
--define(wxFilePickerCtrl_GetPath, 2249).
--define(wxFilePickerCtrl_SetPath, 2250).
--define(wxFilePickerCtrl_destroy, 2251).
--define(wxDirPickerCtrl_new_0, 2252).
--define(wxDirPickerCtrl_new_3, 2253).
--define(wxDirPickerCtrl_Create, 2254).
--define(wxDirPickerCtrl_GetPath, 2255).
--define(wxDirPickerCtrl_SetPath, 2256).
--define(wxDirPickerCtrl_destroy, 2257).
--define(wxColourPickerCtrl_new_0, 2258).
--define(wxColourPickerCtrl_new_3, 2259).
--define(wxColourPickerCtrl_Create, 2260).
--define(wxColourPickerCtrl_GetColour, 2261).
--define(wxColourPickerCtrl_SetColour_1_1, 2262).
--define(wxColourPickerCtrl_SetColour_1_0, 2263).
--define(wxColourPickerCtrl_destroy, 2264).
--define(wxDatePickerCtrl_new_0, 2265).
--define(wxDatePickerCtrl_new_3, 2266).
--define(wxDatePickerCtrl_GetRange, 2267).
--define(wxDatePickerCtrl_GetValue, 2268).
--define(wxDatePickerCtrl_SetRange, 2269).
--define(wxDatePickerCtrl_SetValue, 2270).
--define(wxDatePickerCtrl_destroy, 2271).
--define(wxFontPickerCtrl_new_0, 2272).
--define(wxFontPickerCtrl_new_3, 2273).
--define(wxFontPickerCtrl_Create, 2274).
--define(wxFontPickerCtrl_GetSelectedFont, 2275).
--define(wxFontPickerCtrl_SetSelectedFont, 2276).
--define(wxFontPickerCtrl_GetMaxPointSize, 2277).
--define(wxFontPickerCtrl_SetMaxPointSize, 2278).
--define(wxFontPickerCtrl_destroy, 2279).
--define(wxFindReplaceDialog_new_0, 2282).
--define(wxFindReplaceDialog_new_4, 2283).
--define(wxFindReplaceDialog_destruct, 2284).
--define(wxFindReplaceDialog_Create, 2285).
--define(wxFindReplaceDialog_GetData, 2286).
--define(wxFindReplaceData_new_0, 2287).
--define(wxFindReplaceData_new_1, 2288).
--define(wxFindReplaceData_GetFindString, 2289).
--define(wxFindReplaceData_GetReplaceString, 2290).
--define(wxFindReplaceData_GetFlags, 2291).
--define(wxFindReplaceData_SetFlags, 2292).
--define(wxFindReplaceData_SetFindString, 2293).
--define(wxFindReplaceData_SetReplaceString, 2294).
--define(wxFindReplaceData_destroy, 2295).
--define(wxMultiChoiceDialog_new_0, 2296).
--define(wxMultiChoiceDialog_new_5, 2298).
--define(wxMultiChoiceDialog_GetSelections, 2299).
--define(wxMultiChoiceDialog_SetSelections, 2300).
--define(wxMultiChoiceDialog_destroy, 2301).
--define(wxSingleChoiceDialog_new_0, 2302).
--define(wxSingleChoiceDialog_new_5, 2304).
--define(wxSingleChoiceDialog_GetSelection, 2305).
--define(wxSingleChoiceDialog_GetStringSelection, 2306).
--define(wxSingleChoiceDialog_SetSelection, 2307).
--define(wxSingleChoiceDialog_destroy, 2308).
--define(wxTextEntryDialog_new, 2309).
--define(wxTextEntryDialog_GetValue, 2310).
--define(wxTextEntryDialog_SetValue, 2311).
--define(wxTextEntryDialog_destroy, 2312).
--define(wxPasswordEntryDialog_new, 2313).
--define(wxPasswordEntryDialog_destroy, 2314).
--define(wxFontData_new_0, 2315).
--define(wxFontData_new_1, 2316).
--define(wxFontData_destruct, 2317).
--define(wxFontData_EnableEffects, 2318).
--define(wxFontData_GetAllowSymbols, 2319).
--define(wxFontData_GetColour, 2320).
--define(wxFontData_GetChosenFont, 2321).
--define(wxFontData_GetEnableEffects, 2322).
--define(wxFontData_GetInitialFont, 2323).
--define(wxFontData_GetShowHelp, 2324).
--define(wxFontData_SetAllowSymbols, 2325).
--define(wxFontData_SetChosenFont, 2326).
--define(wxFontData_SetColour, 2327).
--define(wxFontData_SetInitialFont, 2328).
--define(wxFontData_SetRange, 2329).
--define(wxFontData_SetShowHelp, 2330).
--define(wxFontDialog_new_0, 2334).
--define(wxFontDialog_new_2, 2336).
--define(wxFontDialog_Create, 2338).
--define(wxFontDialog_GetFontData, 2339).
--define(wxFontDialog_destroy, 2341).
--define(wxProgressDialog_new, 2342).
--define(wxProgressDialog_destruct, 2343).
--define(wxProgressDialog_Resume, 2344).
--define(wxProgressDialog_Update_2, 2345).
--define(wxProgressDialog_Update_0, 2346).
--define(wxMessageDialog_new, 2347).
--define(wxMessageDialog_destruct, 2348).
--define(wxPageSetupDialog_new, 2349).
--define(wxPageSetupDialog_destruct, 2350).
--define(wxPageSetupDialog_GetPageSetupData, 2351).
--define(wxPageSetupDialog_ShowModal, 2352).
--define(wxPageSetupDialogData_new_0, 2353).
--define(wxPageSetupDialogData_new_1_0, 2354).
--define(wxPageSetupDialogData_new_1_1, 2355).
--define(wxPageSetupDialogData_destruct, 2356).
--define(wxPageSetupDialogData_EnableHelp, 2357).
--define(wxPageSetupDialogData_EnableMargins, 2358).
--define(wxPageSetupDialogData_EnableOrientation, 2359).
--define(wxPageSetupDialogData_EnablePaper, 2360).
--define(wxPageSetupDialogData_EnablePrinter, 2361).
--define(wxPageSetupDialogData_GetDefaultMinMargins, 2362).
--define(wxPageSetupDialogData_GetEnableMargins, 2363).
--define(wxPageSetupDialogData_GetEnableOrientation, 2364).
--define(wxPageSetupDialogData_GetEnablePaper, 2365).
--define(wxPageSetupDialogData_GetEnablePrinter, 2366).
--define(wxPageSetupDialogData_GetEnableHelp, 2367).
--define(wxPageSetupDialogData_GetDefaultInfo, 2368).
--define(wxPageSetupDialogData_GetMarginTopLeft, 2369).
--define(wxPageSetupDialogData_GetMarginBottomRight, 2370).
--define(wxPageSetupDialogData_GetMinMarginTopLeft, 2371).
--define(wxPageSetupDialogData_GetMinMarginBottomRight, 2372).
--define(wxPageSetupDialogData_GetPaperId, 2373).
--define(wxPageSetupDialogData_GetPaperSize, 2374).
--define(wxPageSetupDialogData_GetPrintData, 2376).
--define(wxPageSetupDialogData_IsOk, 2377).
--define(wxPageSetupDialogData_SetDefaultInfo, 2378).
--define(wxPageSetupDialogData_SetDefaultMinMargins, 2379).
--define(wxPageSetupDialogData_SetMarginTopLeft, 2380).
--define(wxPageSetupDialogData_SetMarginBottomRight, 2381).
--define(wxPageSetupDialogData_SetMinMarginTopLeft, 2382).
--define(wxPageSetupDialogData_SetMinMarginBottomRight, 2383).
--define(wxPageSetupDialogData_SetPaperId, 2384).
--define(wxPageSetupDialogData_SetPaperSize_1_1, 2385).
--define(wxPageSetupDialogData_SetPaperSize_1_0, 2386).
--define(wxPageSetupDialogData_SetPrintData, 2387).
--define(wxPrintDialog_new_2_0, 2388).
--define(wxPrintDialog_new_2_1, 2389).
--define(wxPrintDialog_destruct, 2390).
--define(wxPrintDialog_GetPrintDialogData, 2391).
--define(wxPrintDialog_GetPrintDC, 2392).
--define(wxPrintDialogData_new_0, 2393).
--define(wxPrintDialogData_new_1_1, 2394).
--define(wxPrintDialogData_new_1_0, 2395).
--define(wxPrintDialogData_destruct, 2396).
--define(wxPrintDialogData_EnableHelp, 2397).
--define(wxPrintDialogData_EnablePageNumbers, 2398).
--define(wxPrintDialogData_EnablePrintToFile, 2399).
--define(wxPrintDialogData_EnableSelection, 2400).
--define(wxPrintDialogData_GetAllPages, 2401).
--define(wxPrintDialogData_GetCollate, 2402).
--define(wxPrintDialogData_GetFromPage, 2403).
--define(wxPrintDialogData_GetMaxPage, 2404).
--define(wxPrintDialogData_GetMinPage, 2405).
--define(wxPrintDialogData_GetNoCopies, 2406).
--define(wxPrintDialogData_GetPrintData, 2407).
--define(wxPrintDialogData_GetPrintToFile, 2408).
--define(wxPrintDialogData_GetSelection, 2409).
--define(wxPrintDialogData_GetToPage, 2410).
--define(wxPrintDialogData_IsOk, 2411).
--define(wxPrintDialogData_SetCollate, 2412).
--define(wxPrintDialogData_SetFromPage, 2413).
--define(wxPrintDialogData_SetMaxPage, 2414).
--define(wxPrintDialogData_SetMinPage, 2415).
--define(wxPrintDialogData_SetNoCopies, 2416).
--define(wxPrintDialogData_SetPrintData, 2417).
--define(wxPrintDialogData_SetPrintToFile, 2418).
--define(wxPrintDialogData_SetSelection, 2419).
--define(wxPrintDialogData_SetToPage, 2420).
--define(wxPrintData_new_0, 2421).
--define(wxPrintData_new_1, 2422).
--define(wxPrintData_destruct, 2423).
--define(wxPrintData_GetCollate, 2424).
--define(wxPrintData_GetBin, 2425).
--define(wxPrintData_GetColour, 2426).
--define(wxPrintData_GetDuplex, 2427).
--define(wxPrintData_GetNoCopies, 2428).
--define(wxPrintData_GetOrientation, 2429).
--define(wxPrintData_GetPaperId, 2430).
--define(wxPrintData_GetPrinterName, 2431).
--define(wxPrintData_GetQuality, 2432).
--define(wxPrintData_IsOk, 2433).
--define(wxPrintData_SetBin, 2434).
--define(wxPrintData_SetCollate, 2435).
--define(wxPrintData_SetColour, 2436).
--define(wxPrintData_SetDuplex, 2437).
--define(wxPrintData_SetNoCopies, 2438).
--define(wxPrintData_SetOrientation, 2439).
--define(wxPrintData_SetPaperId, 2440).
--define(wxPrintData_SetPrinterName, 2441).
--define(wxPrintData_SetQuality, 2442).
--define(wxPrintPreview_new_2, 2445).
--define(wxPrintPreview_new_3, 2446).
--define(wxPrintPreview_destruct, 2448).
--define(wxPrintPreview_GetCanvas, 2449).
--define(wxPrintPreview_GetCurrentPage, 2450).
--define(wxPrintPreview_GetFrame, 2451).
--define(wxPrintPreview_GetMaxPage, 2452).
--define(wxPrintPreview_GetMinPage, 2453).
--define(wxPrintPreview_GetPrintout, 2454).
--define(wxPrintPreview_GetPrintoutForPrinting, 2455).
--define(wxPrintPreview_IsOk, 2456).
--define(wxPrintPreview_PaintPage, 2457).
--define(wxPrintPreview_Print, 2458).
--define(wxPrintPreview_RenderPage, 2459).
--define(wxPrintPreview_SetCanvas, 2460).
--define(wxPrintPreview_SetCurrentPage, 2461).
--define(wxPrintPreview_SetFrame, 2462).
--define(wxPrintPreview_SetPrintout, 2463).
--define(wxPrintPreview_SetZoom, 2464).
--define(wxPreviewFrame_new, 2465).
--define(wxPreviewFrame_destruct, 2466).
--define(wxPreviewFrame_CreateControlBar, 2467).
--define(wxPreviewFrame_CreateCanvas, 2468).
--define(wxPreviewFrame_Initialize, 2469).
--define(wxPreviewFrame_OnCloseWindow, 2470).
--define(wxPreviewControlBar_new, 2471).
--define(wxPreviewControlBar_destruct, 2472).
--define(wxPreviewControlBar_CreateButtons, 2473).
--define(wxPreviewControlBar_GetPrintPreview, 2474).
--define(wxPreviewControlBar_GetZoomControl, 2475).
--define(wxPreviewControlBar_SetZoomControl, 2476).
--define(wxPrinter_new, 2478).
--define(wxPrinter_CreateAbortWindow, 2479).
--define(wxPrinter_GetAbort, 2480).
--define(wxPrinter_GetLastError, 2481).
--define(wxPrinter_GetPrintDialogData, 2482).
--define(wxPrinter_Print, 2483).
--define(wxPrinter_PrintDialog, 2484).
--define(wxPrinter_ReportError, 2485).
--define(wxPrinter_Setup, 2486).
--define(wxPrinter_destroy, 2487).
--define(wxXmlResource_new_1, 2488).
--define(wxXmlResource_new_2, 2489).
--define(wxXmlResource_destruct, 2490).
--define(wxXmlResource_AttachUnknownControl, 2491).
--define(wxXmlResource_ClearHandlers, 2492).
--define(wxXmlResource_CompareVersion, 2493).
--define(wxXmlResource_Get, 2494).
--define(wxXmlResource_GetFlags, 2495).
--define(wxXmlResource_GetVersion, 2496).
--define(wxXmlResource_GetXRCID, 2497).
--define(wxXmlResource_InitAllHandlers, 2498).
--define(wxXmlResource_Load, 2499).
--define(wxXmlResource_LoadBitmap, 2500).
--define(wxXmlResource_LoadDialog_2, 2501).
--define(wxXmlResource_LoadDialog_3, 2502).
--define(wxXmlResource_LoadFrame_2, 2503).
--define(wxXmlResource_LoadFrame_3, 2504).
--define(wxXmlResource_LoadIcon, 2505).
--define(wxXmlResource_LoadMenu, 2506).
--define(wxXmlResource_LoadMenuBar_2, 2507).
--define(wxXmlResource_LoadMenuBar_1, 2508).
--define(wxXmlResource_LoadPanel_2, 2509).
--define(wxXmlResource_LoadPanel_3, 2510).
--define(wxXmlResource_LoadToolBar, 2511).
--define(wxXmlResource_Set, 2512).
--define(wxXmlResource_SetFlags, 2513).
--define(wxXmlResource_Unload, 2514).
--define(wxXmlResource_xrcctrl, 2515).
--define(wxHtmlEasyPrinting_new, 2516).
--define(wxHtmlEasyPrinting_destruct, 2517).
--define(wxHtmlEasyPrinting_GetPrintData, 2518).
--define(wxHtmlEasyPrinting_GetPageSetupData, 2519).
--define(wxHtmlEasyPrinting_PreviewFile, 2520).
--define(wxHtmlEasyPrinting_PreviewText, 2521).
--define(wxHtmlEasyPrinting_PrintFile, 2522).
--define(wxHtmlEasyPrinting_PrintText, 2523).
--define(wxHtmlEasyPrinting_PageSetup, 2524).
--define(wxHtmlEasyPrinting_SetFonts, 2525).
--define(wxHtmlEasyPrinting_SetHeader, 2526).
--define(wxHtmlEasyPrinting_SetFooter, 2527).
--define(wxGLCanvas_new_2, 2529).
--define(wxGLCanvas_new_3_1, 2530).
--define(wxGLCanvas_new_3_0, 2531).
--define(wxGLCanvas_GetContext, 2532).
--define(wxGLCanvas_SetCurrent, 2534).
--define(wxGLCanvas_SwapBuffers, 2535).
--define(wxGLCanvas_destroy, 2536).
--define(wxAuiManager_new, 2537).
--define(wxAuiManager_destruct, 2538).
--define(wxAuiManager_AddPane_2_1, 2539).
--define(wxAuiManager_AddPane_3, 2540).
--define(wxAuiManager_AddPane_2_0, 2541).
--define(wxAuiManager_DetachPane, 2542).
--define(wxAuiManager_GetAllPanes, 2543).
--define(wxAuiManager_GetArtProvider, 2544).
--define(wxAuiManager_GetDockSizeConstraint, 2545).
--define(wxAuiManager_GetFlags, 2546).
--define(wxAuiManager_GetManagedWindow, 2547).
--define(wxAuiManager_GetManager, 2548).
--define(wxAuiManager_GetPane_1_1, 2549).
--define(wxAuiManager_GetPane_1_0, 2550).
--define(wxAuiManager_HideHint, 2551).
--define(wxAuiManager_InsertPane, 2552).
--define(wxAuiManager_LoadPaneInfo, 2553).
--define(wxAuiManager_LoadPerspective, 2554).
--define(wxAuiManager_SavePaneInfo, 2555).
--define(wxAuiManager_SavePerspective, 2556).
--define(wxAuiManager_SetArtProvider, 2557).
--define(wxAuiManager_SetDockSizeConstraint, 2558).
--define(wxAuiManager_SetFlags, 2559).
--define(wxAuiManager_SetManagedWindow, 2560).
--define(wxAuiManager_ShowHint, 2561).
--define(wxAuiManager_UnInit, 2562).
--define(wxAuiManager_Update, 2563).
--define(wxAuiPaneInfo_new_0, 2564).
--define(wxAuiPaneInfo_new_1, 2565).
--define(wxAuiPaneInfo_destruct, 2566).
--define(wxAuiPaneInfo_BestSize_1, 2567).
--define(wxAuiPaneInfo_BestSize_2, 2568).
--define(wxAuiPaneInfo_Bottom, 2569).
--define(wxAuiPaneInfo_BottomDockable, 2570).
--define(wxAuiPaneInfo_Caption, 2571).
--define(wxAuiPaneInfo_CaptionVisible, 2572).
--define(wxAuiPaneInfo_Centre, 2573).
--define(wxAuiPaneInfo_CentrePane, 2574).
--define(wxAuiPaneInfo_CloseButton, 2575).
--define(wxAuiPaneInfo_DefaultPane, 2576).
--define(wxAuiPaneInfo_DestroyOnClose, 2577).
--define(wxAuiPaneInfo_Direction, 2578).
--define(wxAuiPaneInfo_Dock, 2579).
--define(wxAuiPaneInfo_Dockable, 2580).
--define(wxAuiPaneInfo_Fixed, 2581).
--define(wxAuiPaneInfo_Float, 2582).
--define(wxAuiPaneInfo_Floatable, 2583).
--define(wxAuiPaneInfo_FloatingPosition_1, 2584).
--define(wxAuiPaneInfo_FloatingPosition_2, 2585).
--define(wxAuiPaneInfo_FloatingSize_1, 2586).
--define(wxAuiPaneInfo_FloatingSize_2, 2587).
--define(wxAuiPaneInfo_Gripper, 2588).
--define(wxAuiPaneInfo_GripperTop, 2589).
--define(wxAuiPaneInfo_HasBorder, 2590).
--define(wxAuiPaneInfo_HasCaption, 2591).
--define(wxAuiPaneInfo_HasCloseButton, 2592).
--define(wxAuiPaneInfo_HasFlag, 2593).
--define(wxAuiPaneInfo_HasGripper, 2594).
--define(wxAuiPaneInfo_HasGripperTop, 2595).
--define(wxAuiPaneInfo_HasMaximizeButton, 2596).
--define(wxAuiPaneInfo_HasMinimizeButton, 2597).
--define(wxAuiPaneInfo_HasPinButton, 2598).
--define(wxAuiPaneInfo_Hide, 2599).
--define(wxAuiPaneInfo_IsBottomDockable, 2600).
--define(wxAuiPaneInfo_IsDocked, 2601).
--define(wxAuiPaneInfo_IsFixed, 2602).
--define(wxAuiPaneInfo_IsFloatable, 2603).
--define(wxAuiPaneInfo_IsFloating, 2604).
--define(wxAuiPaneInfo_IsLeftDockable, 2605).
--define(wxAuiPaneInfo_IsMovable, 2606).
--define(wxAuiPaneInfo_IsOk, 2607).
--define(wxAuiPaneInfo_IsResizable, 2608).
--define(wxAuiPaneInfo_IsRightDockable, 2609).
--define(wxAuiPaneInfo_IsShown, 2610).
--define(wxAuiPaneInfo_IsToolbar, 2611).
--define(wxAuiPaneInfo_IsTopDockable, 2612).
--define(wxAuiPaneInfo_Layer, 2613).
--define(wxAuiPaneInfo_Left, 2614).
--define(wxAuiPaneInfo_LeftDockable, 2615).
--define(wxAuiPaneInfo_MaxSize_1, 2616).
--define(wxAuiPaneInfo_MaxSize_2, 2617).
--define(wxAuiPaneInfo_MaximizeButton, 2618).
--define(wxAuiPaneInfo_MinSize_1, 2619).
--define(wxAuiPaneInfo_MinSize_2, 2620).
--define(wxAuiPaneInfo_MinimizeButton, 2621).
--define(wxAuiPaneInfo_Movable, 2622).
--define(wxAuiPaneInfo_Name, 2623).
--define(wxAuiPaneInfo_PaneBorder, 2624).
--define(wxAuiPaneInfo_PinButton, 2625).
--define(wxAuiPaneInfo_Position, 2626).
--define(wxAuiPaneInfo_Resizable, 2627).
--define(wxAuiPaneInfo_Right, 2628).
--define(wxAuiPaneInfo_RightDockable, 2629).
--define(wxAuiPaneInfo_Row, 2630).
--define(wxAuiPaneInfo_SafeSet, 2631).
--define(wxAuiPaneInfo_SetFlag, 2632).
--define(wxAuiPaneInfo_Show, 2633).
--define(wxAuiPaneInfo_ToolbarPane, 2634).
--define(wxAuiPaneInfo_Top, 2635).
--define(wxAuiPaneInfo_TopDockable, 2636).
--define(wxAuiPaneInfo_Window, 2637).
--define(wxAuiNotebook_new_0, 2638).
--define(wxAuiNotebook_new_2, 2639).
--define(wxAuiNotebook_AddPage, 2640).
--define(wxAuiNotebook_Create, 2641).
--define(wxAuiNotebook_DeletePage, 2642).
--define(wxAuiNotebook_GetArtProvider, 2643).
--define(wxAuiNotebook_GetPage, 2644).
--define(wxAuiNotebook_GetPageBitmap, 2645).
--define(wxAuiNotebook_GetPageCount, 2646).
--define(wxAuiNotebook_GetPageIndex, 2647).
--define(wxAuiNotebook_GetPageText, 2648).
--define(wxAuiNotebook_GetSelection, 2649).
--define(wxAuiNotebook_InsertPage, 2650).
--define(wxAuiNotebook_RemovePage, 2651).
--define(wxAuiNotebook_SetArtProvider, 2652).
--define(wxAuiNotebook_SetFont, 2653).
--define(wxAuiNotebook_SetPageBitmap, 2654).
--define(wxAuiNotebook_SetPageText, 2655).
--define(wxAuiNotebook_SetSelection, 2656).
--define(wxAuiNotebook_SetTabCtrlHeight, 2657).
--define(wxAuiNotebook_SetUniformBitmapSize, 2658).
--define(wxAuiNotebook_destroy, 2659).
--define(wxMDIParentFrame_new_0, 2660).
--define(wxMDIParentFrame_new_4, 2661).
--define(wxMDIParentFrame_destruct, 2662).
--define(wxMDIParentFrame_ActivateNext, 2663).
--define(wxMDIParentFrame_ActivatePrevious, 2664).
--define(wxMDIParentFrame_ArrangeIcons, 2665).
--define(wxMDIParentFrame_Cascade, 2666).
--define(wxMDIParentFrame_Create, 2667).
--define(wxMDIParentFrame_GetActiveChild, 2668).
--define(wxMDIParentFrame_GetClientWindow, 2669).
--define(wxMDIParentFrame_Tile, 2670).
--define(wxMDIChildFrame_new_0, 2671).
--define(wxMDIChildFrame_new_4, 2672).
--define(wxMDIChildFrame_destruct, 2673).
--define(wxMDIChildFrame_Activate, 2674).
--define(wxMDIChildFrame_Create, 2675).
--define(wxMDIChildFrame_Maximize, 2676).
--define(wxMDIChildFrame_Restore, 2677).
--define(wxMDIClientWindow_new_0, 2678).
--define(wxMDIClientWindow_new_2, 2679).
--define(wxMDIClientWindow_destruct, 2680).
--define(wxMDIClientWindow_CreateClient, 2681).
--define(wxLayoutAlgorithm_new, 2682).
--define(wxLayoutAlgorithm_LayoutFrame, 2683).
--define(wxLayoutAlgorithm_LayoutMDIFrame, 2684).
--define(wxLayoutAlgorithm_LayoutWindow, 2685).
--define(wxLayoutAlgorithm_destroy, 2686).
--define(wxEvent_GetId, 2687).
--define(wxEvent_GetSkipped, 2688).
--define(wxEvent_GetTimestamp, 2689).
--define(wxEvent_IsCommandEvent, 2690).
--define(wxEvent_ResumePropagation, 2691).
--define(wxEvent_ShouldPropagate, 2692).
--define(wxEvent_Skip, 2693).
--define(wxEvent_StopPropagation, 2694).
--define(wxCommandEvent_getClientData, 2695).
--define(wxCommandEvent_GetExtraLong, 2696).
--define(wxCommandEvent_GetInt, 2697).
--define(wxCommandEvent_GetSelection, 2698).
--define(wxCommandEvent_GetString, 2699).
--define(wxCommandEvent_IsChecked, 2700).
--define(wxCommandEvent_IsSelection, 2701).
--define(wxCommandEvent_SetInt, 2702).
--define(wxCommandEvent_SetString, 2703).
--define(wxScrollEvent_GetOrientation, 2704).
--define(wxScrollEvent_GetPosition, 2705).
--define(wxScrollWinEvent_GetOrientation, 2706).
--define(wxScrollWinEvent_GetPosition, 2707).
--define(wxMouseEvent_AltDown, 2708).
--define(wxMouseEvent_Button, 2709).
--define(wxMouseEvent_ButtonDClick, 2710).
--define(wxMouseEvent_ButtonDown, 2711).
--define(wxMouseEvent_ButtonUp, 2712).
--define(wxMouseEvent_CmdDown, 2713).
--define(wxMouseEvent_ControlDown, 2714).
--define(wxMouseEvent_Dragging, 2715).
--define(wxMouseEvent_Entering, 2716).
--define(wxMouseEvent_GetButton, 2717).
--define(wxMouseEvent_GetPosition, 2720).
--define(wxMouseEvent_GetLogicalPosition, 2721).
--define(wxMouseEvent_GetLinesPerAction, 2722).
--define(wxMouseEvent_GetWheelRotation, 2723).
--define(wxMouseEvent_GetWheelDelta, 2724).
--define(wxMouseEvent_GetX, 2725).
--define(wxMouseEvent_GetY, 2726).
--define(wxMouseEvent_IsButton, 2727).
--define(wxMouseEvent_IsPageScroll, 2728).
--define(wxMouseEvent_Leaving, 2729).
--define(wxMouseEvent_LeftDClick, 2730).
--define(wxMouseEvent_LeftDown, 2731).
--define(wxMouseEvent_LeftIsDown, 2732).
--define(wxMouseEvent_LeftUp, 2733).
--define(wxMouseEvent_MetaDown, 2734).
--define(wxMouseEvent_MiddleDClick, 2735).
--define(wxMouseEvent_MiddleDown, 2736).
--define(wxMouseEvent_MiddleIsDown, 2737).
--define(wxMouseEvent_MiddleUp, 2738).
--define(wxMouseEvent_Moving, 2739).
--define(wxMouseEvent_RightDClick, 2740).
--define(wxMouseEvent_RightDown, 2741).
--define(wxMouseEvent_RightIsDown, 2742).
--define(wxMouseEvent_RightUp, 2743).
--define(wxMouseEvent_ShiftDown, 2744).
--define(wxSetCursorEvent_GetCursor, 2745).
--define(wxSetCursorEvent_GetX, 2746).
--define(wxSetCursorEvent_GetY, 2747).
--define(wxSetCursorEvent_HasCursor, 2748).
--define(wxSetCursorEvent_SetCursor, 2749).
--define(wxKeyEvent_AltDown, 2750).
--define(wxKeyEvent_CmdDown, 2751).
--define(wxKeyEvent_ControlDown, 2752).
--define(wxKeyEvent_GetKeyCode, 2753).
--define(wxKeyEvent_GetModifiers, 2754).
--define(wxKeyEvent_GetPosition, 2757).
--define(wxKeyEvent_GetRawKeyCode, 2758).
--define(wxKeyEvent_GetRawKeyFlags, 2759).
--define(wxKeyEvent_GetUnicodeKey, 2760).
--define(wxKeyEvent_GetX, 2761).
--define(wxKeyEvent_GetY, 2762).
--define(wxKeyEvent_HasModifiers, 2763).
--define(wxKeyEvent_MetaDown, 2764).
--define(wxKeyEvent_ShiftDown, 2765).
--define(wxSizeEvent_GetSize, 2766).
--define(wxMoveEvent_GetPosition, 2767).
--define(wxEraseEvent_GetDC, 2768).
--define(wxFocusEvent_GetWindow, 2769).
--define(wxChildFocusEvent_GetWindow, 2770).
--define(wxMenuEvent_GetMenu, 2771).
--define(wxMenuEvent_GetMenuId, 2772).
--define(wxMenuEvent_IsPopup, 2773).
--define(wxCloseEvent_CanVeto, 2774).
--define(wxCloseEvent_GetLoggingOff, 2775).
--define(wxCloseEvent_SetCanVeto, 2776).
--define(wxCloseEvent_SetLoggingOff, 2777).
--define(wxCloseEvent_Veto, 2778).
--define(wxShowEvent_SetShow, 2779).
--define(wxShowEvent_GetShow, 2780).
--define(wxIconizeEvent_Iconized, 2781).
--define(wxJoystickEvent_ButtonDown, 2782).
--define(wxJoystickEvent_ButtonIsDown, 2783).
--define(wxJoystickEvent_ButtonUp, 2784).
--define(wxJoystickEvent_GetButtonChange, 2785).
--define(wxJoystickEvent_GetButtonState, 2786).
--define(wxJoystickEvent_GetJoystick, 2787).
--define(wxJoystickEvent_GetPosition, 2788).
--define(wxJoystickEvent_GetZPosition, 2789).
--define(wxJoystickEvent_IsButton, 2790).
--define(wxJoystickEvent_IsMove, 2791).
--define(wxJoystickEvent_IsZMove, 2792).
--define(wxUpdateUIEvent_CanUpdate, 2793).
--define(wxUpdateUIEvent_Check, 2794).
--define(wxUpdateUIEvent_Enable, 2795).
--define(wxUpdateUIEvent_Show, 2796).
--define(wxUpdateUIEvent_GetChecked, 2797).
--define(wxUpdateUIEvent_GetEnabled, 2798).
--define(wxUpdateUIEvent_GetShown, 2799).
--define(wxUpdateUIEvent_GetSetChecked, 2800).
--define(wxUpdateUIEvent_GetSetEnabled, 2801).
--define(wxUpdateUIEvent_GetSetShown, 2802).
--define(wxUpdateUIEvent_GetSetText, 2803).
--define(wxUpdateUIEvent_GetText, 2804).
--define(wxUpdateUIEvent_GetMode, 2805).
--define(wxUpdateUIEvent_GetUpdateInterval, 2806).
--define(wxUpdateUIEvent_ResetUpdateTime, 2807).
--define(wxUpdateUIEvent_SetMode, 2808).
--define(wxUpdateUIEvent_SetText, 2809).
--define(wxUpdateUIEvent_SetUpdateInterval, 2810).
--define(wxMouseCaptureChangedEvent_GetCapturedWindow, 2811).
--define(wxPaletteChangedEvent_SetChangedWindow, 2812).
--define(wxPaletteChangedEvent_GetChangedWindow, 2813).
--define(wxQueryNewPaletteEvent_SetPaletteRealized, 2814).
--define(wxQueryNewPaletteEvent_GetPaletteRealized, 2815).
--define(wxNavigationKeyEvent_GetDirection, 2816).
--define(wxNavigationKeyEvent_SetDirection, 2817).
--define(wxNavigationKeyEvent_IsWindowChange, 2818).
--define(wxNavigationKeyEvent_SetWindowChange, 2819).
--define(wxNavigationKeyEvent_IsFromTab, 2820).
--define(wxNavigationKeyEvent_SetFromTab, 2821).
--define(wxNavigationKeyEvent_GetCurrentFocus, 2822).
--define(wxNavigationKeyEvent_SetCurrentFocus, 2823).
--define(wxHelpEvent_GetOrigin, 2824).
--define(wxHelpEvent_GetPosition, 2825).
--define(wxHelpEvent_SetOrigin, 2826).
--define(wxHelpEvent_SetPosition, 2827).
--define(wxContextMenuEvent_GetPosition, 2828).
--define(wxContextMenuEvent_SetPosition, 2829).
--define(wxIdleEvent_CanSend, 2830).
--define(wxIdleEvent_GetMode, 2831).
--define(wxIdleEvent_RequestMore, 2832).
--define(wxIdleEvent_MoreRequested, 2833).
--define(wxIdleEvent_SetMode, 2834).
--define(wxGridEvent_AltDown, 2835).
--define(wxGridEvent_ControlDown, 2836).
--define(wxGridEvent_GetCol, 2837).
--define(wxGridEvent_GetPosition, 2838).
--define(wxGridEvent_GetRow, 2839).
--define(wxGridEvent_MetaDown, 2840).
--define(wxGridEvent_Selecting, 2841).
--define(wxGridEvent_ShiftDown, 2842).
--define(wxNotifyEvent_Allow, 2843).
--define(wxNotifyEvent_IsAllowed, 2844).
--define(wxNotifyEvent_Veto, 2845).
--define(wxSashEvent_GetEdge, 2846).
--define(wxSashEvent_GetDragRect, 2847).
--define(wxSashEvent_GetDragStatus, 2848).
--define(wxListEvent_GetCacheFrom, 2849).
--define(wxListEvent_GetCacheTo, 2850).
--define(wxListEvent_GetKeyCode, 2851).
--define(wxListEvent_GetIndex, 2852).
--define(wxListEvent_GetColumn, 2853).
--define(wxListEvent_GetPoint, 2854).
--define(wxListEvent_GetLabel, 2855).
--define(wxListEvent_GetText, 2856).
--define(wxListEvent_GetImage, 2857).
--define(wxListEvent_GetData, 2858).
--define(wxListEvent_GetMask, 2859).
--define(wxListEvent_GetItem, 2860).
--define(wxListEvent_IsEditCancelled, 2861).
--define(wxDateEvent_GetDate, 2862).
--define(wxCalendarEvent_GetWeekDay, 2863).
--define(wxFileDirPickerEvent_GetPath, 2864).
--define(wxColourPickerEvent_GetColour, 2865).
--define(wxFontPickerEvent_GetFont, 2866).
--define(wxStyledTextEvent_GetPosition, 2867).
--define(wxStyledTextEvent_GetKey, 2868).
--define(wxStyledTextEvent_GetModifiers, 2869).
--define(wxStyledTextEvent_GetModificationType, 2870).
--define(wxStyledTextEvent_GetText, 2871).
--define(wxStyledTextEvent_GetLength, 2872).
--define(wxStyledTextEvent_GetLinesAdded, 2873).
--define(wxStyledTextEvent_GetLine, 2874).
--define(wxStyledTextEvent_GetFoldLevelNow, 2875).
--define(wxStyledTextEvent_GetFoldLevelPrev, 2876).
--define(wxStyledTextEvent_GetMargin, 2877).
--define(wxStyledTextEvent_GetMessage, 2878).
--define(wxStyledTextEvent_GetWParam, 2879).
--define(wxStyledTextEvent_GetLParam, 2880).
--define(wxStyledTextEvent_GetListType, 2881).
--define(wxStyledTextEvent_GetX, 2882).
--define(wxStyledTextEvent_GetY, 2883).
--define(wxStyledTextEvent_GetDragText, 2884).
--define(wxStyledTextEvent_GetDragAllowMove, 2885).
--define(wxStyledTextEvent_GetDragResult, 2886).
--define(wxStyledTextEvent_GetShift, 2887).
--define(wxStyledTextEvent_GetControl, 2888).
--define(wxStyledTextEvent_GetAlt, 2889).
--define(utils_wxGetKeyState, 2890).
--define(utils_wxGetMousePosition, 2891).
--define(utils_wxGetMouseState, 2892).
--define(utils_wxSetDetectableAutoRepeat, 2893).
--define(utils_wxBell, 2894).
--define(utils_wxFindMenuItemId, 2895).
--define(utils_wxGenericFindWindowAtPoint, 2896).
--define(utils_wxFindWindowAtPoint, 2897).
--define(utils_wxBeginBusyCursor, 2898).
--define(utils_wxEndBusyCursor, 2899).
--define(utils_wxIsBusy, 2900).
--define(utils_wxShutdown, 2901).
--define(utils_wxShell, 2902).
--define(utils_wxLaunchDefaultBrowser, 2903).
--define(utils_wxGetEmailAddress, 2904).
--define(utils_wxGetUserId, 2905).
--define(utils_wxGetHomeDir, 2906).
--define(utils_wxNewId, 2907).
--define(utils_wxRegisterId, 2908).
--define(utils_wxGetCurrentId, 2909).
--define(utils_wxGetOsDescription, 2910).
--define(utils_wxIsPlatformLittleEndian, 2911).
--define(utils_wxIsPlatform64Bit, 2912).
--define(wxPrintout_new, 2913).
--define(wxPrintout_destruct, 2914).
--define(wxPrintout_GetDC, 2915).
--define(wxPrintout_GetPageSizeMM, 2916).
--define(wxPrintout_GetPageSizePixels, 2917).
--define(wxPrintout_GetPaperRectPixels, 2918).
--define(wxPrintout_GetPPIPrinter, 2919).
--define(wxPrintout_GetPPIScreen, 2920).
--define(wxPrintout_GetTitle, 2921).
--define(wxPrintout_IsPreview, 2922).
--define(wxPrintout_FitThisSizeToPaper, 2923).
--define(wxPrintout_FitThisSizeToPage, 2924).
--define(wxPrintout_FitThisSizeToPageMargins, 2925).
--define(wxPrintout_MapScreenSizeToPaper, 2926).
--define(wxPrintout_MapScreenSizeToPage, 2927).
--define(wxPrintout_MapScreenSizeToPageMargins, 2928).
--define(wxPrintout_MapScreenSizeToDevice, 2929).
--define(wxPrintout_GetLogicalPaperRect, 2930).
--define(wxPrintout_GetLogicalPageRect, 2931).
--define(wxPrintout_GetLogicalPageMarginsRect, 2932).
--define(wxPrintout_SetLogicalOrigin, 2933).
--define(wxPrintout_OffsetLogicalOrigin, 2934).
--define(wxStyledTextCtrl_new_2, 2935).
--define(wxStyledTextCtrl_new_0, 2936).
--define(wxStyledTextCtrl_destruct, 2937).
--define(wxStyledTextCtrl_Create, 2938).
--define(wxStyledTextCtrl_AddText, 2939).
--define(wxStyledTextCtrl_AddStyledText, 2940).
--define(wxStyledTextCtrl_InsertText, 2941).
--define(wxStyledTextCtrl_ClearAll, 2942).
--define(wxStyledTextCtrl_ClearDocumentStyle, 2943).
--define(wxStyledTextCtrl_GetLength, 2944).
--define(wxStyledTextCtrl_GetCharAt, 2945).
--define(wxStyledTextCtrl_GetCurrentPos, 2946).
--define(wxStyledTextCtrl_GetAnchor, 2947).
--define(wxStyledTextCtrl_GetStyleAt, 2948).
--define(wxStyledTextCtrl_Redo, 2949).
--define(wxStyledTextCtrl_SetUndoCollection, 2950).
--define(wxStyledTextCtrl_SelectAll, 2951).
--define(wxStyledTextCtrl_SetSavePoint, 2952).
--define(wxStyledTextCtrl_GetStyledText, 2953).
--define(wxStyledTextCtrl_CanRedo, 2954).
--define(wxStyledTextCtrl_MarkerLineFromHandle, 2955).
--define(wxStyledTextCtrl_MarkerDeleteHandle, 2956).
--define(wxStyledTextCtrl_GetUndoCollection, 2957).
--define(wxStyledTextCtrl_GetViewWhiteSpace, 2958).
--define(wxStyledTextCtrl_SetViewWhiteSpace, 2959).
--define(wxStyledTextCtrl_PositionFromPoint, 2960).
--define(wxStyledTextCtrl_PositionFromPointClose, 2961).
--define(wxStyledTextCtrl_GotoLine, 2962).
--define(wxStyledTextCtrl_GotoPos, 2963).
--define(wxStyledTextCtrl_SetAnchor, 2964).
--define(wxStyledTextCtrl_GetCurLine, 2965).
--define(wxStyledTextCtrl_GetEndStyled, 2966).
--define(wxStyledTextCtrl_ConvertEOLs, 2967).
--define(wxStyledTextCtrl_GetEOLMode, 2968).
--define(wxStyledTextCtrl_SetEOLMode, 2969).
--define(wxStyledTextCtrl_StartStyling, 2970).
--define(wxStyledTextCtrl_SetStyling, 2971).
--define(wxStyledTextCtrl_GetBufferedDraw, 2972).
--define(wxStyledTextCtrl_SetBufferedDraw, 2973).
--define(wxStyledTextCtrl_SetTabWidth, 2974).
--define(wxStyledTextCtrl_GetTabWidth, 2975).
--define(wxStyledTextCtrl_SetCodePage, 2976).
--define(wxStyledTextCtrl_MarkerDefine, 2977).
--define(wxStyledTextCtrl_MarkerSetForeground, 2978).
--define(wxStyledTextCtrl_MarkerSetBackground, 2979).
--define(wxStyledTextCtrl_MarkerAdd, 2980).
--define(wxStyledTextCtrl_MarkerDelete, 2981).
--define(wxStyledTextCtrl_MarkerDeleteAll, 2982).
--define(wxStyledTextCtrl_MarkerGet, 2983).
--define(wxStyledTextCtrl_MarkerNext, 2984).
--define(wxStyledTextCtrl_MarkerPrevious, 2985).
--define(wxStyledTextCtrl_MarkerDefineBitmap, 2986).
--define(wxStyledTextCtrl_MarkerAddSet, 2987).
--define(wxStyledTextCtrl_MarkerSetAlpha, 2988).
--define(wxStyledTextCtrl_SetMarginType, 2989).
--define(wxStyledTextCtrl_GetMarginType, 2990).
--define(wxStyledTextCtrl_SetMarginWidth, 2991).
--define(wxStyledTextCtrl_GetMarginWidth, 2992).
--define(wxStyledTextCtrl_SetMarginMask, 2993).
--define(wxStyledTextCtrl_GetMarginMask, 2994).
--define(wxStyledTextCtrl_SetMarginSensitive, 2995).
--define(wxStyledTextCtrl_GetMarginSensitive, 2996).
--define(wxStyledTextCtrl_StyleClearAll, 2997).
--define(wxStyledTextCtrl_StyleSetForeground, 2998).
--define(wxStyledTextCtrl_StyleSetBackground, 2999).
--define(wxStyledTextCtrl_StyleSetBold, 3000).
--define(wxStyledTextCtrl_StyleSetItalic, 3001).
--define(wxStyledTextCtrl_StyleSetSize, 3002).
--define(wxStyledTextCtrl_StyleSetFaceName, 3003).
--define(wxStyledTextCtrl_StyleSetEOLFilled, 3004).
--define(wxStyledTextCtrl_StyleResetDefault, 3005).
--define(wxStyledTextCtrl_StyleSetUnderline, 3006).
--define(wxStyledTextCtrl_StyleSetCase, 3007).
--define(wxStyledTextCtrl_StyleSetHotSpot, 3008).
--define(wxStyledTextCtrl_SetSelForeground, 3009).
--define(wxStyledTextCtrl_SetSelBackground, 3010).
--define(wxStyledTextCtrl_GetSelAlpha, 3011).
--define(wxStyledTextCtrl_SetSelAlpha, 3012).
--define(wxStyledTextCtrl_SetCaretForeground, 3013).
--define(wxStyledTextCtrl_CmdKeyAssign, 3014).
--define(wxStyledTextCtrl_CmdKeyClear, 3015).
--define(wxStyledTextCtrl_CmdKeyClearAll, 3016).
--define(wxStyledTextCtrl_SetStyleBytes, 3017).
--define(wxStyledTextCtrl_StyleSetVisible, 3018).
--define(wxStyledTextCtrl_GetCaretPeriod, 3019).
--define(wxStyledTextCtrl_SetCaretPeriod, 3020).
--define(wxStyledTextCtrl_SetWordChars, 3021).
--define(wxStyledTextCtrl_BeginUndoAction, 3022).
--define(wxStyledTextCtrl_EndUndoAction, 3023).
--define(wxStyledTextCtrl_IndicatorSetStyle, 3024).
--define(wxStyledTextCtrl_IndicatorGetStyle, 3025).
--define(wxStyledTextCtrl_IndicatorSetForeground, 3026).
--define(wxStyledTextCtrl_IndicatorGetForeground, 3027).
--define(wxStyledTextCtrl_SetWhitespaceForeground, 3028).
--define(wxStyledTextCtrl_SetWhitespaceBackground, 3029).
--define(wxStyledTextCtrl_GetStyleBits, 3030).
--define(wxStyledTextCtrl_SetLineState, 3031).
--define(wxStyledTextCtrl_GetLineState, 3032).
--define(wxStyledTextCtrl_GetMaxLineState, 3033).
--define(wxStyledTextCtrl_GetCaretLineVisible, 3034).
--define(wxStyledTextCtrl_SetCaretLineVisible, 3035).
--define(wxStyledTextCtrl_GetCaretLineBackground, 3036).
--define(wxStyledTextCtrl_SetCaretLineBackground, 3037).
--define(wxStyledTextCtrl_AutoCompShow, 3038).
--define(wxStyledTextCtrl_AutoCompCancel, 3039).
--define(wxStyledTextCtrl_AutoCompActive, 3040).
--define(wxStyledTextCtrl_AutoCompPosStart, 3041).
--define(wxStyledTextCtrl_AutoCompComplete, 3042).
--define(wxStyledTextCtrl_AutoCompStops, 3043).
--define(wxStyledTextCtrl_AutoCompSetSeparator, 3044).
--define(wxStyledTextCtrl_AutoCompGetSeparator, 3045).
--define(wxStyledTextCtrl_AutoCompSelect, 3046).
--define(wxStyledTextCtrl_AutoCompSetCancelAtStart, 3047).
--define(wxStyledTextCtrl_AutoCompGetCancelAtStart, 3048).
--define(wxStyledTextCtrl_AutoCompSetFillUps, 3049).
--define(wxStyledTextCtrl_AutoCompSetChooseSingle, 3050).
--define(wxStyledTextCtrl_AutoCompGetChooseSingle, 3051).
--define(wxStyledTextCtrl_AutoCompSetIgnoreCase, 3052).
--define(wxStyledTextCtrl_AutoCompGetIgnoreCase, 3053).
--define(wxStyledTextCtrl_UserListShow, 3054).
--define(wxStyledTextCtrl_AutoCompSetAutoHide, 3055).
--define(wxStyledTextCtrl_AutoCompGetAutoHide, 3056).
--define(wxStyledTextCtrl_AutoCompSetDropRestOfWord, 3057).
--define(wxStyledTextCtrl_AutoCompGetDropRestOfWord, 3058).
--define(wxStyledTextCtrl_RegisterImage, 3059).
--define(wxStyledTextCtrl_ClearRegisteredImages, 3060).
--define(wxStyledTextCtrl_AutoCompGetTypeSeparator, 3061).
--define(wxStyledTextCtrl_AutoCompSetTypeSeparator, 3062).
--define(wxStyledTextCtrl_AutoCompSetMaxWidth, 3063).
--define(wxStyledTextCtrl_AutoCompGetMaxWidth, 3064).
--define(wxStyledTextCtrl_AutoCompSetMaxHeight, 3065).
--define(wxStyledTextCtrl_AutoCompGetMaxHeight, 3066).
--define(wxStyledTextCtrl_SetIndent, 3067).
--define(wxStyledTextCtrl_GetIndent, 3068).
--define(wxStyledTextCtrl_SetUseTabs, 3069).
--define(wxStyledTextCtrl_GetUseTabs, 3070).
--define(wxStyledTextCtrl_SetLineIndentation, 3071).
--define(wxStyledTextCtrl_GetLineIndentation, 3072).
--define(wxStyledTextCtrl_GetLineIndentPosition, 3073).
--define(wxStyledTextCtrl_GetColumn, 3074).
--define(wxStyledTextCtrl_SetUseHorizontalScrollBar, 3075).
--define(wxStyledTextCtrl_GetUseHorizontalScrollBar, 3076).
--define(wxStyledTextCtrl_SetIndentationGuides, 3077).
--define(wxStyledTextCtrl_GetIndentationGuides, 3078).
--define(wxStyledTextCtrl_SetHighlightGuide, 3079).
--define(wxStyledTextCtrl_GetHighlightGuide, 3080).
--define(wxStyledTextCtrl_GetLineEndPosition, 3081).
--define(wxStyledTextCtrl_GetCodePage, 3082).
--define(wxStyledTextCtrl_GetCaretForeground, 3083).
--define(wxStyledTextCtrl_GetReadOnly, 3084).
--define(wxStyledTextCtrl_SetCurrentPos, 3085).
--define(wxStyledTextCtrl_SetSelectionStart, 3086).
--define(wxStyledTextCtrl_GetSelectionStart, 3087).
--define(wxStyledTextCtrl_SetSelectionEnd, 3088).
--define(wxStyledTextCtrl_GetSelectionEnd, 3089).
--define(wxStyledTextCtrl_SetPrintMagnification, 3090).
--define(wxStyledTextCtrl_GetPrintMagnification, 3091).
--define(wxStyledTextCtrl_SetPrintColourMode, 3092).
--define(wxStyledTextCtrl_GetPrintColourMode, 3093).
--define(wxStyledTextCtrl_FindText, 3094).
--define(wxStyledTextCtrl_FormatRange, 3095).
--define(wxStyledTextCtrl_GetFirstVisibleLine, 3096).
--define(wxStyledTextCtrl_GetLine, 3097).
--define(wxStyledTextCtrl_GetLineCount, 3098).
--define(wxStyledTextCtrl_SetMarginLeft, 3099).
--define(wxStyledTextCtrl_GetMarginLeft, 3100).
--define(wxStyledTextCtrl_SetMarginRight, 3101).
--define(wxStyledTextCtrl_GetMarginRight, 3102).
--define(wxStyledTextCtrl_GetModify, 3103).
--define(wxStyledTextCtrl_SetSelection, 3104).
--define(wxStyledTextCtrl_GetSelectedText, 3105).
--define(wxStyledTextCtrl_GetTextRange, 3106).
--define(wxStyledTextCtrl_HideSelection, 3107).
--define(wxStyledTextCtrl_LineFromPosition, 3108).
--define(wxStyledTextCtrl_PositionFromLine, 3109).
--define(wxStyledTextCtrl_LineScroll, 3110).
--define(wxStyledTextCtrl_EnsureCaretVisible, 3111).
--define(wxStyledTextCtrl_ReplaceSelection, 3112).
--define(wxStyledTextCtrl_SetReadOnly, 3113).
--define(wxStyledTextCtrl_CanPaste, 3114).
--define(wxStyledTextCtrl_CanUndo, 3115).
--define(wxStyledTextCtrl_EmptyUndoBuffer, 3116).
--define(wxStyledTextCtrl_Undo, 3117).
--define(wxStyledTextCtrl_Cut, 3118).
--define(wxStyledTextCtrl_Copy, 3119).
--define(wxStyledTextCtrl_Paste, 3120).
--define(wxStyledTextCtrl_Clear, 3121).
--define(wxStyledTextCtrl_SetText, 3122).
--define(wxStyledTextCtrl_GetText, 3123).
--define(wxStyledTextCtrl_GetTextLength, 3124).
--define(wxStyledTextCtrl_GetOvertype, 3125).
--define(wxStyledTextCtrl_SetCaretWidth, 3126).
--define(wxStyledTextCtrl_GetCaretWidth, 3127).
--define(wxStyledTextCtrl_SetTargetStart, 3128).
--define(wxStyledTextCtrl_GetTargetStart, 3129).
--define(wxStyledTextCtrl_SetTargetEnd, 3130).
--define(wxStyledTextCtrl_GetTargetEnd, 3131).
--define(wxStyledTextCtrl_ReplaceTarget, 3132).
--define(wxStyledTextCtrl_SearchInTarget, 3133).
--define(wxStyledTextCtrl_SetSearchFlags, 3134).
--define(wxStyledTextCtrl_GetSearchFlags, 3135).
--define(wxStyledTextCtrl_CallTipShow, 3136).
--define(wxStyledTextCtrl_CallTipCancel, 3137).
--define(wxStyledTextCtrl_CallTipActive, 3138).
--define(wxStyledTextCtrl_CallTipPosAtStart, 3139).
--define(wxStyledTextCtrl_CallTipSetHighlight, 3140).
--define(wxStyledTextCtrl_CallTipSetBackground, 3141).
--define(wxStyledTextCtrl_CallTipSetForeground, 3142).
--define(wxStyledTextCtrl_CallTipSetForegroundHighlight, 3143).
--define(wxStyledTextCtrl_CallTipUseStyle, 3144).
--define(wxStyledTextCtrl_VisibleFromDocLine, 3145).
--define(wxStyledTextCtrl_DocLineFromVisible, 3146).
--define(wxStyledTextCtrl_WrapCount, 3147).
--define(wxStyledTextCtrl_SetFoldLevel, 3148).
--define(wxStyledTextCtrl_GetFoldLevel, 3149).
--define(wxStyledTextCtrl_GetLastChild, 3150).
--define(wxStyledTextCtrl_GetFoldParent, 3151).
--define(wxStyledTextCtrl_ShowLines, 3152).
--define(wxStyledTextCtrl_HideLines, 3153).
--define(wxStyledTextCtrl_GetLineVisible, 3154).
--define(wxStyledTextCtrl_SetFoldExpanded, 3155).
--define(wxStyledTextCtrl_GetFoldExpanded, 3156).
--define(wxStyledTextCtrl_ToggleFold, 3157).
--define(wxStyledTextCtrl_EnsureVisible, 3158).
--define(wxStyledTextCtrl_SetFoldFlags, 3159).
--define(wxStyledTextCtrl_EnsureVisibleEnforcePolicy, 3160).
--define(wxStyledTextCtrl_SetTabIndents, 3161).
--define(wxStyledTextCtrl_GetTabIndents, 3162).
--define(wxStyledTextCtrl_SetBackSpaceUnIndents, 3163).
--define(wxStyledTextCtrl_GetBackSpaceUnIndents, 3164).
--define(wxStyledTextCtrl_SetMouseDwellTime, 3165).
--define(wxStyledTextCtrl_GetMouseDwellTime, 3166).
--define(wxStyledTextCtrl_WordStartPosition, 3167).
--define(wxStyledTextCtrl_WordEndPosition, 3168).
--define(wxStyledTextCtrl_SetWrapMode, 3169).
--define(wxStyledTextCtrl_GetWrapMode, 3170).
--define(wxStyledTextCtrl_SetWrapVisualFlags, 3171).
--define(wxStyledTextCtrl_GetWrapVisualFlags, 3172).
--define(wxStyledTextCtrl_SetWrapVisualFlagsLocation, 3173).
--define(wxStyledTextCtrl_GetWrapVisualFlagsLocation, 3174).
--define(wxStyledTextCtrl_SetWrapStartIndent, 3175).
--define(wxStyledTextCtrl_GetWrapStartIndent, 3176).
--define(wxStyledTextCtrl_SetLayoutCache, 3177).
--define(wxStyledTextCtrl_GetLayoutCache, 3178).
--define(wxStyledTextCtrl_SetScrollWidth, 3179).
--define(wxStyledTextCtrl_GetScrollWidth, 3180).
--define(wxStyledTextCtrl_TextWidth, 3181).
--define(wxStyledTextCtrl_GetEndAtLastLine, 3182).
--define(wxStyledTextCtrl_TextHeight, 3183).
--define(wxStyledTextCtrl_SetUseVerticalScrollBar, 3184).
--define(wxStyledTextCtrl_GetUseVerticalScrollBar, 3185).
--define(wxStyledTextCtrl_AppendText, 3186).
--define(wxStyledTextCtrl_GetTwoPhaseDraw, 3187).
--define(wxStyledTextCtrl_SetTwoPhaseDraw, 3188).
--define(wxStyledTextCtrl_TargetFromSelection, 3189).
--define(wxStyledTextCtrl_LinesJoin, 3190).
--define(wxStyledTextCtrl_LinesSplit, 3191).
--define(wxStyledTextCtrl_SetFoldMarginColour, 3192).
--define(wxStyledTextCtrl_SetFoldMarginHiColour, 3193).
--define(wxStyledTextCtrl_LineDown, 3194).
--define(wxStyledTextCtrl_LineDownExtend, 3195).
--define(wxStyledTextCtrl_LineUp, 3196).
--define(wxStyledTextCtrl_LineUpExtend, 3197).
--define(wxStyledTextCtrl_CharLeft, 3198).
--define(wxStyledTextCtrl_CharLeftExtend, 3199).
--define(wxStyledTextCtrl_CharRight, 3200).
--define(wxStyledTextCtrl_CharRightExtend, 3201).
--define(wxStyledTextCtrl_WordLeft, 3202).
--define(wxStyledTextCtrl_WordLeftExtend, 3203).
--define(wxStyledTextCtrl_WordRight, 3204).
--define(wxStyledTextCtrl_WordRightExtend, 3205).
--define(wxStyledTextCtrl_Home, 3206).
--define(wxStyledTextCtrl_HomeExtend, 3207).
--define(wxStyledTextCtrl_LineEnd, 3208).
--define(wxStyledTextCtrl_LineEndExtend, 3209).
--define(wxStyledTextCtrl_DocumentStart, 3210).
--define(wxStyledTextCtrl_DocumentStartExtend, 3211).
--define(wxStyledTextCtrl_DocumentEnd, 3212).
--define(wxStyledTextCtrl_DocumentEndExtend, 3213).
--define(wxStyledTextCtrl_PageUp, 3214).
--define(wxStyledTextCtrl_PageUpExtend, 3215).
--define(wxStyledTextCtrl_PageDown, 3216).
--define(wxStyledTextCtrl_PageDownExtend, 3217).
--define(wxStyledTextCtrl_EditToggleOvertype, 3218).
--define(wxStyledTextCtrl_Cancel, 3219).
--define(wxStyledTextCtrl_DeleteBack, 3220).
--define(wxStyledTextCtrl_Tab, 3221).
--define(wxStyledTextCtrl_BackTab, 3222).
--define(wxStyledTextCtrl_NewLine, 3223).
--define(wxStyledTextCtrl_FormFeed, 3224).
--define(wxStyledTextCtrl_VCHome, 3225).
--define(wxStyledTextCtrl_VCHomeExtend, 3226).
--define(wxStyledTextCtrl_ZoomIn, 3227).
--define(wxStyledTextCtrl_ZoomOut, 3228).
--define(wxStyledTextCtrl_DelWordLeft, 3229).
--define(wxStyledTextCtrl_DelWordRight, 3230).
--define(wxStyledTextCtrl_LineCut, 3231).
--define(wxStyledTextCtrl_LineDelete, 3232).
--define(wxStyledTextCtrl_LineTranspose, 3233).
--define(wxStyledTextCtrl_LineDuplicate, 3234).
--define(wxStyledTextCtrl_LowerCase, 3235).
--define(wxStyledTextCtrl_UpperCase, 3236).
--define(wxStyledTextCtrl_LineScrollDown, 3237).
--define(wxStyledTextCtrl_LineScrollUp, 3238).
--define(wxStyledTextCtrl_DeleteBackNotLine, 3239).
--define(wxStyledTextCtrl_HomeDisplay, 3240).
--define(wxStyledTextCtrl_HomeDisplayExtend, 3241).
--define(wxStyledTextCtrl_LineEndDisplay, 3242).
--define(wxStyledTextCtrl_LineEndDisplayExtend, 3243).
--define(wxStyledTextCtrl_HomeWrapExtend, 3244).
--define(wxStyledTextCtrl_LineEndWrap, 3245).
--define(wxStyledTextCtrl_LineEndWrapExtend, 3246).
--define(wxStyledTextCtrl_VCHomeWrap, 3247).
--define(wxStyledTextCtrl_VCHomeWrapExtend, 3248).
--define(wxStyledTextCtrl_LineCopy, 3249).
--define(wxStyledTextCtrl_MoveCaretInsideView, 3250).
--define(wxStyledTextCtrl_LineLength, 3251).
--define(wxStyledTextCtrl_BraceHighlight, 3252).
--define(wxStyledTextCtrl_BraceBadLight, 3253).
--define(wxStyledTextCtrl_BraceMatch, 3254).
--define(wxStyledTextCtrl_GetViewEOL, 3255).
--define(wxStyledTextCtrl_SetViewEOL, 3256).
--define(wxStyledTextCtrl_SetModEventMask, 3257).
--define(wxStyledTextCtrl_GetEdgeColumn, 3258).
--define(wxStyledTextCtrl_SetEdgeColumn, 3259).
--define(wxStyledTextCtrl_GetEdgeMode, 3260).
--define(wxStyledTextCtrl_GetEdgeColour, 3261).
--define(wxStyledTextCtrl_SetEdgeColour, 3262).
--define(wxStyledTextCtrl_SearchAnchor, 3263).
--define(wxStyledTextCtrl_SearchNext, 3264).
--define(wxStyledTextCtrl_SearchPrev, 3265).
--define(wxStyledTextCtrl_LinesOnScreen, 3266).
--define(wxStyledTextCtrl_UsePopUp, 3267).
--define(wxStyledTextCtrl_SelectionIsRectangle, 3268).
--define(wxStyledTextCtrl_SetZoom, 3269).
--define(wxStyledTextCtrl_GetZoom, 3270).
--define(wxStyledTextCtrl_GetModEventMask, 3271).
--define(wxStyledTextCtrl_SetSTCFocus, 3272).
--define(wxStyledTextCtrl_GetSTCFocus, 3273).
--define(wxStyledTextCtrl_SetStatus, 3274).
--define(wxStyledTextCtrl_GetStatus, 3275).
--define(wxStyledTextCtrl_SetMouseDownCaptures, 3276).
--define(wxStyledTextCtrl_GetMouseDownCaptures, 3277).
--define(wxStyledTextCtrl_SetSTCCursor, 3278).
--define(wxStyledTextCtrl_GetSTCCursor, 3279).
--define(wxStyledTextCtrl_SetControlCharSymbol, 3280).
--define(wxStyledTextCtrl_GetControlCharSymbol, 3281).
--define(wxStyledTextCtrl_WordPartLeft, 3282).
--define(wxStyledTextCtrl_WordPartLeftExtend, 3283).
--define(wxStyledTextCtrl_WordPartRight, 3284).
--define(wxStyledTextCtrl_WordPartRightExtend, 3285).
--define(wxStyledTextCtrl_SetVisiblePolicy, 3286).
--define(wxStyledTextCtrl_DelLineLeft, 3287).
--define(wxStyledTextCtrl_DelLineRight, 3288).
--define(wxStyledTextCtrl_GetXOffset, 3289).
--define(wxStyledTextCtrl_ChooseCaretX, 3290).
--define(wxStyledTextCtrl_SetXCaretPolicy, 3291).
--define(wxStyledTextCtrl_SetYCaretPolicy, 3292).
--define(wxStyledTextCtrl_GetPrintWrapMode, 3293).
--define(wxStyledTextCtrl_SetHotspotActiveForeground, 3294).
--define(wxStyledTextCtrl_SetHotspotActiveBackground, 3295).
--define(wxStyledTextCtrl_SetHotspotActiveUnderline, 3296).
--define(wxStyledTextCtrl_SetHotspotSingleLine, 3297).
--define(wxStyledTextCtrl_ParaDownExtend, 3298).
--define(wxStyledTextCtrl_ParaUp, 3299).
--define(wxStyledTextCtrl_ParaUpExtend, 3300).
--define(wxStyledTextCtrl_PositionBefore, 3301).
--define(wxStyledTextCtrl_PositionAfter, 3302).
--define(wxStyledTextCtrl_CopyRange, 3303).
--define(wxStyledTextCtrl_CopyText, 3304).
--define(wxStyledTextCtrl_SetSelectionMode, 3305).
--define(wxStyledTextCtrl_GetSelectionMode, 3306).
--define(wxStyledTextCtrl_LineDownRectExtend, 3307).
--define(wxStyledTextCtrl_LineUpRectExtend, 3308).
--define(wxStyledTextCtrl_CharLeftRectExtend, 3309).
--define(wxStyledTextCtrl_CharRightRectExtend, 3310).
--define(wxStyledTextCtrl_HomeRectExtend, 3311).
--define(wxStyledTextCtrl_VCHomeRectExtend, 3312).
--define(wxStyledTextCtrl_LineEndRectExtend, 3313).
--define(wxStyledTextCtrl_PageUpRectExtend, 3314).
--define(wxStyledTextCtrl_PageDownRectExtend, 3315).
--define(wxStyledTextCtrl_StutteredPageUp, 3316).
--define(wxStyledTextCtrl_StutteredPageUpExtend, 3317).
--define(wxStyledTextCtrl_StutteredPageDown, 3318).
--define(wxStyledTextCtrl_StutteredPageDownExtend, 3319).
--define(wxStyledTextCtrl_WordLeftEnd, 3320).
--define(wxStyledTextCtrl_WordLeftEndExtend, 3321).
--define(wxStyledTextCtrl_WordRightEnd, 3322).
--define(wxStyledTextCtrl_WordRightEndExtend, 3323).
--define(wxStyledTextCtrl_SetWhitespaceChars, 3324).
--define(wxStyledTextCtrl_SetCharsDefault, 3325).
--define(wxStyledTextCtrl_AutoCompGetCurrent, 3326).
--define(wxStyledTextCtrl_Allocate, 3327).
--define(wxStyledTextCtrl_FindColumn, 3328).
--define(wxStyledTextCtrl_GetCaretSticky, 3329).
--define(wxStyledTextCtrl_SetCaretSticky, 3330).
--define(wxStyledTextCtrl_ToggleCaretSticky, 3331).
--define(wxStyledTextCtrl_SetPasteConvertEndings, 3332).
--define(wxStyledTextCtrl_GetPasteConvertEndings, 3333).
--define(wxStyledTextCtrl_SelectionDuplicate, 3334).
--define(wxStyledTextCtrl_SetCaretLineBackAlpha, 3335).
--define(wxStyledTextCtrl_GetCaretLineBackAlpha, 3336).
--define(wxStyledTextCtrl_StartRecord, 3337).
--define(wxStyledTextCtrl_StopRecord, 3338).
--define(wxStyledTextCtrl_SetLexer, 3339).
--define(wxStyledTextCtrl_GetLexer, 3340).
--define(wxStyledTextCtrl_Colourise, 3341).
--define(wxStyledTextCtrl_SetProperty, 3342).
--define(wxStyledTextCtrl_SetKeyWords, 3343).
--define(wxStyledTextCtrl_SetLexerLanguage, 3344).
--define(wxStyledTextCtrl_GetProperty, 3345).
--define(wxStyledTextCtrl_GetStyleBitsNeeded, 3346).
--define(wxStyledTextCtrl_GetCurrentLine, 3347).
--define(wxStyledTextCtrl_StyleSetSpec, 3348).
--define(wxStyledTextCtrl_StyleSetFont, 3349).
--define(wxStyledTextCtrl_StyleSetFontAttr, 3350).
--define(wxStyledTextCtrl_StyleSetCharacterSet, 3351).
--define(wxStyledTextCtrl_StyleSetFontEncoding, 3352).
--define(wxStyledTextCtrl_CmdKeyExecute, 3353).
--define(wxStyledTextCtrl_SetMargins, 3354).
--define(wxStyledTextCtrl_GetSelection, 3355).
--define(wxStyledTextCtrl_PointFromPosition, 3356).
--define(wxStyledTextCtrl_ScrollToLine, 3357).
--define(wxStyledTextCtrl_ScrollToColumn, 3358).
--define(wxStyledTextCtrl_SendMsg, 3359).
--define(wxStyledTextCtrl_SetVScrollBar, 3360).
--define(wxStyledTextCtrl_SetHScrollBar, 3361).
--define(wxStyledTextCtrl_GetLastKeydownProcessed, 3362).
--define(wxStyledTextCtrl_SetLastKeydownProcessed, 3363).
--define(wxStyledTextCtrl_SaveFile, 3364).
--define(wxStyledTextCtrl_LoadFile, 3365).
--define(wxStyledTextCtrl_DoDragOver, 3366).
--define(wxStyledTextCtrl_DoDropText, 3367).
--define(wxStyledTextCtrl_GetUseAntiAliasing, 3368).
--define(wxStyledTextCtrl_AddTextRaw, 3369).
--define(wxStyledTextCtrl_InsertTextRaw, 3370).
--define(wxStyledTextCtrl_GetCurLineRaw, 3371).
--define(wxStyledTextCtrl_GetLineRaw, 3372).
--define(wxStyledTextCtrl_GetSelectedTextRaw, 3373).
--define(wxStyledTextCtrl_GetTextRangeRaw, 3374).
--define(wxStyledTextCtrl_SetTextRaw, 3375).
--define(wxStyledTextCtrl_GetTextRaw, 3376).
--define(wxStyledTextCtrl_AppendTextRaw, 3377).
--define(wxArtProvider_GetBitmap, 3378).
--define(wxArtProvider_GetIcon, 3379).
--define(wxTreeEvent_GetKeyCode, 3380).
--define(wxTreeEvent_GetItem, 3381).
--define(wxTreeEvent_GetKeyEvent, 3382).
--define(wxTreeEvent_GetLabel, 3383).
--define(wxTreeEvent_GetOldItem, 3384).
--define(wxTreeEvent_GetPoint, 3385).
--define(wxTreeEvent_IsEditCancelled, 3386).
--define(wxTreeEvent_SetToolTip, 3387).
--define(wxNotebookEvent_GetOldSelection, 3388).
--define(wxNotebookEvent_GetSelection, 3389).
--define(wxNotebookEvent_SetOldSelection, 3390).
--define(wxNotebookEvent_SetSelection, 3391).
--define(wxFileDataObject_new, 3392).
--define(wxFileDataObject_AddFile, 3393).
--define(wxFileDataObject_GetFilenames, 3394).
--define(wxFileDataObject_destroy, 3395).
--define(wxTextDataObject_new, 3396).
--define(wxTextDataObject_GetTextLength, 3397).
--define(wxTextDataObject_GetText, 3398).
--define(wxTextDataObject_SetText, 3399).
--define(wxTextDataObject_destroy, 3400).
--define(wxBitmapDataObject_new_1_1, 3401).
--define(wxBitmapDataObject_new_1_0, 3402).
--define(wxBitmapDataObject_GetBitmap, 3403).
--define(wxBitmapDataObject_SetBitmap, 3404).
--define(wxBitmapDataObject_destroy, 3405).
--define(wxClipboard_new, 3407).
--define(wxClipboard_destruct, 3408).
--define(wxClipboard_AddData, 3409).
--define(wxClipboard_Clear, 3410).
--define(wxClipboard_Close, 3411).
--define(wxClipboard_Flush, 3412).
--define(wxClipboard_GetData, 3413).
--define(wxClipboard_IsOpened, 3414).
--define(wxClipboard_Open, 3415).
--define(wxClipboard_SetData, 3416).
--define(wxClipboard_UsePrimarySelection, 3418).
--define(wxClipboard_IsSupported, 3419).
--define(wxClipboard_Get, 3420).
--define(wxSpinEvent_GetPosition, 3421).
--define(wxSpinEvent_SetPosition, 3422).
--define(wxSplitterWindow_new_0, 3423).
--define(wxSplitterWindow_new_2, 3424).
--define(wxSplitterWindow_destruct, 3425).
--define(wxSplitterWindow_Create, 3426).
--define(wxSplitterWindow_GetMinimumPaneSize, 3427).
--define(wxSplitterWindow_GetSashGravity, 3428).
--define(wxSplitterWindow_GetSashPosition, 3429).
--define(wxSplitterWindow_GetSplitMode, 3430).
--define(wxSplitterWindow_GetWindow1, 3431).
--define(wxSplitterWindow_GetWindow2, 3432).
--define(wxSplitterWindow_Initialize, 3433).
--define(wxSplitterWindow_IsSplit, 3434).
--define(wxSplitterWindow_ReplaceWindow, 3435).
--define(wxSplitterWindow_SetSashGravity, 3436).
--define(wxSplitterWindow_SetSashPosition, 3437).
--define(wxSplitterWindow_SetSashSize, 3438).
--define(wxSplitterWindow_SetMinimumPaneSize, 3439).
--define(wxSplitterWindow_SetSplitMode, 3440).
--define(wxSplitterWindow_SplitHorizontally, 3441).
--define(wxSplitterWindow_SplitVertically, 3442).
--define(wxSplitterWindow_Unsplit, 3443).
--define(wxSplitterWindow_UpdateSize, 3444).
--define(wxSplitterEvent_GetSashPosition, 3445).
--define(wxSplitterEvent_GetX, 3446).
--define(wxSplitterEvent_GetY, 3447).
--define(wxSplitterEvent_GetWindowBeingRemoved, 3448).
--define(wxSplitterEvent_SetSashPosition, 3449).
--define(wxHtmlWindow_new_0, 3450).
--define(wxHtmlWindow_new_2, 3451).
--define(wxHtmlWindow_AppendToPage, 3452).
--define(wxHtmlWindow_GetOpenedAnchor, 3453).
--define(wxHtmlWindow_GetOpenedPage, 3454).
--define(wxHtmlWindow_GetOpenedPageTitle, 3455).
--define(wxHtmlWindow_GetRelatedFrame, 3456).
--define(wxHtmlWindow_HistoryBack, 3457).
--define(wxHtmlWindow_HistoryCanBack, 3458).
--define(wxHtmlWindow_HistoryCanForward, 3459).
--define(wxHtmlWindow_HistoryClear, 3460).
--define(wxHtmlWindow_HistoryForward, 3461).
--define(wxHtmlWindow_LoadFile, 3462).
--define(wxHtmlWindow_LoadPage, 3463).
--define(wxHtmlWindow_SelectAll, 3464).
--define(wxHtmlWindow_SelectionToText, 3465).
--define(wxHtmlWindow_SelectLine, 3466).
--define(wxHtmlWindow_SelectWord, 3467).
--define(wxHtmlWindow_SetBorders, 3468).
--define(wxHtmlWindow_SetFonts, 3469).
--define(wxHtmlWindow_SetPage, 3470).
--define(wxHtmlWindow_SetRelatedFrame, 3471).
--define(wxHtmlWindow_SetRelatedStatusBar, 3472).
--define(wxHtmlWindow_ToText, 3473).
--define(wxHtmlWindow_destroy, 3474).
--define(wxHtmlLinkEvent_GetLinkInfo, 3475).
--define(wxSystemSettings_GetColour, 3476).
--define(wxSystemSettings_GetFont, 3477).
--define(wxSystemSettings_GetMetric, 3478).
--define(wxSystemSettings_GetScreenType, 3479).
--define(wxAuiNotebookEvent_SetSelection, 3480).
--define(wxAuiNotebookEvent_GetSelection, 3481).
--define(wxAuiNotebookEvent_SetOldSelection, 3482).
--define(wxAuiNotebookEvent_GetOldSelection, 3483).
--define(wxAuiNotebookEvent_SetDragSource, 3484).
--define(wxAuiNotebookEvent_GetDragSource, 3485).
--define(wxAuiManagerEvent_SetManager, 3486).
--define(wxAuiManagerEvent_GetManager, 3487).
--define(wxAuiManagerEvent_SetPane, 3488).
--define(wxAuiManagerEvent_GetPane, 3489).
--define(wxAuiManagerEvent_SetButton, 3490).
--define(wxAuiManagerEvent_GetButton, 3491).
--define(wxAuiManagerEvent_SetDC, 3492).
--define(wxAuiManagerEvent_GetDC, 3493).
--define(wxAuiManagerEvent_Veto, 3494).
--define(wxAuiManagerEvent_GetVeto, 3495).
--define(wxAuiManagerEvent_SetCanVeto, 3496).
--define(wxAuiManagerEvent_CanVeto, 3497).
--define(wxLogNull_new, 3498).
--define(wxLogNull_destroy, 3499).
+-define(wxListItemAttr_new_0, 1757).
+-define(wxListItemAttr_new_3, 1758).
+-define(wxListItemAttr_GetBackgroundColour, 1759).
+-define(wxListItemAttr_GetFont, 1760).
+-define(wxListItemAttr_GetTextColour, 1761).
+-define(wxListItemAttr_HasBackgroundColour, 1762).
+-define(wxListItemAttr_HasFont, 1763).
+-define(wxListItemAttr_HasTextColour, 1764).
+-define(wxListItemAttr_SetBackgroundColour, 1765).
+-define(wxListItemAttr_SetFont, 1766).
+-define(wxListItemAttr_SetTextColour, 1767).
+-define(wxListItemAttr_destroy, 1768).
+-define(wxImageList_new_0, 1769).
+-define(wxImageList_new_3, 1770).
+-define(wxImageList_Add_1, 1771).
+-define(wxImageList_Add_2_0, 1772).
+-define(wxImageList_Add_2_1, 1773).
+-define(wxImageList_Create, 1774).
+-define(wxImageList_Draw, 1776).
+-define(wxImageList_GetBitmap, 1777).
+-define(wxImageList_GetIcon, 1778).
+-define(wxImageList_GetImageCount, 1779).
+-define(wxImageList_GetSize, 1780).
+-define(wxImageList_Remove, 1781).
+-define(wxImageList_RemoveAll, 1782).
+-define(wxImageList_Replace_2, 1783).
+-define(wxImageList_Replace_3, 1784).
+-define(wxImageList_destroy, 1785).
+-define(wxTextAttr_new_0, 1786).
+-define(wxTextAttr_new_2, 1787).
+-define(wxTextAttr_GetAlignment, 1788).
+-define(wxTextAttr_GetBackgroundColour, 1789).
+-define(wxTextAttr_GetFont, 1790).
+-define(wxTextAttr_GetLeftIndent, 1791).
+-define(wxTextAttr_GetLeftSubIndent, 1792).
+-define(wxTextAttr_GetRightIndent, 1793).
+-define(wxTextAttr_GetTabs, 1794).
+-define(wxTextAttr_GetTextColour, 1795).
+-define(wxTextAttr_HasBackgroundColour, 1796).
+-define(wxTextAttr_HasFont, 1797).
+-define(wxTextAttr_HasTextColour, 1798).
+-define(wxTextAttr_GetFlags, 1799).
+-define(wxTextAttr_IsDefault, 1800).
+-define(wxTextAttr_SetAlignment, 1801).
+-define(wxTextAttr_SetBackgroundColour, 1802).
+-define(wxTextAttr_SetFlags, 1803).
+-define(wxTextAttr_SetFont, 1804).
+-define(wxTextAttr_SetLeftIndent, 1805).
+-define(wxTextAttr_SetRightIndent, 1806).
+-define(wxTextAttr_SetTabs, 1807).
+-define(wxTextAttr_SetTextColour, 1808).
+-define(wxTextAttr_destroy, 1809).
+-define(wxTextCtrl_new_3, 1811).
+-define(wxTextCtrl_new_0, 1812).
+-define(wxTextCtrl_destruct, 1814).
+-define(wxTextCtrl_AppendText, 1815).
+-define(wxTextCtrl_CanCopy, 1816).
+-define(wxTextCtrl_CanCut, 1817).
+-define(wxTextCtrl_CanPaste, 1818).
+-define(wxTextCtrl_CanRedo, 1819).
+-define(wxTextCtrl_CanUndo, 1820).
+-define(wxTextCtrl_Clear, 1821).
+-define(wxTextCtrl_Copy, 1822).
+-define(wxTextCtrl_Create, 1823).
+-define(wxTextCtrl_Cut, 1824).
+-define(wxTextCtrl_DiscardEdits, 1825).
+-define(wxTextCtrl_EmulateKeyPress, 1826).
+-define(wxTextCtrl_GetDefaultStyle, 1827).
+-define(wxTextCtrl_GetInsertionPoint, 1828).
+-define(wxTextCtrl_GetLastPosition, 1829).
+-define(wxTextCtrl_GetLineLength, 1830).
+-define(wxTextCtrl_GetLineText, 1831).
+-define(wxTextCtrl_GetNumberOfLines, 1832).
+-define(wxTextCtrl_GetRange, 1833).
+-define(wxTextCtrl_GetSelection, 1834).
+-define(wxTextCtrl_GetStringSelection, 1835).
+-define(wxTextCtrl_GetStyle, 1836).
+-define(wxTextCtrl_GetValue, 1837).
+-define(wxTextCtrl_IsEditable, 1838).
+-define(wxTextCtrl_IsModified, 1839).
+-define(wxTextCtrl_IsMultiLine, 1840).
+-define(wxTextCtrl_IsSingleLine, 1841).
+-define(wxTextCtrl_LoadFile, 1842).
+-define(wxTextCtrl_MarkDirty, 1843).
+-define(wxTextCtrl_Paste, 1844).
+-define(wxTextCtrl_PositionToXY, 1845).
+-define(wxTextCtrl_Redo, 1846).
+-define(wxTextCtrl_Remove, 1847).
+-define(wxTextCtrl_Replace, 1848).
+-define(wxTextCtrl_SaveFile, 1849).
+-define(wxTextCtrl_SetDefaultStyle, 1850).
+-define(wxTextCtrl_SetEditable, 1851).
+-define(wxTextCtrl_SetInsertionPoint, 1852).
+-define(wxTextCtrl_SetInsertionPointEnd, 1853).
+-define(wxTextCtrl_SetMaxLength, 1855).
+-define(wxTextCtrl_SetSelection, 1856).
+-define(wxTextCtrl_SetStyle, 1857).
+-define(wxTextCtrl_SetValue, 1858).
+-define(wxTextCtrl_ShowPosition, 1859).
+-define(wxTextCtrl_Undo, 1860).
+-define(wxTextCtrl_WriteText, 1861).
+-define(wxTextCtrl_XYToPosition, 1862).
+-define(wxNotebook_new_0, 1865).
+-define(wxNotebook_new_3, 1866).
+-define(wxNotebook_destruct, 1867).
+-define(wxNotebook_AddPage, 1868).
+-define(wxNotebook_AdvanceSelection, 1869).
+-define(wxNotebook_AssignImageList, 1870).
+-define(wxNotebook_Create, 1871).
+-define(wxNotebook_DeleteAllPages, 1872).
+-define(wxNotebook_DeletePage, 1873).
+-define(wxNotebook_RemovePage, 1874).
+-define(wxNotebook_GetCurrentPage, 1875).
+-define(wxNotebook_GetImageList, 1876).
+-define(wxNotebook_GetPage, 1878).
+-define(wxNotebook_GetPageCount, 1879).
+-define(wxNotebook_GetPageImage, 1880).
+-define(wxNotebook_GetPageText, 1881).
+-define(wxNotebook_GetRowCount, 1882).
+-define(wxNotebook_GetSelection, 1883).
+-define(wxNotebook_GetThemeBackgroundColour, 1884).
+-define(wxNotebook_HitTest, 1886).
+-define(wxNotebook_InsertPage, 1888).
+-define(wxNotebook_SetImageList, 1889).
+-define(wxNotebook_SetPadding, 1890).
+-define(wxNotebook_SetPageSize, 1891).
+-define(wxNotebook_SetPageImage, 1892).
+-define(wxNotebook_SetPageText, 1893).
+-define(wxNotebook_SetSelection, 1894).
+-define(wxNotebook_ChangeSelection, 1895).
+-define(wxChoicebook_new_0, 1896).
+-define(wxChoicebook_new_3, 1897).
+-define(wxChoicebook_AddPage, 1898).
+-define(wxChoicebook_AdvanceSelection, 1899).
+-define(wxChoicebook_AssignImageList, 1900).
+-define(wxChoicebook_Create, 1901).
+-define(wxChoicebook_DeleteAllPages, 1902).
+-define(wxChoicebook_DeletePage, 1903).
+-define(wxChoicebook_RemovePage, 1904).
+-define(wxChoicebook_GetCurrentPage, 1905).
+-define(wxChoicebook_GetImageList, 1906).
+-define(wxChoicebook_GetPage, 1908).
+-define(wxChoicebook_GetPageCount, 1909).
+-define(wxChoicebook_GetPageImage, 1910).
+-define(wxChoicebook_GetPageText, 1911).
+-define(wxChoicebook_GetSelection, 1912).
+-define(wxChoicebook_HitTest, 1913).
+-define(wxChoicebook_InsertPage, 1914).
+-define(wxChoicebook_SetImageList, 1915).
+-define(wxChoicebook_SetPageSize, 1916).
+-define(wxChoicebook_SetPageImage, 1917).
+-define(wxChoicebook_SetPageText, 1918).
+-define(wxChoicebook_SetSelection, 1919).
+-define(wxChoicebook_ChangeSelection, 1920).
+-define(wxChoicebook_destroy, 1921).
+-define(wxToolbook_new_0, 1922).
+-define(wxToolbook_new_3, 1923).
+-define(wxToolbook_AddPage, 1924).
+-define(wxToolbook_AdvanceSelection, 1925).
+-define(wxToolbook_AssignImageList, 1926).
+-define(wxToolbook_Create, 1927).
+-define(wxToolbook_DeleteAllPages, 1928).
+-define(wxToolbook_DeletePage, 1929).
+-define(wxToolbook_RemovePage, 1930).
+-define(wxToolbook_GetCurrentPage, 1931).
+-define(wxToolbook_GetImageList, 1932).
+-define(wxToolbook_GetPage, 1934).
+-define(wxToolbook_GetPageCount, 1935).
+-define(wxToolbook_GetPageImage, 1936).
+-define(wxToolbook_GetPageText, 1937).
+-define(wxToolbook_GetSelection, 1938).
+-define(wxToolbook_HitTest, 1940).
+-define(wxToolbook_InsertPage, 1941).
+-define(wxToolbook_SetImageList, 1942).
+-define(wxToolbook_SetPageSize, 1943).
+-define(wxToolbook_SetPageImage, 1944).
+-define(wxToolbook_SetPageText, 1945).
+-define(wxToolbook_SetSelection, 1946).
+-define(wxToolbook_ChangeSelection, 1947).
+-define(wxToolbook_destroy, 1948).
+-define(wxListbook_new_0, 1949).
+-define(wxListbook_new_3, 1950).
+-define(wxListbook_AddPage, 1951).
+-define(wxListbook_AdvanceSelection, 1952).
+-define(wxListbook_AssignImageList, 1953).
+-define(wxListbook_Create, 1954).
+-define(wxListbook_DeleteAllPages, 1955).
+-define(wxListbook_DeletePage, 1956).
+-define(wxListbook_RemovePage, 1957).
+-define(wxListbook_GetCurrentPage, 1958).
+-define(wxListbook_GetImageList, 1959).
+-define(wxListbook_GetPage, 1961).
+-define(wxListbook_GetPageCount, 1962).
+-define(wxListbook_GetPageImage, 1963).
+-define(wxListbook_GetPageText, 1964).
+-define(wxListbook_GetSelection, 1965).
+-define(wxListbook_HitTest, 1967).
+-define(wxListbook_InsertPage, 1968).
+-define(wxListbook_SetImageList, 1969).
+-define(wxListbook_SetPageSize, 1970).
+-define(wxListbook_SetPageImage, 1971).
+-define(wxListbook_SetPageText, 1972).
+-define(wxListbook_SetSelection, 1973).
+-define(wxListbook_ChangeSelection, 1974).
+-define(wxListbook_destroy, 1975).
+-define(wxTreebook_new_0, 1976).
+-define(wxTreebook_new_3, 1977).
+-define(wxTreebook_AddPage, 1978).
+-define(wxTreebook_AdvanceSelection, 1979).
+-define(wxTreebook_AssignImageList, 1980).
+-define(wxTreebook_Create, 1981).
+-define(wxTreebook_DeleteAllPages, 1982).
+-define(wxTreebook_DeletePage, 1983).
+-define(wxTreebook_RemovePage, 1984).
+-define(wxTreebook_GetCurrentPage, 1985).
+-define(wxTreebook_GetImageList, 1986).
+-define(wxTreebook_GetPage, 1988).
+-define(wxTreebook_GetPageCount, 1989).
+-define(wxTreebook_GetPageImage, 1990).
+-define(wxTreebook_GetPageText, 1991).
+-define(wxTreebook_GetSelection, 1992).
+-define(wxTreebook_ExpandNode, 1993).
+-define(wxTreebook_IsNodeExpanded, 1994).
+-define(wxTreebook_HitTest, 1996).
+-define(wxTreebook_InsertPage, 1997).
+-define(wxTreebook_InsertSubPage, 1998).
+-define(wxTreebook_SetImageList, 1999).
+-define(wxTreebook_SetPageSize, 2000).
+-define(wxTreebook_SetPageImage, 2001).
+-define(wxTreebook_SetPageText, 2002).
+-define(wxTreebook_SetSelection, 2003).
+-define(wxTreebook_ChangeSelection, 2004).
+-define(wxTreebook_destroy, 2005).
+-define(wxTreeCtrl_new_2, 2008).
+-define(wxTreeCtrl_new_0, 2009).
+-define(wxTreeCtrl_destruct, 2011).
+-define(wxTreeCtrl_AddRoot, 2012).
+-define(wxTreeCtrl_AppendItem, 2013).
+-define(wxTreeCtrl_AssignImageList, 2014).
+-define(wxTreeCtrl_AssignStateImageList, 2015).
+-define(wxTreeCtrl_Collapse, 2016).
+-define(wxTreeCtrl_CollapseAndReset, 2017).
+-define(wxTreeCtrl_Create, 2018).
+-define(wxTreeCtrl_Delete, 2019).
+-define(wxTreeCtrl_DeleteAllItems, 2020).
+-define(wxTreeCtrl_DeleteChildren, 2021).
+-define(wxTreeCtrl_EditLabel, 2022).
+-define(wxTreeCtrl_EnsureVisible, 2023).
+-define(wxTreeCtrl_Expand, 2024).
+-define(wxTreeCtrl_GetBoundingRect, 2025).
+-define(wxTreeCtrl_GetChildrenCount, 2027).
+-define(wxTreeCtrl_GetCount, 2028).
+-define(wxTreeCtrl_GetEditControl, 2029).
+-define(wxTreeCtrl_GetFirstChild, 2030).
+-define(wxTreeCtrl_GetNextChild, 2031).
+-define(wxTreeCtrl_GetFirstVisibleItem, 2032).
+-define(wxTreeCtrl_GetImageList, 2033).
+-define(wxTreeCtrl_GetIndent, 2034).
+-define(wxTreeCtrl_GetItemBackgroundColour, 2035).
+-define(wxTreeCtrl_GetItemData, 2036).
+-define(wxTreeCtrl_GetItemFont, 2037).
+-define(wxTreeCtrl_GetItemImage_1, 2038).
+-define(wxTreeCtrl_GetItemImage_2, 2039).
+-define(wxTreeCtrl_GetItemText, 2040).
+-define(wxTreeCtrl_GetItemTextColour, 2041).
+-define(wxTreeCtrl_GetLastChild, 2042).
+-define(wxTreeCtrl_GetNextSibling, 2043).
+-define(wxTreeCtrl_GetNextVisible, 2044).
+-define(wxTreeCtrl_GetItemParent, 2045).
+-define(wxTreeCtrl_GetPrevSibling, 2046).
+-define(wxTreeCtrl_GetPrevVisible, 2047).
+-define(wxTreeCtrl_GetRootItem, 2048).
+-define(wxTreeCtrl_GetSelection, 2049).
+-define(wxTreeCtrl_GetSelections, 2050).
+-define(wxTreeCtrl_GetStateImageList, 2051).
+-define(wxTreeCtrl_HitTest, 2052).
+-define(wxTreeCtrl_InsertItem, 2054).
+-define(wxTreeCtrl_IsBold, 2055).
+-define(wxTreeCtrl_IsExpanded, 2056).
+-define(wxTreeCtrl_IsSelected, 2057).
+-define(wxTreeCtrl_IsVisible, 2058).
+-define(wxTreeCtrl_ItemHasChildren, 2059).
+-define(wxTreeCtrl_PrependItem, 2060).
+-define(wxTreeCtrl_ScrollTo, 2061).
+-define(wxTreeCtrl_SelectItem_1, 2062).
+-define(wxTreeCtrl_SelectItem_2, 2063).
+-define(wxTreeCtrl_SetIndent, 2064).
+-define(wxTreeCtrl_SetImageList, 2065).
+-define(wxTreeCtrl_SetItemBackgroundColour, 2066).
+-define(wxTreeCtrl_SetItemBold, 2067).
+-define(wxTreeCtrl_SetItemData, 2068).
+-define(wxTreeCtrl_SetItemDropHighlight, 2069).
+-define(wxTreeCtrl_SetItemFont, 2070).
+-define(wxTreeCtrl_SetItemHasChildren, 2071).
+-define(wxTreeCtrl_SetItemImage_2, 2072).
+-define(wxTreeCtrl_SetItemImage_3, 2073).
+-define(wxTreeCtrl_SetItemText, 2074).
+-define(wxTreeCtrl_SetItemTextColour, 2075).
+-define(wxTreeCtrl_SetStateImageList, 2076).
+-define(wxTreeCtrl_SetWindowStyle, 2077).
+-define(wxTreeCtrl_SortChildren, 2078).
+-define(wxTreeCtrl_Toggle, 2079).
+-define(wxTreeCtrl_ToggleItemSelection, 2080).
+-define(wxTreeCtrl_Unselect, 2081).
+-define(wxTreeCtrl_UnselectAll, 2082).
+-define(wxTreeCtrl_UnselectItem, 2083).
+-define(wxScrollBar_new_0, 2084).
+-define(wxScrollBar_new_3, 2085).
+-define(wxScrollBar_destruct, 2086).
+-define(wxScrollBar_Create, 2087).
+-define(wxScrollBar_GetRange, 2088).
+-define(wxScrollBar_GetPageSize, 2089).
+-define(wxScrollBar_GetThumbPosition, 2090).
+-define(wxScrollBar_GetThumbSize, 2091).
+-define(wxScrollBar_SetThumbPosition, 2092).
+-define(wxScrollBar_SetScrollbar, 2093).
+-define(wxSpinButton_new_2, 2095).
+-define(wxSpinButton_new_0, 2096).
+-define(wxSpinButton_Create, 2097).
+-define(wxSpinButton_GetMax, 2098).
+-define(wxSpinButton_GetMin, 2099).
+-define(wxSpinButton_GetValue, 2100).
+-define(wxSpinButton_SetRange, 2101).
+-define(wxSpinButton_SetValue, 2102).
+-define(wxSpinButton_destroy, 2103).
+-define(wxSpinCtrl_new_0, 2104).
+-define(wxSpinCtrl_new_2, 2105).
+-define(wxSpinCtrl_Create, 2107).
+-define(wxSpinCtrl_SetValue_1_1, 2110).
+-define(wxSpinCtrl_SetValue_1_0, 2111).
+-define(wxSpinCtrl_GetValue, 2113).
+-define(wxSpinCtrl_SetRange, 2115).
+-define(wxSpinCtrl_SetSelection, 2116).
+-define(wxSpinCtrl_GetMin, 2118).
+-define(wxSpinCtrl_GetMax, 2120).
+-define(wxSpinCtrl_destroy, 2121).
+-define(wxStaticText_new_0, 2122).
+-define(wxStaticText_new_4, 2123).
+-define(wxStaticText_Create, 2124).
+-define(wxStaticText_GetLabel, 2125).
+-define(wxStaticText_SetLabel, 2126).
+-define(wxStaticText_Wrap, 2127).
+-define(wxStaticText_destroy, 2128).
+-define(wxStaticBitmap_new_0, 2129).
+-define(wxStaticBitmap_new_4, 2130).
+-define(wxStaticBitmap_Create, 2131).
+-define(wxStaticBitmap_GetBitmap, 2132).
+-define(wxStaticBitmap_SetBitmap, 2133).
+-define(wxStaticBitmap_destroy, 2134).
+-define(wxRadioBox_new, 2135).
+-define(wxRadioBox_destruct, 2137).
+-define(wxRadioBox_Create, 2138).
+-define(wxRadioBox_Enable_2, 2139).
+-define(wxRadioBox_Enable_1, 2140).
+-define(wxRadioBox_GetSelection, 2141).
+-define(wxRadioBox_GetString, 2142).
+-define(wxRadioBox_SetSelection, 2143).
+-define(wxRadioBox_Show_2, 2144).
+-define(wxRadioBox_Show_1, 2145).
+-define(wxRadioBox_GetColumnCount, 2146).
+-define(wxRadioBox_GetItemHelpText, 2147).
+-define(wxRadioBox_GetItemToolTip, 2148).
+-define(wxRadioBox_GetItemFromPoint, 2150).
+-define(wxRadioBox_GetRowCount, 2151).
+-define(wxRadioBox_IsItemEnabled, 2152).
+-define(wxRadioBox_IsItemShown, 2153).
+-define(wxRadioBox_SetItemHelpText, 2154).
+-define(wxRadioBox_SetItemToolTip, 2155).
+-define(wxRadioButton_new_0, 2156).
+-define(wxRadioButton_new_4, 2157).
+-define(wxRadioButton_Create, 2158).
+-define(wxRadioButton_GetValue, 2159).
+-define(wxRadioButton_SetValue, 2160).
+-define(wxRadioButton_destroy, 2161).
+-define(wxSlider_new_6, 2163).
+-define(wxSlider_new_0, 2164).
+-define(wxSlider_Create, 2165).
+-define(wxSlider_GetLineSize, 2166).
+-define(wxSlider_GetMax, 2167).
+-define(wxSlider_GetMin, 2168).
+-define(wxSlider_GetPageSize, 2169).
+-define(wxSlider_GetThumbLength, 2170).
+-define(wxSlider_GetValue, 2171).
+-define(wxSlider_SetLineSize, 2172).
+-define(wxSlider_SetPageSize, 2173).
+-define(wxSlider_SetRange, 2174).
+-define(wxSlider_SetThumbLength, 2175).
+-define(wxSlider_SetValue, 2176).
+-define(wxSlider_destroy, 2177).
+-define(wxDialog_new_4, 2179).
+-define(wxDialog_new_0, 2180).
+-define(wxDialog_destruct, 2182).
+-define(wxDialog_Create, 2183).
+-define(wxDialog_CreateButtonSizer, 2184).
+-define(wxDialog_CreateStdDialogButtonSizer, 2185).
+-define(wxDialog_EndModal, 2186).
+-define(wxDialog_GetAffirmativeId, 2187).
+-define(wxDialog_GetReturnCode, 2188).
+-define(wxDialog_IsModal, 2189).
+-define(wxDialog_SetAffirmativeId, 2190).
+-define(wxDialog_SetReturnCode, 2191).
+-define(wxDialog_Show, 2192).
+-define(wxDialog_ShowModal, 2193).
+-define(wxColourDialog_new_0, 2194).
+-define(wxColourDialog_new_2, 2195).
+-define(wxColourDialog_destruct, 2196).
+-define(wxColourDialog_Create, 2197).
+-define(wxColourDialog_GetColourData, 2198).
+-define(wxColourData_new_0, 2199).
+-define(wxColourData_new_1, 2200).
+-define(wxColourData_destruct, 2201).
+-define(wxColourData_GetChooseFull, 2202).
+-define(wxColourData_GetColour, 2203).
+-define(wxColourData_GetCustomColour, 2205).
+-define(wxColourData_SetChooseFull, 2206).
+-define(wxColourData_SetColour, 2207).
+-define(wxColourData_SetCustomColour, 2208).
+-define(wxPalette_new_0, 2209).
+-define(wxPalette_new_4, 2210).
+-define(wxPalette_destruct, 2212).
+-define(wxPalette_Create, 2213).
+-define(wxPalette_GetColoursCount, 2214).
+-define(wxPalette_GetPixel, 2215).
+-define(wxPalette_GetRGB, 2216).
+-define(wxPalette_IsOk, 2217).
+-define(wxDirDialog_new, 2221).
+-define(wxDirDialog_destruct, 2222).
+-define(wxDirDialog_GetPath, 2223).
+-define(wxDirDialog_GetMessage, 2224).
+-define(wxDirDialog_SetMessage, 2225).
+-define(wxDirDialog_SetPath, 2226).
+-define(wxFileDialog_new, 2230).
+-define(wxFileDialog_destruct, 2231).
+-define(wxFileDialog_GetDirectory, 2232).
+-define(wxFileDialog_GetFilename, 2233).
+-define(wxFileDialog_GetFilenames, 2234).
+-define(wxFileDialog_GetFilterIndex, 2235).
+-define(wxFileDialog_GetMessage, 2236).
+-define(wxFileDialog_GetPath, 2237).
+-define(wxFileDialog_GetPaths, 2238).
+-define(wxFileDialog_GetWildcard, 2239).
+-define(wxFileDialog_SetDirectory, 2240).
+-define(wxFileDialog_SetFilename, 2241).
+-define(wxFileDialog_SetFilterIndex, 2242).
+-define(wxFileDialog_SetMessage, 2243).
+-define(wxFileDialog_SetPath, 2244).
+-define(wxFileDialog_SetWildcard, 2245).
+-define(wxPickerBase_SetInternalMargin, 2246).
+-define(wxPickerBase_GetInternalMargin, 2247).
+-define(wxPickerBase_SetTextCtrlProportion, 2248).
+-define(wxPickerBase_SetPickerCtrlProportion, 2249).
+-define(wxPickerBase_GetTextCtrlProportion, 2250).
+-define(wxPickerBase_GetPickerCtrlProportion, 2251).
+-define(wxPickerBase_HasTextCtrl, 2252).
+-define(wxPickerBase_GetTextCtrl, 2253).
+-define(wxPickerBase_IsTextCtrlGrowable, 2254).
+-define(wxPickerBase_SetPickerCtrlGrowable, 2255).
+-define(wxPickerBase_SetTextCtrlGrowable, 2256).
+-define(wxPickerBase_IsPickerCtrlGrowable, 2257).
+-define(wxFilePickerCtrl_new_0, 2258).
+-define(wxFilePickerCtrl_new_3, 2259).
+-define(wxFilePickerCtrl_Create, 2260).
+-define(wxFilePickerCtrl_GetPath, 2261).
+-define(wxFilePickerCtrl_SetPath, 2262).
+-define(wxFilePickerCtrl_destroy, 2263).
+-define(wxDirPickerCtrl_new_0, 2264).
+-define(wxDirPickerCtrl_new_3, 2265).
+-define(wxDirPickerCtrl_Create, 2266).
+-define(wxDirPickerCtrl_GetPath, 2267).
+-define(wxDirPickerCtrl_SetPath, 2268).
+-define(wxDirPickerCtrl_destroy, 2269).
+-define(wxColourPickerCtrl_new_0, 2270).
+-define(wxColourPickerCtrl_new_3, 2271).
+-define(wxColourPickerCtrl_Create, 2272).
+-define(wxColourPickerCtrl_GetColour, 2273).
+-define(wxColourPickerCtrl_SetColour_1_1, 2274).
+-define(wxColourPickerCtrl_SetColour_1_0, 2275).
+-define(wxColourPickerCtrl_destroy, 2276).
+-define(wxDatePickerCtrl_new_0, 2277).
+-define(wxDatePickerCtrl_new_3, 2278).
+-define(wxDatePickerCtrl_GetRange, 2279).
+-define(wxDatePickerCtrl_GetValue, 2280).
+-define(wxDatePickerCtrl_SetRange, 2281).
+-define(wxDatePickerCtrl_SetValue, 2282).
+-define(wxDatePickerCtrl_destroy, 2283).
+-define(wxFontPickerCtrl_new_0, 2284).
+-define(wxFontPickerCtrl_new_3, 2285).
+-define(wxFontPickerCtrl_Create, 2286).
+-define(wxFontPickerCtrl_GetSelectedFont, 2287).
+-define(wxFontPickerCtrl_SetSelectedFont, 2288).
+-define(wxFontPickerCtrl_GetMaxPointSize, 2289).
+-define(wxFontPickerCtrl_SetMaxPointSize, 2290).
+-define(wxFontPickerCtrl_destroy, 2291).
+-define(wxFindReplaceDialog_new_0, 2294).
+-define(wxFindReplaceDialog_new_4, 2295).
+-define(wxFindReplaceDialog_destruct, 2296).
+-define(wxFindReplaceDialog_Create, 2297).
+-define(wxFindReplaceDialog_GetData, 2298).
+-define(wxFindReplaceData_new_0, 2299).
+-define(wxFindReplaceData_new_1, 2300).
+-define(wxFindReplaceData_GetFindString, 2301).
+-define(wxFindReplaceData_GetReplaceString, 2302).
+-define(wxFindReplaceData_GetFlags, 2303).
+-define(wxFindReplaceData_SetFlags, 2304).
+-define(wxFindReplaceData_SetFindString, 2305).
+-define(wxFindReplaceData_SetReplaceString, 2306).
+-define(wxFindReplaceData_destroy, 2307).
+-define(wxMultiChoiceDialog_new_0, 2308).
+-define(wxMultiChoiceDialog_new_5, 2310).
+-define(wxMultiChoiceDialog_GetSelections, 2311).
+-define(wxMultiChoiceDialog_SetSelections, 2312).
+-define(wxMultiChoiceDialog_destroy, 2313).
+-define(wxSingleChoiceDialog_new_0, 2314).
+-define(wxSingleChoiceDialog_new_5, 2316).
+-define(wxSingleChoiceDialog_GetSelection, 2317).
+-define(wxSingleChoiceDialog_GetStringSelection, 2318).
+-define(wxSingleChoiceDialog_SetSelection, 2319).
+-define(wxSingleChoiceDialog_destroy, 2320).
+-define(wxTextEntryDialog_new, 2321).
+-define(wxTextEntryDialog_GetValue, 2322).
+-define(wxTextEntryDialog_SetValue, 2323).
+-define(wxTextEntryDialog_destroy, 2324).
+-define(wxPasswordEntryDialog_new, 2325).
+-define(wxPasswordEntryDialog_destroy, 2326).
+-define(wxFontData_new_0, 2327).
+-define(wxFontData_new_1, 2328).
+-define(wxFontData_destruct, 2329).
+-define(wxFontData_EnableEffects, 2330).
+-define(wxFontData_GetAllowSymbols, 2331).
+-define(wxFontData_GetColour, 2332).
+-define(wxFontData_GetChosenFont, 2333).
+-define(wxFontData_GetEnableEffects, 2334).
+-define(wxFontData_GetInitialFont, 2335).
+-define(wxFontData_GetShowHelp, 2336).
+-define(wxFontData_SetAllowSymbols, 2337).
+-define(wxFontData_SetChosenFont, 2338).
+-define(wxFontData_SetColour, 2339).
+-define(wxFontData_SetInitialFont, 2340).
+-define(wxFontData_SetRange, 2341).
+-define(wxFontData_SetShowHelp, 2342).
+-define(wxFontDialog_new_0, 2346).
+-define(wxFontDialog_new_2, 2348).
+-define(wxFontDialog_Create, 2350).
+-define(wxFontDialog_GetFontData, 2351).
+-define(wxFontDialog_destroy, 2353).
+-define(wxProgressDialog_new, 2354).
+-define(wxProgressDialog_destruct, 2355).
+-define(wxProgressDialog_Resume, 2356).
+-define(wxProgressDialog_Update_2, 2357).
+-define(wxProgressDialog_Update_0, 2358).
+-define(wxMessageDialog_new, 2359).
+-define(wxMessageDialog_destruct, 2360).
+-define(wxPageSetupDialog_new, 2361).
+-define(wxPageSetupDialog_destruct, 2362).
+-define(wxPageSetupDialog_GetPageSetupData, 2363).
+-define(wxPageSetupDialog_ShowModal, 2364).
+-define(wxPageSetupDialogData_new_0, 2365).
+-define(wxPageSetupDialogData_new_1_0, 2366).
+-define(wxPageSetupDialogData_new_1_1, 2367).
+-define(wxPageSetupDialogData_destruct, 2368).
+-define(wxPageSetupDialogData_EnableHelp, 2369).
+-define(wxPageSetupDialogData_EnableMargins, 2370).
+-define(wxPageSetupDialogData_EnableOrientation, 2371).
+-define(wxPageSetupDialogData_EnablePaper, 2372).
+-define(wxPageSetupDialogData_EnablePrinter, 2373).
+-define(wxPageSetupDialogData_GetDefaultMinMargins, 2374).
+-define(wxPageSetupDialogData_GetEnableMargins, 2375).
+-define(wxPageSetupDialogData_GetEnableOrientation, 2376).
+-define(wxPageSetupDialogData_GetEnablePaper, 2377).
+-define(wxPageSetupDialogData_GetEnablePrinter, 2378).
+-define(wxPageSetupDialogData_GetEnableHelp, 2379).
+-define(wxPageSetupDialogData_GetDefaultInfo, 2380).
+-define(wxPageSetupDialogData_GetMarginTopLeft, 2381).
+-define(wxPageSetupDialogData_GetMarginBottomRight, 2382).
+-define(wxPageSetupDialogData_GetMinMarginTopLeft, 2383).
+-define(wxPageSetupDialogData_GetMinMarginBottomRight, 2384).
+-define(wxPageSetupDialogData_GetPaperId, 2385).
+-define(wxPageSetupDialogData_GetPaperSize, 2386).
+-define(wxPageSetupDialogData_GetPrintData, 2388).
+-define(wxPageSetupDialogData_IsOk, 2389).
+-define(wxPageSetupDialogData_SetDefaultInfo, 2390).
+-define(wxPageSetupDialogData_SetDefaultMinMargins, 2391).
+-define(wxPageSetupDialogData_SetMarginTopLeft, 2392).
+-define(wxPageSetupDialogData_SetMarginBottomRight, 2393).
+-define(wxPageSetupDialogData_SetMinMarginTopLeft, 2394).
+-define(wxPageSetupDialogData_SetMinMarginBottomRight, 2395).
+-define(wxPageSetupDialogData_SetPaperId, 2396).
+-define(wxPageSetupDialogData_SetPaperSize_1_1, 2397).
+-define(wxPageSetupDialogData_SetPaperSize_1_0, 2398).
+-define(wxPageSetupDialogData_SetPrintData, 2399).
+-define(wxPrintDialog_new_2_0, 2400).
+-define(wxPrintDialog_new_2_1, 2401).
+-define(wxPrintDialog_destruct, 2402).
+-define(wxPrintDialog_GetPrintDialogData, 2403).
+-define(wxPrintDialog_GetPrintDC, 2404).
+-define(wxPrintDialogData_new_0, 2405).
+-define(wxPrintDialogData_new_1_1, 2406).
+-define(wxPrintDialogData_new_1_0, 2407).
+-define(wxPrintDialogData_destruct, 2408).
+-define(wxPrintDialogData_EnableHelp, 2409).
+-define(wxPrintDialogData_EnablePageNumbers, 2410).
+-define(wxPrintDialogData_EnablePrintToFile, 2411).
+-define(wxPrintDialogData_EnableSelection, 2412).
+-define(wxPrintDialogData_GetAllPages, 2413).
+-define(wxPrintDialogData_GetCollate, 2414).
+-define(wxPrintDialogData_GetFromPage, 2415).
+-define(wxPrintDialogData_GetMaxPage, 2416).
+-define(wxPrintDialogData_GetMinPage, 2417).
+-define(wxPrintDialogData_GetNoCopies, 2418).
+-define(wxPrintDialogData_GetPrintData, 2419).
+-define(wxPrintDialogData_GetPrintToFile, 2420).
+-define(wxPrintDialogData_GetSelection, 2421).
+-define(wxPrintDialogData_GetToPage, 2422).
+-define(wxPrintDialogData_IsOk, 2423).
+-define(wxPrintDialogData_SetCollate, 2424).
+-define(wxPrintDialogData_SetFromPage, 2425).
+-define(wxPrintDialogData_SetMaxPage, 2426).
+-define(wxPrintDialogData_SetMinPage, 2427).
+-define(wxPrintDialogData_SetNoCopies, 2428).
+-define(wxPrintDialogData_SetPrintData, 2429).
+-define(wxPrintDialogData_SetPrintToFile, 2430).
+-define(wxPrintDialogData_SetSelection, 2431).
+-define(wxPrintDialogData_SetToPage, 2432).
+-define(wxPrintData_new_0, 2433).
+-define(wxPrintData_new_1, 2434).
+-define(wxPrintData_destruct, 2435).
+-define(wxPrintData_GetCollate, 2436).
+-define(wxPrintData_GetBin, 2437).
+-define(wxPrintData_GetColour, 2438).
+-define(wxPrintData_GetDuplex, 2439).
+-define(wxPrintData_GetNoCopies, 2440).
+-define(wxPrintData_GetOrientation, 2441).
+-define(wxPrintData_GetPaperId, 2442).
+-define(wxPrintData_GetPrinterName, 2443).
+-define(wxPrintData_GetQuality, 2444).
+-define(wxPrintData_IsOk, 2445).
+-define(wxPrintData_SetBin, 2446).
+-define(wxPrintData_SetCollate, 2447).
+-define(wxPrintData_SetColour, 2448).
+-define(wxPrintData_SetDuplex, 2449).
+-define(wxPrintData_SetNoCopies, 2450).
+-define(wxPrintData_SetOrientation, 2451).
+-define(wxPrintData_SetPaperId, 2452).
+-define(wxPrintData_SetPrinterName, 2453).
+-define(wxPrintData_SetQuality, 2454).
+-define(wxPrintPreview_new_2, 2457).
+-define(wxPrintPreview_new_3, 2458).
+-define(wxPrintPreview_destruct, 2460).
+-define(wxPrintPreview_GetCanvas, 2461).
+-define(wxPrintPreview_GetCurrentPage, 2462).
+-define(wxPrintPreview_GetFrame, 2463).
+-define(wxPrintPreview_GetMaxPage, 2464).
+-define(wxPrintPreview_GetMinPage, 2465).
+-define(wxPrintPreview_GetPrintout, 2466).
+-define(wxPrintPreview_GetPrintoutForPrinting, 2467).
+-define(wxPrintPreview_IsOk, 2468).
+-define(wxPrintPreview_PaintPage, 2469).
+-define(wxPrintPreview_Print, 2470).
+-define(wxPrintPreview_RenderPage, 2471).
+-define(wxPrintPreview_SetCanvas, 2472).
+-define(wxPrintPreview_SetCurrentPage, 2473).
+-define(wxPrintPreview_SetFrame, 2474).
+-define(wxPrintPreview_SetPrintout, 2475).
+-define(wxPrintPreview_SetZoom, 2476).
+-define(wxPreviewFrame_new, 2477).
+-define(wxPreviewFrame_destruct, 2478).
+-define(wxPreviewFrame_CreateControlBar, 2479).
+-define(wxPreviewFrame_CreateCanvas, 2480).
+-define(wxPreviewFrame_Initialize, 2481).
+-define(wxPreviewFrame_OnCloseWindow, 2482).
+-define(wxPreviewControlBar_new, 2483).
+-define(wxPreviewControlBar_destruct, 2484).
+-define(wxPreviewControlBar_CreateButtons, 2485).
+-define(wxPreviewControlBar_GetPrintPreview, 2486).
+-define(wxPreviewControlBar_GetZoomControl, 2487).
+-define(wxPreviewControlBar_SetZoomControl, 2488).
+-define(wxPrinter_new, 2490).
+-define(wxPrinter_CreateAbortWindow, 2491).
+-define(wxPrinter_GetAbort, 2492).
+-define(wxPrinter_GetLastError, 2493).
+-define(wxPrinter_GetPrintDialogData, 2494).
+-define(wxPrinter_Print, 2495).
+-define(wxPrinter_PrintDialog, 2496).
+-define(wxPrinter_ReportError, 2497).
+-define(wxPrinter_Setup, 2498).
+-define(wxPrinter_destroy, 2499).
+-define(wxXmlResource_new_1, 2500).
+-define(wxXmlResource_new_2, 2501).
+-define(wxXmlResource_destruct, 2502).
+-define(wxXmlResource_AttachUnknownControl, 2503).
+-define(wxXmlResource_ClearHandlers, 2504).
+-define(wxXmlResource_CompareVersion, 2505).
+-define(wxXmlResource_Get, 2506).
+-define(wxXmlResource_GetFlags, 2507).
+-define(wxXmlResource_GetVersion, 2508).
+-define(wxXmlResource_GetXRCID, 2509).
+-define(wxXmlResource_InitAllHandlers, 2510).
+-define(wxXmlResource_Load, 2511).
+-define(wxXmlResource_LoadBitmap, 2512).
+-define(wxXmlResource_LoadDialog_2, 2513).
+-define(wxXmlResource_LoadDialog_3, 2514).
+-define(wxXmlResource_LoadFrame_2, 2515).
+-define(wxXmlResource_LoadFrame_3, 2516).
+-define(wxXmlResource_LoadIcon, 2517).
+-define(wxXmlResource_LoadMenu, 2518).
+-define(wxXmlResource_LoadMenuBar_2, 2519).
+-define(wxXmlResource_LoadMenuBar_1, 2520).
+-define(wxXmlResource_LoadPanel_2, 2521).
+-define(wxXmlResource_LoadPanel_3, 2522).
+-define(wxXmlResource_LoadToolBar, 2523).
+-define(wxXmlResource_Set, 2524).
+-define(wxXmlResource_SetFlags, 2525).
+-define(wxXmlResource_Unload, 2526).
+-define(wxXmlResource_xrcctrl, 2527).
+-define(wxHtmlEasyPrinting_new, 2528).
+-define(wxHtmlEasyPrinting_destruct, 2529).
+-define(wxHtmlEasyPrinting_GetPrintData, 2530).
+-define(wxHtmlEasyPrinting_GetPageSetupData, 2531).
+-define(wxHtmlEasyPrinting_PreviewFile, 2532).
+-define(wxHtmlEasyPrinting_PreviewText, 2533).
+-define(wxHtmlEasyPrinting_PrintFile, 2534).
+-define(wxHtmlEasyPrinting_PrintText, 2535).
+-define(wxHtmlEasyPrinting_PageSetup, 2536).
+-define(wxHtmlEasyPrinting_SetFonts, 2537).
+-define(wxHtmlEasyPrinting_SetHeader, 2538).
+-define(wxHtmlEasyPrinting_SetFooter, 2539).
+-define(wxGLCanvas_new_2, 2541).
+-define(wxGLCanvas_new_3_1, 2542).
+-define(wxGLCanvas_new_3_0, 2543).
+-define(wxGLCanvas_GetContext, 2544).
+-define(wxGLCanvas_SetCurrent, 2546).
+-define(wxGLCanvas_SwapBuffers, 2547).
+-define(wxGLCanvas_destroy, 2548).
+-define(wxAuiManager_new, 2549).
+-define(wxAuiManager_destruct, 2550).
+-define(wxAuiManager_AddPane_2_1, 2551).
+-define(wxAuiManager_AddPane_3, 2552).
+-define(wxAuiManager_AddPane_2_0, 2553).
+-define(wxAuiManager_DetachPane, 2554).
+-define(wxAuiManager_GetAllPanes, 2555).
+-define(wxAuiManager_GetArtProvider, 2556).
+-define(wxAuiManager_GetDockSizeConstraint, 2557).
+-define(wxAuiManager_GetFlags, 2558).
+-define(wxAuiManager_GetManagedWindow, 2559).
+-define(wxAuiManager_GetManager, 2560).
+-define(wxAuiManager_GetPane_1_1, 2561).
+-define(wxAuiManager_GetPane_1_0, 2562).
+-define(wxAuiManager_HideHint, 2563).
+-define(wxAuiManager_InsertPane, 2564).
+-define(wxAuiManager_LoadPaneInfo, 2565).
+-define(wxAuiManager_LoadPerspective, 2566).
+-define(wxAuiManager_SavePaneInfo, 2567).
+-define(wxAuiManager_SavePerspective, 2568).
+-define(wxAuiManager_SetArtProvider, 2569).
+-define(wxAuiManager_SetDockSizeConstraint, 2570).
+-define(wxAuiManager_SetFlags, 2571).
+-define(wxAuiManager_SetManagedWindow, 2572).
+-define(wxAuiManager_ShowHint, 2573).
+-define(wxAuiManager_UnInit, 2574).
+-define(wxAuiManager_Update, 2575).
+-define(wxAuiPaneInfo_new_0, 2576).
+-define(wxAuiPaneInfo_new_1, 2577).
+-define(wxAuiPaneInfo_destruct, 2578).
+-define(wxAuiPaneInfo_BestSize_1, 2579).
+-define(wxAuiPaneInfo_BestSize_2, 2580).
+-define(wxAuiPaneInfo_Bottom, 2581).
+-define(wxAuiPaneInfo_BottomDockable, 2582).
+-define(wxAuiPaneInfo_Caption, 2583).
+-define(wxAuiPaneInfo_CaptionVisible, 2584).
+-define(wxAuiPaneInfo_Centre, 2585).
+-define(wxAuiPaneInfo_CentrePane, 2586).
+-define(wxAuiPaneInfo_CloseButton, 2587).
+-define(wxAuiPaneInfo_DefaultPane, 2588).
+-define(wxAuiPaneInfo_DestroyOnClose, 2589).
+-define(wxAuiPaneInfo_Direction, 2590).
+-define(wxAuiPaneInfo_Dock, 2591).
+-define(wxAuiPaneInfo_Dockable, 2592).
+-define(wxAuiPaneInfo_Fixed, 2593).
+-define(wxAuiPaneInfo_Float, 2594).
+-define(wxAuiPaneInfo_Floatable, 2595).
+-define(wxAuiPaneInfo_FloatingPosition_1, 2596).
+-define(wxAuiPaneInfo_FloatingPosition_2, 2597).
+-define(wxAuiPaneInfo_FloatingSize_1, 2598).
+-define(wxAuiPaneInfo_FloatingSize_2, 2599).
+-define(wxAuiPaneInfo_Gripper, 2600).
+-define(wxAuiPaneInfo_GripperTop, 2601).
+-define(wxAuiPaneInfo_HasBorder, 2602).
+-define(wxAuiPaneInfo_HasCaption, 2603).
+-define(wxAuiPaneInfo_HasCloseButton, 2604).
+-define(wxAuiPaneInfo_HasFlag, 2605).
+-define(wxAuiPaneInfo_HasGripper, 2606).
+-define(wxAuiPaneInfo_HasGripperTop, 2607).
+-define(wxAuiPaneInfo_HasMaximizeButton, 2608).
+-define(wxAuiPaneInfo_HasMinimizeButton, 2609).
+-define(wxAuiPaneInfo_HasPinButton, 2610).
+-define(wxAuiPaneInfo_Hide, 2611).
+-define(wxAuiPaneInfo_IsBottomDockable, 2612).
+-define(wxAuiPaneInfo_IsDocked, 2613).
+-define(wxAuiPaneInfo_IsFixed, 2614).
+-define(wxAuiPaneInfo_IsFloatable, 2615).
+-define(wxAuiPaneInfo_IsFloating, 2616).
+-define(wxAuiPaneInfo_IsLeftDockable, 2617).
+-define(wxAuiPaneInfo_IsMovable, 2618).
+-define(wxAuiPaneInfo_IsOk, 2619).
+-define(wxAuiPaneInfo_IsResizable, 2620).
+-define(wxAuiPaneInfo_IsRightDockable, 2621).
+-define(wxAuiPaneInfo_IsShown, 2622).
+-define(wxAuiPaneInfo_IsToolbar, 2623).
+-define(wxAuiPaneInfo_IsTopDockable, 2624).
+-define(wxAuiPaneInfo_Layer, 2625).
+-define(wxAuiPaneInfo_Left, 2626).
+-define(wxAuiPaneInfo_LeftDockable, 2627).
+-define(wxAuiPaneInfo_MaxSize_1, 2628).
+-define(wxAuiPaneInfo_MaxSize_2, 2629).
+-define(wxAuiPaneInfo_MaximizeButton, 2630).
+-define(wxAuiPaneInfo_MinSize_1, 2631).
+-define(wxAuiPaneInfo_MinSize_2, 2632).
+-define(wxAuiPaneInfo_MinimizeButton, 2633).
+-define(wxAuiPaneInfo_Movable, 2634).
+-define(wxAuiPaneInfo_Name, 2635).
+-define(wxAuiPaneInfo_PaneBorder, 2636).
+-define(wxAuiPaneInfo_PinButton, 2637).
+-define(wxAuiPaneInfo_Position, 2638).
+-define(wxAuiPaneInfo_Resizable, 2639).
+-define(wxAuiPaneInfo_Right, 2640).
+-define(wxAuiPaneInfo_RightDockable, 2641).
+-define(wxAuiPaneInfo_Row, 2642).
+-define(wxAuiPaneInfo_SafeSet, 2643).
+-define(wxAuiPaneInfo_SetFlag, 2644).
+-define(wxAuiPaneInfo_Show, 2645).
+-define(wxAuiPaneInfo_ToolbarPane, 2646).
+-define(wxAuiPaneInfo_Top, 2647).
+-define(wxAuiPaneInfo_TopDockable, 2648).
+-define(wxAuiPaneInfo_Window, 2649).
+-define(wxAuiNotebook_new_0, 2650).
+-define(wxAuiNotebook_new_2, 2651).
+-define(wxAuiNotebook_AddPage, 2652).
+-define(wxAuiNotebook_Create, 2653).
+-define(wxAuiNotebook_DeletePage, 2654).
+-define(wxAuiNotebook_GetArtProvider, 2655).
+-define(wxAuiNotebook_GetPage, 2656).
+-define(wxAuiNotebook_GetPageBitmap, 2657).
+-define(wxAuiNotebook_GetPageCount, 2658).
+-define(wxAuiNotebook_GetPageIndex, 2659).
+-define(wxAuiNotebook_GetPageText, 2660).
+-define(wxAuiNotebook_GetSelection, 2661).
+-define(wxAuiNotebook_InsertPage, 2662).
+-define(wxAuiNotebook_RemovePage, 2663).
+-define(wxAuiNotebook_SetArtProvider, 2664).
+-define(wxAuiNotebook_SetFont, 2665).
+-define(wxAuiNotebook_SetPageBitmap, 2666).
+-define(wxAuiNotebook_SetPageText, 2667).
+-define(wxAuiNotebook_SetSelection, 2668).
+-define(wxAuiNotebook_SetTabCtrlHeight, 2669).
+-define(wxAuiNotebook_SetUniformBitmapSize, 2670).
+-define(wxAuiNotebook_destroy, 2671).
+-define(wxMDIParentFrame_new_0, 2672).
+-define(wxMDIParentFrame_new_4, 2673).
+-define(wxMDIParentFrame_destruct, 2674).
+-define(wxMDIParentFrame_ActivateNext, 2675).
+-define(wxMDIParentFrame_ActivatePrevious, 2676).
+-define(wxMDIParentFrame_ArrangeIcons, 2677).
+-define(wxMDIParentFrame_Cascade, 2678).
+-define(wxMDIParentFrame_Create, 2679).
+-define(wxMDIParentFrame_GetActiveChild, 2680).
+-define(wxMDIParentFrame_GetClientWindow, 2681).
+-define(wxMDIParentFrame_Tile, 2682).
+-define(wxMDIChildFrame_new_0, 2683).
+-define(wxMDIChildFrame_new_4, 2684).
+-define(wxMDIChildFrame_destruct, 2685).
+-define(wxMDIChildFrame_Activate, 2686).
+-define(wxMDIChildFrame_Create, 2687).
+-define(wxMDIChildFrame_Maximize, 2688).
+-define(wxMDIChildFrame_Restore, 2689).
+-define(wxMDIClientWindow_new_0, 2690).
+-define(wxMDIClientWindow_new_2, 2691).
+-define(wxMDIClientWindow_destruct, 2692).
+-define(wxMDIClientWindow_CreateClient, 2693).
+-define(wxLayoutAlgorithm_new, 2694).
+-define(wxLayoutAlgorithm_LayoutFrame, 2695).
+-define(wxLayoutAlgorithm_LayoutMDIFrame, 2696).
+-define(wxLayoutAlgorithm_LayoutWindow, 2697).
+-define(wxLayoutAlgorithm_destroy, 2698).
+-define(wxEvent_GetId, 2699).
+-define(wxEvent_GetSkipped, 2700).
+-define(wxEvent_GetTimestamp, 2701).
+-define(wxEvent_IsCommandEvent, 2702).
+-define(wxEvent_ResumePropagation, 2703).
+-define(wxEvent_ShouldPropagate, 2704).
+-define(wxEvent_Skip, 2705).
+-define(wxEvent_StopPropagation, 2706).
+-define(wxCommandEvent_getClientData, 2707).
+-define(wxCommandEvent_GetExtraLong, 2708).
+-define(wxCommandEvent_GetInt, 2709).
+-define(wxCommandEvent_GetSelection, 2710).
+-define(wxCommandEvent_GetString, 2711).
+-define(wxCommandEvent_IsChecked, 2712).
+-define(wxCommandEvent_IsSelection, 2713).
+-define(wxCommandEvent_SetInt, 2714).
+-define(wxCommandEvent_SetString, 2715).
+-define(wxScrollEvent_GetOrientation, 2716).
+-define(wxScrollEvent_GetPosition, 2717).
+-define(wxScrollWinEvent_GetOrientation, 2718).
+-define(wxScrollWinEvent_GetPosition, 2719).
+-define(wxMouseEvent_AltDown, 2720).
+-define(wxMouseEvent_Button, 2721).
+-define(wxMouseEvent_ButtonDClick, 2722).
+-define(wxMouseEvent_ButtonDown, 2723).
+-define(wxMouseEvent_ButtonUp, 2724).
+-define(wxMouseEvent_CmdDown, 2725).
+-define(wxMouseEvent_ControlDown, 2726).
+-define(wxMouseEvent_Dragging, 2727).
+-define(wxMouseEvent_Entering, 2728).
+-define(wxMouseEvent_GetButton, 2729).
+-define(wxMouseEvent_GetPosition, 2732).
+-define(wxMouseEvent_GetLogicalPosition, 2733).
+-define(wxMouseEvent_GetLinesPerAction, 2734).
+-define(wxMouseEvent_GetWheelRotation, 2735).
+-define(wxMouseEvent_GetWheelDelta, 2736).
+-define(wxMouseEvent_GetX, 2737).
+-define(wxMouseEvent_GetY, 2738).
+-define(wxMouseEvent_IsButton, 2739).
+-define(wxMouseEvent_IsPageScroll, 2740).
+-define(wxMouseEvent_Leaving, 2741).
+-define(wxMouseEvent_LeftDClick, 2742).
+-define(wxMouseEvent_LeftDown, 2743).
+-define(wxMouseEvent_LeftIsDown, 2744).
+-define(wxMouseEvent_LeftUp, 2745).
+-define(wxMouseEvent_MetaDown, 2746).
+-define(wxMouseEvent_MiddleDClick, 2747).
+-define(wxMouseEvent_MiddleDown, 2748).
+-define(wxMouseEvent_MiddleIsDown, 2749).
+-define(wxMouseEvent_MiddleUp, 2750).
+-define(wxMouseEvent_Moving, 2751).
+-define(wxMouseEvent_RightDClick, 2752).
+-define(wxMouseEvent_RightDown, 2753).
+-define(wxMouseEvent_RightIsDown, 2754).
+-define(wxMouseEvent_RightUp, 2755).
+-define(wxMouseEvent_ShiftDown, 2756).
+-define(wxSetCursorEvent_GetCursor, 2757).
+-define(wxSetCursorEvent_GetX, 2758).
+-define(wxSetCursorEvent_GetY, 2759).
+-define(wxSetCursorEvent_HasCursor, 2760).
+-define(wxSetCursorEvent_SetCursor, 2761).
+-define(wxKeyEvent_AltDown, 2762).
+-define(wxKeyEvent_CmdDown, 2763).
+-define(wxKeyEvent_ControlDown, 2764).
+-define(wxKeyEvent_GetKeyCode, 2765).
+-define(wxKeyEvent_GetModifiers, 2766).
+-define(wxKeyEvent_GetPosition, 2769).
+-define(wxKeyEvent_GetRawKeyCode, 2770).
+-define(wxKeyEvent_GetRawKeyFlags, 2771).
+-define(wxKeyEvent_GetUnicodeKey, 2772).
+-define(wxKeyEvent_GetX, 2773).
+-define(wxKeyEvent_GetY, 2774).
+-define(wxKeyEvent_HasModifiers, 2775).
+-define(wxKeyEvent_MetaDown, 2776).
+-define(wxKeyEvent_ShiftDown, 2777).
+-define(wxSizeEvent_GetSize, 2778).
+-define(wxMoveEvent_GetPosition, 2779).
+-define(wxEraseEvent_GetDC, 2780).
+-define(wxFocusEvent_GetWindow, 2781).
+-define(wxChildFocusEvent_GetWindow, 2782).
+-define(wxMenuEvent_GetMenu, 2783).
+-define(wxMenuEvent_GetMenuId, 2784).
+-define(wxMenuEvent_IsPopup, 2785).
+-define(wxCloseEvent_CanVeto, 2786).
+-define(wxCloseEvent_GetLoggingOff, 2787).
+-define(wxCloseEvent_SetCanVeto, 2788).
+-define(wxCloseEvent_SetLoggingOff, 2789).
+-define(wxCloseEvent_Veto, 2790).
+-define(wxShowEvent_SetShow, 2791).
+-define(wxShowEvent_GetShow, 2792).
+-define(wxIconizeEvent_Iconized, 2793).
+-define(wxJoystickEvent_ButtonDown, 2794).
+-define(wxJoystickEvent_ButtonIsDown, 2795).
+-define(wxJoystickEvent_ButtonUp, 2796).
+-define(wxJoystickEvent_GetButtonChange, 2797).
+-define(wxJoystickEvent_GetButtonState, 2798).
+-define(wxJoystickEvent_GetJoystick, 2799).
+-define(wxJoystickEvent_GetPosition, 2800).
+-define(wxJoystickEvent_GetZPosition, 2801).
+-define(wxJoystickEvent_IsButton, 2802).
+-define(wxJoystickEvent_IsMove, 2803).
+-define(wxJoystickEvent_IsZMove, 2804).
+-define(wxUpdateUIEvent_CanUpdate, 2805).
+-define(wxUpdateUIEvent_Check, 2806).
+-define(wxUpdateUIEvent_Enable, 2807).
+-define(wxUpdateUIEvent_Show, 2808).
+-define(wxUpdateUIEvent_GetChecked, 2809).
+-define(wxUpdateUIEvent_GetEnabled, 2810).
+-define(wxUpdateUIEvent_GetShown, 2811).
+-define(wxUpdateUIEvent_GetSetChecked, 2812).
+-define(wxUpdateUIEvent_GetSetEnabled, 2813).
+-define(wxUpdateUIEvent_GetSetShown, 2814).
+-define(wxUpdateUIEvent_GetSetText, 2815).
+-define(wxUpdateUIEvent_GetText, 2816).
+-define(wxUpdateUIEvent_GetMode, 2817).
+-define(wxUpdateUIEvent_GetUpdateInterval, 2818).
+-define(wxUpdateUIEvent_ResetUpdateTime, 2819).
+-define(wxUpdateUIEvent_SetMode, 2820).
+-define(wxUpdateUIEvent_SetText, 2821).
+-define(wxUpdateUIEvent_SetUpdateInterval, 2822).
+-define(wxMouseCaptureChangedEvent_GetCapturedWindow, 2823).
+-define(wxPaletteChangedEvent_SetChangedWindow, 2824).
+-define(wxPaletteChangedEvent_GetChangedWindow, 2825).
+-define(wxQueryNewPaletteEvent_SetPaletteRealized, 2826).
+-define(wxQueryNewPaletteEvent_GetPaletteRealized, 2827).
+-define(wxNavigationKeyEvent_GetDirection, 2828).
+-define(wxNavigationKeyEvent_SetDirection, 2829).
+-define(wxNavigationKeyEvent_IsWindowChange, 2830).
+-define(wxNavigationKeyEvent_SetWindowChange, 2831).
+-define(wxNavigationKeyEvent_IsFromTab, 2832).
+-define(wxNavigationKeyEvent_SetFromTab, 2833).
+-define(wxNavigationKeyEvent_GetCurrentFocus, 2834).
+-define(wxNavigationKeyEvent_SetCurrentFocus, 2835).
+-define(wxHelpEvent_GetOrigin, 2836).
+-define(wxHelpEvent_GetPosition, 2837).
+-define(wxHelpEvent_SetOrigin, 2838).
+-define(wxHelpEvent_SetPosition, 2839).
+-define(wxContextMenuEvent_GetPosition, 2840).
+-define(wxContextMenuEvent_SetPosition, 2841).
+-define(wxIdleEvent_CanSend, 2842).
+-define(wxIdleEvent_GetMode, 2843).
+-define(wxIdleEvent_RequestMore, 2844).
+-define(wxIdleEvent_MoreRequested, 2845).
+-define(wxIdleEvent_SetMode, 2846).
+-define(wxGridEvent_AltDown, 2847).
+-define(wxGridEvent_ControlDown, 2848).
+-define(wxGridEvent_GetCol, 2849).
+-define(wxGridEvent_GetPosition, 2850).
+-define(wxGridEvent_GetRow, 2851).
+-define(wxGridEvent_MetaDown, 2852).
+-define(wxGridEvent_Selecting, 2853).
+-define(wxGridEvent_ShiftDown, 2854).
+-define(wxNotifyEvent_Allow, 2855).
+-define(wxNotifyEvent_IsAllowed, 2856).
+-define(wxNotifyEvent_Veto, 2857).
+-define(wxSashEvent_GetEdge, 2858).
+-define(wxSashEvent_GetDragRect, 2859).
+-define(wxSashEvent_GetDragStatus, 2860).
+-define(wxListEvent_GetCacheFrom, 2861).
+-define(wxListEvent_GetCacheTo, 2862).
+-define(wxListEvent_GetKeyCode, 2863).
+-define(wxListEvent_GetIndex, 2864).
+-define(wxListEvent_GetColumn, 2865).
+-define(wxListEvent_GetPoint, 2866).
+-define(wxListEvent_GetLabel, 2867).
+-define(wxListEvent_GetText, 2868).
+-define(wxListEvent_GetImage, 2869).
+-define(wxListEvent_GetData, 2870).
+-define(wxListEvent_GetMask, 2871).
+-define(wxListEvent_GetItem, 2872).
+-define(wxListEvent_IsEditCancelled, 2873).
+-define(wxDateEvent_GetDate, 2874).
+-define(wxCalendarEvent_GetWeekDay, 2875).
+-define(wxFileDirPickerEvent_GetPath, 2876).
+-define(wxColourPickerEvent_GetColour, 2877).
+-define(wxFontPickerEvent_GetFont, 2878).
+-define(wxStyledTextEvent_GetPosition, 2879).
+-define(wxStyledTextEvent_GetKey, 2880).
+-define(wxStyledTextEvent_GetModifiers, 2881).
+-define(wxStyledTextEvent_GetModificationType, 2882).
+-define(wxStyledTextEvent_GetText, 2883).
+-define(wxStyledTextEvent_GetLength, 2884).
+-define(wxStyledTextEvent_GetLinesAdded, 2885).
+-define(wxStyledTextEvent_GetLine, 2886).
+-define(wxStyledTextEvent_GetFoldLevelNow, 2887).
+-define(wxStyledTextEvent_GetFoldLevelPrev, 2888).
+-define(wxStyledTextEvent_GetMargin, 2889).
+-define(wxStyledTextEvent_GetMessage, 2890).
+-define(wxStyledTextEvent_GetWParam, 2891).
+-define(wxStyledTextEvent_GetLParam, 2892).
+-define(wxStyledTextEvent_GetListType, 2893).
+-define(wxStyledTextEvent_GetX, 2894).
+-define(wxStyledTextEvent_GetY, 2895).
+-define(wxStyledTextEvent_GetDragText, 2896).
+-define(wxStyledTextEvent_GetDragAllowMove, 2897).
+-define(wxStyledTextEvent_GetDragResult, 2898).
+-define(wxStyledTextEvent_GetShift, 2899).
+-define(wxStyledTextEvent_GetControl, 2900).
+-define(wxStyledTextEvent_GetAlt, 2901).
+-define(utils_wxGetKeyState, 2902).
+-define(utils_wxGetMousePosition, 2903).
+-define(utils_wxGetMouseState, 2904).
+-define(utils_wxSetDetectableAutoRepeat, 2905).
+-define(utils_wxBell, 2906).
+-define(utils_wxFindMenuItemId, 2907).
+-define(utils_wxGenericFindWindowAtPoint, 2908).
+-define(utils_wxFindWindowAtPoint, 2909).
+-define(utils_wxBeginBusyCursor, 2910).
+-define(utils_wxEndBusyCursor, 2911).
+-define(utils_wxIsBusy, 2912).
+-define(utils_wxShutdown, 2913).
+-define(utils_wxShell, 2914).
+-define(utils_wxLaunchDefaultBrowser, 2915).
+-define(utils_wxGetEmailAddress, 2916).
+-define(utils_wxGetUserId, 2917).
+-define(utils_wxGetHomeDir, 2918).
+-define(utils_wxNewId, 2919).
+-define(utils_wxRegisterId, 2920).
+-define(utils_wxGetCurrentId, 2921).
+-define(utils_wxGetOsDescription, 2922).
+-define(utils_wxIsPlatformLittleEndian, 2923).
+-define(utils_wxIsPlatform64Bit, 2924).
+-define(wxPrintout_new, 2925).
+-define(wxPrintout_destruct, 2926).
+-define(wxPrintout_GetDC, 2927).
+-define(wxPrintout_GetPageSizeMM, 2928).
+-define(wxPrintout_GetPageSizePixels, 2929).
+-define(wxPrintout_GetPaperRectPixels, 2930).
+-define(wxPrintout_GetPPIPrinter, 2931).
+-define(wxPrintout_GetPPIScreen, 2932).
+-define(wxPrintout_GetTitle, 2933).
+-define(wxPrintout_IsPreview, 2934).
+-define(wxPrintout_FitThisSizeToPaper, 2935).
+-define(wxPrintout_FitThisSizeToPage, 2936).
+-define(wxPrintout_FitThisSizeToPageMargins, 2937).
+-define(wxPrintout_MapScreenSizeToPaper, 2938).
+-define(wxPrintout_MapScreenSizeToPage, 2939).
+-define(wxPrintout_MapScreenSizeToPageMargins, 2940).
+-define(wxPrintout_MapScreenSizeToDevice, 2941).
+-define(wxPrintout_GetLogicalPaperRect, 2942).
+-define(wxPrintout_GetLogicalPageRect, 2943).
+-define(wxPrintout_GetLogicalPageMarginsRect, 2944).
+-define(wxPrintout_SetLogicalOrigin, 2945).
+-define(wxPrintout_OffsetLogicalOrigin, 2946).
+-define(wxStyledTextCtrl_new_2, 2947).
+-define(wxStyledTextCtrl_new_0, 2948).
+-define(wxStyledTextCtrl_destruct, 2949).
+-define(wxStyledTextCtrl_Create, 2950).
+-define(wxStyledTextCtrl_AddText, 2951).
+-define(wxStyledTextCtrl_AddStyledText, 2952).
+-define(wxStyledTextCtrl_InsertText, 2953).
+-define(wxStyledTextCtrl_ClearAll, 2954).
+-define(wxStyledTextCtrl_ClearDocumentStyle, 2955).
+-define(wxStyledTextCtrl_GetLength, 2956).
+-define(wxStyledTextCtrl_GetCharAt, 2957).
+-define(wxStyledTextCtrl_GetCurrentPos, 2958).
+-define(wxStyledTextCtrl_GetAnchor, 2959).
+-define(wxStyledTextCtrl_GetStyleAt, 2960).
+-define(wxStyledTextCtrl_Redo, 2961).
+-define(wxStyledTextCtrl_SetUndoCollection, 2962).
+-define(wxStyledTextCtrl_SelectAll, 2963).
+-define(wxStyledTextCtrl_SetSavePoint, 2964).
+-define(wxStyledTextCtrl_GetStyledText, 2965).
+-define(wxStyledTextCtrl_CanRedo, 2966).
+-define(wxStyledTextCtrl_MarkerLineFromHandle, 2967).
+-define(wxStyledTextCtrl_MarkerDeleteHandle, 2968).
+-define(wxStyledTextCtrl_GetUndoCollection, 2969).
+-define(wxStyledTextCtrl_GetViewWhiteSpace, 2970).
+-define(wxStyledTextCtrl_SetViewWhiteSpace, 2971).
+-define(wxStyledTextCtrl_PositionFromPoint, 2972).
+-define(wxStyledTextCtrl_PositionFromPointClose, 2973).
+-define(wxStyledTextCtrl_GotoLine, 2974).
+-define(wxStyledTextCtrl_GotoPos, 2975).
+-define(wxStyledTextCtrl_SetAnchor, 2976).
+-define(wxStyledTextCtrl_GetCurLine, 2977).
+-define(wxStyledTextCtrl_GetEndStyled, 2978).
+-define(wxStyledTextCtrl_ConvertEOLs, 2979).
+-define(wxStyledTextCtrl_GetEOLMode, 2980).
+-define(wxStyledTextCtrl_SetEOLMode, 2981).
+-define(wxStyledTextCtrl_StartStyling, 2982).
+-define(wxStyledTextCtrl_SetStyling, 2983).
+-define(wxStyledTextCtrl_GetBufferedDraw, 2984).
+-define(wxStyledTextCtrl_SetBufferedDraw, 2985).
+-define(wxStyledTextCtrl_SetTabWidth, 2986).
+-define(wxStyledTextCtrl_GetTabWidth, 2987).
+-define(wxStyledTextCtrl_SetCodePage, 2988).
+-define(wxStyledTextCtrl_MarkerDefine, 2989).
+-define(wxStyledTextCtrl_MarkerSetForeground, 2990).
+-define(wxStyledTextCtrl_MarkerSetBackground, 2991).
+-define(wxStyledTextCtrl_MarkerAdd, 2992).
+-define(wxStyledTextCtrl_MarkerDelete, 2993).
+-define(wxStyledTextCtrl_MarkerDeleteAll, 2994).
+-define(wxStyledTextCtrl_MarkerGet, 2995).
+-define(wxStyledTextCtrl_MarkerNext, 2996).
+-define(wxStyledTextCtrl_MarkerPrevious, 2997).
+-define(wxStyledTextCtrl_MarkerDefineBitmap, 2998).
+-define(wxStyledTextCtrl_MarkerAddSet, 2999).
+-define(wxStyledTextCtrl_MarkerSetAlpha, 3000).
+-define(wxStyledTextCtrl_SetMarginType, 3001).
+-define(wxStyledTextCtrl_GetMarginType, 3002).
+-define(wxStyledTextCtrl_SetMarginWidth, 3003).
+-define(wxStyledTextCtrl_GetMarginWidth, 3004).
+-define(wxStyledTextCtrl_SetMarginMask, 3005).
+-define(wxStyledTextCtrl_GetMarginMask, 3006).
+-define(wxStyledTextCtrl_SetMarginSensitive, 3007).
+-define(wxStyledTextCtrl_GetMarginSensitive, 3008).
+-define(wxStyledTextCtrl_StyleClearAll, 3009).
+-define(wxStyledTextCtrl_StyleSetForeground, 3010).
+-define(wxStyledTextCtrl_StyleSetBackground, 3011).
+-define(wxStyledTextCtrl_StyleSetBold, 3012).
+-define(wxStyledTextCtrl_StyleSetItalic, 3013).
+-define(wxStyledTextCtrl_StyleSetSize, 3014).
+-define(wxStyledTextCtrl_StyleSetFaceName, 3015).
+-define(wxStyledTextCtrl_StyleSetEOLFilled, 3016).
+-define(wxStyledTextCtrl_StyleResetDefault, 3017).
+-define(wxStyledTextCtrl_StyleSetUnderline, 3018).
+-define(wxStyledTextCtrl_StyleSetCase, 3019).
+-define(wxStyledTextCtrl_StyleSetHotSpot, 3020).
+-define(wxStyledTextCtrl_SetSelForeground, 3021).
+-define(wxStyledTextCtrl_SetSelBackground, 3022).
+-define(wxStyledTextCtrl_GetSelAlpha, 3023).
+-define(wxStyledTextCtrl_SetSelAlpha, 3024).
+-define(wxStyledTextCtrl_SetCaretForeground, 3025).
+-define(wxStyledTextCtrl_CmdKeyAssign, 3026).
+-define(wxStyledTextCtrl_CmdKeyClear, 3027).
+-define(wxStyledTextCtrl_CmdKeyClearAll, 3028).
+-define(wxStyledTextCtrl_SetStyleBytes, 3029).
+-define(wxStyledTextCtrl_StyleSetVisible, 3030).
+-define(wxStyledTextCtrl_GetCaretPeriod, 3031).
+-define(wxStyledTextCtrl_SetCaretPeriod, 3032).
+-define(wxStyledTextCtrl_SetWordChars, 3033).
+-define(wxStyledTextCtrl_BeginUndoAction, 3034).
+-define(wxStyledTextCtrl_EndUndoAction, 3035).
+-define(wxStyledTextCtrl_IndicatorSetStyle, 3036).
+-define(wxStyledTextCtrl_IndicatorGetStyle, 3037).
+-define(wxStyledTextCtrl_IndicatorSetForeground, 3038).
+-define(wxStyledTextCtrl_IndicatorGetForeground, 3039).
+-define(wxStyledTextCtrl_SetWhitespaceForeground, 3040).
+-define(wxStyledTextCtrl_SetWhitespaceBackground, 3041).
+-define(wxStyledTextCtrl_GetStyleBits, 3042).
+-define(wxStyledTextCtrl_SetLineState, 3043).
+-define(wxStyledTextCtrl_GetLineState, 3044).
+-define(wxStyledTextCtrl_GetMaxLineState, 3045).
+-define(wxStyledTextCtrl_GetCaretLineVisible, 3046).
+-define(wxStyledTextCtrl_SetCaretLineVisible, 3047).
+-define(wxStyledTextCtrl_GetCaretLineBackground, 3048).
+-define(wxStyledTextCtrl_SetCaretLineBackground, 3049).
+-define(wxStyledTextCtrl_AutoCompShow, 3050).
+-define(wxStyledTextCtrl_AutoCompCancel, 3051).
+-define(wxStyledTextCtrl_AutoCompActive, 3052).
+-define(wxStyledTextCtrl_AutoCompPosStart, 3053).
+-define(wxStyledTextCtrl_AutoCompComplete, 3054).
+-define(wxStyledTextCtrl_AutoCompStops, 3055).
+-define(wxStyledTextCtrl_AutoCompSetSeparator, 3056).
+-define(wxStyledTextCtrl_AutoCompGetSeparator, 3057).
+-define(wxStyledTextCtrl_AutoCompSelect, 3058).
+-define(wxStyledTextCtrl_AutoCompSetCancelAtStart, 3059).
+-define(wxStyledTextCtrl_AutoCompGetCancelAtStart, 3060).
+-define(wxStyledTextCtrl_AutoCompSetFillUps, 3061).
+-define(wxStyledTextCtrl_AutoCompSetChooseSingle, 3062).
+-define(wxStyledTextCtrl_AutoCompGetChooseSingle, 3063).
+-define(wxStyledTextCtrl_AutoCompSetIgnoreCase, 3064).
+-define(wxStyledTextCtrl_AutoCompGetIgnoreCase, 3065).
+-define(wxStyledTextCtrl_UserListShow, 3066).
+-define(wxStyledTextCtrl_AutoCompSetAutoHide, 3067).
+-define(wxStyledTextCtrl_AutoCompGetAutoHide, 3068).
+-define(wxStyledTextCtrl_AutoCompSetDropRestOfWord, 3069).
+-define(wxStyledTextCtrl_AutoCompGetDropRestOfWord, 3070).
+-define(wxStyledTextCtrl_RegisterImage, 3071).
+-define(wxStyledTextCtrl_ClearRegisteredImages, 3072).
+-define(wxStyledTextCtrl_AutoCompGetTypeSeparator, 3073).
+-define(wxStyledTextCtrl_AutoCompSetTypeSeparator, 3074).
+-define(wxStyledTextCtrl_AutoCompSetMaxWidth, 3075).
+-define(wxStyledTextCtrl_AutoCompGetMaxWidth, 3076).
+-define(wxStyledTextCtrl_AutoCompSetMaxHeight, 3077).
+-define(wxStyledTextCtrl_AutoCompGetMaxHeight, 3078).
+-define(wxStyledTextCtrl_SetIndent, 3079).
+-define(wxStyledTextCtrl_GetIndent, 3080).
+-define(wxStyledTextCtrl_SetUseTabs, 3081).
+-define(wxStyledTextCtrl_GetUseTabs, 3082).
+-define(wxStyledTextCtrl_SetLineIndentation, 3083).
+-define(wxStyledTextCtrl_GetLineIndentation, 3084).
+-define(wxStyledTextCtrl_GetLineIndentPosition, 3085).
+-define(wxStyledTextCtrl_GetColumn, 3086).
+-define(wxStyledTextCtrl_SetUseHorizontalScrollBar, 3087).
+-define(wxStyledTextCtrl_GetUseHorizontalScrollBar, 3088).
+-define(wxStyledTextCtrl_SetIndentationGuides, 3089).
+-define(wxStyledTextCtrl_GetIndentationGuides, 3090).
+-define(wxStyledTextCtrl_SetHighlightGuide, 3091).
+-define(wxStyledTextCtrl_GetHighlightGuide, 3092).
+-define(wxStyledTextCtrl_GetLineEndPosition, 3093).
+-define(wxStyledTextCtrl_GetCodePage, 3094).
+-define(wxStyledTextCtrl_GetCaretForeground, 3095).
+-define(wxStyledTextCtrl_GetReadOnly, 3096).
+-define(wxStyledTextCtrl_SetCurrentPos, 3097).
+-define(wxStyledTextCtrl_SetSelectionStart, 3098).
+-define(wxStyledTextCtrl_GetSelectionStart, 3099).
+-define(wxStyledTextCtrl_SetSelectionEnd, 3100).
+-define(wxStyledTextCtrl_GetSelectionEnd, 3101).
+-define(wxStyledTextCtrl_SetPrintMagnification, 3102).
+-define(wxStyledTextCtrl_GetPrintMagnification, 3103).
+-define(wxStyledTextCtrl_SetPrintColourMode, 3104).
+-define(wxStyledTextCtrl_GetPrintColourMode, 3105).
+-define(wxStyledTextCtrl_FindText, 3106).
+-define(wxStyledTextCtrl_FormatRange, 3107).
+-define(wxStyledTextCtrl_GetFirstVisibleLine, 3108).
+-define(wxStyledTextCtrl_GetLine, 3109).
+-define(wxStyledTextCtrl_GetLineCount, 3110).
+-define(wxStyledTextCtrl_SetMarginLeft, 3111).
+-define(wxStyledTextCtrl_GetMarginLeft, 3112).
+-define(wxStyledTextCtrl_SetMarginRight, 3113).
+-define(wxStyledTextCtrl_GetMarginRight, 3114).
+-define(wxStyledTextCtrl_GetModify, 3115).
+-define(wxStyledTextCtrl_SetSelection, 3116).
+-define(wxStyledTextCtrl_GetSelectedText, 3117).
+-define(wxStyledTextCtrl_GetTextRange, 3118).
+-define(wxStyledTextCtrl_HideSelection, 3119).
+-define(wxStyledTextCtrl_LineFromPosition, 3120).
+-define(wxStyledTextCtrl_PositionFromLine, 3121).
+-define(wxStyledTextCtrl_LineScroll, 3122).
+-define(wxStyledTextCtrl_EnsureCaretVisible, 3123).
+-define(wxStyledTextCtrl_ReplaceSelection, 3124).
+-define(wxStyledTextCtrl_SetReadOnly, 3125).
+-define(wxStyledTextCtrl_CanPaste, 3126).
+-define(wxStyledTextCtrl_CanUndo, 3127).
+-define(wxStyledTextCtrl_EmptyUndoBuffer, 3128).
+-define(wxStyledTextCtrl_Undo, 3129).
+-define(wxStyledTextCtrl_Cut, 3130).
+-define(wxStyledTextCtrl_Copy, 3131).
+-define(wxStyledTextCtrl_Paste, 3132).
+-define(wxStyledTextCtrl_Clear, 3133).
+-define(wxStyledTextCtrl_SetText, 3134).
+-define(wxStyledTextCtrl_GetText, 3135).
+-define(wxStyledTextCtrl_GetTextLength, 3136).
+-define(wxStyledTextCtrl_GetOvertype, 3137).
+-define(wxStyledTextCtrl_SetCaretWidth, 3138).
+-define(wxStyledTextCtrl_GetCaretWidth, 3139).
+-define(wxStyledTextCtrl_SetTargetStart, 3140).
+-define(wxStyledTextCtrl_GetTargetStart, 3141).
+-define(wxStyledTextCtrl_SetTargetEnd, 3142).
+-define(wxStyledTextCtrl_GetTargetEnd, 3143).
+-define(wxStyledTextCtrl_ReplaceTarget, 3144).
+-define(wxStyledTextCtrl_SearchInTarget, 3145).
+-define(wxStyledTextCtrl_SetSearchFlags, 3146).
+-define(wxStyledTextCtrl_GetSearchFlags, 3147).
+-define(wxStyledTextCtrl_CallTipShow, 3148).
+-define(wxStyledTextCtrl_CallTipCancel, 3149).
+-define(wxStyledTextCtrl_CallTipActive, 3150).
+-define(wxStyledTextCtrl_CallTipPosAtStart, 3151).
+-define(wxStyledTextCtrl_CallTipSetHighlight, 3152).
+-define(wxStyledTextCtrl_CallTipSetBackground, 3153).
+-define(wxStyledTextCtrl_CallTipSetForeground, 3154).
+-define(wxStyledTextCtrl_CallTipSetForegroundHighlight, 3155).
+-define(wxStyledTextCtrl_CallTipUseStyle, 3156).
+-define(wxStyledTextCtrl_VisibleFromDocLine, 3157).
+-define(wxStyledTextCtrl_DocLineFromVisible, 3158).
+-define(wxStyledTextCtrl_WrapCount, 3159).
+-define(wxStyledTextCtrl_SetFoldLevel, 3160).
+-define(wxStyledTextCtrl_GetFoldLevel, 3161).
+-define(wxStyledTextCtrl_GetLastChild, 3162).
+-define(wxStyledTextCtrl_GetFoldParent, 3163).
+-define(wxStyledTextCtrl_ShowLines, 3164).
+-define(wxStyledTextCtrl_HideLines, 3165).
+-define(wxStyledTextCtrl_GetLineVisible, 3166).
+-define(wxStyledTextCtrl_SetFoldExpanded, 3167).
+-define(wxStyledTextCtrl_GetFoldExpanded, 3168).
+-define(wxStyledTextCtrl_ToggleFold, 3169).
+-define(wxStyledTextCtrl_EnsureVisible, 3170).
+-define(wxStyledTextCtrl_SetFoldFlags, 3171).
+-define(wxStyledTextCtrl_EnsureVisibleEnforcePolicy, 3172).
+-define(wxStyledTextCtrl_SetTabIndents, 3173).
+-define(wxStyledTextCtrl_GetTabIndents, 3174).
+-define(wxStyledTextCtrl_SetBackSpaceUnIndents, 3175).
+-define(wxStyledTextCtrl_GetBackSpaceUnIndents, 3176).
+-define(wxStyledTextCtrl_SetMouseDwellTime, 3177).
+-define(wxStyledTextCtrl_GetMouseDwellTime, 3178).
+-define(wxStyledTextCtrl_WordStartPosition, 3179).
+-define(wxStyledTextCtrl_WordEndPosition, 3180).
+-define(wxStyledTextCtrl_SetWrapMode, 3181).
+-define(wxStyledTextCtrl_GetWrapMode, 3182).
+-define(wxStyledTextCtrl_SetWrapVisualFlags, 3183).
+-define(wxStyledTextCtrl_GetWrapVisualFlags, 3184).
+-define(wxStyledTextCtrl_SetWrapVisualFlagsLocation, 3185).
+-define(wxStyledTextCtrl_GetWrapVisualFlagsLocation, 3186).
+-define(wxStyledTextCtrl_SetWrapStartIndent, 3187).
+-define(wxStyledTextCtrl_GetWrapStartIndent, 3188).
+-define(wxStyledTextCtrl_SetLayoutCache, 3189).
+-define(wxStyledTextCtrl_GetLayoutCache, 3190).
+-define(wxStyledTextCtrl_SetScrollWidth, 3191).
+-define(wxStyledTextCtrl_GetScrollWidth, 3192).
+-define(wxStyledTextCtrl_TextWidth, 3193).
+-define(wxStyledTextCtrl_GetEndAtLastLine, 3194).
+-define(wxStyledTextCtrl_TextHeight, 3195).
+-define(wxStyledTextCtrl_SetUseVerticalScrollBar, 3196).
+-define(wxStyledTextCtrl_GetUseVerticalScrollBar, 3197).
+-define(wxStyledTextCtrl_AppendText, 3198).
+-define(wxStyledTextCtrl_GetTwoPhaseDraw, 3199).
+-define(wxStyledTextCtrl_SetTwoPhaseDraw, 3200).
+-define(wxStyledTextCtrl_TargetFromSelection, 3201).
+-define(wxStyledTextCtrl_LinesJoin, 3202).
+-define(wxStyledTextCtrl_LinesSplit, 3203).
+-define(wxStyledTextCtrl_SetFoldMarginColour, 3204).
+-define(wxStyledTextCtrl_SetFoldMarginHiColour, 3205).
+-define(wxStyledTextCtrl_LineDown, 3206).
+-define(wxStyledTextCtrl_LineDownExtend, 3207).
+-define(wxStyledTextCtrl_LineUp, 3208).
+-define(wxStyledTextCtrl_LineUpExtend, 3209).
+-define(wxStyledTextCtrl_CharLeft, 3210).
+-define(wxStyledTextCtrl_CharLeftExtend, 3211).
+-define(wxStyledTextCtrl_CharRight, 3212).
+-define(wxStyledTextCtrl_CharRightExtend, 3213).
+-define(wxStyledTextCtrl_WordLeft, 3214).
+-define(wxStyledTextCtrl_WordLeftExtend, 3215).
+-define(wxStyledTextCtrl_WordRight, 3216).
+-define(wxStyledTextCtrl_WordRightExtend, 3217).
+-define(wxStyledTextCtrl_Home, 3218).
+-define(wxStyledTextCtrl_HomeExtend, 3219).
+-define(wxStyledTextCtrl_LineEnd, 3220).
+-define(wxStyledTextCtrl_LineEndExtend, 3221).
+-define(wxStyledTextCtrl_DocumentStart, 3222).
+-define(wxStyledTextCtrl_DocumentStartExtend, 3223).
+-define(wxStyledTextCtrl_DocumentEnd, 3224).
+-define(wxStyledTextCtrl_DocumentEndExtend, 3225).
+-define(wxStyledTextCtrl_PageUp, 3226).
+-define(wxStyledTextCtrl_PageUpExtend, 3227).
+-define(wxStyledTextCtrl_PageDown, 3228).
+-define(wxStyledTextCtrl_PageDownExtend, 3229).
+-define(wxStyledTextCtrl_EditToggleOvertype, 3230).
+-define(wxStyledTextCtrl_Cancel, 3231).
+-define(wxStyledTextCtrl_DeleteBack, 3232).
+-define(wxStyledTextCtrl_Tab, 3233).
+-define(wxStyledTextCtrl_BackTab, 3234).
+-define(wxStyledTextCtrl_NewLine, 3235).
+-define(wxStyledTextCtrl_FormFeed, 3236).
+-define(wxStyledTextCtrl_VCHome, 3237).
+-define(wxStyledTextCtrl_VCHomeExtend, 3238).
+-define(wxStyledTextCtrl_ZoomIn, 3239).
+-define(wxStyledTextCtrl_ZoomOut, 3240).
+-define(wxStyledTextCtrl_DelWordLeft, 3241).
+-define(wxStyledTextCtrl_DelWordRight, 3242).
+-define(wxStyledTextCtrl_LineCut, 3243).
+-define(wxStyledTextCtrl_LineDelete, 3244).
+-define(wxStyledTextCtrl_LineTranspose, 3245).
+-define(wxStyledTextCtrl_LineDuplicate, 3246).
+-define(wxStyledTextCtrl_LowerCase, 3247).
+-define(wxStyledTextCtrl_UpperCase, 3248).
+-define(wxStyledTextCtrl_LineScrollDown, 3249).
+-define(wxStyledTextCtrl_LineScrollUp, 3250).
+-define(wxStyledTextCtrl_DeleteBackNotLine, 3251).
+-define(wxStyledTextCtrl_HomeDisplay, 3252).
+-define(wxStyledTextCtrl_HomeDisplayExtend, 3253).
+-define(wxStyledTextCtrl_LineEndDisplay, 3254).
+-define(wxStyledTextCtrl_LineEndDisplayExtend, 3255).
+-define(wxStyledTextCtrl_HomeWrapExtend, 3256).
+-define(wxStyledTextCtrl_LineEndWrap, 3257).
+-define(wxStyledTextCtrl_LineEndWrapExtend, 3258).
+-define(wxStyledTextCtrl_VCHomeWrap, 3259).
+-define(wxStyledTextCtrl_VCHomeWrapExtend, 3260).
+-define(wxStyledTextCtrl_LineCopy, 3261).
+-define(wxStyledTextCtrl_MoveCaretInsideView, 3262).
+-define(wxStyledTextCtrl_LineLength, 3263).
+-define(wxStyledTextCtrl_BraceHighlight, 3264).
+-define(wxStyledTextCtrl_BraceBadLight, 3265).
+-define(wxStyledTextCtrl_BraceMatch, 3266).
+-define(wxStyledTextCtrl_GetViewEOL, 3267).
+-define(wxStyledTextCtrl_SetViewEOL, 3268).
+-define(wxStyledTextCtrl_SetModEventMask, 3269).
+-define(wxStyledTextCtrl_GetEdgeColumn, 3270).
+-define(wxStyledTextCtrl_SetEdgeColumn, 3271).
+-define(wxStyledTextCtrl_GetEdgeMode, 3272).
+-define(wxStyledTextCtrl_GetEdgeColour, 3273).
+-define(wxStyledTextCtrl_SetEdgeColour, 3274).
+-define(wxStyledTextCtrl_SearchAnchor, 3275).
+-define(wxStyledTextCtrl_SearchNext, 3276).
+-define(wxStyledTextCtrl_SearchPrev, 3277).
+-define(wxStyledTextCtrl_LinesOnScreen, 3278).
+-define(wxStyledTextCtrl_UsePopUp, 3279).
+-define(wxStyledTextCtrl_SelectionIsRectangle, 3280).
+-define(wxStyledTextCtrl_SetZoom, 3281).
+-define(wxStyledTextCtrl_GetZoom, 3282).
+-define(wxStyledTextCtrl_GetModEventMask, 3283).
+-define(wxStyledTextCtrl_SetSTCFocus, 3284).
+-define(wxStyledTextCtrl_GetSTCFocus, 3285).
+-define(wxStyledTextCtrl_SetStatus, 3286).
+-define(wxStyledTextCtrl_GetStatus, 3287).
+-define(wxStyledTextCtrl_SetMouseDownCaptures, 3288).
+-define(wxStyledTextCtrl_GetMouseDownCaptures, 3289).
+-define(wxStyledTextCtrl_SetSTCCursor, 3290).
+-define(wxStyledTextCtrl_GetSTCCursor, 3291).
+-define(wxStyledTextCtrl_SetControlCharSymbol, 3292).
+-define(wxStyledTextCtrl_GetControlCharSymbol, 3293).
+-define(wxStyledTextCtrl_WordPartLeft, 3294).
+-define(wxStyledTextCtrl_WordPartLeftExtend, 3295).
+-define(wxStyledTextCtrl_WordPartRight, 3296).
+-define(wxStyledTextCtrl_WordPartRightExtend, 3297).
+-define(wxStyledTextCtrl_SetVisiblePolicy, 3298).
+-define(wxStyledTextCtrl_DelLineLeft, 3299).
+-define(wxStyledTextCtrl_DelLineRight, 3300).
+-define(wxStyledTextCtrl_GetXOffset, 3301).
+-define(wxStyledTextCtrl_ChooseCaretX, 3302).
+-define(wxStyledTextCtrl_SetXCaretPolicy, 3303).
+-define(wxStyledTextCtrl_SetYCaretPolicy, 3304).
+-define(wxStyledTextCtrl_GetPrintWrapMode, 3305).
+-define(wxStyledTextCtrl_SetHotspotActiveForeground, 3306).
+-define(wxStyledTextCtrl_SetHotspotActiveBackground, 3307).
+-define(wxStyledTextCtrl_SetHotspotActiveUnderline, 3308).
+-define(wxStyledTextCtrl_SetHotspotSingleLine, 3309).
+-define(wxStyledTextCtrl_ParaDownExtend, 3310).
+-define(wxStyledTextCtrl_ParaUp, 3311).
+-define(wxStyledTextCtrl_ParaUpExtend, 3312).
+-define(wxStyledTextCtrl_PositionBefore, 3313).
+-define(wxStyledTextCtrl_PositionAfter, 3314).
+-define(wxStyledTextCtrl_CopyRange, 3315).
+-define(wxStyledTextCtrl_CopyText, 3316).
+-define(wxStyledTextCtrl_SetSelectionMode, 3317).
+-define(wxStyledTextCtrl_GetSelectionMode, 3318).
+-define(wxStyledTextCtrl_LineDownRectExtend, 3319).
+-define(wxStyledTextCtrl_LineUpRectExtend, 3320).
+-define(wxStyledTextCtrl_CharLeftRectExtend, 3321).
+-define(wxStyledTextCtrl_CharRightRectExtend, 3322).
+-define(wxStyledTextCtrl_HomeRectExtend, 3323).
+-define(wxStyledTextCtrl_VCHomeRectExtend, 3324).
+-define(wxStyledTextCtrl_LineEndRectExtend, 3325).
+-define(wxStyledTextCtrl_PageUpRectExtend, 3326).
+-define(wxStyledTextCtrl_PageDownRectExtend, 3327).
+-define(wxStyledTextCtrl_StutteredPageUp, 3328).
+-define(wxStyledTextCtrl_StutteredPageUpExtend, 3329).
+-define(wxStyledTextCtrl_StutteredPageDown, 3330).
+-define(wxStyledTextCtrl_StutteredPageDownExtend, 3331).
+-define(wxStyledTextCtrl_WordLeftEnd, 3332).
+-define(wxStyledTextCtrl_WordLeftEndExtend, 3333).
+-define(wxStyledTextCtrl_WordRightEnd, 3334).
+-define(wxStyledTextCtrl_WordRightEndExtend, 3335).
+-define(wxStyledTextCtrl_SetWhitespaceChars, 3336).
+-define(wxStyledTextCtrl_SetCharsDefault, 3337).
+-define(wxStyledTextCtrl_AutoCompGetCurrent, 3338).
+-define(wxStyledTextCtrl_Allocate, 3339).
+-define(wxStyledTextCtrl_FindColumn, 3340).
+-define(wxStyledTextCtrl_GetCaretSticky, 3341).
+-define(wxStyledTextCtrl_SetCaretSticky, 3342).
+-define(wxStyledTextCtrl_ToggleCaretSticky, 3343).
+-define(wxStyledTextCtrl_SetPasteConvertEndings, 3344).
+-define(wxStyledTextCtrl_GetPasteConvertEndings, 3345).
+-define(wxStyledTextCtrl_SelectionDuplicate, 3346).
+-define(wxStyledTextCtrl_SetCaretLineBackAlpha, 3347).
+-define(wxStyledTextCtrl_GetCaretLineBackAlpha, 3348).
+-define(wxStyledTextCtrl_StartRecord, 3349).
+-define(wxStyledTextCtrl_StopRecord, 3350).
+-define(wxStyledTextCtrl_SetLexer, 3351).
+-define(wxStyledTextCtrl_GetLexer, 3352).
+-define(wxStyledTextCtrl_Colourise, 3353).
+-define(wxStyledTextCtrl_SetProperty, 3354).
+-define(wxStyledTextCtrl_SetKeyWords, 3355).
+-define(wxStyledTextCtrl_SetLexerLanguage, 3356).
+-define(wxStyledTextCtrl_GetProperty, 3357).
+-define(wxStyledTextCtrl_GetStyleBitsNeeded, 3358).
+-define(wxStyledTextCtrl_GetCurrentLine, 3359).
+-define(wxStyledTextCtrl_StyleSetSpec, 3360).
+-define(wxStyledTextCtrl_StyleSetFont, 3361).
+-define(wxStyledTextCtrl_StyleSetFontAttr, 3362).
+-define(wxStyledTextCtrl_StyleSetCharacterSet, 3363).
+-define(wxStyledTextCtrl_StyleSetFontEncoding, 3364).
+-define(wxStyledTextCtrl_CmdKeyExecute, 3365).
+-define(wxStyledTextCtrl_SetMargins, 3366).
+-define(wxStyledTextCtrl_GetSelection, 3367).
+-define(wxStyledTextCtrl_PointFromPosition, 3368).
+-define(wxStyledTextCtrl_ScrollToLine, 3369).
+-define(wxStyledTextCtrl_ScrollToColumn, 3370).
+-define(wxStyledTextCtrl_SendMsg, 3371).
+-define(wxStyledTextCtrl_SetVScrollBar, 3372).
+-define(wxStyledTextCtrl_SetHScrollBar, 3373).
+-define(wxStyledTextCtrl_GetLastKeydownProcessed, 3374).
+-define(wxStyledTextCtrl_SetLastKeydownProcessed, 3375).
+-define(wxStyledTextCtrl_SaveFile, 3376).
+-define(wxStyledTextCtrl_LoadFile, 3377).
+-define(wxStyledTextCtrl_DoDragOver, 3378).
+-define(wxStyledTextCtrl_DoDropText, 3379).
+-define(wxStyledTextCtrl_GetUseAntiAliasing, 3380).
+-define(wxStyledTextCtrl_AddTextRaw, 3381).
+-define(wxStyledTextCtrl_InsertTextRaw, 3382).
+-define(wxStyledTextCtrl_GetCurLineRaw, 3383).
+-define(wxStyledTextCtrl_GetLineRaw, 3384).
+-define(wxStyledTextCtrl_GetSelectedTextRaw, 3385).
+-define(wxStyledTextCtrl_GetTextRangeRaw, 3386).
+-define(wxStyledTextCtrl_SetTextRaw, 3387).
+-define(wxStyledTextCtrl_GetTextRaw, 3388).
+-define(wxStyledTextCtrl_AppendTextRaw, 3389).
+-define(wxArtProvider_GetBitmap, 3390).
+-define(wxArtProvider_GetIcon, 3391).
+-define(wxTreeEvent_GetKeyCode, 3392).
+-define(wxTreeEvent_GetItem, 3393).
+-define(wxTreeEvent_GetKeyEvent, 3394).
+-define(wxTreeEvent_GetLabel, 3395).
+-define(wxTreeEvent_GetOldItem, 3396).
+-define(wxTreeEvent_GetPoint, 3397).
+-define(wxTreeEvent_IsEditCancelled, 3398).
+-define(wxTreeEvent_SetToolTip, 3399).
+-define(wxNotebookEvent_GetOldSelection, 3400).
+-define(wxNotebookEvent_GetSelection, 3401).
+-define(wxNotebookEvent_SetOldSelection, 3402).
+-define(wxNotebookEvent_SetSelection, 3403).
+-define(wxFileDataObject_new, 3404).
+-define(wxFileDataObject_AddFile, 3405).
+-define(wxFileDataObject_GetFilenames, 3406).
+-define(wxFileDataObject_destroy, 3407).
+-define(wxTextDataObject_new, 3408).
+-define(wxTextDataObject_GetTextLength, 3409).
+-define(wxTextDataObject_GetText, 3410).
+-define(wxTextDataObject_SetText, 3411).
+-define(wxTextDataObject_destroy, 3412).
+-define(wxBitmapDataObject_new_1_1, 3413).
+-define(wxBitmapDataObject_new_1_0, 3414).
+-define(wxBitmapDataObject_GetBitmap, 3415).
+-define(wxBitmapDataObject_SetBitmap, 3416).
+-define(wxBitmapDataObject_destroy, 3417).
+-define(wxClipboard_new, 3419).
+-define(wxClipboard_destruct, 3420).
+-define(wxClipboard_AddData, 3421).
+-define(wxClipboard_Clear, 3422).
+-define(wxClipboard_Close, 3423).
+-define(wxClipboard_Flush, 3424).
+-define(wxClipboard_GetData, 3425).
+-define(wxClipboard_IsOpened, 3426).
+-define(wxClipboard_Open, 3427).
+-define(wxClipboard_SetData, 3428).
+-define(wxClipboard_UsePrimarySelection, 3430).
+-define(wxClipboard_IsSupported, 3431).
+-define(wxClipboard_Get, 3432).
+-define(wxSpinEvent_GetPosition, 3433).
+-define(wxSpinEvent_SetPosition, 3434).
+-define(wxSplitterWindow_new_0, 3435).
+-define(wxSplitterWindow_new_2, 3436).
+-define(wxSplitterWindow_destruct, 3437).
+-define(wxSplitterWindow_Create, 3438).
+-define(wxSplitterWindow_GetMinimumPaneSize, 3439).
+-define(wxSplitterWindow_GetSashGravity, 3440).
+-define(wxSplitterWindow_GetSashPosition, 3441).
+-define(wxSplitterWindow_GetSplitMode, 3442).
+-define(wxSplitterWindow_GetWindow1, 3443).
+-define(wxSplitterWindow_GetWindow2, 3444).
+-define(wxSplitterWindow_Initialize, 3445).
+-define(wxSplitterWindow_IsSplit, 3446).
+-define(wxSplitterWindow_ReplaceWindow, 3447).
+-define(wxSplitterWindow_SetSashGravity, 3448).
+-define(wxSplitterWindow_SetSashPosition, 3449).
+-define(wxSplitterWindow_SetSashSize, 3450).
+-define(wxSplitterWindow_SetMinimumPaneSize, 3451).
+-define(wxSplitterWindow_SetSplitMode, 3452).
+-define(wxSplitterWindow_SplitHorizontally, 3453).
+-define(wxSplitterWindow_SplitVertically, 3454).
+-define(wxSplitterWindow_Unsplit, 3455).
+-define(wxSplitterWindow_UpdateSize, 3456).
+-define(wxSplitterEvent_GetSashPosition, 3457).
+-define(wxSplitterEvent_GetX, 3458).
+-define(wxSplitterEvent_GetY, 3459).
+-define(wxSplitterEvent_GetWindowBeingRemoved, 3460).
+-define(wxSplitterEvent_SetSashPosition, 3461).
+-define(wxHtmlWindow_new_0, 3462).
+-define(wxHtmlWindow_new_2, 3463).
+-define(wxHtmlWindow_AppendToPage, 3464).
+-define(wxHtmlWindow_GetOpenedAnchor, 3465).
+-define(wxHtmlWindow_GetOpenedPage, 3466).
+-define(wxHtmlWindow_GetOpenedPageTitle, 3467).
+-define(wxHtmlWindow_GetRelatedFrame, 3468).
+-define(wxHtmlWindow_HistoryBack, 3469).
+-define(wxHtmlWindow_HistoryCanBack, 3470).
+-define(wxHtmlWindow_HistoryCanForward, 3471).
+-define(wxHtmlWindow_HistoryClear, 3472).
+-define(wxHtmlWindow_HistoryForward, 3473).
+-define(wxHtmlWindow_LoadFile, 3474).
+-define(wxHtmlWindow_LoadPage, 3475).
+-define(wxHtmlWindow_SelectAll, 3476).
+-define(wxHtmlWindow_SelectionToText, 3477).
+-define(wxHtmlWindow_SelectLine, 3478).
+-define(wxHtmlWindow_SelectWord, 3479).
+-define(wxHtmlWindow_SetBorders, 3480).
+-define(wxHtmlWindow_SetFonts, 3481).
+-define(wxHtmlWindow_SetPage, 3482).
+-define(wxHtmlWindow_SetRelatedFrame, 3483).
+-define(wxHtmlWindow_SetRelatedStatusBar, 3484).
+-define(wxHtmlWindow_ToText, 3485).
+-define(wxHtmlWindow_destroy, 3486).
+-define(wxHtmlLinkEvent_GetLinkInfo, 3487).
+-define(wxSystemSettings_GetColour, 3488).
+-define(wxSystemSettings_GetFont, 3489).
+-define(wxSystemSettings_GetMetric, 3490).
+-define(wxSystemSettings_GetScreenType, 3491).
+-define(wxAuiNotebookEvent_SetSelection, 3492).
+-define(wxAuiNotebookEvent_GetSelection, 3493).
+-define(wxAuiNotebookEvent_SetOldSelection, 3494).
+-define(wxAuiNotebookEvent_GetOldSelection, 3495).
+-define(wxAuiNotebookEvent_SetDragSource, 3496).
+-define(wxAuiNotebookEvent_GetDragSource, 3497).
+-define(wxAuiManagerEvent_SetManager, 3498).
+-define(wxAuiManagerEvent_GetManager, 3499).
+-define(wxAuiManagerEvent_SetPane, 3500).
+-define(wxAuiManagerEvent_GetPane, 3501).
+-define(wxAuiManagerEvent_SetButton, 3502).
+-define(wxAuiManagerEvent_GetButton, 3503).
+-define(wxAuiManagerEvent_SetDC, 3504).
+-define(wxAuiManagerEvent_GetDC, 3505).
+-define(wxAuiManagerEvent_Veto, 3506).
+-define(wxAuiManagerEvent_GetVeto, 3507).
+-define(wxAuiManagerEvent_SetCanVeto, 3508).
+-define(wxAuiManagerEvent_CanVeto, 3509).
+-define(wxLogNull_new, 3510).
+-define(wxLogNull_destroy, 3511).
diff --git a/lib/wx/src/wx_object.erl b/lib/wx/src/wx_object.erl
index bfd38960dd..82c4cfbad5 100644
--- a/lib/wx/src/wx_object.erl
+++ b/lib/wx/src/wx_object.erl
@@ -537,16 +537,16 @@ error_info(_Reason, application_controller, _Msg, _State, _Debug) ->
 error_info(Reason, Name, Msg, State, Debug) ->
     Reason1 = 
 	case Reason of
-	    {undef,[{M,F,A}|MFAs]} ->
+	    {undef,[{M,F,A,L}|MFAs]} ->
 		case code:is_loaded(M) of
 		    false ->
-			{'module could not be loaded',[{M,F,A}|MFAs]};
+			{'module could not be loaded',[{M,F,A,L}|MFAs]};
 		    _ ->
 			case erlang:function_exported(M, F, length(A)) of
 			    true ->
 				Reason;
 			    false ->
-				{'function not exported',[{M,F,A}|MFAs]}
+				{'function not exported',[{M,F,A,L}|MFAs]}
 			end
 		end;
 	    _ ->
diff --git a/lib/wx/src/wxe_server.erl b/lib/wx/src/wxe_server.erl
index 40412987a5..69e2189fac 100644
--- a/lib/wx/src/wxe_server.erl
+++ b/lib/wx/src/wxe_server.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2008-2011. 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.
-%% 
+%%
 %% %CopyrightEnd%
 %%%-------------------------------------------------------------------
 %%% File    : wxe_server.erl
@@ -24,7 +24,7 @@
 %%% Created : 17 Jan 2007 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
 
-%% @hidden 
+%% @hidden
 -module(wxe_server).
 -behaviour(gen_server).
 
@@ -65,7 +65,7 @@ start() ->
 	    end;
 	Env = #wx_env{sv=Pid} ->
 	    case erlang:is_process_alive(Pid) of
-		true ->		    
+		true ->
 		    Env;
 		false ->  %% Ok we got an old wx env, someone forgot
 		    erase(?WXE_IDENTIFIER),  %% to call wx:destroy()
@@ -94,7 +94,7 @@ init([]) ->
     {ok,#state{port=Port, cb_port=CBPort,
 	       users=gb_trees:empty(), cb=gb_trees:empty(), cb_cnt=1}}.
 
-%% Register process 
+%% Register process
 handle_call(register_me, {From,_}, State=#state{users=Users}) ->
     erlang:monitor(process, From),
     case gb_trees:is_defined(From, Users) of
@@ -147,7 +147,7 @@ handle_cast({debug, Level}, State) ->
     put(?WXE_IDENTIFIER, Env#wx_env{debug=Level}),
     {noreply, State};
 
-handle_cast(_Msg, State) ->    
+handle_cast(_Msg, State) ->
     ?log("Unknown message ~p sent to ~p~n",[_Msg, ?MODULE]),
     {noreply, State}.
 
@@ -156,7 +156,7 @@ handle_cast(_Msg, State) ->
 %% Callback request from driver
 handle_info(Cb = {_, _, '_wx_invoke_cb_'}, State) ->
     invoke_cb(Cb, State),
-    {noreply, State}; 
+    {noreply, State};
 handle_info({wx_delete_cb, FunId}, State0 = #state{cb=CB}) when is_integer(FunId) ->
     case get(FunId) of
 	undefined ->
@@ -166,7 +166,7 @@ handle_info({wx_delete_cb, FunId}, State0 = #state{cb=CB}) when is_integer(FunId
 	    {noreply, State0#state{cb=gb_trees:delete(Fun, CB)}}
     end;
 handle_info({'DOWN',_,process,Pid,_}, State=#state{users=Users0,cleaners=Cs}) ->
-    try 
+    try
 	User = gb_trees:get(Pid,Users0),
 	Users = gb_trees:delete(Pid,Users0),
 	Env = wx:get_env(),
@@ -210,7 +210,7 @@ handle_connect(Object, EvData, From, State0 = #state{users=Users}) ->
     case Handler0 of
 	#wx_ref{} when Callback =:= 0 ->
 	    CBHandler = Handler0,
-	    Handler = Handler0;	
+	    Handler = Handler0;
 	undefined when Callback =:= 0 ->
 	    Handler = new_evt_listener(State0),
 	    CBHandler = Handler;
@@ -225,7 +225,7 @@ handle_connect(Object, EvData, From, State0 = #state{users=Users}) ->
 	    {FunId, State} = attach_fun(Callback,State1),
 	    Res = wxEvtHandler:connect_impl(CBHandler,Object,
 					    wxEvtHandler:replace_fun_with_id(EvData,FunId)),
-	    case Res of 
+	    case Res of
 		ok     -> {reply,Res,State};
 		_Error -> {reply,Res,State0}
 	    end;
@@ -238,11 +238,7 @@ invoke_cb({{Ev=#wx{}, Ref=#wx_ref{}}, FunId,_}, _S) ->
     %% Event callbacks
     case get(FunId) of
 	Fun when is_function(Fun) ->
-	    invoke_callback(fun() ->
-			       wxe_util:cast(?WXE_CB_START, <<>>),
-			       Fun(Ev, Ref),
-			       <<>>
-		            end);
+	    invoke_callback(fun() -> Fun(Ev, Ref), <<>> end);
 	Err ->
 	    ?log("Internal Error ~p~n",[Err])
     end;
@@ -254,12 +250,14 @@ invoke_cb({FunId, Args, _}, _S) when is_list(Args), is_integer(FunId) ->
 	Err ->
 	    ?log("Internal Error ~p ~p ~p~n",[Err, FunId, Args])
     end.
-	
+
 invoke_callback(Fun) ->
     Env = get(?WXE_IDENTIFIER),
     CB = fun() ->
 		 wx:set_env(Env),
-		 Res = try Return = Fun(),
+		 wxe_util:cast(?WXE_CB_START, <<>>),
+		 Res = try
+			   Return = Fun(),
 			   true = is_binary(Return),
 			   Return
 		       catch _:Reason ->
@@ -278,9 +276,9 @@ new_evt_listener(State) ->
     get_result(State).
 
 get_result(_State) ->
-    receive 
+    receive
 	{'_wxe_result_', Res} -> Res;
-	{'_wxe_error_', Op, Error} -> 
+	{'_wxe_error_', Op, Error} ->
 	    erlang:error({Error, {wxEvtHandler, {internal_installer, Op}}})
     end.
 
@@ -289,7 +287,7 @@ attach_fun(Fun, S = #state{cb=CB,cb_cnt=Next}) ->
 	{value, ID} ->
 	    {ID,S};
 	none ->
-	    put(Next,Fun), 
+	    put(Next,Fun),
 	    {Next,S#state{cb=gb_trees:insert(Fun,Next,CB),cb_cnt=Next+1}}
     end.
 
@@ -297,7 +295,7 @@ handle_disconnect(Object, Evh, From, State0 = #state{users=Users0}) ->
     User0 = #user{events=Evs0, evt_handler=PidH} = gb_trees:get(From, Users0),
     Fun = wxEvtHandler:get_callback(Evh),
     case find_handler(Evs0, Object, Fun) of
-	[] ->  
+	[] ->
 	    {reply, false, State0};
 	Handlers ->
 	    case disconnect(Object,Evh, Handlers) of
@@ -310,7 +308,7 @@ handle_disconnect(Object, Evh, From, State0 = #state{users=Users0}) ->
 			       [] when PidH =/= undefined ->
 				   wxEvtHandler:destroy_evt_listener(PidH),
 				   User0#user{events=[], evt_handler=undefined};
-			       Evs -> 
+			       Evs ->
 				   User0#user{events=Evs}
 			   end,
 		    {reply, true, State0#state{users=gb_trees:update(From,User,Users0)}};
@@ -345,7 +343,7 @@ find_handler([],_Object,_Fun,Res) ->
 
 
 %% Cleanup
-%% The server handles callbacks from driver so every other wx call must 
+%% The server handles callbacks from driver so every other wx call must
 %% be called from another process, therefore the cleaning must be spawned.
 %%
 cleanup(Env, _Pid, Data) ->
@@ -358,7 +356,7 @@ cleanup(#user{objects=_Os,events=Evs, evt_handler=Handler}) ->
     lists:foreach(fun(#event{object=_O, callback=CB, cb_handler=CbH}) ->
 			  %%catch wxEvtHandler:disconnect_impl(CbH,O),
 			  case is_function(CB) of
-			      true -> 
+			      true ->
 				  wxEvtHandler:destroy_evt_listener(CbH);
 			      false ->
 				  ignore
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl
index 79e6833e9b..b75b0cc74e 100644
--- a/lib/wx/test/wx_class_SUITE.erl
+++ b/lib/wx/test/wx_class_SUITE.erl
@@ -18,14 +18,14 @@
 %%%-------------------------------------------------------------------
 %%% File    : wx_class_SUITE.erl
 %%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created : 13 Nov 2008 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
 -module(wx_class_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 init_per_suite/1, end_per_suite/1, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_suite/1, end_per_suite/1,
 	 init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
@@ -41,18 +41,18 @@ end_per_suite(Config) ->
 
 init_per_testcase(Func,Config) ->
     wx_test_lib:init_per_testcase(Func,Config).
-end_per_testcase(Func,Config) -> 
+end_per_testcase(Func,Config) ->
     wx_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
+all() ->
     [calendarCtrl, treeCtrl, notebook, staticBoxSizer,
-     clipboard, helpFrame, htmlWindow, listCtrlSort,
+     clipboard, helpFrame, htmlWindow, listCtrlSort, listCtrlVirtual,
      radioBox, systemSettings].
 
-groups() -> 
+groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
@@ -70,9 +70,9 @@ calendarCtrl(Config) ->
     Frame = ?mt(wxFrame, wxFrame:new(Wx, 1, "Calendar", [])),
     Panel = wxPanel:new(Frame),
     Sz = wxBoxSizer:new(?wxVERTICAL),
-    
+
     {YMD={_,_,Day},_} = DateTime = calendar:now_to_datetime(erlang:now()),
-    Cal = ?mt(wxCalendarCtrl, wxCalendarCtrl:new(Panel, ?wxID_ANY, 
+    Cal = ?mt(wxCalendarCtrl, wxCalendarCtrl:new(Panel, ?wxID_ANY,
 						 [{date,DateTime}
 						 ])),
     wxSizer:add(Sz,Cal),
@@ -91,25 +91,25 @@ calendarCtrl(Config) ->
     ?m({0,243,0,255}, wxCalendarDateAttr:getBackgroundColour(DateAttr1)),
 
     ?m({YMD, _},wxCalendarCtrl:getDate(Cal)),
-    
-    wxCalendarCtrl:connect(Cal, calendar_weekday_clicked), 
-    wxCalendarCtrl:connect(Cal, calendar_day_changed), 
-    wxCalendarCtrl:connect(Cal, calendar_month_changed), 
+
+    wxCalendarCtrl:connect(Cal, calendar_weekday_clicked),
+    wxCalendarCtrl:connect(Cal, calendar_day_changed),
+    wxCalendarCtrl:connect(Cal, calendar_month_changed),
     wxCalendarCtrl:connect(Cal, calendar_year_changed),
-    wxCalendarCtrl:connect(Cal, calendar_doubleclicked), 
+    wxCalendarCtrl:connect(Cal, calendar_doubleclicked),
     wxCalendarCtrl:connect(Cal, calendar_sel_changed),
-    
+
     wxWindow:setSizer(Panel,Sz),
     wxSizer:setSizeHints(Sz,Frame),
-    wxWindow:show(Frame), 
-    
+    wxWindow:show(Frame),
+
     wx_test_lib:wx_destroy(Frame,Config).
 
 
 treeCtrl(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 treeCtrl(Config) ->
     Wx = wx:new(),
-    
+
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
     Panel = wxPanel:new(Frame, []),
     Tree = ?mt(wxTreeCtrl,wxTreeCtrl:new(Panel, [{style , ?wxTR_HAS_BUTTONS}])),
@@ -122,25 +122,25 @@ treeCtrl(Config) ->
     ?m(ok,  wxTreeCtrl:setItemData(Tree, Item2, {data, item2})),
     Item3 = wxTreeCtrl:appendItem(Tree, Root, "Item3", []),
     ?m(ok, wxTreeCtrl:setItemData(Tree, Item3, {data, item3})),
-    
+
     Sizer = wxBoxSizer:new(?wxVERTICAL),
     wxSizer:add(Sizer, Tree, [{flag, ?wxEXPAND}, {proportion, 1}]),
 
     wxWindow:setSizerAndFit(Panel, Sizer),
     wxFrame:show(Frame),
-    
+
     ?m([], wxTreeCtrl:getItemData(Tree, Root)),
     ?m({data,item1}, wxTreeCtrl:getItemData(Tree, Item1)),
     ?m({data,item2}, wxTreeCtrl:getItemData(Tree, Item2)),
     ?m({data,item3}, wxTreeCtrl:getItemData(Tree, Item3)),
-    
+
     wxFrame:connect(Tree, command_tree_item_expanded),
     wxFrame:connect(Tree, command_tree_item_collapsed),
     wxFrame:connect(Frame, close_window),
 
     wxTreeCtrl:editLabel(Tree, Root),
 
-    
+
     wx_test_lib:wx_destroy(Frame,Config).
 
 notebook(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
@@ -210,13 +210,13 @@ staticBoxSizer(Config) ->
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
     Panel = wxPanel:new(Frame, []),
     InclSizer = ?mt(wxStaticBoxSizer,
-		    wxStaticBoxSizer:new(?wxVERTICAL, Panel, 
+		    wxStaticBoxSizer:new(?wxVERTICAL, Panel,
 					 [{label, "Module inclusion policy"}])),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
     wxSizer:add(Sizer, InclSizer,
 		[{border, 2}, {flag, ?wxALL bor ?wxEXPAND}, {proportion, 1}]),
-    wxWindow:setSizerAndFit(Panel, Sizer),    
-    
+    wxWindow:setSizerAndFit(Panel, Sizer),
+
     wxWindow:show(Frame),
     wx_test_lib:wx_destroy(Frame,Config).
 
@@ -263,13 +263,13 @@ clipboard(_Config) ->
     wxClipboard:flush(CB),
     ?log("Stopping ~n",[]),
     ok.
-    
+
 helpFrame(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 helpFrame(Config) ->
     Wx = wx:new(),
     MFrame = wx:batch(fun() ->
 			      MFrame = wxFrame:new(Wx, ?wxID_ANY, "Main Frame"),
-			      wxPanel:new(MFrame, [{size, {600,400}}]),      
+			      wxPanel:new(MFrame, [{size, {600,400}}]),
 			      wxWindow:show(MFrame),
 			      MFrame
 		      end),
@@ -279,11 +279,11 @@ helpFrame(Config) ->
     {X, Y, W,H} = wxWindow:getScreenRect(MFrame),
     io:format("Pos0: ~p ~p ~p Pos: ~p:~p Size: ~p:~p ~n",
 	      [X0,Y0, wxWindow:clientToScreen(MFrame, {0,0}), X,Y,W,H]),
-    
+
     Pos = {X+5, Y+(H div 2)},
     Size = {W-10, (H div 2) - 5},
 
-    Comp = wxFrame:new(MFrame, ?wxID_ANY, "Completion Window", 
+    Comp = wxFrame:new(MFrame, ?wxID_ANY, "Completion Window",
 		       [{pos, Pos}, {size, Size},
 			{style, ?wxFRAME_FLOAT_ON_PARENT}]),
     LB = wxListBox:new(Comp, 42, [{style, ?wxLB_SINGLE},
@@ -301,7 +301,7 @@ htmlWindow(Config) ->
     {MFrame,HPanel} =
 	wx:batch(fun() ->
 			 MFrame = wxFrame:new(Wx, ?wxID_ANY, "Main Frame"),
-			 HPanel = wxHtmlWindow:new(MFrame, [{size, {600,400}}]),  
+			 HPanel = wxHtmlWindow:new(MFrame, [{size, {600,400}}]),
 			 wxWindow:show(MFrame),
 			 {MFrame, HPanel}
 		 end),
@@ -310,7 +310,7 @@ htmlWindow(Config) ->
     WxMod = code:which(wx),
     WxDir = filename:split(filename:dirname(WxMod)) -- ["ebin"],
     Html = filename:join(filename:join(WxDir),filename:join("doc", "html")),
-    
+
     Index = filename:join(Html, "wx.html"),
 
     ?m(ok, wxHtmlWindow:connect(HPanel, command_html_link_clicked,
@@ -318,7 +318,7 @@ htmlWindow(Config) ->
 				  fun(Ev,_) ->
 					  io:format("Link clicked: ~p~n",[Ev])
 				  end}])),
-    
+
     case filelib:is_file(Index) of
 	true ->
 	    ?m(true, wxHtmlWindow:loadFile(HPanel, Index)),
@@ -326,7 +326,7 @@ htmlWindow(Config) ->
 	false ->
 	    ok
     end,
-    
+
     wx_test_lib:wx_destroy(MFrame,Config).
 
 
@@ -334,18 +334,18 @@ listCtrlSort(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 listCtrlSort(Config) ->
     Wx = wx:new(),
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
-    
+
     LC = wxListCtrl:new(Frame, [{style, ?wxLC_REPORT bor ?wxLC_SORT_ASCENDING}]),
 
     %% must be done crashes in wxwidgets otherwise.
     wxListCtrl:insertColumn(LC, 0, "Column"),
-    
-    Add = fun(Int) ->    
+
+    Add = fun(Int) ->
 		  wxListCtrl:insertItem(LC, Int, integer_to_list(Int)),
 		  %% ItemData Can only be integers currently
 		  wxListCtrl:setItemData(LC, Int, abs(2500-Int))
 	  end,
-    
+
     wx:foreach(Add, lists:seq(0,5000)),
     wxWindow:show(Frame),
 
@@ -360,10 +360,10 @@ listCtrlSort(Config) ->
 						    end
 					    end)
 	   end,
-    
+
     Time = timer:tc(erlang, apply, [Sort,[]]),
     io:format("Sorted ~p ~n",[Time]),
-    
+
     Item = wxListItem:new(),
     _List = wx:map(fun(Int) ->
 			   wxListItem:setId(Item, Int),
@@ -374,6 +374,48 @@ listCtrlSort(Config) ->
 
     wx_test_lib:wx_destroy(Frame,Config).
 
+listCtrlVirtual(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
+listCtrlVirtual(Config) ->
+    Wx = wx:new(),
+    Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
+    IA = wxListItemAttr:new(),
+    wxListItemAttr:setTextColour(IA, {190, 25, 25}),
+    LC = wxListCtrl:new(Frame,
+			[{style, ?wxLC_REPORT bor ?wxLC_VIRTUAL},
+			 {onGetItemText, fun(_This, Item, 0) ->
+						 "Row " ++ integer_to_list(Item);
+					    (_, Item, 1) when Item rem 5 == 0 ->
+						 "Column 2";
+					    (_, _, _) -> ""
+					 end},
+			 {onGetItemAttr, fun(_This, Item) when Item rem 3 == 0 ->
+						 IA;
+					    (_This, _Item)  ->
+						 wx:typeCast(wx:null(), wxListItemAttr)
+					 end},
+			 {onGetItemColumnImage, fun(_This, Item, 1) ->
+							Item rem 4;
+						   (_, _, _) ->
+							-1
+						end}
+			]),
+
+    IL = wxImageList:new(16,16),
+    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_COPY", [{size, {16,16}}])),
+    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_MISSING_IMAGE", [{size, {16,16}}])),
+    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_TICK_MARK", [{size, {16,16}}])),
+    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_CROSS_MARK", [{size, {16,16}}])),
+    wxListCtrl:assignImageList(LC, IL, ?wxIMAGE_LIST_SMALL),
+
+    wxListCtrl:insertColumn(LC, 0, "Column 1"),
+    wxListCtrl:insertColumn(LC, 1, "Column 2"),
+    wxListCtrl:setColumnWidth(LC, 0, 200),
+    wxListCtrl:setColumnWidth(LC, 1, 200),
+    wxListCtrl:setItemCount(LC, 1000000),
+
+    wxWindow:show(Frame),
+    wx_test_lib:wx_destroy(Frame,Config).
+
 
 radioBox(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 radioBox(Config) ->
@@ -382,7 +424,7 @@ radioBox(Config) ->
 
     TrSortRadioBox = wxRadioBox:new(Frame, ?wxID_ANY, "Sort by:",
 				    {100, 100},{100, 100}, ["Timestamp"]),
-    
+
     io:format("TrSortRadioBox ~p ~n", [TrSortRadioBox]),
     %% If I uncomment any of these lines, it will crash
 
@@ -398,7 +440,7 @@ systemSettings(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo)
 systemSettings(Config) ->
     Wx = wx:new(),
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
-    
+
     ?m({_,_,_,_}, wxSystemSettings:getColour(?wxSYS_COLOUR_DESKTOP)),
     ?mt(wxFont, wxSystemSettings:getFont(?wxSYS_SYSTEM_FONT)),
     ?m(true, is_integer(wxSystemSettings:getMetric(?wxSYS_MOUSE_BUTTONS))),
@@ -406,3 +448,25 @@ systemSettings(Config) ->
 
     wxWindow:show(Frame),
     wx_test_lib:wx_destroy(Frame,Config).
+
+
+textCtrl(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
+textCtrl(Config) ->
+    Wx = wx:new(),
+    Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
+
+    TC = ?mt(wxTextCtrl, wxTextCtrl:new(Frame, ?wxID_ANY, [{style, ?wxTE_MULTILINE bor ?wxTE_RICH2}])),
+    wxTextCtrl:appendText(TC, "This line is in default color\n"),
+    Attr = ?mt(wxTextAttr, wxTextAttr:new(?wxRED)),
+    wxTextCtrl:setDefaultStyle(TC, Attr),
+    wxTextCtrl:appendText(TC, "This line is in ?wxRED color\n"),
+    wxTextAttr:setTextColour(Attr, ?wxBLACK),
+    wxTextCtrl:setDefaultStyle(TC, Attr),
+    wxTextCtrl:appendText(TC, "This line is in ?wxBLACK color\n"),
+    Default = wxSystemSettings:getColour(?wxSYS_COLOUR_WINDOWTEXT),
+    wxTextAttr:setTextColour(Attr, Default),
+    wxTextCtrl:setDefaultStyle(TC, Attr),
+    wxTextCtrl:appendText(TC, "This line is in default color\n"),
+    wxTextAttr:destroy(Attr),
+    wxWindow:show(Frame),
+    wx_test_lib:wx_destroy(Frame,Config).
diff --git a/lib/wx/test/wxt.erl b/lib/wx/test/wxt.erl
index 1f5b1cc3b1..c14d3f8647 100644
--- a/lib/wx/test/wxt.erl
+++ b/lib/wx/test/wxt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -72,7 +72,7 @@ resolve({Suite0, Case}) when is_atom(Suite0), is_atom(Case) ->
 	{Suite, Case2} ->
 	    {Suite, Case2}
     end;
-resolve(List) when list(List) ->
+resolve(List) when is_list(List) ->
     [resolve(Case) || Case <- List].
 
 alias(Suite) when is_atom(Suite) ->
@@ -104,7 +104,7 @@ read_config() ->
     end.
 
 %% Write new default config file
-write_config(Config) when list(Config) ->
+write_config(Config) when is_list(Config) ->
     Fname = config_fname(),
     {ok, Fd} = file:open(Fname, write),
     write_list(Fd, Config),
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index 02899f4115..8685c633d4 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 0.98.10
+WX_VSN = 0.99
diff --git a/lib/xmerl/doc/src/make.dep b/lib/xmerl/doc/src/make.dep
deleted file mode 100644
index 9c303fc41c..0000000000
--- a/lib/xmerl/doc/src/make.dep
+++ /dev/null
@@ -1,24 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex part.tex ref_man.tex xmerl.tex xmerl_eventp.tex \
-		xmerl_scan.tex xmerl_ug.tex xmerl_xpath.tex \
-		xmerl_xs.tex xmerl_xsd.tex xmerl_sax_parser.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-xmerl_ug.tex: motorcycles.txt motorcycles2html.erl motorcycles_dtd.txt \
-		new_motorcycles.txt new_motorcycles2.txt
-
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 697823eee2..15c42d6f6a 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -31,6 +31,63 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.2.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fixed a schema search bug in xmerl_xsd. </p> <p> A
+	    new flag was needed in the xsd_state record so if the
+	    state is saved there is an incompatibility and a state
+	    conversion is needed. </p>
+          <p>
+	    *** INCOMPATIBILITY with R14B03 ***</p>
+          <p>
+	    Own Id: OTP-9410</p>
+        </item>
+        <item>
+	    <p> Fixed xmerl_scan problems with entities in attribute
+	    values. </p>
+          <p>
+	    Own Id: OTP-9411</p>
+        </item>
+        <item>
+	    <p> Streaming bug in xmerl_scan. </p> <p> If the
+	    continuation_fun runs out of input at the end of an
+	    attribute value then it crashed. (Thanks to Simon
+	    Cornish) </p>
+          <p>
+	    Own Id: OTP-9457</p>
+        </item>
+        <item>
+          <p>
+	    Fixed xmerl_ucs UCS2 little endian en/decoding</p>
+          <p>
+	    Corrected number of shift bytes in
+	    xmerl_ucs:char_to_ucs2le and recursive call from
+	    from_ucs2le to from_ucs4le. (Thanks to Michal Ptaszek)</p>
+          <p>
+	    Own Id: OTP-9548</p>
+        </item>
+        <item>
+          <p>
+	    Add latin9 (iso-8859-15) support in xmerl_ucs (Thanks to
+	    David Julien)</p>
+          <p>
+	    Own Id: OTP-9552</p>
+        </item>
+        <item>
+          <p>
+	    Improve spelling throughout documentation, code comments
+	    and error messages</p>
+          <p>
+	    Own Id: OTP-9555</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.2.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/xmerl/src/xmerl.erl b/lib/xmerl/src/xmerl.erl
index cf78f7bdf7..2332517988 100644
--- a/lib/xmerl/src/xmerl.erl
+++ b/lib/xmerl/src/xmerl.erl
@@ -307,7 +307,7 @@ apply_cb(Ms, F, Df, Args) ->
 
 apply_cb([M|Ms], F, Df, Args, Ms0) ->
     case catch apply(M, F, Args) of
-	{'EXIT', {undef,[{M,F,_}|_]}} ->
+	{'EXIT', {undef,[{M,F,_,_}|_]}} ->
 	    apply_cb(Ms, F, Df, Args, Ms0);
 	{'EXIT', Reason} ->
 	    exit(Reason);
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index e598c5f56d..25c6547497 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -2074,10 +2074,10 @@ scan_element(T, S, Pos, Name, StartL, StartC, Attrs, Lang, Parents,
     {AttName, NamespaceInfo, T1, S1} = scan_name(T, S),
     {T2, S2} = scan_eq(T1, S1),
     {AttType,_DefaultDecl} = get_att_type(S2,AttName,Name),
-    {AttValue, T3, S3,IsNorm} = scan_att_value(T2, S2, AttType),
+    {AttValue, T3a, S3a,IsNorm} = scan_att_value(T2, S2, AttType),
 %%    check_default_value(S3,DefaultDecl,AttValue),
     NewNS = check_namespace(AttName, NamespaceInfo, AttValue, NS),
-    wfc_whitespace_betw_attrs(hd(T3),S3),
+    {T3,S3} = wfc_whitespace_betw_attrs(T3a,S3a),
     ?strip4,  
     AttrPos = case Attrs of
 		  [] ->
@@ -3284,12 +3284,17 @@ wfc_legal_char(Ch,S) ->
     end.
 
 
-wfc_whitespace_betw_attrs(WS,_S) when ?whitespace(WS) ->
-    ok;
-wfc_whitespace_betw_attrs($/,_S) ->
-    ok;
-wfc_whitespace_betw_attrs($>,_S) ->
-    ok;
+wfc_whitespace_betw_attrs([WS |_]=L,S) when ?whitespace(WS) ->
+    {L,S};
+wfc_whitespace_betw_attrs([$/ |_]=L,S) ->
+    {L,S};
+wfc_whitespace_betw_attrs([$> |_]=L,S) ->
+    {L,S};
+wfc_whitespace_betw_attrs([],S=#xmerl_scanner{continuation_fun = F}) ->
+    ?dbg("cont()...~n", []),
+    F(fun(MoreBytes, S1) -> wfc_whitespace_betw_attrs(MoreBytes, S1) end,
+      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      S);
 wfc_whitespace_betw_attrs(_,S) ->
     ?fatal({whitespace_required_between_attributes},S).
 
diff --git a/lib/xmerl/src/xmerl_ucs.erl b/lib/xmerl/src/xmerl_ucs.erl
index 7c45c838ab..6550a9d954 100644
--- a/lib/xmerl/src/xmerl_ucs.erl
+++ b/lib/xmerl/src/xmerl_ucs.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-2011. 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.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -43,6 +43,7 @@
 -export([to_utf16be/1, from_utf16be/1, from_utf16be/2]).
 -export([to_utf16le/1, from_utf16le/1, from_utf16le/2]).
 -export([to_utf8/1, from_utf8/1]).
+-export([from_latin9/1]).
 
 %%% NB: Non-canonical UTF-8 encodings and incorrectly used
 %%% surrogate-pair codes are disallowed by this code.  There are
@@ -177,13 +178,27 @@ to_utf8(List) when is_list(List) -> lists:flatmap(fun to_utf8/1, List);
 to_utf8(Ch) -> char_to_utf8(Ch).
 
 from_utf8(Bin) when is_binary(Bin) -> from_utf8(binary_to_list(Bin));
-from_utf8(List) -> 
+from_utf8(List) ->
     case expand_utf8(List) of
 	{Result,0} -> Result;
 	{_Res,_NumBadChar} ->
 	    exit({ucs,{bad_utf8_character_code}})
     end.
 
+%%% Latin9 support
+from_latin9(Bin) when is_binary(Bin) -> from_latin9(binary_to_list(Bin));
+from_latin9(List) ->
+    [ latin9_to_ucs4(Char) || Char <- List].
+
+latin9_to_ucs4(16#A4) -> 16#20AC;
+latin9_to_ucs4(16#A6) -> 16#160;
+latin9_to_ucs4(16#A8) -> 16#161;
+latin9_to_ucs4(16#B4) -> 16#17D;
+latin9_to_ucs4(16#B8) -> 16#17E;
+latin9_to_ucs4(16#BC) -> 16#152;
+latin9_to_ucs4(16#BD) -> 16#153;
+latin9_to_ucs4(16#BE) -> 16#178;
+latin9_to_ucs4(Other) -> Other.
 
 
 
@@ -238,7 +253,7 @@ from_ucs4le(Bin,Acc,Tail) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% UCS-2 support
-%%% FIXME! Don't know how to encode UCS-2!! 
+%%% FIXME! Don't know how to encode UCS-2!!
 %%% Currently I just encode as UCS-4, but strips the 16 higher bits.
 char_to_ucs2be(Ch) ->
     true = is_iso10646(Ch),
@@ -259,15 +274,15 @@ from_ucs2be(Bin,Acc,Tail) ->
 
 char_to_ucs2le(Ch) ->
     true = is_iso10646(Ch),
-    [(Ch bsr 16) band 16#FF,
-     (Ch bsr 24)].
+    [Ch band 16#FF,
+     (Ch bsr 8) band 16#FF].
 
 
 from_ucs2le(<<Ch:16/little-signed-integer, Rest/binary>>,Acc,Tail) ->
     if Ch < 0; Ch >= 16#D800, Ch < 16#E000; Ch =:= 16#FFFE; Ch =:= 16#FFFF ->
 	    exit({bad_character_code,Ch});
        true ->
-	    from_ucs4le(Rest,[Ch|Acc],Tail)
+	    from_ucs2le(Rest,[Ch|Acc],Tail)
     end;
 from_ucs2le(<<>>,Acc,Tail) ->
     lists:reverse(Acc,Tail);
@@ -476,6 +491,8 @@ to_unicode(Input,Cs) when Cs=='iso_8859-1:1987';Cs=='iso-ir-100';
 			  Cs=='l1';Cs=='ibm819';
 			  Cs=='cp819';Cs=='csisolatin1' ->
     Input;
+to_unicode(Input,Cs) when Cs=='iso_8859-15';Cs=='iso-8859-15';Cs=='latin9' ->
+    from_latin9(Input);
 % to_unicode(Input,Cs) when Cs=='mnemonic';Cs=='"mnemonic+ascii+38';
 % 			  Cs=='mnem';Cs=='"mnemonic+ascii+8200' ->
 %     from_mnemonic(Input);
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index f003cc74ba..dfdc6138ef 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -355,9 +355,9 @@ initiate_state(Opts,Schema) ->
     XSDBase = filename:dirname(Schema),
     {{state,S},RestOpts}=new_state(Opts),
     S2 = create_tables(S),
-    S3 = initiate_state2(S2#xsd_state{schema_name = Schema, xsd_base=XSDBase,
-				      fetch_fun = fun fetch/2}, 
-			 RestOpts).
+    initiate_state2(S2#xsd_state{schema_name = Schema, xsd_base=XSDBase,
+				 fetch_fun = fun fetch/2}, 
+		    RestOpts).
 
 initiate_state2(S,[]) ->
     S;
@@ -742,7 +742,7 @@ element_content({IDC,S},El,Env)
 	    {{IDC,IDConstr},S3};
 	Err ->
 	    S3 = acc_errs(S2,{error_path(El,El#xmlElement.name),?MODULE,
-			      {erronous_content_in_identity_constraint,IDC,Err}}),
+			      {erroneous_content_in_identity_constraint,IDC,Err}}),
 	    {{IDC,[]},S3}
     end;
 element_content({selector,S},Sel,_Env) ->
@@ -5571,7 +5571,7 @@ format_error({incomplete_file,_FileName,_Other}) ->
     "Schema: The file containing a schema state must be produced by xmerl_xsd:state2file/[1,2].";
 format_error({unexpected_content_in_any,A}) ->
     io_lib:format("Schema: The any type is considered to have no content besides annotation. ~p was found.",[A]);
-format_error({erronous_content_in_identity_constraint,IDC,Err}) ->
+format_error({erroneous_content_in_identity_constraint,IDC,Err}) ->
     io_lib:format("Schema: An ~p identity constraint must have one selector and one or more field in content. This case ~p",[IDC,Err]);
 format_error({missing_xpath_attribute,IDCContent}) ->
     io_lib:format("Schema: A ~p in a identity constraint must have a xpath attribute.",[IDCContent]);
diff --git a/lib/xmerl/test/Makefile b/lib/xmerl/test/Makefile
index 9715aa054a..5a2a585841 100644
--- a/lib/xmerl/test/Makefile
+++ b/lib/xmerl/test/Makefile
@@ -124,4 +124,4 @@ release_tests_spec: opt
 	@tar cfh - xmerl_xsd_MS2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 	@tar cfh - xmerl_xsd_NIST2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 	@tar cfh - xmerl_xsd_Sun2002-01-16_SUITE_data | (cd $(RELSYSDIR); tar xf -)
-	chmod -f -R u+w $(RELSYSDIR)
+	chmod -R u+w $(RELSYSDIR)
diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index 0c809dbcb6..94c38d4d48 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -58,7 +58,7 @@ groups() ->
      {ticket_tests, [],
       [ticket_5998, ticket_7211, ticket_7214, ticket_7430,
        ticket_6873, ticket_7496, ticket_8156, ticket_8697,
-       ticket_9411]},
+       ticket_9411, ticket_9457]},
      {app_test, [], [{xmerl_app_test, all}]},
      {appup_test, [], [{xmerl_appup_test, all}]}].
 
@@ -588,7 +588,26 @@ ticket_9411(Config) ->
     ?line {E, _} = xmerl_scan:string(Xml),
     ?line {E, _} = xmerl_xsd:validate(E, Schema).
 
-
+ticket_9457(suite) -> [];
+ticket_9457(doc) -> 
+    ["Test that xmerl_scan handles continuation correct when current input runs out at the end of an attribute value"];
+ticket_9457(Config) ->
+    Opts = [{continuation_fun, fun ticket_9457_cont/3, start}, {space, normalize}],
+    ?line {E, _} = xmerl_scan:string([], Opts).
+
+ticket_9457_cont(Continue, Exception, GlobalState) ->
+    case xmerl_scan:cont_state(GlobalState) of
+	start ->
+	    G1 = xmerl_scan:cont_state(next, GlobalState),
+	    Bytes = "<?xml version=\"1.0\" ?>\r\n<item a=\"b\"",
+	    Continue(Bytes, G1);
+	next ->
+	    G1 = xmerl_scan:cont_state(last, GlobalState),
+	    Bytes = ">blah</item>\r\n",
+	    Continue(Bytes, G1);
+	_ ->
+	    Exception(GlobalState)
+    end.
 
 %%======================================================================
 %% Support Functions
diff --git a/lib/xmerl/test/xmerl_test_lib.erl b/lib/xmerl/test/xmerl_test_lib.erl
index a83956c076..e82ad283b2 100644
--- a/lib/xmerl/test/xmerl_test_lib.erl
+++ b/lib/xmerl/test/xmerl_test_lib.erl
@@ -87,6 +87,6 @@ keysearch_delete(Key,N,List) ->
 %% the original data directory.
 
 get_data_dir(Config) ->
-    Data0 = ?config(data_dir, Config),
-    {ok,Data,_} = regexp:sub(Data0, "xmerl_sax_std_SUITE", "xmerl_std_SUITE"),
-    Data.
+    Data = ?config(data_dir, Config),
+    Opts = [{return,list}],
+    re:replace(Data, "xmerl_sax_std_SUITE", "xmerl_std_SUITE", Opts).
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 965a0ae7b4..82df8fdeef 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.2.9
+XMERL_VSN = 1.2.10