diff --git a/lib/MC/MCDwarf.cpp b/lib/MC/MCDwarf.cpp
index bcc7c45afc0..b4b3c9956cc 100644
--- a/lib/MC/MCDwarf.cpp
+++ b/lib/MC/MCDwarf.cpp
@@ -1701,7 +1701,8 @@ void FrameEmitterImpl::EmitFDE(const MCSymbol &cieStart,
         MakeStartMinusEndExpr(Streamer, SectionStart, cieStart, 0);
     emitAbsValue(Streamer, offset, 4);
   } else {
-    Streamer.EmitSymbolValue(&cieStart, 4);
+    Streamer.EmitSymbolValue(&cieStart, 4,
+                             asmInfo->needsDwarfSectionOffsetDirective());
   }
 
   // PC Begin
diff --git a/test/MC/COFF/cfi-sections.s b/test/MC/COFF/cfi-sections.s
new file mode 100644
index 00000000000..00a8d746c19
--- /dev/null
+++ b/test/MC/COFF/cfi-sections.s
@@ -0,0 +1,26 @@
+// RUN: llvm-mc -filetype=obj -triple x86_64-mingw32 %s -o - | llvm-objdump -r - | FileCheck --check-prefix=COFF_X86_64 %s
+// RUN: llvm-mc -filetype=obj -triple i686-mingw32 %s -o - | llvm-objdump -r - | FileCheck --check-prefix=COFF_I686 %s
+
+.cfi_sections .debug_frame
+
+f1:
+        .cfi_startproc
+        nop
+        .cfi_endproc
+
+f2:
+        .cfi_startproc
+        nop
+        .cfi_endproc
+
+// COFF_X86_64: RELOCATION RECORDS FOR [.debug_frame]:
+// COFF_X86_64-NEXT: {{.*}} IMAGE_REL_AMD64_SECREL .debug_frame
+// COFF_X86_64-NEXT: {{.*}} IMAGE_REL_AMD64_ADDR64 .text
+// COFF_X86_64-NEXT: {{.*}} IMAGE_REL_AMD64_SECREL .debug_frame
+// COFF_X86_64-NEXT: {{.*}} IMAGE_REL_AMD64_ADDR64 .text
+
+// COFF_I686: RELOCATION RECORDS FOR [.debug_frame]:
+// COFF_I686-NEXT: {{.*}} IMAGE_REL_I386_SECREL .debug_frame
+// COFF_I686-NEXT: {{.*}} IMAGE_REL_I386_DIR32 .text
+// COFF_I686-NEXT: {{.*}} IMAGE_REL_I386_SECREL .debug_frame
+// COFF_I686-NEXT: {{.*}} IMAGE_REL_I386_DIR32 .text