diff --git a/filemin/filemin-lib.pl b/filemin/filemin-lib.pl
index b2169fb28..1dbadeae8 100644
--- a/filemin/filemin-lib.pl
+++ b/filemin/filemin-lib.pl
@@ -487,7 +487,7 @@ foreach my $fref (@{$files_to_extract}) {
     my $name = $fref->{'file'};
 
     my $extract_to = "$cwd/" . fileparse("$cwd/$name", qr/\.[^.]*/);
-    if (-e $extract_to) {
+    if (-e $extract_to && !$in{'overwrite_existing'}) {
         $extract_to .= "_" . int(rand(1000)) . $$;
     }
     mkdir($extract_to);
diff --git a/filemin/lang/en b/filemin/lang/en
index 958c07c4b..0b681ac92 100644
--- a/filemin/lang/en
+++ b/filemin/lang/en
@@ -166,3 +166,4 @@ index_return=file listing
 upload_dirs=Directory Upload
 extract_uploaded=Extract Compressed
 extract_cmd_not_avail=Could not extract $1 file as $2 command is missing
+overwrite_existing=Overwrite Existing
diff --git a/filemin/unauthenticated/templates/dialogs.html b/filemin/unauthenticated/templates/dialogs.html
index d086d0618..c8d1986eb 100644
--- a/filemin/unauthenticated/templates/dialogs.html
+++ b/filemin/unauthenticated/templates/dialogs.html
@@ -337,6 +337,7 @@
           </div>
           <input type="checkbox" data-id="webkitdirectory" onchange="document.querySelector('#upload-form > #upfiles').toggleAttribute('webkitdirectory')"> $text{'upload_dirs'}
           <input type="checkbox" data-id="extract_uploaded" onchange="t=document.querySelector('#upload-form'),v=t.getAttribute('action'),x='&extract_uploaded=1',this.checked?t.setAttribute('action', t.getAttribute('action') + x):t.setAttribute('action',t.getAttribute('action').replace(x,''))"> $text{'extract_uploaded'}
+          <input type="checkbox" data-id="overwrite_existing" onchange="t=document.querySelector('#upload-form'),v=t.getAttribute('action'),x='&overwrite_existing=1',this.checked?t.setAttribute('action', t.getAttribute('action') + x):t.setAttribute('action',t.getAttribute('action').replace(x,''))"> $text{'overwrite_existing'}
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-primary" onclick="uploadFiles()">$text{'upload_files'}</button>
diff --git a/filemin/unauthenticated/templates/legacy_dialogs.html b/filemin/unauthenticated/templates/legacy_dialogs.html
index eb61a04a1..3a105eb22 100644
--- a/filemin/unauthenticated/templates/legacy_dialogs.html
+++ b/filemin/unauthenticated/templates/legacy_dialogs.html
@@ -111,6 +111,8 @@
         <input type="checkbox" id="filetype" onchange="this.parentElement.querySelector('#upfiles').toggleAttribute('webkitdirectory')"><label for="filetype"> $text{'upload_dirs'}</label>
         <br>
         <input type="checkbox" id="extract_upload" onchange="t=document.querySelector('#upload-form'),v=t.getAttribute('action'),x='&extract_uploaded=1',this.checked?t.setAttribute('action', t.getAttribute('action') + x):t.setAttribute('action',t.getAttribute('action').replace(x,''))"><label for="extract_upload"> $text{'extract_uploaded'}</label>
+        <br>
+        <input type="checkbox" id="overwrite_existing" onchange="t=document.querySelector('#upload-form'),v=t.getAttribute('action'),x='&overwrite_existing=1',this.checked?t.setAttribute('action', t.getAttribute('action') + x):t.setAttribute('action',t.getAttribute('action').replace(x,''))"><label for="overwrite_existing"> $text{'overwrite_existing'}</label>
     </form>
     <div id="readyForUploadList" class="well" style="max-height: 180px;">
     </div>
diff --git a/filemin/upload.cgi b/filemin/upload.cgi
index 20004508d..a95a0eb65 100755
--- a/filemin/upload.cgi
+++ b/filemin/upload.cgi
@@ -9,6 +9,7 @@ get_paths();
 
 my @errors;
 my @uploaded_files;
+my $uploaded_dir;
 $line = "";
 
 # Use Webmin's callback function to track progress
@@ -57,6 +58,18 @@ MAINLOOP: while(index($line,"$boundary--") == -1) {
 			if ($dir) {
 				my @dirs = split('/', $dir);
 				$dir = '/';
+				# If overwriting is not allowed check for dupes
+				if (!$in{'overwrite_existing'}) {
+					if ($dirs[0] && -e "$cwd/$dirs[0]") {
+						# As only one directory upload at a time allowed
+						# check if parent exists and if it does add a suffix
+						if (!$uploaded_dir) {
+							$uploaded_dir = $dirs[0] . "_" . int(rand(1000)) . $$;
+						}
+						$file =~ s/^(\Q$dirs[0]\E)/$uploaded_dir/;
+						$dirs[0] = $uploaded_dir;
+					}
+				}
 				foreach my $updir (@dirs) {
 					$dir .= "$updir/";
 					if (!-e "$cwd$dir") {
@@ -66,6 +79,15 @@ MAINLOOP: while(index($line,"$boundary--") == -1) {
 					}
 				}
 			}
+		# In case of a regular file check for dupes
+		if (!$in{'overwrite_existing'}) {
+			if ($file && -e "$cwd/$file") {
+				# If file exists add a suffix
+				my ($file_name, $file_extension) = $file =~ /(?|(.*)\.([^.]+$)|(.*))/;
+				$file = $file_name . "_" . int(rand(1000)) . $$ . ($file_extension ? ".$file_extension" : "");
+			}
+		}
+
 		# OK, we have a file, let`s save it
 		my $full = "$cwd/$file";
 		my $newfile = !-e $full;
diff --git a/net/linux-lib.pl b/net/linux-lib.pl
index 6ba5761ac..b3900d842 100755
--- a/net/linux-lib.pl
+++ b/net/linux-lib.pl
@@ -38,7 +38,7 @@ if (&has_command("ip")) {
 			$ifc{'fullname'} = $1;
 			$ifc{'name'} = $ifc{'fullname'}
 			}
-		elsif ($l =~ /^\d:\s+([^ \t\r\n\@]+\d+)@([^ \t\r\n\@]+\d+):/) {
+		elsif ($l =~ /^\d+:\s+([^ \t\r\n\@]+\d+)@([^ \t\r\n\@]+\d+):/) {
 			# Line like :
 			# 3: eth0@if0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
 			$ifc{'fullname'} = $1;