diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
index c1fff7e35b..838f304f80 100644
--- a/src/mod/Makefile.am
+++ b/src/mod/Makefile.am
@@ -15,7 +15,8 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL
 		fi ; \
 	fi ; \
 	if test -z "$$target" ; then target="all" ; fi ; \
-	if ! test -d "$$moddir" ; then echo ; echo "WARNING $$moddir does not exist, skipping" ; else \
+	if ! test -f $$moddir/$$modname.c && ! test -f $$moddir/$$modname.cpp ;	\
+	then echo ; echo "WARNING $$modname is not a valid FreeSWITCH module dir, skipping it....." ; else \
 		echo ;\
 		echo making $$target $$modname ;\
 		(if test -f "$$moddir/Makefile" ; then \