diff --git a/app/Http/Controllers/FeedsController.php b/app/Http/Controllers/FeedsController.php
index 5d0aa8d3..74e87be6 100644
--- a/app/Http/Controllers/FeedsController.php
+++ b/app/Http/Controllers/FeedsController.php
@@ -102,12 +102,18 @@ class FeedsController extends Controller
      */
     public function notesJson(): array
     {
-        $notes = Note::latest()->with('media', 'place')->take(20)->get();
+        $notes = Note::latest()->with('media', 'place', 'tags')->take(20)->get();
         $data = [
-            'version' => 'https://jsonfeed.org/version/1',
+            'version' => 'https://jsonfeed.org/version/1.1',
             'title' => 'The JSON Feed for ' . config('user.display_name') . '’s notes',
             'home_page_url' => config('app.url') . '/notes',
             'feed_url' => config('app.url') . '/notes/feed.json',
+            'authors' => [
+                [
+                    'name' => config('user.display_name'),
+                    'url' => config('app.url'),
+                ],
+            ],
             'items' => [],
         ];
 
@@ -115,13 +121,13 @@ class FeedsController extends Controller
             $data['items'][$key] = [
                 'id' => $note->longurl,
                 'url' => $note->longurl,
-                'content_html' => $note->content,
+                'content_text' => $note->content,
                 'date_published' => $note->created_at->tz('UTC')->toRfc3339String(),
                 'date_modified' => $note->updated_at->tz('UTC')->toRfc3339String(),
-                'author' => [
-                    'name' => config('user.display_name'),
-                ],
             ];
+            if ($note->tags->count() > 0) {
+                $data['items'][$key]['tags'] = implode(',', $note->tags->pluck('tag')->toArray());
+            }
         }
 
         return $data;
diff --git a/app/Models/Note.php b/app/Models/Note.php
index 39d0c5e1..f854b598 100644
--- a/app/Models/Note.php
+++ b/app/Models/Note.php
@@ -144,17 +144,17 @@ class Note extends Model
      */
     public function getContentAttribute(): string
     {
-        $note = $this->note;
+        $note = $this->getRawOriginal('note');
 
         foreach ($this->media as $media) {
             if ($media->type === 'image') {
-                $note .= '<img src="' . $media->url . '" alt="">';
+                $note .= PHP_EOL . '<img src="' . $media->url . '" alt="">';
             }
             if ($media->type === 'audio') {
-                $note .= '<audio src="' . $media->url . '">';
+                $note .= PHP_EOL . '<audio src="' . $media->url . '">';
             }
             if ($media->type === 'video') {
-                $note .= '<video src="' . $media->url . '">';
+                $note .= PHP_EOL . '<video src="' . $media->url . '">';
             }
         }
 
diff --git a/database/seeders/NotesTableSeeder.php b/database/seeders/NotesTableSeeder.php
index e952afa2..4a42f379 100644
--- a/database/seeders/NotesTableSeeder.php
+++ b/database/seeders/NotesTableSeeder.php
@@ -193,6 +193,7 @@ A note with some code:
 <?php
 
 echo 'Hello World';
+```
 EOF;
         $noteWithCode = Note::create([
             'note' => $noteWithCodeContent,
diff --git a/tests/Unit/NotesTest.php b/tests/Unit/NotesTest.php
index 2aac08cc..a9c595d2 100644
--- a/tests/Unit/NotesTest.php
+++ b/tests/Unit/NotesTest.php
@@ -322,7 +322,7 @@ class NotesTest extends TestCase
         ]);
         $note->media()->save($media);
 
-        $expected = '<p>A nice image</p>
+        $expected = 'A nice image
 <img src="' . config('filesystems.disks.s3.url') . '/test.png" alt="">';
         $this->assertEquals($expected, $note->content);
     }
@@ -339,7 +339,7 @@ class NotesTest extends TestCase
         ]);
         $note->media()->save($media);
 
-        $expected = '<p>A nice video</p>
+        $expected = 'A nice video
 <video src="' . config('filesystems.disks.s3.url') . '/test.mkv">';
         $this->assertEquals($expected, $note->content);
     }
@@ -356,7 +356,7 @@ class NotesTest extends TestCase
         ]);
         $note->media()->save($media);
 
-        $expected = '<p>Some nice audio</p>
+        $expected = 'Some nice audio
 <audio src="' . config('filesystems.disks.s3.url') . '/test.flac">';
         $this->assertEquals($expected, $note->content);
     }