diff --git a/src/lib/client/CServerProxy.cpp b/src/lib/client/CServerProxy.cpp
index d34c594..c3d4738 100644
--- a/src/lib/client/CServerProxy.cpp
+++ b/src/lib/client/CServerProxy.cpp
@@ -412,8 +412,7 @@ CServerProxy::translateKey(KeyID id) const
 		{ kKeyControl_L, kKeyControl_R },
 		{ kKeyAlt_L,     kKeyAlt_R },
 		{ kKeyMeta_L,    kKeyMeta_R },
-		{ kKeySuper_L,   kKeySuper_R },
-		{ kKeyAltGr,     kKeyAltGr}
+		{ kKeySuper_L,   kKeySuper_R }
 	};
 
 	KeyModifierID id2 = kKeyModifierIDNull;
@@ -449,11 +448,6 @@ CServerProxy::translateKey(KeyID id) const
 		side = 1;
 		break;
 
-	case kKeyAltGr:
-		id2 = kKeyModifierIDAltGr;
-		side = 1; // there is only one alt gr key on the right side
-		break;
-
 	case kKeyMeta_L:
 		id2  = kKeyModifierIDMeta;
 		side = 0;
@@ -492,16 +486,14 @@ CServerProxy::translateModifierMask(KeyModifierMask mask) const
 		KeyModifierControl,
 		KeyModifierAlt,
 		KeyModifierMeta,
-		KeyModifierSuper,
-		KeyModifierAltGr
+		KeyModifierSuper
 	};
 
 	KeyModifierMask newMask = mask & ~(KeyModifierShift |
 										KeyModifierControl |
 										KeyModifierAlt |
 										KeyModifierMeta |
-										KeyModifierSuper |
-										KeyModifierAltGr );
+										KeyModifierSuper);
 	if ((mask & KeyModifierShift) != 0) {
 		newMask |= s_masks[m_modifierTranslationTable[kKeyModifierIDShift]];
 	}
@@ -511,9 +503,6 @@ CServerProxy::translateModifierMask(KeyModifierMask mask) const
 	if ((mask & KeyModifierAlt) != 0) {
 		newMask |= s_masks[m_modifierTranslationTable[kKeyModifierIDAlt]];
 	}
-	if ((mask & KeyModifierAltGr) != 0) {
-		newMask |= s_masks[m_modifierTranslationTable[kKeyModifierIDAltGr]];
-	}
 	if ((mask & KeyModifierMeta) != 0) {
 		newMask |= s_masks[m_modifierTranslationTable[kKeyModifierIDMeta]];
 	}
@@ -876,9 +865,6 @@ CServerProxy::setOptions()
 		else if (options[i] == kOptionModifierMapForAlt) {
 			id = kKeyModifierIDAlt;
 		}
-		else if (options[i] == kOptionModifierMapForAltGr) {
-			id = kKeyModifierIDAltGr;
-		}
 		else if (options[i] == kOptionModifierMapForMeta) {
 			id = kKeyModifierIDMeta;
 		}
diff --git a/src/lib/server/CConfig.cpp b/src/lib/server/CConfig.cpp
index deb2cf4..b997814 100644
--- a/src/lib/server/CConfig.cpp
+++ b/src/lib/server/CConfig.cpp
@@ -883,10 +883,6 @@ CConfig::readSectionScreens(CConfigReadContext& s)
 				addOption(screen, kOptionModifierMapForAlt,
 					s.parseModifierKey(value));
 			}
-			else if (name == "altgr") {
-				addOption(screen, kOptionModifierMapForAltGr,
-					s.parseModifierKey(value));
-			}
 			else if (name == "meta") {
 				addOption(screen, kOptionModifierMapForMeta,
 					s.parseModifierKey(value));
@@ -1319,9 +1315,6 @@ CConfig::getOptionName(OptionID id)
 	if (id == kOptionModifierMapForAlt) {
 		return "alt";
 	}
-	if (id == kOptionModifierMapForAltGr) {
-		return "altgr";
-	}
 	if (id == kOptionModifierMapForMeta) {
 		return "meta";
 	}
@@ -1389,7 +1382,6 @@ CConfig::getOptionValue(OptionID id, OptionValue value)
 	if (id == kOptionModifierMapForShift ||
 		id == kOptionModifierMapForControl ||
 		id == kOptionModifierMapForAlt ||
-		id == kOptionModifierMapForAltGr ||
 		id == kOptionModifierMapForMeta ||
 		id == kOptionModifierMapForSuper) {
 		switch (value) {
@@ -1402,9 +1394,6 @@ CConfig::getOptionValue(OptionID id, OptionValue value)
 		case kKeyModifierIDAlt:
 			return "alt";
 
-		case kKeyModifierIDAltGr:
-			return "altgr";
-
 		case kKeyModifierIDMeta:
 			return "meta";
 
@@ -1972,9 +1961,6 @@ CConfigReadContext::parseModifierKey(const CString& arg) const
 	if (CStringUtil::CaselessCmp::equal(arg, "alt")) {
 		return static_cast<OptionValue>(kKeyModifierIDAlt);
 	}
-	if (CStringUtil::CaselessCmp::equal(arg, "altgr")) {
-		return static_cast<OptionValue>(kKeyModifierIDAltGr);
-	}
 	if (CStringUtil::CaselessCmp::equal(arg, "meta")) {
 		return static_cast<OptionValue>(kKeyModifierIDMeta);
 	}
diff --git a/src/lib/synergy/CKeyMap.cpp b/src/lib/synergy/CKeyMap.cpp
index 8683ad9..9c12468 100644
--- a/src/lib/synergy/CKeyMap.cpp
+++ b/src/lib/synergy/CKeyMap.cpp
@@ -382,7 +382,6 @@ CKeyMap::getCommandModifiers() const
 	// but this works anyway.
 	return KeyModifierControl |
 			KeyModifierAlt    |
-			KeyModifierAltGr  |
 			KeyModifierMeta   |
 			KeyModifierSuper;
 }
diff --git a/src/lib/synergy/KeyTypes.h b/src/lib/synergy/KeyTypes.h
index 116d326..64999b2 100644
--- a/src/lib/synergy/KeyTypes.h
+++ b/src/lib/synergy/KeyTypes.h
@@ -87,8 +87,7 @@ static const KeyModifierID		kKeyModifierIDControl  = 2;
 static const KeyModifierID		kKeyModifierIDAlt      = 3;
 static const KeyModifierID		kKeyModifierIDMeta     = 4;
 static const KeyModifierID		kKeyModifierIDSuper    = 5;
-static const KeyModifierID		kKeyModifierIDAltGr    = 6;
-static const KeyModifierID		kKeyModifierIDLast     = 7;
+static const KeyModifierID		kKeyModifierIDLast     = 6;
 //@}
 
 //! @name Key identifiers
diff --git a/src/lib/synergy/OptionTypes.h b/src/lib/synergy/OptionTypes.h
index 6515d2f..1e2aa8a 100644
--- a/src/lib/synergy/OptionTypes.h
+++ b/src/lib/synergy/OptionTypes.h
@@ -51,7 +51,6 @@ static const OptionID	kOptionHalfDuplexScrollLock   = OPTION_CODE("HDSL");
 static const OptionID	kOptionModifierMapForShift    = OPTION_CODE("MMFS");
 static const OptionID	kOptionModifierMapForControl  = OPTION_CODE("MMFC");
 static const OptionID	kOptionModifierMapForAlt      = OPTION_CODE("MMFA");
-static const OptionID	kOptionModifierMapForAltGr    = OPTION_CODE("MMFG");
 static const OptionID	kOptionModifierMapForMeta     = OPTION_CODE("MMFM");
 static const OptionID	kOptionModifierMapForSuper    = OPTION_CODE("MMFR");
 static const OptionID	kOptionHeartbeat              = OPTION_CODE("HART");