Index: jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java
===================================================================
--- jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java	(revision 1574775)
+++ jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java	(working copy)
@@ -130,6 +130,10 @@
                     endpoint = S3 + DASH + region + DOT + AWSDOTCOM;
                 }
             }
+            String propEndPoint = prop.getProperty("s3EndPoint");
+            if( propEndPoint != null & !"".equals(propEndPoint)){
+                endpoint = propEndPoint;
+            }
             /*
              * setting endpoint to remove latency of redirection. If endpoint is
              * not set, invocation first goes us standard region, which
Index: jackrabbit-aws-ext/src/test/resources/aws.properties
===================================================================
--- jackrabbit-aws-ext/src/test/resources/aws.properties	(revision 1574775)
+++ jackrabbit-aws-ext/src/test/resources/aws.properties	(working copy)
@@ -32,6 +32,10 @@
 # Asia Pacific (Tokyo) ap-northeast-1
 # South America (Sao Paulo) sa-east-1
 s3Region=
+# S3 endpoint to be used. It is optional parameter
+# and has higher precedence over endpoint derived
+# via S3 region.
+s3EndPoint=
 connectionTimeout=120000
 socketTimeout=120000
 maxConnections=10