diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index d7e31bf01831..a53f512bfffa 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -467,7 +467,7 @@ $(OBJDIR)/safe_string.o: $(ETC)/safe_string.c $(RC_GENERATED)
 # erl_call
 $(BINDIR)/erl_call@EXEEXT@: $(ERL_TOP)/lib/erl_interface/bin/$(TARGET)/erl_call@EXEEXT@
 	$(ld_verbose)cp $< $@
-        $(ld_verbose)cp $(<:.exe=.pdb) $(@:.exe=.pdb)
+	$(ld_verbose)cp $(<:.exe=.pdb) $(@:.exe=.pdb)
 
 ifneq ($(TARGET),win32)
 $(BINDIR)/$(ERLEXEC): $(OBJDIR)/$(ERLEXEC).o $(ERTS_LIB)
diff --git a/otp_build b/otp_build
index d8d565588797..bec4886e1ca8 100755
--- a/otp_build
+++ b/otp_build
@@ -1257,20 +1257,13 @@ do_update_ex_doc ()
 do_debuginfo_win32 ()
 {
     setup_make
-    (cd erts/emulator && $MAKE MAKE="$MAKE" TARGET=$TARGET debug) || exit 1
+    ($MAKE MAKE="$MAKE" TARGET=$TARGET TYPE=debug) || exit 1
     if [ -z "$1" ]; then
-	RELDIR="$ERL_TOP/release/$TARGET"
+       RELDIR="$ERL_TOP/release/$TARGET"
     else
-	RELDIR="$1"
+       RELDIR="$1"
     fi
-    BINDIR="$ERL_TOP/bin/$TARGET"
-    EVSN=$(grep '^VSN' erts/vsn.mk | sed 's,^VSN.*=[^0-9]*\([0-9].*\)$,@\1,g;s,^[^@].*,,g;s,^@,,g')
-    for f in beam.debug.smp.dll beam.debug.smp.dll.pdb beam.debug.jit.dll.pdb; do
-	if [ -f $BINDIR/$f ]; then
-	    rm -f $RELDIR/erts-$EVSN/bin/$f
-	    cp $BINDIR/$f $RELDIR/erts-$EVSN/bin/$f
-	fi
-    done
+    ($MAKE release RELEASE_ROOT="$RELDIR" MAKE="$MAKE" TARGET=$TARGET TYPE=debug) || exit 1
 }
 
 do_installer_win32 ()