diff --git a/Makefile.griffin b/Makefile.griffin
index ce3d114e28..b3f0ed3603 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -214,7 +214,7 @@ else ifeq ($(platform), vita)
   INCLUDE += -Ideps/zlib
   PLATCFLAGS := -mthumb -mfloat-abi=hard -ffast-math -fsingle-precision-constant -mword-relocations
   LIBS += -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
-			 -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub \
+			 -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub -lSceFiber_stub\
 			 -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
 			 -lSceMotion_stub -lfreetype -lm -lc -lpng -ljpeg
 
diff --git a/libretro-common/libco/libco.c b/libretro-common/libco/libco.c
index 456e9ed374..4e5c649661 100644
--- a/libretro-common/libco/libco.c
+++ b/libretro-common/libco/libco.c
@@ -11,7 +11,7 @@
 #elif defined(__GNUC__) && defined(_ARCH_PPC)
   #include "ppc.c"
 #elif defined(__GNUC__) && defined(VITA)
-  #include "psp2.c"
+  #include "scefiber.c"
 #elif defined(__GNUC__) && (defined(__ARM_EABI__) || defined(__arm__))
   #include "armeabi.c"
 #elif defined(__GNUC__)
diff --git a/libretro-common/libco/scefiber.c b/libretro-common/libco/scefiber.c
new file mode 100644
index 0000000000..bd95947417
--- /dev/null
+++ b/libretro-common/libco/scefiber.c
@@ -0,0 +1,92 @@
+/*
+  libco.win (2016-09-06)
+  authors: frangarcj
+  license: public domain
+*/
+
+#define LIBCO_C
+#include <libco.h>
+#include <stdlib.h>
+#include <psp2/sysmodule.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static thread_local cothread_t co_active_ = 0;
+
+typedef struct SceFiber {
+	char reserved[128];
+} SceFiber __attribute__( ( aligned ( 8 ) ) ) ;
+
+int32_t _sceFiberInitializeImpl(SceFiber* fiber, char* name, void* entry, uint32_t argOnInitialize, void* addrContext, int32_t sizeContext, void* params);
+
+int32_t sceFiberFinalize(SceFiber* fiber);
+
+int32_t sceFiberRun(SceFiber* fiber, uint32_t argOnRunTo, uint32_t* argOnRun);
+
+int32_t sceFiberSwitch(SceFiber* fiber, uint32_t argOnRunTo, uint32_t* argOnRun);
+
+int32_t sceFiberReturnToThread(uint32_t argOnReturn, uint32_t* argOnRun);
+
+void co_thunk(uint32_t argOnInitialize, uint32_t argOnRun)
+{
+   ((void (*)(void))argOnInitialize)();
+}
+
+cothread_t co_active(void)
+{
+   if(!co_active_)
+   {	
+		  sceSysmoduleLoadModule(SCE_SYSMODULE_FIBER);
+      co_active_ = (cothread_t)1;
+   }
+   return co_active_;
+}
+
+cothread_t co_create(unsigned int heapsize, void (*coentry)(void))
+{
+   SceFiber* tailFiber = malloc(sizeof(SceFiber));
+	 char * m_contextBuffer = malloc(sizeof(char)*heapsize);
+	 if(!co_active_)
+   {
+      sceSysmoduleLoadModule(SCE_SYSMODULE_FIBER);
+      co_active_ = (cothread_t)1;
+   }
+   
+   //_sceFiberInitializeImpl
+   int ret = _sceFiberInitializeImpl(tailFiber, "tailFiber", co_thunk, (uint32_t)coentry, (void*) m_contextBuffer, 10000, NULL);
+   if(ret==0){
+     return (cothread_t)tailFiber;
+   }else{
+     return (cothread_t)ret;
+   }
+
+}
+
+void co_delete(cothread_t cothread)
+{
+   sceFiberFinalize((SceFiber*)cothread);
+}
+
+void co_switch(cothread_t cothread)
+{
+  
+   uint32_t argOnReturn = 0;
+   if(cothread == (cothread_t)1){
+     co_active_ = cothread;
+     sceFiberReturnToThread(0, NULL);
+   }else{
+		 SceFiber* theFiber = (SceFiber*)cothread;
+		 if(co_active_ == (cothread_t)1){
+			 sceFiberRun(theFiber, 0, &argOnReturn);
+		 }else{
+			 sceFiberSwitch(theFiber, 0, &argOnReturn);
+		 }
+     co_active_ = cothread;
+   }
+}
+
+#ifdef __cplusplus
+}
+#endif