diff --git a/upload/config.php b/upload/config.php
index 1f8c7b8be..a654d06f2 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,8 +53,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.2 Beta';
-$bb_cfg['tp_release_state'] = 'R319';
-$bb_cfg['tp_release_date'] = '16-11-2011';
+$bb_cfg['tp_release_state'] = 'R320';
+$bb_cfg['tp_release_date'] = '17-11-2011';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/modcp.php b/upload/modcp.php
index 6d32ab552..ea118f9d0 100644
--- a/upload/modcp.php
+++ b/upload/modcp.php
@@ -90,6 +90,14 @@ else
 	{
 		$mode = 'unlock';
 	}
+	else if (isset($_REQUEST['post_pin']) || @$_POST['mod_action'] === 'post_pin')
+	{
+		$mode = 'post_pin';
+	}
+	else if (isset($_REQUEST['post_unpin']) || @$_POST['mod_action'] === 'post_unpin')
+	{
+		$mode = 'post_unpin';
+	}
 }
 
 // Obtain relevant data
@@ -194,8 +202,8 @@ switch ($mode)
 	case 'unlock':
 	case 'set_download':
 	case 'unset_download':
-	case 'post_stick':
-	case 'post_unstick':
+	case 'post_pin':
+	case 'post_unpin':
 
 		if (empty($_POST['topic_id_list']) && empty($topic_id))
 		{
diff --git a/upload/templates/default/viewforum.tpl b/upload/templates/default/viewforum.tpl
index 5b98031fc..b61f510e1 100644
--- a/upload/templates/default/viewforum.tpl
+++ b/upload/templates/default/viewforum.tpl
@@ -168,6 +168,8 @@ ajax.callback.mod_action = function(data) {
 	<input type="submit" name="move" value="{L_MOVE}" />
 	<input type="submit" name="lock" value="{L_LOCK}" />
 	<input type="submit" name="unlock" value="{L_UNLOCK}" />
+	<input type="submit" name="post_pin" value="{L_POST_PIN}" />
+	<input type="submit" name="post_unpin" value="{L_POST_UNPIN}" />
 	<label><input id="in-new-window" type="checkbox" />{L_NEW_WINDOW}</label>
 	</div>
 </form>