3 files changed, 23 insertions, 40 deletions
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index cc64889b17..1185b7658f 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -33,6 +33,24 @@
   </header>
 
   <section>
+    <title>Orber 3.6.15</title>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <list type="bulleted">
+        <item>
+          <p>Removed superfluous VT in the documentation.</p>
+          <p>Own id: OTP-8353 Aux Id:</p>
+        </item>
+        <item>
+          <p>Removed superfluous backslash in the documentation.</p>
+          <p>Own id: OTP-8354 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
+  <section>
     <title>Orber 3.6.14</title>
 
     <section>
diff --git a/lib/orber/doc/src/part_notes_history.xml b/lib/orber/doc/src/part_notes_history.xml
deleted file mode 100644
index 624865014e..0000000000
--- a/lib/orber/doc/src/part_notes_history.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <header>
-    <copyright>
-      <year>2004</year>
-      <year>2007</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>
-
-    <title>Orber Release Notes History</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2004-09-15</date>
-    <rev>1.0</rev>
-  </header>
-  <description>
-    <p>The Orber Application is an Erlang implementation of a CORBA Object 
-      Request Broker.</p>
-  </description>
-  <include file="notes_history"></include>
-</part>
-
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index 8ccdc9792c..ccba631fb5 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1,7 +1,10 @@
 
-ORBER_VSN = 3.6.14
+ORBER_VSN = 3.6.15
 
-TICKETS = OTP-8201
+TICKETS = OTP-8353 \
+	OTP-8354
+
+TICKETS_3.6.14 = OTP-8201
 
 TICKETS_3.6.13 = OTP-7987