diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 77d51da5a5c..4535db91027 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.11 2012/01/13 00:55:14 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2012/01/21 13:54:51 sthen Exp $
 
 COMMENT-main =		GNU editor: extensible, customizable, self-documenting
 COMMENT-el =		elisp sources for those who want to read/modify them
 
 VERSION =		23.3
-DISTNAME =		emacs-${VERSION}
-PKGNAME-main =		emacs-${VERSION}
-FULLPKGNAME-el =	emacs-el-${VERSION}
+WRKDIST =		${WRKDIR}/emacs-23.3
+DISTNAME =		emacs-${VERSION}b
+PKGNAME-main =		emacs-${VERSION}b
+FULLPKGNAME-el =	emacs-el-${VERSION}b
 FULLPKGPATH-el =	editors/emacs23,-el
 
-REVISION-main =		5
-REVISION-el =		2
-
 CATEGORIES =		editors
 
 HOMEPAGE =		http://www.gnu.org/software/emacs/
diff --git a/editors/emacs23/distinfo b/editors/emacs23/distinfo
index 4f854ef0c0b..48e00369112 100644
--- a/editors/emacs23/distinfo
+++ b/editors/emacs23/distinfo
@@ -1,5 +1,5 @@
-MD5 (emacs-23.3.tar.gz) = vwfAHvRz2FQMnDn5RQax5g==
-RMD160 (emacs-23.3.tar.gz) = 44oTNzUgLBC90mTlYdKdu6r1WN4=
-SHA1 (emacs-23.3.tar.gz) = U73+WE+YwTJlyqPuo8/fecoPdYQ=
-SHA256 (emacs-23.3.tar.gz) = ADgkikKZcIqHF/L1ukjxwPFelf/F/PsIy+XDFGdX40w=
-SIZE (emacs-23.3.tar.gz) = 47664601
+MD5 (emacs-23.3b.tar.gz) = 8r/Y6rfjs0oPfwmswGZ+cQ==
+RMD160 (emacs-23.3b.tar.gz) = 0lOHTs71wJ01V2z1CHJ/WGPICDQ=
+SHA1 (emacs-23.3b.tar.gz) = VlA0cumbx8h17DcN7HtAd0z6gto=
+SHA256 (emacs-23.3b.tar.gz) = Vstttxep65Z54SRmVZg3xAR6F1yJ2MxNidTDeFYjIPk=
+SIZE (emacs-23.3b.tar.gz) = 47930061
diff --git a/editors/emacs23/pkg/PLIST-main b/editors/emacs23/pkg/PLIST-main
index 22d9937e4ca..d3ed35c608e 100644
--- a/editors/emacs23/pkg/PLIST-main
+++ b/editors/emacs23/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.1.1.1 2011/03/28 15:18:55 jasper Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2012/01/21 13:54:51 sthen Exp $
 @bin bin/b2m
 @bin bin/ctags
 @bin bin/ebrowse
@@ -283,6 +283,18 @@ share/emacs/${VERSION}/etc/gnus/
 share/emacs/${VERSION}/etc/gnus-tut.txt
 share/emacs/${VERSION}/etc/gnus/gnus-setup.ast
 share/emacs/${VERSION}/etc/gnus/news-server.ast
+share/emacs/${VERSION}/etc/grammars/
+share/emacs/${VERSION}/etc/grammars/bovine-grammar.el
+share/emacs/${VERSION}/etc/grammars/c.by
+share/emacs/${VERSION}/etc/grammars/grammar.wy
+share/emacs/${VERSION}/etc/grammars/java-tags.wy
+share/emacs/${VERSION}/etc/grammars/js.wy
+share/emacs/${VERSION}/etc/grammars/make.by
+share/emacs/${VERSION}/etc/grammars/python.wy
+share/emacs/${VERSION}/etc/grammars/README
+share/emacs/${VERSION}/etc/grammars/scheme.by
+share/emacs/${VERSION}/etc/grammars/srecode-template.wy
+share/emacs/${VERSION}/etc/grammars/wisent-grammar.el
 share/emacs/${VERSION}/etc/grep.txt
 share/emacs/${VERSION}/etc/images/
 share/emacs/${VERSION}/etc/images/README