diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index c3bf82e3d..dacb2a9dd 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -16,7 +16,6 @@ thrift_SOURCES = src/thrifty.yy \
                  src/generate/t_perl_generator.cc \
                  src/generate/t_erl_generator.cc \
                  src/generate/t_cocoa_generator.cc \
-                 src/generate/t_st_generator.cc \
                  src/generate/t_csharp_generator.cc \
                  src/globals.h \
                  src/main.h \
@@ -57,6 +56,9 @@ endif
 if THRIFT_GEN_java
 thrift_SOURCES += src/generate/t_java_generator.cc
 endif
+if THRIFT_GEN_st
+thrift_SOURCES += src/generate/t_st_generator.cc
+endif
 if THRIFT_GEN_ocaml
 thrift_SOURCES += src/generate/t_ocaml_generator.cc
 endif
diff --git a/configure.ac b/configure.ac
index 862cd53e9..8e90092bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,8 @@ AX_THRIFT_GEN(cpp, [C++], yes)
 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(st, [Smalltalk], yes)
+AM_CONDITIONAL([THRIFT_GEN_st], [test "$ax_thrift_gen_st" = "yes"])
 AX_THRIFT_GEN(ocaml, [OCaml], yes)
 AM_CONDITIONAL([THRIFT_GEN_ocaml], [test "$ax_thrift_gen_ocaml" = "yes"])
 AX_THRIFT_GEN(hs, [Haskell], yes)