diff --git a/ChangeLog b/ChangeLog
index 461f7c888..be206a44a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
  - (djm) [sshd_config.5] downgrade mention of login.conf to be an example
    and mention PAM as another provider for ChallengeResponseAuthentication;
    bz#1408; ok dtucker@
+ - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when
+   attempting atomic rename(); ok dtucker@
 
 20090820
  - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not
diff --git a/sftp-server.c b/sftp-server.c
index 83beeadcf..d984e6049 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1041,7 +1041,7 @@ process_rename(void)
 	else if (S_ISREG(sb.st_mode)) {
 		/* Race-free rename of regular files */
 		if (link(oldpath, newpath) == -1) {
-			if (errno == EOPNOTSUPP
+			if (errno == EOPNOTSUPP || errno == ENOSYS
 #ifdef EXDEV
 			    || errno == EXDEV
 #endif