diff --git a/00-vala-039-fix.patch b/00-vala-039-fix.patch
new file mode 100644
index 0000000..0db65ce
--- /dev/null
+++ b/00-vala-039-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/src/PantheonTerminalWindow.vala b/src/PantheonTerminalWindow.vala
+index c0ee5d3..00d9e3b 100644
+--- a/src/PantheonTerminalWindow.vala
++++ b/src/PantheonTerminalWindow.vala
+@@ -463,8 +463,7 @@ namespace PantheonTerminal {
+             clipboard.request_targets (update_context_menu_cb);
+         }
+ 
+-        private void update_context_menu_cb (Gtk.Clipboard clipboard_,
+-                                             Gdk.Atom[] atoms) {
++        private void update_context_menu_cb (Gtk.Clipboard clipboard_, Gdk.Atom[]? atoms) {
+             bool can_paste = false;
+ 
+             if (atoms != null && atoms.length > 0)
diff --git a/pantheon-terminal.spec b/pantheon-terminal.spec
index 748dde3..38c949e 100644
--- a/pantheon-terminal.spec
+++ b/pantheon-terminal.spec
@@ -1,12 +1,19 @@
+%global srcname terminal
+%global appname io.elementary.terminal
+%global oldname org.pantheon.terminal
+
 Name:           pantheon-terminal
 Summary:        The terminal of the 21st century
 Version:        0.4.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        LGPLv3
 
-URL:            https://github.com/elementary/terminal
+URL:            https://github.com/elementary/%{srcname}
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
+# Add patch to fix compilation with newer vala versions
+Patch0:         00-vala-039-fix.patch
+
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -30,7 +37,7 @@ terminal, nothing more, nothing less.
 
 
 %prep
-%autosetup -n terminal-%{version}
+%autosetup -n %{srcname}-%{version} -p1
 
 
 %build
@@ -45,30 +52,37 @@ pushd build
 %make_install
 popd
 
-%find_lang pantheon-terminal
+%find_lang %{name}
 
 
 %check
-desktop-file-validate %{buildroot}/%{_datadir}/applications/org.pantheon.terminal.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/open-pantheon-terminal-here.desktop
+desktop-file-validate \
+    %{buildroot}/%{_datadir}/applications/%{oldname}.desktop
 
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/pantheon-terminal.appdata.xml
+desktop-file-validate \
+    %{buildroot}/%{_datadir}/applications/open-pantheon-terminal-here.desktop
 
+appstream-util validate-relax --nonet \
+    %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
 
-%files -f pantheon-terminal.lang
+
+%files -f %{name}.lang
 %doc AUTHORS README.md
 %license COPYING
 
-%{_bindir}/pantheon-terminal
+%{_bindir}/%{name}
 
-%{_datadir}/appdata/pantheon-terminal.appdata.xml
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/open-pantheon-terminal-here.desktop
-%{_datadir}/applications/org.pantheon.terminal.desktop
-%{_datadir}/glib-2.0/schemas/org.pantheon.terminal.gschema.xml
-%{_datadir}/pantheon-terminal/
+%{_datadir}/applications/%{oldname}.desktop
+%{_datadir}/glib-2.0/schemas/%{oldname}.gschema.xml
+%{_datadir}/%{name}/
 
 
 %changelog
+* Tue Jan 30 2018 Fabio Valentini <decathorpe@gmail.com> - 0.4.3-5
+- Fix compilation with newer vala versions.
+
 * Sat Nov 04 2017 Fabio Valentini <decathorpe@gmail.com> - 0.4.3-4
 - Rebuild for granite soname bump.