diff --git a/mozilla/security/nss/lib/freebl/Makefile b/mozilla/security/nss/lib/freebl/Makefile
index b80b3eb4fde..3a9af3529d4 100644
--- a/mozilla/security/nss/lib/freebl/Makefile
+++ b/mozilla/security/nss/lib/freebl/Makefile
@@ -165,6 +165,7 @@ endif # AIX
 ifeq ($(OS_TARGET), HP-UX)
 ifneq ($(OS_TEST), ia64)
 # PA-RISC
+ASFILES += ret_cr16.s
 ifndef USE_64
     FREEBL_BUILD_SINGLE_SHLIB = 
     HAVE_ABI32_INT32 = 1
diff --git a/mozilla/security/nss/lib/util/ret_cr16.s b/mozilla/security/nss/lib/freebl/ret_cr16.s
similarity index 100%
rename from mozilla/security/nss/lib/util/ret_cr16.s
rename to mozilla/security/nss/lib/freebl/ret_cr16.s
diff --git a/mozilla/security/nss/lib/util/Makefile b/mozilla/security/nss/lib/util/Makefile
index 97dfe0d7afb..afe353d31c9 100644
--- a/mozilla/security/nss/lib/util/Makefile
+++ b/mozilla/security/nss/lib/util/Makefile
@@ -50,12 +50,6 @@ include manifest.mn
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
-ifeq ($(OS_TARGET),HP-UX)
-ifneq ($(OS_TEST),ia64)
-	ASFILES += ret_cr16.s
-endif
-endif
-
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################