diff --git a/python-columnize-no-mock.patch b/python-columnize-no-mock.patch
index dc2855a..639b7ee 100644
--- a/python-columnize-no-mock.patch
+++ b/python-columnize-no-mock.patch
@@ -22,7 +22,7 @@
  "Unit test for Columnize"
 -import mock, operator, os, sys, unittest
 +import operator, os, sys, unittest
-+from unittest.mock import mock
++import unittest.mock as mock
  
  top_builddir = os.path.join(os.path.dirname(__file__), os.path.pardir)
  if top_builddir[-1] != os.path.sep:
diff --git a/python-columnize.spec b/python-columnize.spec
index 25214c9..acc6347 100644
--- a/python-columnize.spec
+++ b/python-columnize.spec
@@ -49,8 +49,9 @@ BuildArch:      noarch
 Format a simple (i.e. not nested) list into aligned columns.
 
 %prep
-%autosetup -p1 -n columnize-%{version}
+%setup -q -n columnize-%{version}
 cp %{SOURCE1} ./
+%autopatch -p1
 
 %build
 %python_build