diff --git a/glusterfs/libglusterfs/src/syncop.c b/glusterfs/libglusterfs/src/syncop.c
index d717faf..b0dc7b8 100644
--- a/glusterfs/libglusterfs/src/syncop.c
+++ b/glusterfs/libglusterfs/src/syncop.c
@@ -356,6 +356,10 @@ synctask_destroy(struct synctask *task)
     if (!task)
         return;
 
+#ifdef __e2k__
+    freecontext_e2k(&task->ctx);
+#endif
+
     GF_FREE(task->stack);
 
     if (task->opframe && (task->opframe != task->frame))
@@ -478,7 +482,11 @@ synctask_create(struct syncenv *env, size_t stacksize, synctask_fn_t fn,
 
     newtask->ctx.uc_stack.ss_sp = newtask->stack;
 
+#ifdef __e2k__
+    makecontext_e2k(&newtask->ctx, (void (*)(void))synctask_wrap, 0);
+#else
     makecontext(&newtask->ctx, (void (*)(void))synctask_wrap, 0);
+#endif
 
 #ifdef HAVE_TSAN_API
     newtask->tsan.fiber = __tsan_create_fiber(0);
diff --git a/glusterfs/xlators/features/bit-rot/src/bitd/Makefile.am b/glusterfs/xlators/features/bit-rot/src/bitd/Makefile.am
index 6db800e..7b8bc14 100644
--- a/glusterfs/xlators/features/bit-rot/src/bitd/Makefile.am
+++ b/glusterfs/xlators/features/bit-rot/src/bitd/Makefile.am
@@ -14,6 +14,7 @@ bit_rot_la_SOURCES = bit-rot.c bit-rot-scrub.c bit-rot-ssm.c \
 		     bit-rot-scrub-status.c
 bit_rot_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
 	$(top_builddir)/xlators/features/changelog/lib/src/libgfchangelog.la
+bit_rot_la_LIBADD += $(MATH_LIB)
 
 noinst_HEADERS = bit-rot.h bit-rot-scrub.h bit-rot-bitd-messages.h bit-rot-ssm.h \
 		 bit-rot-scrub-status.h