diff --git a/tools/port-plasma2.sh b/tools/port-plasma2.sh
index 2f114172e..804092ec2 100755
--- a/tools/port-plasma2.sh
+++ b/tools/port-plasma2.sh
@@ -40,7 +40,7 @@ for FS in `find $PWD  -name '*.qml'`; do
     perl -p -i -e 's/QtQuick 1.1/QtQuick 2.0/g' $FS
 done
 
-exit
+#exit
 
 
 # Change plugin definitions, this is useful if you want to
@@ -92,6 +92,12 @@ for FS in `find $PWD  -name '*.h' -o -name '*.cpp'`; do
     perl -p -i -e 's/QGraphicsSceneWheel/QWheelEvent/g' $FS
     perl -p -i -e 's/QGraphicsSceneHoverEvent/QHoverEvent/g' $FS
 
+    # Fix up includes
+    perl -p -i -e 's/\#include \<QtDeclarative\/QQuickItem\>/\#include \<QtQuick\/QQuickItem\>/g' $FS
+    perl -p -i -e 's/\#include \<QtDeclarative\/QQmlContext\>/\#include \<QtQml\/QQmlContext\>/g' $FS
+    perl -p -i -e 's/\#include \<QtDeclarative\/QQmlEngine\>/\#include \<QtQml\/QQmlEngine\>/g' $FS
+
+
 done