diff --git a/CMakeLists.txt b/CMakeLists.txt
index b537ca4..1ab5947 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ include(ExternalProject)
 ExternalProject_Add(
   relic
   GIT_REPOSITORY https://github.com/relic-toolkit/relic.git
-  GIT_TAG 6f7e8e3c73132f606ea72fbd176d8ce9e4cb2bb1
+  GIT_TAG 3b9a4a8
   UPDATE_DISCONNECTED 1
   STEP_TARGETS update
   LIST_SEPARATOR ^^
diff --git a/src/bbs_util.c b/src/bbs_util.c
index cbde5c7..62088c8 100644
--- a/src/bbs_util.c
+++ b/src/bbs_util.c
@@ -736,11 +736,13 @@ create_generator_init (
 //
 // BEGIN Excerpt from relic's src/ep/relic_ep_map.c
 //
-#include <relic_tmpl_map.h>
+#include <relic_core.h>
+#include <relic_md.h>
+#include <relic_ep_map_tmpl.h>
 TMPL_MAP_HORNER (fp, fp_st);
 TMPL_MAP_ISOGENY_MAP (ep, fp, iso);
 #define EP_MAP_COPY_COND(O, I, C) dv_copy_cond (O, I, RLC_FP_DIGS, C)
-TMPL_MAP_SSWU (ep, fp, dig_t, EP_MAP_COPY_COND);
+TMPL_MAP_SSWU (ep, fp, dig_t);
 
 static void
 ep_map_from_field (ep_t p,
@@ -785,7 +787,7 @@ ep_map_from_field (ep_t p,
 		/* compare sign of y and sign of t; fix if necessary */                         \
 		neg = neg != fp_is_even (PT->y);                                                                         \
 		fp_neg (t, PT->y);                                                                                                       \
-		dv_copy_cond (PT->y, t, RLC_FP_DIGS, neg);                                                       \
+		dv_copy_sec (PT->y, t, RLC_FP_DIGS, neg);                                                       \
 	} while (0)
 
 		/* first map invocation */