diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenCommonArtifactRootCopyingHandlerProvider.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenCommonArtifactRootCopyingHandlerProvider.java
index 9d66bd7f91ab..477e6cf6811d 100644
--- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenCommonArtifactRootCopyingHandlerProvider.java
+++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenCommonArtifactRootCopyingHandlerProvider.java
@@ -58,7 +58,9 @@ public class MavenCommonArtifactRootCopyingHandlerProvider extends ArtifactRootC
         projectConfiguration.moduleConfigurations.get(getModuleName(artifact.getName()));
       if (moduleResourceConfiguration != null && moduleResourceConfiguration.manifest != null) {
         try {
-          FileUtil.writeToFile(root, moduleResourceConfiguration.manifest);
+          final String manifest =
+            StringUtil.unescapeXml(moduleResourceConfiguration.manifest).replaceAll("\n\r|\n|\r", "\r\n") + "\r\n\r\n";
+          FileUtil.writeToFile(root, manifest);
         }
         catch (IOException e) {
           LOG.debug(e);
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
index 871b204bb9dd..fb2855319089 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
@@ -23,6 +23,9 @@ import org.jdom.Document;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.idea.maven.dom.MavenDomUtil;
+import org.jetbrains.idea.maven.dom.MavenPropertyResolver;
+import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel;
 import org.jetbrains.idea.maven.dom.references.MavenFilteredPropertyPsiReferenceProvider;
 import org.jetbrains.idea.maven.model.MavenId;
 import org.jetbrains.idea.maven.model.MavenResource;
@@ -222,8 +225,9 @@ public class MavenResourceCompilerConfigurationGenerator {
       ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
       try {
         manifest.write(outputStream);
-        resourceConfig.manifest = outputStream.toString("UTF8");
-
+        MavenDomProjectModel domModel = MavenDomUtil.getMavenDomProjectModel(module.getProject(), mavenProject.getFile());
+        final String resolvedText = MavenPropertyResolver.resolve(outputStream.toString("UTF8"), domModel);
+        resourceConfig.manifest = StringUtil.escapeXml(resolvedText);
       }
       finally {
         StreamUtil.closeStream(outputStream);