diff --git a/graphics/rabbit/Makefile b/graphics/rabbit/Makefile
index 0da5f19148c7..a278bfaf5600 100644
--- a/graphics/rabbit/Makefile
+++ b/graphics/rabbit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2019/09/14 18:37:04 tsutsui Exp $
+# $NetBSD: Makefile,v 1.60 2019/10/05 06:11:25 ryoon Exp $
 #
 
-DISTNAME=	rabbit-2.2.1
-PKGREVISION=	1
+DISTNAME=	rabbit-3.0.0
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://rabbit-shocker.org/download/
 
@@ -11,7 +10,8 @@ HOMEPAGE=	http://rabbit-shocker.org/
 COMMENT=	RD-document-based presentation application
 LICENSE=	gnu-gpl-v2 # or later
 
-DEPENDS+=	${RUBY_PKGPREFIX}-gtk2>=3.3.8:../../x11/ruby-gtk2
+DEPENDS+=	${RUBY_PKGPREFIX}-gdk_pixbuf2>=3.0.9:../../graphics/ruby-gdk_pixbuf2
+DEPENDS+=	${RUBY_PKGPREFIX}-gtk3>=3.3.8:../../x11/ruby-gtk3
 DEPENDS+=	${RUBY_PKGPREFIX}-rsvg2>=3.3.8:../../graphics/ruby-rsvg2
 DEPENDS+=	${RUBY_PKGPREFIX}-poppler>=3.3.8:../../print/ruby-poppler
 DEPENDS+=	${RUBY_PKGPREFIX}-hikidoc-[0-9]*:../../textproc/ruby-hikidoc
@@ -19,7 +19,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-nokogiri-[0-9]*:../../textproc/ruby-nokogiri
 DEPENDS+=	${RUBY_PKGPREFIX}-rdtool>=0.6.20:../../textproc/ruby-rdtool
 DEPENDS+=	${RUBY_PKGPREFIX}-rttool-[0-9]*:../../textproc/ruby-rttool
 DEPENDS+=	${RUBY_PKGPREFIX}-coderay>=1.0.0:../../textproc/ruby-coderay
-DEPENDS+=	${RUBY_PKGPREFIX}-kramdown-[0-9]*:../../textproc/ruby-kramdown
+DEPENDS+=	${RUBY_PKGPREFIX}-kramdown-parser-gfm-[0-9]*:../../textproc/ruby-kramdown-parser-gfm
 DEPENDS+=	${RUBY_PKGPREFIX}-gettext>=3.0.1:../../devel/ruby-gettext
 DEPENDS+=	${RUBY_PKGPREFIX}-faraday-[0-9]*:../../www/ruby-faraday
 DEPENDS+=	${RUBY_PKGPREFIX}-rouge-[0-9]*:../../www/ruby-rouge
diff --git a/graphics/rabbit/PLIST b/graphics/rabbit/PLIST
index 616039314dd1..6b8f3321778f 100644
--- a/graphics/rabbit/PLIST
+++ b/graphics/rabbit/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.30 2017/09/18 05:31:02 taca Exp $
+@comment $NetBSD: PLIST,v 1.31 2019/10/05 06:11:25 ryoon Exp $
 bin/rabbirc${RUBY_SUFFIX}
-bin/rabbit${RUBY_SUFFIX}
 bin/rabbit-command${RUBY_SUFFIX}
 bin/rabbit-slide${RUBY_SUFFIX}
 bin/rabbit-theme${RUBY_SUFFIX}
+bin/rabbit${RUBY_SUFFIX}
 ${RUBY_VENDORLIB}/rabbit/action.rb
 ${RUBY_VENDORLIB}/rabbit/action/basic.rb
 ${RUBY_VENDORLIB}/rabbit/action/radio.rb
@@ -11,6 +11,7 @@ ${RUBY_VENDORLIB}/rabbit/action/toggle.rb
 ${RUBY_VENDORLIB}/rabbit/author-configuration.rb
 ${RUBY_VENDORLIB}/rabbit/canvas.rb
 ${RUBY_VENDORLIB}/rabbit/command/rabbit-slide.rb
+${RUBY_VENDORLIB}/rabbit/command/rabbit-slide.ui
 ${RUBY_VENDORLIB}/rabbit/command/rabbit-theme.rb
 ${RUBY_VENDORLIB}/rabbit/command/rabbit.rb
 ${RUBY_VENDORLIB}/rabbit/config.rb
@@ -49,6 +50,7 @@ ${RUBY_VENDORLIB}/rabbit/element/text.rb
 ${RUBY_VENDORLIB}/rabbit/element/title-slide.rb
 ${RUBY_VENDORLIB}/rabbit/element/video.rb
 ${RUBY_VENDORLIB}/rabbit/error.rb
+${RUBY_VENDORLIB}/rabbit/filename.rb
 ${RUBY_VENDORLIB}/rabbit/formatter.rb
 ${RUBY_VENDORLIB}/rabbit/frame.rb
 ${RUBY_VENDORLIB}/rabbit/front.rb
@@ -79,6 +81,7 @@ ${RUBY_VENDORLIB}/rabbit/logger/base.rb
 ${RUBY_VENDORLIB}/rabbit/logger/gui.rb
 ${RUBY_VENDORLIB}/rabbit/logger/stderr.rb
 ${RUBY_VENDORLIB}/rabbit/menu.rb
+${RUBY_VENDORLIB}/rabbit/pango-markup.rb
 ${RUBY_VENDORLIB}/rabbit/parser.rb
 ${RUBY_VENDORLIB}/rabbit/parser/base.rb
 ${RUBY_VENDORLIB}/rabbit/parser/ext/aafigure.rb
@@ -146,11 +149,10 @@ ${RUBY_VENDORLIB}/rabbit/renderer/engine/cairo.rb
 ${RUBY_VENDORLIB}/rabbit/renderer/gl.rb
 ${RUBY_VENDORLIB}/rabbit/renderer/kernel.rb
 ${RUBY_VENDORLIB}/rabbit/renderer/offscreen.rb
-${RUBY_VENDORLIB}/rabbit/renderer/print.rb
-${RUBY_VENDORLIB}/rabbit/renderer/print/base.rb
-${RUBY_VENDORLIB}/rabbit/renderer/print/cairo.rb
-${RUBY_VENDORLIB}/rabbit/renderer/print/layout.rb
-${RUBY_VENDORLIB}/rabbit/renderer/print/multiple.rb
+${RUBY_VENDORLIB}/rabbit/renderer/print-layout.rb
+${RUBY_VENDORLIB}/rabbit/renderer/printer.rb
+${RUBY_VENDORLIB}/rabbit/renderer/screen.rb
+${RUBY_VENDORLIB}/rabbit/renderer/widget/drawing-area.rb
 ${RUBY_VENDORLIB}/rabbit/search-window.rb
 ${RUBY_VENDORLIB}/rabbit/searcher.rb
 ${RUBY_VENDORLIB}/rabbit/size.rb
@@ -168,9 +170,7 @@ ${RUBY_VENDORLIB}/rabbit/source.rb
 ${RUBY_VENDORLIB}/rabbit/source/argf.rb
 ${RUBY_VENDORLIB}/rabbit/source/base.rb
 ${RUBY_VENDORLIB}/rabbit/source/file.rb
-${RUBY_VENDORLIB}/rabbit/source/hiki.rb
 ${RUBY_VENDORLIB}/rabbit/source/memory.rb
-${RUBY_VENDORLIB}/rabbit/source/slide-share.rb
 ${RUBY_VENDORLIB}/rabbit/source/uri.rb
 ${RUBY_VENDORLIB}/rabbit/stock.rb
 ${RUBY_VENDORLIB}/rabbit/task.rb
diff --git a/graphics/rabbit/distinfo b/graphics/rabbit/distinfo
index bd50d56ce093..f384c737f191 100644
--- a/graphics/rabbit/distinfo
+++ b/graphics/rabbit/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.40 2017/09/18 05:31:02 taca Exp $
+$NetBSD: distinfo,v 1.41 2019/10/05 06:11:25 ryoon Exp $
 
-SHA1 (rabbit-2.2.1.tar.gz) = 88a96da378173157a141bcc2c3c130f89ca714d6
-RMD160 (rabbit-2.2.1.tar.gz) = 4dd05b3e0cc9e944a8649ec8a9029817ae96dc1c
-SHA512 (rabbit-2.2.1.tar.gz) = 5da26b3ab9b2dfbb18fc84a320084d16552a1c797d654221b6d29bab72bf7c3ac8a886ee4e9f41b49fd6f70baf637bf7a5bb2b870dab5481e7e21fa801903f37
-Size (rabbit-2.2.1.tar.gz) = 5227210 bytes
+SHA1 (rabbit-3.0.0.tar.gz) = 8eab74ee5afbe5a01678bae9e25fec2e280360d8
+RMD160 (rabbit-3.0.0.tar.gz) = 3f72ef3f62013562cb602530f01c1098d9c8f181
+SHA512 (rabbit-3.0.0.tar.gz) = 5f91dbb7e5c5ae407ddaa1230492837c5f67415afaa512eba9d5d3e4ba40609051ac55115b27e7c0e4515a390f1bef98cb053e0a1baa97d08bce379ff92d479b
+Size (rabbit-3.0.0.tar.gz) = 5328773 bytes