diff --git a/guacamole/src/main/webapp/app/osk/styles/osk.css b/guacamole/src/main/webapp/app/osk/styles/osk.css
index 78554e113..c68400320 100644
--- a/guacamole/src/main/webapp/app/osk/styles/osk.css
+++ b/guacamole/src/main/webapp/app/osk/styles/osk.css
@@ -92,6 +92,7 @@
 .guac-keyboard .guac-keyboard-key-tab,
 .guac-keyboard .guac-keyboard-key-lalt,
 .guac-keyboard .guac-keyboard-key-ralt,
+.guac-keyboard .guac-keyboard-key-alt-gr,
 .guac-keyboard .guac-keyboard-key-lctrl,
 .guac-keyboard .guac-keyboard-key-rctrl,
 .guac-keyboard .guac-keyboard-key-lshift,
@@ -112,6 +113,9 @@
 .guac-keyboard.guac-keyboard-modifier-alt .guac-keyboard-key-ralt,
 .guac-keyboard.guac-keyboard-modifier-alt .guac-keyboard-key-lalt,
 
+/* Active alt-gr */
+.guac-keyboard.guac-keyboard-modifier-alt-gr .guac-keyboard-key-alt-gr,
+
 /* Active caps */
 .guac-keyboard.guac-keyboard-modifier-caps .guac-keyboard-key-caps,
 
@@ -185,6 +189,9 @@
 .guac-keyboard:not(.guac-keyboard-modifier-shift)
 .guac-keyboard-cap.guac-keyboard-requires-shift,
 
+.guac-keyboard:not(.guac-keyboard-modifier-alt-gr)
+.guac-keyboard-cap.guac-keyboard-requires-alt-gr,
+
 /* Hide keycaps NOT requiring modifiers which ARE currently active, where that
    modifier is used to determine which cap is displayed for the current key. */
 .guac-keyboard.guac-keyboard-modifier-shift
@@ -193,8 +200,18 @@
 
 .guac-keyboard.guac-keyboard-modifier-caps
 .guac-keyboard-key.guac-keyboard-uses-caps
-.guac-keyboard-cap:not(.guac-keyboard-requires-caps) {
+.guac-keyboard-cap:not(.guac-keyboard-requires-caps),
+
+.guac-keyboard.guac-keyboard-modifier-alt-gr
+.guac-keyboard-key.guac-keyboard-uses-alt-gr
+.guac-keyboard-cap:not(.guac-keyboard-requires-alt-gr) {
 
     display: none;
     
 }
+
+/* Fade out keys which do not use AltGr if AltGr is active */
+.guac-keyboard.guac-keyboard-modifier-alt-gr
+.guac-keyboard-key:not(.guac-keyboard-uses-alt-gr):not(.guac-keyboard-key-alt-gr) {
+    opacity: 0.5;
+}
diff --git a/guacamole/src/main/webapp/layouts/de-de-qwertz.json b/guacamole/src/main/webapp/layouts/de-de-qwertz.json
new file mode 100644
index 000000000..2b746aaeb
--- /dev/null
+++ b/guacamole/src/main/webapp/layouts/de-de-qwertz.json
@@ -0,0 +1,450 @@
+{
+
+    "language" : "de_DE",
+    "type"     : "qwertz",
+    "width"    : 23,
+
+    "keys" : {
+
+        "Esc"   : 65307,
+        "F1"    : 65470,
+        "F2"    : 65471,
+        "F3"    : 65472,
+        "F4"    : 65473,
+        "F5"    : 65474,
+        "F6"    : 65475,
+        "F7"    : 65476,
+        "F8"    : 65477,
+        "F9"    : 65478,
+        "F10"   : 65479,
+        "F11"   : 65480,
+        "F12"   : 65481,
+
+        "Space" : " ",
+
+        "Back" : [{
+            "title"  : "⟵",
+            "keysym" : 65288
+        }],
+        "Tab" : [{
+            "title"  : "Tab ↹",
+            "keysym" : 65289
+        }],
+        "Enter" : [{
+            "title"  : "↵",
+            "keysym" : 65293
+        }],
+        "Home" : [{
+            "title"  : "Pos 1",
+            "keysym" : 65360
+        }],
+        "PgUp" : [{
+            "title"  : "Bild ↑",
+            "keysym" : 65365
+        }],
+        "PgDn" : [{
+            "title"  : "Bild ↓",
+            "keysym" : 65366
+        }],
+        "End" : [{
+            "title"  : "Ende",
+            "keysym" : 65367
+        }],
+        "Ins" : [{
+            "title"  : "Einfg",
+            "keysym" : 65379
+        }],
+        "Del" : [{
+            "title"  : "Entf",
+            "keysym" : 65535
+        }],
+
+        "Left" : [{
+            "title"  : "←",
+            "keysym" : 65361
+        }],
+        "Up" : [{
+            "title"  : "↑",
+            "keysym" : 65362
+        }],
+        "Right" : [{
+            "title"  : "→",
+            "keysym" : 65363
+        }],
+        "Down" : [{
+            "title"  : "↓",
+            "keysym" : 65364
+        }],
+
+        "Menu" : [{
+            "title"    : "Menu",
+            "modifier" : "super",
+            "keysym"   : 65383
+        }],
+        "LShift" : [{
+            "title"    : "Shift",
+            "modifier" : "shift",
+            "keysym"   : 65505
+        }],
+        "RShift" : [{
+            "title"    : "Shift",
+            "modifier" : "shift",
+            "keysym"   : 65506
+        }],
+        "LCtrl" : [{
+            "title"    : "Strg",
+            "modifier" : "control",
+            "keysym"   : 65507
+        }],
+        "RCtrl" : [{
+            "title"    : "Strg",
+            "modifier" : "control",
+            "keysym"   : 65508
+        }],
+        "Caps" : [{
+            "title"    : "Caps",
+            "modifier" : "caps",
+            "keysym"   : 65509
+        }],
+        "LAlt" : [{
+            "title"    : "Alt",
+            "modifier" : "alt",
+            "keysym"   : 65513
+        }],
+        "AltGr" : [{
+            "title"    : "AltGr",
+            "modifier" : "alt-gr",
+            "keysym"   : 65027
+        }],
+        "Super" : [{
+            "title"    : "Super",
+            "modifier" : "super",
+            "keysym"   : 65515
+        }],
+
+        "^" : [
+            { "title" : "^", "requires" : [         ] },
+            { "title" : "°", "requires" : [ "shift" ] }
+        ],
+        "1" : [
+            { "title" : "1", "requires" : [         ] },
+            { "title" : "!", "requires" : [ "shift" ] }
+        ],
+        "2" : [
+            { "title" : "2",  "requires" : [          ] },
+            { "title" : "\"", "requires" : [ "shift"  ] },
+            { "title" : "²",  "requires" : [ "alt-gr" ] }
+        ],
+        "3" : [
+            { "title" : "3", "requires" : [          ] },
+            { "title" : "§", "requires" : [ "shift"  ] },
+            { "title" : "³", "requires" : [ "alt-gr" ] }
+        ],
+        "4" : [
+            { "title" : "4", "requires" : [         ] },
+            { "title" : "$", "requires" : [ "shift" ] }
+        ],
+        "5" : [
+            { "title" : "5", "requires" : [         ] },
+            { "title" : "%", "requires" : [ "shift" ] }
+        ],
+        "6" : [
+            { "title" : "6", "requires" : [         ] },
+            { "title" : "&", "requires" : [ "shift" ] }
+        ],
+        "7" : [
+            { "title" : "7", "requires" : [          ] },
+            { "title" : "/", "requires" : [ "shift"  ] },
+            { "title" : "{", "requires" : [ "alt-gr" ] }
+        ],
+        "8" : [
+            { "title" : "8", "requires" : [          ] },
+            { "title" : "(", "requires" : [ "shift"  ] },
+            { "title" : "[", "requires" : [ "alt-gr" ] }
+        ],
+        "9" : [
+            { "title" : "9", "requires" : [          ] },
+            { "title" : ")", "requires" : [ "shift"  ] },
+            { "title" : "]", "requires" : [ "alt-gr" ] }
+        ],
+        "0" : [
+            { "title" : "0", "requires" : [          ] },
+            { "title" : "=", "requires" : [ "shift"  ] },
+            { "title" : "}", "requires" : [ "alt-gr" ] }
+        ],
+        "ß" : [
+            { "title" : "ß",  "requires" : [          ] },
+            { "title" : "?",  "requires" : [ "shift"  ] },
+            { "title" : "\\", "requires" : [ "alt-gr" ] }
+        ],
+        "´" : [
+            { "title" : "´", "requires" : [         ] },
+            { "title" : "`", "requires" : [ "shift" ] }
+        ],
+        "+" : [
+            { "title" : "+", "requires" : [          ] },
+            { "title" : "*", "requires" : [ "shift"  ] },
+            { "title" : "~", "requires" : [ "alt-gr" ] }
+        ],
+        "#" : [
+            { "title" : "#", "requires" : [         ] },
+            { "title" : "'", "requires" : [ "shift" ] }
+        ],
+        "<" : [
+            { "title" : "<", "requires" : [         ] },
+            { "title" : ">", "requires" : [ "shift" ] },
+            { "title" : "|", "requires" : [ "alt-gr" ] }
+        ],
+        "," : [
+            { "title" : ",", "requires" : [         ] },
+            { "title" : ";", "requires" : [ "shift" ] }
+        ],
+        "." : [
+            { "title" : ".",  "requires" : [         ] },
+            { "title" : ":",  "requires" : [ "shift" ] }
+        ],
+        "-" : [
+            { "title" : "-", "requires" : [         ] },
+            { "title" : "_", "requires" : [ "shift" ] }
+        ],
+
+        "q" : [
+            { "title" : "q", "requires" : [                 ] },
+            { "title" : "Q", "requires" : [ "caps"          ] },
+            { "title" : "Q", "requires" : [ "shift"         ] },
+            { "title" : "q", "requires" : [ "caps", "shift" ] },
+            { "title" : "@", "requires" : [ "alt-gr"        ] }
+        ],
+        "w" : [
+            { "title" : "w", "requires" : [                 ] },
+            { "title" : "W", "requires" : [ "caps"          ] },
+            { "title" : "W", "requires" : [ "shift"         ] },
+            { "title" : "w", "requires" : [ "caps", "shift" ] }
+        ],
+        "e" : [
+            { "title" : "e", "requires" : [                 ] },
+            { "title" : "E", "requires" : [ "caps"          ] },
+            { "title" : "E", "requires" : [ "shift"         ] },
+            { "title" : "e", "requires" : [ "caps", "shift" ] },
+            { "title" : "€", "requires" : [ "alt-gr"        ] }
+        ],
+        "r" : [
+            { "title" : "r", "requires" : [                 ] },
+            { "title" : "R", "requires" : [ "caps"          ] },
+            { "title" : "R", "requires" : [ "shift"         ] },
+            { "title" : "r", "requires" : [ "caps", "shift" ] }
+        ],
+        "t" : [
+            { "title" : "t", "requires" : [                 ] },
+            { "title" : "T", "requires" : [ "caps"          ] },
+            { "title" : "T", "requires" : [ "shift"         ] },
+            { "title" : "t", "requires" : [ "caps", "shift" ] }
+        ],
+        "z" : [
+            { "title" : "z", "requires" : [                 ] },
+            { "title" : "Z", "requires" : [ "caps"          ] },
+            { "title" : "Z", "requires" : [ "shift"         ] },
+            { "title" : "z", "requires" : [ "caps", "shift" ] }
+        ],
+        "u" : [
+            { "title" : "u", "requires" : [                 ] },
+            { "title" : "U", "requires" : [ "caps"          ] },
+            { "title" : "U", "requires" : [ "shift"         ] },
+            { "title" : "u", "requires" : [ "caps", "shift" ] }
+        ],
+        "i" : [
+            { "title" : "i", "requires" : [                 ] },
+            { "title" : "I", "requires" : [ "caps"          ] },
+            { "title" : "I", "requires" : [ "shift"         ] },
+            { "title" : "i", "requires" : [ "caps", "shift" ] }
+        ],
+        "o" : [
+            { "title" : "o", "requires" : [                 ] },
+            { "title" : "O", "requires" : [ "caps"          ] },
+            { "title" : "O", "requires" : [ "shift"         ] },
+            { "title" : "o", "requires" : [ "caps", "shift" ] }
+        ],
+        "p" : [
+            { "title" : "p", "requires" : [                 ] },
+            { "title" : "P", "requires" : [ "caps"          ] },
+            { "title" : "P", "requires" : [ "shift"         ] },
+            { "title" : "p", "requires" : [ "caps", "shift" ] }
+        ],
+        "ü" : [
+            { "title" : "ü", "requires" : [                 ] },
+            { "title" : "Ü", "requires" : [ "caps"          ] },
+            { "title" : "Ü", "requires" : [ "shift"         ] },
+            { "title" : "ü", "requires" : [ "caps", "shift" ] }
+        ],
+        "a" : [
+            { "title" : "a", "requires" : [                 ] },
+            { "title" : "A", "requires" : [ "caps"          ] },
+            { "title" : "A", "requires" : [ "shift"         ] },
+            { "title" : "a", "requires" : [ "caps", "shift" ] }
+        ],
+        "s" : [
+            { "title" : "s", "requires" : [                 ] },
+            { "title" : "S", "requires" : [ "caps"          ] },
+            { "title" : "S", "requires" : [ "shift"         ] },
+            { "title" : "s", "requires" : [ "caps", "shift" ] }
+        ],
+        "d" : [
+            { "title" : "d", "requires" : [                 ] },
+            { "title" : "D", "requires" : [ "caps"          ] },
+            { "title" : "D", "requires" : [ "shift"         ] },
+            { "title" : "d", "requires" : [ "caps", "shift" ] }
+        ],
+        "f" : [
+            { "title" : "f", "requires" : [                 ] },
+            { "title" : "F", "requires" : [ "caps"          ] },
+            { "title" : "F", "requires" : [ "shift"         ] },
+            { "title" : "f", "requires" : [ "caps", "shift" ] }
+        ],
+        "g" : [
+            { "title" : "g", "requires" : [                 ] },
+            { "title" : "G", "requires" : [ "caps"          ] },
+            { "title" : "G", "requires" : [ "shift"         ] },
+            { "title" : "g", "requires" : [ "caps", "shift" ] }
+        ],
+        "h" : [
+            { "title" : "h", "requires" : [                 ] },
+            { "title" : "H", "requires" : [ "caps"          ] },
+            { "title" : "H", "requires" : [ "shift"         ] },
+            { "title" : "h", "requires" : [ "caps", "shift" ] }
+        ],
+        "j" : [
+            { "title" : "j", "requires" : [                 ] },
+            { "title" : "J", "requires" : [ "caps"          ] },
+            { "title" : "J", "requires" : [ "shift"         ] },
+            { "title" : "j", "requires" : [ "caps", "shift" ] }
+        ],
+        "k" : [
+            { "title" : "k", "requires" : [                 ] },
+            { "title" : "K", "requires" : [ "caps"          ] },
+            { "title" : "K", "requires" : [ "shift"         ] },
+            { "title" : "k", "requires" : [ "caps", "shift" ] }
+        ],
+        "l" : [
+            { "title" : "l", "requires" : [                 ] },
+            { "title" : "L", "requires" : [ "caps"          ] },
+            { "title" : "L", "requires" : [ "shift"         ] },
+            { "title" : "l", "requires" : [ "caps", "shift" ] }
+        ],
+        "ö" : [
+            { "title" : "ö", "requires" : [                 ] },
+            { "title" : "Ö", "requires" : [ "caps"          ] },
+            { "title" : "Ö", "requires" : [ "shift"         ] },
+            { "title" : "ö", "requires" : [ "caps", "shift" ] }
+        ],
+        "ä" : [
+            { "title" : "ä", "requires" : [                 ] },
+            { "title" : "Ä", "requires" : [ "caps"          ] },
+            { "title" : "Ä", "requires" : [ "shift"         ] },
+            { "title" : "ä", "requires" : [ "caps", "shift" ] }
+        ],
+        "y" : [
+            { "title" : "y", "requires" : [                 ] },
+            { "title" : "Y", "requires" : [ "caps"          ] },
+            { "title" : "Y", "requires" : [ "shift"         ] },
+            { "title" : "y", "requires" : [ "caps", "shift" ] }
+        ],
+        "x" : [
+            { "title" : "x", "requires" : [                 ] },
+            { "title" : "X", "requires" : [ "caps"          ] },
+            { "title" : "X", "requires" : [ "shift"         ] },
+            { "title" : "x", "requires" : [ "caps", "shift" ] }
+        ],
+        "c" : [
+            { "title" : "c", "requires" : [                 ] },
+            { "title" : "C", "requires" : [ "caps"          ] },
+            { "title" : "C", "requires" : [ "shift"         ] },
+            { "title" : "c", "requires" : [ "caps", "shift" ] }
+        ],
+        "v" : [
+            { "title" : "v", "requires" : [                 ] },
+            { "title" : "V", "requires" : [ "caps"          ] },
+            { "title" : "V", "requires" : [ "shift"         ] },
+            { "title" : "v", "requires" : [ "caps", "shift" ] }
+        ],
+        "b" : [
+            { "title" : "b", "requires" : [                 ] },
+            { "title" : "B", "requires" : [ "caps"          ] },
+            { "title" : "B", "requires" : [ "shift"         ] },
+            { "title" : "b", "requires" : [ "caps", "shift" ] }
+        ],
+        "n" : [
+            { "title" : "n", "requires" : [                 ] },
+            { "title" : "N", "requires" : [ "caps"          ] },
+            { "title" : "N", "requires" : [ "shift"         ] },
+            { "title" : "n", "requires" : [ "caps", "shift" ] }
+        ],
+        "m" : [
+            { "title" : "m", "requires" : [                 ] },
+            { "title" : "M", "requires" : [ "caps"          ] },
+            { "title" : "M", "requires" : [ "shift"         ] },
+            { "title" : "m", "requires" : [ "caps", "shift" ] },
+            { "title" : "µ", "requires" : [ "alt-gr"        ] }
+        ]
+
+    },
+
+    "layout" : [
+
+        [ "Esc", 0.7, "F1", "F2",  "F3",  "F4",
+                 0.7, "F5", "F6",  "F7",  "F8",
+                 0.7, "F9", "F10", "F11", "F12" ],
+
+        [ 0.1 ],
+
+        {
+            "main" : {
+                "alpha" : [
+
+                    [ "^", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "ß", "´",      "Back" ],
+                    [ "Tab", "q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "ü", "+",   1,  0.6 ],
+                    [ "Caps",  "a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä", "#", "Enter" ],
+                    [ "LShift", "<", "y", "x", "c", "v",  "b", "n",  "m", ",", ".", "-",  "RShift" ],
+                    [ "LCtrl", "Super", "LAlt",         "Space",          "AltGr", "Menu", "RCtrl" ]
+
+                ],
+
+                "movement" : [
+                    [ "Ins",  "Home", "PgUp"  ],
+                    [ "Del",  "End",  "PgDn"  ],
+                    [           1             ],
+                    [          "Up"           ],
+                    [ "Left", "Down", "Right" ]
+                ]
+            }
+        }
+
+    ],
+
+    "keyWidths" : {
+
+        "Back"   : 2,
+        "Tab"    : 1.5,
+        "\\"     : 1.5,
+        "Caps"   : 1.75,
+        "Enter"  : 1.25,
+        "LShift" : 2,
+        "RShift" : 2.1,
+
+        "LCtrl" : 1.6,
+        "Super" : 1.6,
+        "LAlt"  : 1.6,
+        "Space" : 6.1,
+        "AltGr" : 1.6,
+        "Menu"  : 1.6,
+        "RCtrl" : 1.6,
+
+        "Ins"  : 1.6,
+        "Home" : 1.6,
+        "PgUp" : 1.6,
+        "Del"  : 1.6,
+        "End"  : 1.6,
+        "PgDn" : 1.6
+
+    }
+
+}
diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json
index ac783dbdf..ce0cdc289 100644
--- a/guacamole/src/main/webapp/translations/de.json
+++ b/guacamole/src/main/webapp/translations/de.json
@@ -87,7 +87,7 @@
 
         "HELP_CLIPBOARD"           : "Kopierter oder ausgeschnittener Text aus Guacamole wird hier angezeigt. Änderungen am Text werden direkt auf die entfernte Zwischenablage angewandt.",
         "HELP_INPUT_METHOD_NONE"   : "Keine Eingabemethode in Verwendung. Tastatureingaben werden von der Hardwaretastatur akzeptiert.",
-        "HELP_INPUT_METHOD_OSK"    : "Bildschirmeingaben und die eingebettete Guacamole Bildschrimtastatur werden akzeptiert. Die Bildschirmtastatur gestattet Tastenkombinationen die ansonsten unmöglich sind (z.B.: Strl-Alt-Del).",
+        "HELP_INPUT_METHOD_OSK"    : "Bildschirmeingaben und die eingebettete Guacamole Bildschrimtastatur werden akzeptiert. Die Bildschirmtastatur gestattet Tastenkombinationen die ansonsten unmöglich sind (z.B.: Strg-Alt-Del).",
         "HELP_INPUT_METHOD_TEXT"   : "Gestattet Eingaben von Text und emuliert Tastaturkombinationen basierend auf den eingegebenen Text. Dies wird benötigt für Geräte ohne Hardwaretastatur.",
         "HELP_MOUSE_MODE"          : "Beeinflusst, wie sich die entfernte Maus bei Touchpadberührungen verhält.",
         "HELP_MOUSE_MODE_ABSOLUTE" : "Tippen Sie auf die Zielposition, der Klick erfolgt am Ort der Berührung des Touchscreen's.",
@@ -119,7 +119,7 @@
         "TEXT_RECONNECT_COUNTDOWN"        : "Neuverbindung in {REMAINING} {REMAINING, plural, one{Sekunde} other{Sekunden}}...",
         "TEXT_FILE_TRANSFER_PROGRESS"     : "{PROGRESS} {UNIT, select, b{B} kb{KB} mb{MB} gb{GB} other{}}",
 
-        "URL_OSK_LAYOUT" : "layouts/en-us-qwerty.json"
+        "URL_OSK_LAYOUT" : "layouts/de-de-qwertz.json"
 
     },