3 files changed, 22 insertions, 4 deletions
diff --git a/ext/re/Makefile.PL b/ext/re/Makefile.PL
index e21b923b29..9ed83d17c8 100644
--- a/ext/re/Makefile.PL
+++ b/ext/re/Makefile.PL
@@ -10,6 +10,23 @@ WriteMakefile(
 );
 
 sub MY::postamble {
+  if ($^O eq 'VMS') {
+    return <<'VMS_EOF';
+re_comp.c : [--]regcomp.c
+	- $(RM_F) $(MMS$TARGET_NAME)
+	$(CP) [--]regcomp.c $(MMS$TARGET_NAME)
+
+re_comp$(OBJ_EXT) : re_comp.c
+
+re_exec.c : [--]regexec.c
+	- $(RM_F) $(MMS$TARGET_NAME)
+	$(CP) [--]regexec.c $(MMS$TARGET_NAME)
+
+re_exec$(OBJ_EXT) : re_exec.c
+
+
+VMS_EOF
+  } else {
     return <<'EOF';
 re_comp.c: ../../regcomp.c
 	-$(RM_F) $@
@@ -20,4 +37,5 @@ re_exec.c: ../../regexec.c
 	$(CP) ../../regexec.c $@
 
 EOF
+  }
 }
diff --git a/perl.h b/perl.h
index a9aaa4d0be..6d4cea7c07 100644
--- a/perl.h
+++ b/perl.h
@@ -1857,10 +1857,6 @@ typedef I32 (*regexec_t) _((regexp* prog, char* stringarg, char* strend, char*
 			    strbeg, I32 minend, SV* screamer, void* data, 
 			    U32 flags));
 
-EXT regexp*	pregcomp _((char* exp, char* xend, PMOP* pm));
-EXT I32		regexec_flags _((regexp* prog, char* stringarg, char* strend,
-			 char* strbeg, I32 minend, SV* screamer,
-			 void* data, U32 flags));
 #endif
 
 /* Set up PERLVAR macros for populating structs */
diff --git a/proto.h b/proto.h
index 9e99392bce..e1b91dc304 100644
--- a/proto.h
+++ b/proto.h
@@ -880,6 +880,10 @@ VIRTUAL SV**	get_specialsv_list _((void));
 VIRTUAL int&	ErrorNo _((void));
 #endif	/* WIN32 */
 #else	/* !PERL_OBJECT */
+regexp*	pregcomp _((char* exp, char* xend, PMOP* pm));
+I32		regexec_flags _((regexp* prog, char* stringarg, char* strend,
+			 char* strbeg, I32 minend, SV* screamer,
+			 void* data, U32 flags));
 END_EXTERN_C
 #endif	/* PERL_OBJECT */