diff --git a/Makefile.xenon b/Makefile.xenon
index 605eb66252..c97527a895 100644
--- a/Makefile.xenon
+++ b/Makefile.xenon
@@ -9,18 +9,21 @@ DEBUG = 0
 
 CC = xenon-gcc
 CXX = xenon-g++
+OBJCOPY = xenon-objcopy
 STRIP = xenon-strip
 
 PPU_TARGET := ssnes-libxenon.elf
+PPU_TARGET_ADJUSTED := ssnes-libxenon.elf32
 
 LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32
 INCDIRS = -I. -I$(DEVKITXENON)/usr/include -I$(DEVKITXENON)/usr/include/SDL
 
 OBJ = fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o input/sdl.o audio/sdl.o gfx/sdl.o gfx/sdlwrap.o gfx/gfx_common.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o
 
-LIBS = -lsnes -lSDL -lxenon -lm
+LIBS = -lsnes -lSDL -lxenon -lm -lc
 DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DHAVE_SDL=1 -DPACKAGE_VERSION=\"0.9.2\" -DHAVE_GETOPT_LONG=1
 DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DSDL -DXENON $(INCDIRS)
+DEFINES += -u read -u _start -u exc_base
 
 ifeq ($(DEBUG), 1)
    OPTIMIZE_LV	:= -O0 -g
@@ -28,12 +31,18 @@ else
    OPTIMIZE_LV	:= -O3
 endif
 
+all: $(PPU_TARGET_ADJUSTED)
+
 CFLAGS := $(OPTIMIZE_LV) $(DEFINES)
-LDFLAGS := -m32 -mpowerpc64 -u read -u _start -u exc_base -fno-pic -mhard-float
+
+LDFLAGS := -m32 -n -T $(DEVKITXENON)/app.lds
+
+$(PPU_TARGET_ADJUSTED): $(PPU_TARGET)
+	$(OBJCOPY) -O elf32-powerpc --adjust-vma 0x80000000 $< $@
+	$(STRIP) $@
 
 $(PPU_TARGET): $(OBJ)
 	$(CXX) -o $@ $(OBJ) $(LDFLAGS) $(LDDIRS) $(LIBS)
-	$(STRIP) $(PPU_TARGET)
 
 %.o: %.c config.h
 	$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/gfx/sdlwrap.c b/gfx/sdlwrap.c
index daa1c8fc52..9cab6d28c0 100644
--- a/gfx/sdlwrap.c
+++ b/gfx/sdlwrap.c
@@ -326,10 +326,12 @@ void sdlwrap_check_window(bool *quit,
 #endif
 }
 
-#ifndef XENON
 bool sdlwrap_get_wm_info(SDL_SysWMinfo *info)
 {
-#if SDL_MODERN
+#ifdef XENON
+   (void)info;
+   return false;
+#elif SDL_MODERN
    if (g_window)
       return SDL_GetWindowWMInfo(g_window, info);
    else
@@ -338,7 +340,6 @@ bool sdlwrap_get_wm_info(SDL_SysWMinfo *info)
    return SDL_GetWMInfo(info) == 1;
 #endif
 }
-#endif
 
 bool sdlwrap_window_has_focus(void)
 {