diff --git a/.gitignore b/.gitignore
index 237f0f44e8164a42885156fe0a2fc2cc07bc85b9..2e42105ad836be63f661bb8da25627ec75339548 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 
 # ignore all apps except core ones
 /apps*/*
+!/apps/comments
 !/apps/dav
 !/apps/files
 !/apps/federation
diff --git a/apps/comments/appinfo/app.php b/apps/comments/appinfo/app.php
new file mode 100644
index 0000000000000000000000000000000000000000..c6f36567c51b9bd6575790a97bb0ac794e71cbf8
--- /dev/null
+++ b/apps/comments/appinfo/app.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+$eventDispatcher = \OC::$server->getEventDispatcher();
+$eventDispatcher->addListener(
+	'OCA\Files::loadAdditionalScripts',
+	function() {
+		\OCP\Util::addScript('oc-backbone-webdav');
+		\OCP\Util::addScript('comments', 'app');
+		\OCP\Util::addScript('comments', 'commentmodel');
+		\OCP\Util::addScript('comments', 'commentcollection');
+		\OCP\Util::addScript('comments', 'commentstabview');
+		\OCP\Util::addScript('comments', 'filesplugin');
+		\OCP\Util::addStyle('comments', 'comments');
+	}
+);
diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml
new file mode 100644
index 0000000000000000000000000000000000000000..550c79448cface3d4192622a3af980a757f399c5
--- /dev/null
+++ b/apps/comments/appinfo/info.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<info>
+	<id>comments</id>
+	<name>Comments</name>
+	<description>Files app plugin to add comments to files</description>
+	<licence>AGPL</licence>
+	<author>Arthur Shiwon, Vincent Petry</author>
+	<default_enable/>
+	<version>0.1</version>
+	<dependencies>
+		<owncloud min-version="9.0" max-version="9.0" />
+	</dependencies>
+	<documentation>
+		<user>user-comments</user>
+	</documentation>
+</info>
diff --git a/apps/comments/js/app.js b/apps/comments/js/app.js
new file mode 100644
index 0000000000000000000000000000000000000000..547059393a525c399d10cda22992092d7cb952d1
Binary files /dev/null and b/apps/comments/js/app.js differ
diff --git a/apps/comments/js/commentcollection.js b/apps/comments/js/commentcollection.js
new file mode 100644
index 0000000000000000000000000000000000000000..61b5adb7da7eb80e477e0d78cc492e4eb6568656
Binary files /dev/null and b/apps/comments/js/commentcollection.js differ
diff --git a/apps/comments/js/commentmodel.js b/apps/comments/js/commentmodel.js
new file mode 100644
index 0000000000000000000000000000000000000000..8771bd2d0f4e2e7901403785aad8bf8d901641a6
Binary files /dev/null and b/apps/comments/js/commentmodel.js differ
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
new file mode 100644
index 0000000000000000000000000000000000000000..cccb400dd68372d07a831f405459e829f925f391
Binary files /dev/null and b/apps/comments/js/commentstabview.js differ
diff --git a/apps/comments/js/filesplugin.js b/apps/comments/js/filesplugin.js
new file mode 100644
index 0000000000000000000000000000000000000000..c8d91e0ede33e2338ae15f40fac868b673f47907
Binary files /dev/null and b/apps/comments/js/filesplugin.js differ
diff --git a/core/shipped.json b/core/shipped.json
index 5dd8700bf1a901e846d7494ed06d5c2d2fd910da..5f995326625fbea6086861d8ebb86abddef2b274 100644
--- a/core/shipped.json
+++ b/core/shipped.json
@@ -3,6 +3,7 @@
     "activity",
     "admin_audit",
     "encryption",
+	"comments",
     "dav",
     "enterprise_key",
     "external",