diff --git a/.gitignore b/.gitignore
index d0a491a..1dfc219 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ xmonad-0.9.1.tar.gz
 /xmonad-0.17.0.tar.gz
 /xmonad-0.17.1.tar.gz
 /xmonad-0.17.2.tar.gz
+/xmonad-0.18.0.tar.gz
diff --git a/sources b/sources
index 0b87a62..11d7318 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmonad-0.17.2.tar.gz) = 8d02422f473499516acf3cfe920b15df1d24a1fbf47f8cded5eb465186427e82cd43d65a63936993016797680335e59380931e9bad82b2181ecdef6b63d9bfd9
+SHA512 (xmonad-0.18.0.tar.gz) = a43bacc20f125da79bf47d7ce9bd1c476b85e92360873496b47321634e4281cabc99503b28d27d115379750e831d2d35bb72aee964f8d4132e8663f53115ed2c
diff --git a/xmonad.spec b/xmonad.spec
index 532db36..304f0a6 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -1,18 +1,19 @@
-# generated by cabal-rpm-2.1.2 --stream hackage
+# generated by cabal-rpm-2.3.0 --stream hackage
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 %global pkg_name xmonad
 %global pkgver %{pkg_name}-%{version}
+%{?haskell_setup}
 
 # testsuite missing deps: quickcheck-classes
 
 Name:           %{pkg_name}
-Version:        0.17.2
+Version:        0.18.0
 Release:        %autorelease
 Summary:        A tiling window manager
 
 License:        BSD-3-Clause
-Url:            https://hackage.haskell.org/package/%{name}
+URL:            https://hackage.haskell.org/package/xmonad
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
 # End cabal-rpm sources
@@ -200,11 +201,13 @@ cp -p %SOURCE5 .
 %install
 # Begin cabal-rpm install
 %ghc_lib_install
+
+mkdir -p %{buildroot}%{_mandir}/man1/
+install -m 644 -p -t %{buildroot}%{_mandir}/man1/ ./man/xmonad.1
 # End cabal-rpm install
 
 mv %{buildroot}%{_defaultlicensedir}/%{name}{,-core}
 
-install -p -m 0644 -D man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 install -p -m 0644 -D %SOURCE2 %{buildroot}%{_datadir}/xsessions/%{name}.desktop
 install -p -m 0755 -D %SOURCE3 %{buildroot}%{_bindir}/%{name}-start
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
@@ -235,7 +238,7 @@ install -p -m 0644 -D %SOURCE7 %{buildroot}%{_datadir}/xmonad/xmonad.hs
 %doc man/xmonad.{hs,1{.html,.markdown}}
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/%{name}-start
-%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/xmonad.1*
 %{_datadir}/applications/%{name}.desktop