diff --git a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXReader.cpp b/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXReader.cpp
index 7f25dfd464..edb01088d6 100644
--- a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXReader.cpp
+++ b/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXReader.cpp
@@ -1,99 +1,207 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "mitkFiberBundleXReader.h"
 #include <itkMetaDataObject.h>
 #include <vtkPolyData.h>
 #include <vtkDataReader.h>
 #include <vtkPolyDataReader.h>
 #include <vtkMatrix4x4.h>
 #include <vtkPolyLine.h>
 #include <vtkCellArray.h>
 #include <itksys/SystemTools.hxx>
 #include <tinyxml.h>
 #include <vtkCleanPolyData.h>
 #include <mitkTrackvis.h>
 #include <mitkCustomMimeType.h>
 #include "mitkDiffusionIOMimeTypes.h"
 
 
 mitk::FiberBundleXReader::FiberBundleXReader()
   : mitk::AbstractFileReader( CustomMimeType( mitk::DiffusionIOMimeTypes::FIBERBUNDLE_MIMETYPE_NAME() ), mitk::DiffusionIOMimeTypes::FIBERBUNDLE_MIMETYPE_DESCRIPTION )
 {
   m_ServiceReg = this->RegisterService();
 }
 
 mitk::FiberBundleXReader::FiberBundleXReader(const FiberBundleXReader &other)
   :mitk::AbstractFileReader(other)
 {
 }
 
 mitk::FiberBundleXReader * mitk::FiberBundleXReader::Clone() const
 {
   return new FiberBundleXReader(*this);
 }
 
 
 std::vector<itk::SmartPointer<mitk::BaseData> > mitk::FiberBundleXReader::Read()
 {
 
   std::vector<itk::SmartPointer<mitk::BaseData> > result;
   try
   {
     const std::string& locale = "C";
     const std::string& currLocale = setlocale( LC_ALL, NULL );
     setlocale(LC_ALL, locale.c_str());
 
     std::string filename = this->GetInputLocation();
 
     std::string ext = itksys::SystemTools::GetFilenameLastExtension(filename);
     ext = itksys::SystemTools::LowerCase(ext);
 
     if (ext==".trk")
     {
       FiberBundleX::Pointer image = FiberBundleX::New();
       TrackVisFiberReader reader;
       reader.open(this->GetInputLocation().c_str());
       reader.read(image.GetPointer());
       result.push_back(image.GetPointer());
       return result;
     }
 
     vtkSmartPointer<vtkDataReader> chooser=vtkSmartPointer<vtkDataReader>::New();
     chooser->SetFileName( this->GetInputLocation().c_str() );
     if( chooser->IsFilePolyData())
     {
       vtkSmartPointer<vtkPolyDataReader> reader = vtkSmartPointer<vtkPolyDataReader>::New();
       reader->SetFileName( this->GetInputLocation().c_str() );
       reader->Update();
 
       if ( reader->GetOutput() != NULL )
       {
         vtkSmartPointer<vtkPolyData> fiberPolyData = reader->GetOutput();
         FiberBundleX::Pointer image = FiberBundleX::New(fiberPolyData);
         result.push_back(image.GetPointer());
         return result;
       }
     }
+    else // try to read deprecated fiber bundle file format
+    {
+      MITK_INFO << "Reading xml fiber bundle";
+      vtkSmartPointer<vtkPolyData> fiberPolyData = vtkSmartPointer<vtkPolyData>::New();
+      vtkSmartPointer<vtkCellArray> cellArray = vtkSmartPointer<vtkCellArray>::New();
+      vtkSmartPointer<vtkPoints>    points = vtkSmartPointer<vtkPoints>::New();
+      TiXmlDocument doc( this->GetInputLocation().c_str() );
+      if(doc.LoadFile())
+      {
+        TiXmlHandle hDoc(&doc);
+        TiXmlElement* pElem;
+        TiXmlHandle hRoot(0);
+        pElem = hDoc.FirstChildElement().Element();
+        // save this for later
+        hRoot = TiXmlHandle(pElem);
+        pElem = hRoot.FirstChildElement("geometry").Element();
+        // read geometry
+        mitk::Geometry3D::Pointer geometry = mitk::Geometry3D::New();
+        // read origin
+        mitk::Point3D origin;
+        double temp = 0;
+        pElem->Attribute("origin_x", &temp);
+        origin[0] = temp;
+        pElem->Attribute("origin_y", &temp);
+        origin[1] = temp;
+        pElem->Attribute("origin_z", &temp);
+        origin[2] = temp;
+        geometry->SetOrigin(origin);
+        // read spacing
+        ScalarType spacing[3];
+        pElem->Attribute("spacing_x", &temp);
+        spacing[0] = temp;
+        pElem->Attribute("spacing_y", &temp);
+        spacing[1] = temp;
+        pElem->Attribute("spacing_z", &temp);
+        spacing[2] = temp;
+        geometry->SetSpacing(spacing);
+        // read transform
+        vtkMatrix4x4* m = vtkMatrix4x4::New();
+        pElem->Attribute("xx", &temp);
+        m->SetElement(0,0,temp);
+        pElem->Attribute("xy", &temp);
+        m->SetElement(1,0,temp);
+        pElem->Attribute("xz", &temp);
+        m->SetElement(2,0,temp);
+        pElem->Attribute("yx", &temp);
+        m->SetElement(0,1,temp);
+        pElem->Attribute("yy", &temp);
+        m->SetElement(1,1,temp);
+        pElem->Attribute("yz", &temp);
+        m->SetElement(2,1,temp);
+        pElem->Attribute("zx", &temp);
+        m->SetElement(0,2,temp);
+        pElem->Attribute("zy", &temp);
+        m->SetElement(1,2,temp);
+        pElem->Attribute("zz", &temp);
+        m->SetElement(2,2,temp);
+        m->SetElement(0,3,origin[0]);
+        m->SetElement(1,3,origin[1]);
+        m->SetElement(2,3,origin[2]);
+        m->SetElement(3,3,1);
+        geometry->SetIndexToWorldTransformByVtkMatrix(m);
+        // read bounds
+        float bounds[] = {0, 0, 0, 0, 0, 0};
+        pElem->Attribute("size_x", &temp);
+        bounds[1] = temp;
+        pElem->Attribute("size_y", &temp);
+        bounds[3] = temp;
+        pElem->Attribute("size_z", &temp);
+        bounds[5] = temp;
+        geometry->SetFloatBounds(bounds);
+        geometry->SetImageGeometry(true);
+        pElem = hRoot.FirstChildElement("fiber_bundle").FirstChild().Element();
+        for( ; pElem ; pElem=pElem->NextSiblingElement())
+        {
+          TiXmlElement* pElem2 = pElem->FirstChildElement();
+          vtkSmartPointer<vtkPolyLine> container = vtkSmartPointer<vtkPolyLine>::New();
+          for( ; pElem2; pElem2=pElem2->NextSiblingElement())
+          {
+            Point3D point;
+            pElem2->Attribute("pos_x", &temp);
+            point[0] = temp;
+            pElem2->Attribute("pos_y", &temp);
+            point[1] = temp;
+            pElem2->Attribute("pos_z", &temp);
+            point[2] = temp;
+            geometry->IndexToWorld(point, point);
+            vtkIdType id = points->InsertNextPoint(point.GetDataPointer());
+            container->GetPointIds()->InsertNextId(id);
+          }
+          cellArray->InsertNextCell(container);
+        }
+        fiberPolyData->SetPoints(points);
+        fiberPolyData->SetLines(cellArray);
+        vtkSmartPointer<vtkCleanPolyData> cleaner = vtkSmartPointer<vtkCleanPolyData>::New();
+        cleaner->SetInputData(fiberPolyData);
+        cleaner->Update();
+        fiberPolyData = cleaner->GetOutput();
+        FiberBundleX::Pointer image = FiberBundleX::New(fiberPolyData);
+        result.push_back(image.GetPointer());
+        return result;
+      }
+      else
+      {
+        MITK_ERROR << "could not open xml file";
+        throw "could not open xml file";
+      }
+    }
     setlocale(LC_ALL, currLocale.c_str());
     MITK_INFO << "Fiber bundle read";
   }
   catch(...)
   {
     throw;
   }
   return result;
 }