diff --git a/src/Builder.php b/src/Builder.php
index 4a61c60..8071191 100644
--- a/src/Builder.php
+++ b/src/Builder.php
@@ -26,7 +26,7 @@ class Builder
      */
     private function build()
     {
-        $prefix = "<?xml version='1.0' encoding='UTF-8'?><feed xmlns='http://www.w3.org/2005/Atom' xmlns:apps='http://schemas.google.com/apps/2006'>";
+        $prefix = "<?xml version='1.0' encoding='UTF-8'?>" . PHP_EOL . "<feed xmlns='http://www.w3.org/2005/Atom' xmlns:apps='http://schemas.google.com/apps/2006'>";
         $suffix = '</feed>';
 
         $xml = collect($this->filters)->map(function ($items) {
@@ -47,9 +47,9 @@ class Builder
     {
         $entry = collect($filter->getProperties())->map(function ($value, $key) {
             return $this->buildProperty($value, $key);
-        })->implode('');
+        })->implode(PHP_EOL);
 
-        return "<entry>{$entry}</entry>";
+        return collect(['<entry>', $entry, '</entry>'])->implode(PHP_EOL);
     }
 
     /**
diff --git a/tests/Unit/BuilderTest.php b/tests/Unit/BuilderTest.php
index a8c4b40..25f24d3 100644
--- a/tests/Unit/BuilderTest.php
+++ b/tests/Unit/BuilderTest.php
@@ -21,9 +21,18 @@ class BuilderTest extends TestCase
         $result = new Builder([$filterA, $filterB]);
 
         $expected = <<<EOF
-<?xml version='1.0' encoding='UTF-8'?><feed xmlns='http://www.w3.org/2005/Atom' xmlns:apps='http://schemas.google.com/apps/2006'>
-<entry><apps:property name='from' value='(foo@example.com|test@example.com)'/><apps:property name='label' value='Some label'/><apps:property name='shouldArchive' value='true'/></entry>
-<entry><apps:property name='hasTheWord' value='from:bar@example.com'/><apps:property name='shouldStar' value='true'/><apps:property name='shouldAlwaysMarkAsImportant' value='true'/></entry>
+<?xml version='1.0' encoding='UTF-8'?>
+<feed xmlns='http://www.w3.org/2005/Atom' xmlns:apps='http://schemas.google.com/apps/2006'>
+<entry>
+<apps:property name='from' value='(foo@example.com|test@example.com)'/>
+<apps:property name='label' value='Some label'/>
+<apps:property name='shouldArchive' value='true'/>
+</entry>
+<entry>
+<apps:property name='hasTheWord' value='from:bar@example.com'/>
+<apps:property name='shouldStar' value='true'/>
+<apps:property name='shouldAlwaysMarkAsImportant' value='true'/>
+</entry>
 </feed>
 EOF;