diff --git a/.gitignore b/.gitignore
index ece389e..93ca781 100644
--- a/.gitignore
+++ b/.gitignore
@@ -337,3 +337,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.7.2.tar.xz
 /NetworkManager-1.7.91.tar.xz
 /NetworkManager-1.7.92.tar.xz
+/NetworkManager-1.8.0.tar.xz
diff --git a/0001-utils-fix-maybe-uninitialized-in-nm-udev-utils.c.patch b/0001-utils-fix-maybe-uninitialized-in-nm-udev-utils.c.patch
new file mode 100644
index 0000000..b1f09af
--- /dev/null
+++ b/0001-utils-fix-maybe-uninitialized-in-nm-udev-utils.c.patch
@@ -0,0 +1,64 @@
+From bf2a90588410a7d81ff86a6dcf09521316f23ffb Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Wed, 10 May 2017 15:31:15 +0200
+Subject: [PATCH 1/1] utils: fix maybe-uninitialized in "nm-udev-utils.c"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+      CC       shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo
+    In file included from ./shared/nm-utils/nm-glib.h:27:0,
+                     from ./shared/nm-utils/nm-macros-internal.h:29,
+                     from ./shared/nm-default.h:178,
+                     from shared/nm-utils/nm-udev-utils.c:21:
+    shared/nm-utils/nm-udev-utils.c: In function ‘nm_udev_client_enumerate_new’:
+    ./shared/nm-utils/gsystem-local-alloc.h:53:50: error: ‘to_free’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+     GS_DEFINE_CLEANUP_FUNCTION(void*, gs_local_free, g_free)
+                                                      ^~~~~~
+    shared/nm-utils/nm-udev-utils.c:147:18: note: ‘to_free’ was declared here
+        gs_free char *to_free;
+                      ^~~~~~~
+    In file included from ./shared/nm-utils/nm-glib.h:27:0,
+                     from ./shared/nm-utils/nm-macros-internal.h:29,
+                     from ./shared/nm-default.h:178,
+                     from shared/nm-utils/nm-udev-utils.c:21:
+    shared/nm-utils/nm-udev-utils.c: In function ‘nm_udev_client_new’:
+    ./shared/nm-utils/gsystem-local-alloc.h:53:50: error: ‘to_free’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+     GS_DEFINE_CLEANUP_FUNCTION(void*, gs_local_free, g_free)
+                                                      ^~~~~~
+    shared/nm-utils/nm-udev-utils.c:243:20: note: ‘to_free’ was declared here
+          gs_free char *to_free;
+                        ^~~~~~~
+
+Fixes: e32839838e5ea74ba490cf912e20939afa0e4f40
+(cherry picked from commit 0893c3756ef898f8fe6e2367d5167a345299dcd4)
+(cherry picked from commit e2902f61a4462e6d197a20bf3d0ab996b64305b1)
+---
+ shared/nm-utils/nm-udev-utils.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/shared/nm-utils/nm-udev-utils.c b/shared/nm-utils/nm-udev-utils.c
+index 5552d59..bf0ad5b 100644
+--- a/shared/nm-utils/nm-udev-utils.c
++++ b/shared/nm-utils/nm-udev-utils.c
+@@ -144,7 +144,7 @@ nm_udev_utils_enumerate (struct udev *uclient,
+ 		for (n = 0; subsystems[n]; n++) {
+ 			const char *subsystem;
+ 			const char *devtype;
+-			gs_free char *to_free;
++			gs_free char *to_free = NULL;
+ 
+ 			_subsystem_split (subsystems[n], &subsystem, &devtype, &to_free);
+ 
+@@ -240,7 +240,7 @@ nm_udev_client_new (const char *const*subsystems,
+ 			/* install subsystem filters to only wake up for certain events */
+ 			for (n = 0; self->subsystems[n]; n++) {
+ 				if (self->monitor) {
+-					gs_free char *to_free;
++					gs_free char *to_free = NULL;
+ 					const char *subsystem;
+ 					const char *devtype;
+ 
+-- 
+2.9.3
+
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 317df10..979570b 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -11,8 +11,8 @@
 %global git_sha %{nil}
 
 %global rpm_version 1.8.0
-%global real_version 1.7.92
-%global release_version 0.2
+%global real_version 1.8.0
+%global release_version 1
 %global epoch_version 1
 
 %global obsoletes_device_plugins 1:0.9.9.95-1
@@ -77,7 +77,7 @@ Source1: NetworkManager.conf
 Source2: 00-server.conf
 Source3: 20-connectivity-fedora.conf
 
-#Patch1: 0001-some.patch
+Patch1: 0001-utils-fix-maybe-uninitialized-in-nm-udev-utils.c.patch
 
 Requires(post): systemd
 Requires(preun): systemd
@@ -333,7 +333,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 %prep
 %setup -q -n NetworkManager-%{real_version}
 
-#%patch1 -p1
+%patch1 -p1
 
 %build
 %if %{with regen_docs}
@@ -636,6 +636,9 @@ fi
 %endif
 
 %changelog
+* Wed May 10 2017 Thomas Haller <thaller@redhat.com> - 1:1.8.0-1
+- Update to 1.8.0 release
+
 * Thu Apr 20 2017 Lubomir Rintel <lkundrak@v3.sk> - 1:1.8.0-0.2.rc3
 - Update to third Release Candidate of NetworkManager 1.8
 
diff --git a/sources b/sources
index b1903ea..017e698 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.7.92.tar.xz) = c88c7b6b4c37372e733d188fef6b48d34267b30be6e7e323072693c5b541c9b2aa615759fa91b2b02ddc2349b418ad302c78b31bb6d32484e1d3eb85bf7198db
+SHA512 (NetworkManager-1.8.0.tar.xz) = 1f261a9bbba1013ec7ac88672f2ebdfdb9447874eb711ccfa7383534f003f37aabbcddb51aa868e14cec1d76c33d33a99d681a3858ea6239112fe6fce81a9c6c