diff --git a/web/people/index.org b/web/people/index.org
index 612ecdb..fbc9379 100644
--- a/web/people/index.org
+++ b/web/people/index.org
@@ -1,212 +1,213 @@
#+TITLE: GnuPG - People
#+STARTUP: showall
#+SETUPFILE: "../share/setup.inc"
* The People behind GnuPG
As with all technical things in the world, people and not machines
created them and are responsible to keep them running. Software and
thus GnuPG is no different. Although software is built using a lot
of other software and thus the work of many thousands of people, you
may be interested to see who is working on GnuPG. Here is a list of
some of them:
#+HTML:
** Werner Koch
#+HTML:
#+HTML:
#+HTML:
/Core components maintainer/
Werner started GnuPG in 1997 and still puts most of his working
time into the development and maintenance of GnuPG. He has 29
years experience in commercial software development on systems
ranging from CP/M systems to mainframes, languages from assembler
to Smalltalk and applications from drivers to financial analysis
systems. Werner is a long time free software supporter and
co-founder of the [[http://fsfe.org][FSFE]]. With the support of his brother he founded
[[https://g10code.com][g10^code]] GmbH in 2001 to make GnuPG development his profession.
Werner is full time employed by g10^code. He is a founding member
and the current chairperson of the [[../verein/index.org][GnuPG e.V.]]
#+HTML:
** David Shaw
#+HTML:
#+HTML:
#+HTML:
/Master of the classic branch/
David approached the GnuPG Project in 2002 after the relaxing of
the US crypto regulation allowed the participation of US based
hackers on international crypto projects. One of his first
achievements was a much improved Web-of-Trust implementation.
Today he mainly takes responsibility for the keyserver access and
the classic GnuPG 1.x branch.
#+HTML:
** NIIBE Yutaka
#+HTML:
#+HTML:
#+HTML:
/Smartcards and Libgcrypt/
Niibe is a long time free software hacker who joined the GnuPG
project in 2011 and soon took over the development of the smartcard
related code. He is also the person behind the [[http://www.fsij.org/gnuk/][Gnuk Token]] and the
[[http://www.gniibe.org/memo/development/gnuk/rng/please-more-and-more-mep.html][MEP game]]. Niibe’s work on GnuPG is financially supported by
g10^code. He is a founding member of the [[../verein/index.org][GnuPG e.V.]]
#+HTML:
** Jussi Kivilinna
#+HTML:
#+HTML:
#+HTML:
/Optimization/
Jussi joined the GnuPG project in 2012 and worked since then on
assembler optimized code for cryptographic algorithms in Libgcrypt.
#+HTML:
+** Andre Heinecke
+
+ #+HTML:
+ #+HTML:
+ #+HTML:
+
+ /Windows and UX/
+
+ Andre is working on GnuPG related projects for
+ [[https://www.g10code.at][g10^code Austria GmbH]] He has been an active KDE Developer since 2009,
+ mostly focused on Windows ports of KDE Software. Since 2013 he took
+ over several Windows and UX specific parts of GnuPG.
+
+ Andre is the current maintainer of Kleopatra the KDE / Gpg4win GUI
+ for GnuPG. He also maintains GpgOL since 2013 and wrote the
+ support for Outlook 2010 and later versions. Additonally he is the
+ maintainer of Gpg4win in general and GpgEX as well as the GPGME
+ bindings for C++ and Qt.
+
+ He is a founding member and the current cashier of the [[../verein/index.org][GnuPG e.V.]]
+
+ GPG Key: [[https://k.gnupg.net/94A5C9A03C2FE5CA3B095D8E1FDF723CF462B6B1][94A5 C9A0 3C2F E5CA 3B09]] [[https://sks-keyservers.net/pks/lookup?op=get&search=0x94A5C9A03C2FE5CA3B095D8E1FDF723CF462B6B1][5D8E 1FDF 723C F462 B6B1]]
+
+ #+HTML:
+
+
+ #+HTML:
+
** Ben McGinnes
#+HTML:
#+HTML:
#+HTML:
/GPGME python hacker/
Ben started working on GPGME in 2015 with the initial port of PyME
from Python 2 to Python 3. Then returned to take over stewardship
of Justus' enhanced version of that port from late 2017 onward. In
conjunction with with continuing work on documentation, developing
the XML definitions of various components of the project and
working on enhancements for which GnuPG and OpenPGP can provide
other protocols, languages or services.
He has been actively advocating for civil and human rights since
the '90s, including as a public [[https://www.securetheinternet.org/][signatory to the open letter]] to
world leaders to not undermine security and freedom. Ben can
sometimes be found on [[irc://irc.freenode.net][Freenode IRC]] using the handle =Hasimir=, in
the fediverse as [[https://chaos.social/users/adversary][@adversary@chaos.social]], and, of course, on the
GnuPG mailing lists (most often posting from his own domain name,
[[http://www.adversary.org/wp/][adversary.org]]).
GPG Key: [[http://www.adversary.org/ben-key.asc][DB47 24E6 FA42 86C9 2B4E]] [[https://sks-keyservers.net/pks/lookup?op=get&search=0xDB4724E6FA4286C92B4E55C4321E4E2373590E5D][55C4 321E 4E23 7359 0E5D]]
#+HTML:
-** Andre Heinecke
-
- #+HTML:
- #+HTML:
- #+HTML:
-
- /Windows and UX/
-
- Andre is working mainly on GnuPG related projects for his employer
- [[https://www.intevation.org][Intevation GmbH]] He has been an active KDE Developer since 2009,
- mostly focused on Windows ports of KDE Software. Since 2013 he took
- over several Windows and UX specific parts of GnuPG.
-
- Andre is the current maintainer of Kleopatra the KDE / Gpg4win GUI
- for GnuPG. He also maintains GpgOL since 2013 and wrote the
- support for Outlook 2010 and later versions. Additonally he is the
- maintainer of Gpg4win in general and GpgEX as well as the GPGME
- bindings for C++ and Qt.
-
- He is a founding member and the current cashier of the [[../verein/index.org][GnuPG e.V.]]
-
- GPG Key: [[https://k.gnupg.net/94A5C9A03C2FE5CA3B095D8E1FDF723CF462B6B1][94A5 C9A0 3C2F E5CA 3B09]] [[https://sks-keyservers.net/pks/lookup?op=get&search=0x94A5C9A03C2FE5CA3B095D8E1FDF723CF462B6B1][5D8E 1FDF 723C F462 B6B1]]
-
- #+HTML:
-
-
- #+HTML:
* Former developers
The following developers made large contributions to GnuPG in the past
but are, sadly, no longer active GnuPG developers.
Most are still working on improving the OpenPGP ecosystem and we wish
them the very best.
#+HTML:
** Marcus Brinkmann
#+HTML:
#+HTML:
#+HTML:
/Hacker/
Marcus is part of the free software community since 1997, when he
joined the [[http://www.debian.org][Debian]] project. Probably best known for his past work
on GNU/Hurd, he also has a diploma degree in mathematics, and was
part and full time employed by [[https://g10code.com][g10^code]] to work on GnuPG and
related software from 2001 to 2012 and for 7 months in 2017. He was
a founding member of the [[../verein/index.org][GnuPG e.V.]]
Marcus currently works on [[https://neopg.io/][NeoPG]].
#+HTML:
** Neal Walfied
#+HTML:
#+HTML:
#+HTML:
/Core components hacker/
Neal started to work on GnuPG in 2015 to support maintenance and
development in all areas. We was full time employed by g10^code
from 2015 to 2017. He is a founding member of the [[../verein/index.org][GnuPG e.V.]]
Neal currently works on [[https://sequoia-pgp.org/][Sequoia-PGP]].
#+HTML:
** Kai Michaelis
#+HTML:
#+HTML:
#+HTML:
/Enigmail hacker/
Kai is working on the [[https://enigmail.net][Enigmail]] project since 2015. He was part
time employed by g10^code from 2015 to 2017. He is a founding
member of the [[../verein/index.org][GnuPG e.V.]]
#+HTML:
** Justus Winter
#+HTML:
#+HTML:
#+HTML:
/Core components hacker/
Justus started to work on GnuPG in 2015 to support maintenance and
development in all areas. He was full time employed by g10^code
from 2015 to 2017. He is a founding member of the [[../verein/index.org][GnuPG e.V.]]
Justus currently works on [[https://sequoia-pgp.org/][Sequoia-PGP]].
#+HTML:
* COMMENT
# eof