diff --git a/web/people/index.org b/web/people/index.org
index 1f65d18..ea3e484 100644
--- a/web/people/index.org
+++ b/web/people/index.org
@@ -1,144 +1,144 @@
#+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 are responsible to keep them running. Software and
thus GnuPG is not different. Although software is build using a lot
of other software and thus the work of many thousand 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:
** 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 is
+ 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.]]
#+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:
** 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.]]
#+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. 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.]]
#+HTML:
* COMMENT
# eof
diff --git a/web/verein/members.org b/web/verein/members.org
index 3b0daad..faad51c 100644
--- a/web/verein/members.org
+++ b/web/verein/members.org
@@ -1,28 +1,31 @@
#+TITLE: Members of the GnuPG e.V
#+STARTUP: showall
#+SETUPFILE: "../share/setup.inc"
* List of GnuPG e.V Members.
To apply for membership please write to board@. We expect that you
have a more than average interest in GnuPG or OpenPGP and that you are
active in development or in evangelizing end-to-end encryption.
** The regular members
- Andre Heinecke
- Bernhard Reiter
- Damien Goutte-Gattat
- Daniel Kahn Gillmor
- Holger Smolinski
- Justus Winter
- Kai Michaelis
- Kristian Fiskerstrand
- - Marcus Brinkmann
- Neal Walfied
- Werner Koch
- Yutaka Niibe
+*** Former members
+
+ - Marcus Brinkmann
+
** The supporting members
/none so far - we still need to setup rules/