diff --git a/configure.ac b/configure.ac
index 704719d..16e053c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,13 @@
 AM_CONDITIONAL([ENABLE_JAVA],
                [test -n "$ANT" -a -n "$JAVA" -a -n "$JAVAC"])
 
+AX_THRIFT_LIB(erlang, [Erlang], yes)
+if test "$with_erlang" = "yes";  then
+  AC_PATH_PROG([ERLC], [erlc])
+fi
+
+AM_CONDITIONAL(ENABLE_ERLANG, [test -n "$ERLC"])
+
 AC_C_CONST
 AC_C_INLINE
 AC_C_VOLATILE
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 36191f6..5d2e1fa 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -10,6 +10,10 @@
 SUBDIRS += java
 endif
 
+if ENABLE_ERLANG
+SUBDIRS += erl
+endif
+
 EXTRA_DIST = \
   cocoa \
   erl   \
diff --git a/lib/erl/src/Makefile b/lib/erl/src/Makefile
index 32b7395..32db9c4 100644
--- a/lib/erl/src/Makefile
+++ b/lib/erl/src/Makefile
@@ -25,8 +25,8 @@
 # ----------------------------------------------------
 
 
-MODULES = $(shell find -name \*.erl | sed s:^\\./:: | sed s/\\.erl//)
-MODULES_STRING_LIST = $(shell find -name \*.erl | sed s:^\\./:\": | sed s/\\.erl/\",/)
+MODULES = $(shell find . -name \*.erl | sed s:^\\./:: | sed s/\\.erl//)
+MODULES_STRING_LIST = $(shell find . -name \*.erl | sed s:^\\./:\": | sed s/\\.erl/\",/)
 
 HRL_FILES=
 INTERNAL_HRL_FILES= $(APP_NAME).hrl