diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index eb8a2fc..ae53d4b 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -15,7 +15,6 @@
                  src/generate/t_xsd_generator.cc \
                  src/generate/t_perl_generator.cc \
                  src/generate/t_erl_generator.cc \
-                 src/generate/t_cocoa_generator.cc \
                  src/generate/t_csharp_generator.cc \
                  src/globals.h \
                  src/main.h \
@@ -55,6 +54,9 @@
 if THRIFT_GEN_java
 thrift_SOURCES += src/generate/t_java_generator.cc
 endif
+if THRIFT_GEN_cocoa
+thrift_SOURCES += src/generate/t_cocoa_generator.cc
+endif
 if THRIFT_GEN_st
 thrift_SOURCES += src/generate/t_st_generator.cc
 endif
diff --git a/configure.ac b/configure.ac
index 8e90092..6d41505 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,8 @@
 AM_CONDITIONAL([THRIFT_GEN_cpp], [test "$ax_thrift_gen_cpp" = "yes"])
 AX_THRIFT_GEN(java, [Java], yes)
 AM_CONDITIONAL([THRIFT_GEN_java], [test "$ax_thrift_gen_java" = "yes"])
+AX_THRIFT_GEN(cocoa, [Cocoa], yes)
+AM_CONDITIONAL([THRIFT_GEN_cocoa], [test "$ax_thrift_gen_cocoa" = "yes"])
 AX_THRIFT_GEN(st, [Smalltalk], yes)
 AM_CONDITIONAL([THRIFT_GEN_st], [test "$ax_thrift_gen_st" = "yes"])
 AX_THRIFT_GEN(ocaml, [OCaml], yes)