diff --git a/env_universal_common.cpp b/env_universal_common.cpp
index f90cc82bf..b493de210 100644
--- a/env_universal_common.cpp
+++ b/env_universal_common.cpp
@@ -698,7 +698,7 @@ bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd)
     */
     int result_fd = -1;
     bool needs_lock = true;
-    int flags = O_RDONLY | O_CREAT;
+    int flags = O_RDWR | O_CREAT;
 #ifdef O_EXLOCK
     flags |= O_EXLOCK;
     needs_lock = false;
@@ -741,8 +741,7 @@ bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd)
                 /* error */
                 if (errno != EINTR)
                 {
-                    int err = errno;
-                    report_error(err, L"Unable to lock universal variable file '%ls'", path.c_str());
+                    /* Do nothing per #2149 */
                     break;
                 }
             }
diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj
index dd4f7262a..94b191ecb 100644
--- a/fish.xcodeproj/project.pbxproj
+++ b/fish.xcodeproj/project.pbxproj
@@ -1325,7 +1325,7 @@
 					"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
 					"BINDIR=L\\\"/usr/local/bin\\\"",
 					"DOCDIR=L\\\"/usr/local/share/doc\\\"",
-					"FISH_BUILD_VERSION=\\\"2.2b1-git\\\"",
+					"FISH_BUILD_VERSION=\\\"2.2.0-git\\\"",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1453,7 +1453,7 @@
 					"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
 					"BINDIR=L\\\"/usr/local/bin\\\"",
 					"DOCDIR=L\\\"/usr/local/share/doc\\\"",
-					"FISH_BUILD_VERSION=\\\"2.2b1-git\\\"",
+					"FISH_BUILD_VERSION=\\\"2.2.0-git\\\"",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1481,7 +1481,7 @@
 					"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
 					"BINDIR=L\\\"/usr/local/bin\\\"",
 					"DOCDIR=L\\\"/usr/local/share/doc\\\"",
-					"FISH_BUILD_VERSION=\\\"2.2b1-git\\\"",
+					"FISH_BUILD_VERSION=\\\"2.2.0-git\\\"",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
diff --git a/osx/config.h b/osx/config.h
index 5a8e6b263..2d3ef3eb3 100644
--- a/osx/config.h
+++ b/osx/config.h
@@ -222,7 +222,7 @@
 #define PACKAGE_NAME "fish"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fish 2.2b1-git"
+#define PACKAGE_STRING "fish 2.2.0-git"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "fish"
@@ -231,7 +231,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.2b1-git"
+#define PACKAGE_VERSION "2.2.0-git"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1