diff --git a/src/frontend/misccoms.c b/src/frontend/misccoms.c
index 7963acf3f..aede25d06 100644
--- a/src/frontend/misccoms.c
+++ b/src/frontend/misccoms.c
@@ -75,6 +75,7 @@ com_quit(wordlist *wl)
 
     /* then go away */
 
+    cp_destroy_keywords();
     destroy_ivars();
 
     byemesg();
diff --git a/src/frontend/parser/complete.c b/src/frontend/parser/complete.c
index 5bf730739..7579272f2 100644
--- a/src/frontend/parser/complete.c
+++ b/src/frontend/parser/complete.c
@@ -496,6 +496,16 @@ cp_addkword(int kw_class, char *word)
     return;
 }
 
+
+void
+cp_destroy_keywords(void)
+{
+    int i;
+    for (i=0; i<NCLASSES; i++)
+        throwaway(keywords[i]);
+    throwaway(commands);
+}
+
 /* Remove a keyword from the database. */
 
 void
diff --git a/src/include/ngspice/cpextern.h b/src/include/ngspice/cpextern.h
index e5e525512..023243eac 100644
--- a/src/include/ngspice/cpextern.h
+++ b/src/include/ngspice/cpextern.h
@@ -44,6 +44,8 @@ extern void cp_ccon(bool on);
 extern void cp_ccrestart(bool kwords);
 extern void cp_remcomm(char *word);
 extern void cp_remkword(int kw_class, char *word);
+extern void cp_destroy_keywords(void);
+
 extern wordlist *cp_cctowl(struct ccom *stuff);
 
 /* cshpar.c */