diff --git a/build b/build
index 7ca5f4fa..68dac037 100755
--- a/build
+++ b/build
@@ -44,7 +44,7 @@ elif [ $ANDROID ]; then
     github.com/yggdrasil-network/yggdrasil-extras/src/mobile \
     github.com/yggdrasil-network/yggdrasil-extras/src/dummy
 else
-  for CMD in `ls cmd/` ; do
+  for CMD in yggdrasil yggdrasilctl ; do
     echo "Building: $CMD"
     go build $ARGS -ldflags="$LDFLAGS" -gcflags="$GCFLAGS" ./cmd/$CMD
 
diff --git a/misc/genkeys.go b/cmd/genkeys/main.go
similarity index 100%
rename from misc/genkeys.go
rename to cmd/genkeys/main.go