diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 606576760e..1070246fca 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -16,7 +16,7 @@ $content = isset( $_REQUEST['content'] ) ? $_REQUEST['content'] : '';
 $source = isset( $_REQUEST['source'] ) ? trim($_REQUEST['source'], '/\\') : '';
 
 if($source) {
-	$eventSource=new OC_EventSource();
+	$eventSource = \OC::$server->getEventSource();
 } else {
 	OC_JSON::callCheck();
 }
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 3ec7f9394b..eed620113a 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -15,7 +15,7 @@ if (isset($_GET['users'])) {
 	$users = array(OC_User::getUser());
 }
 
-$eventSource = new OC_EventSource();
+$eventSource = \OC::$server->getEventSource();
 $listener = new ScanListener($eventSource);
 
 foreach ($users as $user) {
@@ -39,12 +39,12 @@ class ScanListener {
 	private $lastCount = 0;
 
 	/**
-	 * @var \OC_EventSource event source to pass events to
+	 * @var \OCP\IEventSource event source to pass events to
 	 */
 	private $eventSource;
 
 	/**
-	 * @param \OC_EventSource $eventSource
+	 * @param \OCP\IEventSource $eventSource
 	 */
 	public function __construct($eventSource) {
 		$this->eventSource = $eventSource;
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 627ada080c..89ce279837 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -4,7 +4,7 @@ require_once '../../lib/base.php';
 
 if (OC::checkUpgrade(false)) {
 	$l = new \OC_L10N('core');
-	$eventSource = new OC_EventSource();
+	$eventSource = \OC::$server->getEventSource();
 	$updater = new \OC\Updater(\OC_Log::$object);
 	$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) {
 		$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
diff --git a/lib/private/appframework/core/api.php b/lib/private/appframework/core/api.php
index ba6b9f95cb..0dd3a58386 100644
--- a/lib/private/appframework/core/api.php
+++ b/lib/private/appframework/core/api.php
@@ -110,12 +110,11 @@ class API implements IApi{
 
 
 	/**
-	 * used to return and open a new eventsource
-	 * @return \OC_EventSource a new open EventSource class
+	 * used to return and open a new event source
+	 * @return \OCP\IEventSource a new open EventSource class
 	 */
 	public function openEventSource(){
-		# TODO: use public api
-		return new \OC_EventSource();
+		return \OC::$server->getEventSource();
 	}
 
 	/**