diff --git a/gobject-introspection-1.58.0.tar.xz b/gobject-introspection-1.58.0.tar.xz
deleted file mode 100644
index cdda6e2..0000000
--- a/gobject-introspection-1.58.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27c1590a32749de0a5481ce897772547043e94bccba4bc0a7edb3d8513e401ec
-size 1370824
diff --git a/gobject-introspection-1.58.1.tar.xz b/gobject-introspection-1.58.1.tar.xz
new file mode 100644
index 0000000..302d45e
--- /dev/null
+++ b/gobject-introspection-1.58.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4954681fa5c5ed95451d914de89de1263a5b35158b1ded1a8b870042c0d0df89
+size 1377340
diff --git a/gobject-introspection-3.30.0-install-warnlib.patch b/gobject-introspection-3.30.0-install-warnlib.patch
deleted file mode 100644
index da0e785..0000000
--- a/gobject-introspection-3.30.0-install-warnlib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a68cfd769904c621fb2ebc0c4f24f2659fa283de Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar@gmail.com>
-Date: Fri, 7 Sep 2018 16:12:59 +0200
-Subject: [PATCH] meson: Install warnlib
-
-For some reason, meson build system did not install warnlib.
-Let's do it.
-
-Patch from Arch Linux
----
- tests/meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 71cd97fe..18cc0807 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -8,6 +8,8 @@ test_regress_incdirs = include_directories(['.', 'scanner'])
- installed_sources = [
-   'scanner/regress.c',
-   'scanner/regress.h',
-+  'scanner/warnlib.c',
-+  'scanner/warnlib.h',
-   'gimarshallingtests.c',
-   'gimarshallingtests.h',
-   'gitestmacros.h',
--- 
-2.18.0
-
diff --git a/gobject-introspection.changes b/gobject-introspection.changes
index 139e49c..80b7ff7 100644
--- a/gobject-introspection.changes
+++ b/gobject-introspection.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Nov 17 19:23:24 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 1.58.1:
+  + meson:
+    - Install warnlib.
+    - Add back /usr/bin/env to the python-cmd.
+  + scanner: Parse __typeof__ and discard it.
+  + Fix non libtool build.
+- Drop gobject-introspection-3.30.0-install-warnlib.patch: Fixed
+  upstream.
+- Modernize spec, use autosetup macro.
+
 -------------------------------------------------------------------
 Wed Sep 26 21:54:30 UTC 2018 - luc14n0@linuxmail.org
 
diff --git a/gobject-introspection.spec b/gobject-introspection.spec
index bebae0d..dd18666 100644
--- a/gobject-introspection.spec
+++ b/gobject-introspection.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gobject-introspection
-Version:        1.58.0
+Version:        1.58.1
 Release:        0
 # FIXME: Find a way to identify if we need python3-gobject or python-gobject from gi-find-deps.sh.
 Summary:        GObject Introspection Tools
@@ -32,8 +32,6 @@ Source2:        gobjectintrospection.attr
 Source3:        gobject-introspection-typelib.template
 Source98:       baselibs.conf
 Source99:       %{name}-rpmlintrc
-#PATCH-FIX-UPSTREAM gobject-introspection-3.30.0-install-warnlib.patch -- install missing file (picked from upstream)
-Patch0:         gobject-introspection-3.30.0-install-warnlib.patch
 
 BuildRequires:  bison
 BuildRequires:  fdupes
@@ -101,13 +99,13 @@ The goal of the project is to describe the APIs and collect them in
 a uniform, machine readable format.
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 
 %build
 %meson \
-    -Dgtk-doc=true \
-    -Dpython='%{_bindir}/python3'
+	-Dgtk-doc=true \
+	-Dpython='%{_bindir}/python3' \
+	%{nil}
 %meson_build
 
 %check