diff --git a/conf.d/01-system-paths.conf.in b/conf.d/01-system-paths.conf.in
index 9f45abdbd..e97433ba2 100644
--- a/conf.d/01-system-paths.conf.in
+++ b/conf.d/01-system-paths.conf.in
@@ -50,4 +50,4 @@ ZM_PATH_SWAP=@ZM_TMPDIR@
 
 # Full path to optional arp binary
 # ZoneMinder will find the arp binary automatically on most systems
-ZM_PATH_ARP=@ZM_PATH_ARP@
+ZM_PATH_ARP="@ZM_PATH_ARP@"
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 7a86b51a8..d48747703 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -149,7 +149,7 @@ BEGIN {
       foreach my $str ( <$CONFIG> ) {
         next if ( $str =~ /^\s*$/ );
         next if ( $str =~ /^\s*#/ );
-        my ( $name, $value ) = $str =~ /^\s*([^=\s]+)\s*=\s*(.*?)\s*$/;
+        my ( $name, $value ) = $str =~ /^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/;
         if ( ! $name ) {
           print( STDERR "Warning, bad line in $config_file: $str\n" );
           next;
diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index 0865bc6e4..6d63be98b 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -123,9 +123,9 @@ void process_configfile( char* configFile) {
     if ( *line_ptr == '\0' || *line_ptr == '#' )
       continue;
 
-    // Remove trailing white space
+    // Remove trailing white space and trailing quotes
     char *temp_ptr = line_ptr+strlen(line_ptr)-1;
-    while ( *temp_ptr == ' ' || *temp_ptr == '\t' ) {
+    while ( *temp_ptr == ' ' || *temp_ptr == '\t' || *temp_ptr == '\'' || *temp_ptr == '\"') {
       *temp_ptr-- = '\0';
       temp_ptr--;
     }
@@ -147,8 +147,9 @@ void process_configfile( char* configFile) {
       temp_ptr--;
     } while ( *temp_ptr == ' ' || *temp_ptr == '\t' );
 
-    // Remove leading white space from the value part
+    // Remove leading white space and leading quotes from the value part
     white_len = strspn( val_ptr, " \t" );
+    white_len += strspn( val_ptr, "\'\"" );
     val_ptr += white_len;
 
     if ( strcasecmp( name_ptr, "ZM_DB_HOST" ) == 0 )
diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index c6aa93c63..a2a89b224 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -212,7 +212,7 @@ function process_configfile($configFile) {
         continue;
       elseif ( preg_match( '/^\s*#/', $str ))
         continue;
-      elseif ( preg_match( '/^\s*([^=\s]+)\s*=\s*(.*?)\s*$/', $str, $matches ))
+      elseif ( preg_match( '/^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/', $str, $matches ))
         $configvals[$matches[1]] = $matches[2];
     }
     fclose( $cfg );