diff --git a/Makefile.config b/Makefile.config
index 8fb4e6b69..7851f826f 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -35,12 +35,8 @@ endif
 export DEFINES += $(FEATURE_DEFINES)
 export CFLAGS += $(FEATURE_DEFINES)
 
-ifeq ($(call try-cc,$(FEATURE_TEST_UFFD)),y)
-	export UFFD := 1
-endif
-
 FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
-	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW
+	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW UFFD
 
 # $1 - config name
 define gen-feature-test
@@ -61,10 +57,6 @@ $(call map,gen-feature-test,$(FEATURES_LIST))
 ifeq ($$(VDSO),y)
 	$(Q) @echo '#define CONFIG_VDSO'				>> $$@
 	$(Q) @echo ''							>> $$@
-endif
-ifeq ($$(UFFD),1)
-	$(Q) @echo '#define CONFIG_HAS_UFFD'				>> $$@
-	$(Q) @echo ''							>> $$@
 endif
 	$(Q) @echo '#endif /* __CR_CONFIG_H__ */'			>> $$@
 endef
diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 75f043a15..0d28dee3e 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -82,6 +82,7 @@ obj-y			+= uts_ns.o
 obj-y			+= path.o
 obj-y			+= autofs.o
 obj-y			+= fdstore.o
+obj-y			+= uffd.o
 
 ifeq ($(VDSO),y)
 obj-y			+= pie-util-vdso.o
@@ -92,8 +93,6 @@ obj-$(CONFIG_COMPAT)	+= vdso-compat.o
 CFLAGS_REMOVE_vdso-compat.o	+= $(CFLAGS-ASAN) $(CFLAGS-GCOV)
 endif
 
-obj-y	+= uffd.o
-
 PROTOBUF_GEN := scripts/protobuf-gen.sh
 
 $(obj)/protobuf-desc.d: $(obj)/protobuf-desc-gen.h