diff --git a/src/app.ts b/src/app.ts
index 3866760e..743620ad 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -62,6 +62,7 @@ import {
   favouritedByController,
   pinController,
   rebloggedByController,
+  reblogStatusController,
   statusController,
   unbookmarkController,
   unpinController,
@@ -167,6 +168,7 @@ app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/unbookmark', requirePubkey, unbookm
 app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/pin', requirePubkey, pinController);
 app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/unpin', requirePubkey, unpinController);
 app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/zap', requirePubkey, zapController);
+app.post('/api/v1/statuses/:id{[0-9a-f]{64}}/reblog', requirePubkey, reblogStatusController);
 app.post('/api/v1/statuses', requirePubkey, createStatusController);
 app.delete('/api/v1/statuses/:id{[0-9a-f]{64}}', requirePubkey, deleteStatusController);
 
diff --git a/src/controllers/api/statuses.ts b/src/controllers/api/statuses.ts
index 90fcc835..a8f8ece8 100644
--- a/src/controllers/api/statuses.ts
+++ b/src/controllers/api/statuses.ts
@@ -7,7 +7,7 @@ import { jsonMetaContentSchema } from '@/schemas/nostr.ts';
 import { addTag, deleteTag } from '@/tags.ts';
 import { createEvent, paginationSchema, parseBody, updateListEvent } from '@/utils/api.ts';
 import { renderEventAccounts } from '@/views.ts';
-import { renderStatus } from '@/views/mastodon/statuses.ts';
+import { renderReblog, renderStatus } from '@/views/mastodon/statuses.ts';
 import { getLnurl } from '@/utils/lnurl.ts';
 import { nip05Cache } from '@/utils/nip05.ts';
 import { asyncReplaceAll } from '@/utils/text.ts';
@@ -203,6 +203,28 @@ const favouritedByController: AppController = (c) => {
   return renderEventAccounts(c, [{ kinds: [7], '#e': [id], ...params }]);
 };
 
+/** https://docs.joinmastodon.org/methods/statuses/#boost */
+const reblogStatusController: AppController = async (c) => {
+  const eventId = c.req.param('id');
+
+  const event = await getEvent(eventId, {
+    kind: 1,
+  });
+
+  if (!event) {
+    return c.json({ error: 'Event not found.' }, 404);
+  }
+
+  const reblogEvent = await createEvent({
+    kind: 6,
+    tags: [['e', event.id], ['p', event.pubkey]],
+  }, c);
+
+  const status = await renderReblog(reblogEvent);
+
+  return c.json(status);
+};
+
 const rebloggedByController: AppController = (c) => {
   const id = c.req.param('id');
   const params = paginationSchema.parse(c.req.query());
@@ -370,6 +392,7 @@ export {
   favouritedByController,
   pinController,
   rebloggedByController,
+  reblogStatusController,
   statusController,
   unbookmarkController,
   unpinController,
diff --git a/src/controllers/api/streaming.ts b/src/controllers/api/streaming.ts
index c864962e..2ad9eda5 100644
--- a/src/controllers/api/streaming.ts
+++ b/src/controllers/api/streaming.ts
@@ -5,7 +5,7 @@ import { Debug, z } from '@/deps.ts';
 import { getFeedPubkeys } from '@/queries.ts';
 import { Sub } from '@/subs.ts';
 import { bech32ToPubkey } from '@/utils.ts';
-import { renderStatus } from '@/views/mastodon/statuses.ts';
+import { renderReblog, renderStatus } from '@/views/mastodon/statuses.ts';
 
 const debug = Debug('ditto:streaming');
 
@@ -63,6 +63,13 @@ const streamingController: AppController = (c) => {
 
     if (filter) {
       for await (const event of Sub.sub(socket, '1', [filter])) {
+        if (event.kind === 6) {
+          const status = await renderReblog(event);
+          if (status) {
+            send('update', status);
+          }
+          return;
+        }
         const status = await renderStatus(event, pubkey);
         if (status) {
           send('update', status);
@@ -87,20 +94,20 @@ async function topicToFilter(
 
   switch (topic) {
     case 'public':
-      return { kinds: [1] };
+      return { kinds: [1, 6] };
     case 'public:local':
-      return { kinds: [1], search: `domain:${host}` };
+      return { kinds: [1, 6], search: `domain:${host}` };
     case 'hashtag':
-      if (query.tag) return { kinds: [1], '#t': [query.tag] };
+      if (query.tag) return { kinds: [1, 6], '#t': [query.tag] };
       break;
     case 'hashtag:local':
-      if (query.tag) return { kinds: [1], '#t': [query.tag], search: `domain:${host}` };
+      if (query.tag) return { kinds: [1, 6], '#t': [query.tag], search: `domain:${host}` };
       break;
     case 'user':
       // HACK: this puts the user's entire contacts list into RAM,
       // and then calls `matchFilters` over it. Refreshing the page
       // is required after following a new user.
-      return pubkey ? { kinds: [1], authors: await getFeedPubkeys(pubkey) } : undefined;
+      return pubkey ? { kinds: [1, 6], authors: await getFeedPubkeys(pubkey) } : undefined;
   }
 }
 
diff --git a/src/controllers/api/timelines.ts b/src/controllers/api/timelines.ts
index e633ce3d..677bc607 100644
--- a/src/controllers/api/timelines.ts
+++ b/src/controllers/api/timelines.ts
@@ -7,13 +7,13 @@ import { booleanParamSchema } from '@/schema.ts';
 import { eventsDB } from '@/storages.ts';
 import { hydrateEvents } from '@/storages/hydrate.ts';
 import { paginated, paginationSchema } from '@/utils/api.ts';
-import { renderStatus } from '@/views/mastodon/statuses.ts';
+import { renderReblog, renderStatus } from '@/views/mastodon/statuses.ts';
 
 const homeTimelineController: AppController = async (c) => {
   const params = paginationSchema.parse(c.req.query());
   const pubkey = c.get('pubkey')!;
   const authors = await getFeedPubkeys(pubkey);
-  return renderStatuses(c, [{ authors, kinds: [1], ...params }]);
+  return renderStatuses(c, [{ authors, kinds: [1, 6], ...params }]);
 };
 
 const publicQuerySchema = z.object({
@@ -25,7 +25,7 @@ const publicTimelineController: AppController = (c) => {
   const params = paginationSchema.parse(c.req.query());
   const { local, instance } = publicQuerySchema.parse(c.req.query());
 
-  const filter: NostrFilter = { kinds: [1], ...params };
+  const filter: NostrFilter = { kinds: [1, 6], ...params };
 
   if (local) {
     filter.search = `domain:${Conf.url.host}`;
@@ -56,7 +56,17 @@ async function renderStatuses(c: AppContext, filters: NostrFilter[]) {
     return c.json([]);
   }
 
-  const statuses = await Promise.all(events.map((event) => renderStatus(event, c.get('pubkey'))));
+  const statuses = (await Promise.all(events.map((event) => {
+    if (event.kind === 6) {
+      return renderReblog(event);
+    }
+    return renderStatus(event, c.get('pubkey'));
+  }))).filter((boolean) => boolean);
+
+  if (!statuses.length) {
+    return c.json([]);
+  }
+
   return paginated(c, events, statuses);
 }
 
diff --git a/src/interfaces/DittoEvent.ts b/src/interfaces/DittoEvent.ts
index cdd40027..ca38a421 100644
--- a/src/interfaces/DittoEvent.ts
+++ b/src/interfaces/DittoEvent.ts
@@ -22,4 +22,5 @@ export interface DittoEvent extends NostrEvent {
   event_stats?: EventStats;
   d_author?: DittoEvent;
   user?: DittoEvent;
+  repost?: NostrEvent;
 }
diff --git a/src/views/mastodon/statuses.ts b/src/views/mastodon/statuses.ts
index 5f8a0e4a..35f89c5c 100644
--- a/src/views/mastodon/statuses.ts
+++ b/src/views/mastodon/statuses.ts
@@ -4,7 +4,7 @@ import { Conf } from '@/config.ts';
 import { nip19 } from '@/deps.ts';
 import { type DittoEvent } from '@/interfaces/DittoEvent.ts';
 import { getMediaLinks, parseNoteContent } from '@/note.ts';
-import { getAuthor } from '@/queries.ts';
+import { getAuthor, getEvent } from '@/queries.ts';
 import { jsonMediaDataSchema } from '@/schemas/nostr.ts';
 import { eventsDB } from '@/storages.ts';
 import { findReplyTag } from '@/tags.ts';
@@ -100,6 +100,24 @@ async function renderStatus(event: DittoEvent, viewerPubkey?: string) {
   };
 }
 
+async function renderReblog(event: DittoEvent) {
+  if (!event.author) return;
+
+  const repostId = event.tags.find(([name]) => name === 'p')?.[1];
+  event.repost = await getEvent(repostId, { kind: 1 });
+
+  if (!event.repost) return;
+
+  const reblog = await renderStatus(event.repost);
+  reblog.reblogged = true;
+  return {
+    id: event.id,
+    account: await renderAccount(event.author),
+    reblogged: true,
+    reblog,
+  };
+}
+
 async function toMention(pubkey: string) {
   const author = await getAuthor(pubkey);
   const account = author ? await renderAccount(author) : undefined;
@@ -136,4 +154,4 @@ function buildInlineRecipients(mentions: Mention[]): string {
   return `<span class="recipients-inline">${elements.join(' ')} </span>`;
 }
 
-export { renderStatus };
+export { renderReblog, renderStatus };