diff --git a/sudo.spec b/sudo.spec
index bb95586..fbadf99 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,10 +1,18 @@
+
+# comment out if no extra version
+%global extraver p2
+
 Summary: Allows restricted root access for specified users
 Name: sudo
-Version: 1.9.8p2
-Release: %autorelease
+Version: 1.9.8
+# remove -b 3 after rebase !!!
+# use "-p -e % {?extraver}" when beta
+# use "-e % {?extraver}"" when patch version
+# use nothing special when normal version
+Release: %autorelease -b 3
 License: ISC
 URL: https://www.sudo.ws
-Source0: %{url}/dist/%{name}-%{version}.tar.gz
+Source0: %{url}/dist/%{name}-%{version}%{?extraver}.tar.gz
 Source1: sudoers
 Requires: pam
 Recommends: nano
@@ -23,9 +31,6 @@ BuildRequires: sendmail
 BuildRequires: gettext
 BuildRequires: zlib-devel
 
-# don't strip
-Patch1: sudo-1.6.7p5-strip.patch
-
 %description
 Sudo (superuser do) allows a system administrator to give certain
 users (or groups of users) the ability to run some (or all) commands
@@ -66,9 +71,7 @@ BuildRequires:  python3-devel
 %{name}-python-plugin allows using sudo plugins written in Python.
 
 %prep
-%setup -q
-
-%patch1 -p1 -b .strip
+%setup -q -n %{name}-%{version}%{?extraver}
 
 %build
 # Remove bundled copy of zlib
@@ -89,6 +92,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
         --docdir=%{_pkgdocdir} \
 	--enable-openssl \
         --disable-root-mailer \
+        --disable-intercept \
         --with-logging=syslog \
         --with-logfac=authpriv \
         --with-pam \
@@ -192,7 +196,6 @@ EOF
 %attr(0644,root,root) %{_libexecdir}/sudo/group_file.so
 %attr(0644,root,root) %{_libexecdir}/sudo/sample_approval.so
 %attr(0644,root,root) %{_libexecdir}/sudo/system_group.so
-%attr(0644,root,root) %{_libexecdir}/sudo/sudo_intercept.so
 %attr(0644,root,root) %{_libexecdir}/sudo/libsudo_util.so.?.?.?
 %{_libexecdir}/sudo/libsudo_util.so.?
 %{_libexecdir}/sudo/libsudo_util.so