diff --git a/src/utils/Utils.php b/src/utils/Utils.php
index 38e625298..9d77a8a63 100644
--- a/src/utils/Utils.php
+++ b/src/utils/Utils.php
@@ -97,10 +97,16 @@ class Utils{
 			}else{
 				return "mac";
 			}
-		}elseif(stripos($uname, "Win") !== false){
+		}elseif(stripos($uname, "Win") !== false or $uname === "Msys"){
 			return "win";
 		}elseif(stripos($uname, "Linux") !== false){
-			return "linux";
+			if(@file_exists("/system/build.prop")){
+				return "android";
+			}else{
+				return "linux";
+			}
+		}elseif(stripos($uname, "BSD") !== false or $uname === "DragonFly"){
+			return "bsd";
 		}else{
 			return "other";
 		}