diff --git a/Makefile.in b/Makefile.in
index 0e800246..c4346dce 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ DEFS :=
 LIBAUX:= -ldl
 LIBTHR:= -lpthread
 INCLUDES := -I. -I@srcdir@
-CFLAGS := -O2 @MODULE_CFLAGS@ @INLINE_FLAGS@
+CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:=
 LDCONFIG:=true
 
@@ -55,12 +55,12 @@ everything: engine contrib modules test apidocs
 
 .PHONY: clean distclean cvsclean clean-config-files clean-tables clean-apidocs
 clean:
-	-rm $(CLEANS) 2>/dev/null
+	@-$(RM) $(CLEANS) 2>/dev/null
 	$(MAKE) -C ./modules $@
 	$(MAKE) -C ./test $@
-	$(MAKE) -C ./contrib/iax $@
-	$(MAKE) -C ./contrib/qt $@
-	$(MAKE) -C ./contrib/ysip $@
+	@for i in contrib/*; do \
+	    test -f "$$i/Makefile" && $(MAKE) -C "$$i" clean ; \
+	done
 
 check-topdir:
 	@test -f configure || (echo "Must make this target in the top source directory"; exit 1)
@@ -114,7 +114,7 @@ modules: engine
 
 contrib: engine
 	@for i in contrib/*; do \
-	    test "$${i##*/}" != "CVS" && $(MAKE) -C "$$i" all ; \
+	    test -f "$$i/Makefile" && $(MAKE) -C "$$i" all ; \
 	done
 
 tables: @srcdir@/tables/all.h
diff --git a/configure.in b/configure.in
index 42eaddec..55984f9d 100644
--- a/configure.in
+++ b/configure.in
@@ -262,7 +262,21 @@ AC_SUBST(H323_RUN)
 HAVE_ORTP=no
 ORTP_INC=""
 ORTP_LIB=""
-AC_ARG_WITH(libortp,AC_HELP_STRING([--with-libortp=DIR],[use oRTP from DIR (default /usr)]),[ac_cv_use_libortp=$withval],[ac_cv_use_libortp=/usr])
+ORTP_DEP=""
+AC_ARG_WITH(libortp,AC_HELP_STRING([--with-libortp=DIR],[use oRTP from DIR (default: included)]),[ac_cv_use_libortp=$withval],[ac_cv_use_libortp=included])
+if [[ "x$ac_cv_use_libortp" = "xincluded" ]]; then
+    ac_cv_use_libortp="no"
+    basedir=`cd "$srcdir" && pwd`
+    AC_MSG_CHECKING([for oRTP in contrib])
+    incor="contrib/ortp"
+    if [[ -f "$basedir/$incor/ortp.h" ]]; then
+	HAVE_ORTP=yes
+	ORTP_INC="-I$basedir/$incor"
+	ORTP_DEP="../$incor/libortp.a"
+	ORTP_LIB="-L../$incor -lortp"
+    fi
+    AC_MSG_RESULT([$HAVE_ORTP])
+fi
 if [[ "x$ac_cv_use_libortp" != "xno" ]]; then
 AC_MSG_CHECKING([for oRTP in $ac_cv_use_libortp])
 incor="$ac_cv_use_libortp/include/ortp"
@@ -277,6 +291,7 @@ fi
 AC_SUBST(HAVE_ORTP)
 AC_SUBST(ORTP_INC)
 AC_SUBST(ORTP_LIB)
+AC_SUBST(ORTP_DEP)
 
 HAVE_GLIB1=no
 GLIB1_INC=""
@@ -516,10 +531,12 @@ AC_MSG_WARN([Mismatched RTTI setting between Yate ($USE_RTTI) and pwlib ($PWLIB_
 fi
 fi
 
-MODULE_CFLAGS="-fno-exceptions -fno-check-new -fPIC $RTTI_OPT $HAVE_GCC_FORMAT_CHECK"
+MODULE_CFLAGS="-fno-exceptions -fPIC $HAVE_GCC_FORMAT_CHECK"
+MODULE_CPPFLAGS="-fno-check-new $RTTI_OPT $MODULE_CFLAGS"
 MODULE_LDFLAGS="-export-dynamic -shared"
 MODULE_SYMBOLS="-Wl,--retain-symbols-file,/dev/null"
 AC_SUBST(MODULE_CFLAGS)
+AC_SUBST(MODULE_CPPFLAGS)
 AC_SUBST(MODULE_LDFLAGS)
 AC_SUBST(MODULE_SYMBOLS)
 
@@ -531,6 +548,7 @@ AC_CONFIG_FILES([yate.spec
                  scripts/Makefile
                  conf.d/Makefile
                  contrib/iax/Makefile
+                 contrib/ortp/Makefile
                  contrib/ysip/Makefile
                  contrib/qt/Makefile
                  test/Makefile])
diff --git a/contrib/iax/Makefile.in b/contrib/iax/Makefile.in
index cddfd491..075b1ce3 100644
--- a/contrib/iax/Makefile.in
+++ b/contrib/iax/Makefile.in
@@ -30,7 +30,7 @@ strip: all
 
 .PHONY: clean
 clean:
-	@-rm $(PROGS) $(LIBS) $(OBJS) core 2>/dev/null
+	@-$(RM) $(PROGS) $(LIBS) $(OBJS) core 2>/dev/null
 
 %.o: @srcdir@/%.c
 	$(COMPILE) -c $<
diff --git a/contrib/ysip/Makefile.in b/contrib/ysip/Makefile.in
index 1aeac2fe..ddffce4c 100644
--- a/contrib/ysip/Makefile.in
+++ b/contrib/ysip/Makefile.in
@@ -7,7 +7,7 @@ CXX  := @CXX@ -Wall
 AR  := ar
 DEFS :=
 INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@
-CFLAGS := -O2 @MODULE_CFLAGS@ @INLINE_FLAGS@
+CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:= -L.. -lyate
 INCFILES := @top_srcdir@/telengine.h @top_srcdir@/telephony.h \
 	@srcdir@/ysip.h @srcdir@/util.h
@@ -33,7 +33,7 @@ strip: all
 
 .PHONY: clean
 clean:
-	@-rm $(PROGS) $(LIBS) $(OBJS) core 2>/dev/null
+	@-$(RM) $(PROGS) $(LIBS) $(OBJS) core 2>/dev/null
 
 %.o: @srcdir@/%.cpp $(INCFILES)
 	$(COMPILE) -c $<
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 1b97ce76..a1ac0896 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -11,7 +11,7 @@ CXX := @CXX@ -Wall
 SED := sed
 DEFS :=
 INCLUDES := -I.. -I@top_srcdir@
-CFLAGS := -O2 @MODULE_CFLAGS@ @INLINE_FLAGS@
+CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:= -L.. -lyate
 MODFLAGS:= @MODULE_LDFLAGS@
 MODSTRIP:= @MODULE_SYMBOLS@
@@ -37,7 +37,7 @@ ifneq (@HAVE_H323@,no)
 PROGS := $(PROGS) h323chan.yate
 endif
 
-ifeq (@HAVE_ORTP@_@HAVE_GLIB@,yes_yes)
+ifneq (@HAVE_ORTP@,no)
 PROGS := $(PROGS) ortpchan.yate
 endif
 
@@ -81,8 +81,7 @@ strip: all do-strip
 
 .PHONY: clean
 clean: do-clean
-	@echo rm $(PROGS) $(LIBS) *.o core
-	@rm $(PROGS) $(LIBS) *.o core 2>/dev/null; true
+	@-$(RM) $(PROGS) $(LIBS) *.o core 2>/dev/null
 
 .PHONY: install
 install: all do-install
@@ -127,7 +126,9 @@ h323chan.yate: LOCALFLAGS = -DPHAS_TEMPLATES -D_REENTRANT -DP_HAS_SEMAPHORES @H3
 
 pgsqlroute.yate cdrpgsql.yate register.yate: LOCALFLAGS = @PGSQL_INC@ -lpq
 
-ortpchan.yate: LOCALFLAGS = @ORTP_INC@ @GLIB_INC@ @ORTP_LIB@
+ortpchan.yate: @ORTP_DEP@
+ortpchan.yate: LOCALLIBS = @ORTP_LIB@
+ortpchan.yate: LOCALFLAGS = @ORTP_INC@ @GLIB_INC@
 
 iaxchan.yate: @IAX2_DEP@
 iaxchan.yate: LOCALLIBS = @IAX2_DEP@
@@ -152,6 +153,9 @@ ysipchan.yate: LOCALLIBS = ../contrib/ysip/libysip.a
 ../contrib/iax/libiax.a:
 	$(MAKE) -C ../contrib/iax
 
+../contrib/ortp/libortp.a:
+	$(MAKE) -C ../contrib/ortp
+
 ../contrib/qt/libqtclientform.a:
 	$(MAKE) -C ../contrib/qt
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 5bb9161e..01b91545 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -5,7 +5,7 @@ CXX := @CXX@ -Wall
 SED := sed
 DEFS :=
 INCLUDES := -I@top_srcdir@
-CFLAGS := -O0 @MODULE_CFLAGS@ @INLINE_FLAGS@
+CFLAGS := -O0 @MODULE_CPPFLAGS@ @INLINE_FLAGS@
 LDFLAGS:= -L.. -lyate
 MODFLAGS:= @MODULE_LDFLAGS@
 MODSTRIP:= @MODULE_SYMBOLS@
@@ -34,7 +34,7 @@ strip: all
 
 .PHONY: clean
 clean:
-	@-rm $(PROGS) $(LIBS) $(OBJS) core 2>/dev/null
+	@-$(RM) $(PROGS) $(LIBS) $(OBJS) core 2>/dev/null
 
 %.o: @srcdir@/%.cpp $(MKDEPS) @top_srcdir@/telengine.h
 	$(COMPILE) -c $<
diff --git a/yate-config.in b/yate-config.in
index 89a68d78..09da5e6b 100644
--- a/yate-config.in
+++ b/yate-config.in
@@ -11,7 +11,7 @@ prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 moddir="@libdir@/yate"
 confdir="@sysconfdir@/yate"
-s1="@MODULE_CFLAGS@"
+s1="@MODULE_CPPFLAGS@"
 s2="-I@includedir@/yate"
 s3="@MODULE_LDFLAGS@ @MODULE_SYMBOLS@"
 s4="-lyate"
diff --git a/yate.pc.in b/yate.pc.in
index 33be5795..dc313ca8 100644
--- a/yate.pc.in
+++ b/yate.pc.in
@@ -10,4 +10,4 @@ Name: Yate
 Description: Yet Another Telephony Engine
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lyate @MODULE_LDFLAGS@ @MODULE_SYMBOLS@
-Cflags: -I${includedir}/yate @MODULE_CFLAGS@
+Cflags: -I${includedir}/yate @MODULE_CPPFLAGS@