diff --git a/org.adempiere.server-feature/utils.unix/postgresql/DBRestore.sh b/org.adempiere.server-feature/utils.unix/postgresql/DBRestore.sh
index fd3d452411..687110e8bf 100644
--- a/org.adempiere.server-feature/utils.unix/postgresql/DBRestore.sh
+++ b/org.adempiere.server-feature/utils.unix/postgresql/DBRestore.sh
@@ -20,6 +20,20 @@ if [ "$IDEMPIERE_HOME" = "" -o  "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERV
     exit 1
 fi
 
+ISAMAZONRDS=N
+if echo "$ADEMPIERE_DB_SERVER" | grep 'rds.amazonaws.com$' > /dev/null
+then
+    ISAMAZONRDS=Y
+fi
+
+PGPASSWORD=$4
+export PGPASSWORD
+if [ "x$4" = "x^TryLocalConnection^" ]
+then
+    LOCALPG=true  # Allow to run this command with user postgres (just useful running configure as root)
+else
+    LOCALPG=false
+fi
 
 PGPASSWORD=$4
 export PGPASSWORD
@@ -33,7 +47,14 @@ fi
 echo -------------------------------------
 echo Recreate user and database
 echo -------------------------------------
-ADEMPIERE_CREATE_ROLE_SQL="CREATE ROLE $2 SUPERUSER LOGIN PASSWORD '$3'"
+if [ $ISAMAZONRDS = Y ]
+then
+    # modified for amazon RDS - doesn't allow SUPERUSER
+    ROOT_ROLE="CREATEDB IN ROLE rds_superuser, adempiere"
+else
+    ROOT_ROLE="SUPERUSER"
+fi
+ADEMPIERE_CREATE_ROLE_SQL="CREATE ROLE $2 $ROOT_ROLE LOGIN PASSWORD '$3'"
 if [ $LOCALPG = "true" ]
 then
     # Assuming that adempiere role already exists (it was created out there)
@@ -41,7 +62,18 @@ then
     export PGPASSWORD
     dropdb -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U $2 $ADEMPIERE_DB_NAME
 else
-    dropdb -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U postgres $ADEMPIERE_DB_NAME
+    if [ "x$2" != xadempiere ]
+    then
+        psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U postgres -c "CREATE ROLE adempiere"
+    fi
+    if [ $ISAMAZONRDS = Y ]
+    then
+        PGPASSWORD=$3
+        dropdb -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U $2 $ADEMPIERE_DB_NAME
+        PGPASSWORD=$4
+    else
+        dropdb -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U postgres $ADEMPIERE_DB_NAME
+    fi
     dropuser -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U postgres $2
     psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U postgres -c "$ADEMPIERE_CREATE_ROLE_SQL"
 fi
@@ -54,7 +86,6 @@ createdb -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -E UNICODE -T template0 -
 echo -------------------------------------
 echo Import Adempiere_pg.dmp
 echo -------------------------------------
-psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -c "drop schema sqlj cascade"
 ADEMPIERE_ALTER_ROLE_SQL="ALTER ROLE $2 SET search_path TO adempiere, pg_catalog"
 psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -c "$ADEMPIERE_ALTER_ROLE_SQL"
 psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -f $IDEMPIERE_HOME/data/ExpDat.dmp
diff --git a/org.adempiere.server-feature/utils.unix/postgresql/ImportIdempiere.sh b/org.adempiere.server-feature/utils.unix/postgresql/ImportIdempiere.sh
index 06a8f42a82..5791179f55 100644
--- a/org.adempiere.server-feature/utils.unix/postgresql/ImportIdempiere.sh
+++ b/org.adempiere.server-feature/utils.unix/postgresql/ImportIdempiere.sh
@@ -21,6 +21,12 @@ if [ "$IDEMPIERE_HOME" = "" -o  "$ADEMPIERE_DB_NAME" = "" -o "$ADEMPIERE_DB_SERV
     exit 1
 fi
 
+ISAMAZONRDS=N
+if echo "$ADEMPIERE_DB_SERVER" | grep 'rds.amazonaws.com$' > /dev/null
+then
+    ISAMAZONRDS=Y
+fi
+
 PGPASSWORD=$4
 export PGPASSWORD
 if [ "x$4" = "x^TryLocalConnection^" ]
@@ -32,7 +38,14 @@ fi
 echo -------------------------------------
 echo Recreate user and database
 echo -------------------------------------
-ADEMPIERE_CREATE_ROLE_SQL="CREATE ROLE $2 SUPERUSER LOGIN PASSWORD '$3'"
+if [ $ISAMAZONRDS = Y ]
+then
+    # modified for amazon RDS - doesn't allow SUPERUSER
+    ROOT_ROLE="CREATEDB IN ROLE rds_superuser, adempiere"
+else
+    ROOT_ROLE="SUPERUSER"
+fi
+ADEMPIERE_CREATE_ROLE_SQL="CREATE ROLE $2 $ROOT_ROLE LOGIN PASSWORD '$3'"
 if [ $LOCALPG = "true" ]
 then
     # Assuming that adempiere role already exists (it was created out there)
@@ -40,7 +53,18 @@ then
     export PGPASSWORD
     dropdb -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U $2 $ADEMPIERE_DB_NAME
 else
-    dropdb -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U postgres $ADEMPIERE_DB_NAME
+    if [ "x$2" != xadempiere ]
+    then
+        psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U postgres -c "CREATE ROLE adempiere"
+    fi
+    if [ $ISAMAZONRDS = Y ]
+    then
+        PGPASSWORD=$3
+        dropdb -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U $2 $ADEMPIERE_DB_NAME
+        PGPASSWORD=$4
+    else
+        dropdb -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U postgres $ADEMPIERE_DB_NAME
+    fi
     dropuser -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U postgres $2
     psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -U postgres -c "$ADEMPIERE_CREATE_ROLE_SQL"
 fi