diff --git a/analyze.py b/analyze.py
index 36eb291..1a862c6 100644
--- a/analyze.py
+++ b/analyze.py
@@ -75,6 +75,38 @@ def make_pronoun_patterns():
                  ('he', 'male'),
                  ('his', 'male'),
                  ('him', 'male'),
+                 # Source: http://nikkistevens.com/open-demographics/questions/gender.html
+                 ('demi-?girl', 'nonbinary'),
+                 ('demi-?woman', 'nonbinary'),
+                 ('demi-?female', 'nonbinary'),
+                 ('demi-?boy', 'nonbinary'),
+                 ('demi-?man', 'nonbinary'),
+                 ('demi-?male', 'nonbinary'),
+                 ('gender-?flux', 'nonbinary'),
+                 ('gender-?fluid', 'nonbinary'),
+                 ('demi-?gender', 'nonbinary'),
+                 ('bi-?gender', 'nonbinary'),
+                 ('tri-?gender', 'nonbinary'),
+                 ('two-?spirit', 'nonbinary'),
+                 ('multi-?gender', 'nonbinary'),
+                 ('poly-?gender', 'nonbinary'),
+                 ('pan-?gender', 'nonbinary'),
+                 ('omni-?gender', 'nonbinary'),
+                 ('maxi-?gender', 'nonbinary'),
+                 ('apora-?gender', 'nonbinary'),
+                 ('inter-?gender', 'nonbinary'),
+                 ('maverique', 'nonbinary'),
+                 ('gender[ -]?confus(ion)|(ed)', 'nonbinary'),
+                 ('gender[ -]?f[u\*]ck', 'nonbinary'),
+                 ('gender[ -]?indifferent', 'nonbinary'),
+                 ('gray-?gender', 'nonbinary'),
+                 ('agender', 'nonbinary'),
+                 ('demi-?agender', 'nonbinary'),
+                 ('genderless', 'nonbinary'),
+                 ('gender[ -]?neutral', 'nonbinary'),
+                 ('neutrois', 'nonbinary'),
+                 ('androgynous', 'nonbinary'),
+                 ('androgyne', 'nonbinary'),
                  ]:
         for text in (r'\b' + p + r'\b',
                      r'\b' + p + r'/',