diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt
index 4278f732437..7cd781eb84d 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/KotlinLibrary.kt
@@ -31,6 +31,7 @@ const val KLIB_PROPERTY_CONTAINS_ERROR_CODE = "contains_error_code"
 
 // Native-specific:
 const val KLIB_PROPERTY_INTEROP = "interop"
+const val KLIB_PROPERTY_HEADER = "header"
 const val KLIB_PROPERTY_EXPORT_FORWARD_DECLARATIONS = "exportForwardDeclarations"
 const val KLIB_PROPERTY_INCLUDED_FORWARD_DECLARATIONS = "includedForwardDeclarations"
 const val KLIB_PROPERTY_IR_PROVIDER = "ir_provider"
@@ -126,6 +127,9 @@ interface KotlinLibrary : BaseKotlinLibrary, MetadataLibrary, IrLibrary
 val KotlinLibrary.isInterop: Boolean
     get() = manifestProperties.getProperty(KLIB_PROPERTY_INTEROP) == "true"
 
+val KotlinLibrary.isHeader: Boolean
+    get() = manifestProperties.getProperty(KLIB_PROPERTY_HEADER) == "true"
+
 val KotlinLibrary.packageFqName: String?
     get() = manifestProperties.getProperty(KLIB_PROPERTY_PACKAGE)
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/DynamicCompilerDriver.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/DynamicCompilerDriver.kt
index 26ad6eb3680..21ac6d128ee 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/DynamicCompilerDriver.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/DynamicCompilerDriver.kt
@@ -118,7 +118,7 @@ internal class DynamicCompilerDriver : CompilerDriver() {
             val headerKlibPath = config.headerKlibPath
             if (!headerKlibPath.isNullOrEmpty()) {
                 val headerKlib = engine.runFir2IrSerializer(FirSerializerInput(fir2IrOutput, produceHeaderKlib = true))
-                engine.writeKlib(headerKlib, headerKlibPath)
+                engine.writeKlib(headerKlib, headerKlibPath, produceHeaderKlib = true)
                 // Don't overwrite the header klib with the full klib and stop compilation here.
                 // By providing the same path for both regular output and header klib we can skip emitting the full klib.
                 if (File(config.outputPath).canonicalPath == File(headerKlibPath).canonicalPath) return null
@@ -144,7 +144,7 @@ internal class DynamicCompilerDriver : CompilerDriver() {
         val headerKlibPath = config.headerKlibPath
         if (!headerKlibPath.isNullOrEmpty()) {
             val headerKlib = engine.runSerializer(frontendOutput.moduleDescriptor, psiToIrOutput, produceHeaderKlib = true)
-            engine.writeKlib(headerKlib, headerKlibPath)
+            engine.writeKlib(headerKlib, headerKlibPath, produceHeaderKlib = true)
             // Don't overwrite the header klib with the full klib and stop compilation here.
             // By providing the same path for both regular output and header klib we can skip emitting the full klib.
             if (File(config.outputPath).canonicalPath == File(headerKlibPath).canonicalPath) return null
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/WriteKlib.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/WriteKlib.kt
index f62f45a090e..dd5a795260a 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/WriteKlib.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/WriteKlib.kt
@@ -12,14 +12,17 @@ import org.jetbrains.kotlin.backend.konan.driver.PhaseContext
 import org.jetbrains.kotlin.backend.konan.driver.PhaseEngine
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.konan.library.impl.buildLibrary
+import org.jetbrains.kotlin.library.KLIB_PROPERTY_HEADER
 import org.jetbrains.kotlin.library.KotlinAbiVersion
 import org.jetbrains.kotlin.library.KotlinLibraryVersioning
 import org.jetbrains.kotlin.library.metadata.KlibMetadataVersion
 import org.jetbrains.kotlin.util.removeSuffixIfPresent
+import java.util.*
 
 internal data class KlibWriterInput(
         val serializerOutput: SerializerOutput,
-        val customOutputPath: String?
+        val customOutputPath: String?,
+        val produceHeaderKlib: Boolean
 )
 internal val WriteKlibPhase = createSimpleNamedCompilerPhase<PhaseContext, KlibWriterInput>(
         "WriteKlib", "Write klib output",
@@ -43,7 +46,11 @@ internal val WriteKlibPhase = createSimpleNamedCompilerPhase<PhaseContext, KlibW
             metadataVersion = metadataVersion,
     )
     val target = config.target
-    val manifestProperties = config.manifestProperties
+    val manifestProperties = config.manifestProperties ?: Properties()
+
+    if (input.produceHeaderKlib) {
+        manifestProperties.setProperty(KLIB_PROPERTY_HEADER, "true")
+    }
 
     if (!nopack) {
         val suffix = outputFiles.produce.suffix(target)
@@ -80,6 +87,7 @@ internal val WriteKlibPhase = createSimpleNamedCompilerPhase<PhaseContext, KlibW
 internal fun <T : PhaseContext> PhaseEngine<T>.writeKlib(
         serializationOutput: SerializerOutput,
         customOutputPath: String? = null,
+        produceHeaderKlib: Boolean = false,
 ) {
-    this.runPhase(WriteKlibPhase, KlibWriterInput(serializationOutput, customOutputPath))
+    this.runPhase(WriteKlibPhase, KlibWriterInput(serializationOutput, customOutputPath, produceHeaderKlib))
 }