diff --git a/kdevelop-4.2.3-okteta08.patch b/kdevelop-4.2.3-okteta08.patch
index 6ac0812..50b34c6 100644
--- a/kdevelop-4.2.3-okteta08.patch
+++ b/kdevelop-4.2.3-okteta08.patch
@@ -1,4 +1,4 @@
-diff -ur kdevelop-4.2.3/cmake/modules/FindLibKasten.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibKasten.cmake
+diff -Nur kdevelop-4.2.3/cmake/modules/FindLibKasten.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibKasten.cmake
 --- kdevelop-4.2.3/cmake/modules/FindLibKasten.cmake	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/cmake/modules/FindLibKasten.cmake	2011-12-24 01:07:30.000000000 +0100
 @@ -1,73 +1,162 @@
@@ -222,7 +222,7 @@ diff -ur kdevelop-4.2.3/cmake/modules/FindLibKasten.cmake kdevelop-4.2.3-okteta0
 +    LIBKASTEN_LIBRARIES
 +    LIBKASTEN_VERSION
 +)
-diff -ur kdevelop-4.2.3/cmake/modules/FindLibOkteta.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibOkteta.cmake
+diff -Nur kdevelop-4.2.3/cmake/modules/FindLibOkteta.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibOkteta.cmake
 --- kdevelop-4.2.3/cmake/modules/FindLibOkteta.cmake	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/cmake/modules/FindLibOkteta.cmake	2011-12-24 01:07:55.000000000 +0100
 @@ -1,64 +1,146 @@
@@ -421,7 +421,7 @@ diff -ur kdevelop-4.2.3/cmake/modules/FindLibOkteta.cmake kdevelop-4.2.3-okteta0
 +    LIBOKTETA_LIBRARIES
 +    LIBOKTETA_VERSION
 +)
-diff -ur kdevelop-4.2.3/cmake/modules/FindLibOktetaKasten.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibOktetaKasten.cmake
+diff -Nur kdevelop-4.2.3/cmake/modules/FindLibOktetaKasten.cmake kdevelop-4.2.3-okteta08/cmake/modules/FindLibOktetaKasten.cmake
 --- kdevelop-4.2.3/cmake/modules/FindLibOktetaKasten.cmake	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/cmake/modules/FindLibOktetaKasten.cmake	2011-12-24 01:04:52.000000000 +0100
 @@ -1,73 +1,141 @@
@@ -615,7 +615,7 @@ diff -ur kdevelop-4.2.3/cmake/modules/FindLibOktetaKasten.cmake kdevelop-4.2.3-o
 +    LIBOKTETAKASTEN_LIBRARIES
 +    LIBOKTETAKASTEN_VERSION
 +)
-diff -ur kdevelop-4.2.3/utils/CMakeLists.txt kdevelop-4.2.3-okteta08/utils/CMakeLists.txt
+diff -Nur kdevelop-4.2.3/utils/CMakeLists.txt kdevelop-4.2.3-okteta08/utils/CMakeLists.txt
 --- kdevelop-4.2.3/utils/CMakeLists.txt	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/utils/CMakeLists.txt	2011-12-24 01:08:44.000000000 +0100
 @@ -1,20 +1,27 @@
@@ -653,7 +653,7 @@ diff -ur kdevelop-4.2.3/utils/CMakeLists.txt kdevelop-4.2.3-okteta08/utils/CMake
      add_subdirectory(okteta)
 -endif( LIBOKTETA_FOUND AND LIBOKTETAKASTEN_FOUND AND LIBKASTEN_FOUND AND KDE_VERSION VERSION_GREATER 4.4.50)
 +endif( LIBOKTETAKASTEN_FOUND AND LIBKASTEN_FOUND AND LIBOKTETA_FOUND )
-diff -ur kdevelop-4.2.3/utils/okteta/CMakeLists.txt kdevelop-4.2.3-okteta08/utils/okteta/CMakeLists.txt
+diff -Nur kdevelop-4.2.3/utils/okteta/CMakeLists.txt kdevelop-4.2.3-okteta08/utils/okteta/CMakeLists.txt
 --- kdevelop-4.2.3/utils/okteta/CMakeLists.txt	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/utils/okteta/CMakeLists.txt	2011-12-24 01:13:02.000000000 +0100
 @@ -3,11 +3,14 @@
@@ -674,7 +674,7 @@ diff -ur kdevelop-4.2.3/utils/okteta/CMakeLists.txt kdevelop-4.2.3-okteta08/util
  )
  SET( kdevokteta_PART_SRCS
      kastentoolviewwidget.cpp
-diff -ur kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.cpp kdevelop-4.2.3-okteta08/utils/okteta/kastentoolviewwidget.cpp
+diff -Nur kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.cpp kdevelop-4.2.3-okteta08/utils/okteta/kastentoolviewwidget.cpp
 --- kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.cpp	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/utils/okteta/kastentoolviewwidget.cpp	2011-12-24 01:04:52.000000000 +0100
 @@ -25,10 +25,15 @@
@@ -694,7 +694,7 @@ diff -ur kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.cpp kdevelop-4.2.3-okt
  // KDev
  #include <interfaces/icore.h>
  #include <interfaces/iuicontroller.h>
-diff -ur kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.h kdevelop-4.2.3-okteta08/utils/okteta/kastentoolviewwidget.h
+diff -Nur kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.h kdevelop-4.2.3-okteta08/utils/okteta/kastentoolviewwidget.h
 --- kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.h	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/utils/okteta/kastentoolviewwidget.h	2011-12-24 01:04:52.000000000 +0100
 @@ -23,10 +23,12 @@
@@ -711,7 +711,7 @@ diff -ur kdevelop-4.2.3/utils/okteta/kastentoolviewwidget.h kdevelop-4.2.3-oktet
  class AbstractToolView;
  }
  namespace Sublime {
-diff -ur kdevelop-4.2.3/utils/okteta/oktetadocument.cpp kdevelop-4.2.3-okteta08/utils/okteta/oktetadocument.cpp
+diff -Nur kdevelop-4.2.3/utils/okteta/oktetadocument.cpp kdevelop-4.2.3-okteta08/utils/okteta/oktetadocument.cpp
 --- kdevelop-4.2.3/utils/okteta/oktetadocument.cpp	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/utils/okteta/oktetadocument.cpp	2011-12-24 01:04:52.000000000 +0100
 @@ -1,7 +1,7 @@
@@ -814,7 +814,7 @@ diff -ur kdevelop-4.2.3/utils/okteta/oktetadocument.cpp kdevelop-4.2.3-okteta08/
                   SLOT(onByteArrayDocumentChanged()) );
      }
  }
-diff -ur kdevelop-4.2.3/utils/okteta/oktetadocument.h kdevelop-4.2.3-okteta08/utils/okteta/oktetadocument.h
+diff -Nur kdevelop-4.2.3/utils/okteta/oktetadocument.h kdevelop-4.2.3-okteta08/utils/okteta/oktetadocument.h
 --- kdevelop-4.2.3/utils/okteta/oktetadocument.h	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/utils/okteta/oktetadocument.h	2011-12-24 01:04:52.000000000 +0100
 @@ -23,15 +23,17 @@
@@ -850,8 +850,46 @@ diff -ur kdevelop-4.2.3/utils/okteta/oktetadocument.h kdevelop-4.2.3-okteta08/ut
  
    private:
      OktetaPlugin* mPlugin;
-Nur in kdevelop-4.2.3-okteta08/utils/okteta: oktetaglobal.h.
-diff -ur kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.cpp kdevelop-4.2.3-okteta08/utils/okteta/oktetatoolviewfactory.cpp
+diff -Nur kdevelop-4.2.3/utils/okteta/oktetaglobal.h kdevelop-4.2.3-okteta08/utils/okteta/oktetaglobal.h
+--- kdevelop-4.2.3/utils/okteta/oktetaglobal.h	1970-01-01 01:00:00.000000000 +0100
++++ kdevelop-4.2.3-okteta08/utils/okteta/oktetaglobal.h	2011-12-24 01:04:52.000000000 +0100
+@@ -0,0 +1,35 @@
++/*
++    This file is part of the KDevelop Okteta module, part of the KDE project.
++
++    Copyright 2011 Friedrich W. H. Kossebau <kossebau@kde.org>
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) version 3, or any
++    later version accepted by the membership of KDE e.V. (or its
++    successor approved by the membership of KDE e.V.), which shall
++    act as a proxy defined in Section 6 of version 3 of the license.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library. If not, see <http://www.gnu.org/licenses/>.
++*/
++
++#ifndef OKTETAGLOBAL_H
++#define OKTETAGLOBAL_H
++
++// Adaptions for the different version of Kasten and Okteta
++#if KASTEN_VERSION == 1
++namespace Kasten1 {}
++namespace Kasten = Kasten1;
++#define KASTEN_NAMESPACE Kasten1
++#else
++#define KASTEN_NAMESPACE Kasten
++#endif
++
++#endif
+diff -Nur kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.cpp kdevelop-4.2.3-okteta08/utils/okteta/oktetatoolviewfactory.cpp
 --- kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.cpp	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/utils/okteta/oktetatoolviewfactory.cpp	2011-12-24 01:04:52.000000000 +0100
 @@ -25,9 +25,15 @@
@@ -870,7 +908,7 @@ diff -ur kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.cpp kdevelop-4.2.3-ok
  // KDE
  #include <KIcon>
  
-diff -ur kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.h kdevelop-4.2.3-okteta08/utils/okteta/oktetatoolviewfactory.h
+diff -Nur kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.h kdevelop-4.2.3-okteta08/utils/okteta/oktetatoolviewfactory.h
 --- kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.h	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/utils/okteta/oktetatoolviewfactory.h	2011-12-24 01:04:52.000000000 +0100
 @@ -23,10 +23,12 @@
@@ -887,7 +925,7 @@ diff -ur kdevelop-4.2.3/utils/okteta/oktetatoolviewfactory.h kdevelop-4.2.3-okte
  class AbstractToolViewFactory;
  class AbstractToolFactory;
  }
-diff -ur kdevelop-4.2.3/utils/okteta/oktetaview.h kdevelop-4.2.3-okteta08/utils/okteta/oktetaview.h
+diff -Nur kdevelop-4.2.3/utils/okteta/oktetaview.h kdevelop-4.2.3-okteta08/utils/okteta/oktetaview.h
 --- kdevelop-4.2.3/utils/okteta/oktetaview.h	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/utils/okteta/oktetaview.h	2011-12-24 01:04:52.000000000 +0100
 @@ -23,10 +23,12 @@
@@ -904,7 +942,7 @@ diff -ur kdevelop-4.2.3/utils/okteta/oktetaview.h kdevelop-4.2.3-okteta08/utils/
  class ByteArrayView;
  }
  
-diff -ur kdevelop-4.2.3/utils/okteta/oktetawidget.h kdevelop-4.2.3-okteta08/utils/okteta/oktetawidget.h
+diff -Nur kdevelop-4.2.3/utils/okteta/oktetawidget.h kdevelop-4.2.3-okteta08/utils/okteta/oktetawidget.h
 --- kdevelop-4.2.3/utils/okteta/oktetawidget.h	2011-06-24 21:04:01.000000000 +0200
 +++ kdevelop-4.2.3-okteta08/utils/okteta/oktetawidget.h	2011-12-24 01:04:52.000000000 +0100
 @@ -23,12 +23,14 @@