diff --git a/fakeroot-C99.patch b/fakeroot-C99.patch
deleted file mode 100644
index f2c8522..0000000
--- a/fakeroot-C99.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: fakeroot-1.35.1/communicate.c
-===================================================================
---- fakeroot-1.35.1.orig/communicate.c
-+++ fakeroot-1.35.1/communicate.c
-@@ -576,7 +576,7 @@ void send_get_fakem(struct fake_msg *buf
-                &fm,
-                sizeof(fm)-sizeof(fm.mtype),0,0);
- 
--      ptr = &fm;
-+      ptr = (uint8_t*) &fm;
-       for (k=0; k<16; k++) {
-         magic_candidate = *(uint32_t*)&ptr[k];
-         if (magic_candidate == FAKEROOT_MAGIC_LE || magic_candidate == FAKEROOT_MAGIC_BE) {
-Index: fakeroot-1.35.1/faked.c
-===================================================================
---- fakeroot-1.35.1.orig/faked.c
-+++ fakeroot-1.35.1/faked.c
-@@ -1089,7 +1089,7 @@ void get_msg()
-   do {
-     r=msgrcv(msg_get,&fm,sizeof(struct fake_msg_buf),0,0);
- 
--    ptr = &fm;
-+    ptr = (uint8_t*) &fm;
-     for (k=0; k<16; k++) {
-       magic_candidate = *(uint32_t*)&ptr[k];
-       if (magic_candidate == FAKEROOT_MAGIC_LE || magic_candidate == FAKEROOT_MAGIC_BE) {
diff --git a/fakeroot.changes b/fakeroot.changes
index 9fab039..2e74fb7 100644
--- a/fakeroot.changes
+++ b/fakeroot.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Aug 28 08:31:20 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 1.36
+  * Fix build with gcc-14. (Closes: #1074945)
+  * Fix FTBFS on armel, armhf, by undefining the t64 flags in communicate.h
+    Upload to experimental, for additional testing.
+    (Closes: #1065552)
+  * New fix for the previous FTBFS on armel, armhf. Work around glibc headers
+    aliasing symbols we need to redefine.
+    (Closes: #1065552)
+  * Fix ABI mismatch on i386, a 32bit arch _without_ the time_t64 ABI
+    break.
+  * Fix wrappers for fstatat64 et al missing. (Closes: #1078655)
+    Add t.perlstat test. Thanks to Johannes Schauer Marin Rodrigues
+    and Niels Thykier for help with debugging the problem.
+- Drop fakeroot-C99.patch which has been merged upstream
+
 -------------------------------------------------------------------
 Fri Jul 26 16:05:25 UTC 2024 - Martin Jambor <mjambor@suse.com>
 
diff --git a/fakeroot.spec b/fakeroot.spec
index 82c5fcd..fee5e6d 100644
--- a/fakeroot.spec
+++ b/fakeroot.spec
@@ -17,7 +17,7 @@
 
 
 Name:           fakeroot
-Version:        1.35.1
+Version:        1.36
 Release:        0
 Summary:        Wrapper that gives a fake root environment
 License:        GPL-3.0-or-later
@@ -27,8 +27,6 @@ Source0:        http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{vers
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM fakeroot-1.21-fix-shell-in-fakeroot.patch (deb#828810)
 Patch0:         fakeroot-1.21-fix-shell-in-fakeroot
-# PATCH-FIX-UPSTREAM fakeroot-C99.patch - fix C99 issues preventing building with gcc 14
-Patch1:         fakeroot-C99.patch
 BuildRequires:  autoconf >= 2.71
 BuildRequires:  automake
 BuildRequires:  fdupes
@@ -43,7 +41,7 @@ BuildRequires:  po4a
 BuildRequires:  sharutils
 BuildRequires:  user(daemon)
 Requires(post): update-alternatives
-Requires(preun):update-alternatives
+Requires(preun): update-alternatives
 
 %description
 fakeroot runs a command in an environment wherein it appears to have
diff --git a/fakeroot_1.35.1.orig.tar.gz b/fakeroot_1.35.1.orig.tar.gz
deleted file mode 100644
index dd6ba42..0000000
--- a/fakeroot_1.35.1.orig.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a0de53b2de05277d4e6d4a884eb0de7a8ad467b82c07a6f8f2f6a629e655fdc
-size 572985
diff --git a/fakeroot_1.36.orig.tar.gz b/fakeroot_1.36.orig.tar.gz
new file mode 100644
index 0000000..002ec2e
--- /dev/null
+++ b/fakeroot_1.36.orig.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fe3cf3daf95ee93b47e568e85f4d341a1f9ae91766b4f9a9cdc29737dea4988
+size 573364