diff --git a/wyhash.spec b/wyhash.spec
index ca55c87..2b4c200 100644
--- a/wyhash.spec
+++ b/wyhash.spec
@@ -2,7 +2,6 @@ Name:           wyhash
 Summary:        No hash function is perfect, but some are useful
 %global forgeurl https://github.com/wangyi-fudan/%{name}
 %global tag %{name}_final
-%forgemeta
 # Upstream has haphazard versioning: after going through “v1”-“v6”, they
 # selected a version “final1”, and are now working on “final2”. They also keep
 # all old versions in the git repository. We will package only based on the
@@ -10,11 +9,10 @@ Summary:        No hash function is perfect, but some are useful
 # forward to that version, with “final1” offered in a parallel-installable
 # compat package,
 Version:        final1
-# Note that the forgemeta macro prepends commit information to the dist macro.
-Release:        1%{?dist}
+Release:        1.20210311git%{tag}%{?dist}
 
 URL:            %{forgeurl}
-Source0:        %{forgesource}
+Source0:        %{forgeurl}/archive/%{tag}/%{name}-%{tag}.tar.gz
 License:        Unlicense
 
 BuildRequires:  gcc-c++
@@ -70,7 +68,7 @@ BuildArch:      noarch
 
 
 %prep
-%forgeautosetup
+%autosetup -n %{name}-%{tag}
 
 # Build the tests with the distribution’s preferred flags
 sed -r -i \
@@ -81,6 +79,8 @@ sed -r -i \
 
 %build
 %set_build_flags
+# Tests are C++11:
+CXXFLAGS="${CXXFLAGS} -std=gnu++0x"
 # We build only the test executable, not the benchmarks.
 %make_build test_vector CXX="${CXX-g++}"
 
@@ -90,7 +90,8 @@ sed -r -i \
 # not yet properly versioned. We put it in a subdirectory of _includedir for
 # parallel-installability; dependent packages requiring particular versions
 # will have to adjust their CFLAGS.
-install -D -p -m 0644 -t %{buildroot}%{_includedir}/%{compat_name} %{name}.h
+install -d %{buildroot}%{_includedir}/%{compat_name}
+install -t %{buildroot}%{_includedir}/%{compat_name} -p -m 0644 %{name}.h
 
 # For this package, which tracks the latest version, we also allow the header
 # to be used without adding the subdirectory to the CFLAGS.
@@ -116,5 +117,5 @@ ln -s %{compat_name}/%{name}.h %{buildroot}%{_includedir}/%{name}.h
 
 
 %changelog
-* Sat Mar 06 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.20210306gitfinal
-- Initial package
+* Tue Oct 12 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.20210306gitwyhash_final
+- Initial package for EPEL7