diff --git a/gas/ChangeLog b/gas/ChangeLog
index b95cf736646..fbedd888c6b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+Fri Oct 29 13:26:12 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* as.c (main): Disable "-R" option if NO_FOLD_DATA_AND_TEXT
+	is defined.
+	* config/tc-hppa.h (NO_FOLD_DATA_AND_TEXT): Define.  Folding
+	of text and data segments fails miserably on the PA.
+
 Thu Oct 28 12:36:13 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
 	* config/tc-hppa.c (md_pseudo_table): Default alignment is 8 for