diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/LanguageResourceService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/LanguageResourceService.java
index d9f27292c..e2bac09b0 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/LanguageResourceService.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/LanguageResourceService.java
@@ -119,8 +119,20 @@ public class LanguageResourceService {
      *     "application/json".
      */
     public void addLanguageResource(String key, Resource resource) {
-        resources.put(key, resource);
-        logger.debug("Added language: \"{}\"", key);
+
+        // Merge language resources if already defined
+        Resource existing = resources.get(key);
+        if (existing != null) {
+            // TODO: Merge
+            logger.debug("Merged strings with existing language: \"{}\"", key);
+        }
+
+        // Otherwise, add new language resource
+        else {
+            resources.put(key, resource);
+            logger.debug("Added language: \"{}\"", key);
+        }
+
     }
 
     /**