diff --git a/chmlib-chm_lib-fix_for_multiarch.diff b/chmlib-chm_lib-fix_for_multiarch.diff
new file mode 100644
index 0000000..1cd4186
--- /dev/null
+++ b/chmlib-chm_lib-fix_for_multiarch.diff
@@ -0,0 +1,46 @@
+--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
++++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
+@@ -148,35 +148,15 @@
+ typedef unsigned __int32        UInt32;
+ typedef __int64                 Int64;
+ typedef unsigned __int64        UInt64;
+-
+-/* I386, 32-bit, non-Windows */
+-/* Sparc        */
+-/* MIPS         */
+-/* PPC          */
+-#elif __i386__ || __sun || __sgi || __ppc__
+-typedef unsigned char           UChar;
+-typedef short                   Int16;
+-typedef unsigned short          UInt16;
+-typedef long                    Int32;
+-typedef unsigned long           UInt32;
+-typedef long long               Int64;
+-typedef unsigned long long      UInt64;
+-
+-/* x86-64 */
+-/* Note that these may be appropriate for other 64-bit machines. */
+-#elif __x86_64__ || __ia64__
+-typedef unsigned char           UChar;
+-typedef short                   Int16;
+-typedef unsigned short          UInt16;
+-typedef int                     Int32;
+-typedef unsigned int            UInt32;
+-typedef long                    Int64;
+-typedef unsigned long           UInt64;
+-
+ #else
+-
+-/* yielding an error is preferable to yielding incorrect behavior */
+-#error "Please define the sized types for your platform in chm_lib.c"
++#include <stdint.h>
++typedef uint8_t UChar;
++typedef int16_t Int16;
++typedef uint16_t UInt16;
++typedef int32_t Int32;
++typedef uint32_t UInt32;
++typedef int64_t Int64;
++typedef uint64_t UInt64;
+ #endif
+ 
+ /* GCC */
diff --git a/chmlib-chm_lib_c-ppc-patch.diff b/chmlib-chm_lib_c-ppc-patch.diff
deleted file mode 100644
index 1bf1eb3..0000000
--- a/chmlib-chm_lib_c-ppc-patch.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/chm_lib.c	2005-10-26 16:17:50.000000000 +0400
-+++ src/chm_lib.c	2006-01-09 17:12:12.000000000 +0300
-@@ -160,7 +160,7 @@
- /* Sparc        */
- /* MIPS         */
- /* PPC          */
--#elif __i386__ || __sun || __sgi || __ppc__
-+#elif __i386__ || __sun || __sgi || __ppc__ || __powerpc__
- typedef unsigned char           UChar;
- typedef short                   Int16;
- typedef unsigned short          UInt16;