diff --git a/_artifacts/opensearch-1.0/arm64/opensearch-1.0.1-freebsd-arm64.markdown b/_artifacts/opensearch-1.0/arm64/opensearch-1.0.1-freebsd-arm64.markdown
new file mode 100644
index 0000000000..bc552a433a
--- /dev/null
+++ b/_artifacts/opensearch-1.0/arm64/opensearch-1.0.1-freebsd-arm64.markdown
@@ -0,0 +1,12 @@
+---
+role: daemon
+artifact_id: opensearch
+version: 1.0.1
+platform: freebsd
+architecture: arm64
+slug: opensearch-1.0.1-freebsd-arm64
+category: opensearch
+type: system-package
+freebsd_package_name: opensearch
+link: https://www.freshports.org/textproc/opensearch
+---
diff --git a/_artifacts/opensearch-1.0/arm64/opensearch-dashboards-1.0.1-freebsd-arm64.markdown b/_artifacts/opensearch-1.0/arm64/opensearch-dashboards-1.0.1-freebsd-arm64.markdown
new file mode 100644
index 0000000000..193a2ce83c
--- /dev/null
+++ b/_artifacts/opensearch-1.0/arm64/opensearch-dashboards-1.0.1-freebsd-arm64.markdown
@@ -0,0 +1,13 @@
+---
+role: ui
+title: OpenSearch Dashboards
+artifact_id: opensearch-dashboards
+architecture: arm64
+platform: freebsd
+type: system-package
+category: opensearch-dashboards
+slug: opensearch-dashboards-1.0.1-freebsd-arm64
+version: 1.0.1
+freebsd_package_name: opensearch-dashboards
+link: https://www.freshports.org/textproc/opensearch-dashboards
+---
diff --git a/_artifacts/opensearch-1.0/x64/opensearch-1.0.1-freebsd-x64.markdown b/_artifacts/opensearch-1.0/x64/opensearch-1.0.1-freebsd-x64.markdown
new file mode 100644
index 0000000000..4d96850304
--- /dev/null
+++ b/_artifacts/opensearch-1.0/x64/opensearch-1.0.1-freebsd-x64.markdown
@@ -0,0 +1,12 @@
+---
+role: daemon
+artifact_id: opensearch
+version: 1.0.1
+platform: freebsd
+architecture: x64
+slug: opensearch-1.0.1-freebsd-x64
+category: opensearch
+type: system-package
+freebsd_package_name: opensearch
+link: https://www.freshports.org/textproc/opensearch
+---
diff --git a/_artifacts/opensearch-1.0/x64/opensearch-dashboards-1.0.1-freebsd-x64.markdown b/_artifacts/opensearch-1.0/x64/opensearch-dashboards-1.0.1-freebsd-x64.markdown
new file mode 100644
index 0000000000..e3c68b58dc
--- /dev/null
+++ b/_artifacts/opensearch-1.0/x64/opensearch-dashboards-1.0.1-freebsd-x64.markdown
@@ -0,0 +1,13 @@
+---
+role: ui
+title: OpenSearch Dashboards
+artifact_id: opensearch-dashboards
+architecture: x64
+platform: freebsd
+type: system-package
+category: opensearch-dashboards
+slug: opensearch-dashboards-1.0.1-freebsd-x64
+version: 1.0.1
+freebsd_package_name: opensearch-dashboards
+link: https://www.freshports.org/textproc/opensearch-dashboards
+---
diff --git a/_artifacts/opensearch-1.0/x86/opensearch-1.0.1-freebsd-x86.markdown b/_artifacts/opensearch-1.0/x86/opensearch-1.0.1-freebsd-x86.markdown
new file mode 100644
index 0000000000..7bd8afe6fa
--- /dev/null
+++ b/_artifacts/opensearch-1.0/x86/opensearch-1.0.1-freebsd-x86.markdown
@@ -0,0 +1,12 @@
+---
+role: daemon
+artifact_id: opensearch
+version: 1.0.1
+platform: freebsd
+architecture: x86
+slug: opensearch-1.0.1-freebsd-x86
+category: opensearch
+type: system-package
+freebsd_package_name: opensearch
+link: https://www.freshports.org/textproc/opensearch
+---
diff --git a/_artifacts/opensearch-1.0/x86/opensearch-dashboards-1.0.1-freebsd-x86.markdown b/_artifacts/opensearch-1.0/x86/opensearch-dashboards-1.0.1-freebsd-x86.markdown
new file mode 100644
index 0000000000..7e0b0fd387
--- /dev/null
+++ b/_artifacts/opensearch-1.0/x86/opensearch-dashboards-1.0.1-freebsd-x86.markdown
@@ -0,0 +1,13 @@
+---
+role: ui
+title: OpenSearch Dashboards
+artifact_id: opensearch-dashboards
+architecture: x86
+platform: freebsd
+type: system-package
+category: opensearch-dashboards
+slug: opensearch-dashboards-1.0.1-freebsd-x86
+version: 1.0.1
+freebsd_package_name: opensearch-dashboards
+link: https://www.freshports.org/textproc/opensearch-dashboards
+---
diff --git a/_layouts/versions.html b/_layouts/versions.html
index 10b6a2f9ef..ed2a8ba780 100644
--- a/_layouts/versions.html
+++ b/_layouts/versions.html
@@ -19,6 +19,7 @@
   platforms:
     windows: "Windows"
     linux: "Linux"
+    freebsd: "FreeBSD"
     macos: macOS
     java: "Java"
     docker: Docker
@@ -30,9 +31,11 @@
     msi: "Installer (msi)"
     jar: ".jar"
     docker_hub: 'Dockerfile'
+    system-package: "System package"
   architectures:
     arm64: "ARM64"
     x64: "x64"
+    x86: "x86"
     jvm: Java Virtual Machine
   sections:
     opensearch: OpenSearch
@@ -51,6 +54,7 @@
 platform_order:
   - linux
   - docker
+  - freebsd
   - macos
   - windows
   - java
@@ -193,6 +197,13 @@ <h3 class="artifact-name" id="{{component.artifact}}">{{ name_pretty }}</h3>
                 class="cta">Download</a> </div>{% endcapture %}
               {% assign artifact_extras = artifact_extras | append: artifact_extra %}
             {% endif %}
+            {% if details.freebsd_package_name %}
+              {% capture artifact_extra %}<div class="extra_links extra_{{artifact_id}}">
+                <p>Install from FreeBSD packages:</p>
+                <pre># pkg install {{details.freebsd_package_name}}</pre>
+                </div>{% endcapture %}
+              {% assign artifact_extras = artifact_extras | append: artifact_extra %}
+            {% endif %}
             {% if details.link %}
               {% capture artifact_extra %}<div class="extra_links extra_{{artifact_id}}">
                 <a href="{{details.link}}" target="_blank" class="cta">Get it</a>
@@ -271,4 +282,4 @@ <h3 class="artifact-name" id="{{component.artifact}}">{{ name_pretty }}</h3>
 {% endcapture %}
 
 {% include copy_banner.html %}
-{% include base_3col.html %}
\ No newline at end of file
+{% include base_3col.html %}
diff --git a/artifacts/index.html b/artifacts/index.html
index 167405d322..bc2bd0522c 100644
--- a/artifacts/index.html
+++ b/artifacts/index.html
@@ -8,10 +8,10 @@
   <ul class="tree">
     {% for id_group in artifacts_by_id %}
         <li id="{{id_group.name}}">{{ id_group.name }}
-        {% assign artifacts_by_platform = id_group.items | group_by: "platform" %}
+        {% assign artifacts_by_platform = id_group.items | sort: "platform" | group_by: "platform" %}
         <ul class="tree">
         {% for platform_group in artifacts_by_platform %}    
-          {% assign architecture_group = platform_group.items | group_by: "architecture" %}
+          {% assign architecture_group = platform_group.items | sort: "name" | group_by: "architecture" %}
           {% for artifacts in architecture_group %}
             <li>{{ platform_group.name }}-{{ artifacts.name }}
               <ul class="tree">