diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile
index 497a375419f..f4f866fb34c 100644
--- a/chinese/libchewing/Makefile
+++ b/chinese/libchewing/Makefile
@@ -1,11 +1,10 @@
 COMMENT =	intelligent phonetic input method library
 
-V =		0.5.1
+V =		0.6.0
 DISTNAME =	libchewing-$V
 PKGNAME =	zh-libchewing-$V
-REVISION =	0
 
-SHARED_LIBS =	chewing	0.1	# .3.3
+SHARED_LIBS =	chewing	0.2	# .3.3.1
 
 CATEGORIES =	chinese inputmethods
 
@@ -16,19 +15,16 @@ MAINTAINER = 	Kevin Lo <kevlo@openbsd.org>
 # LGPLv2.1 only
 PERMIT_PACKAGE=	Yes
 
-WANTLIB +=	m pthread sqlite3 z
+WANTLIB +=	c sqlite3
 
 SITES =		https://github.com/chewing/libchewing/releases/download/v$V/
 
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX =	.tar.xz
 
-BUILD_DEPENDS =	print/texinfo
+MODULES =	devel/cmake
 LIB_DEPENDS =	databases/sqlite3
 
-MAKE_FLAGS =	MAKEINFO=${LOCALBASE}/bin/gmakeinfo
-
-CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS =	CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CFLAGS +=		-I${LOCALBASE}/include
+MODCMAKE_LDFLAGS =      -L${LOCALBASE}/lib -lc
 
 .include <bsd.port.mk>
diff --git a/chinese/libchewing/distinfo b/chinese/libchewing/distinfo
index 43c1ab25422..3c91d9dbf41 100644
--- a/chinese/libchewing/distinfo
+++ b/chinese/libchewing/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libchewing-0.5.1.tar.bz2) = lwjGNBX6YDRDXA84EA59MNDhuskn9nvsbf6z/vAWFys=
-SIZE (libchewing-0.5.1.tar.bz2) = 3141084
+SHA256 (libchewing-0.6.0.tar.xz) = wpE77VW3/bJZQralgywlS8m8ucNl08r6ClabS3y9jwA=
+SIZE (libchewing-0.6.0.tar.xz) = 3473564
diff --git a/chinese/libchewing/patches/patch-CMakeLists_txt b/chinese/libchewing/patches/patch-CMakeLists_txt
new file mode 100644
index 00000000000..0bb96c78a07
--- /dev/null
+++ b/chinese/libchewing/patches/patch-CMakeLists_txt
@@ -0,0 +1,19 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+ enable_testing()
+ 
+ if(UNIX)
+-    set(CMAKE_C_FLAGS "-g -O2 -Wall -fPIC ${CMAKE_C_FLAGS}")
++    set(CMAKE_C_FLAGS "-Wall -fPIC ${CMAKE_C_FLAGS}")
+     add_compile_definitions(UNDER_POSIX PIC)
+ endif()
+ 
+@@ -338,4 +338,4 @@ set(CPACK_PACKAGE_CHECKSUM SHA256)
+ set(CPACK_SOURCE_IGNORE_FILES "/out" "/\\\\..*")
+ set(CPACK_SOURCE_GENERATOR TXZ)
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME libchewing-${CMAKE_PROJECT_VERSION})
+-include(CPack)
+\ No newline at end of file
++include(CPack)
diff --git a/chinese/libchewing/patches/patch-configure b/chinese/libchewing/patches/patch-configure
deleted file mode 100644
index 9136be8bd17..00000000000
--- a/chinese/libchewing/patches/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: configure
---- configure.orig
-+++ configure
-@@ -15425,7 +15425,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_undefined" >&5
- $as_echo "$ac_cv_no_undefined" >&6; }
- if test x$ac_cv_no_undefined = "xyes"; then :
--  NO_UNDEFINED_LDFLAGS="-Wl,--no-undefined"
-+  NO_UNDEFINED_LDFLAGS=""
- fi
- 
- 
diff --git a/chinese/libchewing/pkg/PLIST b/chinese/libchewing/pkg/PLIST
index ea33fe5b1fe..b5e6905e22a 100644
--- a/chinese/libchewing/pkg/PLIST
+++ b/chinese/libchewing/pkg/PLIST
@@ -4,9 +4,6 @@ include/chewing/chewing.h
 include/chewing/chewingio.h
 include/chewing/global.h
 include/chewing/mod_aux.h
-@info info/libchewing.info
-lib/libchewing.a
-lib/libchewing.la
 @lib lib/libchewing.so.${LIBchewing_VERSION}
 lib/pkgconfig/chewing.pc
 share/libchewing/