diff --git a/yatex.el b/yatex.el
index 20ca7f9..f1990ee 100644
--- a/yatex.el
+++ b/yatex.el
@@ -1,6 +1,6 @@
 ;;; yatex.el --- Yet Another tex-mode for emacs //�쒹// -*- coding: sjis -*-
 ;;; (c)1991-2015 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Wed Jul  8 13:41:17 2015 on duke
+;;; Last modified Fri Aug 28 21:02:24 2015 on zxr
 ;;; $Id$
 ;;; The latest version of this software is always available at;
 ;;; http://www.yatex.org/
@@ -299,6 +299,8 @@
      ("frac" 2) ("sqrt") ("mathrm") ("mathbf") ("mathit")
      ;;cleveref
      ("cref") ("crefrange") ("cpageref") ("labelcref") ("labelcpageref")
+     ;; beamer
+     ("frametitle") ("framesubtitle")
      )
    (if YaTeX-use-LaTeX2e
        '(("documentclass") ("usepackage")
@@ -349,7 +351,7 @@
 ; Set tex-environment possible completion
 (defvar env-table
   (append
-   '(("quote") ("quotation") ("center") ("verse") ("document")
+   '(("quote") ("quotation") ("centerc") ("verse") ("document")
      ("verbatim") ("itemize") ("enumerate") ("description")
      ("list") ("tabular") ("tabular*") ("table") ("tabbing") ("titlepage")
      ("sloppypar") ("picture") ("displaymath")
@@ -359,6 +361,7 @@
      ("minipage")
      ("supertabular")
      ("wrapfigure") ("wraptable")
+     ("frame") ("block") ("example")				;beamer
      )
    (if YaTeX-use-LaTeX2e
        '(("comment")			;defined in version
@@ -410,6 +413,7 @@
      ("linebreak") ("pagebreak") ("noindent") ("indent")
      ("left") ("right") ("dots") ("smallskip") ("medskip") ("bigskip")
      ("displaystyle")
+     ("onslide") ("pause")		;beamer
      )
    (if YaTeX-greek-by-maketitle-completion
        '(("alpha") ("beta") ("gamma") ("delta") ("epsilon")
diff --git a/yatexadd.el b/yatexadd.el
index 343b5f5..ecfed6a 100644
--- a/yatexadd.el
+++ b/yatexadd.el
@@ -1,6 +1,6 @@
 ;;; yatexadd.el --- YaTeX add-in functions -*- coding: sjis -*-
 ;;; (c)1991-2015 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Wed Jul  8 09:15:15 2015 on firestorm
+;;; Last modified Fri Aug 28 20:52:57 2015 on zxr
 ;;; $Id$
 
 ;;; Code:
@@ -2105,6 +2105,27 @@
        ((memq c '(?c ?C)) (setq left "{\\scriptsize " right "}")))
       (format "%s%s%s" left char right)))))
 
+;;; -------------------- beamer stuff --------------------
+(defvar YaTeX:frame-option-alist-default
+  '(("plain") ("containverbatim") ("shrink") ("squeeze")
+    ("allowframebreaks") ("label=")))
+(defvar YaTeX:frame-option-alist-private nil
+  "*Alist for completion list of the argument for `frame' environemnt")
+(defvar YaTeX:frame-option-alist
+  (append YaTeX:frame-option-alist-private YaTeX:frame-option-alist-default))
+
+(defun YaTeX:frame ()
+  (let*((minibuffer-local-completion-map YaTeX-minibuffer-completion-map)
+	(delim ",")
+	(opt (YaTeX-completing-read-or-skip
+	      "Frame option: " YaTeX:frame-option-alist))
+	(title (YaTeX-read-string-or-skip "Title: "))
+	(subtitle (YaTeX-read-string-or-skip "Subtitle: ")))
+    (concat
+     (if (string< "" opt)	(concat "[" opt "]"))
+     (if (string< "" title)	(concat "{" title "}"))
+     (if (string< "" subtitle)	(concat "{" subtitle "}")))))
+
 ;;; -------------------- math-mode stuff --------------------
 (defun YaTeX::tilde (&optional pos)
   "For accent macros in mathmode"