diff --git a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
index 054a115a4..84e332262 100644
--- a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java
@@ -243,7 +243,7 @@ public class RepoXMLHandler extends DefaultHandler {
                 curapp.requirements = Utils.CommaSeparatedList.make(str);
             }
         } else if (curel.equals("description")) {
-            description = str;
+            description = cleanWhiteSpace(str);
         }
     }
 
@@ -273,10 +273,10 @@ public class RepoXMLHandler extends DefaultHandler {
 
             String nm = attributes.getValue("", "name");
             if (nm != null)
-                name = nm;
+                name = cleanWhiteSpace(nm);
             String dc = attributes.getValue("", "description");
             if (dc != null)
-                description = dc;
+                description = cleanWhiteSpace(dc);
 
         } else if (localName.equals("application") && curapp == null) {
             curapp = new App();
@@ -306,4 +306,8 @@ public class RepoXMLHandler extends DefaultHandler {
     public void setTotalAppCount(int totalAppCount) {
         this.totalAppCount = totalAppCount;
     }
+
+    private String cleanWhiteSpace(String str) {
+        return str.replaceAll("\n", " ").replaceAll("  ", " ");
+    }
 }