diff --git a/Makefile.griffin b/Makefile.griffin
index f940471241..4838988047 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -82,6 +82,7 @@ else ifeq ($(platform), ps3-cobra)
 
 # NGC/Wii - libogc
 else ifeq ($(libogc_platform), 1)
+EXTERNAL_LIBOGC=1
   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
   CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
   LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
@@ -89,15 +90,32 @@ else ifeq ($(libogc_platform), 1)
   EXT_TARGET := $(TARGET_NAME)_$(platform).dol
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
 
-  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/libz
+  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/libz -Iwii/libogc/include
+ 
+ifeq ($(EXTERNAL_LIBOGC), 1)
+
+ifeq ($(platform), ngc)
+LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube
+else ifeq ($(platform), wii)
+LIBDIRS += -L$(DEVKITPRO)/libogc/lib/wii
+endif
+
+else
+
+ifeq ($(platform), ngc)
+LIBDIRS += -Lwii/libogc/libs/cube
+else ifeq ($(platform), wii)
+LIBDIRS += -Lwii/libogc/libs/wii
+endif
+
+endif
 
 ifeq ($(platform), ngc)
-  LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube
   MACHDEP := -DHW_DOL -mogc
 else ifeq ($(platform), wii)
-  LIBDIRS += -L$(DEVKITPRO)/libogc/lib/wii
   MACHDEP := -DHW_RVL -mrvl
 endif
+
   LIBDIRS += -L.
   MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float -DMSB_FIRST
 
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 896a020c4b..29f57d78cb 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -6,6 +6,7 @@
 DEBUG			= 0
 HAVE_LOGGER		= 0
 HAVE_FILE_LOGGER	= 0
+EXTERNAL_LIBOGC = 1
 
 # system platform
 system_platform = unix
@@ -29,8 +30,15 @@ ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
 DOL_TARGET := retroarch-salamander_wii.dol
 ELF_TARGET := retroarch-salamander_wii.elf
 
-INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ilibretro-common/include -Ideps/libz
-LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
+INCLUDE := -I. -Ilibretro-common/include -Ideps/libz
+LIBDIRS := -L.
+ifeq ($(EXTERNAL_LIBOGC), 1)
+INCLUDE += -I$(DEVKITPRO)/libogc/include 
+LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii 
+else
+INCLUDE += -Iwii/libogc/include 
+LIBDIRS := -Lwii/libogc/libs/wii 
+endif
 
 MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
diff --git a/wii/app_booter/Makefile b/wii/app_booter/Makefile
index 4523f9045e..22576a832c 100644
--- a/wii/app_booter/Makefile
+++ b/wii/app_booter/Makefile
@@ -14,6 +14,7 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
    system_platform = win
 endif
 
+EXTERNAL_LIBOGC = 1
 CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
 LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
 OBJCOPY = $(DEVKITPPC)/bin/powerpc-eabi-objcopy$(EXE_EXT)
@@ -23,8 +24,16 @@ ELF_TARGET := app_booter.elf
 
 LIBRETRO_COMM_DIR := ../../libretro-common
 
-INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -I$(LIBRETRO_COMM_DIR)/crt/include
-LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii
+LIBDIRS :=
+INCLUDE := -I.  -I$(LIBRETRO_COMM_DIR)/crt/include
+
+ifeq ($(EXTERNAL_LIBOGC), 1)
+INCLUDE += -I$(DEVKITPRO)/libogc/include
+LIBDIRS += -L$(DEVKITPRO)/libogc/lib/wii
+else
+INCLUDE += -I../libogc/include
+LIBDIRS += -Lwii/libogc/libs/wii
+endif
 
 MACHDEP := -DHW_RVL -DGEKKO -mno-eabi -mno-sdata -mcpu=750
 # todo: find out why -Os spits out linker errors