diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx
index 6bb824d..e61c2e7 100644
--- a/common/rfb/CConnection.cxx
+++ b/common/rfb/CConnection.cxx
@@ -579,11 +579,10 @@
     encodings.push_back(pseudoEncodingDesktopSize);
   if (server.supportsExtendedDesktopSize)
     encodings.push_back(pseudoEncodingExtendedDesktopSize);
-  if (server.supportsDesktopRename)
-    encodings.push_back(pseudoEncodingDesktopName);
   if (server.supportsLEDState)
     encodings.push_back(pseudoEncodingLEDState);
 
+  encodings.push_back(pseudoEncodingDesktopName);
   encodings.push_back(pseudoEncodingLastRect);
   encodings.push_back(pseudoEncodingContinuousUpdates);
   encodings.push_back(pseudoEncodingFence);
diff --git a/common/rfb/ServerParams.cxx b/common/rfb/ServerParams.cxx
index 4ee25a8..9ae8a60 100644
--- a/common/rfb/ServerParams.cxx
+++ b/common/rfb/ServerParams.cxx
@@ -25,11 +25,8 @@
 
 ServerParams::ServerParams()
   : majorVersion(0), minorVersion(0),
-    useCopyRect(false),
-    supportsLocalCursor(false), supportsLocalXCursor(false),
-    supportsLocalCursorWithAlpha(false),
+    supportsLocalCursor(false),
     supportsDesktopResize(false), supportsExtendedDesktopSize(false),
-    supportsDesktopRename(false), supportsLastRect(false),
     supportsLEDState(false), supportsQEMUKeyEvent(false),
     supportsSetDesktopSize(false), supportsFence(false),
     supportsContinuousUpdates(false),
diff --git a/common/rfb/ServerParams.h b/common/rfb/ServerParams.h
index 4554f09..cae38cb 100644
--- a/common/rfb/ServerParams.h
+++ b/common/rfb/ServerParams.h
@@ -69,15 +69,9 @@
     unsigned int ledState() { return ledState_; }
     void setLEDState(unsigned int state);
 
-    bool useCopyRect;
-
     bool supportsLocalCursor;
-    bool supportsLocalXCursor;
-    bool supportsLocalCursorWithAlpha;
     bool supportsDesktopResize;
     bool supportsExtendedDesktopSize;
-    bool supportsDesktopRename;
-    bool supportsLastRect;
     bool supportsLEDState;
     bool supportsQEMUKeyEvent;