diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQCHPluginListener.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQCHPluginListener.cpp
index d84a54ea03..1fae2dbb99 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQCHPluginListener.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQCHPluginListener.cpp
@@ -1,155 +1,152 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date$
  Version:   $Revision$
 
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
 
 
 #include "berryQCHPluginListener.h"
 
 #include <ctkPlugin.h>
 
 #include <QDir>
 #include <QDateTime>
 
 #include "../berryQtAssistantUtil.h"
 
 namespace berry {
 
 QCHPluginListener::QCHPluginListener(ctkPluginContext* context)
   : delayRegistration(true), context(context)
 {
 }
 
 void QCHPluginListener::processPlugins()
 {
   if (QtAssistantUtil::GetHelpCollectionFile().isEmpty())
   {
     return;
   }
 
   foreach (QSharedPointer<ctkPlugin> plugin, context->getPlugins())
   {
     if (isPluginResolved(plugin))
       addPlugin(plugin);
     else
       removePlugin(plugin);
   }
 
   delayRegistration = false;
 }
 
 void QCHPluginListener::pluginChanged(const ctkPluginEvent& event)
 {
   if (delayRegistration)
   {
     this->processPlugins();
     return;
   }
 
   /* Only should listen for RESOLVED and UNRESOLVED events.
    *
    * When a plugin is updated the Framework will publish an UNRESOLVED and
    * then a RESOLVED event which should cause the plugin to be removed
    * and then added back into the registry.
    *
    * When a plugin is uninstalled the Framework should publish an UNRESOLVED
    * event and then an UNINSTALLED event so the plugin will have been removed
    * by the UNRESOLVED event before the UNINSTALLED event is published.
    */
   QSharedPointer<ctkPlugin> plugin = event.getPlugin();
   switch (event.getType())
   {
     case ctkPluginEvent::RESOLVED :
       addPlugin(plugin);
       break;
     case ctkPluginEvent::UNRESOLVED :
       removePlugin(plugin);
       break;
   }
 }
 
 bool QCHPluginListener::isPluginResolved(QSharedPointer<ctkPlugin> plugin)
 {
   return (plugin->getState() & (ctkPlugin::RESOLVED | ctkPlugin::ACTIVE | ctkPlugin::STARTING | ctkPlugin::STOPPING)) != 0;
 }
 
 void QCHPluginListener::removePlugin(QSharedPointer<ctkPlugin> plugin)
 {
   // bail out if system plugin
   if (plugin->getPluginId() == 0) return;
 
-  QFileInfo qchDirInfo = plugin->getPluginContext()->getDataFile("qch_files/");
+  QFileInfo qchDirInfo = context->getDataFile("qch_files/" + QString::number(plugin->getPluginId()));
   if (qchDirInfo.exists())
   {
     QDir qchDir(qchDirInfo.absoluteFilePath());
     QStringList qchEntries = qchDir.entryList(QStringList("*.qch"));
     // unregister the qch files
     QtAssistantUtil::UnregisterQCHFiles(qchEntries);
     // clean the directory
     foreach(QString qchEntry, qchEntries)
     {
       qchDir.remove(qchEntry);
     }
   }
 }
 
 void QCHPluginListener::addPlugin(QSharedPointer<ctkPlugin> plugin)
 {
   // bail out if system plugin
   if (plugin->getPluginId() == 0) return;
 
-  // if the given plugin already exists in the registry then return.
-  // note that this does not work for update cases.
-
-  QFileInfo qchDirInfo = plugin->getPluginContext()->getDataFile("qch_files");
+  QFileInfo qchDirInfo = context->getDataFile("qch_files/" + QString::number(plugin->getPluginId()));
   QUrl location(plugin->getLocation());
   QFileInfo pluginFileInfo(location.toLocalFile());
 
   if (!qchDirInfo.exists() || qchDirInfo.lastModified() < pluginFileInfo.lastModified())
   {
     removePlugin(plugin);
 
     if (!qchDirInfo.exists())
     {
-      QDir().mkdir(qchDirInfo.absoluteFilePath());
+      QDir().mkpath(qchDirInfo.absoluteFilePath());
     }
 
     QStringList localQCHFiles;
     QStringList resourceList = plugin->findResources("/", "*.qch", true);
     foreach(QString resource, resourceList)
     {
       QByteArray content = plugin->getResource(resource);
       QFile localFile(qchDirInfo.absoluteFilePath() + "/" + resource.section('/', -1));
       localFile.open(QIODevice::WriteOnly);
       localFile.write(content);
       localFile.close();
       if (localFile.error() != QFile::NoError)
       {
         BERRY_WARN << "Error writing " << localFile.fileName().toStdString()
                    << ": " << localFile.errorString().toStdString();
       }
       else
       {
         localQCHFiles << localFile.fileName();
       }
     }
 
     QtAssistantUtil::RegisterQCHFiles(localQCHFiles);
   }
 
 }
 
 }
 
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtAssistantUtil.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtAssistantUtil.cpp
index 7c8f61e6bc..451d5f7f92 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtAssistantUtil.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/src/berryQtAssistantUtil.cpp
@@ -1,271 +1,271 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date$
  Version:   $Revision$
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "berryQtAssistantUtil.h"
 #include <berryPlatformUI.h>
 #include <berryConfig.h>
 #include <berryLog.h>
 #include <berryIBundleStorage.h>
 #include <berryIWorkbench.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIWorkbenchPart.h>
 
 #include <QFileInfo>
 #include <QProgressDialog>
 #include <QMessageBox>
 #include <QDir>
 #include <QCoreApplication>
 
 namespace berry
 {
 
 QProcess* QtAssistantUtil::assistantProcess = 0;
 QString QtAssistantUtil::helpCollectionFile;
 QString QtAssistantUtil::defaultHelpUrl;
 QStringList QtAssistantUtil::registeredBundles;
 
 void QtAssistantUtil::SetHelpCollectionFile(const QString& file)
 {
   helpCollectionFile = file;
 }
 
 QString QtAssistantUtil::GetHelpCollectionFile()
 {
   return helpCollectionFile;
 }
 
 void QtAssistantUtil::OpenActivePartHelp()
 {
   //Get Plugin-ID
   QString pluginID;
   berry::IWorkbench* currentWorkbench = berry::PlatformUI::GetWorkbench();
   if (currentWorkbench) 
   {
     berry::IWorkbenchWindow::Pointer currentWorkbenchWindow = currentWorkbench->GetActiveWorkbenchWindow();
     if (currentWorkbenchWindow)
     {
       berry::IWorkbenchPage::Pointer currentPage = currentWorkbenchWindow->GetActivePage();
       if (currentPage)
       {
         berry::IWorkbenchPart::Pointer currentPart = currentPage->GetActivePart();
         if (currentPart) pluginID = QString::fromStdString(currentPart->GetSite()->GetPluginId());
       }
     }
   }
   //End get Plugin-ID
 
   QString helpUrl = defaultHelpUrl;
   if (!pluginID.isEmpty() && registeredBundles.contains(pluginID))
     helpUrl = "qthelp://"+pluginID+"/bundle/index.html";
 
   OpenAssistant(helpUrl);
 }
 
 void QtAssistantUtil::OpenAssistant(const QString& startPage)
 {
   QString startUrl = startPage;
   if (startUrl.isEmpty()) startUrl = defaultHelpUrl;
 
   if (assistantProcess == 0)
   {
     assistantProcess = new QProcess;
   }
 
   if (assistantProcess->state() == QProcess::NotRunning)
   {
     QStringList assistantArgs;
     if (!helpCollectionFile.isEmpty())
     {
       assistantArgs << QLatin1String("-collectionFile") 
                      << QLatin1String(helpCollectionFile.toLatin1());
     }
 
     assistantArgs << QLatin1String("-enableRemoteControl")
                    << QLatin1String("-showUrl")
                    << QLatin1String(startUrl.toLatin1());
     assistantProcess->start(GetAssistantExecutable(), assistantArgs);
   }
   else
   {
     QByteArray ba;
     ba.append("setSource ").append(startUrl.toLatin1()).append('\0');
     assistantProcess->write(ba);
   }
 
 }
 
 void QtAssistantUtil::CloseAssistant()
 {
   if (assistantProcess && (assistantProcess->state() != QProcess::NotRunning))
   {
     assistantProcess->close();
   }
   delete assistantProcess;
 }
 
 bool QtAssistantUtil::RegisterQCHFiles(const std::vector<IBundle::Pointer>& bundles)
 {
   QStringList qchFiles = ExtractQCHFiles(bundles);
   return CallQtAssistant(qchFiles);
 }
 
 bool QtAssistantUtil::RegisterQCHFiles(const QStringList& qchFiles)
 {
   return CallQtAssistant(qchFiles, true);
 }
 
 bool QtAssistantUtil::UnregisterQCHFiles(const QStringList& qchFiles)
 {
   return CallQtAssistant(qchFiles, false);
 }
 
 QStringList QtAssistantUtil::ExtractQCHFiles(const std::vector<IBundle::Pointer>& bundles)
 {
   QStringList result;
 
   for (std::size_t i = 0; i < bundles.size(); ++i)
   {
     std::vector<std::string> resourceFiles;
     bundles[i]->GetStorage().List("resources", resourceFiles);
     bool qchFileFound = false;
     for (std::size_t j = 0; j < resourceFiles.size(); ++j)
     {
       QString resource = QString::fromStdString(resourceFiles[j]);
       if (resource.endsWith(".qch"))
       {
         qchFileFound = true;
         Poco::Path qchPath = bundles[i]->GetPath();
         qchPath.pushDirectory("resources");
         qchPath.setFileName(resourceFiles[j]);
         result << QString::fromStdString(qchPath.toString());
       }
     }
 
     if (qchFileFound)
     {
       registeredBundles.push_back(QString::fromStdString(bundles[i]->GetSymbolicName()));
     }
   }
 
   return result;
 }
 
 bool QtAssistantUtil::CallQtAssistant(const QStringList& qchFiles, bool registerFile)
 {
   if (qchFiles.empty()) return true;
 
   bool success = true;
 
   QList<QStringList> argsVector;
   foreach (QString qchFile, qchFiles)
   {
     QStringList args;
     if (!helpCollectionFile.isEmpty())
     {
       args << QLatin1String("-collectionFile") << helpCollectionFile;
     }
 
     if (registerFile)
     {
       args << QLatin1String("-register");
     }
     else
     {
       args << QLatin1String("-unregister");
     }
     args << qchFile;
     args << QLatin1String("-quiet");
-    //BERRY_INFO << "Registering " << qchPath.toString() << " with " << collectionFile.toStdString();
+    //BERRY_INFO << "Registering " << qchFile.toStdString() << " with " << helpCollectionFile.toStdString();
     argsVector.push_back(args);
   }
 
   QProgressDialog progress("Registering help files...", "Abort Registration", 0, argsVector.size());
   progress.setWindowModality(Qt::WindowModal);
 
   QString assistantExec = GetAssistantExecutable();
   QString errorString;
   int exitCode = 0;
   for (int i = 0; i < argsVector.size(); ++i)
   {
     const QStringList& args = argsVector[i];
     progress.setValue(i);
     QString labelText = QString("Registering ") + args[3];
     progress.setLabelText(labelText);
 
     if (progress.wasCanceled())
     {
       success = false;
       break;
     }
 
     QProcess* process = new QProcess;
     process->start(assistantExec, args);
     if (!process->waitForStarted())
     {
       success = false;
       BERRY_ERROR << "Registering compressed help file" << args[3].toStdString() << " failed";
     }
 
     if (process->error() != QProcess::UnknownError)
     {
       errorString = process->errorString();
       success = false;
     }
 
     if (process->exitCode() != 0)
       exitCode = process->exitCode();
   }
   progress.setValue(argsVector.size());
 
   if (!errorString.isEmpty() || exitCode)
   {
     QString errText = "Registering one or more help files failed.";
     if (errorString.isEmpty())
     {
       errText += "\nYou may not have write permissions in " + QDir::toNativeSeparators(QDir::homePath());
     }
     else
     {
       errText += " The last error was: " + errorString;
     }
     QMessageBox::warning(0, "Help System Error", errText);
   }
 
   return success;
 }
 
 QString QtAssistantUtil::GetAssistantExecutable()
 {
   QFileInfo assistantFile(QT_ASSISTANT_EXECUTABLE);
   QFileInfo localAssistant(QCoreApplication::applicationDirPath() + "/" + assistantFile.fileName() );
   
   if (localAssistant.isExecutable())
   {  
     return localAssistant.absoluteFilePath();
   } 
   else
   {
     return assistantFile.absoluteFilePath();
   }
 }
 
 void QtAssistantUtil::SetDefaultHelpUrl(const QString& defaultUrl)
 {
   defaultHelpUrl = defaultUrl;
 }
 
 }