diff --git a/de.bmotionstudio.help/META-INF/MANIFEST.MF b/de.bmotionstudio.help/META-INF/MANIFEST.MF
index 55322ca98a127f4e98ca410dd541e61e565015a9..2a3c26e48a13dd905f4cf8073d66bcae49f1d6c3 100644
--- a/de.bmotionstudio.help/META-INF/MANIFEST.MF
+++ b/de.bmotionstudio.help/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.eclipse.help;bundle-version="3.5.100"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: HHU Düsseldorf STUPS Group
+Eclipse-RegisterBuddy: de.bmotionstudio.gef.editor
 Bundle-ClassPath: lib/org.eclipse.mylyn.wikitext.core_1.7.0.I20120513-1032.jar,
  lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.7.0.I20120513-1032.jar,
  .
diff --git a/de.bmotionstudio.help/customBuild.xml b/de.bmotionstudio.help/customBuild.xml
index 9a76d6d5a566670a590bd0292bcafbf0fedba6d1..9885823bf43374c91fed743860767d28de87d6c7 100644
--- a/de.bmotionstudio.help/customBuild.xml
+++ b/de.bmotionstudio.help/customBuild.xml
@@ -52,7 +52,6 @@
     	    		generateUnifiedToc="false">
     	    		<path name="User_Guide/Tutorial" title="BMotion Studio Tutorial" generateToc="true"/>
     	    		<path name="User_Guide/Reference" title="BMotion Studio Reference" generateToc="true"/>
-    		        <path name="User_Guide/Glossary" title="BMotion Studio Glossary" generateToc="true"/>
     	    		<pageAppendum>
 = Updating This Document =
 
diff --git a/de.bmotionstudio.help/plugin.xml b/de.bmotionstudio.help/plugin.xml
index 18c73be8a45716c079f354924d055b75a3b91641..15735205f7fe0e34ac72b93fe7553cbeadb4ed55 100644
--- a/de.bmotionstudio.help/plugin.xml
+++ b/de.bmotionstudio.help/plugin.xml
@@ -18,11 +18,6 @@
             file="User-Guide-Reference-toc.xml"
             primary="false">
       </toc>
-      <toc
-            category="BMS"
-            file="User-Guide-Glossary-toc.xml"
-            primary="false">
-      </toc>      
    </extension>
 
 </plugin>
diff --git a/de.bmotionstudio.help/toc.xml b/de.bmotionstudio.help/toc.xml
index bf6e880b55058dd6f9acd3949181e86d0ca79a15..95c83a4d527e1dc8ca8d580b90d1b90e59b2b42c 100644
--- a/de.bmotionstudio.help/toc.xml
+++ b/de.bmotionstudio.help/toc.xml
@@ -14,12 +14,6 @@
     <anchor id="after-reference-content"/>
     <anchor id="additions-reference" />
   </topic>
-  <topic label="Glossary">
-    <anchor id="before-glossary-content"/>
-    <link toc="User-Guide-Glossary-toc.xml"/>
-    <anchor id="after-glossary-content"/>
-    <anchor id="additions-glossary"/>
-  </topic>  
    <anchor id="after-reference"/>
    <anchor id="additions"/>
  	<topic href="doc/notices.html" label="Legal" />