diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 97b9001aecf9..812a812adf57 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r10b9
-PORTREVISION=	1
+PORTVERSION=	r10b10
 PORTEPOCH=	1
 CATEGORIES=	lang parallel
 MASTER_SITES=	http://www.erlang.org/download/        \
@@ -15,7 +14,7 @@ MASTER_SITES=	http://www.erlang.org/download/        \
 		http://www.erlang.org/download/        \
 		http://erlang.stacken.kth.se/download/ \
 		http://www.csd.uu.se/ftp/mirror/erlang/download/
-DISTNAME=	otp_src_R10B-9
+DISTNAME=	otp_src_R10B-10
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -59,9 +58,9 @@ LIB_DEPENDS+=           iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=     otp_doc_man_R10B-9.tar.gz
+ERLANG_MAN=     otp_doc_man_R10B-10.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R10B-9.tar.gz
+ERLANG_DOCS=	otp_doc_html_R10B-10.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index 357a1647a7cc..ed747a4e6e07 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.4.12
+ERTS_VSN=	5.4.13
 OTP_LIBS=	appmon-2.1.5 \
 		asn1-1.4.4.9 \
-		compiler-4.3.11 \
+		compiler-4.3.12 \
 		cosEvent-2.1 \
 		cosEventDomain-1.1 \
 		cosFileTransfer-1.1.2 \
@@ -14,34 +14,34 @@ OTP_LIBS=	appmon-2.1.5 \
 		crypto-1.4 \
 		debugger-3.0.1 \
 		edoc-0.6.8 \
-		erl_interface-3.5.4 \
+		erl_interface-3.5.5 \
 		et-1.0 \
 		gs-1.5.4 \
-		hipe-3.5.4 \
+		hipe-3.5.5 \
 		ic-4.2.9 \
-		inets-4.6.2 \
+		inets-4.7.2 \
 		jinterface-1.3 \
-		kernel-2.10.12 \
-		megaco-3.2.3 \
+		kernel-2.10.13 \
+		megaco-3.3 \
 		mnemosyne-1.2.5.1 \
-		mnesia-4.2.3 \
+		mnesia-4.2.5 \
 		mnesia_session-1.1.5 \
 		observer-0.9.6.2 \
-		odbc-2.0.5 \
+		odbc-2.0.6 \
 		orber-3.6.2 \
-		os_mon-1.8 \
+		os_mon-2.0 \
 		otp_mibs-1.0.4 \
 		parsetools-1.3.2 \
 		pman-2.5.2 \
 		runtime_tools-1.5.1.1 \
 		sasl-2.1.1 \
-		snmp-4.6.1 \
-		ssh-0.9 \
-		ssl-3.0.10 \
-		stdlib-1.13.11 \
+		snmp-4.7.1 \
+		ssh-0.9.1 \
+		ssl-3.0.11 \
+		stdlib-1.13.12 \
 		syntax_tools-1.4.3 \
 		toolbar-1.2.1 \
-		tools-2.4.6 \
+		tools-2.4.7 \
 		tv-2.1.2 \
 		webtool-0.8.2 \
 		xmerl-1.0.3
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index 4b64f03ae781..106ea3e09e7c 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -123,6 +123,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	erl_error.3 \
 	erl_eterm.3 \
 	erl_eval.3 \
+	erl_expand_records.3 \
 	erl_format.3 \
 	erl_global.3 \
 	erl_id_trans.3 \
@@ -297,11 +298,6 @@ MAN3=	CosEventChannelAdmin.3 \
 	webtool.3 \
 	win32reg.3 \
 	wrap_log_reader.3 \
-	xmerl.3 \
-	xmerl_eventp.3 \
-	xmerl_scan.3 \
-	xmerl_xpath.3 \
-	xmerl_xs.3 \
 	xref.3 \
 	yecc.3 \
 	zlib.3
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 2e8ecd13c2c6..8b95abe63e05 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-MD5 (erlang/otp_src_R10B-9.tar.gz) = 05791e9097f36202eb705df2a1db6500
-SHA256 (erlang/otp_src_R10B-9.tar.gz) = 60bf7045805310f8b5ccc3b0472d7c25e190171d2773bc38d6ef051c6006f5ce
-SIZE (erlang/otp_src_R10B-9.tar.gz) = 9961340
-MD5 (erlang/otp_doc_man_R10B-9.tar.gz) = 051cd9893b36313f20a420bc2491905c
-SHA256 (erlang/otp_doc_man_R10B-9.tar.gz) = de2139727d429a7abf64b8e53575e89d33c6f31087ffc3369539cd860c832223
-SIZE (erlang/otp_doc_man_R10B-9.tar.gz) = 600937
-MD5 (erlang/otp_doc_html_R10B-9.tar.gz) = 108bc01be67aaa2edde9a0331ef9bc71
-SHA256 (erlang/otp_doc_html_R10B-9.tar.gz) = 198eea5c9f731da9312ae63e187237123a32a4b5696782e3e5518f521ec3d3bb
-SIZE (erlang/otp_doc_html_R10B-9.tar.gz) = 4656131
+MD5 (erlang/otp_src_R10B-10.tar.gz) = c1405c885f07d661b7362b822d571586
+SHA256 (erlang/otp_src_R10B-10.tar.gz) = bd87e1b09f1f3d694fc32ef4d27372e25c95ce35b383c7747ab40c27471c28ac
+SIZE (erlang/otp_src_R10B-10.tar.gz) = 9445437
+MD5 (erlang/otp_doc_man_R10B-10.tar.gz) = 207e00bcaf5a9428bd86e3973f9b699f
+SHA256 (erlang/otp_doc_man_R10B-10.tar.gz) = 8ecfc9b627200f59c35591a743e03a587258ddcdd39052a0b2cb58b80f6fc20b
+SIZE (erlang/otp_doc_man_R10B-10.tar.gz) = 594690
+MD5 (erlang/otp_doc_html_R10B-10.tar.gz) = d6e9655ff07af642025b0465c5e7e1a6
+SHA256 (erlang/otp_doc_html_R10B-10.tar.gz) = 2373d6935b44b64a137bf8ba198dca3fb782d0c072735b172ae4420c380a5d9c
+SIZE (erlang/otp_doc_html_R10B-10.tar.gz) = 4655081
diff --git a/lang/erlang/files/patch-lib_hipe_cerl_cerl__hipeify.erl b/lang/erlang/files/patch-lib_hipe_cerl_cerl__hipeify.erl
new file mode 100644
index 000000000000..3f19ff5bfe1d
--- /dev/null
+++ b/lang/erlang/files/patch-lib_hipe_cerl_cerl__hipeify.erl
@@ -0,0 +1,34 @@
+
+$FreeBSD$
+
+--- lib/hipe/cerl/cerl_hipeify.erl.orig
++++ lib/hipe/cerl/cerl_hipeify.erl
+@@ -14,7 +14,7 @@
+ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ %% USA
+ %%
+-%% $Id$
++%% $Id: cerl_hipeify.erl,v 1.23 2006/03/10 13:40:37 tobiasl Exp $
+ %%
+ %% @author Richard Carlsson <richardc@csd.uu.se>
+ %% @copyright 2000-2004 Richard Carlsson
+@@ -361,6 +361,19 @@
+ 				cerl:atom_val(F),
+ 				length(As))
+ 		of
++	        {yes, ?PRIMOP_IS_RECORD} ->
++		    %% Needs additional testing
++		    [_, Tag, Arity] = As,
++		    case (cerl:is_c_atom(Tag) andalso 
++			  cerl:is_c_int(Arity)) of
++		        true ->
++			    %% The primop might need further handling
++			    N1 = cerl:c_atom(?PRIMOP_IS_RECORD),
++			    E1 = cerl:update_c_primop(E, N1, As),
++			    rewrite_primop(E1, N1, As, S);
++		        false ->
++			    cerl:update_c_call(E, M, F, As)
++		    end;
+ 		{yes, N} ->
+ 		    %% The primop might need further handling
+ 		    N1 = cerl:c_atom(N),
diff --git a/lang/erlang/files/patch-lib_odbc_configure b/lang/erlang/files/patch-lib_odbc_configure
deleted file mode 100644
index f74d6e1e696f..000000000000
--- a/lang/erlang/files/patch-lib_odbc_configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/odbc/configure.orig
-+++ lib/odbc/configure
-@@ -1005,7 +1005,7 @@
- 	       echo $ac_n "checking for odbc in standard locations""... $ac_c" 1>&6
- echo "configure:1007: checking for odbc in standard locations" >&5
- 	         for dir in /usr/local/odbc /usr/odbc \
--		     /usr /opt/local/pgm/odbc 
-+		     /usr /opt/local/pgm/odbc /usr/local
- 		 do   
- 		    if test -f "$dir/include/sql.h"; then
- 		      is_odbc_std_location=yes	   
diff --git a/lang/erlang/pkg-message b/lang/erlang/pkg-message
index f69818d24d60..1f830b0ed3e2 100644
--- a/lang/erlang/pkg-message
+++ b/lang/erlang/pkg-message
@@ -7,7 +7,7 @@ Installation tips:
 
 You can find an emacs mode for Erlang here:
 
-    ${LOCALBASE}/lib/erlang/lib/tools-2.4.6/emacs
+    ${LOCALBASE}/lib/erlang/lib/tools-2.4.7/emacs
 
 You may wish to add the following line to /etc/manpath.config:
 
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 97b9001aecf9..812a812adf57 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r10b9
-PORTREVISION=	1
+PORTVERSION=	r10b10
 PORTEPOCH=	1
 CATEGORIES=	lang parallel
 MASTER_SITES=	http://www.erlang.org/download/        \
@@ -15,7 +14,7 @@ MASTER_SITES=	http://www.erlang.org/download/        \
 		http://www.erlang.org/download/        \
 		http://erlang.stacken.kth.se/download/ \
 		http://www.csd.uu.se/ftp/mirror/erlang/download/
-DISTNAME=	otp_src_R10B-9
+DISTNAME=	otp_src_R10B-10
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -59,9 +58,9 @@ LIB_DEPENDS+=           iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=     otp_doc_man_R10B-9.tar.gz
+ERLANG_MAN=     otp_doc_man_R10B-10.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R10B-9.tar.gz
+ERLANG_DOCS=	otp_doc_html_R10B-10.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang14/Makefile.lib b/lang/erlang14/Makefile.lib
index 357a1647a7cc..ed747a4e6e07 100644
--- a/lang/erlang14/Makefile.lib
+++ b/lang/erlang14/Makefile.lib
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.4.12
+ERTS_VSN=	5.4.13
 OTP_LIBS=	appmon-2.1.5 \
 		asn1-1.4.4.9 \
-		compiler-4.3.11 \
+		compiler-4.3.12 \
 		cosEvent-2.1 \
 		cosEventDomain-1.1 \
 		cosFileTransfer-1.1.2 \
@@ -14,34 +14,34 @@ OTP_LIBS=	appmon-2.1.5 \
 		crypto-1.4 \
 		debugger-3.0.1 \
 		edoc-0.6.8 \
-		erl_interface-3.5.4 \
+		erl_interface-3.5.5 \
 		et-1.0 \
 		gs-1.5.4 \
-		hipe-3.5.4 \
+		hipe-3.5.5 \
 		ic-4.2.9 \
-		inets-4.6.2 \
+		inets-4.7.2 \
 		jinterface-1.3 \
-		kernel-2.10.12 \
-		megaco-3.2.3 \
+		kernel-2.10.13 \
+		megaco-3.3 \
 		mnemosyne-1.2.5.1 \
-		mnesia-4.2.3 \
+		mnesia-4.2.5 \
 		mnesia_session-1.1.5 \
 		observer-0.9.6.2 \
-		odbc-2.0.5 \
+		odbc-2.0.6 \
 		orber-3.6.2 \
-		os_mon-1.8 \
+		os_mon-2.0 \
 		otp_mibs-1.0.4 \
 		parsetools-1.3.2 \
 		pman-2.5.2 \
 		runtime_tools-1.5.1.1 \
 		sasl-2.1.1 \
-		snmp-4.6.1 \
-		ssh-0.9 \
-		ssl-3.0.10 \
-		stdlib-1.13.11 \
+		snmp-4.7.1 \
+		ssh-0.9.1 \
+		ssl-3.0.11 \
+		stdlib-1.13.12 \
 		syntax_tools-1.4.3 \
 		toolbar-1.2.1 \
-		tools-2.4.6 \
+		tools-2.4.7 \
 		tv-2.1.2 \
 		webtool-0.8.2 \
 		xmerl-1.0.3
diff --git a/lang/erlang14/Makefile.man b/lang/erlang14/Makefile.man
index 4b64f03ae781..106ea3e09e7c 100644
--- a/lang/erlang14/Makefile.man
+++ b/lang/erlang14/Makefile.man
@@ -123,6 +123,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	erl_error.3 \
 	erl_eterm.3 \
 	erl_eval.3 \
+	erl_expand_records.3 \
 	erl_format.3 \
 	erl_global.3 \
 	erl_id_trans.3 \
@@ -297,11 +298,6 @@ MAN3=	CosEventChannelAdmin.3 \
 	webtool.3 \
 	win32reg.3 \
 	wrap_log_reader.3 \
-	xmerl.3 \
-	xmerl_eventp.3 \
-	xmerl_scan.3 \
-	xmerl_xpath.3 \
-	xmerl_xs.3 \
 	xref.3 \
 	yecc.3 \
 	zlib.3
diff --git a/lang/erlang14/distinfo b/lang/erlang14/distinfo
index 2e8ecd13c2c6..8b95abe63e05 100644
--- a/lang/erlang14/distinfo
+++ b/lang/erlang14/distinfo
@@ -1,9 +1,9 @@
-MD5 (erlang/otp_src_R10B-9.tar.gz) = 05791e9097f36202eb705df2a1db6500
-SHA256 (erlang/otp_src_R10B-9.tar.gz) = 60bf7045805310f8b5ccc3b0472d7c25e190171d2773bc38d6ef051c6006f5ce
-SIZE (erlang/otp_src_R10B-9.tar.gz) = 9961340
-MD5 (erlang/otp_doc_man_R10B-9.tar.gz) = 051cd9893b36313f20a420bc2491905c
-SHA256 (erlang/otp_doc_man_R10B-9.tar.gz) = de2139727d429a7abf64b8e53575e89d33c6f31087ffc3369539cd860c832223
-SIZE (erlang/otp_doc_man_R10B-9.tar.gz) = 600937
-MD5 (erlang/otp_doc_html_R10B-9.tar.gz) = 108bc01be67aaa2edde9a0331ef9bc71
-SHA256 (erlang/otp_doc_html_R10B-9.tar.gz) = 198eea5c9f731da9312ae63e187237123a32a4b5696782e3e5518f521ec3d3bb
-SIZE (erlang/otp_doc_html_R10B-9.tar.gz) = 4656131
+MD5 (erlang/otp_src_R10B-10.tar.gz) = c1405c885f07d661b7362b822d571586
+SHA256 (erlang/otp_src_R10B-10.tar.gz) = bd87e1b09f1f3d694fc32ef4d27372e25c95ce35b383c7747ab40c27471c28ac
+SIZE (erlang/otp_src_R10B-10.tar.gz) = 9445437
+MD5 (erlang/otp_doc_man_R10B-10.tar.gz) = 207e00bcaf5a9428bd86e3973f9b699f
+SHA256 (erlang/otp_doc_man_R10B-10.tar.gz) = 8ecfc9b627200f59c35591a743e03a587258ddcdd39052a0b2cb58b80f6fc20b
+SIZE (erlang/otp_doc_man_R10B-10.tar.gz) = 594690
+MD5 (erlang/otp_doc_html_R10B-10.tar.gz) = d6e9655ff07af642025b0465c5e7e1a6
+SHA256 (erlang/otp_doc_html_R10B-10.tar.gz) = 2373d6935b44b64a137bf8ba198dca3fb782d0c072735b172ae4420c380a5d9c
+SIZE (erlang/otp_doc_html_R10B-10.tar.gz) = 4655081
diff --git a/lang/erlang14/files/patch-lib_hipe_cerl_cerl__hipeify.erl b/lang/erlang14/files/patch-lib_hipe_cerl_cerl__hipeify.erl
new file mode 100644
index 000000000000..3f19ff5bfe1d
--- /dev/null
+++ b/lang/erlang14/files/patch-lib_hipe_cerl_cerl__hipeify.erl
@@ -0,0 +1,34 @@
+
+$FreeBSD$
+
+--- lib/hipe/cerl/cerl_hipeify.erl.orig
++++ lib/hipe/cerl/cerl_hipeify.erl
+@@ -14,7 +14,7 @@
+ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ %% USA
+ %%
+-%% $Id$
++%% $Id: cerl_hipeify.erl,v 1.23 2006/03/10 13:40:37 tobiasl Exp $
+ %%
+ %% @author Richard Carlsson <richardc@csd.uu.se>
+ %% @copyright 2000-2004 Richard Carlsson
+@@ -361,6 +361,19 @@
+ 				cerl:atom_val(F),
+ 				length(As))
+ 		of
++	        {yes, ?PRIMOP_IS_RECORD} ->
++		    %% Needs additional testing
++		    [_, Tag, Arity] = As,
++		    case (cerl:is_c_atom(Tag) andalso 
++			  cerl:is_c_int(Arity)) of
++		        true ->
++			    %% The primop might need further handling
++			    N1 = cerl:c_atom(?PRIMOP_IS_RECORD),
++			    E1 = cerl:update_c_primop(E, N1, As),
++			    rewrite_primop(E1, N1, As, S);
++		        false ->
++			    cerl:update_c_call(E, M, F, As)
++		    end;
+ 		{yes, N} ->
+ 		    %% The primop might need further handling
+ 		    N1 = cerl:c_atom(N),
diff --git a/lang/erlang14/files/patch-lib_odbc_configure b/lang/erlang14/files/patch-lib_odbc_configure
deleted file mode 100644
index f74d6e1e696f..000000000000
--- a/lang/erlang14/files/patch-lib_odbc_configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/odbc/configure.orig
-+++ lib/odbc/configure
-@@ -1005,7 +1005,7 @@
- 	       echo $ac_n "checking for odbc in standard locations""... $ac_c" 1>&6
- echo "configure:1007: checking for odbc in standard locations" >&5
- 	         for dir in /usr/local/odbc /usr/odbc \
--		     /usr /opt/local/pgm/odbc 
-+		     /usr /opt/local/pgm/odbc /usr/local
- 		 do   
- 		    if test -f "$dir/include/sql.h"; then
- 		      is_odbc_std_location=yes	   
diff --git a/lang/erlang14/pkg-message b/lang/erlang14/pkg-message
index f69818d24d60..1f830b0ed3e2 100644
--- a/lang/erlang14/pkg-message
+++ b/lang/erlang14/pkg-message
@@ -7,7 +7,7 @@ Installation tips:
 
 You can find an emacs mode for Erlang here:
 
-    ${LOCALBASE}/lib/erlang/lib/tools-2.4.6/emacs
+    ${LOCALBASE}/lib/erlang/lib/tools-2.4.7/emacs
 
 You may wish to add the following line to /etc/manpath.config: