diff -Naur lzop-1.01.orgi/configure.ac lzop-1.01/configure.ac
--- lzop-1.01.orgi/configure.ac	2005-09-11 23:56:31.000000000 +0200
+++ lzop-1.01/configure.ac	2005-09-11 23:56:46.000000000 +0200
@@ -65,12 +65,12 @@
 # // Checks for LZO library
 # ************************************************************************/
 
-AC_CHECK_HEADERS(lzoconf.h lzo1x.h,,AC_MSG_ERROR([LZO header file not found. Please check your installation or set the environment variable \`CPPFLAGS'.]))
+AC_CHECK_HEADERS(lzo/lzoconf.h lzo/lzo1x.h,,AC_MSG_ERROR([LZO header file not found. Please check your installation or set the environment variable \`CPPFLAGS'.]))
 
-AC_CHECK_LIB(lzo,__lzo_init2,,AC_MSG_ERROR([LZO library not found. Please check your installation or set the environment variable \`LDFLAGS'.]))
+AC_CHECK_LIB(lzo2,__lzo_init_v2,,AC_MSG_ERROR([LZO library not found. Please check your installation or set the environment variable \`LDFLAGS'.]))
 
-AC_CHECK_LIB(lzo,lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_1,1,[Use asm.]))
-AC_CHECK_LIB(lzo,_lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_2,1,[Use asm.]))
+AC_CHECK_LIB(lzo2,lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_1,1,[Use asm.]))
+AC_CHECK_LIB(lzo2,_lzo1x_decompress_asm_fast,AC_DEFINE(LZO_USE_ASM_2,1,[Use asm.]))
 
 
 # /***********************************************************************
diff -Naur lzop-1.01.orgi/src/conf.h lzop-1.01/src/conf.h
--- lzop-1.01.orgi/src/conf.h	2005-09-11 23:56:31.000000000 +0200
+++ lzop-1.01/src/conf.h	2005-09-11 23:56:59.000000000 +0200
@@ -34,13 +34,14 @@
 #endif
 
 #define WITH_LZO
-#include <lzoconf.h>
+#include <lzo/lzoconf.h>
 #if !defined(LZO_VERSION)
 #  error "you need the LZO library"
 #elif (LZO_VERSION < 0x1040)
 #  error "please upgrade your LZO package"
 #elif (LZO_VERSION >= 0x1080)
-#  include <lzoutil.h>
+#else
+#  include <lzo/lzoutil.h>
 #endif
 
 /* workaround a cpp bug under hpux 10.20 */
@@ -73,8 +74,8 @@
 #  define USE_MALLOC
 #  undef malloc
 #  undef free
-#  define malloc        lzo_malloc
-#  define free          lzo_free
+//#  define malloc        lzo_malloc
+//#  define free          lzo_free
 #else
 #  error
 #endif
@@ -682,7 +683,7 @@
 
 #if defined(WITH_LZO)
 
-#include <lzo1x.h>
+#include <lzo/lzo1x.h>
 
 #define USE_LZO1X_1
 #if !defined(LZO_999_UNSUPPORTED)
@@ -693,6 +694,7 @@
 #endif
 
 #if defined(LZO_USE_ASM_1)
+#define LZO_EXTERN_CDECL LZO_EXTERN
 LZO_EXTERN_CDECL(int)
 lzo1x_decompress_asm_fast
                         ( const lzo_byte *src, lzo_uint  src_len,