diff --git a/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/ConnectivityTest.java b/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/ConnectivityTest.java
index 79fa959b2ec..1c1d625b9cf 100755
--- a/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/ConnectivityTest.java
+++ b/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/ConnectivityTest.java
@@ -123,6 +123,11 @@ public class ConnectivityTest<ProcessT extends AwsApplicationProcess<String, Sai
         keyPass = "lkayrelakuesyrlasp8caorewyc".getBytes();
     }
     
+    @Test
+    public void testReverseDNSLookup() {
+        assertEquals("mongo0.internal.sapsailing.com", landscape.findHostnamesForIP("172.31.13.233"));
+    }
+    
     @Test
     public void testGetMasterOnApplicationProcess() throws Exception {
         final Iterable<SailingAnalyticsHost<String>> hosts = landscape.getApplicationProcessHostsByTag(region,
diff --git a/java/com.sap.sse.landscape.aws/src/com/sap/sse/landscape/aws/AwsLandscape.java b/java/com.sap.sse.landscape.aws/src/com/sap/sse/landscape/aws/AwsLandscape.java
index 07d15239f6c..6c81c38dee0 100755
--- a/java/com.sap.sse.landscape.aws/src/com/sap/sse/landscape/aws/AwsLandscape.java
+++ b/java/com.sap.sse.landscape.aws/src/com/sap/sse/landscape/aws/AwsLandscape.java
@@ -762,7 +762,9 @@ public interface AwsLandscape<ShardingKey> extends Landscape<ShardingKey> {
      * to that {@code ipAddress} and returns the record set name as the hostname. This searches
      * the whole of all resource record sets in the AWS account.<p>
      * 
-     * Example: asking for "172.31.13.233" may return something like "mongo0.internal.sapsailing.com"
+     * Example: asking for "172.31.13.233" may return something like "mongo0.internal.sapsailing.com"<p>
+     * 
+     * Note that this strips off any trailing "." (dot) from a resource record set name.
      * 
      * @return the fully-qualified resource record set name if found, otherwise {@code null}
      */
diff --git a/java/com.sap.sse.landscape.aws/src/com/sap/sse/landscape/aws/impl/AwsLandscapeImpl.java b/java/com.sap.sse.landscape.aws/src/com/sap/sse/landscape/aws/impl/AwsLandscapeImpl.java
index 042d0e50701..c504f1b2682 100644
--- a/java/com.sap.sse.landscape.aws/src/com/sap/sse/landscape/aws/impl/AwsLandscapeImpl.java
+++ b/java/com.sap.sse.landscape.aws/src/com/sap/sse/landscape/aws/impl/AwsLandscapeImpl.java
@@ -1761,7 +1761,7 @@ public class AwsLandscapeImpl<ShardingKey> implements AwsLandscape<ShardingKey>
             for (final ResourceRecordSet resourceRecordSet : route53Client.listResourceRecordSets(b->b.hostedZoneId(hostedZone.id())).resourceRecordSets()) {
                 for (final ResourceRecord resourceRecord : resourceRecordSet.resourceRecords()) {
                     if (Util.equalsWithNull(resourceRecord.value(), ipAddress)) {
-                        return resourceRecordSet.name();
+                        return resourceRecordSet.name().replaceFirst("\\.$", "");
                     }
                 }
             }