diff --git a/advancecomp-1.14-64bit.patch b/advancecomp-1.14-64bit.patch
new file mode 100644
index 0000000..3f1ccfa
--- /dev/null
+++ b/advancecomp-1.14-64bit.patch
@@ -0,0 +1,27 @@
+diff -Naupr advancecomp-1.14.orig/7z/Portable.h advancecomp-1.14/7z/Portable.h
+--- advancecomp-1.14.orig/7z/Portable.h	2003-02-10 20:25:16.000000000 +0100
++++ advancecomp-1.14/7z/Portable.h	2005-05-27 10:24:22.000000000 +0200
+@@ -2,6 +2,7 @@
+ #define __PORTABLE_H
+ 
+ #include <string.h>
++#include <stdint.h>
+ 
+ typedef signed char INT8;
+ typedef unsigned char UINT8;
+@@ -12,11 +13,11 @@ typedef unsigned long UINT32;
+ typedef long long INT64;
+ typedef unsigned long long UINT64;
+ 
+-typedef UINT8 BYTE;
+-typedef UINT16 WORD;
+-typedef UINT32 DWORD;
++typedef uint8_t BYTE;
++typedef uint16_t WORD;
++typedef uint32_t DWORD;
+ 
+-typedef unsigned UINT_PTR;
++typedef uintptr_t UINT_PTR;
+ 
+ typedef int BOOL;
+ #define FALSE 0
diff --git a/advancecomp-64bit.patch b/advancecomp-64bit.patch
deleted file mode 100644
index 65728e0..0000000
--- a/advancecomp-64bit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- advancecomp-1.14/7z/Portable.h.64bit	2005-05-26 11:02:30.000000000 -0400
-+++ advancecomp-1.14/7z/Portable.h	2005-05-26 10:50:22.000000000 -0400
-@@ -16,7 +16,11 @@
- typedef UINT16 WORD;
- typedef UINT32 DWORD;
- 
--typedef unsigned UINT_PTR;
-+#if defined(__x86_64__) || defined(__s390x__) || defined(__ppc64__) || defined(__ia64__) || defined(__sparc64__) || defined(__alpha__)
-+typedef unsigned long UINT_PTR;
-+#else
-+typedef unsigned int UINT_PTR;
-+#endif
- 
- typedef int BOOL;
- #define FALSE 0
diff --git a/advancecomp.spec b/advancecomp.spec
index 954f26d..1508354 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -1,12 +1,12 @@
 Summary: Recompression utilities for .PNG, .MNG and .ZIP files
 Name: advancecomp
 Version: 1.14
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/Emulators
 URL: http://advancemame.sourceforge.net/
 Source: http://dl.sf.net/advancemame/advancecomp-%{version}.tar.gz
-Patch0: advancecomp-64bit.patch
+Patch0: advancecomp-1.14-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc-c++, zlib-devel
 
@@ -44,6 +44,9 @@ The main features are :
 
 
 %changelog
+* Fri May 27 2005 Matthias Saou <http://freshrpms.net/> 1.14-5
+- Update 64bit patch to a cleaner approach as Ralf suggested.
+
 * Thu May 26 2005 Jeremy Katz <katzj@redhat.com> - 1.14-4
 - fix build on 64bit arches