diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index b76258d929..ac7d287049 100644
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -162,6 +162,7 @@ OBJECTS1=fs_inet.obj,\
 
 OBJECTS2=utilscmn.obj,\
 		rgncmn.obj,\
+		uri.obj,\
 		valgen.obj,\
 		validate.obj,\
 		valtext.obj,\
@@ -323,6 +324,7 @@ SOURCES = \
 		radiocmn.cpp,\
 		regex.cpp,\
 		taskbarcmn.cpp,\
+		uri.cpp,\
 		xti.cpp,\
 		xtistrm.cpp,\
 		xtixml.cpp
@@ -498,3 +500,4 @@ taskbarcmn.obj : taskbarcmn.cpp
 xti.obj : xti.cpp
 xtistrm.obj : xtistrm.cpp
 xtixml.obj : xtixml.cpp
+uri.obj : uri.cpp
diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 3e8a373222..c93bcc3132 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -473,8 +473,12 @@ size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t
             len++;
         }
 #ifndef WC_UTF16
-        else if (cc > ((const wchar_t)0xffff))
-        {
+#ifdef __VMS
+       else if (cc > 0xffff)
+#else
+       else if (cc > ((const wchar_t)0xffff))
+#endif
+	 {
             // no surrogate pair generation (yet?)
             return (size_t)-1;
         }