diff --git a/!Readme.txt/freppbx.txt b/!Readme.txt/freppbx.txt
new file mode 100644
index 0000000..f5a405c
--- /dev/null
+++ b/!Readme.txt/freppbx.txt
@@ -0,0 +1 @@
+https://github.com/chan-sccp/chan-sccp/wiki/Monitor-and-Pickup-Incoming-Calls-via-Speeddial-Using-Custom-Devstate
diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php
index c097bbe..0cb91a2 100644
--- a/Sccp_manager.class.php
+++ b/Sccp_manager.class.php
@@ -1945,7 +1945,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
         fclose($fh);
 
         $zip = new \ZipArchive();
-        $filename = $result . "." . gethostname() . ".zip";
+        $filename = $result . "." . gethostname() .  ".zip";
         if ($zip->open($filename, \ZIPARCHIVE::CREATE)) {
             $zip->addFile($result);
             $zip->addFile($backup_info);
diff --git a/conf/sccpgeneral.xml.v433 b/conf/sccpgeneral.xml.v433
index e05a2dc..f65b27e 100644
--- a/conf/sccpgeneral.xml.v433
+++ b/conf/sccpgeneral.xml.v433
@@ -1590,7 +1590,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Help!</help>
         </item>
         <item type="IS" id="13" seq="99">
-            <name>rouminglogin</name> 
+            <name>roaminglogin</name> 
             <label>Rouming</label>
             <default>off</default>
             <button value="off">Disabled</button>
diff --git a/contrib/rewrite.rules b/contrib/rewrite.rules
index 915c83e..7e3bbed 100644
--- a/contrib/rewrite.rules
+++ b/contrib/rewrite.rules
@@ -106,10 +106,10 @@ ri ^(cmterm_7936.3-3-21-0.bin)$ firmware/7936/\1
 ri ^(apps37sccp.1-4-5-7.bin)$ firmware/7937/\1
 
 # 7940_7960 firmware (ancient)
-ri ^(P0030801SR)(+\.bin)$ firmware/7940/\1
-ri ^(P0030801SR)(+\.loads)$ firmware/7940/\1
-ri ^(P0030801SR)(+\.sb2)$ firmware/7940/\1
-ri ^(P0030801SR)(+\.sbn)$ firmware/7940/\1
+ri ^(P0030801SR)(.+\.bin)$ firmware/7940/\1
+ri ^(P0030801SR)(.+\.loads)$ firmware/7940/\1
+ri ^(P0030801SR)(.+\.sb2)$ firmware/7940/\1
+ri ^(P0030801SR)(.+\.sbn)$ firmware/7940/\1
 
 # 7941_7961 firmware (java-based)
 ri ^(apps41)(.+\.sbn)$ firmware/7941/\1\2
@@ -174,11 +174,11 @@ ri ^(ATA030204SCCP090202A.zup)$ firmware/ata186/\1
 # Sub-Directory Handling
 
 # settings
-ri ^(.+\.tlv)?$ settings/\1
-ri ^\/(.+\.tlv)?$ settings/\1
-ri ^((.+\.cnf.xml)(\.enc)?(\.sgn)?)$ settings/\1
-ri ^\/((.+\-cnf.xml)(\.enc)?(\.sgn)?)$ settings/\1
-ri ^\/((SPA504G-cfg.xml)(\.enc)?(\.sgn)?)$ settings/\1
+#ri ^(.+\.tlv)?$ settings/\1
+#ri ^\/(.+\.tlv)?$ settings/\1
+#ri ^((.+\.cnf.xml)(\.enc)?(\.sgn)?)$ settings/\1
+#ri ^\/((.+\-cnf.xml)(\.enc)?(\.sgn)?)$ settings/\1
+#ri ^\/((SPA504G-cfg.xml)(\.enc)?(\.sgn)?)$ settings/\1
 
 # Keep firmware in a separate directory (optional)
 #ri ^(.+\.loads)$ firmware/\1
@@ -197,7 +197,7 @@ ri ^(.+)\/(.+-kate.xml)$ languages/\1/\2
 # Keep ring-tones in a separate directory (optional)
 ri ^([R|r]ing[L|l]ist)(\.xml|-wb\.xml)(\.sgn)?$ ringtones/ringlist.xml
 ri ^(Distinctive[R|r]ing[L|l]ist)(\.xml|-wb\.xml)(\.sgn)?$ ringtones/ringlist.xml
-ri ^(.+)(\.raw|\.rwb)(\.sgn)?$ ringtones/\1\2\3
+ri ^(.+)(\.raw|\.rwb|\.pcm)(\.sgn)?$ ringtones/\1\2\3
 
 # Rename Desktops to wallpapers (optional)
 #ri ^Desktops/(.+)/(List\.xml)(\.sgn)?$ wallpapers/\1/\2\3
diff --git a/install.php b/install.php
index eb2caa9..a7a4e3a 100644
--- a/install.php
+++ b/install.php
@@ -500,7 +500,7 @@ function InstallDB_sccpusers() {
 	`pin` VARCHAR(7) NULL DEFAULT NULL,
 	`password` VARCHAR(7) NULL DEFAULT NULL,
 	`description` VARCHAR(45) NULL DEFAULT NULL,
-	`rouminglogin` ENUM('on','off','multi') NULL DEFAULT 'off',
+	`roaminglogin` ENUM('on','off','multi') NULL DEFAULT 'off',
 	`devicegroup` VARCHAR(20) NULL DEFAULT 'all',
  	`auto_logout` ENUM('on','off') NULL DEFAULT 'off',
         `homedevice` VARCHAR(20) NULL DEFAULT NULL,