--- /usr/ports/Mk/bsd.emacs.mk	2012-02-22 18:55:25.000000000 +0530
+++ Mk/bsd.emacs.mk	2012-07-24 01:28:46.197758778 +0530
@@ -5,9 +5,9 @@
 #
 
 Emacs_Include=			bsd.emacs.mk
-Emacs_Include_MAINTAINER=	ports@FreeBSD.org
+Emacs_Include_MAINTAINER=	ashish@FreeBSD.org
 
-EMACS_PORT_NAME?=	emacs23
+EMACS_PORT_NAME?=	emacs24
 
 #
 # This file for ports which depend on emacs family.
@@ -114,6 +114,23 @@
 PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif
 
+# Emacs-24.x
+.elif (${EMACS_PORT_NAME} == "emacs24")
+EMACS_NAME=		emacs
+EMACS_VER=		24.1
+EMACS_MAJOR_VER=	24
+EMACS_LIBDIR?=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
+EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs
+EMACS_COMMON_PORT=	NO
+EMACS_HAS_MULE=		YES
+EMACS_NO_SUBDIRSEL=	NO
+.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
+COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
+PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
+.endif
+
 # Emacs-24.x (development version)
 .elif (${EMACS_PORT_NAME} == "emacs-devel")
 EMACS_NAME=		emacs
@@ -208,7 +225,8 @@
 check-makevars::
 	@${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}."
 	@${ECHO} "Valid values are:"
-	@${ECHO} "	Emacs  family: emacs21 emacs22 emacs23 emacs-devel"
+	@${ECHO} "	Emacs  family: emacs21 emacs22 emacs23 emacs24"
+	@${ECHO} "                     emacs-devel"
 	@${ECHO} "	XEmacs family: xemacs21 xemacs21-mule xemacs-devel"
 	@${ECHO} "	               xemacs-devel-mule xemacs-mule-xft"
 	@${FALSE}