diff --git a/CHANGES b/CHANGES
index 2189331e2f..69b0843286 100644
--- a/CHANGES
+++ b/CHANGES
@@ -393,6 +393,13 @@ Security Events Framework
    coming soon.  For more information on the security events framework, see the
    "Security Events" chapter of the included documentation - doc/tex/asterisk.pdf.
 
+Fax
+---
+ * A technology independent fax frontend (res_fax) has been added to Asterisk.
+ * A spandsp based fax backend (res_fax_spandsp) has been added.
+ * The app_fax module has been deprecated in favor of the res_fax module and
+   the new res_fax_spandsp backend.
+
 Miscellaneous
 -------------
  * The transmit_silence_during_record option in asterisk.conf.sample has been removed.
diff --git a/apps/app_fax.c b/apps/app_fax.c
index a5afe87dde..a664b1c96d 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -13,7 +13,9 @@
  */
 
 /*** MODULEINFO
-	 <depend>spandsp</depend>
+	<defaultenabled>no</defaultenabled>
+	<depend>spandsp</depend>
+	<conflict>res_fax</conflict>
 ***/
  
 #include "asterisk.h"
diff --git a/res/res_fax.c b/res/res_fax.c
index 36ca2601b9..e37fe1deda 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -17,6 +17,10 @@
  * at the top of the source tree.
  */
 
+/*** MODULEINFO
+	<conflict>app_fax</conflict>
+***/
+
 /*! \file
  *
  * \brief Generic FAX Resource for FAX technology resource modules
diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index 630cccb3b2..9a84d28f6a 100644
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -26,7 +26,8 @@
  */
 
 /*** MODULEINFO
-		<depend>spandsp</depend>
+	<depend>spandsp</depend>
+	<depend>res_fax</depend>
 ***/
 
 #include "asterisk.h"