diff --git a/Makefile b/Makefile
index e1b7bf4847..a57e7d10cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,3 @@
-# Use shell variables, if defined
-ifeq ($(PROJECT),)
-export PROJECT=generic
-endif
-
 BUILD_DIRS="build.*"
 
 all: system
diff --git a/config/options b/config/options
index 42e85dc5f0..9692e2fcfd 100644
--- a/config/options
+++ b/config/options
@@ -1,7 +1,13 @@
-# Project name
-PROJECT=${PROJECT}
+# determines PROJECT, if not forced by user
+# default is generic
+if [ -z "$PROJECT" ]; then
+  PROJECT="generic"
+else
+  PROJECT=$PROJECT
+fi
 
-# determines TARGET_ARCH, if not forced by user
+# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / powerpc)
+# default is i386
 if [ -z "$ARCH" ]; then
   TARGET_ARCH="i386"
 else