diff --git a/wmweather+.spec b/wmweather+.spec
index e75a775..3f63ad0 100644
--- a/wmweather+.spec
+++ b/wmweather+.spec
@@ -1,12 +1,13 @@
+%define _legacy_common_support 1
+
 Name:           wmweather+
 Version:        2.17
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Weather status dockapp
 
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/wmweatherplus/
-Source0:        http://dl.sf.net/wmweatherplus/%{name}-%{version}.tar.gz
-Patch1:         wmweather+-Makefile.patch
+Source0:        https://downloads.sourceforge.net/project/wmweatherplus/%{name}/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:  libICE-devel
@@ -16,7 +17,6 @@ BuildRequires:  libXext-devel
 BuildRequireS:  libXpm-devel
 BuildRequires:  WINGs-devel
 BuildRequires:  pcre-devel
-BuildRequires:  w3c-libwww-devel
 BuildRequires:  openssl-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  autoconf automake
@@ -28,20 +28,16 @@ dockapp. Think wmweather with a smaller font, forecasts, a weather map, and a
 sky condition display.
 
 %prep
-%setup -q
-%patch1
+%autosetup
 
 autoreconf -fv
 
 %build
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
+%make_install
 
 %files
 %doc COPYING README
@@ -49,6 +45,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Mar 29 2020 Jani Juhani Sinervo - 2.17-7
+- Fix FTBFS on Rawhide and 32
+- Modernize the spec-file
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild