diff --git a/.gitignore b/.gitignore
index e9d5b00d..7d3fa655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,8 @@ test_mxqd_control.o
 mxq_log.o
 mx_mysql.o
 mxqd_control.o
+keywordset.o
+test_keywordset.o
 
 
 mxqsub
@@ -34,6 +36,7 @@ test_mx_util
 test_mx_log
 test_mx_mysq
 test_mxqd_control
+test_keywordset
 
 /web/pages/mxq/mxq
 web/lighttpd.conf
diff --git a/Makefile b/Makefile
index 6e14493d..330bfdfc 100644
--- a/Makefile
+++ b/Makefile
@@ -341,6 +341,10 @@ mxqd_control.h += mxqd.h
 
 mx_getopt.h += mx_getopt.h
 
+### keywordset.h -------------------------------------------------------
+
+keywordset.h += keywordset.h
+
 ########################################################################
 
 ### mx_getopt.o --------------------------------------------------------
@@ -494,6 +498,13 @@ mxqsub.o: CFLAGS += $(CFLAGS_MYSQL)
 
 clean: CLEAN += mxqsub.o
 
+### keywordset.o -----------------------------------------------------
+
+keywordset.o: $(keywordset.h)
+keywordset.o: xmalloc.h
+
+clean: CLEAN += keywordset.o
+
 ########################################################################
 
 ### mxqd ---------------------------------------------------------------
@@ -678,3 +689,9 @@ test_mxqd_control: LDLIBS += $(LDLIBS_MYSQL)
 clean: CLEAN += test_mxqd_control
 
 test: test_mxqd_control
+
+test_keywordset: $(test_keywordset.h)
+test_keywordset: test_keywordset.o
+test_keywordset: keywordset.o
+clean: CLEAN += test_keywordset.o
+test: test_keywordset