diff --git a/README.md b/README.md
index 12d74717b..1bbeb5909 100644
--- a/README.md
+++ b/README.md
@@ -1,50 +1,48 @@
-[Windows Snapshot](https://sourceforge.net/projects/cc65/files/cc65-snapshot-win32.zip)
-
-[Linux Snapshot DEB and RPM](https://software.opensuse.org//download.html?project=home%3Astrik&package=cc65)
-
-[Documentation](https://cc65.github.io/doc)
-
-[Contributing](Contributing.md) to the CC65 project.
-
-The [Wiki](https://github.com/cc65/wiki/wiki) contains extra info that does not fit into the regular documentation.
-
-[![Snapshot Build](https://github.com/cc65/cc65/actions/workflows/snapshot-on-push-master.yml/badge.svg?branch=master)](https://github.com/cc65/cc65/actions/workflows/snapshot-on-push-master.yml)
+# About cc65
 
 cc65 is a complete cross development package for 65(C)02 systems, including
 a powerful macro assembler, a C compiler, linker, librarian and several
-other tools.
+other tools. cc65 has C and runtime library support for many of the old 6502 machines.
+For details look at the [Website](https://cc65.github.io).
 
-cc65 has C and runtime library support for many of the old 6502 machines,
-including
+## People
 
-- the following Commodore machines:
-  - VIC20
-  - C16/C116 and Plus/4
-  - C64
-  - C128
-  - CBM 510 (aka P500)
-  - the 600/700 family
-  - newer PET machines (not 2001).
-- the Apple ]\[+ and successors.
-- the Atari 8-bit machines.
-- the Atari 2600 console.
-- the Atari 5200 console.
-- the Atari 7800 console.
-- GEOS for the C64, C128 and Apple //e.
-- the Bit Corporation Gamate console.
-- the NEC PC-Engine (aka TurboGrafx-16) console.
-- the Nintendo Entertainment System (NES) console.
-- the Watara Supervision console.
-- the VTech Creativision console.
-- the Oric Atmos.
-- the Oric Telestrat.
-- the Lynx console.
-- the Ohio Scientific Challenger 1P.
-- the Commander X16.
-<<<<<<< HEAD
-- the Synertek Systems Sym-1.
-=======
->>>>>>> 2583dfb71 (Update README.md)
+Core team members:
 
-The libraries are fairly portable, so creating a version for other 6502s
-shouldn't be too much work.
+* [Christian Groessler](https://github.com/groessler): Atari, Atari5200, and CreatiVision library Maintainer
+* [dqh](https://github.com/dqh-au): GHA help
+* [Greg King](https://github.com/greg-king5): all around hackery
+* [groepaz](https://github.com/mrdudz): CBM libary, Project Maintainer
+* [Oliver Schmidt](https://github.com/oliverschmidt): Apple II library Maintainer
+
+External contributors:
+
+* [acqn](https://github.com/acqn): various compiler fixes
+* [jedeoric](https://github.com/jedeoric): Telestrat target
+* [jmr](https://github.com/jmr): compiler fixes
+* [karrika](https://github.com/karrika): Atari 7800 target
+* [Stephan Mühlstrasser](https://github.com/smuehlst): osic1p target
+
+*(The above list is incomplete, if you feel left out - please speak up or add yourself in a PR)*
+
+For a complete list look at the [full team list](https://github.com/orgs/cc65/teams) or the list of [all contributors](https://github.com/cc65/cc65/graphs/contributors)
+
+# Contact
+
+For general discussion, questions, etc subscribe to the [mailing list](https://cc65.github.io/mailing-lists.html) or use the [github discussions](https://github.com/cc65/cc65/discussions).
+
+# Documentation
+
+* The main [Documentation](https://cc65.github.io/doc) for users and developers
+
+* Info on [Contributing](Contributing.md) to the CC65 project. Please read this before working on something you want to contribute, and before reporting bugs.
+
+* The [Wiki](https://github.com/cc65/wiki/wiki) contains some extra info that does not fit into the regular documentation.
+
+# Downloads
+
+* [Windows Snapshot](https://sourceforge.net/projects/cc65/files/cc65-snapshot-win32.zip)
+
+* [Linux Snapshot DEB and RPM](https://software.opensuse.org//download.html?project=home%3Astrik&package=cc65)
+
+[![Snapshot Build](https://github.com/cc65/cc65/actions/workflows/snapshot-on-push-master.yml/badge.svg?branch=master)](https://github.com/cc65/cc65/actions/workflows/snapshot-on-push-master.yml)