--- ../../editors/emacs/modules.mk.orig	2011-03-24 00:15:20.000000000 +0900
+++ ../../editors/emacs/modules.mk	2012-03-06 21:22:17.000000000 +0900
@@ -346,7 +346,12 @@
 .  if empty(EMACS_TYPE:Memacs24)
 ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp
 .  else
-ALL_ENV+=	EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}/lisp:${_EMACS_DIR}/site-lisp
+_EMACS_VERSION_DIR!=   \
+       (${PKG_INFO} -e emacs || ${ECHO} "") |                          \
+       ${SED} -e 's/emacs-//' |                                        \
+       ${SED} -e 's/\.[0-9]\{8,\}//' |                                 \
+       ${SED} -e 's/nb.*//'
+ALL_ENV+=      EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_DIR}/lisp:${_EMACS_DIR}/site-lisp
 .  endif
 .include	"${_EMACS_PKGDIR}/buildlink3.mk"
 .endif