diff --git a/java/compiler/impl/compiler-impl.iml b/java/compiler/impl/compiler-impl.iml
index 4f7473c9ff2a..381f3496886b 100644
--- a/java/compiler/impl/compiler-impl.iml
+++ b/java/compiler/impl/compiler-impl.iml
@@ -23,8 +23,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../lib/dev/compilerapi.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="lang-impl" />
diff --git a/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryTest.java b/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryTest.java
index a9578c24654e..b1bbd7a29e74 100644
--- a/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryTest.java
+++ b/java/java-tests/testSrc/com/intellij/roots/libraries/LibraryTest.java
@@ -47,7 +47,7 @@ public class LibraryTest extends IdeaTestCase {
 
     final Element element = new Element("root");
     library.writeExternal(element);
-    assertEquals("<root><library name=\"library\"><CLASSES><root url=\"file://x.jar\" /></CLASSES><JAVADOC /><SOURCES><root url=\"file://x-src.jar\" /></SOURCES></library></root>",
+    assertEquals("<root><library name=\"library\"><CLASSES><root url=\"file://x.jar\" /></CLASSES><SOURCES><root url=\"file://x-src.jar\" /></SOURCES></library></root>",
             new XMLOutputter().outputString(element));
 
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java
index 091ccf348d86..762e7b6bd738 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java
@@ -277,7 +277,7 @@ public class LibraryImpl implements LibraryEx.ModifiableModelEx, LibraryEx {
       if (roots.size() == 0 && rootType.skipWriteIfEmpty()) continue; //compatibility iml/ipr
       final Element rootTypeElement = new Element(rootType.name());
       roots.writeExternal(rootTypeElement, ROOT_PATH_ELEMENT);
-      element.addContent(rootTypeElement);
+      if (rootTypeElement.getAttributes().size() > 0 || rootTypeElement.getContent().size() > 0) element.addContent(rootTypeElement);
     }
     List<String> urls = new ArrayList<String>(myJarDirectories.keySet());
     Collections.sort(urls, new Comparator<String>() {
diff --git a/plugins/cvs/cvs-core/cvs-core.iml b/plugins/cvs/cvs-core/cvs-core.iml
index 53189febbd11..f170b4099106 100644
--- a/plugins/cvs/cvs-core/cvs-core.iml
+++ b/plugins/cvs/cvs-core/cvs-core.iml
@@ -15,7 +15,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../lib/trilead-ssh2-build213.jar!/" />
         </CLASSES>
-        <JAVADOC />
         <SOURCES>
           <root url="file://$MODULE_DIR$/../trilead-ssh2-build213/src" />
         </SOURCES>
diff --git a/plugins/git4idea/git4idea.iml b/plugins/git4idea/git4idea.iml
index aa21265058b8..5fa1b17970c1 100644
--- a/plugins/git4idea/git4idea.iml
+++ b/plugins/git4idea/git4idea.iml
@@ -16,7 +16,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/trilead-ssh2.jar!/" />
         </CLASSES>
-        <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/lib/trilead-ssh2-src.zip!/" />
         </SOURCES>
diff --git a/plugins/groovy/jetgroovy.iml b/plugins/groovy/jetgroovy.iml
index 3b210de157c4..3ead47ab4a1e 100644
--- a/plugins/groovy/jetgroovy.iml
+++ b/plugins/groovy/jetgroovy.iml
@@ -26,8 +26,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/gradle-open-api-0.8.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="java-impl" />
diff --git a/plugins/maven/facade-api/maven-facade-api.iml b/plugins/maven/facade-api/maven-facade-api.iml
index 8ba63b8dc7db..56173f227d95 100644
--- a/plugins/maven/facade-api/maven-facade-api.iml
+++ b/plugins/maven/facade-api/maven-facade-api.iml
@@ -14,8 +14,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/lucene-core-2.3.0.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
   </component>
diff --git a/plugins/maven/facade-impl/maven-facade-impl.iml b/plugins/maven/facade-impl/maven-facade-impl.iml
index 9240cd8ba91c..ae61f67a346f 100644
--- a/plugins/maven/facade-impl/maven-facade-impl.iml
+++ b/plugins/maven/facade-impl/maven-facade-impl.iml
@@ -16,8 +16,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/jaxb-impl-2.1.10.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -25,8 +23,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/wadl-core.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -34,8 +30,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/jaxb-api-2.1.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -43,8 +37,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/maven-embedder-1.1-SNAPSHOT.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -52,8 +44,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/classworlds-1.1.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -61,8 +51,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/plexus-utils-1.5.5.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -70,8 +58,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/maven-2.2.1-uber.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -79,8 +65,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/mercury-artifact-1.0-alpha-6.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -88,8 +72,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/maven-dependency-tree-1.2.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -97,8 +79,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/nexus-indexer-1.2.3.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -106,8 +86,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/archetype-common-2.0-alpha-4-SNAPSHOT.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -115,8 +93,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/activation-1.1.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -124,8 +100,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/commons-logging-1.1.1.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -133,8 +107,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/commons-beanutils.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="maven" scope="TEST" />
diff --git a/plugins/relaxng/relaxng.iml b/plugins/relaxng/relaxng.iml
index d7d35d40c904..6ff34b95fc39 100644
--- a/plugins/relaxng/relaxng.iml
+++ b/plugins/relaxng/relaxng.iml
@@ -18,7 +18,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/rngom-20051226-patched.jar!/" />
         </CLASSES>
-        <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/lib/rngom-src.zip!/src" />
         </SOURCES>
@@ -29,8 +28,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/isorelax.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -38,8 +35,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/trang-core.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -47,8 +42,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/jing.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
   </component>
diff --git a/plugins/svn4idea/svn4idea-tests.iml b/plugins/svn4idea/svn4idea-tests.iml
index 798757278775..5039b6b4a9f5 100644
--- a/plugins/svn4idea/svn4idea-tests.iml
+++ b/plugins/svn4idea/svn4idea-tests.iml
@@ -16,7 +16,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/svnkit.jar!/" />
         </CLASSES>
-        <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/lib/svnkitsrc.zip!/" />
         </SOURCES>
@@ -30,8 +29,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/jna.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
   </component>
diff --git a/plugins/svn4idea/svn4idea.iml b/plugins/svn4idea/svn4idea.iml
index fd765b400568..e00b72d68d9c 100644
--- a/plugins/svn4idea/svn4idea.iml
+++ b/plugins/svn4idea/svn4idea.iml
@@ -22,7 +22,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/svnkit.jar!/" />
         </CLASSES>
-        <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/lib/svnkitsrc.zip!/" />
         </SOURCES>
@@ -33,8 +32,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/trilead.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="platform-impl" />
@@ -43,8 +40,6 @@
         <CLASSES>
           <root url="jar://$MODULE_DIR$/lib/jna.jar!/" />
         </CLASSES>
-        <JAVADOC />
-        <SOURCES />
       </library>
     </orderEntry>
   </component>