diff --git a/app/Http/Controllers/FeedsController.php b/app/Http/Controllers/FeedsController.php
index 3ffb99f8..e7602230 100644
--- a/app/Http/Controllers/FeedsController.php
+++ b/app/Http/Controllers/FeedsController.php
@@ -121,9 +121,8 @@ class FeedsController extends Controller
         foreach ($notes as $key => $note) {
             $data['items'][$key] = [
                 'id' => $note->longurl,
-                'title' => $note->getOriginal('note'),
                 'url' => $note->longurl,
-                'content_html' => $note->note,
+                'content_html' => $note->content,
                 'date_published' => $note->created_at->tz('UTC')->toRfc3339String(),
                 'date_modified' => $note->updated_at->tz('UTC')->toRfc3339String(),
                 'author' => [
diff --git a/app/Models/Note.php b/app/Models/Note.php
index cbbc5335..8ed7f9c1 100644
--- a/app/Models/Note.php
+++ b/app/Models/Note.php
@@ -176,6 +176,37 @@ class Note extends Model
         return $modified;
     }
 
+    /**
+     * Provide the content_html for JSON feed.
+     *
+     * In particular we want to include media links such as images.
+     *
+     * @return string
+     */
+    public function getContentAttribute(): string
+    {
+        $note = $this->note;
+
+        foreach ($this->media as $media) {
+            if ($media->type == 'image') {
+                $note .= '<img src="' . $media->url . '" alt="">';
+            }
+            if ($media->type == 'audio') {
+                $note .= '<audio src="' . $media->url . '">';
+            }
+            if ($media->type == 'video') {
+                $note .= '<video src="' . $media->url . '">';
+            }
+        }
+
+        if ($note === null) {
+            // when would $note still be blank?
+            $note = 'A blank note';
+        }
+
+        return $note;
+    }
+
     /**
      * Generate the NewBase60 ID from primary ID.
      *
diff --git a/changelog.md b/changelog.md
index ee96ad0f..052550f5 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 0.16.3 (2018-04-12)
+  - Improve JSON feed conformance
+
 ## Version 0.16.2 (2018-04-07)
   - Add CORS headers as necessary in the Laravel app (as oppose to using nginx)
   - Add CSP headers
diff --git a/tests/Feature/FeedsTest.php b/tests/Feature/FeedsTest.php
index 0bafdbe9..37c51a27 100644
--- a/tests/Feature/FeedsTest.php
+++ b/tests/Feature/FeedsTest.php
@@ -71,4 +71,28 @@ class FeedsTest extends TestCase
         $response = $this->get('/notes/feed.json');
         $response->assertHeader('Content-Type', 'application/json');
     }
+
+    /**
+     * Each JSON feed item must have one of `content_text` or `content_html`,
+     * and whichever one they have can’t be `null`.
+     *
+     * @return void
+     */
+    public function test_json_feed_has_one_content_attribute_and_it_isnt_null()
+    {
+        $response = $this->get('/notes/feed.json');
+        $data = json_decode($response->content());
+        foreach ($data->items as $item) {
+            $this->assertTrue(
+                property_exists($item, 'content_text') ||
+                property_exists($item, 'content_html')
+            );
+            if (property_exists($item, 'content_text')) {
+                $this->assertNotNull($item->content_text);
+            }
+            if (property_exists($item, 'content_html')) {
+                $this->assertNotNull($item->content_html);
+            }
+        }
+    }
 }