diff --git a/ld/ChangeLog b/ld/ChangeLog
index 801de43428..f0f2b6b851 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-22  Igor Shevlyakov  <igor@windriver.com>
+
+	* ldmain.c (main): When deciding if ".text" section should be
+        read-only, don't forget to reset SEC_READONLY because it
+        could be already set.
+
 2000-05-22  Thomas de Lellis  <tdel@windriver.com>
 
         * ld.1: Add documentation for new command line option:
diff --git a/ld/ldmain.c b/ld/ldmain.c
index cfdbdd7a80..73725949d2 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -347,17 +347,18 @@ main (argc, argv)
   /* Print error messages for any missing symbols, for any warning
      symbols, and possibly multiple definitions */
 
-
-  if (config.text_read_only)
-    {
-      /* Look for a text section and mark the readonly attribute in it */
-      asection *found = bfd_get_section_by_name (output_bfd, ".text");
-
-      if (found != (asection *) NULL)
-	{
+  /* Look for a text section and switch the readonly attribute in it.  */
+  {
+    asection * found = bfd_get_section_by_name (output_bfd, ".text");
+    
+    if (found != (asection *) NULL)
+      {
+	if (config.text_read_only)
 	  found->flags |= SEC_READONLY;
-	}
-    }
+	else
+	  found->flags &= ~SEC_READONLY;
+      }
+  }
 
   if (link_info.relocateable)
     output_bfd->flags &= ~EXEC_P;