diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index 053a31ea97..a2195d29fe 100644
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -1341,11 +1341,15 @@ DoLoop:
    SectionSetFlags ${secLoopback} $0
    
 SkipLoop:
-   ; Never install debug symbols unless explicitly selected
-	!IFDEF DEBUG
+   ; Never install debug symbols unless explicitly selected, except in DEBUG mode
+	!IFNDEF DEBUG
    SectionGetFlags ${secDebug} $0
 	IntOp $0 $0 & ${SECTION_OFF}
 	SectionSetFlags ${secDebug} $0
+   !ELSE
+   SectionGetFlags ${secDebug} $0
+	IntOp $0 $0 | ${SF_SELECTED}
+	SectionSetFlags ${secDebug} $0
    !ENDIF
    ; Our logic should be like this.
    ;     1) If no AFS components are installed, we do a clean install with default options. (Client/Docs)