diff --git a/.gitignore b/.gitignore
index 73247db6..663b12da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ docs/doctrees/*
 .directory
 
 # ignore demo attachments that user might have added
+helpdesk/attachments/
 demo/demodesk/media/helpdesk/attachments/*
 !demo/demodesk/media/helpdesk/attachments/DH-3
 demo/demodesk/media/helpdesk/attachments/DH-3/*
diff --git a/Makefile b/Makefile
index 7b43e2b6..c79dbbf1 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ distclean: clean
 	rm -rf *.egg
 	rm -rf *.egg-info
 	rm -rf demo/*.egg-info
+	rm -rf helpdesk/attachments/
 	# remove the django-created database
 	rm -f demo/demodesk/*.sqlite3