diff --git a/man/Makefile-client.am b/man/Makefile-client.am
index ebf6e92d03f..14200f5a8ce 100644
--- a/man/Makefile-client.am
+++ b/man/Makefile-client.am
@@ -1,5 +1,3 @@
-if ENABLE_CLIENT
-
 dist_man_MANS += \
 	ceph-syn.8 \
 	ceph-conf.8 \
@@ -39,5 +37,3 @@ dist_man_MANS += \
 	radosgw.8 \
 	radosgw-admin.8
 endif
-
-endif # ENABLE_CLIENT
diff --git a/man/Makefile-server.am b/man/Makefile-server.am
index 13945882431..794275b5431 100644
--- a/man/Makefile-server.am
+++ b/man/Makefile-server.am
@@ -1,5 +1,3 @@
-if ENABLE_SERVER
-
 dist_man_MANS += \
 	ceph-deploy.8 \
 	crushtool.8 \
@@ -26,5 +24,3 @@ if WITH_MDS
 dist_man_MANS += \
 	ceph-mds.8
 endif
-
-endif # ENABLE_SERVER
diff --git a/man/Makefile.am b/man/Makefile.am
index 2c2a5c3a38f..64f07cc8645 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -2,5 +2,10 @@ AUTOMAKE_OPTIONS = gnu
 
 dist_man_MANS = 
 
-include arch/Makefile-client.am
-include auth/Makefile-server.am
+if ENABLE_CLIENT
+include Makefile-client.am
+endif
+
+if ENABLE_SERVER
+include Makefile-server.am
+endif