diff --git a/fetch b/fetch
index f19b2fd2..6bdc88ed 100755
--- a/fetch
+++ b/fetch
@@ -401,31 +401,11 @@ case "$os" in
     ;;
 
     "Windows")
-        case "$(cmd /c ver)" in
-            *"XP"*)
-                distro="Windows XP"
-            ;;
-
-            *"7"*)
-                distro="Windows 7"
-            ;;
-
-            *"8.1"*)
-                distro="Windows 8.1"
-            ;;
-
-            *"8"*)
-                distro="Windows 8"
-            ;;
-
-            *"10"*)
-                distro="Windows 10"
-            ;;
-
-            *)
-                distro="Windows"
-            ;;
-        esac
+        distro="$(wmic os get Caption /value)"
+        distro=${distro/Caption}
+        distro=${distro//[[:space:]]/ }
+        distro=${distro//  }
+        distro=${distro/Microsoft }
     ;;
 
     *)