diff --git a/swig/Makefile b/swig/Makefile
index deca8df97d7bd255ef2081703854dfae3a9d9e5b..338985e33a22bf89ab096829c0cb3f94e678928c 100644
--- a/swig/Makefile
+++ b/swig/Makefile
@@ -22,6 +22,7 @@ CBIN=libcclvalue.o \
 	libcclstrset.o \
 	libcclmatch.o \
 	libcclmatchdata.o \
+	libccltokenmatch.o \
 	libcclexpression.o \
 	libcclparsedexpression.o \
 	libcclfunctionaloperator.o \
@@ -41,6 +42,7 @@ CBINOUT=_libcclvalue.so \
 				_libcclvariables.so \
 				_libcclmatch.so \
 				_libcclmatchdata.so \
+				_libccltokenmatch.so \
 				_libcclsentencecontext.so \
 				_libccloperator.so \
 				_libcclparser.so \
@@ -58,6 +60,7 @@ CWRAP=libcclvalue_wrap.cxx \
 			libcclvariables_wrap.cxx \
 			libcclmatch_wrap.cxx \
 			libcclmatchdata_wrap.cxx \
+			libccltokenmatch_wrap.cxx \
 			libcclsentencecontext_wrap.cxx \
 			libcorpussentence_wrap.cxx \
 			libccloperator_wrap.cxx \
@@ -74,6 +77,7 @@ CWRAPBIN=libcclvalue_wrap.o \
 				 libcclvariables_wrap.o \
 				 libcclmatch_wrap.o \
 				 libcclmatchdata_wrap.o \
+				 libccltokenmatch_wrap.o \
 				 libcclsentencecontext_wrap.o \
 				 libccloperator_wrap.o \
 				 libcclparser_wrap.o \
@@ -87,6 +91,7 @@ PYMODULES=libcclvalue.py \
 					libccltset.py \
 					libcclmatch.py \
 					libcclmatchdata.py \
+					libccltokenmatch.py \
 					libcclexpression.py \
 					libcclparsedexpression.py \
 					libcclvariables.py \
@@ -102,6 +107,7 @@ PYCBIN=libcclvalue.pyc \
 			 libccltset.pyc \
 			 libcclmatch.pyc \
 			 libcclmatchdata.pyc \
+			 libccltokenmatch.pyc \
 			 libcclexpression.pyc \
 			 libcclparsedexpression.pyc \
 			 libcclvariables.pyc \
@@ -172,13 +178,20 @@ libcclmatch.o:
 	$(CPP) -shared libcclmatch_wrap.o \
 		$(CCLBIN) $(ANTLRLIB) -o _libcclmatch.so
 
-# matchdata
+# MatchData
 libcclmatchdata.o:
 	$(SWIG) $(SWIGOPTS_LANG) libcclmatchdata.i
 	$(CPP) -c libcclmatchdata_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
 	$(CPP) -shared libcclmatchdata_wrap.o \
 		$(CCLBIN) $(ANTLRLIB) -o _libcclmatchdata.so
 
+# TokenMatch
+libccltokenmatch.o:
+	$(SWIG) $(SWIGOPTS_LANG) libccltokenmatch.i
+	$(CPP) -c libccltokenmatch_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
+	$(CPP) -shared libccltokenmatch_wrap.o \
+		$(CCLBIN) $(ANTLRLIB) -o _libccltokenmatch.so
+
 # Expression
 libcclexpression.o:
 	$(SWIG) $(SWIGOPTS_LANG) libcclexpression.i