diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 4f18ae14f23..fa07fe3b09c 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -587,6 +587,8 @@ reads the sentence before point, and prints the Doctor's answer."
 (doctor-put-meaning vms 'mach)
 (doctor-put-meaning ibm 'mach)
 (doctor-put-meaning pc 'mach)
+(doctor-put-meaning gnu 'mach)
+(doctor-put-meaning linux 'mach)
 (doctor-put-meaning bitching 'foul)
 (doctor-put-meaning shit 'foul)
 (doctor-put-meaning bastard 'foul)
@@ -624,6 +626,8 @@ reads the sentence before point, and prints the Doctor's answer."
 (doctor-put-meaning cocaine 'drug)
 (doctor-put-meaning uppers 'drug)
 (doctor-put-meaning downers 'drug)
+(doctor-put-meaning opium 'drug)
+(doctor-put-meaning valium 'drug)
 (doctor-put-meaning loves 'loves)
 (doctor-put-meaning love 'love)
 (doctor-put-meaning loved 'love)
@@ -653,6 +657,8 @@ reads the sentence before point, and prints the Doctor's answer."
 (doctor-put-meaning likes 'desire)
 (doctor-put-meaning needs 'desire)
 (doctor-put-meaning need 'desire)
+(doctor-put-meaning crave 'desire)
+(doctor-put-meaning craves 'desires)
 (doctor-put-meaning frustrated 'mood)
 (doctor-put-meaning depressed 'mood)
 (doctor-put-meaning annoyed 'mood)
@@ -670,6 +676,9 @@ reads the sentence before point, and prints the Doctor's answer."
 (doctor-put-meaning fear 'fear)
 (doctor-put-meaning scared 'fear)
 (doctor-put-meaning frightened 'fear)
+(doctor-put-meaning panic 'fear)
+(doctor-put-meaning phobia 'fear)
+(doctor-put-meaning phobias 'fear)
 (doctor-put-meaning virginity 'sexnoun)
 (doctor-put-meaning virgins 'sexnoun)
 (doctor-put-meaning virgin 'sexnoun)
@@ -699,6 +708,11 @@ reads the sentence before point, and prints the Doctor's answer."
 (doctor-put-meaning grandfather 'family)
 (doctor-put-meaning maternal 'family)
 (doctor-put-meaning paternal 'family)
+(doctor-put-meaning cousin 'family)
+(doctor-put-meaning aunt 'family)
+(doctor-put-meaning uncle 'family)
+(doctor-put-meaning niece 'family)
+(doctor-put-meaning nephew 'family)
 (doctor-put-meaning stab 'death)
 (doctor-put-meaning murder 'death)
 (doctor-put-meaning murders 'death)
@@ -728,6 +742,8 @@ reads the sentence before point, and prints the Doctor's answer."
 (doctor-put-meaning barf 'symptoms)
 (doctor-put-meaning toothache 'symptoms)
 (doctor-put-meaning hurt 'symptoms)
+(doctor-put-meaning nausea 'symptoms)
+(doctor-put-meaning cough 'symptoms)
 (doctor-put-meaning rum 'alcohol)
 (doctor-put-meaning gin 'alcohol)
 (doctor-put-meaning vodka 'alcohol)
@@ -737,6 +753,8 @@ reads the sentence before point, and prints the Doctor's answer."
 (doctor-put-meaning wine 'alcohol)
 (doctor-put-meaning whiskey 'alcohol)
 (doctor-put-meaning scotch 'alcohol)
+(doctor-put-meaning tequila 'alcohol)
+(doctor-put-meaning martini 'alcohol)
 (doctor-put-meaning fuck 'sexverb)
 (doctor-put-meaning fucked 'sexverb)
 (doctor-put-meaning screw 'sexverb)
@@ -778,6 +796,9 @@ reads the sentence before point, and prints the Doctor's answer."
 (doctor-put-meaning profs 'school)
 (doctor-put-meaning professors 'school)
 (doctor-put-meaning mit 'school)
+(doctor-put-meaning university 'school)
+(doctor-put-meaning college 'school)
+(doctor-put-meaning homework 'school)
 (doctor-put-meaning emacs 'eliza)
 (doctor-put-meaning eliza 'eliza)
 (doctor-put-meaning liza 'eliza)
@@ -815,6 +836,7 @@ reads the sentence before point, and prints the Doctor's answer."
 (doctor-put-meaning geometric 'math)
 (doctor-put-meaning calculus 'math)
 (doctor-put-meaning arithmetic 'math)
+(doctor-put-meaning topology 'math)
 (doctor-put-meaning zippy 'zippy)
 (doctor-put-meaning zippy 'zippy)
 (doctor-put-meaning pinhead 'zippy)