diff --git a/README b/README
index 44b8569c7..5994dfb68 100644
--- a/README
+++ b/README
@@ -1,4 +1,7 @@
-This is the Emacs Org project, an Emacs library for organizing your life.
+The is a distribution of Org, a plain text notes and project planning
+tool for Emacs.
+
+The version of this release is: 7.9.1
 
 The homepage of Org is at http://orgmode.org
 
@@ -7,16 +10,6 @@ This distribution contains:
 README
     This file.
 
-README_DIST
-    The README file for the distribution (zip and tar files)
-
-README_contribute
-    Information about the git repository and how to contribute
-    to Org-mode development. 
-
-README_maintainer
-    Information for the maintainer.
-
 Makefile
     The makefile to compile and install Org.  For installation
     instructions, see the manual or the more detailed procedure
@@ -32,18 +25,18 @@ doc/
     The documentation files.  org.texi is the source of the
     documentation, org.html and org.pdf are formatted versions of it.
 
-etc/
-    Files needed for the ODT exporter.
-
 contrib/
     A directory with third-party additions for Org.  Some really cool
     stuff is in there.
 
+etc/
+    Files needed for the ODT exporter.
+
 testing/
     Testing suite for Org.
 
 request-assign-future.txt
-    The form that contributors have to sign and get processed with the
-    FSF before contributed changes can be integrated into the Org
+    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
new file mode 100644
index 000000000..5b4c9461b
--- /dev/null
+++ b/README_ELPA
@@ -0,0 +1,37 @@
+This is the Emacs Org project, an Emacs library for organizing your life.
+
+The homepage of Org is at http://orgmode.org
+
+This distribution contains an ELPA packaged version of Org.
+"ELPA" stands for the "Emacs Lisp Package Archive".
+The GNU ELPA is here:
+
+  http://elpa.gnu.org
+
+It contains the org-*.tar package, containing only the org files
+that are also part of GNU Emacs.
+
+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 packages of Org contain:
+
+README_ELPA
+    This file.
+
+*.el
+    Elisp files.
+
+org
+    The Org info manual.
+
+orgcard.pdf
+    The Org reference card.
+
+etc/
+    Libraries for the ODT exporter.
+
+org-*-pkg.el
+    The name of the package, requested GNU Emacs packaging system.
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_DIST b/README_git
similarity index 67%
rename from README_DIST
rename to README_git
index ba5d90578..7ec84028a 100644
--- a/README_DIST
+++ b/README_git
@@ -1,20 +1,33 @@
-The is a distribution of Org, a plain text notes and project planning
-tool for Emacs.
-
-The version of this release is: 7.9
+This is the Emacs Org project, an Emacs library for organizing your life.
 
 The homepage of Org is at http://orgmode.org
 
 This distribution contains:
 
-README
+README_git
     This file.
 
+README
+    The README file for the main distribution (zip and tar files).
+
+README_ELPA
+    The README file for the ELPA packages.
+
+README_contribute
+    Information about the git repository and how to contribute
+    to Org-mode development.
+
+README_maintainer
+    Information for the maintainer.
+
 Makefile
     The makefile to compile and install Org.  For installation
     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.
 
@@ -22,21 +35,18 @@ doc/
     The documentation files.  org.texi is the source of the
     documentation, org.html and org.pdf are formatted versions of it.
 
-contrib/
-    A directory with third-party additions for Org.  Some really cool
-    stuff is in there.
-
 etc/
     Files needed for the ODT exporter.
 
-mk/
-    Files needed for building Org.
+contrib/
+    A directory with third-party additions for Org.  Some really cool
+    stuff is in there.
 
 testing/
     Testing suite for Org.
 
 request-assign-future.txt
-    The form that contributors have to sign and get processed with 
-    the FSF before contributed changes can be integrated into the Org
+    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_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/contrib/lisp/org-wikinodes.el b/contrib/lisp/org-wikinodes.el
index 12091b69c..bdc3e340f 100644
--- a/contrib/lisp/org-wikinodes.el
+++ b/contrib/lisp/org-wikinodes.el
@@ -121,7 +121,8 @@ setting of `org-wikinodes-create-targets'."
     (setq pos
 	  (or (org-find-exact-headline-in-buffer target (current-buffer))
 	      (and (eq org-wikinodes-scope 'directory)
-		   (setq file (org-wikinodes-which-file target))
+		   (setq file (org-wikinodes-which-file
+			       target (file-name-directory (buffer-file-name))))
 		   (org-find-exact-headline-in-buffer
 		    target (or (get-file-buffer file)
 			       (find-file-noselect file))))))
@@ -238,12 +239,14 @@ setting of `org-wikinodes-create-targets'."
 (defun org-wikinodes-which-file (target &optional directory)
   "Return the file for wiki headline TARGET DIRECTORY.
 If there is no such wiki target, return nil."
-  (setq directory (expand-file-name (or directory default-directory)))
-  (unless (assoc directory org-wikinodes-directory-targets-cache)
-    (push (cons directory (org-wikinodes-get-links-for-directory directory))
-	  org-wikinodes-directory-targets-cache))
-  (cdr (assoc target (cdr (assoc directory
-				 org-wikinodes-directory-targets-cache)))))
+  (let* ((directory (expand-file-name (or directory default-directory)))
+	 (founddir (assoc directory org-wikinodes-directory-targets-cache))
+	 (foundfile (cdr (assoc target (cdr founddir)))))
+    (or foundfile
+	(and (push (cons directory (org-wikinodes-get-links-for-directory directory))
+		   org-wikinodes-directory-targets-cache)
+	     (cdr (assoc target (cdr (assoc directory
+					    org-wikinodes-directory-targets-cache))))))))
 
 ;;; Exporting Wiki links
 
diff --git a/mk/server.mk b/mk/server.mk
index cff1c675c..bc1ea2d6b 100644
--- a/mk/server.mk
+++ b/mk/server.mk
@@ -13,9 +13,11 @@ help helpall helpserver::
 	$(info Maintenance)
 	$(info ===========)
 	$(info release             - clean up, create the distribution archives)
-	$(info elpa                - clean up, create the ELPA archive)
+	$(info elpa                - clean up, create the org-*.tar ELPA archive)
+	$(info elpaplus            - clean up, create the org-plus-contrib-*.tar ELPA archive)
 	$(info upload-release      - clean up, populate the server with arhives)
-	$(info upload-elpa         - clean up, populate the server with ELPA)
+	$(info upload-elpa         - clean up, populate the server with org-*.tar)
+	$(info upload-elpaplus     - clean up, populate the server with org-plus-contrib-*.tar)
 	$(info upload-doc          - clean up, populate the server with docs)
 	$(info upload              - clean up, populate the server with everything)
 
@@ -29,15 +31,16 @@ SERVERMK ?= true # or just any value at all, really
 
 #----------------------------------------------------------------------
 
-ORGCOMM  = README lisp/
-ORGFULL  = $(ORGCOMM) 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) doc/dir doc/org doc/orgcard.pdf \
-		      etc/styles/ org-pkg.el
-ORGELPA := $(ORGELPA:%/=%/*)
+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   = README_ELPA lisp/ \
+		doc/dir doc/org doc/orgcard.pdf \
+		etc/styles/ org-pkg.el
+ORGELPA  := $(ORGELPA:%/=%/*)
 ORGELPAPLUS := $(ORGELPA:org-pkg%=org-plus-contrib-pkg%)
 
 release:	cleanall info pdf card rel-dirty tagwarn
@@ -64,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
@@ -80,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
diff --git a/mk/set-version.pl b/mk/set-version.pl
index ed185ea24..d042a6e02 100755
--- a/mk/set-version.pl
+++ b/mk/set-version.pl
@@ -38,8 +38,8 @@ if (not $only) {
   $c1 = "perl -pi -e '$cmd' doc/orgcard.tex";
   system($c1);
 
-  print STDERR "README_DIST\n";
+  print STDERR "README\n";
   $cmd = qq{s/^(The version of this release is:)\\s+(\\S+)[ \t]*\$/\$1 $version/;};
-  $c1 = "perl -pi -e '$cmd' README_DIST";
+  $c1 = "perl -pi -e '$cmd' README";
   system($c1);
 }