--- a/make/Docs.gmk	Tue Sep 18 14:28:49 2018 +0200
+++ b/make/Docs.gmk	Fri Oct 12 16:47:58 2018 +0200
@@ -335,7 +335,7 @@
     $1_JAVADOC_CMD := $$(JAVA) -Djava.awt.headless=true $$($1_JAVA_ARGS) \
         $$(NEW_JAVADOC)
   else
-    $1_OPTIONS += $$(addprefix -J, $$($1_JAVA_ARGS)) 
+    $1_OPTIONS += $$(addprefix -J, $$($1_JAVA_ARGS))
   endif
 
   $1_VARDEPS := $$($1_JAVA_ARGS) $$($1_OPTIONS) $$(MODULES_SOURCE_PATH) \
@@ -469,7 +469,7 @@
 # Setup generation of the reference Java SE API documentation (javadoc + modulegraph)
 
 # The reference javadoc is just the same as javase, but using the BootJDK javadoc
-# and a stable set of javadoc options.  Typically it is used for generating 
+# and a stable set of javadoc options.  Typically it is used for generating
 # diffs between the reference javadoc and a javadoc bundle of a specific build
 # generated in the same way.
 
@@ -560,27 +560,12 @@
   ifeq ($(ENABLE_MAN_PAGES), true)
     # We assume all man pages should reside in section 1
 
-    # Copy man pages already in troff format
-    $(foreach m, $(ALL_MODULES), \
-      $(eval MAN_$m := $(call FindModuleManDirs, $m)) \
-      $(foreach d, $(MAN_$m), \
-        $(if $(filter %.1, $(call CacheFind, $d)), \
-          $(eval $(call SetupCopyFiles, COPY_MAN_$m, \
-              SRC := $d, \
-              FILES := $(filter %.1, $(call CacheFind, $d)), \
-              DEST := $(JAVADOC_OUTPUTDIR)/man/man1, \
-          )) \
-          $(eval MAN_PAGE_TARGETS += $(COPY_MAN_$m)) \
-        ) \
-      ) \
-    )
-
     # Generate man pages from markdown
     $(foreach m, $(ALL_MODULES), \
       $(eval MAN_$m := $(call FindModuleManDirs, $m)) \
       $(foreach d, $(MAN_$m), \
         $(if $(filter %.md, $(call CacheFind, $d)), \
-        $(eval $m_$d_NAME := CONVERT_MAN_TO_TROFF_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
+        $(eval $m_$d_NAME := MAN_TO_TROFF_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
           $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \
               SRC := $d, \
               FILES := $(filter %.md, $(call CacheFind, $d)), \
@@ -597,7 +582,7 @@
       $(eval MAN_$m := $(call FindModuleManDirs, $m)) \
       $(foreach d, $(MAN_$m), \
         $(if $(filter %.md, $(call CacheFind, $d)), \
-        $(eval $m_$d_NAME := CONVERT_MAN_TO_HTML_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
+        $(eval $m_$d_NAME := MAN_TO_HTML_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
           $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \
               SRC := $d, \
               FILES := $(filter %.md, $(call CacheFind, $d)), \
@@ -610,7 +595,7 @@
     )
 
   JDK_SPECS_TARGETS += $(MAN_PAGE_TARGETS)
-  
+
   endif
 endif