diff --git a/.gitignore b/.gitignore
index 34cd951..55f5726 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /wmweather+-2.15.tar.gz
 /wmweather+-2.17.tar.gz
+/wmweatherplus-git-be2f4b3010e78f7d6c68922db36641ab743f9db9.zip
diff --git a/sources b/sources
index 28b16e3..8f394c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wmweather+-2.17.tar.gz) = 45622513792698f1adf4a686506913146e2a24c9ff39fda1129132aae864528184aa122b525e00b079f416fd131c1369ff95e430c4c63877bdc166c982f841eb
+SHA512 (wmweatherplus-git-be2f4b3010e78f7d6c68922db36641ab743f9db9.zip) = 2bb1a5cc881bff6f2b1cda37d4ef3a45c766ec1133473e249f0436aafd20822444c7cfc13ffed78e983150f465c6ffeeeed4b0d1c829018d848f05265909631c
diff --git a/wmweather+.spec b/wmweather+.spec
index fb30dfe..7ee0c4f 100644
--- a/wmweather+.spec
+++ b/wmweather+.spec
@@ -1,15 +1,17 @@
 %define _legacy_common_support 1
+%global commit be2f4b3010e78f7d6c68922db36641ab743f9db9
 
 Name:           wmweather+
-Version:        2.17
-Release:        13%{?dist}
+Version:        2.18^20211125gitbe2f4b30
+Release:        1%{?dist}
 Summary:        Weather status dockapp
 
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/wmweatherplus/
-Source0:        https://downloads.sourceforge.net/project/wmweatherplus/%{name}/%{name}-%{version}.tar.gz
+#Source0:        https://downloads.sourceforge.net/project/wmweatherplus/%%{name}/%%{name}-%%{version}.tar.gz
+Source0:	https://sourceforge.net/code-snapshots/git/w/wm/wmweatherplus/git.git/wmweatherplus-git-%{commit}.zip
 
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  libICE-devel
 BuildRequires:  libSM-devel
@@ -17,7 +19,7 @@ BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequireS:  libXpm-devel
 BuildRequires:  WINGs-devel
-BuildRequires:  pcre-devel
+BuildRequires:  pcre2-devel
 BuildRequires:  openssl-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  autoconf automake
@@ -29,7 +31,7 @@ dockapp. Think wmweather with a smaller font, forecasts, a weather map, and a
 sky condition display.
 
 %prep
-%autosetup
+%autosetup -n wmweatherplus-git-%{commit}
 
 autoreconf -fvi
 
@@ -46,6 +48,10 @@ autoreconf -fvi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Sep 20 2022 Jani Juhani Sinervo <jani@sinervo.fi> - 2.18^20211125gitbe2f4b30-1
+- Update to latest upstream version
+- Change to PCRE2
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild