diff --git a/src/main.c b/src/main.c
index 686fb14..277e317 100644
--- a/src/main.c
+++ b/src/main.c
@@ -162,10 +162,11 @@
 	}
 #endif
 #ifdef MSWIN
-    // Need to find "-register" before loading any libraries.
+    // Need to find "-register" and "-unregister" before loading any libraries.
     for (i = 1; i < argc; ++i)
-	if (STRICMP(argv[i] + 1, "register") == 0
-				   && (argv[i][0] == '-' || argv[i][0] == '/'))
+	if ((STRICMP(argv[i] + 1, "register") == 0
+				    || STRICMP(argv[i] + 1, "unregister") == 0)
+		&& (argv[i][0] == '-' || argv[i][0] == '/'))
 	{
 	    found_register_arg = TRUE;
 	    break;
diff --git a/src/version.c b/src/version.c
index 8140e20..acf0e73 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2822,
+/**/
     2821,
 /**/
     2820,