diff --git a/podman.spec b/podman.spec
index 0aeeb41..819a27d 100644
--- a/podman.spec
+++ b/podman.spec
@@ -1,7 +1,5 @@
 %define     debug %nil
 %define     debug_package %nil
-%define    _tmpfilesdir  %{_prefix}/lib/tmpfiles.d
-%define    _systemddir  %{_prefix}/lib/systemd
 %define    _libexecdir %{_prefix}/libexec
 
 Name:       podman
@@ -15,7 +13,7 @@ License:    ASL 2.0
 Group:      Development/Other
 BuildRequires:  go
 BuildRequires:  git-core
-BuildRequires:  go-md2man
+BuildRequires:  go-md2man >= 2
 BuildRequires:  upx
 BuildRequires:  python3-sphinx
 BuildRequires:  %{_lib}gpgme-devel
@@ -38,26 +36,36 @@ volumes.
 %setup -q
 
 %build
-%make binaries
+%make binaries completions
 
 # compress bin
 upx bin/*
 
-#CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build \
-#      -tags " exclude_graphdriver_btrfs btrfs_noversion    exclude_graphdriver_devicemapper seccomp" \
-#      -o bin/podman ./cmd/podman
-      
-#CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build \
-#      -o bin/rootlessport ./cmd/rootlessport
-
 %install
-%makeinstall PREFIX=%{_prefix} DESTDIR=%{buildroot}
+make \
+        install.bin \
+        install.remote \
+        install.systemd \
+        install.completions \
+        PREFIX=%{_prefix} \
+        DESTDIR=%{buildroot} \
+        SYSTEMDDIR=%{_unitdir} \
+        USERSYSTEMDDIR=%{_userunitdir} \
+        TMPFILESDIR=%{_tmpfilesdir}
+
+install -d %{buildroot}%{_mandir}/man1/
+install -Dm644 docs/source/markdown/links/*1 %{buildroot}%{_mandir}/man1
+
 
 %files
 %doc README.md LICENSE
 %{_bindir}/%{name}*
 %{_libexecdir}/%{name}/rootlessport
 %{_mandir}/man1/*
-#{_systemddir}/*
-#{_sysconfdir}/cni/net.d/87-podman-bridge.conflist
 %{_tmpfilesdir}/podman.conf
+%{_unitdir}/*
+%{_userunitdir}/*
+%{_datadir}/bash-completion/completions/*
+%{_datadir}/fish/vendor_completions.d/*
+%{_datadir}/zsh/site-functions/*
+