diff --git a/modules/rhizo_base/manifests/freeswitch.pp b/modules/rhizo_base/manifests/freeswitch.pp
index 11f5802..48254b2 100644
--- a/modules/rhizo_base/manifests/freeswitch.pp
+++ b/modules/rhizo_base/manifests/freeswitch.pp
@@ -33,6 +33,10 @@ class rhizo_base::freeswitch::ubuntu inherits rhizo_base::freeswitch::common {
       require => Package['freeswitch']
     }
 
+  file { '/etc/freeswitch/autoload_configs/modules.conf.xml':
+      content => template('rhizo_base/modules.conf.xml.erb'),
+      require => Package['freeswitch'],
+    }
 }
 
 class rhizo_base::freeswitch::debian inherits rhizo_base::freeswitch::common {
@@ -50,6 +54,11 @@ class rhizo_base::freeswitch::debian inherits rhizo_base::freeswitch::common {
       require => Package['freeswitch'],
     }
 
+  file { '/etc/freeswitch/autoload_configs/modules.conf.xml':
+      content => template('rhizo_base/modules.conf.xml.erb'),
+      require => Package['freeswitch'],
+    }
+
   file { '/etc/default/freeswitch':
       source  => 'puppet:///modules/rhizo_base/etc/default/freeswitch',
       require => Package['freeswitch'],
diff --git a/modules/rhizo_base/files/etc/freeswitch/autoload_configs/modules.conf.xml b/modules/rhizo_base/templates/modules.conf.xml.erb
similarity index 99%
rename from modules/rhizo_base/files/etc/freeswitch/autoload_configs/modules.conf.xml
rename to modules/rhizo_base/templates/modules.conf.xml.erb
index c360888..fccd6ea 100644
--- a/modules/rhizo_base/files/etc/freeswitch/autoload_configs/modules.conf.xml
+++ b/modules/rhizo_base/templates/modules.conf.xml.erb
@@ -86,7 +86,7 @@
     <!--<load module="mod_g723_1"/>-->
     <!--<load module="mod_bcg729"/>-->
     <load module="mod_g729"/>
-    <load module="mod_amr"/>
+    <load module="<%= @amr_module %>"/>
     <!--<load module="mod_ilbc"/>-->
     <!--<load module="mod_speex"/>
     <load module="mod_h26x"/>