diff --git a/src/main.c b/src/main.c
index 5e4013fb4..33c7ca2c7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -186,122 +186,7 @@ char *strdup(char *str)
 #endif
 
 #ifdef	VMS
-int	vms_show = 0;
-#define	FAC_CURL	0xC01
-#define	FAC_SYSTEM	0
-#define	MSG_NORMAL	0
-#define	VMS_STS(c,f,e,s) (((c&0xF)<<28)|((f&0xFFF)<<16)|((e&0x1FFF)<3)|(s&7))
-#define	VMSSTS_HIDE	VMS_STS(1,0,0,0)
-#define	SEV_WARNING	0
-#define	SEV_SUCCESS	1
-#define	SEV_ERROR	2
-#define	SEV_INFO	3	/* success, with an extra hint */
-#define	SEV_FATAL	4
-globalvalue int  CURL_UNSUPPROTO;		/* these are from curlmsg.msg file..... */
-globalvalue int  CURL_FAILINIT;
-globalvalue int  CURL_BADURLSYN;
-globalvalue int  CURL_BADURLUSER;
-globalvalue int  CURL_BADPROXY;
-globalvalue int  CURL_BADHOST;
-globalvalue int  CURL_FAILHOST;
-globalvalue int  CURL_FTPUNKREPLY;
-globalvalue int  CURL_FTPNOACC;
-globalvalue int  CURL_FTPUSRPW;
-globalvalue int  CURL_FTPBADPASS;
-globalvalue int  CURL_FTPBADUSER;
-globalvalue int  CURL_FTPBADPASV;
-globalvalue int  CURL_FTPBAD227;
-globalvalue int  CURL_FTPBADHOST227;
-globalvalue int  CURL_FTPNORECONN;
-globalvalue int  CURL_FTPNOBIN;
-globalvalue int  CURL_PARTIALFILE;
-globalvalue int  CURL_FTPNORETR;
-globalvalue int  CURL_FTPWRITERR;
-globalvalue int  CURL_FTPNOQUOTE;
-globalvalue int  CURL_HTTPPNF;
-globalvalue int  CURL_WRITERR;
-globalvalue int  CURL_BADUSER;
-globalvalue int  CURL_FTPNOSTOR;
-globalvalue int  CURL_READERR;
-globalvalue int  CURL_OUTOFMEM;
-globalvalue int  CURL_TIMEOUT;
-globalvalue int  CURL_FTPNOASCII;
-globalvalue int  CURL_FTPNOPORT;
-globalvalue int  CURL_FTPNOREST;
-globalvalue int  CURL_FTPNOSIZE;
-globalvalue int  CURL_HTTPRNGERR;
-globalvalue int  CURL_HTTPPOSTERR;
-globalvalue int  CURL_SSLNOCONN;
-globalvalue int  CURL_FTPBADRESUME;
-globalvalue int  CURL_FILENOACC;
-globalvalue int  CURL_LDAPNOBIND;
-globalvalue int  CURL_LDAPNOSRCH;
-globalvalue int  CURL_LDAPNOLIB;
-globalvalue int  CURL_LDAPNOFUNC;
-globalvalue int  CURL_ABORTCB;
-globalvalue int  CURL_BADPARAM;
-globalvalue int  CURL_BADORDER;
-globalvalue int  CURL_BADPWD;
-globalvalue int  CURL_MNYREDIR;
-globalvalue int  CURL_UNKTELNET;
-globalvalue int  CURL_UNKMSG;
-globalvalue int  CURL_BADSSLCERT;
-globalvalue int  CURL_SRVNOERR;
-globalvalue int  CURL_MAXMSG;
-long	vms_cond[] = {
-	VMS_STS(1,FAC_SYSTEM,MSG_NORMAL,SEV_SUCCESS),
-	CURL_UNSUPPROTO,		/* these are from curlmsg.msg file..... */
-	CURL_FAILINIT,
-	CURL_BADURLSYN,
-	CURL_BADURLUSER,
-	CURL_BADPROXY,
-	CURL_BADHOST,
-	CURL_FAILHOST,
-	CURL_FTPUNKREPLY,
-	CURL_FTPNOACC,
-	CURL_FTPUSRPW,
-	CURL_FTPBADPASS,
-	CURL_FTPBADUSER,
-	CURL_FTPBADPASV,
-	CURL_FTPBAD227,
-	CURL_FTPBADHOST227,
-	CURL_FTPNORECONN,
-	CURL_FTPNOBIN,
-	CURL_PARTIALFILE,
-	CURL_FTPNORETR,
-	CURL_FTPWRITERR,
-	CURL_FTPNOQUOTE,
-	CURL_HTTPPNF,
-	CURL_WRITERR,
-	CURL_BADUSER,
-	CURL_FTPNOSTOR,
-	CURL_READERR,
-	CURL_OUTOFMEM,
-	CURL_TIMEOUT,
-	CURL_FTPNOASCII,
-	CURL_FTPNOPORT,
-	CURL_FTPNOREST,
-	CURL_FTPNOSIZE,
-	CURL_HTTPRNGERR,
-	CURL_HTTPPOSTERR,
-	CURL_SSLNOCONN,
-	CURL_FTPBADRESUME,
-	CURL_FILENOACC,
-	CURL_LDAPNOBIND,
-	CURL_LDAPNOSRCH,
-	CURL_LDAPNOLIB,
-	CURL_LDAPNOFUNC,
-	CURL_ABORTCB,
-	CURL_BADPARAM,
-	CURL_BADORDER,
-	CURL_BADPWD,
-	CURL_MNYREDIR,
-	CURL_UNKTELNET,
-	CURL_UNKMSG,
-	CURL_BADSSLCERT,
-	CURL_SRVNOERR,
-	CURL_MAXMSG
-};
+#include "curlmsg_vms.h"
 #endif
 
 extern void hugehelp(void);
@@ -3456,8 +3341,8 @@ int main(int argc, char *argv[])
   free_config_fields(&config);
 
 #ifdef	VMS
-  if (res > 52) res = 53;		/* MAXMSG, porting helper */
-  return (vms_cond[res]|vms_show);
+  if (res > CURL_LAST) res = CURL_LAST;	/* If CURL_LAST exceeded then */
+  return (vms_cond[res]|vms_show);      /* curlmsg.h is out of sync.  */
 #else
   return res;
 #endif