diff --git a/.gitignore b/.gitignore
index e943ac0..4bd8d2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ M2Crypto-0.20.2.tar.gz
 /M2Crypto-0.27.0.tar.gz.asc
 /M2Crypto-0.28.2.tar.gz
 /M2Crypto-0.28.2.tar.gz.asc
+/M2Crypto-0.30.1.tar.gz
+/M2Crypto-0.30.1.tar.gz.asc
diff --git a/m2crypto-0.26.4-gcc_macros.patch b/m2crypto-0.26.4-gcc_macros.patch
deleted file mode 100644
index 224cd15..0000000
--- a/m2crypto-0.26.4-gcc_macros.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- M2Crypto/SWIG/_m2crypto.i	2017-09-26 11:26:33.000000000 +0200
-+++ M2Crypto-0.26.4/SWIG/_m2crypto.i	2017-09-26 21:04:14.080330741 +0200
-@@ -7,6 +7,7 @@
-  * Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
-  *
-  */
-+%import "gcc_macros.h"
- 
- %module(threads=1) m2crypto
- /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere.
-@@ -15,11 +16,6 @@
- %nothreadblock;
- %nothreadallow;
- 
--#if SWIG_VERSION >= 0x030000
--#define __WCHAR_MAX__ __WCHAR_MAX
--#define __WCHAR_MIN__ __WCHAR_MIN
--#endif
--
- %{
- #if __GNUC__ < 5
- #pragma GCC diagnostic ignored "-Wunused-label"
diff --git a/m2crypto-0.30.1-gcc_macros.patch b/m2crypto-0.30.1-gcc_macros.patch
new file mode 100644
index 0000000..a31e86e
--- /dev/null
+++ b/m2crypto-0.30.1-gcc_macros.patch
@@ -0,0 +1,23 @@
+diff -up M2Crypto-0.30.1/SWIG/_m2crypto.i.gcc_macros M2Crypto-0.30.1/SWIG/_m2crypto.i
+--- M2Crypto-0.30.1/SWIG/_m2crypto.i.gcc_macros	2018-02-24 14:54:59.000000000 +0100
++++ M2Crypto-0.30.1/SWIG/_m2crypto.i	2018-05-19 06:07:31.032986837 +0200
+@@ -7,6 +7,7 @@
+  * Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
+  *
+  */
++%import "gcc_macros.h"
+ 
+ %module(threads=1) m2crypto
+ /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere.
+@@ -15,11 +16,6 @@
+ %nothreadblock;
+ %nothreadallow;
+ 
+-#if SWIG_VERSION >= 0x030000
+-#define __WCHAR_MAX__ __WCHAR_MAX
+-#define __WCHAR_MIN__ __WCHAR_MIN
+-#endif
+-
+ %{
+ #ifdef _WIN32
+ #define _WINSOCKAPI_
diff --git a/m2crypto.spec b/m2crypto.spec
index a4b6edd..a0801ae 100644
--- a/m2crypto.spec
+++ b/m2crypto.spec
@@ -1,13 +1,11 @@
 Summary: Support for using OpenSSL in Python 2 scripts
 Name: m2crypto
-Version: 0.28.2
-Release: 2%{?dist}
-Source0: https://pypi.python.org/packages/4e/bd/690f9b8aa87b82b0905c6e928da4cb0ce3ac65b1fc43c8efd3f8104e345e/M2Crypto-0.28.2.tar.gz
-# Should generally be available at pypi; for this release it has been obtained independently.
-Source1: M2Crypto-0.28.2.tar.gz.asc
-# Source1: https://pypi.python.org/packages/4e/bd/690f9b8aa87b82b0905c6e928da4cb0ce3ac65b1fc43c8efd3f8104e345e/M2Crypto-0.28.2.tar.gz.asc
+Version: 0.30.1
+Release: 1%{?dist}
+Source0: https://files.pythonhosted.org/packages/41/50/7d85dc99b1c4f29eca83873d851ec29a8e484a66b31351e62e30be9db7d1/M2Crypto-0.30.1.tar.gz
+Source1: https://files.pythonhosted.org/packages/41/50/7d85dc99b1c4f29eca83873d851ec29a8e484a66b31351e62e30be9db7d1/M2Crypto-0.30.1.tar.gz.asc
 # This is only precautionary, it does fix anything - not sent upstream
-Patch0: m2crypto-0.26.4-gcc_macros.patch
+Patch0: m2crypto-0.30.1-gcc_macros.patch
 Requires: python2-typing
  
 License: MIT
@@ -95,6 +93,9 @@ popd
 %{python3_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Sat May 19 2018 Miloslav Trmač <mitr@redhat.com> - 0.30.1-1
+- Update to M2Crypto-0.30.1
+
 * Sat Feb 17 2018 Miloslav Trmač <mitr@redhat.com> - 0.28.2-2
 - Add a python3-m2crypto subpackage
 
diff --git a/sources b/sources
index 2a79031..e3c5527 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (M2Crypto-0.28.2.tar.gz) = 57314a3ac70609386cf7cd5fda7fa4371a7b4fef5d1f49ea46215097f31bd98f98431c1698de47e670d7176639a6c0e53b14d981aca0f5f430a5dd7970784d7b
-SHA512 (M2Crypto-0.28.2.tar.gz.asc) = 17979f58802e0a4de0536fdc523be740fb257b889d78679645972cc84e364e0901964dcc99073b4c7ddd7d45fb2c18fca35438935bd7d0aa3e979c6f0e2dae50
+SHA512 (M2Crypto-0.30.1.tar.gz) = c85b6350d8b6b4a14e9c76b755cdc1a88d7ba63ae75ebfbb32d42389225c0a3cf9d530f95c2651ff3811c755cd9bbb482f81fdb0dcf670d7a0015320622725b2
+SHA512 (M2Crypto-0.30.1.tar.gz.asc) = 5ec4ad657395a370af3044889acf8b88a50d95a7f46d39f64039296181bdb7c419e2e4151aeef289d016899a27a7389d5c26832e21c6ebcac64285177bb846fa