diff --git a/libnma-1.8.28.tar.xz b/libnma-1.8.28.tar.xz
deleted file mode 100644
index 2b7af6d..0000000
--- a/libnma-1.8.28.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726
-size 1366584
diff --git a/libnma-1.8.30.tar.xz b/libnma-1.8.30.tar.xz
new file mode 100644
index 0000000..f0ddfbb
--- /dev/null
+++ b/libnma-1.8.30.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da33e72a49e07d855d97a52aa9a8962a4c96f52b9168c4e0027117ad8ffdafb4
+size 1386248
diff --git a/libnma-fix-segment-fault.patch b/libnma-fix-segment-fault.patch
deleted file mode 100644
index 37d8b37..0000000
--- a/libnma-fix-segment-fault.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From c901762a4c310bc651590df11152d2fbbf5aa9c1 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Sat, 11 Apr 2020 15:44:17 +0200
-Subject: [PATCH] nma-ws: properly dispose wireless security objects
-
-Chain up to parent to properly free resources on dispose().
-
-Fixes: b61cc1b9fa040 ("nma-ws: add")
-
-https://gitlab.gnome.org/GNOME/libnma/-/issues/7
----
- src/nma-ws/nma-ws-802-1x.c  | 2 ++
- src/nma-ws/nma-ws-leap.c    | 2 ++
- src/nma-ws/nma-ws-sae.c     | 2 ++
- src/nma-ws/nma-ws-wep-key.c | 2 ++
- src/nma-ws/nma-ws-wpa-psk.c | 2 ++
- 5 files changed, 10 insertions(+)
-
-diff --git a/src/nma-ws/nma-ws-802-1x.c b/src/nma-ws/nma-ws-802-1x.c
-index ba348266..0c148ce5 100644
---- a/src/nma-ws/nma-ws-802-1x.c
-+++ b/src/nma-ws/nma-ws-802-1x.c
-@@ -482,6 +482,8 @@ dispose (GObject *object)
- 	g_clear_pointer (&self->secrets_hints, g_strfreev);
- 	g_clear_pointer (&self->username, g_free);
- 	g_clear_pointer (&self->password, g_free);
-+
-+	G_OBJECT_CLASS (nma_ws_802_1x_parent_class)->dispose (object);
- }
- 
- static void
-diff --git a/src/nma-ws/nma-ws-leap.c b/src/nma-ws/nma-ws-leap.c
-index f90d43aa..df6d2dde 100644
---- a/src/nma-ws/nma-ws-leap.c
-+++ b/src/nma-ws/nma-ws-leap.c
-@@ -260,6 +260,8 @@ dispose (GObject *object)
- 	NMAWsLeap *self = NMA_WS_LEAP (object);
- 
- 	g_clear_object (&self->connection);
-+
-+	G_OBJECT_CLASS (nma_ws_leap_parent_class)->dispose (object);
- }
- 
- static void
-diff --git a/src/nma-ws/nma-ws-sae.c b/src/nma-ws/nma-ws-sae.c
-index e3454bbd..00fb6ff5 100644
---- a/src/nma-ws/nma-ws-sae.c
-+++ b/src/nma-ws/nma-ws-sae.c
-@@ -252,6 +252,8 @@ dispose (GObject *object)
- 	NMAWsSae *self = NMA_WS_SAE (object);
- 
- 	g_clear_object (&self->connection);
-+
-+	G_OBJECT_CLASS (nma_ws_sae_parent_class)->dispose (object);
- }
- 
- static void
-diff --git a/src/nma-ws/nma-ws-wep-key.c b/src/nma-ws/nma-ws-wep-key.c
-index cae8c272..992aabf7 100644
---- a/src/nma-ws/nma-ws-wep-key.c
-+++ b/src/nma-ws/nma-ws-wep-key.c
-@@ -404,6 +404,8 @@ dispose (GObject *object)
- 	NMAWsWepKey *self = NMA_WS_WEP_KEY (object);
- 
- 	g_clear_object (&self->connection);
-+
-+	G_OBJECT_CLASS (nma_ws_wep_key_parent_class)->dispose (object);
- }
- 
- static void
-diff --git a/src/nma-ws/nma-ws-wpa-psk.c b/src/nma-ws/nma-ws-wpa-psk.c
-index 1c73922a..27604960 100644
---- a/src/nma-ws/nma-ws-wpa-psk.c
-+++ b/src/nma-ws/nma-ws-wpa-psk.c
-@@ -270,6 +270,8 @@ dispose (GObject *object)
- 	NMAWsWpaPsk *self = NMA_WS_WPA_PSK (object);
- 
- 	g_clear_object (&self->connection);
-+
-+	G_OBJECT_CLASS (nma_ws_wpa_psk_parent_class)->dispose (object);
- }
- 
- static void
--- 
-2.24.1
-
diff --git a/libnma.changes b/libnma.changes
index 20d7597..a3e99bd 100644
--- a/libnma.changes
+++ b/libnma.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jun 23 17:38:03 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.8.30:
+  + Properly dispose wireless security objects.
+  + Don't clear the key when users set a non-pkcs12 certificate in
+    the certificate chooser UI.
+  + Added missing VAPI macro file.
+- Drop libnma-fix-segment-fault.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Thu Jun  4 07:35:49 UTC 2020 - Jonathan Kang <songchuan.kang@suse.com>
 
diff --git a/libnma.spec b/libnma.spec
index a3bb74f..f296d48 100644
--- a/libnma.spec
+++ b/libnma.spec
@@ -20,14 +20,12 @@
 %define base_ver 1.8
 
 Name:           libnma
-Version:        1.8.28
+Version:        1.8.30
 Release:        0
 Summary:        Shared library for NetworkManager-applet
 License:        GPL-2.0-or-later
 URL:            https://gitlab.gnome.org/GNOME/libnma
 Source0:        https://download.gnome.org/sources/%{name}/%{base_ver}/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM libnma-fix-segment-fault.patch bsc#1168347 glgo#GNOME/libnma#7 sckang@suse.com -- nma-ws: properly dispose wireless security objects.
-Patch0:         libnma-fix-segment-fault.patch
 
 BuildRequires:  gtk-doc
 BuildRequires:  meson