diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c
index 7b062bdb9b..6432ca0fff 100644
--- a/gfx/context/ps3_ctx.c
+++ b/gfx/context/ps3_ctx.c
@@ -18,6 +18,12 @@
 #include "../../ps3/sdk_defines.h"
 #include "../../console/rarch_console.h"
 
+#ifdef HAVE_LIBDBGFONT
+#ifndef __PSL1GHT__
+#include <cell/dbgfont.h>
+#endif
+#endif
+
 #ifndef __PSL1GHT__
 #include <sys/spu_initialize.h>
 #endif
@@ -194,7 +200,10 @@ static bool gfx_ctx_has_focus(void)
 
 static void gfx_ctx_swap_buffers(void)
 {
-#if defined(HAVE_PSGL)
+#ifdef HAVE_LIBDBGFONT
+   cellDbgFontDraw();
+#endif
+#ifdef HAVE_PSGL
    psglSwap();
 #endif
 #ifdef HAVE_SYSUTILS
diff --git a/gfx/fonts/ps_libdbgfont.c b/gfx/fonts/ps_libdbgfont.c
index c4de04e1fa..db1bfb906d 100644
--- a/gfx/fonts/ps_libdbgfont.c
+++ b/gfx/fonts/ps_libdbgfont.c
@@ -23,15 +23,13 @@
 #define DbgFontConfig SceDbgFontConfig
 #define DbgFontInit sceDbgFontInit
 #define DbgFontExit sceDbgFontExit
-#define DbgFontDraw sceDbgFontFlush
 #elif defined(__CELLOS_LV2__)
 #include <cell/dbgfont.h>
-#define SCE_DBGFONT_BUFSIZE_LARGE 512
+#define SCE_DBGFONT_BUFSIZE_LARGE 1024
 #define DbgFontPrint(x, y, scale, color, msg) cellDbgFontPrintf(x, y, scale, color, msg)
 #define DbgFontConfig CellDbgFontConfig
 #define DbgFontInit cellDbgFontInit
 #define DbgFontExit cellDbgFontExit
-#define DbgFontDraw cellDbgFontDraw
 #endif
 
 static bool gl_init_font(void *data, const char *font_path, float font_size)
@@ -94,7 +92,10 @@ static void gl_render_msg(void *data, const char *msg, void *parms)
    if (!params)
       DbgFontPrint(x, y, scale - 0.01f, WHITE, msg);
 
-   DbgFontDraw();
+#ifdef SN_TARGET_PSP2
+   /* FIXME - if we ever get around to this port, move this out to some better place */
+   sceDbgFontFlush();
+#endif
 }
 
 const gl_font_renderer_t libdbg_font = {