diff --git a/soc/nios2/nios2f-zephyr/CMakeLists.txt b/soc/v2/altera/zephyr_nios2f/CMakeLists.txt
similarity index 69%
rename from soc/nios2/nios2f-zephyr/CMakeLists.txt
rename to soc/v2/altera/zephyr_nios2f/CMakeLists.txt
index 789c4c81fc9..3277239a967 100644
--- a/soc/nios2/nios2f-zephyr/CMakeLists.txt
+++ b/soc/v2/altera/zephyr_nios2f/CMakeLists.txt
@@ -1,5 +1,7 @@
+# Copyright (c) 2016 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_include_directories(include)
+zephyr_include_directories(.)
 
 set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "")
diff --git a/soc/nios2/nios2f-zephyr/Kconfig.soc b/soc/v2/altera/zephyr_nios2f/Kconfig
similarity index 60%
rename from soc/nios2/nios2f-zephyr/Kconfig.soc
rename to soc/v2/altera/zephyr_nios2f/Kconfig
index 15e12382631..6aa5654f7b5 100644
--- a/soc/nios2/nios2f-zephyr/Kconfig.soc
+++ b/soc/v2/altera/zephyr_nios2f/Kconfig
@@ -1,7 +1,7 @@
+# Copyright (c) 2016 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_NIOS2F_ZEPHYR
-	bool "Nios IIf - Zephyr Golden Configuration"
+config SOC_ZEPHYR_NIOS2F
 	select NIOS2
 	select HAS_MUL_INSTRUCTION
 	select HAS_DIV_INSTRUCTION
diff --git a/soc/nios2/nios2f-zephyr/Kconfig.defconfig b/soc/v2/altera/zephyr_nios2f/Kconfig.defconfig
similarity index 79%
rename from soc/nios2/nios2f-zephyr/Kconfig.defconfig
rename to soc/v2/altera/zephyr_nios2f/Kconfig.defconfig
index 3ffa3f9e14b..5f021107cac 100644
--- a/soc/nios2/nios2f-zephyr/Kconfig.defconfig
+++ b/soc/v2/altera/zephyr_nios2f/Kconfig.defconfig
@@ -1,9 +1,7 @@
+# Copyright (c) 2016 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_NIOS2F_ZEPHYR
-
-config SOC
-	default "nios2f-zephyr"
+if SOC_ZEPHYR_NIOS2F
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 50000000
@@ -23,4 +21,4 @@ config ALTERA_AVALON_MSGDMA
 	def_bool y
 	depends on DMA_NIOS2_MSGDMA
 
-endif # SOC_NIOS2F_ZEPHYR
+endif # SOC_ZEPHYR_NIOS2F
diff --git a/soc/v2/altera/zephyr_nios2f/Kconfig.soc b/soc/v2/altera/zephyr_nios2f/Kconfig.soc
new file mode 100644
index 00000000000..b976d0b4795
--- /dev/null
+++ b/soc/v2/altera/zephyr_nios2f/Kconfig.soc
@@ -0,0 +1,8 @@
+# Copyright (c) 2016 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_ZEPHYR_NIOS2F
+	bool
+
+config SOC
+	default "zephyr_nios2f" if SOC_ZEPHYR_NIOS2F
diff --git a/soc/nios2/nios2f-zephyr/cpu/README b/soc/v2/altera/zephyr_nios2f/cpu/README
similarity index 100%
rename from soc/nios2/nios2f-zephyr/cpu/README
rename to soc/v2/altera/zephyr_nios2f/cpu/README
diff --git a/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qpf b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qpf
similarity index 100%
rename from soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qpf
rename to soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qpf
diff --git a/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsf b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsf
similarity index 100%
rename from soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsf
rename to soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsf
diff --git a/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsys b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsys
similarity index 100%
rename from soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.qsys
rename to soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.qsys
diff --git a/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.sof
similarity index 100%
rename from soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sof
rename to soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.sof
diff --git a/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sopcinfo b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.sopcinfo
similarity index 100%
rename from soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da.sopcinfo
rename to soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da.sopcinfo
diff --git a/soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da_top.v b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da_top.v
similarity index 100%
rename from soc/nios2/nios2f-zephyr/cpu/ghrd_10m50da_top.v
rename to soc/v2/altera/zephyr_nios2f/cpu/ghrd_10m50da_top.v
diff --git a/soc/nios2/nios2f-zephyr/cpu/ghrd_timing.sdc b/soc/v2/altera/zephyr_nios2f/cpu/ghrd_timing.sdc
similarity index 100%
rename from soc/nios2/nios2f-zephyr/cpu/ghrd_timing.sdc
rename to soc/v2/altera/zephyr_nios2f/cpu/ghrd_timing.sdc
diff --git a/soc/nios2/nios2f-zephyr/include/layout.h b/soc/v2/altera/zephyr_nios2f/include/layout.h
similarity index 100%
rename from soc/nios2/nios2f-zephyr/include/layout.h
rename to soc/v2/altera/zephyr_nios2f/include/layout.h
diff --git a/soc/nios2/nios2f-zephyr/include/linker.h b/soc/v2/altera/zephyr_nios2f/include/linker.h
similarity index 100%
rename from soc/nios2/nios2f-zephyr/include/linker.h
rename to soc/v2/altera/zephyr_nios2f/include/linker.h
diff --git a/soc/nios2/nios2f-zephyr/include/system.h b/soc/v2/altera/zephyr_nios2f/include/system.h
similarity index 100%
rename from soc/nios2/nios2f-zephyr/include/system.h
rename to soc/v2/altera/zephyr_nios2f/include/system.h
diff --git a/soc/nios2/nios2f-zephyr/linker.ld b/soc/v2/altera/zephyr_nios2f/linker.ld
similarity index 100%
rename from soc/nios2/nios2f-zephyr/linker.ld
rename to soc/v2/altera/zephyr_nios2f/linker.ld
diff --git a/soc/nios2/nios2f-zephyr/soc.h b/soc/v2/altera/zephyr_nios2f/soc.h
similarity index 100%
rename from soc/nios2/nios2f-zephyr/soc.h
rename to soc/v2/altera/zephyr_nios2f/soc.h
diff --git a/soc/v2/altera/zephyr_nios2f/soc.yml b/soc/v2/altera/zephyr_nios2f/soc.yml
new file mode 100644
index 00000000000..156e865a4cb
--- /dev/null
+++ b/soc/v2/altera/zephyr_nios2f/soc.yml
@@ -0,0 +1,2 @@
+socs:
+  - name: zephyr_nios2f