diff --git a/Makefile b/Makefile
index 5ced1cf..cc14d41 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,31 @@
-all:
-	8g irc.go irc_struct.go
+GOFILES = irc.go irc_struct.go
+
+all: $(GOARCH)
+
+clean: clean_$(GOARCH)
+	rm test
+
+386:	
+	8g $(GOFILES)
 	8g test.go
 	8l -o test test.8
 
-clean:
-	rm *.8 *.6 test
+x64:
+	6g $(GOFILES)
+	6g test.go
+	6l -o test test.6
+
+arm:
+	5g $(GOFILES)
+	5g test.go
+	5l -o test test.5
+
+clean_x64:
+	rm *.6
+
+clean_386:
+	rm *.8
+
+clean_arm:
+	rm *.5
+