Index: subversion/libsvn_client/blame.c
===================================================================
--- subversion/libsvn_client/blame.c    (revision 17597)
+++ subversion/libsvn_client/blame.c    (working copy)
@@ -329,25 +329,6 @@
     SVN_ERR (svn_io_file_close (dbaton->source_file, frb->currpool));
   SVN_ERR (svn_io_file_close (dbaton->file, frb->currpool));
  
-  if (svn_subst_translation_required (frb->eol_style, frb->eol_str,
-                                      NULL, FALSE, FALSE))
-    {
-      const char *translation_tgt;
-
-      SVN_ERR (svn_io_open_unique_file2 (NULL,
-                                         &translation_tgt,
-                                         frb->tmp_path,
-                                         ".tmp",
-                                         svn_io_file_del_on_pool_cleanup,
-                                         frb->currpool));
-      SVN_ERR (svn_subst_copy_and_translate3 (dbaton->filename,
-                                              translation_tgt,
-                                              frb->eol_str, FALSE,
-                                              NULL, FALSE, FALSE,
-                                              frb->currpool));
-      dbaton->filename = translation_tgt;
-    }
-
   /* Process this file. */
   SVN_ERR (add_file_blame (frb->last_filename,
                            dbaton->filename, frb));
@@ -617,6 +598,11 @@
                              APR_OS_DEFAULT, pool));
   stream = svn_stream_from_aprfile (file, pool);
  
+  if (svn_subst_translation_required (frb.eol_style, frb.eol_str,
+                                      NULL, FALSE, FALSE))
+    stream = svn_subst_stream_translated (stream, frb.eol_str, TRUE,
+                                          NULL, FALSE, pool);
+
   /* Process each blame item. */
   for (walk = frb.blame; walk; walk = walk->next)
     {