diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31e29b23a..978294665 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(plasma-workspace)
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
 set(QT_MIN_VERSION "5.2.0")
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick Concurrent Test)
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick Concurrent Test Script)
 
 find_package(ECM 0.0.11 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt
index 5f0b35ff1..9e0982137 100644
--- a/runners/CMakeLists.txt
+++ b/runners/CMakeLists.txt
@@ -1,6 +1,6 @@
 # add_subdirectory(activities)
 add_subdirectory(bookmarks)
-# add_subdirectory(calculator)
+add_subdirectory(calculator)
 add_subdirectory(locations)
 add_subdirectory(places)
 add_subdirectory(services)
diff --git a/runners/calculator/CMakeLists.txt b/runners/calculator/CMakeLists.txt
index 3fc302f9b..fb81c5656 100644
--- a/runners/calculator/CMakeLists.txt
+++ b/runners/calculator/CMakeLists.txt
@@ -1,33 +1,39 @@
 
 ########### next target ###############
 
-macro_optional_find_package(Qalculate)
-set_package_properties(Qalculate PROPERTIES DESCRIPTION "Qalculate Library"
-                       URL "http://qalculate.sourceforge.net"
-                       TYPE OPTIONAL
-                       PURPOSE "Needed to enable advanced features of the calculator runner"
-                      )
-if ( QALCULATE_FOUND )
-    add_definitions(-DENABLE_QALCULATE)
-
-    set(qalculate_engine_SRCS
-    qalculate_engine.cpp
-    )
-
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS} -Wno-deprecated")
-endif()
+#macro_optional_find_package(Qalculate)
+#set_package_properties(Qalculate PROPERTIES DESCRIPTION "Qalculate Library"
+#                       URL "http://qalculate.sourceforge.net"
+#                       TYPE OPTIONAL
+#                       PURPOSE "Needed to enable advanced features of the calculator runner"
+#                      )
+#if ( QALCULATE_FOUND )
+#    add_definitions(-DENABLE_QALCULATE)
+#
+#    set(qalculate_engine_SRCS
+#    qalculate_engine.cpp
+#    )
+#
+#    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS} -Wno-deprecated")
+#endif()
 
 set(krunner_calculatorrunner_SRCS
     calculatorrunner.cpp
 )
 
-if ( QALCULATE_FOUND )
-    add_library(krunner_calculatorrunner MODULE ${qalculate_engine_SRCS} ${krunner_calculatorrunner_SRCS})
-    target_link_libraries(krunner_calculatorrunner ${QALCULATE_LIBRARIES} ${CLN_LIBRARIES} KF5::Solid KIOCore ${KDE4_KDEUI_LIBS} KF5::Plasma )
-else ()
+#if ( QALCULATE_FOUND )
+#    add_library(krunner_calculatorrunner MODULE ${qalculate_engine_SRCS} ${krunner_calculatorrunner_SRCS})
+#    target_link_libraries(krunner_calculatorrunner ${QALCULATE_LIBRARIES} ${CLN_LIBRARIES} KF5::Solid KIOCore KF5::Runner KF5::KDELibs4Support KF5::Plasma )
+#else ()
     add_library(krunner_calculatorrunner MODULE ${krunner_calculatorrunner_SRCS})
-    target_link_libraries(krunner_calculatorrunner ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} KF5::Plasma)	
-endif ()
+    target_link_libraries(krunner_calculatorrunner
+                          KF5::Plasma
+                          KF5::Runner
+                          KF5::I18n
+                          KF5::KDELibs4Support
+                          Qt5::Script
+    )
+#endif ()
 
 install(TARGETS krunner_calculatorrunner DESTINATION ${PLUGIN_INSTALL_DIR} )
 
diff --git a/runners/calculator/calculatorrunner.cpp b/runners/calculator/calculatorrunner.cpp
index 47db16109..0ca4bd7a5 100644
--- a/runners/calculator/calculatorrunner.cpp
+++ b/runners/calculator/calculatorrunner.cpp
@@ -29,8 +29,11 @@
 
 #include <KIcon>
 #include <QDebug>
+#include <KGlobal>
 
-#include <QueryMatch>
+#include <krunner/querymatch.h>
+
+K_EXPORT_PLASMA_RUNNER(calculatorrunner, CalculatorRunner)
 
 CalculatorRunner::CalculatorRunner( QObject* parent, const QVariantList &args )
     : Plasma::AbstractRunner(parent, args)
@@ -216,7 +219,7 @@ void CalculatorRunner::match(Plasma::RunnerContext &context)
         match.setText("42");
         match.setData("42");
         match.setId(term);
-        context.addMatch(term, match);
+        context.addMatch(match);
         return;
     }
 
@@ -265,7 +268,7 @@ void CalculatorRunner::match(Plasma::RunnerContext &context)
         match.setText(result);
         match.setData(result);
         match.setId(term);
-        context.addMatch(term, match);
+        context.addMatch(match);
     }
 }
 
@@ -315,7 +318,7 @@ QMimeData * CalculatorRunner::mimeDataForMatch(const Plasma::QueryMatch &match)
 {
     //qDebug();
     QMimeData *result = new QMimeData();
-    result->setText(match->text());
+    result->setText(match.text());
     return result;
 }
 
diff --git a/runners/calculator/calculatorrunner.h b/runners/calculator/calculatorrunner.h
index 7abbcf34b..88f3b72b8 100644
--- a/runners/calculator/calculatorrunner.h
+++ b/runners/calculator/calculatorrunner.h
@@ -26,7 +26,7 @@
 class QalculateEngine;
 #endif
 
-#include <Plasma/AbstractRunner>
+#include <krunner/abstractrunner.h>
 
 /**
  * This class evaluates the basic expressions given in the interface.
@@ -55,6 +55,4 @@ class CalculatorRunner : public Plasma::AbstractRunner
         #endif
 };
 
-K_EXPORT_PLASMA_RUNNER(calculatorrunner, CalculatorRunner)
-
 #endif