diff --git a/src/lib/synergy/ArgParser.cpp b/src/lib/synergy/ArgParser.cpp
index 11adc2d5..d16a6fa9 100644
--- a/src/lib/synergy/ArgParser.cpp
+++ b/src/lib/synergy/ArgParser.cpp
@@ -70,6 +70,9 @@ ArgParser::parseServerArgs(ServerArgs& args, int argc, const char* const* argv)
 		else if (isArg(i, argc, argv, "", "--prm-hc", 1)) {
 			DpiHelper::s_primaryHeightCenter = synergy::string::stringToSizeType(argv[++i]);
 		}
+		else if (isArg(i, argc, argv, "", "--serial-key", 1)) {
+			args.m_serial = argv[++i];
+		}
 		else {
 			LOG((CLOG_PRINT "%s: unrecognized option `%s'" BYE, args.m_pname, argv[i], args.m_pname));
 			return false;
diff --git a/src/lib/synergy/ServerArgs.cpp b/src/lib/synergy/ServerArgs.cpp
index f56f6e8d..52166f2a 100644
--- a/src/lib/synergy/ServerArgs.cpp
+++ b/src/lib/synergy/ServerArgs.cpp
@@ -19,6 +19,7 @@
 
 ServerArgs::ServerArgs() :
 	m_configFile(),
+	m_serial(),
 	m_config(NULL)
 {
 }
diff --git a/src/lib/synergy/ServerArgs.h b/src/lib/synergy/ServerArgs.h
index 54310f8e..7c69fae6 100644
--- a/src/lib/synergy/ServerArgs.h
+++ b/src/lib/synergy/ServerArgs.h
@@ -28,5 +28,6 @@ public:
 
 public:
 	String				m_configFile;
+	String				m_serial;
 	Config*				m_config;
 };