diff --git a/Makefile.in b/Makefile.in
index b0bfb361b..121aeb2f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -329,7 +329,7 @@ install-main:
 	@$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
 
 lib-languages = typemaps tcl perl5 python guile java mzscheme ruby php4 ocaml \
-	pike chicken csharp modula3 allegrocl clisp lua
+	pike chicken csharp modula3 allegrocl clisp lua cffi
 
 lib-modules = std
 
diff --git a/Source/Makefile.am b/Source/Makefile.am
index 0025732dd..513fcdc5c 100644
--- a/Source/Makefile.am
+++ b/Source/Makefile.am
@@ -38,6 +38,7 @@ eswig_SOURCES =	CParse/cscanner.c		\
 		Modules/allegrocl.cxx		\
 		Modules/allocate.cxx		\
 		Modules/browser.cxx		\
+		Modules/cffi.cxx		\
 		Modules/chicken.cxx		\
 		Modules/clisp.cxx		\
 		Modules/contract.cxx		\
diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx
index dbcebcabc..71dee799d 100644
--- a/Source/Modules/swigmain.cxx
+++ b/Source/Modules/swigmain.cxx
@@ -50,6 +50,7 @@ extern "C" {
   Language *swig_allegrocl(void);
   Language *swig_lua(void);
   Language *swig_clisp(void);
+  Language *swig_cffi(void);  
   Language *swig_uffi(void);
 }
 
@@ -67,6 +68,7 @@ static swig_module  modules[] = {
   {"-allegrocl", swig_allegrocl, "ALLEGROCL"},
   {"-chicken",   swig_chicken,   "CHICKEN"},
   {"-clisp",     swig_clisp,     "CLISP"},
+  {"-cffi",      swig_cffi,     "CFFI"},
   {"-csharp",    swig_csharp,    "C#"},
   {"-guile",     swig_guile,     "Guile"},
   {"-java",      swig_java,      "Java"},