diff --git a/README.md b/README.md
index a29b046..78a80b6 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,7 @@ To Contribute, checkout our [`CONTRIBUTING.md`](./CONTRIBUTING.md).
* [alternatives](#password-manager-alternatives)
* [Social Media](#social-media)
* [Servers](#servers)
+ * [Alternatives](#generic-social-media-server-alternatives)
* [Clients](#clients)
* [Messaging](#messaging)
* [Budgeting](#budgeting)
@@ -492,19 +493,27 @@ This is for both social media websites and apps.
| Name | Last Untainted Version or Commit ID | Tags and Evidence | Alternative(s) |
|---|:---:|---|---|
-| [Bluesky](https://bsky.app) | [](#request-for-help) | [](#vibecoded) ([1](https://bsky.app/profile/pfrazee.com/post/3luyb3jcbv52d)) | [GoToSocial] |
-| [`rsky`](https://github.com/blacksky-algorithms/rsky) | [](#request-for-help) | [](#vibecoded) ([1](https://github.com/blacksky-algorithms/rsky/commit/02313d970dc2e1cef0909277b94bbff222dff152), [2](https://github.com/blacksky-algorithms/rsky/commit/fd6063d4e2f0688899faef34e2d3553c36c69d43), [3](https://github.com/blacksky-algorithms/rsky/commit/b7adaa213ca49318de078b82410bf54f828ba0f2)) | [GoToSocial] |
+| [Bluesky](https://bsky.app) | [](#request-for-help) | [](#vibecoded) ([1](https://bsky.app/profile/pfrazee.com/post/3luyb3jcbv52d)) | See below |
+| [`rsky`](https://github.com/blacksky-algorithms/rsky) | [](#request-for-help) | [](#vibecoded) ([1](https://github.com/blacksky-algorithms/rsky/commit/02313d970dc2e1cef0909277b94bbff222dff152), [2](https://github.com/blacksky-algorithms/rsky/commit/fd6063d4e2f0688899faef34e2d3553c36c69d43), [3](https://github.com/blacksky-algorithms/rsky/commit/b7adaa213ca49318de078b82410bf54f828ba0f2)) | See below |
| [PeerTube](https://joinpeertube.org/) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/Chocobozzz/PeerTube/blob/c2345d670bfe83295896b3451ebfc14185934a1b/AGENTS.md))
[](#ai-functionality) ([1](https://framacolibri.org/t/peertube-and-generative-ai/26622)) | [](#request-for-help) |
-| [Mastodon](https://joinmastodon.org/) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/mastodon/.github/blob/49b9c64f3e2b6a459e56a05068c05b3247659bb3/AI_POLICY.md)) | [GoToSocial] |
-| [Misskey](https://misskey-hub.net/) | [](#request-for-help) | [](#vibecoded) ([1](https://github.com/misskey-dev/misskey/commit/2fa6ecc7efaaf9b9d189cdd3a3ebbb9171c86078)) | [GoToSocial] |
+| [Mastodon](https://joinmastodon.org/) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/mastodon/.github/blob/49b9c64f3e2b6a459e56a05068c05b3247659bb3/AI_POLICY.md)) | See below |
+| [Misskey](https://misskey-hub.net/) | [](#request-for-help) | [](#vibecoded) ([1](https://github.com/misskey-dev/misskey/commit/2fa6ecc7efaaf9b9d189cdd3a3ebbb9171c86078)) | See below |
| [Lemmy](https://join-lemmy.org/) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://join-lemmy.org/docs/code_of_conduct.html)) | [](#request-for-help) |
+> [!Note]
+> ##### Generic social media server alternatives
+> * [GoToSocial]
+> * [Wafrn](https://codeberg.org/wafrn/wafrn/) supports both ActivityPub and ATproto
+> * [snac2](https://codeberg.org/grunfink/snac2)
+> * [Iceshrimp.NET](https://iceshrimp.net/)
+> * [Epicyon](https://codeberg.org/bashrc/epicyon)
+
#### Clients
| Name | Last Untainted Version or Commit ID | Tags and Evidence | Alternative(s) |
|---|:---:|---|---|
-| [IceCubesApp for iOS](https://github.com/Dimillian/IceCubesApp) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/Dimillian/IceCubesApp/blob/main/CLAUDE.md)) |[Feditext](https://github.com/feditext/feditext), an iOS fediverse app in beta |
-| [Bluesky Social App](https://github.com/misskey-dev/misskey/commit/2fa6ecc7efaaf9b9d189cdd3a3ebbb9171c86078) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/bluesky-social/social-app/blob/177bdcd2b7807c9980dab32e7a5664fc006df40b/CLAUDE.md))
[](#vibecoded) ([1](https://github.com/bluesky-social/social-app/commit/8c4fc087f8119de5c007b71baaaf02089a346b38), [2](https://github.com/bluesky-social/social-app/commit/612a778361edc0314f92a0451abb98843e7bef9a), [3](https://github.com/bluesky-social/social-app/commit/1782a65174cbd22f01936f529f954e7a491b3fac)) | Not using Bluesky |
+| [IceCubesApp for iOS](https://github.com/Dimillian/IceCubesApp) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/Dimillian/IceCubesApp/blob/main/CLAUDE.md)) |[Feditext](https://github.com/feditext/feditext) (an iOS fediverse app in beta), [wafrn-rn] |
+| [Bluesky Social App](https://github.com/misskey-dev/misskey/commit/2fa6ecc7efaaf9b9d189cdd3a3ebbb9171c86078) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/bluesky-social/social-app/blob/177bdcd2b7807c9980dab32e7a5664fc006df40b/CLAUDE.md))
[](#vibecoded) ([1](https://github.com/bluesky-social/social-app/commit/8c4fc087f8119de5c007b71baaaf02089a346b38), [2](https://github.com/bluesky-social/social-app/commit/612a778361edc0314f92a0451abb98843e7bef9a), [3](https://github.com/bluesky-social/social-app/commit/1782a65174cbd22f01936f529f954e7a491b3fac)) | [wafrn-rn] |
### Messaging
@@ -758,6 +767,7 @@ This repository is licensed under the Creative Commons Attribution Share Alike 4
[Servo]: https://servo.org/
[vaultwarden]: https://github.com/dani-garcia/vaultwarden
[vim-classic]: https://drewdevault.com/2026/03/25/2026-03-25-Forking-vim.html
+[wafrn-rn]: https://codeberg.org/wafrn/wafrn-rn
[WriteFreely]: https://writefreely.org/
[xfce4-terminal]: https://gitlab.xfce.org/apps/xfce4-terminal
[XTerm]: https://xterm.dev/