diff --git a/desmume/configure.ac b/desmume/configure.ac
index 4014431b6..687dd6f6e 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -368,6 +368,7 @@ AC_CONFIG_FILES([Makefile
                  src/gtk/doc/Makefile
                  src/gtk-glade/Makefile
                  src/gtk-glade/doc/Makefile
+                 src/wx/Makefile
 		 src/gdbstub/Makefile
 		 autopackage/default.apspec
 ])
diff --git a/desmume/src/wx/Makefile.am b/desmume/src/wx/Makefile.am
new file mode 100644
index 000000000..0fb9db7f9
--- /dev/null
+++ b/desmume/src/wx/Makefile.am
@@ -0,0 +1,28 @@
+include $(top_srcdir)/src/desmume.mk
+
+AM_CPPFLAGS += -DHAVE_WX=1 -DHAVE_X11=1 $(WX_CPPFLAGS) $(SDL_CFLAGS) $(LIBAGG_CFLAGS)
+
+Applicationsdir = $(datadir)/applications
+Applications_DATA = desmume.desktop
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = DeSmuME.xpm
+EXTRA_DIST = DeSmuME.xpm desmume.desktop
+bin_PROGRAMS = desmume
+desmume_SOURCES = \
+	../driver.h ../driver.cpp \
+	../wxdlg/wxdlg3dViewer.h ../wxdlg/wxdlg3dViewer.cpp \
+	PadSimple/PadSimple.cpp \
+	InputCommon/X11InputBase.cpp \
+	InputCommon/XInput.cpp \
+	InputCommon/InputCommon.cpp \
+	InputCommon/EventHandler.cpp \
+	InputCommon/Configuration.cpp \
+	InputCommon/SDL.cpp \
+	IniFile.cpp \
+	StringUtil.cpp \
+	wxMain.cpp
+desmume_LDADD = ../libdesmume.a \
+	$(SDL_LIBS) $(GTHREAD_LIBS) $(GLIB_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(WX_LIBS)
+if HAVE_GDB_STUB
+desmume_LDADD += ../gdbstub/libgdbstub.a
+endif