diff --git a/CREDITS.txt b/CREDITS.txt
index ff430c9273..79f6dc10bf 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -21,7 +21,7 @@ Andreas Neustifter
 Andrej Stieben
 André Alves
 André Lohan
-Andy H3
+Andy
 Andy Hee
 AndyHee
 Angristan
@@ -49,6 +49,7 @@ Christian M. Grube
 Christian Vogeley
 Cohan Robinson
 Copiis Praeesse
+CrystalStiletto
 Cyboulette
 Cyryl Sochacki
 czarnystokrotek
@@ -78,6 +79,7 @@ Fabian Dost
 Fabio Comuni
 felixgilles
 Filip Bugaj
+Filip H.F. "FiXato" Slagter
 FlxAlbroscheit
 foss
 Francesco Apruzzese
@@ -111,6 +113,7 @@ jeroenpraat
 Johannes Schwab
 John Brazil
 Jonatan Nyberg
+Jonny Tischbein
 Josef Moravek
 juanman
 julia.domagalska
@@ -131,7 +134,9 @@ Magdalena Gazda
 Mai Anh Nguyen
 Manuel Pérez Monís
 Marcin Klessa
+Marcin Mikołajczak
 Marcus Müller
+Marie Olive
 Mariusz Pisz
 marmor
 Marquis_de_Carabas
@@ -173,6 +178,7 @@ Rabuzarus
 Radek
 Rafael Garau
 Rainulf Pineda
+Ralf Thees
 Ralph
 Ratten
 rcmaniac
@@ -212,6 +218,7 @@ Thecross
 Thomas
 Thomas Willingham
 thorsten23
+Tim Stahel
 Tino
 Tobias Diekershoff
 Tobias Hößl
@@ -229,10 +236,13 @@ ufic
 Unknown
 Vasudev Kamath
 Vasya Novikov
+Vinzenz Vietzke
 vislav
+vladimir N
 VVelox
 Vít Šesták 'v6ak'
 Waldemar Stoczkowski
+Wouter Broers
 Yasen Pramatarov
 ylms
 Zach Prezkuta
@@ -243,4 +253,4 @@ zottel
 Zvi ben Yaakov (a.k.a rdc)
 Михаил
 Олексій Замковий
-朱陈锬
\ No newline at end of file
+朱陈锬
diff --git a/bin/dev/make_credits.py b/bin/dev/make_credits.py
index e373fa8caa..d895213909 100755
--- a/bin/dev/make_credits.py
+++ b/bin/dev/make_credits.py
@@ -23,7 +23,9 @@ import os, glob, subprocess
 #  not work in some cases.
 dontinclude = ['root', 'friendica', 'bavatar', 'tony baldwin', 'Taek', 'silke m',
                'leberwurscht', 'abinoam', 'fabrixxm', 'FULL NAME', 'Hauke Zuehl',
-               'Michal Supler', 'michal_s', 'Manuel Pérez', 'rabuzarus', 'Alberto Díaz']
+               'Michal Supler', 'michal_s', 'Manuel Pérez', 'rabuzarus',
+               'Alberto Díaz', 'hoergen oostende', 'Friendica', 'vinzv',
+               'Vincent Vindarel']
 
 
 #  this script is in the /bin/dev directory of the friendica installation
@@ -88,10 +90,14 @@ for f in glob.glob(path+'/addon/*/lang/*/messages.po'):
     for ll in l:
         if intrans and ll.strip()=='':
             intrans = False;
-        if intrans and ll[0]=='#':
-            name = ll.split('# ')[1].split(',')[0].split(' <')[0]
-            if not name in contributors and name not in dontinclude:
-                contributors.append(name)
+        # at this point Transifex sometimes includes a "#, fuzzy" we eill
+        # ignore all lines starting with "#," as they do not contains any
+        # "Name email, year" information.
+        if not "#," in ll:
+            if intrans and ll[0]=='#':
+                name = ll.split('# ')[1].split(',')[0].split(' <')[0]
+                if not name in contributors and name not in dontinclude:
+                    contributors.append(name)
         if "# Translators:" in ll:
             intrans = True
 #  done with the translators