diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index b09900fbf1af..f9a3438c4607 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -14,13 +14,15 @@ MASTER_SITE_SUBDIR=	cedet
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dryice@liu.com.cn
 COMMENT=	Quick access to files and tags in an Emacs frame
 
 EMACS_PORT_NAME?=	emacs21
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+CONFLICTS=	cedet*
+INFO=		speedbar
 
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/speedbar
 
@@ -30,6 +32,12 @@ MUST_BE_RECOMPILED=	gud.el info.el rmail.el vhdl-mode.el
 
 EMACS_ARGS=	 -batch -l speedbar-compile-script -f batch-byte-compile
 
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "New version of speedbar is now in devel/cedet."
+	@${ECHO_MSG} "Hit C-c now if you want the new version."
+	@${ECHO_MSG} ""
+
 pre-build:
 .for i in ${MUST_BE_RECOMPILED}
 	${CP} `${FIND} ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/lisp -name ${i}` \
diff --git a/editors/speedbar/pkg-plist b/editors/speedbar/pkg-plist
index 821b4a4bab65..cefc5893e1c3 100644
--- a/editors/speedbar/pkg-plist
+++ b/editors/speedbar/pkg-plist
@@ -1,7 +1,3 @@
-@unexec install-info --delete %D/info/speedbar.info %D/info/dir
-@unexec [ -f %D/info/speedbar ] && install-info %D/info/speedbar %D/info/dir || true
-info/speedbar.info
-@exec install-info %D/info/speedbar.info %D/info/dir
 %%EMACS_VERSION_SITE_LISPDIR%%/speedbar/bigclock.el
 %%EMACS_VERSION_SITE_LISPDIR%%/speedbar/dframe.el
 %%EMACS_VERSION_SITE_LISPDIR%%/speedbar/dframe.elc