diff --git a/build/modules.conf.in b/build/modules.conf.in
index a33a5bdd2e..22fa0cc1ea 100644
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -8,6 +8,7 @@ applications/mod_enum
 #applications/mod_soundtouch
 #applications/mod_rss
 #asr_tts/mod_cepstral
+#asr_tts/mod_openmrcp
 #codecs/mod_amr
 codecs/mod_g711
 #codecs/mod_g722
@@ -28,6 +29,7 @@ endpoints/mod_portaudio
 endpoints/mod_sofia
 #endpoints/mod_wanpipe
 endpoints/mod_woomera
+#../../libs/openzap/mod_openzap
 #event_handlers/mod_cdr
 #event_handlers/mod_event_multicast
 event_handlers/mod_event_socket
diff --git a/configure.in b/configure.in
index c10f687d30..04ae944dab 100644
--- a/configure.in
+++ b/configure.in
@@ -400,5 +400,6 @@ AC_CONFIG_SUBDIRS(libs/sofia-sip)
 AC_CONFIG_SUBDIRS(libs/speex)
 AC_CONFIG_SUBDIRS(libs/xmlrpc-c)
 AC_CONFIG_SUBDIRS(libs/portaudio)
+AC_CONFIG_SUBDIRS(libs/openmrcp)
 
 AC_OUTPUT
diff --git a/src/mod/asr_tts/mod_openmrcp/Makefile b/src/mod/asr_tts/mod_openmrcp/Makefile
index 2ed42c5b05..082f3a297c 100644
--- a/src/mod/asr_tts/mod_openmrcp/Makefile
+++ b/src/mod/asr_tts/mod_openmrcp/Makefile
@@ -1,33 +1,27 @@
 # define these targets in your makefile if you wish
 # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
 
-# and define these variables to impact your build
-
-# TO GET THIS TO COMPILE
-# hack ../../../../build/modmake.rules and remove the
-# -Werror from the ALL_CFLAGS variable.  
-
 # TODO
-# - re-enable the -Werror flag after openmrcp compilation warnings are fixed
 # - needs to compile/link against the _freeswitch_ sofia libs (see FIXME)
-# - Should this download and build openmrcp?  What's the plan? (see FIXME)
-# - somehow consolidate libs and includes into less files
 
-# FIXME!!!  
-OPENMRCP_DIR=/usr/src/openmrcp_trunk
+OPENMRCP_DIR=../../../../libs/openmrcp
 
 OPENMRCP_INCLUDE=-I$(OPENMRCP_DIR)/mrcpcore/client/include/ -I$(OPENMRCP_DIR)/platform/openmrcpclient/include/ -I$(OPENMRCP_DIR)/mediaframe/include/ -I$(OPENMRCP_DIR)/mrcpcore/engine/include/ -I$(OPENMRCP_DIR)/mrcpcore/include/ -I$(OPENMRCP_DIR)/mrcpcore/parser/include/ -I$(OPENMRCP_DIR)/mrcpcore/server/include/ -I$(OPENMRCP_DIR)/mrcpcore/media/include/ -I$(OPENMRCP_DIR)/mrcpcore/util/include -I$(OPENMRCP_DIR)/mrcpcore/resource/include/
 
-OPENMRCP_LIBS=$(OPENMRCP_DIR)/platform/openmrcpclient/.libs/libopenmrcpclient.a $(OPENMRCP_DIR)/platform/openmrcpserver/.libs/libopenmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/client/.libs/libmrcpclient.a $(OPENMRCP_DIR)/mediaframe/.libs/libmediaframe.a $(OPENMRCP_DIR)/mrcpcore/engine/.libs/libmrcpengine.a $(OPENMRCP_DIR)/mrcpcore/parser/.libs/libmrcpparser.a $(OPENMRCP_DIR)/mrcpcore/server/.libs/libmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/media/.libs/libmrcpmedia.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/resource/.libs/libmrcpresource.a $(OPENMRCP_DIR)/module/plugin/demo/.libs/libdemoplugin.a $(OPENMRCP_DIR)/module/mrcpv2agent/.libs/libmrcpv2agent.a $(OPENMRCP_DIR)/module/mrcpmediaframe/.libs/libmrcpmediaframe.a $(OPENMRCP_DIR)/module/mrcpsofiasip/.libs/libmrcpsofiasip.a $(OPENMRCP_DIR)/mrcpcore/.libs/libmrcpcore.a
+OPENMRCP_LIBS=$(OPENMRCP_DIR)/platform/openmrcpclient/.libs/libopenmrcpclient.a $(OPENMRCP_DIR)/platform/openmrcpserver/.libs/libopenmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/client/.libs/libmrcpclient.a $(OPENMRCP_DIR)/mediaframe/.libs/libmediaframe.a $(OPENMRCP_DIR)/mrcpcore/engine/.libs/libmrcpengine.a $(OPENMRCP_DIR)/mrcpcore/parser/.libs/libmrcpparser.a $(OPENMRCP_DIR)/mrcpcore/server/.libs/libmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/media/.libs/libmrcpmedia.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/resource/.libs/libmrcpresource.a $(OPENMRCP_DIR)/module/plugin/demo/.libs/libdemoplugin.a $(OPENMRCP_DIR)/module/mrcpv2agent/.libs/libmrcpv2agent.a $(OPENMRCP_DIR)/module/mrcpmediaframe/.libs/libmrcpmediaframe.a $(OPENMRCP_DIR)/module/mrcpsofiasip/.libs/libmrcpsofiasip.a $(OPENMRCP_DIR)/mrcpcore/.libs/libmrcpcore.a
 
 MRCP_APR_INCLUDES =  -I../../../../libs/apr/include
 MRCP_APU_INCLUDES =  -I../../../../libs/apr-util/include
-MRCP_SOFIA_INCLUDES = -I/usr/local/include/sofia-sip-1.12  # FIXME!!
 
 LOCAL_CFLAGS= -Wno-unused
-LOCAL_CFLAGS+= -Wno-comment -Wno-sign-compare $(OPENMRCP_INCLUDE) $(MRCP_APR_INCLUDES) $(MRCP_APU_INCLUDES) $(MRCP_SOFIA_INCLUDES)
+LOCAL_CFLAGS+= -Wno-comment -Wno-sign-compare $(OPENMRCP_INCLUDE) $(MRCP_APR_INCLUDES) $(MRCP_APU_INCLUDES) 
+
+LOCAL_LIBADD=$(OPENMRCP_LIBS)
 
-LOCAL_LDFLAGS=$(OPENMRCP_LIBS)
-VERBOSE=TRUE
 include ../../../../build/modmake.rules
 
+$(OPENMRCP_DIR)/Makefile:
+	cd $(OPENMRCP_DIR) && ./configure --with-apr=../apr --with-apr-util=../apr-util --with-sofia-sip=../sofia-sip
+
+$(OPENMRCP_LIBS): $(OPENMRCP_DIR)/Makefile
+	cd $(OPENMRCP_DIR) && make