diff --git a/.release-plz.toml b/.release-plz.toml
index 68bd669aff358..51d1688a852ff 100644
--- a/.release-plz.toml
+++ b/.release-plz.toml
@@ -1,3 +1,48 @@
 [workspace]
 git_release_name = "{{ version }}"
 git_tag_name = "{{ version }}"
+
+[changelog]
+body = """
+## [{{ version | trim_start_matches(pat="v") }}]\
+    {%- if release_link -%}\
+        ({{ release_link }})\
+    {% endif %} \
+    - {{ timestamp | date(format="%Y-%m-%d") }}
+{% for group, commits in commits | group_by(attribute="group") %}
+### {{ group | upper_first }}
+    {% for commit in commits %}
+        - {% if commit.scope -%}{{ commit.scope | upper_first }}: {% endif %}
+        {%- if commit.breaking %}[**breaking**] {% endif %}
+        {{- commit.message }}
+        {%- if commit.links %} ([{{ commit.links.1.text }}]({{ commit.links.1.href }})){% endif -%}
+    {% endfor %}
+{% endfor %}
+{%- if github -%}
+{% if github.contributors | filter(attribute="is_first_time", value=true) | length != 0 %}
+  ## New Contributors ❤️
+{% endif %}\
+{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}
+  * @{{ contributor.username }} made their first contribution
+    {%- if contributor.pr_number %} in \
+      [#{{ contributor.pr_number }}]({{ self::remote_url() }}/pull/{{ contributor.pr_number }}) \
+    {%- endif %}
+{%- endfor -%}
+{%- endif %}
+"""
+
+commit_parsers = [
+  { message = '(?i)^(\w+: )?feat', group = "added" },
+  { message = '(?i)^(\w+: )?add', group = "added" },
+  { message = '(?i)^(\w+: )?change', group = "changed" },
+  { message = '(?i)^(\w+: )?deprecate', group = "deprecated" },
+  { message = '(?i)^(\w+: )?remove', group = "removed" },
+  { message = '(?i)^(\w+: )?fix', group = "fixed" },
+  { message = '(?i)^(\w+: )?fix', group = "fixed" },
+  { message = '^.*', group = "other" },
+]
+
+link_parsers = [
+    # Extract backport patterns
+    { pattern = '\(backport <.*/(\d+)>\)', text = "#$1", href = "https://github.com/rust-lang/libc/pull/$1"}
+]
diff --git a/src/hermit.rs b/src/hermit.rs
index 65d0bf374d8cd..db51ee94b7881 100644
--- a/src/hermit.rs
+++ b/src/hermit.rs
@@ -100,7 +100,7 @@ s! {
         pub st_uid: u32,
         pub st_gid: u32,
         pub st_rdev: u64,
-        pub st_size: u64,
+        pub st_size: i64,
         pub st_blksize: i64,
         pub st_blocks: i64,
         pub st_atim: timespec,
diff --git a/src/unix/linux_like/emscripten/mod.rs b/src/unix/linux_like/emscripten/mod.rs
index d8bb18637b5bf..985b3c0c5e187 100644
--- a/src/unix/linux_like/emscripten/mod.rs
+++ b/src/unix/linux_like/emscripten/mod.rs
@@ -1512,8 +1512,6 @@ extern "C" {
     pub fn pwritev(fd: c_int, iov: *const crate::iovec, iovcnt: c_int, offset: off_t) -> ssize_t;
     pub fn preadv(fd: c_int, iov: *const crate::iovec, iovcnt: c_int, offset: off_t) -> ssize_t;
     pub fn dup3(oldfd: c_int, newfd: c_int, flags: c_int) -> c_int;
-    pub fn mkostemp(template: *mut c_char, flags: c_int) -> c_int;
-    pub fn mkostemps(template: *mut c_char, suffixlen: c_int, flags: c_int) -> c_int;
     pub fn nl_langinfo_l(item: crate::nl_item, locale: crate::locale_t) -> *mut c_char;
     pub fn accept4(
         fd: c_int,
diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
index 629821fd87d9d..efeddb54f7498 100644
--- a/src/unix/linux_like/linux/mod.rs
+++ b/src/unix/linux_like/linux/mod.rs
@@ -6372,8 +6372,6 @@ extern "C" {
         sigmask: *const crate::sigset_t,
     ) -> c_int;
     pub fn dup3(oldfd: c_int, newfd: c_int, flags: c_int) -> c_int;
-    pub fn mkostemp(template: *mut c_char, flags: c_int) -> c_int;
-    pub fn mkostemps(template: *mut c_char, suffixlen: c_int, flags: c_int) -> c_int;
     pub fn sigtimedwait(
         set: *const sigset_t,
         info: *mut siginfo_t,
diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
index 5560b1ed0f667..3b84d97bc3b0c 100644
--- a/src/unix/linux_like/mod.rs
+++ b/src/unix/linux_like/mod.rs
@@ -1886,6 +1886,9 @@ extern "C" {
     ) -> size_t;
     pub fn strptime(s: *const c_char, format: *const c_char, tm: *mut crate::tm) -> *mut c_char;
 
+    pub fn mkostemp(template: *mut c_char, flags: c_int) -> c_int;
+    pub fn mkostemps(template: *mut c_char, suffixlen: c_int, flags: c_int) -> c_int;
+
     pub fn getdomainname(name: *mut c_char, len: size_t) -> c_int;
     pub fn setdomainname(name: *const c_char, len: size_t) -> c_int;
 }