diff --git a/Makefile.am b/Makefile.am
index 9758fdd9..b4c2cde5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Process this file with automake to create Makefile.in
 
-SUBDIRS = . aclocal docs etc macos src win32
+SUBDIRS = . aclocal docs etc macos man src win32
 
 EXTRA_DIST = ANNOUNCE CodingStyle PAM_README QUICKSTART README \
 	bootstrap Makefile.mak depcomp \
diff --git a/configure.in b/configure.in
index b218d494..9d38dbf4 100644
--- a/configure.in
+++ b/configure.in
@@ -970,6 +970,7 @@ docs/Makefile
 docs/pkcs15-profile.5
 etc/Makefile
 macos/Makefile
+man/Makefile
 src/Makefile
 src/common/Makefile
 src/include/Makefile
diff --git a/docs/cardos-info.1 b/man/cardos-info.1
similarity index 100%
rename from docs/cardos-info.1
rename to man/cardos-info.1
diff --git a/docs/cryptoflex-tool.1 b/man/cryptoflex-tool.1
similarity index 100%
rename from docs/cryptoflex-tool.1
rename to man/cryptoflex-tool.1
diff --git a/docs/netkey-tool.1 b/man/netkey-tool.1
similarity index 100%
rename from docs/netkey-tool.1
rename to man/netkey-tool.1
diff --git a/docs/opensc-config.1 b/man/opensc-config.1
similarity index 100%
rename from docs/opensc-config.1
rename to man/opensc-config.1
diff --git a/docs/opensc-explorer.1 b/man/opensc-explorer.1
similarity index 100%
rename from docs/opensc-explorer.1
rename to man/opensc-explorer.1
diff --git a/docs/opensc-tool.1 b/man/opensc-tool.1
similarity index 100%
rename from docs/opensc-tool.1
rename to man/opensc-tool.1
diff --git a/docs/opensc.7 b/man/opensc.7
similarity index 100%
rename from docs/opensc.7
rename to man/opensc.7
diff --git a/docs/pkcs11-tool.1 b/man/pkcs11-tool.1
similarity index 100%
rename from docs/pkcs11-tool.1
rename to man/pkcs11-tool.1
diff --git a/docs/pkcs15-crypt.1 b/man/pkcs15-crypt.1
similarity index 100%
rename from docs/pkcs15-crypt.1
rename to man/pkcs15-crypt.1
diff --git a/docs/pkcs15-init.1 b/man/pkcs15-init.1
similarity index 100%
rename from docs/pkcs15-init.1
rename to man/pkcs15-init.1
diff --git a/docs/pkcs15-profile.5.in b/man/pkcs15-profile.5.in
similarity index 100%
rename from docs/pkcs15-profile.5.in
rename to man/pkcs15-profile.5.in
diff --git a/docs/pkcs15-tool.1 b/man/pkcs15-tool.1
similarity index 100%
rename from docs/pkcs15-tool.1
rename to man/pkcs15-tool.1
diff --git a/docs/pkcs15.7 b/man/pkcs15.7
similarity index 100%
rename from docs/pkcs15.7
rename to man/pkcs15.7
diff --git a/docs/sc_connect_card.3 b/man/sc_connect_card.3
similarity index 100%
rename from docs/sc_connect_card.3
rename to man/sc_connect_card.3
diff --git a/docs/sc_detect_card_presence.3 b/man/sc_detect_card_presence.3
similarity index 100%
rename from docs/sc_detect_card_presence.3
rename to man/sc_detect_card_presence.3
diff --git a/docs/sc_disconnect_card.3 b/man/sc_disconnect_card.3
similarity index 100%
rename from docs/sc_disconnect_card.3
rename to man/sc_disconnect_card.3
diff --git a/docs/sc_establish_context.3 b/man/sc_establish_context.3
similarity index 100%
rename from docs/sc_establish_context.3
rename to man/sc_establish_context.3
diff --git a/docs/sc_file.3 b/man/sc_file.3
similarity index 100%
rename from docs/sc_file.3
rename to man/sc_file.3
diff --git a/docs/sc_file_free.3 b/man/sc_file_free.3
similarity index 100%
rename from docs/sc_file_free.3
rename to man/sc_file_free.3
diff --git a/docs/sc_file_new.3 b/man/sc_file_new.3
similarity index 100%
rename from docs/sc_file_new.3
rename to man/sc_file_new.3
diff --git a/docs/sc_list_files.3 b/man/sc_list_files.3
similarity index 100%
rename from docs/sc_list_files.3
rename to man/sc_list_files.3
diff --git a/docs/sc_lock.3 b/man/sc_lock.3
similarity index 100%
rename from docs/sc_lock.3
rename to man/sc_lock.3
diff --git a/docs/sc_pkcs15_compute_signature.3 b/man/sc_pkcs15_compute_signature.3
similarity index 100%
rename from docs/sc_pkcs15_compute_signature.3
rename to man/sc_pkcs15_compute_signature.3
diff --git a/docs/sc_read_binary.3 b/man/sc_read_binary.3
similarity index 100%
rename from docs/sc_read_binary.3
rename to man/sc_read_binary.3
diff --git a/docs/sc_read_record.3 b/man/sc_read_record.3
similarity index 100%
rename from docs/sc_read_record.3
rename to man/sc_read_record.3
diff --git a/docs/sc_release_context.3 b/man/sc_release_context.3
similarity index 100%
rename from docs/sc_release_context.3
rename to man/sc_release_context.3
diff --git a/docs/sc_select_file.3 b/man/sc_select_file.3
similarity index 100%
rename from docs/sc_select_file.3
rename to man/sc_select_file.3