diff --git a/target/linux/s3c24xx/Makefile b/target/linux/s3c24xx/Makefile
index a0c186a86..0a051ff13 100644
--- a/target/linux/s3c24xx/Makefile
+++ b/target/linux/s3c24xx/Makefile
@@ -11,13 +11,14 @@ BOARD:=s3c24xx
 BOARDNAME:=Samsung S3C24xx
 FEATURES:=jffs2
 CFLAGS:=-O2 -pipe -march=armv4t -mtune=arm920t -funit-at-a-time
+SUBTARGETS:=openmoko-gta02
 
 LINUX_VERSION:=2.6.30.10
 
 DEVICE_TYPE=phone
 
 define Target/Description
-	OpenMoko gta02
+	S3C24xx arm
 endef
 
 include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/s3c24xx/modules.mk b/target/linux/s3c24xx/modules.mk
index 544aaff6e..771574810 100644
--- a/target/linux/s3c24xx/modules.mk
+++ b/target/linux/s3c24xx/modules.mk
@@ -1,4 +1,4 @@
-ifeq ($(CONFIG_TARGET_s3c24xx),y)
+ifeq ($(CONFIG_TARGET_s3c24xx_openmoko_gta02),y)
 	SOUNDCORE_FILES = \
 		$(LINUX_DIR)/sound/soundcore.ko \
 		$(LINUX_DIR)/sound/core/snd.ko \
diff --git a/target/linux/s3c24xx/base-files/etc/acpi/sleep.sh b/target/linux/s3c24xx/openmoko-gta02/base-files/etc/acpi/sleep.sh
old mode 100755
new mode 100644
similarity index 100%
rename from target/linux/s3c24xx/base-files/etc/acpi/sleep.sh
rename to target/linux/s3c24xx/openmoko-gta02/base-files/etc/acpi/sleep.sh
diff --git a/target/linux/s3c24xx/base-files/etc/config/fstab b/target/linux/s3c24xx/openmoko-gta02/base-files/etc/config/fstab
similarity index 100%
rename from target/linux/s3c24xx/base-files/etc/config/fstab
rename to target/linux/s3c24xx/openmoko-gta02/base-files/etc/config/fstab
diff --git a/target/linux/s3c24xx/base-files/etc/config/network b/target/linux/s3c24xx/openmoko-gta02/base-files/etc/config/network
similarity index 100%
rename from target/linux/s3c24xx/base-files/etc/config/network
rename to target/linux/s3c24xx/openmoko-gta02/base-files/etc/config/network
diff --git a/target/linux/s3c24xx/config-2.6.30 b/target/linux/s3c24xx/openmoko-gta02/config-2.6.30
similarity index 100%
rename from target/linux/s3c24xx/config-2.6.30
rename to target/linux/s3c24xx/openmoko-gta02/config-2.6.30
diff --git a/target/linux/s3c24xx/profiles/100-gta02-minimal.mk b/target/linux/s3c24xx/openmoko-gta02/profiles/100-gta02-minimal.mk
similarity index 100%
rename from target/linux/s3c24xx/profiles/100-gta02-minimal.mk
rename to target/linux/s3c24xx/openmoko-gta02/profiles/100-gta02-minimal.mk
diff --git a/target/linux/s3c24xx/profiles/101-gta02-full.mk b/target/linux/s3c24xx/openmoko-gta02/profiles/101-gta02-full.mk
similarity index 100%
rename from target/linux/s3c24xx/profiles/101-gta02-full.mk
rename to target/linux/s3c24xx/openmoko-gta02/profiles/101-gta02-full.mk
diff --git a/target/linux/s3c24xx/openmoko-gta02/target.mk b/target/linux/s3c24xx/openmoko-gta02/target.mk
new file mode 100644
index 000000000..730fcf94e
--- /dev/null
+++ b/target/linux/s3c24xx/openmoko-gta02/target.mk
@@ -0,0 +1,7 @@
+BOARDNAME:=OpenMoko gta02
+DEVICE_TYPE=phone
+
+define Target/Description
+	OpenMoko gta02
+endef
+