diff --git a/QubesDevelopers.md b/QubesDevelopers.md
index d2204a7c..3b7c03f1 100644
--- a/QubesDevelopers.md
+++ b/QubesDevelopers.md
@@ -10,15 +10,26 @@ Qubes Developers
 Architects & Core Developers
 ----------------------------
 
--   Joanna Rutkowska `joanna at invisiblethingslab dot com` - architecture & project management
--   Marek Marczykowski `marmarek at invisiblethingslab dot com` - core, and pretty much everything these days :)
+-   Joanna Rutkowska `joanna at invisiblethingslab dot com` - architecture & project management, original core, occasional addons
+-   Marek Marczykowski `marmarek at invisiblethingslab dot com` - everything [Xen/Linux?](/wiki/Xen/Linux) related :)
 
-Contributors
-------------
+Contributors to the open source code
+------------------------------------
 
--   Rafal Wojtczuk `rafal at invisiblethingslab dot com` - architecture & system-level stuff
+(Roughly in chronology order:)
+
+-   Rafal Wojtczuk `rafal at invisiblethingslab dot com` - architecture & system-level stuff (notably original gui virtualization)
 -   Tomasz Sterna `tomek at xiaoka dot com` - installer & gui
 -   Agnieszka Kostrzewa `a.kostrzewa at alx dot pl` - qubes-manager, docs
 -   Abel Luck `abel at outcomedubious dot im` - torvm
 -   Alexandre Bezroutchko `abb at gremwell dot com` - pvusb support
+-   Bruce A Downs `bruceadowns at gmail.com` - minor various cleanups and miscs
+-   Olivier Médoc `o_medoc at yahoo.fr` - core and gui fixes, template builder generalization (Arch Linux support)
+-   Timo Juhani Lindfors `timo.lindfors at iki.fi` - minor core cleanups
+-   Radoslaw Szkodzinski `astralstorm at gmail.com` - minor gui build fixes
+
+Proprietary code developers
+---------------------------
+
+-   Alexander Tereshkin `alex.tereshkin at gmail.com` - core windows (Qubes Windows Tools)