--- src/CMakeLists.txt.orig	2015-08-13 11:47:34.949824839 +0300
+++ src/CMakeLists.txt	2015-08-13 12:22:28.068842900 +0300
@@ -56,6 +56,15 @@
 	ELSE(WITH_SMBCLIENT)
 		MESSAGE(STATUS "smbclient support disabled")
 	ENDIF(WITH_SMBCLIENT)
+
+	FIND_PACKAGE(Utf8proc)
+	IF(NOT ${UTF8PROC_FOUND})
+		MESSAGE(FATAL_ERROR "utf8proc not found.")
+	ENDIF(NOT ${UTF8PROC_FOUND})
+	ADD_DEFINITIONS(-DUTF8PROC_EXIST)
+	INCLUDE_DIRECTORIES(${UTF8PROC_INCLUDE_DIR})
+	SET(wcm_LIBS ${wcm_LIBS} ${UTF8PROC_LIBRARY})
+	MESSAGE(STATUS "utf8proc ok")
 ENDIF(MINGW)
 
 # flags
@@ -66,7 +75,7 @@
 
 CONFIGURE_FILE(libconf_ux.h.in libconf_ux.h) # noop, flags are passed via compiler args
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES(BEFORE wal swl vfs utf8proc .)
+INCLUDE_DIRECTORIES(BEFORE wal swl vfs .)
 ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
 ADD_DEFINITIONS(-DUNIX_CONFIG_DIR_PATH="${CMAKE_INSTALL_PREFIX}/${DATADIR}")
 
@@ -103,7 +112,6 @@
 		shell.cpp
 		swl/swl_wincoreUX.cpp
 		terminal.cpp
-		utf8proc/utf8proc.c
 	)
 ENDIF(MINGW OR MSVC)
 
--- src/makefile.linux.orig	2015-08-13 12:21:35.229402340 +0300
+++ src/makefile.linux	2015-08-13 12:21:55.071497499 +0300
@@ -208,7 +208,6 @@
 	$(OBJDIR)/wal_sys_api.o\
 	$(OBJDIR)/wal_tmpls.o \
 	$(OBJDIR)/wcm-config.o \
-	$(OBJDIR)/utf8proc.o \
 	$(OBJDIR)/LUrlParser.o
 
 ifeq ($(UNAME_S),Darwin)
@@ -230,9 +229,6 @@
 #	cd libtester &&	./libconf.create
 
 
-$(OBJDIR)/utf8proc.o: $(HW) $(HS) $(HN) src/utf8proc/utf8proc.c 
-	$(CC) -I uft8/proc -std=c99 -c $(CFLAGS) -Wno-missing-field-initializers src/utf8proc/utf8proc.c -o $(OBJDIR)/utf8proc.o
-
 $(OBJDIR)/LUrlParser.o: $(HW) $(HS) $(HN) src/urlparser/LUrlParser.cpp
 	$(CC) $(COPTS) -c $(CFLAGS) src/urlparser/LUrlParser.cpp -o $(OBJDIR)/LUrlParser.o
 
--- src/wal/wal.cpp.orig	2015-04-25 00:50:22.000000000 +0300
+++ src/wal/wal.cpp	2015-08-13 12:33:19.971388697 +0300
@@ -12,7 +12,7 @@
 #endif
 
 #if !defined(_WIN32)
-#	include "utf8proc/utf8proc.h"
+#	include <utf8proc.h>
 #endif
 
 #include <string>