--- ext/enchant/config.m4	2018-01-02 09:50:14.000000000 +0100
+++ ext/enchant/config.m4.new	2018-02-01 12:13:28.801708953 +0100
@@ -14,9 +14,9 @@
 	    ENCHANT_SEARCH_DIRS="/usr/local /usr"
 	fi
 	for i in $ENCHANT_SEARCH_DIRS; do
-		if test -f $i/include/enchant/enchant.h; then
+		if test -f $i/include/enchant-2/enchant.h; then
 			ENCHANT_DIR=$i
-			ENCHANT_INCDIR=$i/include/enchant
+			ENCHANT_INCDIR=$i/include/enchant-2
 		elif test -f $i/include/enchant.h; then
 			ENCHANT_DIR=$i
 			ENCHANT_INCDIR=$i/include
@@ -31,7 +31,7 @@
 
 	AC_DEFINE(HAVE_ENCHANT,1,[ ])
 	PHP_SUBST(ENCHANT_SHARED_LIBADD)
-	PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
+	PHP_ADD_LIBRARY_WITH_PATH(enchant-2, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
 	PHP_ADD_INCLUDE($ENCHANT_INCDIR)
 	PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
 	[
--- configure	2018-01-02 09:51:27.000000000 +0100
+++ configure.new	2018-02-01 12:16:17.950382811 +0100
@@ -29838,9 +29838,9 @@
 	    ENCHANT_SEARCH_DIRS="/usr/local /usr"
 	fi
 	for i in $ENCHANT_SEARCH_DIRS; do
-		if test -f $i/include/enchant/enchant.h; then
+		if test -f $i/include/enchant-2/enchant.h; then
 			ENCHANT_DIR=$i
-			ENCHANT_INCDIR=$i/include/enchant
+			ENCHANT_INCDIR=$i/include/enchant-2
 		elif test -f $i/include/enchant.h; then
 			ENCHANT_DIR=$i
 			ENCHANT_INCDIR=$i/include
@@ -29862,7 +29862,7 @@
 
 
   if test "$ext_shared" = "yes"; then
-    ENCHANT_SHARED_LIBADD="-lenchant $ENCHANT_SHARED_LIBADD"
+    ENCHANT_SHARED_LIBADD="-lenchant-2 $ENCHANT_SHARED_LIBADD"
     if test -n "$ENCHANT_LIBDIR"; then
 
   if test "$ENCHANT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ENCHANT_LIBDIR" != "/usr/lib"; then
--- ext/enchant/enchant.c	2018-01-02 09:50:14.000000000 +0100
+++ ext/enchant/enchant.c.new	2018-02-01 12:19:00.228985343 +0100
@@ -745,7 +745,7 @@
 			for (i = 0; i < n_sugg; i++) {
 				add_next_index_string(sugg, suggs[i]);
 			}
-			enchant_dict_free_suggestions(pdict->pdict, suggs);
+			enchant_dict_free_string_list(pdict->pdict, suggs);
 		}
 
 
@@ -802,7 +802,7 @@
 			add_next_index_string(return_value, suggs[i]);
 		}
 
-		enchant_dict_free_suggestions(pdict->pdict, suggs);
+		enchant_dict_free_string_list(pdict->pdict, suggs);
 	}
 }
 /* }}} */
@@ -822,7 +822,7 @@
 
 	PHP_ENCHANT_GET_DICT;
 
-	enchant_dict_add_to_personal(pdict->pdict, word, wordlen);
+	enchant_dict_add(pdict->pdict, word, wordlen);
 }
 /* }}} */
 
@@ -860,7 +860,7 @@
 
 	PHP_ENCHANT_GET_DICT;
 
-	RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen));
+	RETURN_BOOL(enchant_dict_is_added(pdict->pdict, word, wordlen));
 }
 /* }}} */