diff --git a/libvncclient/Makefile.am b/libvncclient/Makefile.am
index bc2420b..c056088 100644
--- a/libvncclient/Makefile.am
+++ b/libvncclient/Makefile.am
@@ -13,8 +13,8 @@ endif
 endif
 
 
-libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c ../common/minilzo.c $(TLSSRCS)
-libvncclient_la_LIBADD=$(TLSLIBS)
+libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c $(TLSSRCS)
+libvncclient_la_LIBADD=$(TLSLIBS) -lminilzo
 
 noinst_HEADERS=../common/lzodefs.h ../common/lzoconf.h ../common/minilzo.h tls.h
 
diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c
index 4ff1d3b..c633a88 100644
--- a/libvncclient/rfbproto.c
+++ b/libvncclient/rfbproto.c
@@ -66,7 +66,7 @@
 #include <gcrypt.h>
 #endif
 
-#include "minilzo.h"
+#include <lzo/minilzo.h>
 #include "tls.h"
 
 #ifdef _MSC_VER
diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am
index e25784b..5a669ea 100644
--- a/libvncserver/Makefile.am
+++ b/libvncserver/Makefile.am
@@ -53,11 +53,11 @@ endif
 LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c $(WEBSOCKETSSRCS) \
 	stats.c corre.c hextile.c rre.c translate.c cutpaste.c \
 	httpd.c cursor.c font.c \
-	draw.c selbox.c ../common/d3des.c ../common/vncauth.c cargs.c ../common/minilzo.c ultra.c scale.c \
+	draw.c selbox.c ../common/d3des.c ../common/vncauth.c cargs.c ultra.c scale.c \
 	$(ZLIBSRCS) $(TIGHTSRCS) $(TIGHTVNCFILETRANSFERSRCS)
 
 libvncserver_la_SOURCES=$(LIB_SRCS)
-libvncserver_la_LIBADD=$(WEBSOCKETSSSLLIBS)
+libvncserver_la_LIBADD=$(WEBSOCKETSSSLLIBS) -lminilzo
 
 if WITH_SYSTEMD
 AM_CPPFLAGS += -DLIBVNCSERVER_WITH_SYSTEMD
diff --git a/libvncserver/ultra.c b/libvncserver/ultra.c
index 83bddaa..deaf43b 100644
--- a/libvncserver/ultra.c
+++ b/libvncserver/ultra.c
@@ -8,7 +8,7 @@
  */
 
 #include <rfb/rfb.h>
-#include "minilzo.h"
+#include <lzo/minilzo.h>
 
 /*
  * cl->beforeEncBuf contains pixel data in the client's format.