diff --git a/wipe-rootbuildfix.patch b/wipe-2.3.1-makefile.patch
similarity index 55%
rename from wipe-rootbuildfix.patch
rename to wipe-2.3.1-makefile.patch
index 1844b0b..c2c520f 100644
--- a/wipe-rootbuildfix.patch
+++ b/wipe-2.3.1-makefile.patch
@@ -1,9 +1,12 @@
-diff -ru wipe-2.2.0.orig/Makefile.in wipe-2.2.0/Makefile.in
---- wipe-2.2.0.orig/Makefile.in	2003-08-31 03:18:03.000000000 +0200
-+++ wipe-2.2.0/Makefile.in	2004-01-12 00:58:45.000000000 +0100
-@@ -60,12 +60,12 @@
+diff -urN wipe-2.3.1/Makefile.in wipe-2.3.1-patched/Makefile.in
+--- wipe-2.3.1/Makefile.in	2009-11-02 07:11:30.000000000 +1000
++++ wipe-2.3.1-patched/Makefile.in	2019-08-16 12:47:09.485251340 +1000
+@@ -58,14 +58,14 @@
+ 
+ install: $(BIN_OUT)
  	$(INSTALL_BIN) -d $(bindir)
- 	$(INSTALL_BIN) -s $(BIN_OUT) $(bindir)
+-	$(INSTALL_BIN) -s $(BIN_OUT) $(bindir)
++	$(INSTALL_BIN) $(BIN_OUT) $(bindir)
  	$(INSTALL) -d $(mandir)/man1
 -	$(INSTALL) -o root -m 0644 wipe.1 $(mandir)/man1/
 +	$(INSTALL) -m 0644 wipe.1 $(mandir)/man1/
@@ -16,4 +19,3 @@ diff -ru wipe-2.2.0.orig/Makefile.in wipe-2.2.0/Makefile.in
  	done
  
  install_home: $(BIN_OUT)
-Only in wipe-2.2.0: Makefile.in~
diff --git a/wipe.spec b/wipe.spec
index 9438ca9..d19679e 100644
--- a/wipe.spec
+++ b/wipe.spec
@@ -1,19 +1,15 @@
-%define debug_package   %{nil}
-
-Name:           wipe
-Version:        2.3.1
-Release:        6
-Epoch:          0
-Summary:        Secure file deletion utility 
-License:        GPLv2
-Group:          File tools
-URL:            http://wipe.sourceforge.net/
-Source0:        http://unc.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Source1:        http://unc.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2.sig
-Patch0:         %{name}-rootbuildfix.patch
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
-
+Summary:	Secure file deletion utility
+Name:		wipe
+Version:	2.3.1
+Release:	8
+License:	GPLv2+
+Group:		File tools
+Url:		http://wipe.sourceforge.net/
+Source0:	http://unc.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source1:	http://unc.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2.sig
+# Don't use root user to install files, don't strip the binary
+Patch0:		wipe-2.3.1-makefile.patch
+Requires(post,postun):	update-alternatives
 
 %description
 Wipe is a tool that effectively degauses the surface of a hard
@@ -21,13 +17,26 @@ disk, making it virtually impossible to retrieve the data that was
 stored on it. This tool is designed to make sure secure data that is
 erased from a hard drive is unrecoverable.
 
+%files
+%doc LICENSE copyright README CHANGES TODO INSTALL TESTING
+%{_bindir}/wipe.wipe
+%{_mandir}/man1/wipe.wipe.1*
+
+%post
+%{_sbindir}/update-alternatives --install %{_bindir}/wipe wipe %{_bindir}/wipe.wipe 10 --slave %{_mandir}/man1/wipe.1.lzma wipe.1.lzma %{_mandir}/man1/wipe.wipe.1.lzma
+
+%postun
+%{_sbindir}/update-alternatives --remove wipe %{_bindir}/wipe.wipe
+
+#----------------------------------------------------------------------------
+
 %prep
 %setup -q
 %patch0 -p1
 
 %build
 %configure2_5x
-%make
+%make CFLAGS="%{optflags}"
 
 %install
 %makeinstall
@@ -37,20 +46,3 @@ mv %{buildroot}%{_mandir}/man1/wipe.1 %{buildroot}%{_mandir}/man1/wipe.wipe.1
 # remove package installed docs
 rm -rf %{buildroot}/%{_datadir}/doc/%{name}
 
-
-
-%post
-%{_sbindir}/update-alternatives --install %{_bindir}/wipe wipe %{_bindir}/wipe.wipe 10 --slave %{_mandir}/man1/wipe.1.lzma wipe.1.lzma %{_mandir}/man1/wipe.wipe.1.lzma
-
-%postun
-%{_sbindir}/update-alternatives --remove wipe %{_bindir}/wipe.wipe
-
-%files
-%defattr(0644,root,root,0755)
-%doc LICENSE copyright README CHANGES TODO INSTALL TESTING
-%attr(0755,root,root) %{_bindir}/wipe.wipe
-%{_mandir}/man1/wipe.wipe.1*
-
-
-
-