diff --git a/.gitignore b/.gitignore
index 754b06e..af3accf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,10 @@ debian/*.debhelper
 debian/*.substvars
 debian/shellinabox/
 debian/tmp/
+demo/beep.wav
 demo/demo.js
+demo/enabled.gif
+demo/favicon.ico
 demo/keyboard.png
 demo/print-styles.css
 demo/styles.css
diff --git a/Makefile.am b/Makefile.am
index 8f9b92a..2a59fe2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -238,7 +238,7 @@ shellinaboxd.1: ${top_srcdir}/shellinabox/shellinaboxd.man.in                 \
 	@out=`echo "$@" 2>/dev/null|sed -e 's/\.[^.]*$$/.ps/'`;               \
 	man -Tps "./$@" >"$${out}" 2>/dev/null || rm -f "$${out}"
 
-clean-local:
+clean-local: clean-demo
 	-rm -rf shellinaboxd.1                                                \
 	        shellinaboxd.ps
 	-rm -rf debian/shellinabox                                            \
@@ -259,6 +259,20 @@ clean-local:
 	        shellinabox/vt100.js                                          \
 	        shellinabox/vt100.h
 
+clean-demo:
+	-rm demo/beep.wav						      \
+	    demo/demo.js 						      \
+	    demo/enabled.gif 						      \
+	    demo/favicon.ico 						      \
+	    demo/keyboard.png 						      \
+	    demo/print-styles.css 					      \
+	    demo/styles.css 						      \
+	    demo/usercss-0.css 						      \
+	    demo/usercss-1.css 						      \
+	    demo/usercss-2.css 						      \
+	    demo/usercss-3.css 						      \
+	    demo/vt100.js
+
 .css.h:
 	@echo od "$<" '>'"$@"
 	@mkdir -p "`dirname "$@"`"
diff --git a/debian/rules b/debian/rules
index eb1229a..53f3cfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DH_WITH=--with autotools-dev,autoreconf
+
+clean:
+	[ ! -f Makefile ] || make clean-demo
+	dh clean $(DH_WITH)
+
 %:
-	dh $@ --with autotools-dev,autoreconf
+	dh $@ $(DH_WITH)
 
 # elf-2012.04.10: Since Debian manages package dependencies we can
 # 		  force linkage of ssl s.t. the dependency is properly kept
diff --git a/demo/beep.wav b/demo/beep.wav
deleted file mode 100644
index a5ee5d9..0000000
Binary files a/demo/beep.wav and /dev/null differ
diff --git a/demo/enabled.gif b/demo/enabled.gif
deleted file mode 100644
index 07936e2..0000000
Binary files a/demo/enabled.gif and /dev/null differ
diff --git a/demo/favicon.ico b/demo/favicon.ico
deleted file mode 100644
index 116fdbc..0000000
Binary files a/demo/favicon.ico and /dev/null differ