diff --git a/korean/ibus-hangul/Makefile b/korean/ibus-hangul/Makefile
index bd4a72ad147c..e3043743f23a 100644
--- a/korean/ibus-hangul/Makefile
+++ b/korean/ibus-hangul/Makefile
@@ -1,34 +1,36 @@
 PORTNAME=	ibus-hangul
-PORTVERSION=	1.5.1
-PORTREVISION=	3
+PORTVERSION=	1.5.5
 CATEGORIES=	korean
-MASTER_SITES=	https://github.com/choehwanjin/ibus-hangul/releases/download/${PORTVERSION}/
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Hangul input engine for IBus
 WWW=		https://github.com/libhangul/ibus-hangul/wiki
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libhangul.so:korean/libhangul \
 		libibus-1.0.so:textproc/ibus
 
-USES=		gmake gnome libtool pkgconfig python
+USES=		autoreconf gmake gnome libtool pkgconfig python
 USE_GNOME=	gtk30 intlhack pygobject3
 USE_PYTHON=	py3kplist
 
+GH_ACCOUNT=	choehwanjin
+GH_TAGNAME=	aa4b71c
+USE_GITHUB=	yes
+
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	NLS
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 NLS_USES_OFF=		gettext-tools
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-python="${PYTHON_CMD}"
 
 GLIB_SCHEMAS=	org.freedesktop.ibus.engine.hangul.gschema.xml
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/korean/ibus-hangul/distinfo b/korean/ibus-hangul/distinfo
index f98cb71538e9..3d836e795254 100644
--- a/korean/ibus-hangul/distinfo
+++ b/korean/ibus-hangul/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563219642
-SHA256 (ibus-hangul-1.5.1.tar.gz) = 7af195ba9c7b7964f079900e84a8c1989ad7de9ad1f9b11dea9914d75c430a3e
-SIZE (ibus-hangul-1.5.1.tar.gz) = 460517
+TIMESTAMP = 1782670131
+SHA256 (choehwanjin-ibus-hangul-1.5.5-aa4b71c_GH0.tar.gz) = ccc1fa40147a8578dcceca76e84f248e2acac35b639f72a4ca3f039ac981dd84
+SIZE (choehwanjin-ibus-hangul-1.5.5-aa4b71c_GH0.tar.gz) = 70648
diff --git a/korean/ibus-hangul/files/patch-setup_main.py b/korean/ibus-hangul/files/patch-setup_main.py
deleted file mode 100644
index 060cd3e1e902..000000000000
--- a/korean/ibus-hangul/files/patch-setup_main.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup/main.py.orig	2018-06-08 14:34:37 UTC
-+++ setup/main.py
-@@ -151,6 +151,7 @@ class Setup ():
-         self.__window = self.__builder.get_object("SetupDialog")
-         icon_file = os.path.join(config.pkgdatadir, "icons", "ibus-hangul.svg")
-         self.__window.set_icon_from_file(icon_file)
-+        self.__window.connect("destroy", Gtk.main_quit)
-         self.__window.show()
- 
-         button = self.__builder.get_object("button_apply")
diff --git a/korean/ibus-hangul/pkg-plist b/korean/ibus-hangul/pkg-plist
index f65e8e19d7cc..b05a5ed34f12 100644
--- a/korean/ibus-hangul/pkg-plist
+++ b/korean/ibus-hangul/pkg-plist
@@ -1,24 +1,29 @@
 bin/ibus-setup-hangul
 libexec/ibus-engine-hangul
 libexec/ibus-setup-hangul
 share/applications/ibus-setup-hangul.desktop
+share/glib-2.0/schemas/org.freedesktop.ibus.engine.hangul.gschema.xml
 %%DATADIR%%/data/symbol.txt
 %%DATADIR%%/icons/ibus-hangul.png
 %%DATADIR%%/icons/ibus-hangul.svg
+%%DATADIR%%/setup/__pycache__/config%%PYTHON_TAG%%.opt-1.pyc
+%%DATADIR%%/setup/__pycache__/config%%PYTHON_TAG%%.opt-2.pyc
+%%DATADIR%%/setup/__pycache__/config%%PYTHON_TAG%%.pyc
+%%DATADIR%%/setup/__pycache__/keycapturedialog%%PYTHON_TAG%%.opt-1.pyc
+%%DATADIR%%/setup/__pycache__/keycapturedialog%%PYTHON_TAG%%.opt-2.pyc
+%%DATADIR%%/setup/__pycache__/keycapturedialog%%PYTHON_TAG%%.pyc
+%%DATADIR%%/setup/__pycache__/main%%PYTHON_TAG%%.opt-1.pyc
+%%DATADIR%%/setup/__pycache__/main%%PYTHON_TAG%%.opt-2.pyc
+%%DATADIR%%/setup/__pycache__/main%%PYTHON_TAG%%.pyc
 %%DATADIR%%/setup/config.py
-%%DATADIR%%/setup/config.pyc
-%%DATADIR%%/setup/config.pyo
 %%DATADIR%%/setup/keycapturedialog.py
-%%DATADIR%%/setup/keycapturedialog.pyc
-%%DATADIR%%/setup/keycapturedialog.pyo
 %%DATADIR%%/setup/main.py
-%%PYTHON2%%%%DATADIR%%/setup/main.pyc
-%%PYTHON2%%%%DATADIR%%/setup/main.pyo
 %%DATADIR%%/setup/setup.ui
 share/ibus/component/hangul.xml
 share/icons/hicolor/64x64/apps/ibus-hangul.png
 share/icons/hicolor/64x64/apps/ibus-setup-hangul.png
 share/icons/hicolor/scalable/apps/ibus-hangul.svg
 share/icons/hicolor/scalable/apps/ibus-setup-hangul.svg
 %%NLS%%share/locale/ko/LC_MESSAGES/ibus-hangul.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-hangul.mo
+share/metainfo/org.freedesktop.ibus.engine.hangul.metainfo.xml