diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 29dcd29308..73ea59d2f3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 11 14:41:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* elfcode.h (assign_file_positions_except_relocs): Don't require
+	the file alignment to correspond to the page size when linking
+	with -N.
+
 Sun Apr 10 01:02:24 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
 	* elfcode.h (write_relocs): For rela relocations, adjust the
diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 50878fc17b..b30d5c3382 100644
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -1976,6 +1976,7 @@ assign_file_positions_except_relocs (abfd)
 	}
 
       if (exec_p
+	  && (abfd->flags & D_PAGED) != 0
 	  && get_elf_backend_data (abfd)->maxpagesize > 1
 	  && i_shdrp->sh_type == SHT_PROGBITS
 	  && (i_shdrp->sh_flags & SHF_ALLOC)