diff --git a/argon2.changes b/argon2.changes
index 8e6be9f..e045bb1 100644
--- a/argon2.changes
+++ b/argon2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 23 22:32:49 UTC 2017 - adam@mizerski.pl
+
+- moved argon2-specs.pdf to doc subpackage
+- added packaging of man page
+
 -------------------------------------------------------------------
 Sat Jan 28 09:56:58 UTC 2017 - hpj@urpla.net
 
diff --git a/argon2.spec b/argon2.spec
index dc88a17..098136a 100644
--- a/argon2.spec
+++ b/argon2.spec
@@ -39,6 +39,15 @@ Argon2 is a password-hashing function that summarizes the state of the art in
 the design of memory-hard functions and can be used to hash passwords for
 credential storage, key derivation, or other applications.
 
+%package doc
+Summary:        Documentation for Argon2
+Group:          Documentation/Other
+BuildArch:      noarch
+
+%description doc
+Documentation for Argon2, the password-hashing function that won the Password
+Hashing Competition (PHC).
+
 %package -n %{lname}
 Summary:        The reference C implementation of Argon2
 Group:          System/Libraries
@@ -73,6 +82,8 @@ chmod -x %{buildroot}%{_includedir}/argon2.h
 mv %{buildroot}%{_libdir}/libargon2.so %{buildroot}%{_libdir}/libargon2.so.0
 ln -s %{_libdir}/libargon2.so.0 %{buildroot}%{_libdir}/libargon2.so
 
+install -D -m 644 man/argon2.1 %{buildroot}%{_mandir}/man1/argon2.1
+
 %check
 make CFLAGS="-pthread %{optflags} -Iinclude -Isrc" test
 
@@ -81,8 +92,13 @@ make CFLAGS="-pthread %{optflags} -Iinclude -Isrc" test
 
 %files
 %defattr(-,root,root)
-%doc LICENSE CHANGELOG.md README.md argon2-specs.pdf
+%doc LICENSE CHANGELOG.md README.md
 %{_bindir}/argon2
+%{_mandir}/man1/argon2.1%{ext_man}
+
+%files doc
+%defattr(-,root,root)
+%doc argon2-specs.pdf
 
 %files -n %{lname}
 %defattr(-,root,root)