diff --git a/remote-server-client-libraries.xml b/remote-server-client-libraries.xml
index fc89757..4f95ab5 100644
--- a/remote-server-client-libraries.xml
+++ b/remote-server-client-libraries.xml
@@ -50,5 +50,28 @@
       <file path="$USER_HOME$/.WebStorm11/system/remote-server-libraries/docker-1.7.6/bcprov-jdk15on-1.51.jar" />
       <file path="$USER_HOME$/.WebStorm11/system/remote-server-libraries/docker-1.7.6/guava-18.0.jar" />
     </client-library>
+    <client-library id="awselasticbeanstalk_1.10.49-1">
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/aspectjrt-1.8.6.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/commons-codec-1.6.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/commons-logging-1.1.3.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/aws-java-sdk-core-1.10.48.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/httpcore-4.3.3.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/jackson-annotations-2.5.0.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/aws-java-sdk-s3-1.10.48.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/aws-java-sdk-elasticbeanstalk-1.10.48.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/httpclient-4.3.6.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/jackson-core-2.5.3.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/freemarker-2.3.9.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/mail-1.4.6.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/aspectjweaver-1.8.6.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/aws-java-sdk-iam-1.10.48.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/spring-beans-3.0.7.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/spring-core-3.0.7.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/spring-context-3.0.7.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/joda-time-2.8.1.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/jackson-databind-2.5.3.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/xerces-2.4.0.jar" />
+      <file path="$USER_HOME$/Library/Caches/WebStorm2017.2/remote-server-libraries/awselasticbeanstalk_1.10.49-1/aws-java-sdk-ec2-1.10.48.jar" />
+    </client-library>
   </component>
 </application>
\ No newline at end of file
diff --git a/remote-servers.xml b/remote-servers.xml
index 01ae708..2ccbc7e 100644
--- a/remote-servers.xml
+++ b/remote-servers.xml
@@ -5,5 +5,8 @@
         <option name="certificatesPath" value="C:\Users\Martin\.docker\machine\machines\default" />
       </configuration>
     </remote-server>
+    <remote-server name="AWS ElasticBeanstalk" type="awselasticbeanstalk">
+      <configuration access-key="AKIAJWJS75F7WNCGK64A" region-url="elasticbeanstalk.eu-west-1.amazonaws.com" secret-key="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" />
+    </remote-server>
   </component>
 </application>
\ No newline at end of file