diff --git a/meta/recipes-extended/ghostscript/arm/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/arm/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
diff --git a/meta/recipes-extended/ghostscript/arm/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/arm/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/i586/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/i586/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
diff --git a/meta/recipes-extended/ghostscript/i586/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/i586/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/i686 b/meta/recipes-extended/ghostscript/ghostscript/i686
new file mode 120000
index 0000000000..87aaca5903
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/ghostscript/i686
@@ -0,0 +1 @@
+i586
\ No newline at end of file
diff --git a/meta/recipes-extended/ghostscript/mips/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/mips/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h
diff --git a/meta/recipes-extended/ghostscript/mips/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/mips/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/powerpc/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/powerpc/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
diff --git a/meta/recipes-extended/ghostscript/powerpc/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/powerpc/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/x86_64/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/x86_64/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/x86_64/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/x86_64/objarch.h
diff --git a/meta/recipes-extended/ghostscript/x86_64/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/x86_64/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h