--- a/Makefile	Thu Feb 19 19:40:37 2015 +0200
+++ b/Makefile	Tue Feb 24 01:27:49 2015 +0200
@@ -95,8 +95,14 @@
   mv ~/.emacs-post $(mylispdir) || true; \
   mv ~/.emacs-places $(mylispdir) || true; \
   mv ~/.emacs.desktop $(mylispdir) || true; \
+  mv ~/.emacs.bmk $(mylispdir) || true; \
   rm -f ~/.emacs-autogen; \
 fi
+	\
+rm -f ~/.emacs ~/.emacs-places; \
+for f in $(mylispdir)/.emacs*; do \
+  mv $$f $(emacsdir) || true; \
+done
 
 .PHONY: install-all
 install-all: install
@@ -110,7 +116,7 @@
 	for file in .emacs-pre .emacs-post; do \
 		[ -f $(mylispdir)/$$file ] || cp $$file $(mylispdir)/$$file; \
 	done
-	cp .emacs $(HOME)/.emacs
+	cp .emacs $(emacsdir)/init.el
 	cp .emacs-my $(mylispdir)/.emacs-my
 	mkdir -p $(HOME)/.gnus/scores
 	cp all.SCORE $(HOME)/.gnus/scores