2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index a87b7116d..fa9e32b65 100644
--- a/CHANGES
+++ b/CHANGES
@@ -54,6 +54,7 @@
 	- there must be a { between two % in a query format (unless %% is used)
 
 2.5.6 -> 2.5.7:
+	- resurrect osf1 as canonical os name (Time Mooney).
 	- make '-' character illegal (again) in version/release.
 	- use portable #!/bin/sh (Tim Mooney).
 	- don't erase failing build script (Tim Mooney).
diff --git a/rpmrc.in b/rpmrc.in
index 6b109070c..4c8294ac2 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -83,6 +83,8 @@ os_canon:      AmigaOS: AmigaOS 5
 os_canon:          AIX: AIX     5
 os_canon:        HP-UX: hpux10  6
 os_canon:         OSF1: osf1    7
+os_canon:       osf4.0: osf1    7
+os_canon:       osf3.2: osf1    7
 os_canon:      FreeBSD: FreeBSD 8
 os_canon:       SCO_SV: SCO_SV3.2v5.0.2  9
 os_canon:	IRIX64: Irix64  10