diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 7357576..b548120 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -24,6 +24,11 @@ prepare() {
 
 	# rsync-ssl: Verify the hostname in the certificate when using openssl.
 	git cherry-pick -n c3f7414c450faaf6a8281cc4a4403529aeb7d859
+
+	# Force HAVE_LCHMOD off for Linux (for now).
+	git cherry-pick -n 85b8dc8abaca96fc3ea7421e09101b6ac41b6718
+	# Work around glibc's lchmod() issue a better way.
+	git cherry-pick -n 9dd62525f3b98d692e031f22c02be8f775966503
 }
 
 build() {