diff --git a/models/forms/make-post.js b/models/forms/make-post.js
index b85f4e24..65c0e436 100644
--- a/models/forms/make-post.js
+++ b/models/forms/make-post.js
@@ -166,7 +166,8 @@ module.exports = async (req, res, numFiles) => {
 		'ip': ip,
 		'files': files,
 		'salt': !req.body.thread ? salt : '',
-		'reports': []
+		'reports': [],
+		'spoiler': req.body.spoiler ? true : false,
 	};
 
 	let postId;
diff --git a/static/img/spoiler.png b/static/img/spoiler.png
new file mode 100644
index 00000000..e6c18bf5
Binary files /dev/null and b/static/img/spoiler.png differ
diff --git a/views/includes/postform.pug b/views/includes/postform.pug
index a519a1fc..af9759b2 100644
--- a/views/includes/postform.pug
+++ b/views/includes/postform.pug
@@ -15,7 +15,11 @@ section.form-wrapper
 	
 		textarea#message(name='message', rows='8', cols='50', placeholder='message' autocomplete='off' maxlength='2000')
 	
-		input#file(type='file', name='file' multiple)
-	
+		span
+			input#file(type='file', name='file' multiple)
+			label
+				input.post-check#spoiler(type='checkbox', name='spoiler', value='true')
+				| Spoiler
+
 		input(type='submit', value='submit')
 	
diff --git a/views/mixins/post.pug b/views/mixins/post.pug
index d8a02ad3..9af10305 100644
--- a/views/mixins/post.pug
+++ b/views/mixins/post.pug
@@ -22,7 +22,10 @@ mixin post(board, post, truncate)
 							span (#{file.sizeString} #{file.geometryString})
 						.post-file-src
 							a(target='_blank' href='/img/'+file.filename)
-								object(data=`/img/thumb-${file.filename.split('.')[0]}.png` width='128' height='128')
+								if post.spoiler
+									object(data='/img/spoiler.png' width='128' height='128')
+								else
+									object(data=`/img/thumb-${file.filename.split('.')[0]}.png` width='128' height='128')
 		if post.message
 			if truncate
 				-
diff --git a/wipe.js b/wipe.js
index 4848d2fd..59c62519 100644
--- a/wipe.js
+++ b/wipe.js
@@ -63,7 +63,8 @@ const Mongo = require(__dirname+'/helpers/db.js')
 	});
 	await readdir('static/img/').then(async files => {
 		await Promise.all(files.map(async file => {
-			unlink(path.join('static/img/', file));
+			if (file != 'spoiler.png')
+				unlink(path.join('static/img/', file));
 		}))
 	});
 	console.log('creating admin account: admin:changeme');