diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
index ec77b35..40c166d 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
@@ -25,7 +25,7 @@
 
 ###{ObjectTeams:
 otdtc.name = Extension for Object Teams
-otdtc.version = 2.1.0 M5 $LastChangedRevision$ $LastChangedDate$
+otdtc.version = 2.1.0 M6 $LastChangedRevision$ $LastChangedDate$
 otdtc.copyright = Copyright by TU Berlin, Fraunhofer FIRST and others, 2004, 2012.
 ### SH}
 ### progress
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/news/new_in_2.1.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/news/new_in_2.1.html
index 2ffefac..b9def0e 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/news/new_in_2.1.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/news/new_in_2.1.html
@@ -7,14 +7,14 @@
 </head>
 <body>
 <h1>OTDT 2.1 - New and Noteworthy</h1>
-<div class="navigation"><i>Status: 2.1 M4</i></div>
+<div class="navigation"><i>Status: 2.1 M5</i></div>
 <div class="navigation">On this page:
 <!--a href="#metrics">&bull; Metrics Plug-in</a-->
 <!--a href="#configuration">&bull; Configuration</a-->
 <!--a href="#views">&bull; Views/Dialogs</a--> 
 <a href="#assist">&bull; Content Assist</a>  
 <!--a href="#refactor">&bull; Refactoring</a-->  
-<!--a href="#formatting">&bull; Formatting</a-->
+<a href="#formatting">&bull; Formatting</a>
 <a href="#debug">&bull; Run/Debug</a>
 <a href="#language">&bull; Language</a>
 <!--a href="#api">&bull; API</a-->
@@ -82,6 +82,33 @@
     	<p><img alt="Result of &quot;Add unimplemented methods&quot; quick fix" src="../images/screenshots/NN21/ImplementFromTSuper1.png"></p>
     </td>
   </tr>
+  <tr>
+    <td><p align="right"><b>Improved handling of base imports</b><br>
+        <span class="since">since&nbsp;2.1M5</span><br>
+        <a class="buglink" title="improve handling of base imports" href="https://bugs.eclipse.org/356003">356003</a></p></td>
+    <td><p>So-called "base imports" are used in OT/J to distinguish those classes that are imported only as a base class of
+    		a role in the current team, disallowing direct use within the implementation of the team and its roles (see <a class="otjldlink" href="http://www.objectteams.org/def/1.3/s2.html#s2.1.2.d">OTJLD &sect;2.1.2(d)</a>).
+    		The umbrella bug 356003 lists several individual improvements to make content assist, wizards, and refactoring
+    		better aware of the semantic rules of base imports.
+    		In all these situations the correct base import or regular imported is now created,
+    		and base imports are correctly updated if mandated by a refactoring.
+    	</p>
+    </td>
+  </tr>
+  <tr><td colspan="2" id="formatting"><h2>Formatting</h2></td></tr>
+  <tr>
+    <td><p align="right"><b>Basid code formatting for OT/J</b><br>
+        <span class="since">since&nbsp;2.1M5</span><br>
+        <a class="buglink" title="Formatter fails silently on big Teams" href="https://bugs.eclipse.org/331731">331731</a></p></td>
+    <td><p>In previous versions support for code formatting for OT/J was incomplete, and the occurrence of some
+    		constructs like <code class="keyword">precedence</code> made the formatter silently fail.
+    		As of 2.1 M5 code formatting for OT/J now generally works for all language constructs.
+    		Results may not be optimal for all syntax elements because no special preference options have been introduced
+    		for elements like callin / callout. However, users who don't object to the default formatting style
+    		can now rely on automatic formatting of roles and teams. 
+    	</p>
+    </td>
+  </tr>
 <!--
   <tr><td colspan="2" id="refactor"><h2>Refactoring</h2></td></tr>
 -->
@@ -180,7 +207,7 @@
     <td><p>
 			An internal data structure woven into each base class was initialized eagerly causing a performance penalty.
 			This eager initialization could be removed completely, lazy initialization was already implemented.
-			For situations where lots of base objects were created for which now role was ever created
+			For situations where lots of base objects were created for which no role was ever created
 			this results in a speedup of up-to 3.5 (from a micro benchmark).
     	</p>
     </td>
diff --git a/plugins/org.eclipse.objectteams.otdt/about.ini b/plugins/org.eclipse.objectteams.otdt/about.ini
index 469a2fd..30c888e 100644
--- a/plugins/org.eclipse.objectteams.otdt/about.ini
+++ b/plugins/org.eclipse.objectteams.otdt/about.ini
@@ -1,8 +1,8 @@
 aboutText=Object Teams Development Tooling\n\
 \n\
-Version: 2.1.0 M5\n\
+Version: 2.1.0 M6\n\
 \n\
-Part of the Eclipse Juno Simultaneous Release M5\n\
+Part of the Eclipse Juno Simultaneous Release M6\n\
 \n\
 (c) Copyright TU Berlin, Fraunhofer FIRST and others, 2005, 2012\n\
 Visit http://www.eclipse.org/objectteams
diff --git a/plugins/org.eclipse.objectteams.otequinox/about.ini b/plugins/org.eclipse.objectteams.otequinox/about.ini
index 6e6a98a..109fafb 100644
--- a/plugins/org.eclipse.objectteams.otequinox/about.ini
+++ b/plugins/org.eclipse.objectteams.otequinox/about.ini
@@ -1,8 +1,8 @@
 aboutText=Object Teams -- Equinox integration (OT/Equinox)\n\
 \n\
-OT/Equinox Version: 2.1.0 M5\n\
+OT/Equinox Version: 2.1.0 M6\n\
 \n\
-Part of the Eclipse Juno Simultaneous Release M5\n\
+Part of the Eclipse Juno Simultaneous Release M6\n\
 \n\
 (c) Copyright Technical University Berlin and others, 2005, 2012\n\
 Visit http://www.eclipse.org/objectteams\n\
diff --git a/releng/map/otdt.map b/releng/map/otdt.map
index 9933930..8a9b31e 100644
--- a/releng/map/otdt.map
+++ b/releng/map/otdt.map
@@ -10,19 +10,19 @@
 plugin@org.eclipse.jdt.core,3.8.1.v_OTDT_r210_qualifier=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=org.eclipse.jdt.core
 
 !next plug-in don't specify version so that org.eclipse.objectteams.runtime/customBuildCallbacks.xml will find the plug-in directory:
-plugin@org.eclipse.objectteams.otdt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt,tag=builds/201201311800
+plugin@org.eclipse.objectteams.otdt=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt
 
 plugin@org.eclipse.objectteams.otdt.debug,2.0.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug,tag=builds/201105161939
 plugin@org.eclipse.objectteams.otdt.debug.ui,2.1.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug.ui
 plugin@org.eclipse.objectteams.otdt.ui,2.1.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui
-plugin@org.eclipse.objectteams.otdt.doc,2.1.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.doc,tag=builds/201109201811
+plugin@org.eclipse.objectteams.otdt.doc,2.1.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.doc
 plugin@org.eclipse.objectteams.otdt.metrics,0.7.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.metrics,tag=builds/201101290806
 
 plugin@org.eclipse.objectteams.runtime=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.runtime,tag=builds/201201311800
 fragment@org.eclipse.objectteams.otequinox.hook,2.1.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.hook
 fragment@org.eclipse.objectteams.otequinox.sunjvm,2.0.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.sunjvm,tag=builds/201109201811
 !the following is also referenced in otdt.doc/buildDoc.xml (plugin-name without version):
-plugin@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox,tag=builds/201201311800
+plugin@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox
 plugin@org.eclipse.objectteams.eclipse.monitor,2.0.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.eclipse.monitor,tag=builds/201105161939
 
 !not currently maintained: