diff --git a/AUTHORS b/AUTHORS
index 7fd2361d..16491cb0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
-2017-2018, Hèctor Alòs i Font <hectoralos@gmail.com>
+2017-2019, Hèctor Alòs i Font <hectoralos@gmail.com>
 2017-2018, Lorenza Russo <lorenzarusso@hotmail.com>
+2018, Claudi Balaguer <ratapenada@yahoo.com>
 2017, Trond Trosterud <trond.trosterud@hum.uit.no>
 2017, Bernard Chardonneau <bechapertium@free.fr>
 2016-2017, Toyama Tokanawa <cordawyn@tut.by>
diff --git a/Makefile.am b/Makefile.am
index a8c72dea..58bc71b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,8 +46,8 @@ $(LANG1).autopgen.bin: $(BASENAME).post-$(LANG1).dix
 ## Disambiguation rules
 ###############################################################################
 
-$(LANG1).rlx.bin: $(BASENAME).$(LANG1).rlx $(CGCOMP)
-	$(CGCOMP) $< $@
+$(LANG1).rlx.bin: $(BASENAME).$(LANG1).rlx
+	cg-comp $< $@
 
 ###############################################################################
 ## Distribution
diff --git a/configure.ac b/configure.ac
index 0b3efdee..17f61f25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,12 @@
 AC_PREREQ(2.52)
 
-AC_INIT([apertium-fra], [1.6.0], [unhammer@fsfe.org])
-AM_INIT_AUTOMAKE([apertium-fra], [1.6.0], no-define)
-AC_PROG_LN_S
+AC_INIT([Apertium French], [1.7.0], [apertium-stuff@lists.sourceforge.net], [apertium-fra], [http://wiki.apertium.org/wiki/Apertium-fra])
+AM_INIT_AUTOMAKE
 AC_PROG_AWK
 
-m4_define([required_apertium_version], [3.5.2])
-m4_define([required_lttoolbox_version], [3.5.0])
-
-PKG_CHECK_MODULES(APERTIUM, apertium >= required_apertium_version)
-PKG_CHECK_MODULES(LTTOOLBOX, lttoolbox >= required_lttoolbox_version)
-
-
-AC_PATH_PROG(CGCOMP, cg-comp, no)
-if test x$ac_cv_path_CGCOMP = x
-then
-  AC_MSG_ERROR([You don't have cg-comp installed.])
-fi
-if test x$ac_cv_path_CGPROC = xno
-then
-  AC_MSG_ERROR([You don't have cg-comp installed.])
-fi
-
+PKG_CHECK_MODULES(APERTIUM, apertium >= 3.6.0)
+PKG_CHECK_MODULES(LTTOOLBOX, lttoolbox >= 3.5.0)
+PKG_CHECK_MODULES(CG3, cg3 >= 1.3.0)
 
 AP_MKINCLUDE