diff --git a/demos/modules/gaudin/demo.mk b/demos/modules/audio/oscilloscope/demo.mk
similarity index 57%
rename from demos/modules/gaudin/demo.mk
rename to demos/modules/audio/oscilloscope/demo.mk
index 1b57f289..ffdf6980 100644
--- a/demos/modules/gaudin/demo.mk
+++ b/demos/modules/audio/oscilloscope/demo.mk
@@ -1,3 +1,3 @@
-DEMODIR = $(GFXLIB)/demos/modules/gaudin
+DEMODIR = $(GFXLIB)/demos/modules/audio/oscilloscope
 GFXINC +=   $(DEMODIR)
 GFXSRC +=	$(DEMODIR)/main.c $(DEMODIR)/gwinosc.c
diff --git a/demos/modules/gaudin/gfxconf.h b/demos/modules/audio/oscilloscope/gfxconf.h
similarity index 98%
rename from demos/modules/gaudin/gfxconf.h
rename to demos/modules/audio/oscilloscope/gfxconf.h
index 8733268d..8af25391 100644
--- a/demos/modules/gaudin/gfxconf.h
+++ b/demos/modules/audio/oscilloscope/gfxconf.h
@@ -47,6 +47,7 @@
 #define GFX_USE_GTIMER			TRUE
 //#define GFX_USE_GADC			TRUE
 #define GFX_USE_GAUDIN			TRUE
+#define GFX_USE_GAUDOUT			TRUE
 
 /* Features for the GDISP sub-system. */
 #define GDISP_NEED_VALIDATION	TRUE
diff --git a/demos/modules/gaudin/gwinosc.c b/demos/modules/audio/oscilloscope/gwinosc.c
similarity index 100%
rename from demos/modules/gaudin/gwinosc.c
rename to demos/modules/audio/oscilloscope/gwinosc.c
diff --git a/demos/modules/gaudin/gwinosc.h b/demos/modules/audio/oscilloscope/gwinosc.h
similarity index 100%
rename from demos/modules/gaudin/gwinosc.h
rename to demos/modules/audio/oscilloscope/gwinosc.h
diff --git a/demos/modules/gaudin/main.c b/demos/modules/audio/oscilloscope/main.c
similarity index 100%
rename from demos/modules/gaudin/main.c
rename to demos/modules/audio/oscilloscope/main.c
diff --git a/demos/modules/gaudin/results_264x264.jpg b/demos/modules/audio/oscilloscope/results_264x264.jpg
similarity index 100%
rename from demos/modules/gaudin/results_264x264.jpg
rename to demos/modules/audio/oscilloscope/results_264x264.jpg