diff --git a/dlls/geoip/GeoIP.h b/dlls/geoip/GeoIP.h
index 06211df4..a46fca1e 100755
--- a/dlls/geoip/GeoIP.h
+++ b/dlls/geoip/GeoIP.h
@@ -25,6 +25,19 @@
 extern "C" {
 #endif
 
+#ifdef _MSC_VER
+	#if _MSC_VER >= 1400
+		/* Disable deprecation warnings concerning unsafe CRT functions */
+		#define _CRT_SECURE_NO_DEPRECATE
+
+		/* Replace the POSIX function with ISO C++ conformant one as it is now deprecated */
+		#define fileno _fileno
+
+		/* Disable deprecation warnings because MSVC8 seemingly thinks ISO C++ conformant functions are deprecated. */
+		#pragma warning (disable : 4996)
+	#endif
+#endif
+
 #include<stdio.h>
 #include<stdlib.h>
 #include<string.h>
diff --git a/dlls/geoip/msvc8/geoip.vcproj b/dlls/geoip/msvc8/geoip.vcproj
index a08e8bbb..14fed890 100644
--- a/dlls/geoip/msvc8/geoip.vcproj
+++ b/dlls/geoip/msvc8/geoip.vcproj
@@ -209,11 +209,11 @@
 				Name="GeoIP"
 				>
 				<File
-					RelativePath="..\geolib\libGeoIP\GeoIP.c"
+					RelativePath="..\GeoIP.c"
 					>
 				</File>
 				<File
-					RelativePath="..\geolib\libGeoIP\GeoIP.h"
+					RelativePath="..\GeoIP.h"
 					>
 				</File>
 			</Filter>