diff --git a/Fix-issue-with-unbuffered-text-I-O-under-python3.patch b/Fix-issue-with-unbuffered-text-I-O-under-python3.patch
new file mode 100644
index 0000000..a7eb376
--- /dev/null
+++ b/Fix-issue-with-unbuffered-text-I-O-under-python3.patch
@@ -0,0 +1,29 @@
+From 8d9a7d6dacad4a033f2a4c800ff32137e6e894da Mon Sep 17 00:00:00 2001
+From: Bruce Rogers <brogers@suse.com>
+Date: Wed, 28 Oct 2020 18:09:24 -0600
+Subject: [PATCH] Fix issue with unbuffered text I/O under python3
+
+This fix is in an upstream pull request, as shown here:
+https://github.com/aspiers/git-deps/pull/93/commits/6beebe034b5c6fd19d73edd774dbf424ea183fee
+
+Signed-off-by: Bruce Rogers <brogers@suse.com>
+---
+ git_deps/cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/git_deps/cli.py b/git_deps/cli.py
+index 9e8b0ab..7882088 100755
+--- a/git_deps/cli.py
++++ b/git_deps/cli.py
+@@ -135,7 +135,7 @@ def main(args):
+     if options.serve:
+         serve(options)
+     else:
+-        sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
++        sys.stdout = os.fdopen(sys.stdout.fileno(), 'w')
+         try:
+             cli(options, args)
+         except InvalidCommitish as e:
+-- 
+2.29.0
+
diff --git a/dont-use-st-markdown.patch b/dont-use-st-markdown.patch
index 265b55c..42c83e3 100644
--- a/dont-use-st-markdown.patch
+++ b/dont-use-st-markdown.patch
@@ -37,7 +37,7 @@
 +            "Topic :: Utilities"
 +        ],
 +        scripts = ["bin/git-fixup"],
-+        # packages = "git_deps",
++        packages = ["git_deps", "git_deps/listener"],
 +        # data_files = "share/git_deps = share/gitfile-handler.desktop",
          setup_requires=[
              'six',
diff --git a/git-deps.changes b/git-deps.changes
index fe6b585..422e743 100644
--- a/git-deps.changes
+++ b/git-deps.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Oct 29 15:48:48 UTC 2020 - Bruce Rogers <brogers@suse.com>
+
+- Fix setup.py to correctly identify the project packages git_deps
+  and git_deps/listener. These were not being packaged and as a
+  result the git-deps command was simply failing
+- Fix issue with unbuffered text I/O under python3, as identified in
+https://github.com/aspiers/git-deps/pull/93/commits/6beebe034b5c6fd19d73edd774dbf424ea183fee
+
 -------------------------------------------------------------------
 Mon Jun  1 17:25:50 UTC 2020 - Matej Cepl <mcepl@suse.com>
 
diff --git a/git-deps.spec b/git-deps.spec
index 7af63f3..a55ed0a 100644
--- a/git-deps.spec
+++ b/git-deps.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define skip_python2 1
 Name:           git-deps
@@ -26,13 +27,14 @@ Group:          Development/Tools/Version Control
 URL:            https://github.com/aspiers/git-deps
 Source:         %{name}-%{version}.tar.xz
 Patch0:         dont-use-st-markdown.patch
-BuildRequires:  python-rpm-macros
-BuildRequires:  fdupes
-BuildRequires:  %{python_module setuptools}
+Patch1:         Fix-issue-with-unbuffered-text-I-O-under-python3.patch
 BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module wheel}
-BuildRequires:  %{python_module six}
 BuildRequires:  %{python_module pygit2}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module six}
+BuildRequires:  %{python_module wheel}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 Requires:       python-pygit2
 # for html subpackage
 Requires:       python-Flask
@@ -48,6 +50,7 @@ file bugs at https://github.com/aspiers/git-deps/issues
 
 %package html
 Summary:        Tool to analyze git deps - HTML parts
+Group:          Development/Tools/Version Control
 
 %description html
 Documentation for git-deps.