diff --git a/src/index.js b/src/index.js
index 38f21b5..567e80e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -72,7 +72,7 @@
 // Maps lowercased surface form → { lemma, upos, xpos, feats }.
 //
 // Lemma: nominative form as listed on pronomen.net.
-// UPOS:  PRON  |  XPOS: PPER  |  FEATS: Gender=NonBin|PronType=Prs
+// UPOS:  PRON  |  XPOS: PPER  |  FEATS: Gender=Fem,Masc,NonBin|PronType=Prs
 //
 // Excluded (too ambiguous with standard German words):
 //   'dem'   – dative definite article / demonstrative pronoun
@@ -91,7 +91,7 @@
 // ---------------------------------------------------------------------------
 
 function neoPron(lemma) {
-  return { lemma, upos: 'PRON', xpos: 'PPER', feats: 'Gender=NonBin|PronType=Prs' };
+  return { lemma, upos: 'PRON', xpos: 'PPER', feats: 'Gender=Fem,Masc,NonBin|PronType=Prs' };
 }
 
 const NEO_PRONOUN_FORMS = new Map([
@@ -261,7 +261,7 @@
 
   const feats = [];
   if (genderIsNonBinary) {
-    feats.push('Gender=NonBin');
+    feats.push('Gender=Fem,Masc,NonBin');
   } else if (genderIsBinary) {
     feats.push('Gender=Masc,Fem');
   }
@@ -449,7 +449,7 @@
       lemma: detBase + marker + ending,
       upos:  'DET',
       xpos:  inferDetXpos(detBase),
-      feats: 'Gender=NonBin',
+      feats: 'Gender=Fem,Masc,NonBin',
     };
   }
 
@@ -476,7 +476,7 @@
       upos:  'PRON',
       xpos:  inferPronXpos(pron1),
       feats: markerType === 'star' || markerType === 'colon' || markerType === 'underscore'
-             ? 'Gender=NonBin' : 'Gender=Masc,Fem',
+             ? 'Gender=Fem,Masc,NonBin' : 'Gender=Masc,Fem',
     };
   }