diff --git a/libretro/Makefile b/libretro/Makefile
index 0a0dbfb4..91fc7ba7 100644
--- a/libretro/Makefile
+++ b/libretro/Makefile
@@ -303,22 +303,6 @@ else ifeq ($(platform), emscripten)
    TARGET := $(TARGET_NAME)_libretro_$(platform).bc
    STATIC_LINKING = 1
 
-# Genode
-else ifeq ($(platform), genode)
-   TARGET  := $(TARGET_NAME)_libretro.lib.so
-   PKG_CONFIG := genode-lib genode-stdcxx
-   CXXFLAGS += -D__GENODE__
-   CXXFLAGS += $(shell pkg-config --cflags $(PKG_CONFIG))
-
-   LDFLAGS += -shared --version-script=link.T
-   LDFLAGS += $(shell pkg-config --libs $(PKG_CONFIG))
-
-   CC  = $(shell pkg-config genode-base --variable=cc)
-   CXX = $(shell pkg-config genode-base --variable=cxx)
-   LD  = $(shell pkg-config genode-base --variable=ld)
-   AR  = $(shell pkg-config genode-base --variable=ar) -rcs
-   LIBS =
-
 # Windows MSVC 2003 Xbox 1
 else ifeq ($(platform), xbox1_msvc2003)
 CFLAGS += -D__WIN32__
@@ -641,7 +625,7 @@ ifeq ($(STATIC_LINKING),1)
 else
 	LD = link.exe
 endif
-else ifneq ($(platform),genode)
+else
 	LD = $(CXX)
 endif
 
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index f221e8f4..7f427d1d 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -1,4 +1,7 @@
-LIBRETRO_COMM_DIR = $(CORE_DIR)/libretro/libretro-common
+ifeq ($(LIBRETRO_COMM_DIR),)
+	LIBRETRO_COMM_DIR = $(CORE_DIR)/libretro/libretro-common
+endif
+
 INCFLAGS   = -I$(CORE_DIR)/libretro -I$(CORE_DIR) -I$(CORE_DIR)/apu/ -I$(CORE_DIR)/apu/bapu
 
 ifneq (,$(findstring msvc2003,$(platform)))
diff --git a/libretro/Tupfile b/libretro/Tupfile
new file mode 100644
index 00000000..2c2cc4db
--- /dev/null
+++ b/libretro/Tupfile
@@ -0,0 +1,3 @@
+TARGET_NAME=snes9x
+CORE_DIR=$(TUP_CWD)/..
+include_rules