diff --git a/.gitignore b/.gitignore
index 826a5e6..dd65548 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1 @@
-multitail-5.2.6.tgz
-/multitail-5.2.8.tgz
-/multitail-5.2.12.tgz
-/multitail-5.2.13.tgz
-/multitail-6.0.tgz
-/multitail-6.2.1.tgz
-/multitail-6.4.2.tgz
+/multitail-*.tgz
diff --git a/Unversioned-doc-dir.patch b/Unversioned-doc-dir.patch
deleted file mode 100644
index bdd85b4..0000000
--- a/Unversioned-doc-dir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up multitail-6.4.2/Makefile.orig multitail-6.4.2/Makefile
---- multitail-6.4.2/Makefile.orig	2015-12-23 22:58:28.000000000 -0500
-+++ multitail-6.4.2/Makefile	2015-12-23 22:58:41.000000000 -0500
-@@ -30,8 +30,6 @@ install: multitail
- 	cp multitail $(DESTDIR)$(PREFIX)/bin
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
- 	cp multitail.1 $(DESTDIR)$(PREFIX)/share/man/man1/multitail.1
--	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/multitail-$(VERSION)
--	cp *.txt INSTALL manual*.html $(DESTDIR)$(PREFIX)/share/doc/multitail-$(VERSION)
- 	#
- 	### COPIED multitail.conf.new, YOU NEED TO REPLACE THE multitail.conf
- 	### YOURSELF WITH THE NEW FILE
-@@ -56,7 +54,6 @@ uninstall: clean
- 	rm -f $(DESTDIR)$(PREFIX)/bin/multitail
- 	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/multitail.1.gz
- #	rm -f $(CONFIG_FILE)
--	rm -rf $(DESTDIR)$(PREFIX)/share/doc/multitail-$(VERSION)
- 
- clean:
- 	rm -f $(OBJS) multitail core gmon.out *.da ccmultitail
diff --git a/multitail.spec b/multitail.spec
index 5d0566f..3aca5be 100644
--- a/multitail.spec
+++ b/multitail.spec
@@ -1,18 +1,15 @@
 Name:		multitail
-Version:	6.4.2
-Release:	10%{?dist}
+Version:	6.5.0
+Release:	1%{?dist}
 Summary:	View one or multiple files like tail but with multiple windows
 
 # License GPLv2 specified in readme.txt
 License:	GPLv2
-URL:		http://www.vanheusden.com/multitail/
-Source:		http://www.vanheusden.com/multitail/multitail-%{version}.tgz
-Patch0:		Unversioned-doc-dir.patch
+URL:		https://www.vanheusden.com/multitail/
+Source:		https://www.vanheusden.com/multitail/multitail-%{version}.tgz
 
 BuildRequires:	gcc
 BuildRequires:	ncurses-devel
-# For unversioned doc dir
-%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 %description
 MultiTail lets you view one or multiple files like the original tail
@@ -32,43 +29,42 @@ external software, MultiTail can mimic the functionality of tools like
 'watch' and such.
 
 %prep
-%setup -q -n multitail-%{version}
-%patch0 -p1
-
-%build
-CFLAGS="%{optflags}" make %{?_smp_mflags}
-
-# Fix up doc encoding
-for f in readme.txt; do
-    iconv -f ISO88592 -t UTF8 < $f > $f.utf8 && \
-    touch -r $f $f.utf8 && \
-    mv $f.utf8 $f
-done
+%setup -q
 
 # Fix up examples permissions
 chmod 644 conversion-scripts/colors-example.*
 chmod 644 conversion-scripts/convert-*.pl
 
+%build
+%make_build CFLAGS="%{optflags}" CONFIG_FILE=%{_sysconfdir}/%{name}.conf
+
 %install
-rm -rf %{buildroot}
 # Create necessary directories
-mkdir -p %{buildroot}/%{_pkgdocdir} %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1 %{buildroot}%{_sysconfdir} %{buildroot}%{_pkgdocdir}
-make DESTDIR=%{buildroot} DOCDIR=%{buildroot}%{_pkgdocdir} install
+mkdir -p %{buildroot}%{_sysconfdir}
+%make_install PREFIX=%{_prefix} CONFIG_FILE=%{buildroot}%{_sysconfdir}/%{name}.conf
 
 # move the configuration in the right place
-mv %{buildroot}%{_sysconfdir}/multitail.conf{.new,}
+mv -f %{buildroot}%{_sysconfdir}/multitail.conf{.new,}
 
 # remove the examples (installed as docs)
-rm %{buildroot}%{_sysconfdir}/multitail/colors-example.*
+rm -f %{buildroot}%{_prefix}%{_sysconfdir}/multitail/colors-example.*
+mv -f %{buildroot}{%{_prefix},}%{_sysconfdir}/multitail/
+
+# remove documentation later catched up by %%doc
+rm -rf %{buildroot}%{_docdir}/
 
 %files
-%doc manual*.html license.txt readme.txt conversion-scripts/colors-example.*
+%license license.txt
+%doc manual*.html readme.txt conversion-scripts/colors-example.*
 %config(noreplace) %{_sysconfdir}/multitail.conf
 %{_sysconfdir}/multitail/
 %{_bindir}/multitail
 %{_mandir}/man1/multitail.1*
 
 %changelog
+* Fri Jan 03 2020 Robert Scheck <robert@fedoraproject.org> - 6.5.0-1
+- Upgrade to 6.5.0 (#1771093)
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index b2f764c..73ec412 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a0959f7b2385061080712afd8ae6e33d  multitail-6.4.2.tgz
+SHA512 (multitail-6.5.0.tgz) = de6dfc8f9278752a77ded4b317952dbada2b05927ce7afcbe063a6e8f5a628e31e719ce4badc7a600f75cabe4f40d811e51ff6cddf25f1c90d1180b1b0e0057c