diff --git a/SOURCES/liblangtag-noparallel-gir.patch b/SOURCES/liblangtag-noparallel-gir.patch
new file mode 100644
index 0000000..d5b2bcf
--- /dev/null
+++ b/SOURCES/liblangtag-noparallel-gir.patch
@@ -0,0 +1,8 @@
+diff -pruN liblangtag-0.6.2.orig/liblangtag-gobject/gendeps.sh liblangtag-0.6.2/liblangtag-gobject/gendeps.sh
+--- liblangtag-0.6.2.orig/liblangtag-gobject/gendeps.sh	2012-12-13 17:59:17.000000000 +0900
++++ liblangtag-0.6.2/liblangtag-gobject/gendeps.sh	2020-11-18 21:10:08.511540427 +0900
+@@ -11,3 +11,4 @@ while [ $# -ne 0 ]; do
+     echo "	\$(AM_V_GEN) \$(srcdir)/gengir.sh \$(top_srcdir)/liblangtag \$@"
+ done
+ echo "\$(srcdir)/gendir.sh:"
++echo ".NOTPARALLEL:"
diff --git a/SPECS/liblangtag.spec b/SPECS/liblangtag.spec
index f76056e..7531d37 100644
--- a/SPECS/liblangtag.spec
+++ b/SPECS/liblangtag.spec
@@ -5,17 +5,20 @@
 
 Name: liblangtag
 Version: 0.6.2
-Release: 5%{?dist}
+Release: 8%{?dist}
 Summary: An interface library to access tags for identifying languages
 
 License: LGPLv3+ or MPLv2.0
 URL: http://tagoh.bitbucket.org/liblangtag/
 Source0: https://bitbucket.org/tagoh/%{name}/downloads/%{name}-%{version}.tar.bz2
+Patch0: liblangtag-noparallel-gir.patch
 
 Requires: %{name}-data = %{version}-%{release}
 
 BuildRequires: glibc-common
+%if ! 0%{?flatpak}
 BuildRequires: gtk-doc
+%endif
 BuildRequires: pkgconfig(check)
 BuildRequires: pkgconfig(gobject-2.0)
 BuildRequires: pkgconfig(gobject-introspection-1.0)
@@ -76,7 +79,11 @@ The %{name}-doc package contains documentation files for %{name}.
 %autosetup -p1
 
 %build
-%configure --disable-silent-rules --disable-static --enable-shared --enable-introspection
+%configure \
+%if 0%{?flatpak}
+  --disable-gtk-doc \
+%endif
+  --disable-silent-rules --disable-static --enable-shared --enable-introspection
 sed -i \
     -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
     -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
@@ -127,6 +134,11 @@ make %{?_smp_mflags} check
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Wed Nov 18 2020 Akira TAGOH <tagoh@redhat.com> - 0.6.2-8
+- Suppress documentation in Flatpak builds
+  Resolves: rhbz#1896257
+- build gir with non-parallel to avoid strange behavior.
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild