diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml
index a227ccd655..4436e820b5 100644
--- a/apps/updatenotification/appinfo/info.xml
+++ b/apps/updatenotification/appinfo/info.xml
@@ -23,4 +23,8 @@
 	<settings>
 		<admin>OCA\UpdateNotification\Settings\Admin</admin>
 	</settings>
+
+	<commands>
+		<command>OCA\UpdateNotification\Command\Check</command>
+	</commands>
 </info>
diff --git a/apps/updatenotification/composer/composer/autoload_classmap.php b/apps/updatenotification/composer/composer/autoload_classmap.php
index bc9474d545..c6243dd76b 100644
--- a/apps/updatenotification/composer/composer/autoload_classmap.php
+++ b/apps/updatenotification/composer/composer/autoload_classmap.php
@@ -7,6 +7,7 @@ $baseDir = $vendorDir;
 
 return array(
     'OCA\\UpdateNotification\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
+    'OCA\\UpdateNotification\\Command\\Check' => $baseDir . '/../lib/Command/Check.php',
     'OCA\\UpdateNotification\\Controller\\APIController' => $baseDir . '/../lib/Controller/APIController.php',
     'OCA\\UpdateNotification\\Controller\\AdminController' => $baseDir . '/../lib/Controller/AdminController.php',
     'OCA\\UpdateNotification\\Notification\\BackgroundJob' => $baseDir . '/../lib/Notification/BackgroundJob.php',
diff --git a/apps/updatenotification/composer/composer/autoload_static.php b/apps/updatenotification/composer/composer/autoload_static.php
index 1908e43394..b3f900c3f9 100644
--- a/apps/updatenotification/composer/composer/autoload_static.php
+++ b/apps/updatenotification/composer/composer/autoload_static.php
@@ -22,6 +22,7 @@ class ComposerStaticInitUpdateNotification
 
     public static $classMap = array (
         'OCA\\UpdateNotification\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
+        'OCA\\UpdateNotification\\Command\\Check' => __DIR__ . '/..' . '/../lib/Command/Check.php',
         'OCA\\UpdateNotification\\Controller\\APIController' => __DIR__ . '/..' . '/../lib/Controller/APIController.php',
         'OCA\\UpdateNotification\\Controller\\AdminController' => __DIR__ . '/..' . '/../lib/Controller/AdminController.php',
         'OCA\\UpdateNotification\\Notification\\BackgroundJob' => __DIR__ . '/..' . '/../lib/Notification/BackgroundJob.php',
diff --git a/apps/updatenotification/lib/Command/Check.php b/apps/updatenotification/lib/Command/Check.php
new file mode 100644
index 0000000000..f363832873
--- /dev/null
+++ b/apps/updatenotification/lib/Command/Check.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ *
+ * @copyright Copyright (c) 2018, Tobia De Koninck (tobia@ledfan.be)
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\UpdateNotification\Command;
+
+use OC\App\AppManager;
+use OC\Installer;
+use OCA\UpdateNotification\UpdateChecker;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Check extends Command {
+
+	/**
+	 * @var Installer $installer
+	 */
+	private $installer;
+
+	/**
+	 * @var AppManager $appManager
+	 */
+	private $appManager;
+
+	/**
+	 * @var UpdateChecker $updateChecker
+	 */
+	private $updateChecker;
+
+	public function __construct(AppManager $appManager, UpdateChecker $updateChecker, Installer $installer) {
+		parent::__construct();
+		$this->installer = $installer;
+		$this->appManager = $appManager;
+		$this->updateChecker = $updateChecker;
+	}
+
+	protected function configure() {
+		$this
+			->setName('update:check')
+			->setDescription('Check for server and app updates')
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$updatesAvailableCount = 0;
+
+		// Server
+		$r = $this->updateChecker->getUpdateState();
+		if (isset($r['updateAvailable']) && $r['updateAvailable']) {
+			$output->writeln($r['updateVersion'] . ' is available. Get more information on how to update at '. $r['updateLink'] . '.');
+			$updatesAvailableCount += 1;
+		}
+
+
+		// Apps
+		$apps = $this->appManager->getInstalledApps();
+		foreach ($apps as $app) {
+			$update = $this->installer->isUpdateAvailable($app);
+			if ($update !== false) {
+				$output->writeln('Update for ' . $app . ' to version ' . $update . ' is available.');
+				$updatesAvailableCount += 1;
+			}
+		}
+
+		// Report summary
+		if ($updatesAvailableCount === 0) {
+			$output->writeln('<info>Everything up to date</info>');
+		} else if ($updatesAvailableCount === 1) {
+			$output->writeln('<comment>1 update available</comment>');
+		} else {
+			$output->writeln('<comment>' . $updatesAvailableCount . ' updates available</comment>');
+		}
+
+		return 0;
+	}
+}