diff --git a/.gitignore b/.gitignore
index fcb9fd5..aede5fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /network-manager-applet-1.4.4.tar.xz
 /network-manager-applet-1.4.6.tar.xz
 /network-manager-applet-1.7.1.tar.xz
+/network-manager-applet-1.8.0.tar.xz
diff --git a/network-manager-applet.spec b/network-manager-applet.spec
index b3a1e6f..f24d513 100644
--- a/network-manager-applet.spec
+++ b/network-manager-applet.spec
@@ -3,16 +3,20 @@
 %global nm_version      1:1.1.0
 %global obsoletes_ver   1:0.9.7
 
+%global rpm_version 1.8.0
+%global real_version 1.8.0
+%global release_version 1
+
 Name: network-manager-applet
 Summary: A network control and status applet for NetworkManager
-Version: 1.8.0
-Release: 0.1%{?dist}
+Version: %{rpm_version}
+Release: %{release_version}%{?dist}
 Group: Applications/System
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
 
-Source: https://download.gnome.org/sources/network-manager-applet/1.7/%{name}-1.7.1.tar.xz
+Source: https://download.gnome.org/sources/network-manager-applet/1.8/%{name}-%{real_version}.tar.xz
 Patch0: nm-applet-no-notifications.patch
 
 Requires: NetworkManager >= %{nm_version}
@@ -112,7 +116,7 @@ nm-applet, nm-connection-editor, and the GNOME control center.
 This package deprecates libnm-gtk.
 
 %prep
-%setup -q -n network-manager-applet-1.7.1
+%setup -q -n "%{name}-%{real_version}"
 %patch0 -p1
 
 %build
@@ -229,6 +233,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 
 %changelog
+* Wed May 10 2017 Thomas Haller <thaller@redhat.com> - 1.8.0-1
+- Update to 1.8.0 release
+
 * Fri Mar 24 2017 Lubomir Rintel <lkundrak@v3.sk> - 1.8.0-0.1
 - Update to a snapshot of network-manager-applet 1.8 release
 
diff --git a/sources b/sources
index b888a88..6f44478 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (network-manager-applet-1.7.1.tar.xz) = d4b0cd5dcb219c34abf9c4f4df0861e3198c45edbb1e8d45eb53fe85fc590dd0486eb978c4445430554c70f337bb9e8fa9367c5c1689228ecc2c30194e8d7ff0
+SHA512 (network-manager-applet-1.8.0.tar.xz) = 5f86806cd60d740ddd7773d6f006b1fd2cefdaecdf617c97dba48732a872f0cb1d4ac0785e87f989f13cd626cdbe017b6f99ce0079aecc6031d3cc52d8d2a36d