diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1fff79b482..b756f62605 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,9 @@
 Sun Mar 20 09:24:36 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
+	* som.c (som_begin_writing): Fix braino (one call to align
+	space/subspace data was done unconditionally rather than
+	just for executables.)
+
 	* som.c (som_begin_writing): Align text in all executables to
 	make HPUX kernel happy.  Fixes strip/objcopy for shared
 	executables.
diff --git a/bfd/som.c b/bfd/som.c
index a355b75f86..c5ba4d7095 100644
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -3077,7 +3077,8 @@ som_begin_writing (abfd)
       while (!som_is_space (section))
 	section = section->next;
 
-      current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
+      if (abfd->flags & EXEC_P)
+	current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
 
       /* Now look for all its subspaces.  */
       for (subsection = abfd->sections;