diff --git a/src/wdm/debian/control/StandardFile.php b/src/wdm/debian/control/StandardFile.php
index bba1ac7..3c96b1d 100644
--- a/src/wdm/debian/control/StandardFile.php
+++ b/src/wdm/debian/control/StandardFile.php
@@ -44,7 +44,7 @@ class StandardFile
         "Recommends" => false,
         "Suggests" => false,
         "Installed-Size" => 1024,
-        "Maintainer" => "name [email]",
+        "Maintainer" => "name <email>",
         "Conflicts" => false,
         "Replaces" => false,
         "Provides" => "your-company",
@@ -109,7 +109,7 @@ class StandardFile
     public function setMaintainer($maintainer, $email = false)
     {
         $email = ($email) ? $email : "---";
-        return $this->_setProperty("Maintainer", $maintainer . "[{$email}]");
+        return $this->_setProperty("Maintainer", "{$maintainer} <{$email}>");
     }
 
     public function setConflicts($conflicts)
diff --git a/tests/wdm/debian/control/StandardFileTest.php b/tests/wdm/debian/control/StandardFileTest.php
index 81b539a..a26ff32 100644
--- a/tests/wdm/debian/control/StandardFileTest.php
+++ b/tests/wdm/debian/control/StandardFileTest.php
@@ -21,7 +21,7 @@ Priority: optional
 Architecture: all
 Essential: no
 Installed-Size: 1024
-Maintainer: name [email]
+Maintainer: name <email>
 Provides: your-company
 Description: Your description
 
@@ -46,7 +46,7 @@ OEF;
         $this->object["Architecture"] = "x86";
         $this->object["Essential"] = "yes";
         $this->object["Installed-Size"] = "2048";
-        $this->object["Maintainer"] = "Walter Dal Mut [walter.dalmut at gmail dot com]";
+        $this->object["Maintainer"] = "Walter Dal Mut <walter.dalmut at gmail dot com>";
         $this->object["Provides"] = "Corley SRL";
         $this->object["Description"] = "My Desc";
         $this->object["Depends"] = "php5-cli";
@@ -63,7 +63,7 @@ Essential: yes
 Depends: php5-cli
 Recommends: php5-curl
 Installed-Size: 2048
-Maintainer: Walter Dal Mut [walter.dalmut at gmail dot com]
+Maintainer: Walter Dal Mut <walter.dalmut at gmail dot com>
 Provides: Corley SRL
 Description: My Desc