diff --git a/CHANGES b/CHANGES
index 20089ed3c3..6b6a6e84fe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,7 @@
 	#767: Bump iw package to 0.9.18
 	#773: [SECURITY] Update bind to 9.5.2-P1
 	#795: Minor edits to fix typos, grammar, spelling, usage in documen...
+	#823: Editor backup files (~) is copied from the target_skeleton
 
 2009.11, Released December 1st, 2009:
 
diff --git a/Makefile b/Makefile
index 051b661fe7..5f71148535 100644
--- a/Makefile
+++ b/Makefile
@@ -386,7 +386,7 @@ $(BUILD_DIR)/.root:
 		touch $(STAGING_DIR)/.fakeroot.00000; \
 	fi
 	-find $(TARGET_DIR) -type d -name CVS -print0 -o -name .svn -print0 | xargs -0 rm -rf
-	-find $(TARGET_DIR) -type f -name .empty -print0 | xargs -0 rm -rf
+	-find $(TARGET_DIR) -type f \( -name .empty -o -name '*~' \) -print0 | xargs -0 rm -rf
 	touch $@
 
 $(TARGET_DIR): $(BUILD_DIR)/.root