diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c
index 960d3013b..572f33aea 100644
--- a/coregrind/arch/x86-linux/vg_libpthread.c
+++ b/coregrind/arch/x86-linux/vg_libpthread.c
@@ -1730,7 +1730,7 @@ strong_alias(send, __send)
 weak_alias (__pread64, pread64)
 weak_alias (__pwrite64, pwrite64)
 weak_alias(__fork, fork)
-//weak_alias(__vfork, vfork)
+
 
 
 /*--------------------------------------------------*/
diff --git a/coregrind/arch/x86-linux/vg_libpthread_unimp.c b/coregrind/arch/x86-linux/vg_libpthread_unimp.c
index 66c586e7d..01c299e2a 100644
--- a/coregrind/arch/x86-linux/vg_libpthread_unimp.c
+++ b/coregrind/arch/x86-linux/vg_libpthread_unimp.c
@@ -72,7 +72,7 @@ void __libc_current_sigrtmin ( void )  { unimp("__libc_current_sigrtmin"); }
 //void __res_state ( void )  { unimp("__res_state"); }
 //void __send ( void )  { unimp("__send"); }
 //void __sigaction ( void )  { unimp("__sigaction"); }
-void __vfork ( void )  { unimp("__vfork"); }
+//--//void __vfork ( void )  { unimp("__vfork"); }
 //void __wait ( void )  { unimp("__wait"); }
 //void __write ( void )  { unimp("__write"); }
 //void _pthread_cleanup_pop ( void )  { unimp("_pthread_cleanup_pop"); }
@@ -208,7 +208,7 @@ __attribute__((weak)) void recvfrom ( void ) { vgPlain_unimp("recvfrom"); }
 __attribute__((weak)) void recvmsg ( void ) { vgPlain_unimp("recvmsg"); }
 //__attribute__((weak)) void sendmsg ( void ) { vgPlain_unimp("sendmsg"); }
 __attribute__((weak)) void tcdrain ( void ) { vgPlain_unimp("tcdrain"); }
-__attribute__((weak)) void vfork ( void ) { vgPlain_unimp("vfork"); }
+//--//__attribute__((weak)) void vfork ( void ) { vgPlain_unimp("vfork"); }
 
 __attribute__((weak)) void pthread_attr_getguardsize ( void )
                       { vgPlain_unimp("pthread_attr_getguardsize"); }
diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index 960d3013b..572f33aea 100644
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -1730,7 +1730,7 @@ strong_alias(send, __send)
 weak_alias (__pread64, pread64)
 weak_alias (__pwrite64, pwrite64)
 weak_alias(__fork, fork)
-//weak_alias(__vfork, vfork)
+
 
 
 /*--------------------------------------------------*/
diff --git a/coregrind/vg_libpthread_unimp.c b/coregrind/vg_libpthread_unimp.c
index 66c586e7d..01c299e2a 100644
--- a/coregrind/vg_libpthread_unimp.c
+++ b/coregrind/vg_libpthread_unimp.c
@@ -72,7 +72,7 @@ void __libc_current_sigrtmin ( void )  { unimp("__libc_current_sigrtmin"); }
 //void __res_state ( void )  { unimp("__res_state"); }
 //void __send ( void )  { unimp("__send"); }
 //void __sigaction ( void )  { unimp("__sigaction"); }
-void __vfork ( void )  { unimp("__vfork"); }
+//--//void __vfork ( void )  { unimp("__vfork"); }
 //void __wait ( void )  { unimp("__wait"); }
 //void __write ( void )  { unimp("__write"); }
 //void _pthread_cleanup_pop ( void )  { unimp("_pthread_cleanup_pop"); }
@@ -208,7 +208,7 @@ __attribute__((weak)) void recvfrom ( void ) { vgPlain_unimp("recvfrom"); }
 __attribute__((weak)) void recvmsg ( void ) { vgPlain_unimp("recvmsg"); }
 //__attribute__((weak)) void sendmsg ( void ) { vgPlain_unimp("sendmsg"); }
 __attribute__((weak)) void tcdrain ( void ) { vgPlain_unimp("tcdrain"); }
-__attribute__((weak)) void vfork ( void ) { vgPlain_unimp("vfork"); }
+//--//__attribute__((weak)) void vfork ( void ) { vgPlain_unimp("vfork"); }
 
 __attribute__((weak)) void pthread_attr_getguardsize ( void )
                       { vgPlain_unimp("pthread_attr_getguardsize"); }
diff --git a/vg_libpthread.c b/vg_libpthread.c
index 960d3013b..572f33aea 100644
--- a/vg_libpthread.c
+++ b/vg_libpthread.c
@@ -1730,7 +1730,7 @@ strong_alias(send, __send)
 weak_alias (__pread64, pread64)
 weak_alias (__pwrite64, pwrite64)
 weak_alias(__fork, fork)
-//weak_alias(__vfork, vfork)
+
 
 
 /*--------------------------------------------------*/
diff --git a/vg_libpthread_unimp.c b/vg_libpthread_unimp.c
index 66c586e7d..01c299e2a 100644
--- a/vg_libpthread_unimp.c
+++ b/vg_libpthread_unimp.c
@@ -72,7 +72,7 @@ void __libc_current_sigrtmin ( void )  { unimp("__libc_current_sigrtmin"); }
 //void __res_state ( void )  { unimp("__res_state"); }
 //void __send ( void )  { unimp("__send"); }
 //void __sigaction ( void )  { unimp("__sigaction"); }
-void __vfork ( void )  { unimp("__vfork"); }
+//--//void __vfork ( void )  { unimp("__vfork"); }
 //void __wait ( void )  { unimp("__wait"); }
 //void __write ( void )  { unimp("__write"); }
 //void _pthread_cleanup_pop ( void )  { unimp("_pthread_cleanup_pop"); }
@@ -208,7 +208,7 @@ __attribute__((weak)) void recvfrom ( void ) { vgPlain_unimp("recvfrom"); }
 __attribute__((weak)) void recvmsg ( void ) { vgPlain_unimp("recvmsg"); }
 //__attribute__((weak)) void sendmsg ( void ) { vgPlain_unimp("sendmsg"); }
 __attribute__((weak)) void tcdrain ( void ) { vgPlain_unimp("tcdrain"); }
-__attribute__((weak)) void vfork ( void ) { vgPlain_unimp("vfork"); }
+//--//__attribute__((weak)) void vfork ( void ) { vgPlain_unimp("vfork"); }
 
 __attribute__((weak)) void pthread_attr_getguardsize ( void )
                       { vgPlain_unimp("pthread_attr_getguardsize"); }