diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk
index 5cc83429b27..4e211d84600 100644
--- a/jdk/make/common/Program.gmk
+++ b/jdk/make/common/Program.gmk
@@ -268,6 +268,11 @@ else
 	   $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \
 	   $(RM) $(@F).debuginfo ; \
 	  )
+          # save ZIP'ed debug info with rest of the program's build artifacts
+	  $(MV) $@.diz $(OBJDIR)
+        else
+          # save debug info with rest of the program's build artifacts
+	  $(MV) $@.debuginfo $(OBJDIR)
         endif
       endif # PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS
     endif # ENABLE_FULL_DEBUG_SYMBOLS