diff --git a/help/YATEXHLP.eng b/help/YATEXHLP.eng
index 40bfa2e..dfc1f47 100644
--- a/help/YATEXHLP.eng
+++ b/help/YATEXHLP.eng
@@ -1765,6 +1765,12 @@
  \caption{foo image}\label{foo-jpg}
 \end{wrapfigure}
 
+wraptable
+\begin{wraptable}[LINES]{POS}[OVH]{WIDTH} ...TABULAR... \end{wraptable}
+Create floating tabular.
+Usage is the same as wrapfigure environment except enclosing tabular.
+
+<refer wrapfigure>
 
 abstract
 \begin{abstract} ... \end{abstract}
diff --git a/help/YATEXHLP.jp b/help/YATEXHLP.jp
index e1c267e..554dd9a 100644
--- a/help/YATEXHLP.jp
+++ b/help/YATEXHLP.jp
@@ -1771,6 +1771,7 @@
 OVH(�ȗ���)	�摜�̒���o���}�[�W��(\wrapoverhang �ʏ�0)
 WIDTH		��荞�݂���(�摜���݂�)��
 
+
 �y�g�p��z
 % �v���A���u��
 \usepackage{wrapfig}
@@ -1780,6 +1781,13 @@
  \caption{�ق��ق�}\label{hoge-jpg}
 \end{wrapfigure}
 
+wraptable
+\begin{wraptable}[LINES]{POS}[OVH]{WIDTH} ...�\... \end{wraptable}
+���E��荞�݂̕\���o�͂���(table�‹��Ɠ��l�̃t���[�g�쐬)�B
+������tabular�n������_�ȊO�ɂ‚��Ă�wrapfigure�Ɠ��l�B
+
+<refer wrapfigure>
+
 abstract
 \begin{abstract} ... \end{abstract}
 ���^(�A�u�X�g���N�g)���o�͂���B
diff --git a/yatexadd.el b/yatexadd.el
index 40c5a7c..476eaa2 100644
--- a/yatexadd.el
+++ b/yatexadd.el
@@ -1,6 +1,6 @@
 ;;; yatexadd.el --- YaTeX add-in functions -*- coding: sjis -*-
 ;;; (c)1991-2019 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Sat Dec  4 07:11:07 2021 on firestorm
+;;; Last modified Wed Sep 21 21:22:37 2022 on firestorm
 ;;; $Id$
 
 ;;; Code:
@@ -193,15 +193,22 @@
 
 
 ;; wrapfig.sty
-(defun YaTeX:wrapfigure ()
-  (YaTeX-help "wrapfigure")
-  (concat
-   (let ((lines (YaTeX-read-string-or-skip "Wrap Lines(Optional): ")))
-     (if (string< "" lines)
-	 (concat "[" lines "]")))
-   "{" (YaTeX:read-oneof "rlioRLIO" t) "}"
-   "{" (YaTeX:read-length "Image width: ") "}"))
- 
+(defun YaTeX:wrapfigure (&optional kind)
+  (setq kind (or kind "figure"))
+  (YaTeX-help (concat "wrap" kind))
+  (prog1
+      (concat
+       (let ((lines (YaTeX-read-string-or-skip "Wrap Lines(Optional): ")))
+	 (if (string< "" lines)
+	     (concat "[" lines "]")))
+       "{" (YaTeX:read-oneof "rlioRLIO" t) "}"
+       "{" (YaTeX:read-length (concat (capitalize kind) " width: ")) "}")
+    (setq YaTeX-section-name "includegraphics")))
+
+(defun YaTeX:wraptable ()
+  (prog1
+      (YaTeX:wrapfigure "table")
+    (setq YaTeX-env-name "tabular")))
 
 ;;;
 ;;Sample functions for section-type command.