diff --git a/configure.ac b/configure.ac
index 1b443ce9f..394eb677f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,3 +222,9 @@ src/zapit/src/Makefile
 src/zapit/data/Makefile
 ])
 
+if test "$BOXMODEL" = "apollo"; then
+AC_OUTPUT([
+src/system/mtdutils/Makefile
+src/system/mtdutils/lib/Makefile
+])
+fi
diff --git a/src/Makefile.am b/src/Makefile.am
index 33af31d06..8694896fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,6 +49,12 @@ else
 FLACLIBS =
 endif
 
+if BOXMODEL_APOLLO
+MTDUTILSLIBS = \
+	system/mtdutils/libneutrino_system_mtdutils.a \
+	system/mtdutils/lib/libneutrino_system_mtdutils_lib.a
+endif
+
 neutrino_LDADD = \
 	daemonc/libneutrino_daemonc.a \
 	gui/bedit/libneutrino_gui_bedit.a \
@@ -58,6 +64,7 @@ neutrino_LDADD = \
 	gui/widget/libneutrino_gui_widget2.a \
 	driver/pictureviewer/libneutrino_pictureviewer.a \
 	system/libneutrino_system.a \
+	$(MTDUTILSLIBS) \
 	gui/movieinfo.o \
 	gui/libneutrino_gui2.a \
 	gui/components/libneutrino_gui_components.a \
diff --git a/src/system/Makefile.am b/src/system/Makefile.am
index 2ed9e2309..49bab1c92 100644
--- a/src/system/Makefile.am
+++ b/src/system/Makefile.am
@@ -1,3 +1,7 @@
+if BOXMODEL_APOLLO
+SUBDIRS = mtdutils
+endif
+
 AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
diff --git a/src/system/mtdutils/Makefile.am b/src/system/mtdutils/Makefile.am
new file mode 100644
index 000000000..2e79b98fb
--- /dev/null
+++ b/src/system/mtdutils/Makefile.am
@@ -0,0 +1,27 @@
+AM_CXXFLAGS = -D__STDC_FORMAT_MACROS
+
+SUBDIRS = lib
+
+INCLUDES = \
+	-I$(top_builddir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/lib \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/system/mtdutils/include
+
+if BOXMODEL_APOLLO
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream2
+else
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream
+endif
+
+noinst_LIBRARIES = libneutrino_system_mtdutils.a
+
+libneutrino_system_mtdutils_a_SOURCES = \
+	compr.cpp \
+	compr_lzo.cpp \
+	compr_rtime.cpp \
+	compr_zlib.cpp \
+	mkfs.jffs2.cpp \
+	rbtree.cpp \
+	sumtool.cpp
diff --git a/src/system/mtdutils/lib/Makefile.am b/src/system/mtdutils/lib/Makefile.am
new file mode 100644
index 000000000..1d62a9cdb
--- /dev/null
+++ b/src/system/mtdutils/lib/Makefile.am
@@ -0,0 +1,16 @@
+AM_CXXFLAGS = -D__STDC_FORMAT_MACROS
+
+INCLUDES = \
+	-I$(top_builddir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/lib \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/system/mtdutils/include
+
+noinst_LIBRARIES = libneutrino_system_mtdutils_lib.a
+
+libneutrino_system_mtdutils_lib_a_SOURCES = \
+	libcrc32.cpp \
+	libfec.cpp \
+	libmtd.cpp \
+	libmtd_legacy.cpp