diff --git a/plugins/format/address.inc b/plugins/format/address.inc
index 6fe37df..ef22481 100644
--- a/plugins/format/address.inc
+++ b/plugins/format/address.inc
@@ -274,6 +274,32 @@ function addressfield_format_address_generate(&$format, $address, $context = arr
     $format['locality_block']['administrative_area']['#title'] = t('Province');
   }
   else if ($address['country'] == 'BR') {
+    $format['street_block']['thoroughfare'] = array(
+      '#title' => t('Address'),
+      '#attributes' => array('class' => array('thoroughfare')),
+      '#size' => 30,
+      '#required' => TRUE,
+      '#suffix' => ', '
+    );
+
+    // hide suffix of street while in form
+    if ($context['mode'] == 'form') {
+      $format['street_block']['thoroughfare']['#suffix'] = null;
+    }
+
+    $format['street_block']['premise'] = array(
+      '#title' => t('Number'),
+      '#attributes' => array('class' => array('premise')),
+      '#size' => 5,
+    );
+
+    $format['street_block']['sub_premise'] = array(
+      '#title' => t('Complement'),
+      '#attributes' => array('class' => array('sub_premise')),
+      '#size' => 30,
+      '#prefix' => ' '
+    );
+
     $format['locality_block']['administrative_area']['#options'] = array(
       ''   => t('--'),
       'AC' => t('Acre'),
@@ -304,6 +330,17 @@ function addressfield_format_address_generate(&$format, $address, $context = arr
       'SP' => t('Sao Paulo'),
       'TO' => t('Tocantins'),
     );
+
+    $format['locality_block']['postal_code']['#weight'] = 10;
+    $format['locality_block']['locality']['#weight'] = 30;
+    $format['locality_block']['administrative_area']['#weight'] = 40;
+    $format['locality_block']['dependent_locality'] = array(
+      '#title' => t('Neighborhood'),
+      '#size' => 10,
+      '#prefix' => ' ',
+      '#weight' => 20,
+      '#attributes' => array('class' => array('neighborhood')),
+    );
   }
   else if ($address['country'] == 'CA') {
     $format['locality_block']['administrative_area']['#options'] = array(
