diff --git a/Makefile b/Makefile
index b45266197..34c38381f 100644
--- a/Makefile
+++ b/Makefile
@@ -187,10 +187,10 @@ SDL_MIXER_LIB:=$(call linktest,-lSDL2_mixer,$(SDL_LIBS))
 NOSOUNDFLAG:=$(if $(SDL_MIXER_LIB),,-DNOSOUND$(warning -lSDL2_Mixer failed, no sound for you!))
 
 # SDL Pango is needed to render complex scripts like Thai and Arabic
-SDL_PANGO_LIB:=$(call linktest,-lSDL2_Pango,$(SDL_LIBS))
-NOPANGOFLAG:=$(if $(SDL_PANGO_LIB),,-DNO_SDLPANGO$(warning -lSDL2_Pango failed, no scripts for you!))
+SDL2_PANGO_LIB:=$(call linktest,-lSDL2_Pango,$(SDL_LIBS))
+NOPANGOFLAG:=$(if $(SDL2_PANGO_LIB),,-DNO_SDLPANGO$(warning -lSDL2_Pango failed, no scripts for you!))
 
-SDL_LIBS+=$(SDL_MIXER_LIB) $(SDL_PANGO_LIB)
+SDL_LIBS+=$(SDL_MIXER_LIB) $(SDL2_PANGO_LIB)
 
 SDL_CFLAGS:=$(shell $(PKG_CONFIG) $(SDL_PCNAME) --cflags)
 
@@ -211,7 +211,7 @@ OLDSVGFLAG:=$(if $(filter -lsvg-cairo,$(SVG_LIB)),-DOLD_SVG,)
 
 ifeq ($(hack),1)
 hack:
-	@echo 'SDL_PANGO_LIB is' $(SDL_PANGO_LIB)
+	@echo 'SDL2_PANGO_LIB is' $(SDL2_PANGO_LIB)
 	@echo 'SDL_MIXER_LIB is' $(SDL_MIXER_LIB)
 	@echo 'SVG_LIB       is' $(SVG_LIB)
 	@echo 'SDL_LIBS      is' $(SDL_LIBS)
@@ -225,7 +225,7 @@ endif
 # The entire set of CFLAGS:
 
 #-ffast-math
-OPTFLAGS:=-O2
+OPTFLAGS:=-O0 -g
 CFLAGS:=$(CPPFLAGS) $(OPTFLAGS) -W -Wall -fno-common -ffloat-store \
 	$(if $(filter windows,$(OS)),,$(call comptest,-fvisibility=hidden,)) \
 	-Wcast-align -Wredundant-decls \
@@ -862,7 +862,7 @@ install-dlls:
 	  cp `which libxml2-2.dll` $(BIN_PREFIX); \
 	  cp `which libcairo-2.dll` $(BIN_PREFIX); \
 	  cp `which libfontconfig-1.dll` $(BIN_PREFIX); \
-	  cp `which libSDL_Pango-1.dll` $(BIN_PREFIX); \
+	  cp `which libSDL2_Pango-1.dll` $(BIN_PREFIX); \
 	  cp `which libgobject-2.0-0.dll` $(BIN_PREFIX); \
 	  cp `which libgthread-2.0-0.dll` $(BIN_PREFIX); \
 	  cp `which librsvg-2-2.dll` $(BIN_PREFIX); \
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index bc756f4e3..e648aeab8 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -410,7 +410,7 @@ static void mtw(wchar_t * wtok, char * tok)
  The renaming ends here.
  */
 
-#include "SDL_Pango.h"
+#include "SDL2_Pango.h"
 #if !defined(SDL_PANGO_H)
 #error "---------------------------------------------------"
 #error "If you installed SDL_Pango from a package, be sure"
@@ -1455,7 +1455,7 @@ static SDL_Surface *render_text(TuxPaint_Font * restrict font,
 
     SDLPango_SetDefaultColor(font->pango_context, &pango_color);
     SDLPango_SetText(font->pango_context, str, -1);
-    ret = SDLPango_CreateSurfaceDraw(font->pango_context);     
+    ret = SDLPango_CreateSurfaceDraw(font->pango_context);
   }
 #endif
     
@@ -16888,7 +16888,6 @@ static void handle_keymouse(SDLKey key, Uint32 updown, int steps, SDL_Rect *area
       if (key == SDLK_INSERT || key == SDLK_F5 ||
 	  ((cur_tool != TOOL_TEXT && cur_tool != TOOL_LABEL) &&
 	   (key == SDLK_SPACE || key == SDLK_5 || key == SDLK_KP_5)))
-
       {
 	event.type = SDL_MOUSEBUTTONUP;
 	event.button.x = oldpos_x;
@@ -23540,7 +23539,7 @@ VIDEO_BPP, SDL_SWSURFACE);*/
   printf("Spawning Pango thread\n"); fflush(stdout);
 #endif
 
-  fontconfig_thread = SDL_CreateThread(generate_fontconfig_cache, NULL);
+  fontconfig_thread = SDL_CreateThread(generate_fontconfig_cache, "fontconfig_thread", NULL);
   if (fontconfig_thread == NULL) {
     fprintf(stderr, "Failed to create Pango setup thread: %s\n", SDL_GetError());
   } else {
@@ -23550,7 +23549,8 @@ VIDEO_BPP, SDL_SWSURFACE);*/
     if (generate_fontconfig_cache_spinner(screen)) /* returns 1 if aborted */
     {
       printf("Pango thread aborted!\n"); fflush(stdout);
-      SDL_KillThread(fontconfig_thread);
+      // FIXME SDL2
+      //      SDL_KillThread(fontconfig_thread);
       SDL_Quit();
       exit(0);
       /* FIXME: Let's be more graceful about exiting (e.g., clean up lockfile!) -bjk 2010.04.27 */