++ if (atimes_ndx)
++ F_ATIME(file) = (time_t)atime;
+ #ifdef ICONV_OPTION
+ if (ic_ndx)
+ F_NDX(file) = flist->used + flist->ndx_start;
+@@ -1181,6 +1207,8 @@ struct file_struct *make_file(const char
+ F_OWNER(file) = st.st_uid;
+ if (gid_ndx)
+ F_GROUP(file) = st.st_gid;
++ if (atimes_ndx)
++ F_ATIME(file) = st.st_atime;
+
+ if (basename != thisname)
+ file->dirname = lastdir;
+--- old/generator.c
++++ new/generator.c
+@@ -43,6 +43,7 @@ extern int preserve_specials;
+ extern int preserve_hard_links;
+ extern int preserve_perms;
+ extern int preserve_times;
++extern int preserve_atimes;
+ extern int uid_ndx;
+ extern int gid_ndx;
+ extern int delete_mode;
+@@ -563,6 +564,9 @@ void itemize(const char *fnamecmp, struc
+ && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+ || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
+ iflags |= ITEM_REPORT_TIME;
++ if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
++ && cmp_time(F_ATIME(file), sxp->st.st_atime) != 0)
++ iflags |= ITEM_REPORT_ATIME;
+ if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
+ iflags |= ITEM_REPORT_PERMS;
+ if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
+@@ -880,6 +884,8 @@ static int try_dests_reg(struct file_str
+ if (link_dest) {
+ if (!hard_link_one(file, fname, cmpbuf, 1))
+ goto try_a_copy;
++ if (preserve_atimes)
++ set_file_attrs(fname, file, sxp, NULL, 0);
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
+ if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+@@ -1774,7 +1780,7 @@ static void touch_up_dirs(struct file_li
+ if (!(file->mode & S_IWUSR))
+ do_chmod(fname, file->mode);
+ if (need_retouch_dir_times)
+- set_modtime(fname, file->modtime, file->mode);
++ set_times(fname, file->modtime, file->modtime, file->mode);
+ if (allowed_lull && !(counter % lull_mod))
+ maybe_send_keepalive();
+ else if (!(counter & 0xFF))
+--- old/log.c
++++ new/log.c
+@@ -631,7 +631,8 @@ static void log_formatted(enum logcode c
+ c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
+ c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
+ c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
+- c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
++ c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
++ : S_ISLNK(file->mode) ? 'U' : 'u';
+ c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
+ c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
+ c[11] = '\0';
+--- old/options.c
++++ new/options.c
+@@ -56,6 +56,7 @@ int preserve_specials = 0;
+ int preserve_uid = 0;