diff --git a/bootstrap b/bootstrap
index c014abf8..7015f543 100755
--- a/bootstrap
+++ b/bootstrap
@@ -574,6 +574,9 @@ enter_fork()
     info[pkg_name]=${fork}
     info[pkg_label]=${fork}
     info[mirrors]=
+    info[src_release]=
+    info[src_devel]=
+    info[src_custom]=
     info[archive_filename]='@{pkg_name}-@{version}'
     info[archive_dirname]='@{pkg_name}-@{version}'
     info[versionlocked]=
@@ -646,7 +649,11 @@ enter_milestone()
 
     info[ms]=${ms}
     if [ -n "${info[ver]}" ]; then
-        info[version_cmp_milestone]=`cmp_versions ${info[ver]} ${info[ms]}`
+        if [ -n "${info[version_number]}" ]; then
+            info[version_cmp_milestone]=`cmp_versions ${info[version_number]} ${info[ms]}`
+        else
+            info[version_cmp_milestone]=`cmp_versions ${info[ver]} ${info[ms]}`
+        fi
     fi
 }
 
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 8174dc48..001cd2f1 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -105,6 +105,7 @@ config GLIBC_HAS_NPTL_ADDON
 config GLIBC_HAS_PORTS_ADDON
     def_bool y
     depends on !GLIBC_2_20_or_later
+    depends on !GLIBC_USE_ORACLE
 
 config GLIBC_HAS_PORTS_ADDON_EXTERNAL
     def_bool y
@@ -121,6 +122,7 @@ config GLIBC_USE_PORTS_ADDON
     def_bool y
     depends on ARCH_ALPHA || ARCH_ARM || ARCH_M68K || ARCH_MIPS || ARCH_POWERPC
     depends on GLIBC_HAS_PORTS_ADDON
+    depends on !GLIBC_USE_ORACLE
 
 config GLIBC_USE_PORTS_EXTERNAL
     def_bool y
diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index 61414f50..19693548 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -53,7 +53,7 @@ config @@fork|@@_PKG_NAME
 choice
     bool "Source of @@pkg_label@@"
 
-#!if [ "@@#version@@" -gt 0 ]
+#!if [ "@@#version@@" -gt 0 ] && [ "@@src_release@@" != "n" ]
 config @@fork|@@_SRC_RELEASE
     bool "Released tarball"
     help
@@ -62,9 +62,6 @@ config @@fork|@@_SRC_RELEASE
 #!end-if
 config @@fork|@@_SRC_DEVEL
     bool "Vendor/custom repository"
-#!if [ "@@#version@@" -gt 0 ]
-    depends on EXPERIMENTAL
-#!end-if
     help
       Check out from a repository.
 #!if [ -n "@@repository@@" ]
@@ -116,6 +113,9 @@ config @@fork|@@_DEVEL_URL
 
 config @@fork|@@_DEVEL_BRANCH
     string "Branch/tag to check out"
+#!foreach version if-differs repository_branch
+    default "@@repository_branch@@" if @@fork|@@_V_@@ver_sel|@@
+#!end-foreach
     default "@@repository_branch@@"
     help
       Git/CVS: branch/tag to be checked out
@@ -126,6 +126,9 @@ config @@fork|@@_DEVEL_BRANCH
 
 config @@fork|@@_DEVEL_REVISION
     string "Revision/changeset"
+#!foreach version if-differs repository_cset
+    default "@@repository_cset@@" if @@fork|@@_V_@@ver_sel|@@
+#!end-foreach
     default "@@repository_cset@@"
     help
       Commit ID or revision ID to check out.
@@ -135,6 +138,9 @@ config @@fork|@@_DEVEL_REVISION
 
 config @@fork|@@_DEVEL_SUBDIR
     string "Subdirectory in the repository"
+#!foreach version if-differs repository_subdir
+    default "@@repository_subdir@@" if @@fork|@@_V_@@ver_sel|@@
+#!end-foreach
     default "@@repository_subdir@@"
     help
       Some projects produce releases not from the top-level directory in the
@@ -143,6 +149,9 @@ config @@fork|@@_DEVEL_SUBDIR
 
 config @@fork|@@_DEVEL_BOOTSTRAP
     string "Bootstrap command"
+#!foreach version if-differs bootstrap
+    default "@@bootstrap@@" if @@fork|@@_V_@@ver_sel|@@
+#!end-foreach
     default "@@bootstrap@@"
     help
       Command to run after checking out. Some projects don't store the generated
@@ -316,7 +325,7 @@ config @@fork|@@_VERSION
     default "old" if @@fork|@@_VERY_OLD
     default "unknown"
 
-#!if [ "@@#version@@" -gt 0 ]
+#!if [ "@@#version@@" -gt 0 ] && [ "@@src_release@@" != "n" ]
 config @@fork|@@_MIRRORS
     string
 #!foreach version if-differs mirrors
diff --git a/packages/binutils-oracle/2.27-44.base.0.400/version.desc b/packages/binutils-oracle/2.27-44.base.0.400/version.desc
new file mode 100644
index 00000000..0184dc3e
--- /dev/null
+++ b/packages/binutils-oracle/2.27-44.base.0.400/version.desc
@@ -0,0 +1,2 @@
+repository_branch='oracle/binutils/ol7-u9-arm'
+version_number='2.27'
diff --git a/packages/binutils-oracle/package.desc b/packages/binutils-oracle/package.desc
new file mode 100644
index 00000000..44f3a635
--- /dev/null
+++ b/packages/binutils-oracle/package.desc
@@ -0,0 +1,5 @@
+master='binutils'
+repository='git https://github.com/oracle/binutils-gdb.git'
+origin='Oracle'
+src_release='n'
+src_devel='y'
diff --git a/packages/gcc-oracle/4.8.5-44.0.5/version.desc b/packages/gcc-oracle/4.8.5-44.0.5/version.desc
new file mode 100644
index 00000000..2f2ac61a
--- /dev/null
+++ b/packages/gcc-oracle/4.8.5-44.0.5/version.desc
@@ -0,0 +1,2 @@
+repository_branch='oracle/gcc/ol7-u9'
+version_number='4.8'
diff --git a/packages/gcc-oracle/package.desc b/packages/gcc-oracle/package.desc
new file mode 100644
index 00000000..6ccf4ccf
--- /dev/null
+++ b/packages/gcc-oracle/package.desc
@@ -0,0 +1,5 @@
+master='gcc'
+repository='git https://github.com/oracle/gcc.git'
+origin='Oracle'
+src_release='n'
+src_devel='y'
diff --git a/packages/glibc-oracle/2.17-317.0.3/version.desc b/packages/glibc-oracle/2.17-317.0.3/version.desc
new file mode 100644
index 00000000..f818679c
--- /dev/null
+++ b/packages/glibc-oracle/2.17-317.0.3/version.desc
@@ -0,0 +1,2 @@
+repository_branch='oracle/glibc/ol7-u9'
+version_number='2.17'
diff --git a/packages/glibc-oracle/package.desc b/packages/glibc-oracle/package.desc
new file mode 100644
index 00000000..a94f7d22
--- /dev/null
+++ b/packages/glibc-oracle/package.desc
@@ -0,0 +1,5 @@
+master='glibc'
+repository='git https://github.com/oracle/glibc.git'
+origin='Oracle'
+src_release='n'
+src_devel='y'
diff --git a/packages/linux-oracle/4.14.35-2025.400.8/version.desc b/packages/linux-oracle/4.14.35-2025.400.8/version.desc
new file mode 100644
index 00000000..e6641500
--- /dev/null
+++ b/packages/linux-oracle/4.14.35-2025.400.8/version.desc
@@ -0,0 +1,2 @@
+repository_branch='v4.14.35-2025.400.8'
+version_number='4.14'
diff --git a/packages/linux-oracle/package.desc b/packages/linux-oracle/package.desc
new file mode 100644
index 00000000..e02c85e0
--- /dev/null
+++ b/packages/linux-oracle/package.desc
@@ -0,0 +1,5 @@
+master='linux'
+origin='Oracle'
+repository='git https://github.com/oracle/linux-uek.git'
+src_release='n'
+src_devel='y'
diff --git a/packages/linux/package.desc b/packages/linux/package.desc
index 184e6dde..97636385 100644
--- a/packages/linux/package.desc
+++ b/packages/linux/package.desc
@@ -1,3 +1,4 @@
+origin='www.kernel.org'
 repository='git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
 mirrors='$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})'
 relevantpattern='2.*.*|. *.*|.'
diff --git a/samples/aarch64-ol7u9-linux-gnu/crosstool.config b/samples/aarch64-ol7u9-linux-gnu/crosstool.config
new file mode 100644
index 00000000..165468c9
--- /dev/null
+++ b/samples/aarch64-ol7u9-linux-gnu/crosstool.config
@@ -0,0 +1,21 @@
+CT_CONFIG_VERSION="3"
+CT_OBSOLETE=y
+CT_ARCH_ARM=y
+CT_ARCH_64=y
+CT_TARGET_VENDOR="ol7u9"
+CT_KERNEL_LINUX=y
+CT_LINUX_USE_ORACLE=y
+CT_LINUX_ORACLE_V_4_14=y
+CT_LINUX_ORACLE_VERSION="4.14.35-2025.400.8"
+CT_BINUTILS_USE_ORACLE=y
+CT_BINUTILS_ORACLE_V_2_27_44=y
+CT_BINUTILS_LINKER_LD_GOLD=y
+CT_BINUTILS_GOLD_THREADS=y
+CT_BINUTILS_LD_WRAPPER=y
+CT_BINUTILS_PLUGINS=y
+CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_ORACLE_V_2_17_317_0_3=y
+CT_GCC_USE_ORACLE=y
+CT_GCC_ORACLE_V_4_8=y
+CT_GCC_ORACLE_VERSION="4.8.5-44.0.5"
+CT_CC_LANG_CXX=y
diff --git a/samples/aarch64-ol7u9-linux-gnu/reported.by b/samples/aarch64-ol7u9-linux-gnu/reported.by
new file mode 100644
index 00000000..964d9dd1
--- /dev/null
+++ b/samples/aarch64-ol7u9-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Jose E. Marchesi"
+reporter_url=""
+reporter_comment="OL 7.9 toolchain configured for AARCH64"
diff --git a/samples/arm-ol7u9-linux-gnueabi/crosstool.config b/samples/arm-ol7u9-linux-gnueabi/crosstool.config
new file mode 100644
index 00000000..1894fe85
--- /dev/null
+++ b/samples/arm-ol7u9-linux-gnueabi/crosstool.config
@@ -0,0 +1,21 @@
+CT_CONFIG_VERSION="3"
+CT_OBSOLETE=y
+CT_ARCH_ARM=y
+CT_TARGET_VENDOR="ol7u9"
+CT_ARCH_FLOAT_SW=y
+CT_KERNEL_LINUX=y
+CT_LINUX_USE_ORACLE=y
+CT_LINUX_ORACLE_V_4_14=y
+CT_LINUX_ORACLE_VERSION="4.14.35-2025.400.8"
+CT_BINUTILS_USE_ORACLE=y
+CT_BINUTILS_ORACLE_V_2_27_44=y
+CT_BINUTILS_LINKER_LD_GOLD=y
+CT_BINUTILS_GOLD_THREADS=y
+CT_BINUTILS_LD_WRAPPER=y
+CT_BINUTILS_PLUGINS=y
+CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_ORACLE_V_2_17_317_0_3=y
+CT_GCC_USE_ORACLE=y
+CT_GCC_ORACLE_V_4_8=y
+CT_GCC_ORACLE_VERSION="4.8.5-44.0.5"
+CT_CC_LANG_CXX=y
diff --git a/samples/arm-ol7u9-linux-gnueabi/reported.by b/samples/arm-ol7u9-linux-gnueabi/reported.by
new file mode 100644
index 00000000..19080faa
--- /dev/null
+++ b/samples/arm-ol7u9-linux-gnueabi/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Jose E. Marchesi"
+reporter_url=""
+reporter_comment="OL 7.9 toolchain configured for ARM w/o fp hardware"
diff --git a/samples/arm-ol7u9-linux-gnueabihf/crosstool.config b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config
new file mode 100644
index 00000000..16731296
--- /dev/null
+++ b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config
@@ -0,0 +1,21 @@
+CT_CONFIG_VERSION="3"
+CT_OBSOLETE=y
+CT_ARCH_ARM=y
+CT_TARGET_VENDOR="ol7u9"
+CT_ARCH_FLOAT_HW=y
+CT_KERNEL_LINUX=y
+CT_LINUX_USE_ORACLE=y
+CT_LINUX_ORACLE_V_4_14=y
+CT_LINUX_ORACLE_VERSION="4.14.35-2025.400.8"
+CT_BINUTILS_USE_ORACLE=y
+CT_BINUTILS_ORACLE_V_2_27_44=y
+CT_BINUTILS_LINKER_LD_GOLD=y
+CT_BINUTILS_GOLD_THREADS=y
+CT_BINUTILS_LD_WRAPPER=y
+CT_BINUTILS_PLUGINS=y
+CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_ORACLE_V_2_17_317_0_3=y
+CT_GCC_USE_ORACLE=y
+CT_GCC_ORACLE_V_4_8=y
+CT_GCC_ORACLE_VERSION="4.8.5-44.0.5"
+CT_CC_LANG_CXX=y
diff --git a/samples/arm-ol7u9-linux-gnueabihf/reported.by b/samples/arm-ol7u9-linux-gnueabihf/reported.by
new file mode 100644
index 00000000..96dee7ee
--- /dev/null
+++ b/samples/arm-ol7u9-linux-gnueabihf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Jose E. Marchesi"
+reporter_url=""
+reporter_comment="OL 7.9 toolchain configured for ARM with fp hardware"