3 files changed, 4 insertions, 14 deletions
diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
index 1c6781e5fd..d96350f4d5 100644
--- a/lib/orber/src/Makefile
+++ b/lib/orber/src/Makefile
@@ -21,9 +21,6 @@ include $(ERL_TOP)/make/target.mk
 
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
-# To get hold of SYSTEM_VSN (e.g. R9C).
-#include $(ERL_TOP)/erts/vsn.mk
-
 # ----------------------------------------------------
 # Application version
 # ----------------------------------------------------
diff --git a/lib/orber/src/orber.app.src b/lib/orber/src/orber.app.src
index 88df4162b6..30bd90347d 100644
--- a/lib/orber/src/orber.app.src
+++ b/lib/orber/src/orber.app.src
@@ -103,7 +103,9 @@
                 orber_iiop_pm, orber_env]},
   {applications, [stdlib, kernel, mnesia]},
   {env, []},
-  {mod, {orber, []}}
+  {mod, {orber, []}},
+  {runtime_dependencies, ["stdlib-2.0","ssl-5.3.4","mnesia-4.12","kernel-3.0",
+			  "inets-5.10","erts-6.0"]}
 ]}.
 
 
diff --git a/lib/orber/src/orber_interceptors.erl b/lib/orber/src/orber_interceptors.erl
index 407823ea79..62870b35b5 100644
--- a/lib/orber/src/orber_interceptors.erl
+++ b/lib/orber/src/orber_interceptors.erl
@@ -112,7 +112,7 @@ pop_system_message_interceptor(out) ->
 	[{_, []}] ->
 	    ok;
 	[{_, Interceptors}] ->
-	    ets:insert(orber_interceptors, {message_out_interceptors,  remove_last_element(Interceptors)});
+	    ets:insert(orber_interceptors, {message_out_interceptors,  lists:droplast(Interceptors)});
 	_ ->
 	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
     end.    
@@ -151,12 +151,3 @@ apply_message_interceptors([], F, ObjRef, Bytes) ->
 apply_message_interceptors([M | Rest], F, ObjRef, Bytes) ->
     apply_message_interceptors(Rest, F, ObjRef, apply(M, F, [ObjRef, Bytes])).
 
-
-remove_last_element([]) ->
-    [];
-remove_last_element([M]) ->
-    [];
-remove_last_element([M |Tail]) ->
-    remove_last_element([Tail]).
-
-