diff --git a/common/servertalk.h b/common/servertalk.h
index 97221b107..26450d872 100644
--- a/common/servertalk.h
+++ b/common/servertalk.h
@@ -1,8 +1,6 @@
 #ifndef EQ_SOPCODES_H
 #define EQ_SOPCODES_H
 
-#define EQEMU_PROTOCOL_VERSION	"0.3.10"
-
 #include "../common/types.h"
 #include "../common/packet_functions.h"
 #include "../common/eq_packet_structs.h"
diff --git a/common/version.h b/common/version.h
index 0ac48f56d..531064665 100644
--- a/common/version.h
+++ b/common/version.h
@@ -1,5 +1,5 @@
 /*  EQEMu:  Everquest Server Emulator
-    Copyright (C) 2001-2002  EQEMu Development Team (http://eqemu.org)
+    Copyright (C) 2001-2013  EQEMu Development Team (http://eqemulator.net)
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,16 +16,15 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef VERSION_H
-#define VERSION_H
+#ifndef _EQEMU_VERSION_H
+#define _EQEMU_VERSION_H
 
-#define CURRENT_VERSION	        "0.8.0"
-#define CURRENT_CHAT_VERSION    "EQEmulator " CURRENT_VERSION
-#define CURRENT_ZONE_VERSION	"EQEmulator " CURRENT_VERSION
-#define CURRENT_WORLD_VERSION   "EQEmulator " CURRENT_VERSION
+#define LOGIN_VERSION "0.8.0"
+#define EQEMU_PROTOCOL_VERSION "0.3.10"
+
+#define CURRENT_VERSION "1.0.0"
 #define COMPILE_DATE	__DATE__
 #define COMPILE_TIME	__TIME__
-#define	SVN_REVISION		"$Rev: 986 $"
 #ifndef WIN32
 	#define LAST_MODIFIED	__TIME__
 #else
diff --git a/world/LoginServer.cpp b/world/LoginServer.cpp
index 6d8e61752..bb1c671da 100644
--- a/world/LoginServer.cpp
+++ b/world/LoginServer.cpp
@@ -268,7 +268,7 @@ void LoginServer::SendInfo() {
 	memset(pack->pBuffer, 0, pack->size);
 	ServerLSInfo_Struct* lsi = (ServerLSInfo_Struct*) pack->pBuffer;
 	strcpy(lsi->protocolversion, EQEMU_PROTOCOL_VERSION);
-	strcpy(lsi->serverversion, CURRENT_VERSION);
+	strcpy(lsi->serverversion, LOGIN_VERSION);
 	strcpy(lsi->name, Config->LongName.c_str());
 	strcpy(lsi->account, LoginAccount);
 	strcpy(lsi->password, LoginPassword);
@@ -288,7 +288,7 @@ void LoginServer::SendNewInfo() {
 	memset(pack->pBuffer, 0, pack->size);
 	ServerNewLSInfo_Struct* lsi = (ServerNewLSInfo_Struct*) pack->pBuffer;
 	strcpy(lsi->protocolversion, EQEMU_PROTOCOL_VERSION);
-	strcpy(lsi->serverversion, CURRENT_VERSION);
+	strcpy(lsi->serverversion, LOGIN_VERSION);
 	strcpy(lsi->name, Config->LongName.c_str());
 	strcpy(lsi->shortname, Config->ShortName.c_str());
 	strcpy(lsi->account, LoginAccount);
diff --git a/world/console.cpp b/world/console.cpp
index a1b12aec6..20a7438d9 100644
--- a/world/console.cpp
+++ b/world/console.cpp
@@ -749,7 +749,7 @@ void Console::ProcessCommand(const char* command) {
 			}
 			else if (strcasecmp(sep.arg[0], "version") == 0 && admin >= consoleWorldStatus) {
 				SendMessage(1, "Current version information.");
-				SendMessage(1, "  %s", CURRENT_WORLD_VERSION);
+				SendMessage(1, "  %s", CURRENT_VERSION);
 				SendMessage(1, "  Compiled on: %s at %s", COMPILE_DATE, COMPILE_TIME);
 				SendMessage(1, "  Last modified on: %s", LAST_MODIFIED);
 			}
diff --git a/world/net.cpp b/world/net.cpp
index 3ca7490bb..0da9807e0 100644
--- a/world/net.cpp
+++ b/world/net.cpp
@@ -144,7 +144,7 @@ int main(int argc, char** argv) {
 		_log(WORLD__INIT, "Log settings loaded from %s", Config->LogSettingsFile.c_str());
 
 
-	_log(WORLD__INIT, "CURRENT_WORLD_VERSION:%s", CURRENT_WORLD_VERSION);
+	_log(WORLD__INIT, "CURRENT_VERSION: %s", CURRENT_VERSION);
 	
 	#ifdef _DEBUG
 		_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
diff --git a/zone/aggro.cpp b/zone/aggro.cpp
index d7548b705..700c98ffd 100644
--- a/zone/aggro.cpp
+++ b/zone/aggro.cpp
@@ -1422,15 +1422,13 @@ void Mob::RemoveFromFeignMemory(Client* attacker) {
 }
 
 void Mob::ClearFeignMemory() {
-    std::set<uint32>::iterator RememberedCharID;
-    RememberedCharID = feign_memory_list.begin();
-
+    std::set<uint32>::iterator RememberedCharID = feign_memory_list.begin();
     while (RememberedCharID != feign_memory_list.end()) 
     {
         Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID);
         if(remember_client != NULL) //Still in zone
             remember_client->RemoveXTarget(this, false);
-        RememberedCharID++;
+        ++RememberedCharID;
     }
 
 	feign_memory_list.clear();
diff --git a/zone/command.cpp b/zone/command.cpp
index aa07c28d1..483f00dc3 100644
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -943,7 +943,7 @@ void command_help(Client *c, const Seperator *sep)
 void command_version(Client *c, const Seperator *sep)
 {
 	c->Message(0, "Current version information.");
-	c->Message(0, "	%s", CURRENT_ZONE_VERSION);
+	c->Message(0, "	%s", CURRENT_VERSION);
 	c->Message(0, "	Compiled on: %s at %s", COMPILE_DATE, COMPILE_TIME);
 	c->Message(0, "	Last modified on: %s", LAST_MODIFIED);
 }
diff --git a/zone/net.cpp b/zone/net.cpp
index b1832f48b..56264832d 100644
--- a/zone/net.cpp
+++ b/zone/net.cpp
@@ -229,7 +229,7 @@ int main(int argc, char** argv) {
 //	_crtBreakAlloc = 2025;
 #endif
 	
-	_log(ZONE__INIT, "CURRENT_ZONE_VERSION: %s", CURRENT_ZONE_VERSION);
+	_log(ZONE__INIT, "CURRENT_VERSION: %s", CURRENT_VERSION);
 	
 	/*
 	 * Setup nice signal handlers