diff --git a/README b/README
index f7f7cad18..5994dfb68 100644
--- a/README
+++ b/README
@@ -15,6 +15,9 @@ Makefile
     instructions, see the manual or the more detailed procedure
     on Worg: http://orgmode.org/worg/dev/org-build-system.html
 
+mk/
+    Files needed for building Org.
+
 lisp/
     Directory with all the Emacs Lisp files that make up Org.
 
@@ -29,14 +32,11 @@ contrib/
 etc/
     Files needed for the ODT exporter.
 
-mk/
-    Files needed for building Org.
-
 testing/
     Testing suite for Org.
 
 request-assign-future.txt
-    The form that contributors have to sign and get processed with 
+    The form that contributors have to sign and get processed with
     the FSF before contributed changes can be integrated into the Org
     core.  All files in this distribution except the contrib/ directory
     have copyright assigned to the FSF.
diff --git a/README_ELPA b/README_ELPA
index f4a418e64..5b4c9461b 100644
--- a/README_ELPA
+++ b/README_ELPA
@@ -16,12 +16,12 @@ There are other ELPA online, offering more packages.
 Some contain the org-plus-contrib-*.tar ELPA package, which bundles
 the core Org files plus many additional contributed libraries.
 
-All ELPA version of Org contain:
+All ELPA packages of Org contain:
 
 README_ELPA
     This file.
 
-*el
+*.el
     Elisp files.
 
 org
diff --git a/README_contribute b/README_contribute
index a73d59253..3e1ef6d6b 100644
--- a/README_contribute
+++ b/README_contribute
@@ -86,4 +86,3 @@ move the file into the Org-mode core.  This means they will be
 moved up to the root directory and will also eventually be added
 to GNU Emacs bzr repository.  The final decision about this rests
 with the maintainer.
-
diff --git a/README_git b/README_git
index 2f7506c60..7ec84028a 100644
--- a/README_git
+++ b/README_git
@@ -15,7 +15,7 @@ README_ELPA
 
 README_contribute
     Information about the git repository and how to contribute
-    to Org-mode development. 
+    to Org-mode development.
 
 README_maintainer
     Information for the maintainer.
diff --git a/README_maintainer b/README_maintainer
index f5d99dd3f..1323217e4 100644
--- a/README_maintainer
+++ b/README_maintainer
@@ -33,7 +33,7 @@ release.
 
 When doing a /major release/, make sure all changes from the maint
 branch are merged into the the master branch, then merge the master
-branch back into maint to synchronize the two.  
+branch back into maint to synchronize the two.
 
 ** Minor release
 
@@ -41,7 +41,7 @@ The release number for minor releases look like this:  =7.13.01=
 
 Minor releases are small amends to main releases.  Usually they fix
 critical bugs discovered in a main release.  Minor bugs are usually
-not fixed -- they will be adressed in the next main release.  
+not fixed -- they will be adressed in the next main release.
 
 Only the fix to the bug is bundled into a release, without the main
 development work going on in the master branch.  Since the bug fix
@@ -50,7 +50,7 @@ maint then merged in master.
 
 ** Tagging the release
 
-When doing a major and a minor release, after all necessary merging 
+When doing a major and a minor release, after all necessary merging
 is done, tag the _maint_ branch for the release with:
 
   git tag -a "Adding release tag" release_7.9.1
@@ -65,11 +65,11 @@ Log on the orgmode.org server as the emacs user and cd to
 ~/git/org-mode
 
 From there do
-  
+
   make release
   make upload
 
-to create the .tar.gz and .zip files, the documentation, and to 
+to create the .tar.gz and .zip files, the documentation, and to
 upload everything at the right place.
 
 * Working with patchwork
@@ -246,7 +246,7 @@ So the way I have been doing things with Emacs is this:
 
 * Updating the list of hooks/commands/options on Worg
 
-  Load the =mk/eldo.el= file then =M-x eldo-make-doc RET=. 
+  Load the =mk/eldo.el= file then =M-x eldo-make-doc RET=.
 
   This will produce an org file with the documentation.
 
diff --git a/mk/server.mk b/mk/server.mk
index 5e5cc253c..bc1ea2d6b 100644
--- a/mk/server.mk
+++ b/mk/server.mk
@@ -31,17 +31,13 @@ SERVERMK ?= true # or just any value at all, really
 
 #----------------------------------------------------------------------
 
-ORGREADMECOMM = README
-ORGREADMEELPA = README_ELPA
-
-ORGCOMM   = lisp/
-ORGFULL   = $(ORGCOMM) $(ORGREADMECOMM) \
+ORGFULL   = README lisp/ \
 		Makefile request-assign-future.txt \
 		mk/default.mk mk/targets.mk mk/version.mk \
 		mk/org-fixup.el \
 		etc/ contrib/ doc/
 ORGFULL  := $(ORGFULL:%/=%/*)
-ORGELPA   = $(ORGCOMM) $(ORGREADMEELPA) \
+ORGELPA   = README_ELPA lisp/ \
 		doc/dir doc/org doc/orgcard.pdf \
 		etc/styles/ org-pkg.el
 ORGELPA  := $(ORGELPA:%/=%/*)
@@ -71,7 +67,7 @@ elpa-dirty:
 	ln -s . $(ORGDIR)
 	echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
 	  > org-pkg.el
-	tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
+	tar --exclude=Makefile --exclude="org-colview-xemacs.el" --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
 	  $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
 	-@$(RM) $(ORGDIR) org-pkg.el
 elpa-up:	info card elpa-dirty
@@ -87,7 +83,7 @@ elpaplus-dirty:
 	ln -s . $(ORGDIR)
 	echo "(define-package \"org-plus-contrib\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \
 	  > org-plus-contrib-pkg.el
-	tar --exclude=Makefile --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
+	tar --exclude=Makefile --exclude="org-colview-xemacs.el" --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
 	  $(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist))
 	-@$(RM) $(ORGDIR) org-plus-contrib-pkg.el
 	@$(MAKE) cleanlisp