--- a/src/file-coding.c	Mon Aug 13 11:21:40 2007 +0200
+++ b/src/file-coding.c	Mon Aug 13 11:22:23 2007 +0200
@@ -55,7 +55,7 @@
 
 Lisp_Object Qcoding_system_p;
 
-Lisp_Object Qno_conversion, Qccl, Qiso2022;
+Lisp_Object Qraw_text, Qno_conversion, Qccl, Qiso2022;
 /* Qinternal in general.c */
 
 Lisp_Object Qmnemonic, Qeol_type;
@@ -1531,7 +1531,7 @@
 	    }
 	}
       if (NILP (retval))
-	retval = Fget_coding_system (Qno_conversion);
+	retval = Fget_coding_system (Qraw_text);
       return retval;
     }
   else
@@ -1553,7 +1553,7 @@
       if (cat >= 0)
 	return coding_category_system[cat];
       else
-	return Fget_coding_system (Qno_conversion);
+	return Fget_coding_system (Qraw_text);
     }
 }
 
@@ -5447,6 +5447,7 @@
 #endif /* MULE */
   defsymbol (&Qcoding_system_p, "coding-system-p");
   defsymbol (&Qno_conversion, "no-conversion");
+  defsymbol (&Qraw_text, "raw-text");
 #ifdef MULE
   defsymbol (&Qbig5, "big5");
   defsymbol (&Qshift_jis, "shift-jis");
@@ -5643,15 +5644,22 @@
   DEFINE_CODESYS_PROP (CODESYS_PROP_CCL,     Qdecode);
 #endif /* MULE */
   /* Need to create this here or we're really screwed. */
-  Fmake_coding_system (Qno_conversion, Qno_conversion, build_string ("No conversion"),
-		       list2 (Qmnemonic, build_string ("Noconv")));
-
-  Fcopy_coding_system (Fcoding_system_property (Qno_conversion, Qeol_lf),
-		       Qbinary);
+  Fmake_coding_system
+    (Qraw_text, Qno_conversion,
+     build_string ("Raw text, which means it converts only line-break-codes."),
+     list2 (Qmnemonic, build_string ("Raw")));
+
+  Fmake_coding_system
+    (Qbinary, Qno_conversion,
+     build_string ("Binary, which means it does not convert anything."),
+     list4 (Qeol_type, Qlf,
+	    Qmnemonic, build_string ("Binary")));
+
+  Fdefine_coding_system_alias (Qno_conversion, Qraw_text);
 
   /* Need this for bootstrapping */
   coding_category_system[CODING_CATEGORY_NO_CONVERSION] =
-    Fget_coding_system (Qno_conversion);
+    Fget_coding_system (Qraw_text);
 
 #ifdef MULE
   {