diff --git a/dlls/geoip/AMBuilder b/dlls/geoip/AMBuilder
index cd3ce025..66ddee96 100644
--- a/dlls/geoip/AMBuilder
+++ b/dlls/geoip/AMBuilder
@@ -3,9 +3,12 @@ import os.path
 
 binary = AMXX.Module(builder, 'geoip')
 
+binary.compiler.defines += ['HAVE_STDINT_H']
+binary.compiler.includes += [os.path.join(builder.sourcePath, 'dlls', 'geoip', 'GeoIP2')]
+
 binary.sources = [
   'sdk/amxxmodule.cpp',
-  'GeoIP.c',
+  'GeoIP2/maxminddb.cpp',
   'geoip_amxx.cpp',
 ]
 
diff --git a/dlls/geoip/msvc10/geoip.vcxproj b/dlls/geoip/msvc10/geoip.vcxproj
index cc5e5fe3..fbfe39ff 100644
--- a/dlls/geoip/msvc10/geoip.vcxproj
+++ b/dlls/geoip/msvc10/geoip.vcxproj
@@ -52,8 +52,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\;..\sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\;..\sdk;..\GeoIP2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -75,8 +75,8 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\;..\sdk;..\GeoIP2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <PrecompiledHeader>
@@ -95,14 +95,16 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\GeoIP2\maxminddb.cpp" />
     <ClCompile Include="..\geoip_amxx.cpp" />
-    <ClCompile Include="..\GeoIP.c" />
     <ClCompile Include="..\sdk\amxxmodule.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\GeoIP2\maxminddb-compat-util.h" />
+    <ClInclude Include="..\GeoIP2\maxminddb.h" />
+    <ClInclude Include="..\GeoIP2\maxminddb_config.h" />
     <ClInclude Include="..\geoip_amxx.h" />
     <ClInclude Include="..\svn_version.h" />
-    <ClInclude Include="..\GeoIP.h" />
     <ClInclude Include="..\sdk\moduleconfig.h" />
     <ClInclude Include="..\sdk\amxxmodule.h" />
   </ItemGroup>
diff --git a/dlls/geoip/msvc10/geoip.vcxproj.filters b/dlls/geoip/msvc10/geoip.vcxproj.filters
index 514bdb69..be52e3c7 100644
--- a/dlls/geoip/msvc10/geoip.vcxproj.filters
+++ b/dlls/geoip/msvc10/geoip.vcxproj.filters
@@ -9,9 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="GeoIP">
-      <UniqueIdentifier>{2df41d4d-d80c-4557-88e6-0a8e902154d5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Module SDK">
       <UniqueIdentifier>{a6d73610-c960-4557-87c5-2d1b137ed3b3}</UniqueIdentifier>
     </Filter>
@@ -21,17 +18,20 @@
     <Filter Include="Pawn Includes">
       <UniqueIdentifier>{f31e7815-11bd-4a86-899e-43f85dfdc067}</UniqueIdentifier>
     </Filter>
+    <Filter Include="GeoIP2">
+      <UniqueIdentifier>{0bd4b9fb-f847-4fe5-af3e-9000fc854c5c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\geoip_amxx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\GeoIP.c">
-      <Filter>GeoIP</Filter>
-    </ClCompile>
     <ClCompile Include="..\sdk\amxxmodule.cpp">
       <Filter>Module SDK\SDK Base</Filter>
     </ClCompile>
+    <ClCompile Include="..\GeoIP2\maxminddb.cpp">
+      <Filter>GeoIP2</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\geoip_amxx.h">
@@ -40,15 +40,21 @@
     <ClInclude Include="..\svn_version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\GeoIP.h">
-      <Filter>GeoIP</Filter>
-    </ClInclude>
     <ClInclude Include="..\sdk\moduleconfig.h">
       <Filter>Module SDK</Filter>
     </ClInclude>
     <ClInclude Include="..\sdk\amxxmodule.h">
       <Filter>Module SDK\SDK Base</Filter>
     </ClInclude>
+    <ClInclude Include="..\GeoIP2\maxminddb.h">
+      <Filter>GeoIP2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GeoIP2\maxminddb_config.h">
+      <Filter>GeoIP2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\GeoIP2\maxminddb-compat-util.h">
+      <Filter>GeoIP2</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\plugins\include\geoip.inc">