diff --git a/Makefile b/Makefile
index 1b4250f..2bcd622 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,6 @@ all:
 test: all
 	(cd tests; make all)
 
-stateos:
-	@echo OS is $(OS)
-
 clean:
 	@echo "Cleaning..."
 	@(cd src; make clean)
diff --git a/src/Makefile b/src/Makefile
index ae609ab..fce45ea 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,6 +5,7 @@ SERVER = ../bin/iodined
 SERVEROBJS = iodined.o tun.o dns.o read.o encoding.o login.o base32.o md5.o
 
 OS = `uname | tr "a-z" "A-Z"`
+ARCH = `uname -m`
 
 LDFLAGS =  -lz
 CFLAGS = -c -g -Wall -D$(OS)
@@ -12,7 +13,7 @@ CFLAGS = -c -g -Wall -D$(OS)
 all: stateos $(CLIENT) $(SERVER) $(TESTSUITE) 
 
 stateos:
-	@echo OS is $(OS)
+	@echo OS is $(OS), arch is $(ARCH)
 
 $(CLIENT): $(CLIENTOBJS)
 	@echo LD $@