diff --git a/configure.ac b/configure.ac
index eb3eb2b467..f8cba27da3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1658,6 +1658,7 @@ AC_CONFIG_FILES([Makefile
 		src/mod/xml_int/mod_xml_radius/Makefile
 		src/mod/xml_int/mod_xml_rpc/Makefile
 		src/mod/xml_int/mod_xml_scgi/Makefile
+		src/mod/applications/mod_av/Makefile
 		src/include/switch_am_config.h
 		build/getsounds.sh
 		build/getlib.sh
diff --git a/src/mod/applications/mod_av/Makefile.am b/src/mod/applications/mod_av/Makefile.am
new file mode 100644
index 0000000000..da4223a52b
--- /dev/null
+++ b/src/mod/applications/mod_av/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_av
+
+mod_LTLIBRARIES = mod_av.la
+mod_av_la_SOURCES  = mod_av.c
+mod_av_la_CFLAGS   = $(AM_CFLAGS)
+mod_av_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_av_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lavformat -lavcodec
diff --git a/src/mod/applications/mod_av/mod_av.c b/src/mod/applications/mod_av/mod_av.c
index 9d5ff3db1a..a078ab632f 100644
--- a/src/mod/applications/mod_av/mod_av.c
+++ b/src/mod/applications/mod_av/mod_av.c
@@ -830,13 +830,20 @@ static void print_codecs_for_id(switch_stream_handle_t *stream, enum AVCodecID i
 
 static int is_device(const AVClass *avclass)
 {
+#if 0
 	if (!avclass) return 0;
+
+
 	return  avclass->category == AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT ||
 			avclass->category == AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT ||
 			avclass->category == AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT ||
 			avclass->category == AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT ||
 			avclass->category == AV_CLASS_CATEGORY_DEVICE_OUTPUT ||
 			avclass->category == AV_CLASS_CATEGORY_DEVICE_INPUT;
+#endif
+
+	return 0;
+
 }
 
 void show_formats(switch_stream_handle_t *stream) {