diff --git a/.gitignore b/.gitignore
index 8acfd30..713ae76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@ gnome-system-monitor-2.28.1.tar.bz2
 /gnome-system-monitor-3.17.92.tar.xz
 /gnome-system-monitor-3.18.0.tar.xz
 /gnome-system-monitor-3.18.0.1.tar.xz
+/gnome-system-monitor-3.18.2.tar.xz
diff --git a/0001-Fix-a-syntax-error-in-desktop-file-keywords-Romanian.patch b/0001-Fix-a-syntax-error-in-desktop-file-keywords-Romanian.patch
new file mode 100644
index 0000000..30f5c03
--- /dev/null
+++ b/0001-Fix-a-syntax-error-in-desktop-file-keywords-Romanian.patch
@@ -0,0 +1,35 @@
+From 64220e1f0f83ea4c9947f7cf8ea07fc74b5311e6 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Tue, 10 Nov 2015 11:58:09 +0100
+Subject: [PATCH] Fix a syntax error in desktop file keywords Romanian
+ translation
+
+---
+ po/ro.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/po/ro.po b/po/ro.po
+index 2e708f6..12a47a9 100644
+--- a/po/ro.po
++++ b/po/ro.po
+@@ -41,7 +41,7 @@ msgid ""
+ msgstr ""
+ "Monitor;System;Process;CPU;Memory;Network;History;Usage;Performance;Task;"
+ "Manager;Sistem;Proces;Memorie;Rețea;Istoric;Utilizare;Performanță;Sarcină;"
+-"Administrator"
++"Administrator;"
+ 
+ #: ../gnome-system-monitor-kde.desktop.in.in.h:1
+ #: ../gnome-system-monitor.appdata.xml.in.h:1 ../src/application.cpp:318
+@@ -52,7 +52,7 @@ msgstr "Monitor de sistem GNOME"
+ msgid "Monitor;System;Process;CPU;Memory;Network;History;Usage;"
+ msgstr ""
+ "Monitor;System;Process;CPU;Memory;Network;History;Usage;Sistem;Proces;"
+-"Memorie;Rețea;Istoric;Utilizare"
++"Memorie;Rețea;Istoric;Utilizare;"
+ 
+ #: ../gnome-system-monitor.appdata.xml.in.h:2
+ msgid "View and manage system resources"
+-- 
+2.5.0
+
diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index 856f039..93f42b4 100644
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -6,13 +6,15 @@
 
 Summary: Process and resource monitor
 Name: gnome-system-monitor
-Version: 3.18.0.1
+Version: 3.18.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnome.org/
 #VCS: git:git://git.gnome.org/gnome-system-monitor
 Source: http://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz
+# Backported from upstream
+Patch0: 0001-Fix-a-syntax-error-in-desktop-file-keywords-Romanian.patch
 
 BuildRequires: pkgconfig(libgtop-2.0) >= %{libgtop2_version}
 BuildRequires: pkgconfig(libwnck-3.0) >= %{libwnck_version}
@@ -35,6 +37,7 @@ such as CPU and memory.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-systemd --enable-wnck
@@ -62,6 +65,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monit
 %{_libexecdir}/gnome-system-monitor/gsm-*
 
 %changelog
+* Tue Nov 10 2015 Kalev Lember <klember@redhat.com> - 3.18.2-1
+- Update to 3.18.2
+
 * Tue Sep 22 2015 Kalev Lember <klember@redhat.com> - 3.18.0.1-1
 - Update to 3.18.0.1
 
diff --git a/sources b/sources
index 422fe11..5722f3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff2e972bcac34502b3b1137b0fb9b8b4  gnome-system-monitor-3.18.0.1.tar.xz
+7979c3d773aa72924dd539f6bcedf367  gnome-system-monitor-3.18.2.tar.xz