diff --git a/popt.spec b/popt.spec
index 0ef355c..11f6d3e 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,16 +1,14 @@
+%define ver 1.18
+%define snap rc1
+%define srcver %{ver}%{?snap:-%{snap}}
+
 Summary:	C library for parsing command line parameters
 Name:		popt
-Version:	1.16
-Release:	19%{?dist}
+Version:	%{ver}%{?snap:~%{snap}}
+Release:	1%{?dist}
 License:	MIT
-URL:		http://www.rpm5.org/
-Source:		http://www.rpm5.org/files/%{name}/%{name}-%{version}.tar.gz
-Patch0:		popt-1.16-pkgconfig.patch
-Patch1:		popt-1.16-execfail.patch
-Patch2:		popt-1.16-man-page.patch
-Patch3:		popt-1.16-help.patch
-Patch4:		popt-1.16-nextarg-memleak.patch
-Patch5:		popt-1.16-glob-error.patch
+URL:		https://github.com/rpm-software-management/popt/
+Source:		http://ftp.rpm.org/releases/testing/%{name}/%{name}-%{srcver}.tar.gz
 BuildRequires:	gcc gettext
 
 %description
@@ -41,7 +39,7 @@ The popt-static package includes static libraries of the popt library.
 Install it if you need to link statically with libpopt.
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{srcver}
 
 %build
 %configure
@@ -79,6 +77,10 @@ make check
 %{_libdir}/libpopt.a
 
 %changelog
+* Fri May 29 2020 Panu Matilainen <pmatilai@redhat.com> - 1.18~rc1-1
+- Rebase to popt 1.18-rc1
+- Update URLs to the new upstream
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 2fed694..35b328c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (popt-1.16.tar.gz) = bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
+SHA512 (popt-1.18-rc1.tar.gz) = 0bcde880335ad6d24e2549f121ebd826eed2c4c7f873c93801dc25edb95664d708348efa42b82f4cb8d2583a28f3618fb8a4574701c7568c9b54093993542c4f