diff --git a/declarativeimports/core/corebindingsplugin.cpp b/declarativeimports/core/corebindingsplugin.cpp
index 92d0befba..755dad61c 100644
--- a/declarativeimports/core/corebindingsplugin.cpp
+++ b/declarativeimports/core/corebindingsplugin.cpp
@@ -1,95 +1,101 @@
 /*
  *   Copyright 2009 by Alan Alpert <alan.alpert@nokia.com>
  *   Copyright 2010 by Ménard Alexis <menard@kde.org>
  *   Copyright 2010 by Marco Martin <mart@kde.org>
 
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program 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 General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #include "corebindingsplugin.h"
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QDeclarativeContext>
 #include <QScriptEngine>
 
 #include <kdeclarative.h>
 
 #include <Plasma/FrameSvg>
 #include <Plasma/Svg>
+#include <Plasma/QueryMatch>
 
 #include "datasource.h"
 #include "datamodel.h"
 #include "framesvgitem.h"
+#include "runnermodel.h"
 #include "svgitem.h"
 #include "theme.h"
 #include "dialog.h"
 #include "tooltip.h"
 #include "dataenginebindings_p.h"
 
 void CoreBindingsPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
 {
     QDeclarativeExtensionPlugin::initializeEngine(engine, uri);
 
     QDeclarativeContext *context = engine->rootContext();
 
     ThemeProxy *theme = new ThemeProxy(context);
     context->setContextProperty("theme", theme);
 
     KDeclarative kdeclarative;
     kdeclarative.setDeclarativeEngine(engine);
     kdeclarative.initialize();
     QScriptEngine *scriptEngine = kdeclarative.scriptEngine();
 
     //inject the hack only if wasn't injected already
     if (!scriptEngine->globalObject().property("i18n").isValid()) {
         //binds things like kconfig and icons
         kdeclarative.setupBindings();
     }
 
     registerDataEngineMetaTypes(scriptEngine);
 }
 
 void CoreBindingsPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("org.kde.plasma.core"));
 
     qmlRegisterType<Plasma::Svg>(uri, 0, 1, "Svg");
     qmlRegisterType<Plasma::FrameSvg>(uri, 0, 1, "FrameSvg");
     qmlRegisterType<Plasma::SvgItem>(uri, 0, 1, "SvgItem");
     qmlRegisterType<Plasma::FrameSvgItem>(uri, 0, 1, "FrameSvgItem");
 
     qmlRegisterType<ThemeProxy>(uri, 0, 1, "Theme");
 
     qmlRegisterType<Plasma::DataSource>(uri, 0, 1, "DataSource");
     qmlRegisterType<Plasma::DataModel>(uri, 0, 1, "DataModel");
     qmlRegisterType<Plasma::SortFilterModel>(uri, 0, 1, "SortFilterModel");
 
     qmlRegisterType<DialogProxy>(uri, 0, 1, "Dialog");
     qmlRegisterType<ToolTipProxy>(uri, 0, 1, "ToolTip");
 
     qmlRegisterInterface<Plasma::Service>("Service");
     qRegisterMetaType<Plasma::Service*>("Service");
     qmlRegisterInterface<Plasma::ServiceJob>("ServiceJob");
     qRegisterMetaType<Plasma::ServiceJob*>("ServiceJob");
     qmlRegisterType<QAbstractItemModel>();
 
+    qmlRegisterType<RunnerModel>(uri, 0, 1, "RunnerModel");
+    qmlRegisterInterface<Plasma::QueryMatch>("QueryMatch");
+    qRegisterMetaType<Plasma::QueryMatch *>("QueryMatch");
+
     /*qmlRegisterInterface<Plasma::DataSource>("DataSource");
     qRegisterMetaType<Plasma::DataSource*>("DataSource");*/
 }
 
 
 #include "corebindingsplugin.moc"
 
diff --git a/declarativeimports/krunnermodel/runnermodelplugin.cpp b/declarativeimports/krunnermodel/runnermodelplugin.cpp
index e483f71a5..38a6c91ed 100644
--- a/declarativeimports/krunnermodel/runnermodelplugin.cpp
+++ b/declarativeimports/krunnermodel/runnermodelplugin.cpp
@@ -1,37 +1,40 @@
 /*
  *   Copyright 2011 by Marco Martin <mart@kde.org>
 
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program 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 Library General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #include "runnermodelplugin.h"
 
 #include <QtDeclarative/qdeclarative.h>
 
+#include <KDebug>
+
 #include <Plasma/QueryMatch>
 
 #include "../core/runnermodel.h"
 
 void RunnerModelPlugin::registerTypes(const char *uri)
 {
+    kWarning() << "Using deprecated import org.kde.runnermodel, please port to org.kde.plasma.core";
     Q_ASSERT(uri == QLatin1String("org.kde.runnermodel"));
     qmlRegisterType<RunnerModel>(uri, 0, 1, "RunnerModel");
     qmlRegisterInterface<Plasma::QueryMatch>("QueryMatch");
     qRegisterMetaType<Plasma::QueryMatch *>("QueryMatch");
 }
 
 #include "runnermodelplugin.moc"
 
diff --git a/declarativeimports/krunnermodel/runnermodelplugin.h b/declarativeimports/krunnermodel/runnermodelplugin.h
index b15bf40ac..2f92a7e0d 100644
--- a/declarativeimports/krunnermodel/runnermodelplugin.h
+++ b/declarativeimports/krunnermodel/runnermodelplugin.h
@@ -1,36 +1,38 @@
 /*
  *   Copyright 2011 by Marco Martin <mart@kde.org>
  *   Copyright 2011 by Aaron Seigo <aseigo@kde.org>
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program 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 Library General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #ifndef RUNNERMODELPLUGIN_H
 #define RUNNERMODELPLUGIN_H
 
 #include <QDeclarativeExtensionPlugin>
 
-
+/*
+ * FIXME: This plugin is deprecated, it should be removed for plasma2
+ */
 class RunnerModelPlugin : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 
 public:
     void registerTypes(const char *uri);
 };
 
 Q_EXPORT_PLUGIN2(datamodelsplugin, RunnerModelPlugin)
 
 #endif