diff --git a/yadm.spec b/yadm.spec
index bc5fbb2..bfa7d63 100644
--- a/yadm.spec
+++ b/yadm.spec
@@ -1,12 +1,21 @@
-Summary: Yet Another Dotfiles Manager
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 Name: yadm
+Summary: Yet Another Dotfiles Manager
 Version: 1.12.0
+Group: Development/Tools
 Release: 1%{?dist}
-URL: https://github.com/TheLocehiliosan/yadm
-License: GPLv3
-BuildRequires: hostname git gnupg bats expect
-Requires: bash hostname git
-Source: https://github.com/TheLocehiliosan/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+URL: https://yadm.io
+License: GPL-3.0-only
+Requires: bash
+Requires: git
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} >= 700
+Requires: /usr/bin/hostname
+%else
+Requires: /bin/hostname
+%endif
+
+Source: %{name}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
 BuildArch: noarch
 
 %description
@@ -17,24 +26,31 @@ yadm supplies the ability to manage a subset of secure files, which are
 encrypted before they are included in the repository.
 
 %prep
-%setup -q
+%setup -c
 
 %build
 
-%check
-bats test
-
 %install
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
-install -m 755 yadm   ${RPM_BUILD_ROOT}%{_bindir}
-install -m 644 yadm.1 ${RPM_BUILD_ROOT}%{_mandir}/man1
+
+# this is done to allow paths other than yadm-x.x.x (for example, when building
+# from branches instead of release tags)
+cd *yadm-*
+
+%{__mkdir} -p %{buildroot}%{_bindir}
+%{__cp}  yadm %{buildroot}%{_bindir}
+
+%{__mkdir} -p  %{buildroot}%{_mandir}/man1
+%{__cp} yadm.1 %{buildroot}%{_mandir}/man1
+
+%{__mkdir} -p                        %{buildroot}%{_pkgdocdir}
+%{__cp} README.md                    %{buildroot}%{_pkgdocdir}/README
+%{__cp} CHANGES CONTRIBUTORS LICENSE %{buildroot}%{_pkgdocdir}
+%{__cp} -r completion contrib        %{buildroot}%{_pkgdocdir}
 
 %files
 %attr(755,root,root) %{_bindir}/yadm
 %attr(644,root,root) %{_mandir}/man1/*
-%license LICENSE
-%doc CHANGES CONTRIBUTORS README.md completion/*
+%doc %{_pkgdocdir}
 
 %changelog
 * Wed Oct 25 2017 Tim Byrne <sultan@locehilios.com> - 1.12.0-1