diff --git a/src/main/java/com/sheepit/client/os/Linux.java b/src/main/java/com/sheepit/client/os/Linux.java
index 85703e9..d8dc433 100644
--- a/src/main/java/com/sheepit/client/os/Linux.java
+++ b/src/main/java/com/sheepit/client/os/Linux.java
@@ -94,6 +94,17 @@ public class Linux extends OS {
 		return builder.start();
 	}
 	
+	@Override public boolean isSupported() {
+		String arch = System.getProperty("os.arch").toLowerCase();
+		return
+			super.isSupported() &&
+			(
+				"amd64".equals(arch) ||
+				"x64".equals(arch) ||
+				"x86_64".equals(arch)
+			);
+	}
+	
 	@Override public boolean getSupportHighPriority() {
 		try {
 			ProcessBuilder builder = new ProcessBuilder();
diff --git a/src/main/java/com/sheepit/client/os/Windows.java b/src/main/java/com/sheepit/client/os/Windows.java
index fc81485..7fd60a9 100644
--- a/src/main/java/com/sheepit/client/os/Windows.java
+++ b/src/main/java/com/sheepit/client/os/Windows.java
@@ -79,13 +79,21 @@ public class Windows extends OS {
 	
 	@Override public boolean isSupported() {
 		long buildNumber = Long.MIN_VALUE;
+		String arch = System.getProperty("os.arch").toLowerCase();
 		try {
 			buildNumber = Long.parseLong(operatingSystem.getVersionInfo().getBuildNumber());
 		}
 		catch(NumberFormatException e) {
 			System.err.println("Windows::isSupported Failed to extract Windows build number: " + e);
 		}
-		return super.isSupported() && buildNumber >= MINIMUM_SUPPORTED_BUILD;
+		return
+			super.isSupported() &&
+			buildNumber >= MINIMUM_SUPPORTED_BUILD &&
+			(
+				"amd64".equals(arch) ||
+				"x64".equals(arch) ||
+				"x86_64".equals(arch)
+			);
 	}
 	
 	int getPriorityClass(int priority) {