diff --git a/conf/nginx-primaryonly.conf b/conf/nginx-primaryonly.conf
index eb446251..4de080c1 100644
--- a/conf/nginx-primaryonly.conf
+++ b/conf/nginx-primaryonly.conf
@@ -15,7 +15,7 @@
 	# ownCloud configuration.
 	rewrite ^/cloud$ /cloud/ redirect;
 	rewrite ^/cloud/$ /cloud/index.php;
-	rewrite ^/cloud/(contacts|calendar|files)$ /cloud/index.php/apps/$1/ redirect;
+	rewrite ^/cloud/(contacts|calendar|files|notes)$ /cloud/index.php/apps/$1/ redirect;
 	rewrite ^(/cloud/core/doc/[^\/]+/)$ $1/index.html;
 	location /cloud/ {
 		alias /usr/local/lib/owncloud/;
diff --git a/management/templates/sync-guide.html b/management/templates/sync-guide.html
index 3d6fe3e5..c6693a7a 100644
--- a/management/templates/sync-guide.html
+++ b/management/templates/sync-guide.html
@@ -1,7 +1,7 @@
 <div>
-	<h2>Contacts &amp; Calendar Synchronization</h2>
+	<h2>Contacts, Calendar &amp; Notes Synchronization</h2>
 
-	<p>This box can hold your contacts and calendar, just like it holds your email.</p>
+	<p>This box can hold your contacts, calendar and notes, just like it holds your email.</p>
 
 	<hr>
 
@@ -9,12 +9,13 @@
 		<div class="col-sm-6">
 			<h4>In your browser</h4>
 
-			<p>You can edit your contacts and calendar from your web browser.</p>
+			<p>You can edit your contacts, calendar and notes from your web browser.</p>
 
 			<table class="table">
 			<thead><tr><th>For...</th> <th>Visit this URL</th></tr></thead>
 			<tr><th>Contacts</td> <td><a href="https://{{hostname}}/cloud/contacts">https://{{hostname}}/cloud/contacts</a></td></tr>
 			<tr><th>Calendar</td> <td><a href="https://{{hostname}}/cloud/calendar">https://{{hostname}}/cloud/calendar</a></td></tr>
+			<tr><th>Notes</td> <td><a href="https://{{hostname}}/cloud/notes">https://{{hostname}}/cloud/calendar</a></td></tr>
 			</table>
 
 			<p>Log in settings are the same as with <a href="#mail-guide" onclick="return show_panel(this);">mail</a>: your
@@ -26,13 +27,14 @@
 
 			<p>If you set up your <a href="#mail-guide" onclick="return show_panel(this);">mail</a> using Exchange/ActiveSync,
 			your contacts and calendar may already appear on your device.</p>
-			<p>Otherwise, here are some apps that can synchronize your contacts and calendar to your Android phone.</p>
+			<p>Otherwise, here are some apps that can synchronize your contacts, calendar and notes to your Android phone.</p>
 
 			<table class="table">
 			<thead><tr><th>For...</th> <th>Use...</th></tr></thead>
 			<tr><td>Contacts and Calendar</td> <td><a href="https://play.google.com/store/apps/details?id=at.bitfire.davdroid">DAVdroid</a> ($3.69; free <a href="https://f-droid.org/repository/browse/?fdfilter=dav&fdid=at.bitfire.davdroid">here</a>)</td></tr>
 			<tr><td>Only Contacts</td> <td><a href="https://play.google.com/store/apps/details?id=org.dmfs.carddav.sync">CardDAV-Sync free beta</a> (free)</td></tr>
 			<tr><td>Only Calendar</td> <td><a href="https://play.google.com/store/apps/details?id=org.dmfs.caldav.lib">CalDAV-Sync</a> ($2.89)</td></tr>
+			<tr><td>Only Notes</td> <td><a href="https://play.google.com/store/apps/details?id=com.nowsci.ownnote">ownNotes</a> ($0.99)</td></tr>
 			</table>
 
 			<p>Use the following settings:</p>
diff --git a/setup/owncloud.sh b/setup/owncloud.sh
index 5cf3714d..5121fd58 100755
--- a/setup/owncloud.sh
+++ b/setup/owncloud.sh
@@ -47,7 +47,7 @@ InstallOwncloud() {
 	unzip -q /tmp/owncloud.zip -d /usr/local/lib
 	rm -f /tmp/owncloud.zip
 
-	# The two apps we actually want are not in ownCloud core. Download the releases from
+	# The three apps we actually want are not in ownCloud core. Download the releases from
 	# their github repositories.
 	mkdir -p /usr/local/lib/owncloud/apps
 	wget_verify https://github.com/owncloud/contacts/releases/download/v1.4.0.0/contacts.tar.gz c1c22d29699456a45db447281682e8bc3f10e3e7 /tmp/contacts.tgz
@@ -57,6 +57,10 @@ InstallOwncloud() {
         wget_verify https://github.com/nextcloud/calendar/releases/download/v1.4.0/calendar.tar.gz c84f3170efca2a99ea6254de34b0af3cb0b3a821 /tmp/calendar.tgz
 	tar xf /tmp/calendar.tgz -C /usr/local/lib/owncloud/apps/
 	rm /tmp/calendar.tgz
+	
+	wget_verify https://github.com/owncloud/notes/releases/download/v2.0.2/notes-2.0.2.tar.gz 78f001d55ed66686dac13454650f83e0de6adb3b /tmp/notes.tgz
+	tar xf /tmp/notes.tgz -C /usr/local/lib/owncloud/apps/
+	rm /tmp/notes.tgz
 
 	# Fix weird permissions.
 	chmod 750 /usr/local/lib/owncloud/{apps,config}
@@ -266,6 +270,7 @@ hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:disable
 hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable user_external
 hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable contacts
 hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable calendar
+hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable notes
 
 # When upgrading, run the upgrade script again now that apps are enabled. It seems like
 # the first upgrade at the top won't work because apps may be disabled during upgrade?