diff --git a/.gitignore b/.gitignore
index 9b612a22..afab69a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,7 +77,7 @@ _ReSharper.*
 demos/lol.js/lol.js
 doc/samples/benchsuite
 doc/samples/btphystest
-doc/samples/meshviewer
+doc/samples/meshviewer/meshviewer
 doc/samples/nacl_phystest
 doc/samples/sandbox/sample
 doc/samples/math/pi
diff --git a/build/Lol (vs2013).sln b/build/Lol (vs2013).sln
index 9156d9de..b5d77862 100644
--- a/build/Lol (vs2013).sln	
+++ b/build/Lol (vs2013).sln	
@@ -92,7 +92,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benlitz", "Benlitz", "{B583
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benlitzTest1", "..\people\benlitz\test1\benlitzTest1.vcxproj", "{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\doc\samples\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\doc\samples\meshviewer\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tactics", "..\people\touky\tactics\tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}"
 EndProject
diff --git a/build/Lol (vs2015).sln b/build/Lol (vs2015).sln
index b6c523d6..c2eb58c9 100644
--- a/build/Lol (vs2015).sln	
+++ b/build/Lol (vs2015).sln	
@@ -92,7 +92,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benlitz", "Benlitz", "{B583
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benlitzTest1", "..\people\benlitz\test1\benlitzTest1.vcxproj", "{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\doc\samples\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\doc\samples\meshviewer\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tactics", "..\people\touky\tactics\tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}"
 EndProject
diff --git a/configure.ac b/configure.ac
index 7897b849..2e1003e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,6 +483,7 @@ AC_CONFIG_FILES(
   doc/doxygen.cfg
   doc/samples/Makefile
   doc/samples/math/Makefile
+  doc/samples/meshviewer/Makefile
   doc/samples/sandbox/Makefile
   doc/tutorial/Makefile
 ])
diff --git a/doc/samples/Makefile.am b/doc/samples/Makefile.am
index 16eea037..3c365077 100644
--- a/doc/samples/Makefile.am
+++ b/doc/samples/Makefile.am
@@ -1,13 +1,12 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-SUBDIRS = math sandbox
+SUBDIRS = math meshviewer sandbox
 
 bench: benchsuite$(EXEEXT)
 	./benchsuite$(EXEEXT)
 
-noinst_PROGRAMS = benchsuite btphystest nacl_phystest meshviewer \
-    simplex
+noinst_PROGRAMS = benchsuite btphystest nacl_phystest simplex
 
 benchsuite_SOURCES = benchsuite.cpp \
     benchmark/vector.cpp benchmark/half.cpp benchmark/trig.cpp \
@@ -41,16 +40,6 @@ nacl_phystest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bullet \
 nacl_phystest_DEPENDENCIES = @LOL_DEPS@
 nacl_phystest_LDFLAGS = $(AM_LDFLAGS)
 
-meshviewer_SOURCES = meshviewer/meshviewer.cpp meshviewer/meshviewer.h \
-    meshviewer/scenesetup.cpp meshviewer/scenesetup.h \
-    data/shinymvtexture.lolfx data/shinyfur.lolfx
-meshviewer_CPPFLAGS = $(AM_CPPFLAGS)
-meshviewer_DEPENDENCIES = @LOL_DEPS@
-meshviewer_LDFLAGS = $(AM_LDFLAGS)
-if USE_EMSCRIPTEN
-meshviewer_LDFLAGS += -s EXPORTED_FUNCTIONS="['_main', '_C_Send']"
-endif
-
 simplex_SOURCES = simplex.cpp
 simplex_CPPFLAGS = $(AM_CPPFLAGS)
 simplex_DEPENDENCIES = @LOL_DEPS@
diff --git a/doc/samples/meshviewer/Makefile.am b/doc/samples/meshviewer/Makefile.am
new file mode 100644
index 00000000..b31b9638
--- /dev/null
+++ b/doc/samples/meshviewer/Makefile.am
@@ -0,0 +1,15 @@
+
+include $(top_srcdir)/build/autotools/common.am
+
+noinst_PROGRAMS = meshviewer
+
+meshviewer_SOURCES = meshviewer.cpp meshviewer.h \
+    scenesetup.cpp scenesetup.h \
+    shinymvtexture.lolfx shinyfur.lolfx
+meshviewer_CPPFLAGS = $(AM_CPPFLAGS)
+meshviewer_DEPENDENCIES = @LOL_DEPS@
+meshviewer_LDFLAGS = $(AM_LDFLAGS)
+if USE_EMSCRIPTEN
+meshviewer_LDFLAGS += -s EXPORTED_FUNCTIONS="['_main', '_C_Send']"
+endif
+
diff --git a/doc/samples/meshviewer.vcxproj b/doc/samples/meshviewer/meshviewer.vcxproj
similarity index 100%
rename from doc/samples/meshviewer.vcxproj
rename to doc/samples/meshviewer/meshviewer.vcxproj
diff --git a/doc/samples/data/shinyfur.lolfx b/doc/samples/meshviewer/shinyfur.lolfx
similarity index 100%
rename from doc/samples/data/shinyfur.lolfx
rename to doc/samples/meshviewer/shinyfur.lolfx
diff --git a/doc/samples/data/shinymvtexture.lolfx b/doc/samples/meshviewer/shinymvtexture.lolfx
similarity index 100%
rename from doc/samples/data/shinymvtexture.lolfx
rename to doc/samples/meshviewer/shinymvtexture.lolfx