diff --git a/TitanEngine/TitanEngine.Static.cpp b/TitanEngine/TitanEngine.Static.cpp
index a691c8f..a98fd3f 100644
--- a/TitanEngine/TitanEngine.Static.cpp
+++ b/TitanEngine/TitanEngine.Static.cpp
@@ -416,7 +416,6 @@ __declspec(dllexport) bool TITCALL StaticMemoryDecompress(void* Source, DWORD So
 
     if(Algorithm == UE_STATIC_APLIB)
     {
-#if !defined (_WIN64)
         if(aP_depack_asm_safe(Source, SourceSize, Destination, DestinationSize) != APLIB_ERROR)
         {
             return true;
@@ -425,7 +424,6 @@ __declspec(dllexport) bool TITCALL StaticMemoryDecompress(void* Source, DWORD So
         {
             return true;
         }
-#endif
     }
     else if(Algorithm == UE_STATIC_LZMA)
     {
diff --git a/TitanEngine/aplib.h b/TitanEngine/aplib.h
index 97fee44..4a4341a 100644
--- a/TitanEngine/aplib.h
+++ b/TitanEngine/aplib.h
@@ -1,9 +1,9 @@
 /*
  * aPLib compression library  -  the smaller the better :)
  *
- * MS COFF format header file
+ * COFF format header file
  *
- * Copyright (c) 1998-2005 by Joergen Ibsen / Jibz
+ * Copyright (c) 1998-2014 Joergen Ibsen
  * All Rights Reserved
  *
  * http://www.ibsensoftware.com/
@@ -11,50 +11,57 @@
 
 #ifndef APLIB_H_INCLUDED
 #define APLIB_H_INCLUDED
-#pragma comment(lib, "aplib.lib")
+
+#ifdef _WIN64
+#pragma comment(lib,"aplib_x64.lib")
+#define APLIB_CONVENTION
+#else
+#pragma comment(lib,"aplib_x86.lib")
+#define APLIB_CONVENTION __cdecl
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifndef APLIB_ERROR
-# define APLIB_ERROR (-1)
+# define APLIB_ERROR ((unsigned int) (-1))
 #endif
 
-unsigned int __cdecl aP_pack(const void *source,
+unsigned int APLIB_CONVENTION aP_pack(const void *source,
                              void *destination,
                              unsigned int length,
                              void *workmem,
                              int (__cdecl *callback)(unsigned int, unsigned int, unsigned int, void *),
                              void *cbparam);
 
-unsigned int __cdecl aP_workmem_size(unsigned int inputsize);
+unsigned int APLIB_CONVENTION aP_workmem_size(unsigned int inputsize);
 
-unsigned int __cdecl aP_max_packed_size(unsigned int inputsize);
+unsigned int APLIB_CONVENTION aP_max_packed_size(unsigned int inputsize);
 
-unsigned int __cdecl aP_depack_asm(const void *source, void *destination);
+unsigned int APLIB_CONVENTION aP_depack_asm(const void *source, void *destination);
 
-unsigned int __cdecl aP_depack_asm_fast(const void *source, void *destination);
+unsigned int APLIB_CONVENTION aP_depack_asm_fast(const void *source, void *destination);
 
-unsigned int __cdecl aP_depack_asm_safe(const void *source,
+unsigned int APLIB_CONVENTION aP_depack_asm_safe(const void *source,
                                         unsigned int srclen,
                                         void *destination,
                                         unsigned int dstlen);
 
-unsigned int __cdecl aP_crc32(const void *source, unsigned int length);
+unsigned int APLIB_CONVENTION aP_crc32(const void *source, unsigned int length);
 
-unsigned int __cdecl aPsafe_pack(const void *source,
+unsigned int APLIB_CONVENTION aPsafe_pack(const void *source,
                                  void *destination,
                                  unsigned int length,
                                  void *workmem,
                                  int (__cdecl *callback)(unsigned int, unsigned int, unsigned int, void *),
                                  void *cbparam);
 
-unsigned int __cdecl aPsafe_check(const void *source);
+unsigned int APLIB_CONVENTION aPsafe_check(const void *source);
 
-unsigned int __cdecl aPsafe_get_orig_size(const void *source);
+unsigned int APLIB_CONVENTION aPsafe_get_orig_size(const void *source);
 
-unsigned int __cdecl aPsafe_depack(const void *source,
+unsigned int APLIB_CONVENTION aPsafe_depack(const void *source,
                                    unsigned int srclen,
                                    void *destination,
                                    unsigned int dstlen);
diff --git a/TitanEngine/aplib.lib b/TitanEngine/aplib.lib
deleted file mode 100644
index ddbb11a..0000000
Binary files a/TitanEngine/aplib.lib and /dev/null differ
diff --git a/TitanEngine/aplib_x64.lib b/TitanEngine/aplib_x64.lib
new file mode 100644
index 0000000..8bf6695
Binary files /dev/null and b/TitanEngine/aplib_x64.lib differ
diff --git a/TitanEngine/aplib_x86.lib b/TitanEngine/aplib_x86.lib
new file mode 100644
index 0000000..3f3d1e5
Binary files /dev/null and b/TitanEngine/aplib_x86.lib differ
diff --git a/TitanEngine/stdafx.h b/TitanEngine/stdafx.h
index 1cad587..ec083ec 100644
--- a/TitanEngine/stdafx.h
+++ b/TitanEngine/stdafx.h
@@ -14,9 +14,8 @@
 #include <windows.h>
 #include <Winternl.h>
 
-#if !defined(_WIN64)
+
 #include "aplib.h"
-#endif
 #include "LzmaDec.h"
 
 #define STATUS_SUCCESS ((NTSTATUS)0x00000000L) // ntsubauth