diff -Naur '--exclude=*~' org-7.4/Makefile org-7.4.fink/Makefile
--- org-7.4/Makefile	2010-12-10 13:16:34.000000000 +0000
+++ org-7.4.fink/Makefile	2010-12-17 18:41:21.000000000 +0000
@@ -29,7 +29,7 @@
 # Using emacs in batch mode.
 
 BATCH=$(EMACS) -batch -q -no-site-file -eval                             			\
-  "(setq load-path (cons (expand-file-name \"./lisp/\") (cons \"$(lispdir)\" load-path)))"
+  "(setq load-path (cons (expand-file-name \".\") (cons \"$(lispdir)\" load-path)))"
 
 # Specify the byte-compiler for compiling org-mode files
 ELC= $(BATCH) -f batch-byte-compile
@@ -155,8 +155,8 @@
 		ob-js.el		\
 		ob-scheme.el
 
-LISPFILES0  = $(LISPF:%=lisp/%)
-LISPFILES   = $(LISPFILES0) lisp/org-install.el
+LISPFILES0  = $(LISPF)
+LISPFILES   = $(LISPFILES0) org-install.el
 ELCFILES0   = $(LISPFILES0:.el=.elc)
 ELCFILES    = $(LISPFILES:.el=.elc)
 DOCFILES    = doc/org.texi doc/org.pdf doc/org doc/dir \
@@ -223,9 +223,9 @@
 install-info-debian: $(INFOFILES)
 	$(INSTALL_INFO) --infodir=$(infodir) $(INFOFILES)
 
-autoloads: lisp/org-install.el
+autoloads: org-install.el
 
-lisp/org-install.el: $(LISPFILES0) Makefile
+org-install.el: $(LISPFILES0) Makefile
 	$(BATCH) --eval "(require 'autoload)" \
 		--eval '(find-file "org-install.el")'  \
 		--eval '(erase-buffer)' \
@@ -361,7 +361,7 @@
 	${MAKE} cleancontrib
 	${MAKE} info
 	${MAKE} doc
-	${MAKE} lisp/org-install.el
+	${MAKE} org-install.el
 	rm -rf org-$(TAG) org-$(TAG).zip
 	$(MKDIR) org-$(TAG)
 	$(MKDIR) org-$(TAG)/doc
@@ -410,7 +410,7 @@
 
 cleanall:
 	${MAKE} clean
-	rm -f lisp/org-install.el
+	rm -f org-install.el
 
 clean:
 	${MAKE} cleanelc
@@ -452,60 +452,60 @@
 
 # Dependencies
 
-lisp/org.elc:		lisp/org-macs.el lisp/org-compat.el lisp/org-faces.el
-lisp/org-agenda.elc:	lisp/org.el
-lisp/org-ascii.elc:	lisp/org-exp.el
-lisp/org-attach.elc:	lisp/org.el lisp/org-id.el
-lisp/org-archive.elc:	lisp/org.el
-lisp/org-bbdb.elc:	lisp/org.el
-lisp/org-beamer.elc:	lisp/org.el
-lisp/org-bibtex.elc:	lisp/org.el
-lisp/org-capture.elc:	lisp/org.el lisp/org-mks.el
-lisp/org-clock.elc:	lisp/org.el
-lisp/org-colview.elc:	lisp/org.el
-lisp/org-colview-xemacs.elc:	lisp/org.el
-lisp/org-compat.elc:	lisp/org-macs.el
-lisp/org-crypt.elc:	lisp/org-crypt.el lisp/org.el
-lisp/org-ctags.elc:	lisp/org.el
-lisp/org-datetree.elc:	lisp/org.el
-lisp/org-docview.elc:	lisp/org.el
-lisp/org-entities.elc:
-lisp/org-exp.elc:	lisp/org.el lisp/org-agenda.el
-lisp/org-exp-blocks.elc: lisp/org.el
-lisp/org-latex.elc:	lisp/org.el lisp/org-exp.el lisp/org-beamer.el
-lisp/org-docbook.elc:	lisp/org.el lisp/org-exp.el
-lisp/org-faces.elc:	lisp/org-macs.el lisp/org-compat.el
-lisp/org-feed.elc:	lisp/org.el
-lisp/org-footnotes.elc:	lisp/org-macs.el lisp/org-compat.el
-lisp/org-freemind.elc:	lisp/org.el
-lisp/org-gnus.elc:	lisp/org.el
-lisp/org-html.elc:	lisp/org-exp.el
-lisp/org-habit.elc:	lisp/org.el lisp/org-agenda.el
-lisp/org-icalendar.elc:	lisp/org-exp.el
-lisp/org-id.elc:	lisp/org.el
-lisp/org-indent.elc:	lisp/org.el lisp/org-macs.el lisp/org-compat.el
-lisp/org-info.elc:	lisp/org.el
-lisp/org-inlinetask.elc:
-lisp/org-irc.elc:	lisp/org.el
-lisp/org-jsinfo.elc:	lisp/org.el lisp/org-exp.el
-lisp/org-list.elc:	lisp/org-macs.el lisp/org-compat.el
-lisp/org-mac-message.elc:	lisp/org.el
-lisp/org-macs.elc:
-lisp/org-mew.elc:	lisp/org.el
-lisp/org-mhe.elc:	lisp/org.el
-lisp/org-mks.elc:
-lisp/org-mobile.elc:	lisp/org.el
-lisp/org-mouse.elc:	lisp/org.el
-lisp/org-plot.elc:	lisp/org.el lisp/org-exp.el lisp/org-table.el
-lisp/org-publish.elc:
-lisp/org-protocol.elc:	lisp/org.el
-lisp/org-remember.elc:	lisp/org.el
-lisp/org-rmail.elc:	lisp/org.el
-lisp/org-src.elc:	lisp/org-macs.el lisp/org-compat.el
-lisp/org-table.elc:	lisp/org.el
-lisp/org-taskjuggler.elc: lisp/org.el lisp/org-exp.el
-lisp/org-timer.elc:	lisp/org.el
-lisp/org-vm.elc:	lisp/org.el
-lisp/org-w3m.elc:	lisp/org.el
-lisp/org-wl.elc:	lisp/org.el
-lisp/org-xoxo.elc:	lisp/org-exp.el
+org.elc:		org-macs.el org-compat.el org-faces.el
+org-agenda.elc:	org.el
+org-ascii.elc:	org-exp.el
+org-attach.elc:	org.el org-id.el
+org-archive.elc:	org.el
+org-bbdb.elc:	org.el
+org-beamer.elc:	org.el
+org-bibtex.elc:	org.el
+org-capture.elc:	org.el org-mks.el
+org-clock.elc:	org.el
+org-colview.elc:	org.el
+org-colview-xemacs.elc:	org.el
+org-compat.elc:	org-macs.el
+org-crypt.elc:	org-crypt.el org.el
+org-ctags.elc:	org.el
+org-datetree.elc:	org.el
+org-docview.elc:	org.el
+org-entities.elc:
+org-exp.elc:	org.el org-agenda.el
+org-exp-blocks.elc: org.el
+org-latex.elc:	org.el org-exp.el org-beamer.el
+org-docbook.elc:	org.el org-exp.el
+org-faces.elc:	org-macs.el org-compat.el
+org-feed.elc:	org.el
+org-footnotes.elc:	org-macs.el org-compat.el
+org-freemind.elc:	org.el
+org-gnus.elc:	org.el
+org-html.elc:	org-exp.el
+org-habit.elc:	org.el org-agenda.el
+org-icalendar.elc:	org-exp.el
+org-id.elc:	org.el
+org-indent.elc:	org.el org-macs.el org-compat.el
+org-info.elc:	org.el
+org-inlinetask.elc:
+org-irc.elc:	org.el
+org-jsinfo.elc:	org.el org-exp.el
+org-list.elc:	org-macs.el org-compat.el
+org-mac-message.elc:	org.el
+org-macs.elc:
+org-mew.elc:	org.el
+org-mhe.elc:	org.el
+org-mks.elc:
+org-mobile.elc:	org.el
+org-mouse.elc:	org.el
+org-plot.elc:	org.el org-exp.el org-table.el
+org-publish.elc:
+org-protocol.elc:	org.el
+org-remember.elc:	org.el
+org-rmail.elc:	org.el
+org-src.elc:	org-macs.el org-compat.el
+org-table.elc:	org.el
+org-taskjuggler.elc: org.el org-exp.el
+org-timer.elc:	org.el
+org-vm.elc:	org.el
+org-w3m.elc:	org.el
+org-wl.elc:	org.el
+org-xoxo.elc:	org-exp.el
diff -Naur '--exclude=*~' org-7.4/doc/org org-7.4.fink/doc/org
--- org-7.4/doc/org	2010-12-10 13:16:34.000000000 +0000
+++ org-7.4.fink/doc/org	2010-12-17 18:42:04.000000000 +0000
@@ -25,7 +25,7 @@
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
-* Org Mode: (org).      Outline-based notes management and organizer
+* Org Mode: (org-7.4).      Outline-based notes management and organizer
 END-INFO-DIR-ENTRY
 
 
diff -Naur '--exclude=*~' org-7.4/fink/50org.el org-7.4.fink/fink/50org.el
--- org-7.4/fink/50org.el	1970-01-01 01:00:00.000000000 +0100
+++ org-7.4.fink/fink/50org.el	2010-12-17 18:42:28.000000000 +0000
@@ -0,0 +1,3 @@
+(require 'org-install)
+(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
+(add-hook 'org-mode-hook 'turn-on-font-lock)  ; org-mode buffers only
diff -Naur '--exclude=*~' org-7.4/fink/emacsen-install org-7.4.fink/fink/emacsen-install
--- org-7.4/fink/emacsen-install	1970-01-01 01:00:00.000000000 +0100
+++ org-7.4.fink/fink/emacsen-install	2010-12-17 19:07:01.000000000 +0000
@@ -0,0 +1,54 @@
+#!/bin/bash -e
+
+set -o posix
+
+FLAVOR=${1}
+
+if [ ${FLAVOR} == emacs ]
+then
+    # This isn't really an emacs.  No need to print anything
+    exit 0
+fi
+
+echo >&2 "install/org-mode: Handling install of emacsen flavor ${FLAVOR}"
+
+if [ ${FLAVOR} == emacs20 ]
+then
+    echo "install/org-mode: Skipping unsupported flavor ${FLAVOR}"
+    exit 0
+fi
+
+if [ ${FLAVOR} == emacs21 ]
+then
+    echo "install/org-mode: Warning: org-mode may not work properly with emacs21"
+    echo "install/org-mode: Warning: consider updating to emacs version 22 or hiher;"
+    exit 0
+fi
+
+if [ ${FLAVOR} == xemacs ]
+then
+    echo "install/org-mode: Skipping unsupported flavor ${FLAVOR}"
+    exit 0
+fi
+
+# Install base elisp
+mkdir -p @PREFIX@/share/${FLAVOR}/site-lisp/org
+for i in ob-C.el ob-R.el ob-asymptote.el ob-calc.el ob-clojure.el ob-comint.el ob-css.el ob-ditaa.el ob-dot.el ob-emacs-lisp.el ob-eval.el ob-exp.el ob-gnuplot.el ob-haskell.el ob-js.el ob-keys.el ob-latex.el ob-ledger.el ob-lob.el ob-matlab.el ob-mscgen.el ob-ocaml.el ob-octave.el ob-org.el ob-perl.el ob-plantuml.el ob-python.el ob-ref.el ob-ruby.el ob-sass.el ob-scheme.el ob-screen.el ob-sh.el ob-sql.el ob-sqlite.el ob-table.el ob-tangle.el ob.el org-agenda.el org-archive.el org-ascii.el org-attach.el org-bbdb.el org-beamer.el org-bibtex.el org-capture.el org-clock.el org-colview-xemacs.el org-colview.el org-compat.el org-complete.el org-crypt.el org-ctags.el org-datetree.el org-docbook.el org-docview.el org-entities.el org-exp-blocks.el org-exp.el org-faces.el org-feed.el org-footnote.el org-freemind.el org-gnus.el org-habit.el org-html.el org-icalendar.el org-id.el org-indent.el org-info.el org-inlinetask.el org-install.el org-irc.el org-jsinfo.el org-latex.el org-list.el org-mac-message.el org-macs.el org-mew.el org-mhe.el org-mks.el org-mobile.el org-mouse.el org-plot.el org-protocol.el org-publish.el org-remember.el org-rmail.el org-src.el org-table.el org-taskjuggler.el org-timer.el org-vm.el org-w3m.el org-wl.el org-xoxo.el org.el Makefile; do
+  ln -s -f @PREFIX@/share/emacs/site-lisp/org/${i} @PREFIX@/share/${FLAVOR}/site-lisp/org;
+done
+
+echo >&2 -n "install/org-mode: Byte-compiling for ${FLAVOR}..."
+
+cd @PREFIX@/share/${FLAVOR}/site-lisp/org;
+
+(make EMACS=${FLAVOR} PREFIX="@PREFIX@" default --keep-going 2>&1) \
+  > @PREFIX@/share/doc/org-mode/CompilationLog-${FLAVOR}
+
+rm -f Makefile
+
+gzip -9qf @PREFIX@/share/doc/org-mode/CompilationLog-${FLAVOR};
+
+echo >&2 "done."
+echo >&2 "install/org-mode: Compilation log saved in @PREFIX@/share/doc/org-mode/CompilationLog-${FLAVOR}.gz."
+
+exit 0
diff -Naur '--exclude=*~' org-7.4/fink/emacsen-install-contrib org-7.4.fink/fink/emacsen-install-contrib
--- org-7.4/fink/emacsen-install-contrib	1970-01-01 01:00:00.000000000 +0100
+++ org-7.4.fink/fink/emacsen-install-contrib	2010-12-17 19:31:17.000000000 +0000
@@ -0,0 +1,54 @@
+#!/bin/bash -e
+
+set -o posix
+
+FLAVOR=${1}
+
+if [ ${FLAVOR} == emacs ]
+then
+    # No compilation done; no need to print anything
+    exit 0
+fi
+
+echo >&2 "install/org-mode-contrib: Handling install of emacsen flavor ${FLAVOR}"
+
+if [ ${FLAVOR} == emacs20 ]
+then
+    echo "install/org-mode-contrib: Skipping unsupported flavor ${FLAVOR}"
+    exit 0
+fi
+
+if [ ${FLAVOR} == emacs21 ]
+then
+    echo "install/org-mode-contrib: Warning: org-mode-contrib may not work propely with emacs21;"
+    echo "install/org-mode-contrib: Warning: consider updating to emacs version 2 or higher;"
+    exit 0
+fi
+
+if [ ${FLAVOR} == xemacs ]
+then
+    echo "install/org-mode-contrib: Skipping unsupported flavor ${FLAVOR}"
+    exit 0
+fi
+
+# Install contributed code
+mkdir -p @PREFIX@/share/${FLAVOR}/site-lisp/org/contrib;
+for i in org-annotate-file.el org-bookmark.el org-checklist.el org-choose.el org-collector.el org-contribdir.el org-depend.el org-drill.el org-elisp-symbol.el org-eval-light.el org-eval.el org-exp-bibtex.el org-expiry.el org-export-generic.el org-git-link.el org-interactive-query.el org-invoice.el org-jira.el org-learn.el org-mac-iCal.el org-mac-link-grabber.el org-mairix.el org-man.el org-mime.el org-mtags.el org-panel.el org-registry.el org-screen.el org-secretary.el org-special-blocks.el org-static-mathjax.el org-toc.el org-track.el org-velocity.el org-wikinodes.el org2rem.el orgtbl-sqlinsert.el; do
+  ln -s -f @PREFIX@/share/emacs/site-lisp/org/contrib/${i} @PREFIX@/share/${FLAVOR}/site-lisp/org/contrib;
+done
+
+echo >&2 -n "install/org-mode-contrib: Byte-compiling for ${FLAVOR}..."
+
+cd @PREFIX@/share/${FLAVOR}/site-lisp/org/contrib;
+
+(${FLAVOR} -batch --no-init-file --no-site-file \
+  --execute '(push "@PREFIX@/share/${FLAVOR}/site-lisp/org" load-path)' \
+  -f batch-byte-compile *.el 2>&1) \
+  > @PREFIX@/share/doc/org-mode-contrib/CompilationLog-${FLAVOR}
+
+gzip -9qf @PREFIX@/share/doc/org-mode-contrib/CompilationLog-${FLAVOR};
+
+echo >&2 "done."
+echo >&2 "install/org-mode-contrib: Compilation log saved in @PREFIX@/share/doc/org-mode-contrib/CompilationLog-${FLAVOR}.gz."
+
+exit 0
diff -Naur '--exclude=*~' org-7.4/fink/emacsen-remove org-7.4.fink/fink/emacsen-remove
--- org-7.4/fink/emacsen-remove	1970-01-01 01:00:00.000000000 +0100
+++ org-7.4.fink/fink/emacsen-remove	2010-12-17 18:45:13.000000000 +0000
@@ -0,0 +1,31 @@
+#!/bin/bash -e
+
+set -o posix
+
+FLAVOR=${1}
+
+if [ ${FLAVOR} == emacs ]
+then
+  exit 0
+fi
+
+echo "remove/org-mode: Handling removal for emacsen flavor ${FLAVOR}"
+
+if [ ${FLAVOR} == emacs20 ]
+then
+    echo "remove/org-mode: Skipping unsupported flavor ${FLAVOR}"
+    exit 0
+fi
+
+if [ ${FLAVOR} == xemacs ]
+then
+    echo "remove/org-mode: Skipping unsupported flavor ${FLAVOR}"
+    exit 0
+fi
+
+echo >&2 -n "remove/org-mode: Purging compilation log and byte-compiled files fo ${FLAVOR}..."
+rm -f @PREFIX@/share/doc/org-mode/CompilationLog-${FLAVOR}.gz
+rm -Rf @PREFIX@/share/${FLAVOR}/site-lisp/org
+echo >&2 "done."
+    
+exit 0
diff -Naur '--exclude=*~' org-7.4/fink/emacsen-remove-contrib org-7.4.fink/fink/emacsen-remove-contrib
--- org-7.4/fink/emacsen-remove-contrib	1970-01-01 01:00:00.000000000 +0100
+++ org-7.4.fink/fink/emacsen-remove-contrib	2010-12-17 18:45:54.000000000 +0000
@@ -0,0 +1,31 @@
+#!/bin/bash -e
+
+set -o posix
+
+FLAVOR=${1}
+
+if [ ${FLAVOR} == emacs ]
+then
+  exit 0
+fi
+
+echo "remove/org-mode-contrib: Handling removal for emacsen flavor ${FLAVOR}"
+
+if [ ${FLAVOR} == emacs20 ]
+then
+    echo "remove/org-mode-contrib: Skipping unsupported flavor ${FLAVOR}"
+    exit 0
+fi
+
+if [ ${FLAVOR} == xemacs ]
+then
+    echo "remove/org-mode-contrib: Skipping unsupported flavor ${FLAVOR}"
+    exit 0
+fi
+
+echo >&2 -n "remove/org-mode-contrib: Purging compilation log and byte-compiled iles for ${FLAVOR}..."
+rm -f @PREFIX@/share/doc/org-mode-contrib/CompilationLog-${FLAVOR}.gz
+rm -Rf @PREFIX@/share/${FLAVOR}/site-lisp/org/contrib
+echo >&2 "done."
+    
+exit 0