diff --git a/builtin/providers/postgresql/provider.go b/builtin/providers/postgresql/provider.go
index d644aa2a2a..3e2efcbcf4 100644
--- a/builtin/providers/postgresql/provider.go
+++ b/builtin/providers/postgresql/provider.go
@@ -11,8 +11,9 @@ func Provider() terraform.ResourceProvider {
 	return &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"host": {
-				Type:        schema.TypeString,
+				Type:     schema.TypeString,
 				Optional: true,
+				// FIXME: Remove POSTGRESQL_HOST in 0.8
 				DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGHOST", "POSTGRESQL_HOST"}, nil),
 				Description: "The PostgreSQL server address",
 			},
@@ -23,14 +24,16 @@ func Provider() terraform.ResourceProvider {
 				Description: "The PostgreSQL server port",
 			},
 			"username": {
-				Type:        schema.TypeString,
+				Type:     schema.TypeString,
 				Optional: true,
+				// FIXME: Remove POSTGRESQL_USER in 0.8
 				DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGUSER", "POSTGRESQL_USER"}, nil),
 				Description: "Username for PostgreSQL server connection",
 			},
 			"password": {
-				Type:        schema.TypeString,
-				Optional:    true,
+				Type:     schema.TypeString,
+				Optional: true,
+				// FIXME: Remove POSTGRESQL_PASSWORD in 0.8
 				DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGPASSWORD", "POSTGRESQL_PASSWORD"}, nil),
 				Description: "Password for PostgreSQL server connection",
 			},