diff --git a/.gitignore b/.gitignore
index 18af33f68..77d349a57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,4 @@ tester/stereo-record.wav
 git-clang-format.diff
 *.log
 .bc_tester_utils.tmp
+tools/lp-test-ecc
diff --git a/configure.ac b/configure.ac
index eb9f974cc..929dc1e59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ AC_CONFIG_MACRO_DIR([m4])
 dnl do not put anythingelse before AC_PROG_CC unless checking if macro still work for clang
 AC_PROG_CXX(["xcrun clang++" g++])
 AC_PROG_CC(["xcrun clang" gcc])
+AC_PROG_OBJC(["xcrun clang" gcc])
 
 gl_LD_OUTPUT_DEF
 
@@ -595,6 +596,8 @@ AC_ARG_WITH(ffmpeg,
 	[ ffmpegdir=/usr ]
 )
 
+AM_CONDITIONAL([BUILD_MACOS], [test "x$build_macos" = "xyes"])
+
 if test "$video" = "true"; then
 
 	if test "$enable_x11" = "true"; then
diff --git a/coreapi/help/realtimetext_sender.c b/coreapi/help/realtimetext_sender.c
index 29a738fb2..18e4ffcf4 100644
--- a/coreapi/help/realtimetext_sender.c
+++ b/coreapi/help/realtimetext_sender.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 /**
- * @defgroup real_time_text Real Time Text Sender
+ * @defgroup real_time_text_sender Real Time Text Sender
  * @ingroup tutorials
  This program just send chat message in real time to dest uri. Use realtimetext_receiver to receive  message.
  usage: ./realtimetext_sender sip:localhost:5060
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 37bd7f7ee..8cfa49957 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -74,6 +74,7 @@ linphone_SOURCES+= \
 	status_notifier.h
 endif
 
+
 linphone_LDADD=	$(top_builddir)/coreapi/liblinphone.la \
 		$(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) $(SQLITE3_LIBS) $(BELLESIP_LIBS)
 
@@ -92,17 +93,20 @@ endif
 uidir=$(datadir)/linphone
 dist_ui_DATA=$(UI_FILES) $(PIXMAPS) $(top_srcdir)/COPYING
 
+if BUILD_MACOS
+linphone_SOURCES+=mac.m
+linphone_LDFLAGS+=-framework Cocoa
+endif
 endif
 
 
-AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ -I$(top_builddir)/coreapi/ \
+AM_CPPFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ -I$(top_builddir)/coreapi/ \
 		$(MEDIASTREAMER_CFLAGS) \
 		$(ORTP_CFLAGS) $(BELLESIP_CFLAGS) \
 		$(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) $(LIBGTK_CFLAGS) $(LIBGTKMAC_CFLAGS) $(IPV6_CFLAGS) \
 		$(TUNNEL_CFLAGS) \
 		$(SQLITE3_CFLAGS)
 
-
 version_date.h: $(top_srcdir)/configure.ac
 	echo "#define LINPHONE_VERSION_DATE \"$(VERSION)-`date +%y%m%d`\"" > $@