diff --git a/nsprpub/.arcconfig b/nsprpub/.arcconfig
new file mode 100644
index 000000000000..9b4b448d97a8
--- /dev/null
+++ b/nsprpub/.arcconfig
@@ -0,0 +1,5 @@
+{
+  "phabricator.uri" : "https://phabricator.services.mozilla.com/",
+  "repository.callsign": "NSPR",
+  "history.immutable": false
+}
diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
index ff81d57202c6..36bafdfa3e53 100644
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_22_BETA1
+NSPR_4_22_RTM
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
index e49e92677e3e..6c66b37ca0fc 100644
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+
diff --git a/nsprpub/config/rules.mk b/nsprpub/config/rules.mk
index 1c8fdc9b8edf..84dff5617941 100644
--- a/nsprpub/config/rules.mk
+++ b/nsprpub/config/rules.mk
@@ -280,10 +280,13 @@ ifdef ENABLE_STRIP
 	$(STRIP) $@
 endif
 
-$(LIBRARY): $(OBJS)
+# Same as OBJS, but without any file that matches p*vrsion.o, since these
+# collide for static libraries, and are not useful for that case anyway.
+STATICLIB_OBJS = $(filter-out $(OBJDIR)/p%vrsion.$(OBJ_SUFFIX),$(OBJS))
+$(LIBRARY): $(STATICLIB_OBJS)
 	@$(MAKE_OBJDIR)
 	rm -f $@
-	$(AR) $(AR_FLAGS) $(OBJS) $(AR_EXTRA_ARGS)
+	$(AR) $(AR_FLAGS) $(STATICLIB_OBJS) $(AR_EXTRA_ARGS)
 	$(RANLIB) $@
 
 ifeq ($(OS_TARGET), OS2)
diff --git a/nsprpub/pr/include/prinit.h b/nsprpub/pr/include/prinit.h
index 09e0ac48b6e4..64a7ef1282f3 100644
--- a/nsprpub/pr/include/prinit.h
+++ b/nsprpub/pr/include/prinit.h
@@ -31,11 +31,11 @@ PR_BEGIN_EXTERN_C
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.22 Beta"
+#define PR_VERSION  "4.22"
 #define PR_VMAJOR   4
 #define PR_VMINOR   22
 #define PR_VPATCH   0
-#define PR_BETA     PR_TRUE
+#define PR_BETA     PR_FALSE
 
 /*
 ** PRVersionCheck