cvar master attempt

diff --git a/src/engine/qcommon/gameinfo.cpp b/src/engine/qcommon/gameinfo.cpp
index 1bdf5bc52..5cb911aaf 100644
--- a/src/engine/qcommon/gameinfo.cpp
+++ b/src/engine/qcommon/gameinfo.cpp
@@ -26,9 +26,9 @@ along with Daemon Source Code.  If not, see <http://www.gnu.org/licenses/>.
 #include <string>

 #include "gameinfo.h"
+#include "qcommon/cvar.h"
 #include "common/FileSystem.h"

-
 Gameinfo& Gameinfo::getInstance()
 {
    static Gameinfo instance;
@@ -70,23 +70,28 @@ void Gameinfo::parse(std::string fname)
        }
        else if(argvec[i] == "MASTERSERVER1")
        {
-           _masterserver1 = argvec[i+1];
+           // _masterserver1 = argvec[i+1];
+           Cvar_Set( "sv_master1", argvec[i+1].c_str() );
        }
        else if(argvec[i] == "MASTERSERVER2")
        {
-           _masterserver2 = argvec[i+1];
+           // _masterserver2 = argvec[i+1];
+           Cvar_Set( "sv_master2", argvec[i+1].c_str() );
        }
        else if(argvec[i] == "MASTERSERVER3")
        {
-           _masterserver3 = argvec[i+1];
+           // _masterserver3 = argvec[i+1];
+           Cvar_Set( "sv_master3", argvec[i+1].c_str() );
        }
        else if(argvec[i] == "MASTERSERVER4")
        {
-           _masterserver4 = argvec[i+1];
+           // _masterserver4 = argvec[i+1];
+           Cvar_Set( "sv_master4", argvec[i+1].c_str() );
        }
        else if(argvec[i] == "MASTERSERVER5")
        {
-           _masterserver5 = argvec[i+1];
+           // _masterserver5 = argvec[i+1];
+           Cvar_Set( "sv_master5", argvec[i+1].c_str() );
        }
        else if(argvec[i] == "WWWBASEURL")
        {
diff --git a/src/engine/server/sv_main.cpp b/src/engine/server/sv_main.cpp
index bab3e586d..e3af1d591 100644
--- a/src/engine/server/sv_main.cpp
+++ b/src/engine/server/sv_main.cpp
@@ -288,8 +288,8 @@ struct MasterServer
    sv_master[ 3 ] = Cvar_Get( "sv_master4", Gameinfo::getInstance().masterserver4().c_str(), 0 );
    sv_master[ 4 ] = Cvar_Get( "sv_master5", Gameinfo::getInstance().masterserver5().c_str(), 0 );
 */
-#define MASTER1_SERVER_NAME "master.unvanquished.net"
-#define MASTER2_SERVER_NAME "master2.unvanquished.net"
+#define MASTER1_SERVER_NAME "" //"master.unvanquished.net"
+#define MASTER2_SERVER_NAME "" //"master2.unvanquished.net"
 #define MASTER3_SERVER_NAME ""
 #define MASTER4_SERVER_NAME ""
 #define MASTER5_SERVER_NAME ""