diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2913ea74b7..678b0ebef4 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+Mon May 16 13:35:08 1994  Jeff Law  (law@snake.cs.utah.edu)
+
+	* emultempl/hppaelf.em: Change all references of
+	.hppa_linker_stubs to .PARISC.stubs.
+	* scripttempl/hppaelf.sc: Likewise.
+
 Fri May 13 13:00:38 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* ldlang.c (print_output_section_statement): Change ``no attached
diff --git a/ld/scripttempl/hppaelf.sc b/ld/scripttempl/hppaelf.sc
new file mode 100644
index 0000000000..21b6085a4e
--- /dev/null
+++ b/ld/scripttempl/hppaelf.sc
@@ -0,0 +1,35 @@
+cat <<EOF
+OUTPUT_FORMAT("${OUTPUT_FORMAT}")
+OUTPUT_ARCH(${ARCH})
+ENTRY("\$START\$")
+${RELOCATING+${LIB_SEARCH_DIRS}}
+${RELOCATING+___stack_zero = ABSOLUTE(0x2000);}
+SECTIONS
+{
+  .text ${RELOCATING+${TEXT_START_ADDR}}:
+  {
+    ${RELOCATING+__text_start = .};
+    CREATE_OBJECT_SYMBOLS
+    *(.PARISC.stubs)
+    *(.text)
+    ${RELOCATING+etext = .};
+    ${RELOCATING+_etext = .};
+  }
+  .data  ${RELOCATING+ 0x40000000 } :
+  {
+    ${RELOCATING+ . = . + 0x1000 };
+    ${RELOCATING+__data_start = .};
+    *(.data)
+    ${CONSTRUCTING+CONSTRUCTORS}
+    ${RELOCATING+edata = .};
+    ${RELOCATING+_edata = .};
+  }
+  .bss ${RELOCATING+SIZEOF(.data) + ADDR(.data)} :
+  {
+   *(.bss)
+   *(COMMON)
+   ${RELOCATING+end = . };
+   ${RELOCATING+_end = . };
+  }
+}
+EOF