diff --git a/inc/config.php b/inc/config.php
index 1531d807..b2ce8bf4 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -561,6 +561,9 @@
 	// When true, users are instead presented a selectbox for email. Contains, blank, noko and sage.
 	$config['field_email_selectbox'] = &$config['field_disable_name'];
 
+	// Prevent users from uploading files.
+	$config['disable_images'] = false;
+
 	// When true, the sage won't be displayed
 	$config['hide_sage'] = false;
 
@@ -1117,7 +1120,7 @@
 	$config['error']['mime_exploit']	= _('MIME type detection XSS exploit (IE) detected; post discarded.');
 	$config['error']['invalid_embed']	= _('Couldn\'t make sense of the URL of the video you tried to embed.');
 	$config['error']['captcha']		= _('You seem to have mistyped the verification.');
-
+	$config['error']['images_disabled'] = _('Uploading files is disabled on this board.');
 
 	// Moderator errors
 	$config['error']['toomanyunban']	= _('You are only allowed to unban %s users at a time. You tried to unban %u users.');
diff --git a/inc/instance-config.php b/inc/instance-config.php
index 732eade1..20f2c757 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -57,7 +57,6 @@
 	$config['show_ratio'] = true;
 	//$config['allow_upload_by_url'] = true;
 	$config['max_filesize'] = 1024 * 1024 * 8; // 8MB
-	$config['disable_images'] = false; 
 	$config['spoiler_images'] = true;
 	$config['image_reject_repost'] = true;
 	$config['allowed_ext_files'][] = 'webm';
diff --git a/post.php b/post.php
index b303f536..86b7de61 100644
--- a/post.php
+++ b/post.php
@@ -406,6 +406,10 @@ elseif (isset($_POST['post'])) {
 		error('Sorry. Tor users can\'t upload files.');
 	if ($tor && !$config['tor_posting'])
 		error('Sorry. The owner of this board has decided not to allow Tor posters for some reason...');
+
+	if ($post['has_file'] && $config['disable_images']) {
+		error($config['error']['images_disabled']);
+	}
 	
 	if (!($post['has_file'] || isset($post['embed'])) || (($post['op'] && $config['force_body_op']) || (!$post['op'] && $config['force_body']))) {
 		// http://stackoverflow.com/a/4167053