diff --git a/inc/config.php b/inc/config.php
index 8e604adc..545d8c1c 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -396,6 +396,15 @@
 		'message' => &$config['error']['flood']
 	);
 
+	//max threads per hour
+	$config['filters'][] = array(
+		'condition' => array(
+			'custom' => 'check_thread_limit'
+		),
+		'action' => 'reject',
+		'message' => &$config['error']['too_many_threads']
+	);
+
 	// Example: Minimum time between posts with the same file hash.
 	// $config['filters'][] = array(
 	// 	'condition' => array(
@@ -493,6 +502,8 @@
     // Requires $config['strip_combining_chars'] = true;
     $config['max_combining_chars'] = 3;
 
+	// Maximum numbers of threads that can be created every hour on a board.
+	$config['max_threads_per_hour'] = 30;
 	// Maximum post body length.
 	$config['max_body'] = 1800;
 	// Maximum number of lines allowed in a post.
@@ -1141,6 +1152,7 @@
 	$config['error']['image_hard_limit']	= _('Thread has reached its maximum image limit.');
 	$config['error']['nopost']		= _('You didn\'t make a post.');
 	$config['error']['flood']		= _('Flood detected; Post discarded.');
+	$config['error']['too_many_threads']	= _('The hourly thread limit has been reached. Please post in an existing thread.');
 	$config['error']['spam']		= _('Your request looks automated; Post discarded.');
 	$config['error']['unoriginal']		= _('Unoriginal content!');
 	$config['error']['muted']		= _('Unoriginal content! You have been muted for %d seconds.');
diff --git a/inc/functions.php b/inc/functions.php
index 7c9b35bf..a3461128 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3067,3 +3067,16 @@ function uncloak_mask($mask) {
 
 	return $mask;
 }
+
+function check_thread_limit($post) {
+	global $config, $board;
+	if (!isset($config['max_threads_per_hour']) || !$config['max_threads_per_hour']) return false;
+
+	if ($post['op']) {
+		$query = prepare(sprintf('SELECT COUNT(*) AS `count` FROM ``posts_%s`` WHERE `thread` IS NULL AND FROM_UNIXTIME(`time`) > DATE_SUB(NOW(), INTERVAL 1 HOUR);', $board['uri']));
+		$query->execute() or error(db_error($query));
+		$r = $query->fetch(PDO::FETCH_ASSOC);
+
+		return $r['count'] >= $config['max_threads_per_hour'];
+	}
+}