diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c
index fbce2a0..cd58730 100644
--- a/kpatch-build/create-diff-object.c
+++ b/kpatch-build/create-diff-object.c
@@ -1029,7 +1029,7 @@ void kpatch_regenerate_bug_table_rela_section(struct kpatch_elf *kelf)
 	}
 
 	/* overwrite with new relas list */
-	sec->relas = newrelas;
+	list_replace(&newrelas, &sec->relas);
 
 	/* include both rela and text sections */
 	sec->include = 1;
@@ -1076,7 +1076,7 @@ void kpatch_regenerate_smp_locks_sections(struct kpatch_elf *kelf)
 	}
 
 	/* overwrite with new relas list */
-	sec->relas = newrelas;
+	list_replace(&newrelas, &sec->relas);
 
 	/* include both rela and text sections */
 	sec->include = 1;
@@ -1141,7 +1141,7 @@ void kpatch_regenerate_parainstructions_sections(struct kpatch_elf *kelf)
 	}
 
 	/* overwrite with new relas table */
-	sec->relas = newrelas;
+	list_replace(&newrelas, &sec->relas);
 
 	/* mark sections for inclusion */
 	sec->include = 1;
diff --git a/kpatch-build/list.h b/kpatch-build/list.h
index 7da8453..825fd95 100644
--- a/kpatch-build/list.h
+++ b/kpatch-build/list.h
@@ -142,6 +142,22 @@ static inline void list_del(struct list_head *entry)
 	entry->prev = LIST_POISON2;
 }
 
+/**
+ * list_replace - replace old entry by new one
+ * @old : the element to be replaced
+ * @new : the new element to insert
+ *
+ * If @old was empty, it will be overwritten.
+ */
+static inline void list_replace(struct list_head *old,
+				struct list_head *new)
+{
+	new->next = old->next;
+	new->next->prev = new;
+	new->prev = old->prev;
+	new->prev->next = new;
+}
+
 #define list_entry(ptr, type, member) \
 	container_of(ptr, type, member)