diff --git a/moe.changes b/moe.changes
index 592b2c1..c5484d4 100644
--- a/moe.changes
+++ b/moe.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jul 10 17:19:05 UTC 2016 - mpluskal@suse.com
+
+- Small spec file cleanup
+
 -------------------------------------------------------------------
 Sun Mar  6 09:36:15 UTC 2016 - astieger@suse.com
 
diff --git a/moe.spec b/moe.spec
index 356c52e..e44d2de 100644
--- a/moe.spec
+++ b/moe.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package moe
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,20 +21,19 @@ Version:        1.8
 Release:        0
 Summary:        Powerful and User-friendly Text Editor
 License:        GPL-3.0+
-Group:          Productivity/Editors/Other
-Url:            http://www.gnu.org/software/moe/moe.html
-Source:         ftp://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.lz
-Source1:        ftp://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.lz.sig
+Group:          Productivity/Text/Editors
+Url:            https://www.gnu.org/software/moe/moe.html
+Source:         https://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.lz
+Source1:        https://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.lz.sig
 Source2:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=moe&download=1#/%{name}.keyring
-Source3:        %{name}.changes
 BuildRequires:  gcc-c++
 BuildRequires:  glibc-devel
 BuildRequires:  libstdc++-devel
 BuildRequires:  lzip
 BuildRequires:  make
 BuildRequires:  ncurses-devel
-# FIXME: use proper Requires(pre/post/preun/...)
-PreReq:         %{install_info_prereq}
+Requires(post): %{install_info_prereq}
+Requires(preun): %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -57,17 +56,17 @@ make %{?_smp_mflags} CXXFLAGS="%{optflags}"
 make DESTDIR=%{buildroot} install %{?_smp_mflags} install-man
 
 %post
-%install_info --info-dir="%{_infodir}" "%{_infodir}"/moe.info*
+%install_info --info-dir=%{_infodir} %{_infodir}/moe.info%{ext_info}
 
 %preun
-%install_info_delete --info-dir="%{_infodir}" "%{_infodir}"/moe.info*
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/moe.info%{ext_info}
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %config(noreplace) %{_sysconfdir}/moerc
 %{_bindir}/moe
-%{_infodir}/moe.info*
-%{_mandir}/man1/moe.1*
+%{_infodir}/moe.info%{ext_info}
+%{_mandir}/man1/moe.1%{ext_man}
 
 %changelog